From 7b87df2fd70456f313a572d01d45aa066f33f519 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Wed, 11 May 2022 15:46:25 +0200
Subject: [PATCH] weitere Korrekturen

---
 .../DetailViewControls/OverViewDetailControl.xaml |  5 +++--
 .../OverViewDetailControl.xaml.cs                 | 15 ++++-----------
 ENI2/ENI2.csproj                                  |  4 ++--
 ENI2/Excel/DakosyUtil.cs                          | 13 +++++++++----
 ENI2/Excel/ExcelReader.cs                         |  9 ++++-----
 bsmd.database/DBManager.cs                        |  4 ++--
 bsmd.database/MDH.cs                              |  2 +-
 7 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/ENI2/DetailViewControls/OverViewDetailControl.xaml b/ENI2/DetailViewControls/OverViewDetailControl.xaml
index 9817e9bf..eb097996 100644
--- a/ENI2/DetailViewControls/OverViewDetailControl.xaml
+++ b/ENI2/DetailViewControls/OverViewDetailControl.xaml
@@ -75,7 +75,7 @@
                 <Label HorizontalAlignment="Right" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textTicketNo}" Margin="0,0,10,0" />
                 <Label HorizontalContentAlignment="Right" Grid.Row="4" Grid.Column="3" Content="{x:Static p:Resources.textCreated}" Margin="0,0,10,0" />
                 <Label Name="labelCreated" Grid.Column="4" Grid.Row="4" Margin="2, 0, 0, 0" />
-                    <Button Name="buttonFormblattNeu" Grid.Column="5" Grid.Row="7" Margin="2" Click="buttonFormblattNeu_Click" >
+                    <Button Name="buttonFormblattNeu" Grid.Column="4" Grid.Row="7" Margin="2" Click="buttonFormblattNeu_Click" >
                         <StackPanel Orientation="Horizontal">
                             <TextBlock Text="Formblatt neu"></TextBlock>
                             <Image Source="../Resources/excel.png" Margin="10,0,5,0" Height="16"/>
@@ -122,13 +122,14 @@
                         <Image Source="../Resources/excel.png" Margin="10,0,5,0" Height="16"/>
                     </StackPanel>
                 </Button>
+                <!--
                 <Button Grid.Column="4" Grid.Row="7" Margin="2" Name="buttonExcelExport" Click="buttonExcelExport_Click">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock Text="{x:Static p:Resources.textExcelExport}"></TextBlock>
                         <Image Source="../Resources/excel.png" Margin="10,0,5,0" Height="16"/>
                     </StackPanel>
                 </Button>
-
+                -->
                 <StackPanel Orientation="Horizontal" Grid.Column="5" Grid.Row="4" Visibility="Hidden" Name="stackPanelLock">
                     <Image Source="../Resources/lock.png" Margin="0,0,5,0" Height="24" />
                     <TextBlock Name="textBlockLockUserName" VerticalAlignment="Center" />
diff --git a/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs b/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
index 040e3017..1bb1ba98 100644
--- a/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
+++ b/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
@@ -67,17 +67,10 @@ namespace ENI2.DetailViewControls
             if (this.Messages == null) return;
             if (this.Core == null) return;
 
-            if (DBManager.Instance.GetReportingPartyDict()[App.UserId.Value].IsAdmin)
-            {
-                this.textBoxENI.IsReadOnly = false;
-                this.textBoxIMO.IsReadOnly = false;
-                this.locodePoC.IsEnabled = true;
-                this.textBoxDisplayId.IsReadOnly = false;
-            }
-            else
-            {
-                this.buttonExcelExport.Visibility = Visibility.Hidden;
-            }
+            this.textBoxENI.IsReadOnly = false;
+            this.textBoxIMO.IsReadOnly = false;
+            this.locodePoC.IsEnabled = true;
+            this.textBoxDisplayId.IsReadOnly = false;            
 
             this.textBoxENI.DataContext = this.Core;
             this.textBoxIMO.DataContext = this.Core;
diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 58815865..48ff9166 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -36,8 +36,8 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>1</ApplicationRevision>
-    <ApplicationVersion>7.1.0.1</ApplicationVersion>
+    <ApplicationRevision>2</ApplicationRevision>
+    <ApplicationVersion>7.1.0.2</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
diff --git a/ENI2/Excel/DakosyUtil.cs b/ENI2/Excel/DakosyUtil.cs
index 36543016..bb3c68cd 100644
--- a/ENI2/Excel/DakosyUtil.cs
+++ b/ENI2/Excel/DakosyUtil.cs
@@ -489,11 +489,16 @@ namespace ENI2.Excel
             sec.CurrentShipSecurityLevel = (byte?)reader.ReadCellAsDecimal("security", "D7");
             sec.SECSimplification = reader.ReadCellAsBool("security", "D9");
 
