From c1b7bce38647df4cb190d75a2f2c82927735f812 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Wed, 2 Aug 2023 09:10:13 +0200
Subject: [PATCH] Korrekturen nach Feedback 7.13.0.1

---
 ENI2/App.config                               |  9 ++++---
 ENI2/Controls/ServerStatusControl.xaml        |  4 ---
 ENI2/Controls/ServerStatusControl.xaml.cs     | 26 ++++++++++---------
 .../PortNotificationDetailControl.xaml        | 11 ++++----
 .../PortNotificationDetailControl.xaml.cs     |  3 ++-
 ENI2/ENI2.csproj                              |  2 +-
 ENI2/Properties/Settings.Designer.cs          |  4 +--
 ENI2/Properties/Settings.settings             |  2 +-
 bsmd.LockingService/LockingService.svc.cs     | 18 ++++++-------
 .../Properties/Settings.Designer.cs           |  2 +-
 .../Properties/Settings.settings              |  2 +-
 bsmd.LockingService/Web.config                |  2 +-
 bsmd.database/INFO.cs                         |  2 +-
 13 files changed, 45 insertions(+), 42 deletions(-)

diff --git a/ENI2/App.config b/ENI2/App.config
index 6105b6f2..c4795a17 100644
--- a/ENI2/App.config
+++ b/ENI2/App.config
@@ -26,17 +26,20 @@
                 <value>1000</value>
             </setting>
             <setting name="LockingServerAddress" serializeAs="String">
-				<value>http://192.168.2.24/LockingService/LockingService.svc</value>				
+                <value>http://192.168.2.24/LockingService/LockingService.svc</value>
+            </setting>
+            <setting name="ReportAuthor" serializeAs="String">
+                <value>BSMD ReportGenerator</value>
             </setting>
             <setting name="ConnectionString" serializeAs="String">
-				<value>Initial Catalog=nswtest;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value>				
+                <value>Initial Catalog=nswtest;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value>
             </setting>
         </ENI2.Properties.Settings>
     </applicationSettings>
     <userSettings>
         <ENI2.Properties.Settings>
             <setting name="MainWindowPlacement" serializeAs="String">
-                <value/>
+                <value />
             </setting>
         </ENI2.Properties.Settings>
     </userSettings>
diff --git a/ENI2/Controls/ServerStatusControl.xaml b/ENI2/Controls/ServerStatusControl.xaml
index 638b19db..def37caa 100644
--- a/ENI2/Controls/ServerStatusControl.xaml
+++ b/ENI2/Controls/ServerStatusControl.xaml
@@ -16,12 +16,8 @@
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
             <StackPanel Grid.Row="0" Orientation="Horizontal">
-                <Label Content="Excel:" />
-                <Label Name="labelStatusExcel" Content="?" FontWeight="Bold" />
                 <Label Content="Transmitter:" />
                 <Label Name="labelStatusTransmitter" Content="?" FontWeight="Bold" />
-                <Label Content="Report:" />
-                <Label Name="labelStatusReport" Content="?" FontWeight="Bold" />
                 <Button Name="refreshButton" Content="{x:Static p:Resources.textRefresh}" Margin="4" Background="Transparent" Click="refreshButton_Click"/>
             </StackPanel>
             <local:ENIDataGrid Grid.Row="1"
diff --git a/ENI2/Controls/ServerStatusControl.xaml.cs b/ENI2/Controls/ServerStatusControl.xaml.cs
index 816dc43b..00e11159 100644
--- a/ENI2/Controls/ServerStatusControl.xaml.cs
+++ b/ENI2/Controls/ServerStatusControl.xaml.cs
@@ -28,17 +28,17 @@ namespace ENI2.Controls
         private ProgressBar _updateProgressBar;
         private TextBlock _updateTextBlock;
         private bool _isUpdating = false;
+        private readonly static Dictionary<Guid, string> coreIdVisitIdMap = new Dictionary<Guid, string>();
 
         public ServerStatusControl()
         {
             InitializeComponent();
             this.dataGridStatus.ItemsSource = this.entries;
             this.Loaded += ServerStatusControl_Loaded;
-            
         }
 
         private void ServerStatusControl_Loaded(object sender, System.Windows.RoutedEventArgs e)
