Versionsänderungen für 1.2.2.3 produktiv

If user enters 10 digits, then these are split up for the date

misc/BreCalApi.cs

@@ -4833,7 +4833,7 @@ namespace BreCalClient.misc.Client
         {
             Proxy = null;
             UserAgent = WebUtility.UrlEncode("OpenAPI-Generator/1.0.0/csharp");
-            BasePath = "https://brecaldevel.bsmd-emswe.eu";
+            BasePath = "https://brecal.bsmd-emswe.eu";
             DefaultHeaders = new ConcurrentDictionary<string, string>();
             ApiKey = new ConcurrentDictionary<string, string>();
             ApiKeyPrefix = new ConcurrentDictionary<string, string>();
@@ -4841,8 +4841,8 @@ namespace BreCalClient.misc.Client
             {
                 {
                     new Dictionary<string, object> {
-                        {"url", "https://brecaldevel.bsmd-emswe.eu"},
-                        {"description", "Development server hosted on vcup"},
+                        {"url", "https://brecal.bsmd-emswe.eu"},
+                        {"description", "Test server hosted on vcup"},
                     }
                 }
             };
@@ -4860,7 +4860,7 @@ namespace BreCalClient.misc.Client
             IDictionary<string, string> defaultHeaders,
             IDictionary<string, string> apiKey,
             IDictionary<string, string> apiKeyPrefix,
-            string basePath = "https://brecaldevel.bsmd-emswe.eu") : this()
+            string basePath = "https://brecal.bsmd-emswe.eu") : this()
         {
             if (string.IsNullOrWhiteSpace(basePath))
                 throw new ArgumentException("The provided basePath is invalid.", "basePath");

misc/BreCalApi.yaml

@@ -14,8 +14,8 @@ info:
     name: Use at your own risk
     url: 'https://www.bsmd.de/license'
 servers:
-  - url: 'https://brecaldevel.bsmd-emswe.eu'
-    description: Development server hosted on vcup
+  - url: 'https://brecal.bsmd-emswe.eu'
+    description: Test server hosted on vcup
 tags:
   - name: user
   - name: shipcall

src/BreCalClient/App.config

@@ -29,16 +29,16 @@
     <applicationSettings>
         <BreCalClient.Properties.Settings>
             <setting name="BG_COLOR" serializeAs="String">
-                <value>#1D751F</value>
+                <value>#203864</value>
             </setting>
             <setting name="APP_TITLE" serializeAs="String">
-                <value>!!Bremen calling Testversion!!</value>
+                <value>Bremen calling</value>
             </setting>
             <setting name="LOGO_IMAGE_URL" serializeAs="String">
                 <value>https://www.textbausteine.net/</value>
             </setting>
             <setting name="API_URL" serializeAs="String">
-                <value>https://brecaldevel.bsmd-emswe.eu</value>
+                <value>https://brecal.bsmd-emswe.eu</value>
             </setting>
         </BreCalClient.Properties.Settings>
     </applicationSettings>

src/BreCalClient/BreCalClient.csproj

@@ -8,12 +8,12 @@
     <SignAssembly>True</SignAssembly>
     <StartupObject>BreCalClient.App</StartupObject>
     <AssemblyOriginatorKeyFile>..\..\misc\brecal.snk</AssemblyOriginatorKeyFile>
-    <AssemblyVersion>1.3.0.0</AssemblyVersion>
-    <FileVersion>1.3.0.0</FileVersion>
+    <AssemblyVersion>1.2.2.3</AssemblyVersion>
+    <FileVersion>1.2.2.3</FileVersion>
     <Title>Bremen calling client</Title>
     <Description>A Windows WPF client for the Bremen calling API.</Description>
     <ApplicationIcon>containership.ico</ApplicationIcon>
-    <AssemblyName>BreCalDevelClient</AssemblyName>
+    <AssemblyName>BreCalClient</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>

src/BreCalClient/DateTimePickerExt.cs

@@ -9,36 +9,33 @@ namespace BreCalClient
         protected override void OnPreviewTextInput(TextCompositionEventArgs e)
         {
             base.OnPreviewTextInput(e);
-                        
-            // Die vom Agenten "vorgeschlagene" Zeit könnte auch der Watermark sein?
-
-            string text = this.Text + e.Text;
             if (this.Template.FindName("PART_TextBox", this) is not WatermarkTextBox tb) return;
 
-            if (Regex.IsMatch(text, @"^\d{3}"))
+            // strip input after caret
+            string subText = (tb.CaretIndex > 0) ? this.Text[..tb.CaretIndex] : tb.Text; // Range operator instead of Substring(0, tb.CaretIndex)
+            string text = subText + e.Text;
+            
+            // System.Diagnostics.Debug.WriteLine("C:" + this.Text + " E: " + e.Text + " Caret: " + tb.CaretIndex + " Subt: " + subText);
+
+            // 10 char eingabe "am Stück"
+            if (Regex.IsMatch(text, @"^\d{10}"))
             {
                 e.Handled = true;
-                tb.Text = Regex.Replace(text, @"(\d{2})(\d)", "$1.$2");
+                tb.Text = Regex.Replace(text, @"(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})", "$1.$2.20$3 $4:$5");
                 tb.CaretIndex = tb.Text.Length;
+                tb.SelectedText = "";
             }
-            else if (Regex.IsMatch(text, @"^(\d{2}\.\d{3})"))
+
+            // nur die Zeit wird markiert und mit 4 Zahlen befüllt, diese Regel setzt den Doppelpunkt
+            else if (Regex.IsMatch(text, @"^(\d{2}\.\d{2}\. \d{4}  \d{3})"))
             {
                 e.Handled = true;
-                tb.Text = Regex.Replace(text, @"^(\d{2}\.\d{2})(\d)", "$1.$2");
-                tb.CaretIndex = tb.Text.Length;
-            }
-            else if (Regex.IsMatch(text, @"^(\d{2}\.\d{2}\.\d{2} \d{3})"))
-            {
-                e.Handled = true;
-                tb.Text = Regex.Replace(text, @"(\d{2}\.\d{2}\.\d{2} \d{2})(\d)", "$1:$2");
-                tb.CaretIndex = tb.Text.Length;
-            }
-            else if (Regex.IsMatch(text, @"^(\d{2}\.\d{2}\.\d{4} \d{3})"))
-            {
-                e.Handled = true;
-                tb.Text = Regex.Replace(text, @"(\d{2}\.\d{2}\.\d{4} \d{2})(\d)", "$1:$2");
+                tb.Text = Regex.Replace(text, @"(\d{2}\.\d{2}\. \d{4}  \d{2})(\d)(.*)", "$1:$2");
+                // System.Diagnostics.Trace.WriteLine("Replaced: " + tb.Text);
                 tb.CaretIndex = tb.Text.Length;
+                tb.Select(tb.Text.Length, 0);
             }
+
         }
     }
 }