-            sec.KielCanalPassagePlanned = reader.ReadCellAsBool("security", "I7");
+            sec.KielCanalPassagePlanned = reader.ReadCellAsBool("security", "I7") ?? false;
             if(sec.KielCanalPassagePlanned ?? false)
             {
-                sec.KielCanalPassagePlannedIncomming = reader.ReadCellAsDateTime("security", "I9");
-                sec.KielCanalPassagePlannedOutgoing = reader.ReadCellAsDateTime("security", "I12");
+                DateTime? incoming = reader.ReadCellAsDateTime("security", "I9");
+                if (incoming.HasValue)
+                    sec.KielCanalPassagePlannedIncomming = new DateTime(incoming.Value.Year, incoming.Value.Month, incoming.Value.Day, 11, 11, 0).ToUniversalTime();
+
+                DateTime? outgoing = reader.ReadCellAsDateTime("security", "I12");
+                if(outgoing.HasValue)
+                sec.KielCanalPassagePlannedOutgoing = new DateTime(outgoing.Value.Year, outgoing.Value.Month, outgoing.Value.Day, 11, 11, 0).ToUniversalTime();
             }
 
             if(sec.SECSimplification ?? false)
@@ -627,7 +632,7 @@ namespace ENI2.Excel
                 pre72h.VolumeOfCargo = reader.ReadCellAsDecimal("port state control", "C13");
             }
 
-            pre72h.PlannedOperations = reader.ReadCellAsText("port state control", "C14");
+            pre72h.PlannedOperations = reader.ReadTextFromDropdown("port state control", "C14");
             pre72h.PlannedWorks = reader.ReadCellAsText("port state control", "C15");
             pre72h.DateOfLastExpandedInspection = reader.ReadCellAsDateTime("port state control", "C16");
             pre72h.PlannedPeriodOfStay_HUR = reader.ReadCellAsDecimal("port state control", "C17");
diff --git a/ENI2/Excel/ExcelReader.cs b/ENI2/Excel/ExcelReader.cs
index 83d4a968..0e91a001 100644
--- a/ENI2/Excel/ExcelReader.cs
+++ b/ENI2/Excel/ExcelReader.cs
@@ -582,12 +582,11 @@ namespace ENI2.Excel
             try
             {
                 Worksheet workSheet = (Worksheet)_workBook.Worksheets[sheetName];
-                
-                Shapes shapes = workSheet.Shapes;
-                Shape aShape = shapes.Item("bla");
                 Range aRange = workSheet.Range[range];
-
-                string formulaRange = aRange.Validation.Formula1;
+                if (aRange != null)
+                {
+                    
+                }
             }
             catch (Exception e)
             {
diff --git a/bsmd.database/DBManager.cs b/bsmd.database/DBManager.cs
index c3494875..94603d3c 100644
--- a/bsmd.database/DBManager.cs
+++ b/bsmd.database/DBManager.cs
@@ -1437,11 +1437,11 @@ namespace bsmd.database
             if (core == null) return;
             using (SqlCommand cmd = new SqlCommand())
             {
-                cmd.CommandText = "SELECT COUNT(*) FROM MessageHeader WHERE MessageHeader.MessageCoreId = @ID AND MessageHeader.NotificationClass > 1 AND MessageHeader.NotificationClass < 28";
+                cmd.CommandText = "SELECT COUNT(*) FROM MessageHeader WHERE MessageHeader.MessageCoreId = @ID AND ((MessageHeader.NotificationClass > 1 AND MessageHeader.NotificationClass < 28) OR MessageHeader.NotificationClass > 30)";
                 cmd.Parameters.AddWithValue("@ID", core.Id);
                 int total = this.PerformReadIntQuery(cmd) ?? 0;
 
-                cmd.CommandText = "SELECT COUNT(*) FROM MessageHeader WHERE MessageHeader.MessageCoreId = @ID AND MessageHeader.BSMDStatus = 5 AND  MessageHeader.NotificationClass > 1 AND MessageHeader.NotificationClass < 28"; // compare "CONFIRMED"
+                cmd.CommandText = "SELECT COUNT(*) FROM MessageHeader WHERE MessageHeader.MessageCoreId = @ID AND MessageHeader.BSMDStatus = 5 AND ((MessageHeader.NotificationClass > 1 AND MessageHeader.NotificationClass < 28) OR MessageHeader.NotificationClass > 30)"; // compare "CONFIRMED"
                 int sent = this.PerformReadIntQuery(cmd) ?? 0;
 
                 core.NumberSentDisplay = string.Format("{0}/{1}", sent, total);
diff --git a/bsmd.database/MDH.cs b/bsmd.database/MDH.cs
index d4b673ba..86c9acbd 100644
--- a/bsmd.database/MDH.cs
+++ b/bsmd.database/MDH.cs
@@ -599,7 +599,7 @@ namespace bsmd.database
                 if ((this.SanitaryMeasuresApplied ?? false) && this.SanitaryMeasuresDetails.IsNullOrEmpty())                    
                     violations.Add(RuleEngine.CreateViolation(ValidationCode.V763, "Sanitary measure details missing", null, this.Title, null, this.Tablename));
 
-                if ((this.StowawaysDetected ?? false) && this.StowawaysJoiningLocation.IsNullOrEmpty())
+                if ((this.StowawaysDetected ?? false) && this.StowawaysJoiningLocationText.IsNullOrEmpty())
                     violations.Add(RuleEngine.CreateViolation(ValidationCode.V764, "Stowaways joining location missing", null, this.Title, null, this.Tablename));
 
                 if ((this.ValidSanitaryControlExemptionOrCertificateOnBoard ?? false) &&