-        {            
+        {
             this.refreshButton_Click(null, null);
         }
 
@@ -106,12 +106,6 @@ namespace ENI2.Controls
             {
 
                 // Enumeration parsen und text ausgeben
-                ServiceControllerStatus excel = (ServiceControllerStatus)serverStatus.Excel;
-                this.labelStatusExcel.Content = excel.ToString();
-
-                ServiceControllerStatus report = (ServiceControllerStatus)serverStatus.Report;
-                this.labelStatusReport.Content = report.ToString();
-
                 ServiceControllerStatus transmitter = (ServiceControllerStatus)serverStatus.Transmitter;
                 this.labelStatusTransmitter.Content = transmitter.ToString();
 
@@ -152,15 +146,23 @@ namespace ENI2.Controls
 
                         string guidString = m.Groups[2].Value;
 
+                        string idString = "";
                         if (!guidIdDict.ContainsKey(guidString))
                         {
-                            string idString = "";
                             if (Guid.TryParse(m.Groups[2].Value, out Guid coreId))
                             {
-                                MessageCore aCore = DBManager.Instance.GetMessageCoreById(coreId);
-                                if (aCore != null)
+                                if (!coreIdVisitIdMap.ContainsKey(coreId))
                                 {
-                                    idString = aCore.DisplayId;
+                                    MessageCore aCore = DBManager.Instance.GetMessageCoreById(coreId);
+                                    if (aCore != null)
+                                    {
+                                        coreIdVisitIdMap[coreId] = aCore.DisplayId;
+                                        idString = aCore.DisplayId;
+                                    }
+                                }
+                                else
+                                {
+                                    idString = coreIdVisitIdMap[coreId];
                                 }
                             }
                             guidIdDict[guidString] = idString;
diff --git a/ENI2/DetailViewControls/PortNotificationDetailControl.xaml b/ENI2/DetailViewControls/PortNotificationDetailControl.xaml
index 634feb3f..f6aee911 100644
--- a/ENI2/DetailViewControls/PortNotificationDetailControl.xaml
+++ b/ENI2/DetailViewControls/PortNotificationDetailControl.xaml
@@ -66,10 +66,10 @@
                         <Label HorizontalContentAlignment="Right" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textSternThrusterPower}" Name="label_INFOSternThrusterPower" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
                         <Label HorizontalContentAlignment="Right" Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textFumigatedBulkCargo}" Name="label_INFOFumigatedBulkCargo" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
                         <Label HorizontalContentAlignment="Right" Grid.Row="6" Grid.Column="0" Content="{x:Static p:Resources.textDeplacementSummerDraught}" Name="label_INFODeplacementSummerDraught" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
-                        <Label HorizontalContentAlignment="Right" Grid.Row="2" Grid.Column="2" Content="{x:Static p:Resources.textSpecialRequirementsOfShipAtBerth}" Name="label_INFOSpecialRequirements" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
-                        <Label HorizontalContentAlignment="Right" Grid.Row="4" Grid.Column="2" Content="{x:Static p:Resources.textConstructionCharacteristics}" Name="label_INFOConstructionCharacteristics" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
+                        <Label HorizontalContentAlignment="Right" Grid.Row="4" Grid.Column="2" Content="{x:Static p:Resources.textSpecialRequirementsOfShipAtBerth}" Name="label_INFOSpecialRequirements" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
+                        <Label HorizontalContentAlignment="Right" Grid.Row="6" Grid.Column="2" Content="{x:Static p:Resources.textConstructionCharacteristics}" Name="label_INFOConstructionCharacteristics" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
                         <ComboBox Grid.Row="0" Grid.Column="1" x:Name="comboBoxShippingArea" Margin="2" SelectedIndex="{Binding ShippingArea, Converter={util:ByteConverter}}" ContextMenu="{DynamicResource ClearContextMenu}" />
-                        <ComboBox Grid.Row="0" Grid.Column="3" x:Name="comboBoxGroup" Margin="0,2,4,2" ItemsSource="{StaticResource arrList}" DisplayMemberPath="Key" SelectedValuePath="Value" SelectionChanged="comboBoxGroup_SelectionChanged"/>
+                        <ComboBox Grid.Row="0" Grid.Column="3" x:Name="comboBoxGroup" Margin="2,2,4,2" ItemsSource="{StaticResource arrList}" DisplayMemberPath="Key" SelectedValuePath="Value" SelectionChanged="comboBoxGroup_SelectionChanged"/>
                         <ComboBox Grid.Row="1" Grid.Column="1" Name="comboBoxPortArea" Margin="2" SelectedValue="{Binding PortArea}" SelectedValuePath="Key" DisplayMemberPath="Value" ContextMenu="{DynamicResource ClearContextMenu}" />
                         <Grid Grid.Row="1" Grid.Column="3">
                             <Grid.ColumnDefinitions>
@@ -88,8 +88,9 @@
                         <TextBox Grid.Row="4" Grid.Column="1" Name="textSternThrusterPower" Margin="2" Text="{Binding SternThrusterPower, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
                         <CheckBox Grid.Row="5" Grid.Column="1" Name="checkBoxFumigatedBulkCargo" VerticalContentAlignment="Center" IsChecked="{Binding FumigatedBulkCargoBool, Mode=TwoWay}" Margin="2"/>
                         <xctk:DoubleUpDown Grid.Row="6" Grid.Column="1" Name="doubleUpDownDisplacementSummerDraught" ShowButtonSpinner="False" ParsingNumberStyle="Any" Value="{Binding DeplacementSummerDraught_TNE}" Margin="4,2,0,2" FormatString="N1" TextAlignment="Left"/>
-                        <TextBox Grid.Row="2" Grid.Column="3" Grid.RowSpan="2" Name="textSpecialRequirements" Margin="2" Text="{Binding SpecialRequirementsOfShipAtBerth, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
-                        <TextBox Grid.Row="4" Grid.Column="3" Grid.RowSpan="2" Name="textConstructionCharacteristics" Margin="2" Text="{Binding ConstructionCharacteristicsOfShip, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
+                        <TextBlock Grid.Row="2" Grid.Column="3" Grid.RowSpan="2" Name="textBlockPortAreaRemarks"  Text="-" TextWrapping="WrapWithOverflow" Height="52" VerticalAlignment="Center" Margin="2" />
+                        <TextBox Grid.Row="4" Grid.Column="3" Grid.RowSpan="2" Name="textSpecialRequirements" Margin="2" Text="{Binding SpecialRequirementsOfShipAtBerth, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Top" />
+                        <TextBox Grid.Row="6" Grid.Column="3" Grid.RowSpan="1" Name="textConstructionCharacteristics" Margin="2" Text="{Binding ConstructionCharacteristicsOfShip, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
                     </Grid>
                 </GroupBox>
                 <GroupBox Name="servGroupBox" Header="{x:Static p:Resources.textServ}" Grid.Row="2">
diff --git a/ENI2/DetailViewControls/PortNotificationDetailControl.xaml.cs b/ENI2/DetailViewControls/PortNotificationDetailControl.xaml.cs
index 4367f7ef..bc1ae6c4 100644
--- a/ENI2/DetailViewControls/PortNotificationDetailControl.xaml.cs
+++ b/ENI2/DetailViewControls/PortNotificationDetailControl.xaml.cs
@@ -490,7 +490,8 @@ namespace ENI2.DetailViewControls
             if (this.comboBoxPortAreaHelper.SelectedItem != null)
             {
                 PortAreaInfo pai = this.comboBoxPortAreaHelper.SelectedItem as PortAreaInfo;
-                this.comboBoxPortAreaHelper.ToolTip = $"{pai.Remark} Ships: {pai.Ships} Agentur: {pai.Agency} Liegeplatz: {pai.Berth}";
+                // this.comboBoxPortAreaHelper.ToolTip = $"{pai.Remark} Ships: {pai.Ships} Agentur: {pai.Agency} Liegeplatz: {pai.Berth}";
+                this.textBlockPortAreaRemarks.Text = $"Ag:{pai.Agency} Ship:{pai.Ships} :{pai.Remark}";
             }
             
         }
diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 7090ff11..f5bd8965 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -36,7 +36,7 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationRevision>2</ApplicationRevision>
     <ApplicationVersion>7.13.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
diff --git a/ENI2/Properties/Settings.Designer.cs b/ENI2/Properties/Settings.Designer.cs
index ce92588e..3d4052ac 100644
--- a/ENI2/Properties/Settings.Designer.cs
+++ b/ENI2/Properties/Settings.Designer.cs
@@ -82,8 +82,8 @@ namespace ENI2.Properties {
         
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("Initial Catalog=nsw;Data Source=192.168.2.24\\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;P" +
-            "ersist Security Info=False;Connection Reset=false")]
+        [global::System.Configuration.DefaultSettingValueAttribute("Initial Catalog=nswtest;Data Source=192.168.2.24\\SQLEXPRESS;Uid=dfuser;pwd=dfpass" +
+            "wd;Persist Security Info=False;Connection Reset=false")]
         public string ConnectionString {
             get {
                 return ((string)(this["ConnectionString"]));
diff --git a/ENI2/Properties/Settings.settings b/ENI2/Properties/Settings.settings
index 46d9c0c3..b52a955d 100644
--- a/ENI2/Properties/Settings.settings
+++ b/ENI2/Properties/Settings.settings
@@ -21,7 +21,7 @@
       <Value Profile="(Default)">BSMD ReportGenerator</Value>
     </Setting>
     <Setting Name="ConnectionString" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">Initial Catalog=nsw;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</Value>
+      <Value Profile="(Default)">Initial Catalog=nswtest;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</Value>
     </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/bsmd.LockingService/LockingService.svc.cs b/bsmd.LockingService/LockingService.svc.cs
index bd012032..31a41570 100644
--- a/bsmd.LockingService/LockingService.svc.cs
+++ b/bsmd.LockingService/LockingService.svc.cs
@@ -12,7 +12,7 @@ using System.IO;
 
 namespace bsmd.LockingService
 {
-    
+
     [AspNetCompatibilityRequirements(RequirementsMode = AspNetCompatibilityRequirementsMode.Allowed)]
     public class LockingService : IService
     {
@@ -73,13 +73,13 @@ namespace bsmd.LockingService
                     }
                 }
             }
-                        
+
             return result;
         }
 