src/BreCalClient/EditTimesAgencyOutgoingControl.xaml

@@ -45,7 +45,7 @@
                 <ColumnDefinition Width=".5*" />
                 <ColumnDefinition Width=".5*" />
             </Grid.ColumnDefinitions>
-            <local:DateTimePickerExt x:Name="datePickerETD" Grid.Column="0" Grid.Row="0" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETD_ValueChanged" PreviewKeyUp="datePickerETD_PreviewKeyUp" PreviewTextInput="datePickerETD_PreviewTextInput"/>
+            <local:DateTimePickerExt x:Name="datePickerETD" Grid.Column="0" Grid.Row="0" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETD_ValueChanged" AllowTextInput="True" />
             <local:DateTimePickerExt x:Name="datePickerETD_End" Grid.Column="1" Grid.Row="0" Margin="2" Format="Custom" FormatString="dd.MM. yyyy  HH:mm" ValueChanged="datePickerETD_ValueChanged"/>
         </Grid>
         <Label Content="{x:Static p:Resources.textBerth}" Grid.Column="0" Grid.Row="2" HorizontalContentAlignment="Right" FontWeight="Bold"/>

src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs

@@ -348,46 +348,5 @@ namespace BreCalClient
 
         #endregion        
         
-        private void datePickerETD_PreviewKeyUp(object sender, System.Windows.Input.KeyEventArgs e)
-        {
-
-        }
-
-        private void datePickerETD_PreviewTextInput(object sender, System.Windows.Input.TextCompositionEventArgs e)
-        {
-            DateTimePicker? dp = (sender as DateTimePicker);
-            if(dp == null) return;
-            
-            // Das ist der richtige Ansatz, funktioniert aber bei der Jahresangabe noch nicht ganz richtig.
-            // Die vom Agenten "vorgeschlagene" Zeit könnte auch der Watermark sein?
-
-            string text = dp.Text + e.Text;
-            if (dp.Template.FindName("PART_TextBox", dp) is not WatermarkTextBox tb) return;
-
-            if (Regex.IsMatch(text, @"^\d{3}"))
-            {
-                e.Handled = true;                                
-                tb.Text = Regex.Replace(text, @"(\d{2})(\d)", "$1.$2");
-                tb.CaretIndex = tb.Text.Length;
-            }
-            else if (Regex.IsMatch(text, @"^(\d{2}\.\d{3})"))
-            {
-                e.Handled = true;                
-                tb.Text = Regex.Replace(text, @"^(\d{2}\.\d{2})(\d)", "$1.$2");
-                tb.CaretIndex = tb.Text.Length;
-            }
-            else if (Regex.IsMatch(text, @"^(\d{2}\.\d{2}\.\d{2} \d{3})"))
-            {
-                e.Handled = true;
-                tb.Text = Regex.Replace(text, @"(\d{2}\.\d{2}\.\d{2} \d{2})(\d)", "$1:$2");
-                tb.CaretIndex = tb.Text.Length;
-            }
-            else if (Regex.IsMatch(text, @"^(\d{2}\.\d{2}\.\d{4} \d{3})"))
-            {
-                e.Handled = true;
-                tb.Text = Regex.Replace(text, @"(\d{2}\.\d{2}\.\d{4} \d{2})(\d)", "$1:$2");
-                tb.CaretIndex = tb.Text.Length;
-            }
-        }
     }
 }

