diff --git a/misc/BreCalApi.cs b/misc/BreCalApi.cs index a27deda..e9a90a7 100644 --- a/misc/BreCalApi.cs +++ b/misc/BreCalApi.cs @@ -1,7 +1,7 @@ //---------------------- // -// Generated REST API Client Code Generator v1.7.17.0 on 26.07.2023 19:35:38 +// Generated REST API Client Code Generator v1.7.17.0 on 28.07.2023 08:12:12 // Using the tool OpenAPI Generator v6.6.0 // //---------------------- diff --git a/src/BreCalClient/BreCalClient.csproj b/src/BreCalClient/BreCalClient.csproj index 903972e..f430105 100644 --- a/src/BreCalClient/BreCalClient.csproj +++ b/src/BreCalClient/BreCalClient.csproj @@ -8,12 +8,23 @@ + + + + + + + + + + + @@ -34,6 +45,14 @@ OpenApiCodeGenerator BreCalApi.cs + + + + + + + + MSBuild:Compile @@ -44,6 +63,9 @@ + + + diff --git a/src/BreCalClient/MainWindow.xaml.cs b/src/BreCalClient/MainWindow.xaml.cs index 5859a30..13d820b 100644 --- a/src/BreCalClient/MainWindow.xaml.cs +++ b/src/BreCalClient/MainWindow.xaml.cs @@ -156,6 +156,8 @@ namespace BreCalClient ShipcallControl sc = new ShipcallControl(); sc.Height = 80; sc.ShipcallControlModel = scm; + sc.TimesRequested += Sc_TimesRequested; + sc.EditRequested += Sc_EditRequested; this.stackPanel.Children.Add(sc); })); } @@ -172,9 +174,21 @@ namespace BreCalClient } } + private void Sc_EditRequested(ShipcallControl obj) + { + // TODO: get the shipcall from the control and show the edit control + + } + + private void Sc_TimesRequested(ShipcallControl obj) + { + // TODO: get the shipcall, load and show a list of the times + + } + #endregion - + } } diff --git a/src/BreCalClient/Resources/Resources.Designer.cs b/src/BreCalClient/Resources/Resources.Designer.cs index 4a501ea..26afcfe 100644 --- a/src/BreCalClient/Resources/Resources.Designer.cs +++ b/src/BreCalClient/Resources/Resources.Designer.cs @@ -60,6 +60,86 @@ namespace BreCalClient.Resources { } } + /// + /// Looks up a localized resource of type System.Byte[]. + /// + internal static byte[] arrow_down_red { + get { + object obj = ResourceManager.GetObject("arrow_down_red", resourceCulture); + return ((byte[])(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Byte[]. + /// + internal static byte[] arrow_right_blue { + get { + object obj = ResourceManager.GetObject("arrow_right_blue", resourceCulture); + return ((byte[])(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Byte[]. + /// + internal static byte[] arrow_up_green { + get { + object obj = ResourceManager.GetObject("arrow_up_green", resourceCulture); + return ((byte[])(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Byte[]. + /// + internal static byte[] clipboard { + get { + object obj = ResourceManager.GetObject("clipboard", resourceCulture); + return ((byte[])(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Byte[]. + /// + internal static byte[] clock { + get { + object obj = ResourceManager.GetObject("clock", resourceCulture); + return ((byte[])(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Byte[]. + /// + internal static byte[] containership { + get { + object obj = ResourceManager.GetObject("containership", resourceCulture); + return ((byte[])(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Byte[]. + /// + internal static byte[] emergency_stop_button { + get { + object obj = ResourceManager.GetObject("emergency_stop_button", resourceCulture); + return ((byte[])(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Byte[]. + /// + internal static byte[] ship2 { + get { + object obj = ResourceManager.GetObject("ship2", resourceCulture); + return ((byte[])(obj)); + } + } + /// /// Looks up a localized resource of type System.Byte[]. /// @@ -119,5 +199,35 @@ namespace BreCalClient.Resources { return ((byte[])(obj)); } } + + /// + /// Looks up a localized resource of type System.Byte[]. + /// + internal static byte[] umbrella_closed { + get { + object obj = ResourceManager.GetObject("umbrella_closed", resourceCulture); + return ((byte[])(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Byte[]. + /// + internal static byte[] umbrella_open { + get { + object obj = ResourceManager.GetObject("umbrella_open", resourceCulture); + return ((byte[])(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Byte[]. + /// + internal static byte[] worker2 { + get { + object obj = ResourceManager.GetObject("worker2", resourceCulture); + return ((byte[])(obj)); + } + } } } diff --git a/src/BreCalClient/Resources/Resources.resx b/src/BreCalClient/Resources/Resources.resx index 2d8b1ab..bb55b44 100644 --- a/src/BreCalClient/Resources/Resources.resx +++ b/src/BreCalClient/Resources/Resources.resx @@ -118,6 +118,30 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + arrow_down_red.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + arrow_right_blue.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + arrow_up_green.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + clipboard.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + clock.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + containership.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + emergency_stop_button.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ship2.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + trafficlight_green.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -136,4 +160,13 @@ trafficlight_yellow.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + umbrella_closed.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + umbrella_open.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + worker2.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/src/BreCalClient/Resources/arrow_down_red.png b/src/BreCalClient/Resources/arrow_down_red.png new file mode 100644 index 0000000..14046cc Binary files /dev/null and b/src/BreCalClient/Resources/arrow_down_red.png differ diff --git a/src/BreCalClient/Resources/arrow_right_blue.png b/src/BreCalClient/Resources/arrow_right_blue.png new file mode 100644 index 0000000..587903d Binary files /dev/null and b/src/BreCalClient/Resources/arrow_right_blue.png differ diff --git a/src/BreCalClient/Resources/arrow_up_green.png b/src/BreCalClient/Resources/arrow_up_green.png new file mode 100644 index 0000000..524d2cf Binary files /dev/null and b/src/BreCalClient/Resources/arrow_up_green.png differ diff --git a/src/BreCalClient/Resources/clipboard.png b/src/BreCalClient/Resources/clipboard.png new file mode 100644 index 0000000..8c012f1 Binary files /dev/null and b/src/BreCalClient/Resources/clipboard.png differ diff --git a/src/BreCalClient/Resources/clock.png b/src/BreCalClient/Resources/clock.png new file mode 100644 index 0000000..a0868c9 Binary files /dev/null and b/src/BreCalClient/Resources/clock.png differ diff --git a/src/BreCalClient/Resources/containership.png b/src/BreCalClient/Resources/containership.png new file mode 100644 index 0000000..e4c2d42 Binary files /dev/null and b/src/BreCalClient/Resources/containership.png differ diff --git a/src/BreCalClient/Resources/emergency_stop_button.png b/src/BreCalClient/Resources/emergency_stop_button.png new file mode 100644 index 0000000..d5668cc Binary files /dev/null and b/src/BreCalClient/Resources/emergency_stop_button.png differ diff --git a/src/BreCalClient/Resources/ship2.png b/src/BreCalClient/Resources/ship2.png new file mode 100644 index 0000000..fc7c1d3 Binary files /dev/null and b/src/BreCalClient/Resources/ship2.png differ diff --git a/src/BreCalClient/Resources/umbrella_closed.png b/src/BreCalClient/Resources/umbrella_closed.png new file mode 100644 index 0000000..540d592 Binary files /dev/null and b/src/BreCalClient/Resources/umbrella_closed.png differ diff --git a/src/BreCalClient/Resources/umbrella_open.png b/src/BreCalClient/Resources/umbrella_open.png new file mode 100644 index 0000000..954b66e Binary files /dev/null and b/src/BreCalClient/Resources/umbrella_open.png differ diff --git a/src/BreCalClient/Resources/worker2.png b/src/BreCalClient/Resources/worker2.png new file mode 100644 index 0000000..9034044 Binary files /dev/null and b/src/BreCalClient/Resources/worker2.png differ diff --git a/src/BreCalClient/ShipcallControl.xaml b/src/BreCalClient/ShipcallControl.xaml index 236ea2c..292fa2e 100644 --- a/src/BreCalClient/ShipcallControl.xaml +++ b/src/BreCalClient/ShipcallControl.xaml @@ -7,84 +7,100 @@ xmlns:db="clr-namespace:BreCalClient;assembly=BreCalClient" mc:Ignorable="d" d:DesignHeight="100" d:DesignWidth="800" Loaded="UserControl_Loaded"> - - - - - - - - - - - - - - - - - + + + + + + + - - - - + + + + - - + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs index a9b103d..785240f 100644 --- a/src/BreCalClient/ShipcallControl.xaml.cs +++ b/src/BreCalClient/ShipcallControl.xaml.cs @@ -3,19 +3,8 @@ // using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows; using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; namespace BreCalClient { @@ -34,6 +23,14 @@ namespace BreCalClient #endregion + #region events + + public event Action? EditRequested; + + public event Action? TimesRequested; + + #endregion + #region Properties /// @@ -48,6 +45,22 @@ namespace BreCalClient private void UserControl_Loaded(object sender, RoutedEventArgs e) { this.DataContext = this.ShipcallControlModel; + } + + private void buttonListTimes_Click(object sender, RoutedEventArgs e) + { + if(this.TimesRequested != null) + { + this.TimesRequested(this); + } + } + + private void buttonEditShipcall_Click(object sender, RoutedEventArgs e) + { + if (this.EditRequested != null) + { + this.EditRequested(this); + } } #endregion