-        
+
         public void Unlock(Guid messageCoreId, Guid userId)
-        {            
+        {
             lock(lockDict)
             {
                 if(lockDict.ContainsKey(messageCoreId))
@@ -89,19 +89,19 @@ namespace bsmd.LockingService
                 }
             }
         }
-        
+
         public void LockRefresh(List<Guid> currentLocks, Guid userId)
         {
             foreach (Guid messageCoreId in currentLocks)
                 this.Lock(messageCoreId, userId);
         }
 
-        
+
         public void Log(string msg, string host, Guid userId)
         {
             log.Info(string.Format("{0} {1}:{2}", host, userId, msg));
         }
-                
+
         public List<CoreLock> GetLocks()
         {
             List<CoreLock> result = new List<CoreLock>();
@@ -152,8 +152,8 @@ namespace bsmd.LockingService
             string impPath = Path.Combine(Properties.Settings.Default.TransmitterRoot, "IMP");
             if(Directory.Exists(impPath))
             {
-                foreach(string file in Directory.GetFiles(impPath))                
-                    serverStatus.IMPFiles.Add(Path.GetFileNameWithoutExtension(file));                
+                foreach(string file in Directory.GetFiles(impPath))
+                    serverStatus.IMPFiles.Add(Path.GetFileNameWithoutExtension(file));
             }
 
             serverStatus.READYFiles = new List<string>();
diff --git a/bsmd.LockingService/Properties/Settings.Designer.cs b/bsmd.LockingService/Properties/Settings.Designer.cs
index fb989587..07f6d1d3 100644
--- a/bsmd.LockingService/Properties/Settings.Designer.cs
+++ b/bsmd.LockingService/Properties/Settings.Designer.cs
@@ -25,7 +25,7 @@ namespace bsmd.LockingService.Properties {
         
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("")]
+        [global::System.Configuration.DefaultSettingValueAttribute("E:\\svnlager\\BSMD\\nsw\\HIS-NORD\\Transmitter-Tool")]
         public string TransmitterRoot {
             get {
                 return ((string)(this["TransmitterRoot"]));
diff --git a/bsmd.LockingService/Properties/Settings.settings b/bsmd.LockingService/Properties/Settings.settings
index 45df6128..5156aee4 100644
--- a/bsmd.LockingService/Properties/Settings.settings
+++ b/bsmd.LockingService/Properties/Settings.settings
@@ -3,7 +3,7 @@
   <Profiles />
   <Settings>
     <Setting Name="TransmitterRoot" Type="System.String" Scope="Application">
-      <Value Profile="(Default)" />
+      <Value Profile="(Default)">E:\svnlager\BSMD\nsw\HIS-NORD\Transmitter-Tool</Value>
     </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/bsmd.LockingService/Web.config b/bsmd.LockingService/Web.config
index 1bdabf1f..88be4476 100644
--- a/bsmd.LockingService/Web.config
+++ b/bsmd.LockingService/Web.config
@@ -58,7 +58,7 @@
   <applicationSettings>
     <bsmd.LockingService.Properties.Settings>
       <setting name="TransmitterRoot" serializeAs="String">
-        <value>E:\svnlager\BSMD\nsw\HIS-NORD\Transmitter-Tool</value>&gt;
+        <value>E:\svnlager\BSMD\nsw\HIS-NORD\Transmitter-Tool</value>
       </setting>
     </bsmd.LockingService.Properties.Settings>
   </applicationSettings>
diff --git a/bsmd.database/INFO.cs b/bsmd.database/INFO.cs
index 3178b061..4812feff 100644
--- a/bsmd.database/INFO.cs
+++ b/bsmd.database/INFO.cs
@@ -258,7 +258,7 @@ namespace bsmd.database
 
         public override string ToString()
         {
-            return string.Format("{0} ({1})", PortArea, PortAreaCode);
+            return string.Format("{0} ({1})", PortArea, Berth);
         }
     }