src/BreCalClient/EditTimesControl.xaml.cs

@@ -7,6 +7,7 @@ using BreCalClient.misc.Model;
 using System;
 using System.Windows;
 using System.Windows.Media.Imaging;
+using Xceed.Wpf.Toolkit;
 
 namespace BreCalClient
 {
@@ -29,6 +30,8 @@ namespace BreCalClient
 
         public Times Times { get; set; } = new();
 
+        public Times? AgencyTimes { get; set; } = new();
+
         public ShipcallControlModel ShipcallModel { get; set; } = new();
 
         #endregion
@@ -37,8 +40,8 @@ namespace BreCalClient
 
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {                        
-            this.CopyToControls();
             this.EnableControls();
+            this.CopyToControls();
         }
 
         private void buttonOK_Click(object sender, RoutedEventArgs e)
@@ -93,13 +96,35 @@ namespace BreCalClient
         {
             this.textBoxRemarks.Text = this.Times.Remarks;
             this.datePickerETABerth.Value = this.Times.EtaBerth;
+            if(this.datePickerETABerth.IsEnabled && (this.Times.EtaBerth == null) && (this.AgencyTimes?.EtaBerth != null) && (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival))
+            {
+                this.datePickerETABerth.Value = this.AgencyTimes.EtaBerth;
+                if (this.datePickerETABerth.Template.FindName("PART_TextBox", this.datePickerETABerth) is WatermarkTextBox tb) { tb.Focus(); tb.SelectAll(); }
+            }
             this.datePickerETDBerth.Value = this.Times.EtdBerth;
+            if(this.datePickerETDBerth.IsEnabled && (this.Times.EtdBerth == null) && (this.AgencyTimes?.EtdBerth != null) && ((ShipcallModel.Shipcall?.Type == ShipcallType.Departure) || (ShipcallModel.Shipcall?.Type == ShipcallType.Shifting)))
+            {
+                this.datePickerETDBerth.Value = this.AgencyTimes.EtdBerth;
+                if (this.datePickerETDBerth.Template.FindName("PART_TextBox", this.datePickerETDBerth) is WatermarkTextBox tb) { tb.Focus(); tb.SelectAll(); }
+            }
+
             this.datePickerLockTime.Value = this.Times.LockTime;
             this.datePickerZoneEntry.Value = this.Times.ZoneEntry;
             this.datePickerATA.Value = this.Times.Ata;
             this.datePickerATD.Value = this.Times.Atd;
             this.datePickerETABerth_End.Value = this.Times.EtaIntervalEnd;
+            if (this.datePickerETABerth_End.IsEnabled && (this.Times.EtaIntervalEnd == null) && (this.Times.EtaBerth == null) && (this.AgencyTimes?.EtaIntervalEnd != null) && (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival))
+            {
+                this.datePickerETABerth_End.Value = this.AgencyTimes.EtaIntervalEnd;
+                //if (this.datePickerETABerth_End.Template.FindName("PART_TextBox", this.datePickerETABerth_End) is WatermarkTextBox tb) { tb.Focus(); tb.SelectAll(); }
+            }
+
             this.datePickerETDBerth_End.Value = this.Times.EtdIntervalEnd;
+            if (this.datePickerETDBerth_End.IsEnabled && (this.Times.EtdIntervalEnd == null) && (this.Times.EtdBerth == null) && (this.AgencyTimes?.EtdIntervalEnd != null) && ((ShipcallModel.Shipcall?.Type == ShipcallType.Departure) || (ShipcallModel.Shipcall?.Type == ShipcallType.Shifting)))
+            {
+                this.datePickerETDBerth_End.Value = this.AgencyTimes.EtdIntervalEnd;
+                //if (this.datePickerETDBerth_End.Template.FindName("PART_TextBox", this.datePickerETDBerth_End) is WatermarkTextBox tb) { tb.Focus(); tb.SelectAll(); }
+            }
 
             this.labelETA.Content = string.Format("ETA {0}", BreCalLists.TimeRefs[this.ShipcallModel.Shipcall?.TimeRefPoint ?? 0]);
             this.labelETD.Content = string.Format("ETD {0}", BreCalLists.TimeRefs[this.ShipcallModel.Shipcall?.TimeRefPoint ?? 0]);

src/BreCalClient/Extensions.cs

@@ -98,7 +98,7 @@ namespace BreCalClient
                     if(times.OperationsStart.HasValue)
                     {
                         string result = times.OperationsStart.Value.ToString("dd.MM.yyyy HH:mm");
-                        if (times.EtaIntervalEnd.HasValue) result += " - " + times.EtaIntervalEnd.Value.ToString("HH:mm");
+                        if (times.EtaIntervalEnd.HasValue) result = times.OperationsStart.Value.ToString("d.M. HH:mm") + " - " + times.EtaIntervalEnd.Value.ToString("d.M. HH:mm");
                         return result;
                     }
                     else
@@ -111,7 +111,7 @@ namespace BreCalClient
                     if(times.EtaBerth.HasValue)
                     {
                         string result = times.EtaBerth.Value.ToString("dd.MM.yyyy HH:mm");
-                        if (times.EtaIntervalEnd.HasValue) result += " - " + times.EtaIntervalEnd.Value.ToString("HH:mm");
+                        if (times.EtaIntervalEnd.HasValue) result = times.EtaBerth.Value.ToString("d.M. HH:mm") + " - " + times.EtaIntervalEnd.Value.ToString("d.M. HH:mm");
                         return result;
                     }
                     else
@@ -127,7 +127,7 @@ namespace BreCalClient
                     if(times.OperationsEnd.HasValue)
                     {
                         string result = times.OperationsEnd.Value.ToString("dd.MM.yyyy HH:mm");
-                        if (times.EtdIntervalEnd.HasValue) result += " - " + times.EtdIntervalEnd.Value.ToString("HH:mm");
+                        if (times.EtdIntervalEnd.HasValue) result = times.OperationsEnd.Value.ToString("d.M. HH:mm") + " - " + times.EtdIntervalEnd.Value.ToString("d.M. HH:mm");
                         return result;
                     }
                     else
@@ -140,7 +140,7 @@ namespace BreCalClient
                     if(times.EtdBerth.HasValue)
                     {
                         string result = times.EtdBerth.Value.ToString("dd.MM.yyyy HH:mm");
-                        if (times.EtdIntervalEnd.HasValue) result += " - " + times.EtdIntervalEnd.Value.ToString("HH:mm");
+                        if (times.EtdIntervalEnd.HasValue) result = times.EtdBerth.Value.ToString("d.M. HH:mm") + " - " + times.EtdIntervalEnd.Value.ToString("d.M. HH:mm");
                         return result;
                     }
                     else

src/BreCalClient/MainWindow.xaml.cs

@@ -707,7 +707,7 @@ namespace BreCalClient
                 _ = this._visibleControlModels.RemoveAll(x =>
                 {
                     Times? t = x.GetTimesForParticipantType(ParticipantType.AGENCY);
-                    DateTime refValue = sfm.EtaTo.Value.AddMinutes(1439); // 23:59
+                    DateTime refValue = sfm.EtaTo.Value.AddMinutes(1440); // including 23:59
                     switch (x.Shipcall?.Type)
                     {
                         case ShipcallType.Arrival:
@@ -745,7 +745,34 @@ namespace BreCalClient
                 _ = this._visibleControlModels.RemoveAll(x => x.Shipcall?.Canceled ?? false);
             }
 
-            switch(this._sortOrder)
+            // special Basti case: Wenn das ATA / ATD eingetragen ist und schon 2 Stunden in der Vergangenheit liegt
+            if (searchPastDays <= 3)
+            {
+                _ = this._visibleControlModels.RemoveAll(x =>
+                {
+                    Times? mooringTimes = x.GetTimesForParticipantType(ParticipantType.MOORING);
+                    if (mooringTimes != null)
+                    {
+                        switch (x.Shipcall?.Type)
+                        {
+                            case ShipcallType.Arrival:
+                                if (mooringTimes.Ata.HasValue && ((DateTime.Now - mooringTimes.Ata.Value).TotalHours > 2))
+                                    return true;
+                                break;
+
+                            default:
+                                if (mooringTimes.Atd.HasValue && ((DateTime.Now - mooringTimes.Atd.Value).TotalHours > 2))
+                                    return true;
+                                break;
+                        }
+                    }
+
+                    return false;
+                });
+            }
+
+
+                switch (this._sortOrder)
             {
                 case Extensions.SortOrder.SHIP_NAME:
                     this._visibleControlModels.Sort((x, y) => { if (x.Ship == null) return 0; if (y.Ship == null) return 0; return x.Ship.Name.CompareTo(y.Ship.Name); });
@@ -854,10 +881,14 @@ namespace BreCalClient
             if( obj.ShipcallControlModel == null) { return; }
             if (!obj.ShipcallControlModel.AssignedParticipants.ContainsKey(participantType)) return; // no assigment means no dialog my friend
 
+            Times? agencyTimes = obj.ShipcallControlModel.GetTimesForParticipantType(ParticipantType.AGENCY);
+
             // show a dialog that lets the user create / update times for the given shipcall
             IEditTimesControl etc = (participantType == ParticipantType.TERMINAL) ? new EditTimesTerminalControl() : new EditTimesControl();
             etc.Title = obj.ShipcallControlModel.Title;
             etc.ShipcallModel = obj.ShipcallControlModel;
+            if (etc is EditTimesControl control)
+                control.AgencyTimes = agencyTimes;
 
             bool wasEdit = false;
             if (times != null)

src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml

@@ -4,8 +4,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
   <PropertyGroup>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>6.0</ApplicationVersion>
+    <ApplicationRevision>3</ApplicationRevision>
+    <ApplicationVersion>1.2.2.3</ApplicationVersion>
     <BootstrapperEnabled>False</BootstrapperEnabled>
     <Configuration>Release</Configuration>
     <CreateWebPageOnPublish>True</CreateWebPageOnPublish>

src/BreCalClient/Properties/PublishProfiles/ClickOnceTestProfile.pubxml

@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.3.0.0</ApplicationVersion>
+    <ApplicationVersion>1.2.2.3</ApplicationVersion>
     <BootstrapperEnabled>True</BootstrapperEnabled>
     <Configuration>Debug</Configuration>
     <CreateDesktopShortcut>True</CreateDesktopShortcut>

src/BreCalClient/Properties/Settings.Designer.cs

@@ -25,7 +25,7 @@ namespace BreCalClient.Properties {
 
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("#1D751F")]
+        [global::System.Configuration.DefaultSettingValueAttribute("#203864")]
         public string BG_COLOR {
             get {
                 return ((string)(this["BG_COLOR"]));
@@ -64,7 +64,7 @@ namespace BreCalClient.Properties {
 
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("https://brecaldevel.bsmd-emswe.eu")]
+        [global::System.Configuration.DefaultSettingValueAttribute("https://brecal.bsmd-emswe.eu")]
         public string API_URL {
             get {
                 return ((string)(this["API_URL"]));

src/BreCalClient/Properties/Settings.settings

@@ -3,7 +3,7 @@
   <Profiles />
   <Settings>
     <Setting Name="BG_COLOR" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">#1D751F</Value>
+      <Value Profile="(Default)">#203864</Value>
     </Setting>
     <Setting Name="APP_TITLE" Type="System.String" Scope="Application">
       <Value Profile="(Default)">!!Bremen calling Testversion!!</Value>
@@ -15,7 +15,7 @@
       <Value Profile="(Default)" />
     </Setting>
     <Setting Name="API_URL" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">https://brecaldevel.bsmd-emswe.eu</Value>
+      <Value Profile="(Default)">https://brecal.tbsmd-emswe.eu</Value>
     </Setting>
     <Setting Name="Width" Type="System.Double" Scope="User">
       <Value Profile="(Default)">800</Value>

src/BreCalClient/SearchFilterControl.xaml

@@ -8,7 +8,7 @@
              xmlns:api="clr-namespace:BreCalClient.misc.Model"
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
              mc:Ignorable="d" 
-             d:DesignHeight="56" d:DesignWidth="800" Loaded="UserControl_Loaded">
+             d:DesignHeight="56" d:DesignWidth="800">
     <UserControl.Resources>
         <local:EnumToStringConverter x:Key="enumToStringConverter" />
     </UserControl.Resources>

src/BreCalClient/SearchFilterControl.xaml.cs

@@ -130,20 +130,15 @@ namespace BreCalClient
             LogoImageClicked?.Invoke();
         }
 
-        private void UserControl_Loaded(object sender, System.Windows.RoutedEventArgs e)
-        {
-            
-        }        
-
         private void datePickerETAFrom_SelectedDateChanged(object sender, SelectionChangedEventArgs e)
         {
-            this._model.EtaFrom = this.datePickerETAFrom.SelectedDate;
+            this._model.EtaFrom = this.datePickerETAFrom.SelectedDate?.Date;
             SearchFilterChanged?.Invoke();
         }
 
         private void datePickerETATo_SelectedDateChanged(object sender, SelectionChangedEventArgs e)
         {
-            this._model.EtaTo = datePickerETATo.SelectedDate;
+            this._model.EtaTo = datePickerETATo.SelectedDate?.Date;
             SearchFilterChanged?.Invoke();
         }
 

src/BreCalClient/ShipcallControl.xaml

@@ -5,7 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"              
              xmlns:p = "clr-namespace:BreCalClient.Resources"
              xmlns:sets="clr-namespace:BreCalClient.Properties"
-             xmlns:db="clr-namespace:BreCalClient;assembly=BreCalDevelClient"             
+             xmlns:db="clr-namespace:BreCalClient;assembly=BreCalClient"             
              mc:Ignorable="d" 
              d:DesignHeight="135" d:DesignWidth="800">
     <Border BorderBrush="LightGray" Margin="1" BorderThickness="1">

src/BreCalClient/ShipcallControl.xaml.cs

@@ -214,13 +214,13 @@ namespace BreCalClient
                     switch (this.ShipcallControlModel?.Shipcall?.Type)
                     {
                         case ShipcallType.Arrival: // incoming
-                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/arrow_down_red.png"));
+                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalClient;component/Resources/arrow_down_red.png"));
                             break;
                         case ShipcallType.Departure: // outgoing
-                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/arrow_up_blue.png"));
+                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalClient;component/Resources/arrow_up_blue.png"));
                             break;
                         case ShipcallType.Shifting: // shifting
-                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/arrow_right_green.png"));
+                            this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalClient;component/Resources/arrow_right_green.png"));
                             break;
                         default:
                             break;
@@ -229,13 +229,13 @@ namespace BreCalClient
                     switch(this.ShipcallControlModel?.LightMode)
                     {
                         case EvaluationType.Green:
-                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/check.png"));
+                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalClient;component/Resources/check.png"));
                             break;
                         case EvaluationType.Yellow:
-                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/sign_warning.png"));
+                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalClient;component/Resources/sign_warning.png"));
                             break;
                         case EvaluationType.Red:
-                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/delete2.png"));
+                            this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalClient;component/Resources/delete2.png"));
                             break;
                         default:
                             break;

src/RoleEditor/App.config

@@ -8,7 +8,7 @@
     <applicationSettings>
         <RoleEditor.Properties.Settings>
             <setting name="ConnectionString" serializeAs="String">
-                <value>Server=localhost;User ID=ds;Password=HalloWach_2323XXL!!;Database=bremen_calling_devel;Port=33306</value>
+                <value>Server=localhost;User ID=ds;Password=HalloWach_2323XXL!!;Database=bremen_calling_test;Port=33306</value>
             </setting>
         </RoleEditor.Properties.Settings>
     </applicationSettings>

src/Setup/Setup.vdproj

@@ -43,6 +43,22 @@
         "PrivateKeyFile" = "8:"
         "TimeStampServer" = "8:"
         "InstallerBootstrapper" = "3:2"
+            "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
+            {
+            "Enabled" = "11:TRUE"
+            "PromptEnabled" = "11:TRUE"
+            "PrerequisitesLocation" = "2:1"
+            "Url" = "8:"
+            "ComponentsUrl" = "8:"
+                "Items"
+                {
+                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.7.2"
+                    {
+                    "Name" = "8:Microsoft .NET Framework 4.7.2 (x86 and x64)"
+                    "ProductCode" = "8:.NETFramework,Version=v4.7.2"
+                    }
+                }
+            }
         }
         "Release"
         {
@@ -59,6 +75,22 @@
         "PrivateKeyFile" = "8:"
         "TimeStampServer" = "8:"
         "InstallerBootstrapper" = "3:2"
+            "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
+            {
+            "Enabled" = "11:TRUE"
+            "PromptEnabled" = "11:TRUE"
+            "PrerequisitesLocation" = "2:1"
+            "Url" = "8:"
+            "ComponentsUrl" = "8:"
+                "Items"
+                {
+                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.7.2"
+                    {
+                    "Name" = "8:Microsoft .NET Framework 4.7.2 (x86 and x64)"
+                    "ProductCode" = "8:.NETFramework,Version=v4.7.2"
+                    }
+                }
+            }
         }
     }
     "Deployable"
@@ -166,9 +198,9 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Bremen calling"
-        "ProductCode" = "8:{6EF71F76-3E55-483B-A032-4B29FDAFE6A4}"
+        "ProductCode" = "8:{0ED342DD-DC00-4CE4-8348-96BB3AB726B1}"
         "PackageCode" = "8:{8E55F30F-A9C8-41E9-BCE8-431770A951ED}"
-        "UpgradeCode" = "8:{1C7FA3E4-BAB9-4911-9348-73094357FC7C}"
+        "UpgradeCode" = "8:{81A329F1-C663-48DA-9E15-DAF19F99B5AE}"
         "AspNetVersion" = "8:"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
@@ -716,7 +748,7 @@
         {
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_3E48B6E716164CC1826E094025517B3F"
             {
-            "SourcePath" = "8:..\\BreCalClient\\obj\\Release\\net6.0-windows\\apphost.exe"
+            "SourcePath" = "8:..\\BreCalClient\\obj\\Debug\\net6.0-windows\\apphost.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_7C8F7547CED64B3CAE7D0296A8BCE23F"

src/server/BreCal/__init__.py

@@ -62,7 +62,7 @@ def create_app(test_config=None):
     app.register_blueprint(user.bp)
     app.register_blueprint(history.bp)
 
-    logging.basicConfig(filename='brecaldevel.log', level=logging.DEBUG, format='%(asctime)s | %(name)s | %(levelname)s | %(message)s')
+    logging.basicConfig(filename='brecal.log', level=logging.DEBUG, format='%(asctime)s | %(name)s | %(levelname)s | %(message)s')
     local_db.initPool(os.path.dirname(app.instance_path))
     logging.info('App started')
 

src/server/BreCal/local_db.py

@@ -11,7 +11,7 @@ def initPool(instancePath):
     try:
         global config_path
         if(config_path == None):
-            config_path = os.path.join(instancePath,'../../../secure/connection_data_devel.json');
+            config_path = os.path.join(instancePath,'../../../secure/connection_data_prod.json');
 
         print (config_path)
 

src/server/flaskapp.wsgi

@@ -2,7 +2,7 @@ import os
 import sys
 import logging
 
-sys.path.insert(0, '/var/www/brecal_devel/src/server')
+sys.path.insert(0, '/var/www/brecal/src/server')
 sys.path.insert(0, '/var/www/venv/lib/python3.10/site-packages/')
 
 import schedule

src/server/setup.py

@@ -2,7 +2,7 @@ from setuptools import find_packages, setup
 
 setup(
     name='BreCal',
-    version='1.3.0',
+    version='1.2.2',
     packages=find_packages(),
     include_package_data=True,
     zip_safe=False,