From 9cb40ad699eefd21b608fdd30dcfc904eb1c7cae Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Sat, 28 May 2022 09:28:31 +0200
Subject: [PATCH] Fixes for 7.2 pt 2 (extra Funktion : Copy TOWD to TOWA)

---
 .../TowageDetailControl.xaml.cs               | 28 ++++++++++++++++++-
 ENI2/ENI2.csproj                              | 20 +++++++++++--
 bsmd.database/TOWA.cs                         | 25 +++++++++++++++++
 3 files changed, 69 insertions(+), 4 deletions(-)

diff --git a/ENI2/DetailViewControls/TowageDetailControl.xaml.cs b/ENI2/DetailViewControls/TowageDetailControl.xaml.cs
index 5cb74cbd..6bfae9f9 100644
--- a/ENI2/DetailViewControls/TowageDetailControl.xaml.cs
+++ b/ENI2/DetailViewControls/TowageDetailControl.xaml.cs
@@ -35,10 +35,18 @@ namespace ENI2.DetailViewControls
             {
                 this.dataGridTowageOnArrival.ContextMenu.Items.Add(new Separator());
                 MenuItem copyItem = new MenuItem();
-                copyItem.Header = Properties.Resources.textCopyTOWATOWD;
+                copyItem.Header = string.Format(Properties.Resources.textCopyTo, "TOWD");
                 copyItem.Icon = new Image { Source = new BitmapImage(new Uri("pack://application:,,,/Resources/documents.png")) };
                 copyItem.Click += new RoutedEventHandler(this.copyItem);
                 this.dataGridTowageOnArrival.ContextMenu.Items.Add(copyItem);
+
+                this.dataGridTowageOnDeparture.ContextMenu.Items.Add(new Separator());
+                copyItem = new MenuItem();
+                copyItem.Header = string.Format(Properties.Resources.textCopyTo, "TOWA");
+                copyItem.Icon = new Image { Source = new BitmapImage(new Uri("pack://application:,,,/Resources/documents.png")) };
+                copyItem.Click += new RoutedEventHandler(this.copyItemToTOWA);
+                this.dataGridTowageOnDeparture.ContextMenu.Items.Add(copyItem);
+
                 _ctxInitialized = true;
             }
         }
@@ -61,6 +69,24 @@ namespace ENI2.DetailViewControls
             }
         }
 
+        private void copyItemToTOWA(object sender, RoutedEventArgs e)
+        {
+            // aus dem aktuell selektierten TOWA Element ein neues TOWD Element machen
+            if (this.dataGridTowageOnDeparture.SelectedItems != null)
+            {
+                foreach (TOWD selectedTOWD in this.dataGridTowageOnDeparture.SelectedItems)
+                {
+                    TOWA copyTOWA = new TOWA();
+                    copyTOWA.MessageHeader = _towdMessage;
+                    copyTOWA.CopyFromTOWD(selectedTOWD);
+                    copyTOWA.Identifier = TOWD.GetNewIdentifier(this._towdMessage.Elements);
+                    this._towaMessage.Elements.Add(copyTOWA);
+                    this.dataGridTowageOnArrival.Items.Refresh();
+                    this.SublistElementChanged(Message.NotificationClass.TOWA);
+                }
+            }
+        }
+
         public override void Initialize()
         {
             base.Initialize();
diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 6e156068..fe1eb57a 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>0</ApplicationRevision>
-    <ApplicationVersion>7.2.0.0</ApplicationVersion>
+    <ApplicationRevision>1</ApplicationRevision>
+    <ApplicationVersion>7.2.0.1</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
@@ -949,7 +949,21 @@
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>"C:\Program Files (x86)\Windows Kits\10\bin\x64\signtool" sign /f $(ProjectDir)\..\misc\codesigning.pfx /p t5bj2dk9ifdIWBPhPra4U $(TargetPath)</PostBuildEvent>
+    <!-- Find Windows Kit path and then SignTool path for the post-build event -->
+    <WindowsKitsRoot>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots', 'KitsRoot10', null, RegistryView.Registry32, RegistryView.Default))</WindowsKitsRoot>
+    <WindowsKitsRoot Condition="'$(WindowsKitsRoot)' == ''">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots', 'KitsRoot81', null, RegistryView.Registry32, RegistryView.Default))</WindowsKitsRoot>
+    <WindowsKitsRoot Condition="'$(WindowsKitsRoot)' == ''">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots', 'KitsRoot', null, RegistryView.Registry32, RegistryView.Default))</WindowsKitsRoot>
+    <SignToolPath Condition="'$(SignToolPath)' == '' And '$(Platform)' == 'AnyCPU' and Exists('$(WindowsKitsRoot)bin\x64\signtool.exe')">$(WindowsKitsRoot)bin\x64\</SignToolPath>
+    <SignToolPath Condition="'$(SignToolPath)' == '' And Exists('$(WindowsKitsRoot)bin\$(Platform)\signtool.exe')">$(WindowsKitsRoot)bin\$(Platform)\</SignToolPath>
+    <SignToolPathBin Condition="'$(SignToolPath)' == ''">$([System.IO.Directory]::GetDirectories('$(WindowsKitsRoot)bin',"10.0.*"))</SignToolPathBin>
+    <SignToolPathLen Condition="'$(SignToolPathBin)' != ''">$(SignToolPathBin.Split(';').Length)</SignToolPathLen>
+    <SignToolPathIndex Condition="'$(SignToolPathLen)' != ''">$([MSBuild]::Add(-1, $(SignToolPathLen)))</SignToolPathIndex>
+    <SignToolPathBase Condition="'$(SignToolPathIndex)' != ''">$(SignToolPathBin.Split(';').GetValue($(SignToolPathIndex)))\</SignToolPathBase>
+    <SignToolPath Condition="'$(SignToolPath)' == '' And '$(SignToolPathBase)' != '' And '$(Platform)' == 'AnyCPU'">$(SignToolPathBase)x64\</SignToolPath>
+    <SignToolPath Condition="'$(SignToolPath)' == '' And '$(SignToolPathBase)' != ''">$(SignToolPathBase)$(Platform)\</SignToolPath>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PostBuildEvent>"$(SignToolPath)signtool.exe" sign /f $(ProjectDir)\..\misc\codesigning.pfx /p t5bj2dk9ifdIWBPhPra4U $(TargetPath)</PostBuildEvent>
   </PropertyGroup>
   <Import Project="packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.115.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets" Condition="Exists('packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.115.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
diff --git a/bsmd.database/TOWA.cs b/bsmd.database/TOWA.cs
index c8d52d79..d80ce5c7 100644
--- a/bsmd.database/TOWA.cs
+++ b/bsmd.database/TOWA.cs
@@ -233,6 +233,31 @@ namespace bsmd.database
 
         #endregion
 
+        #region public methods
+
+        public void CopyFromTOWD(TOWD copyTOWD)
+        {
+            if (copyTOWD != null)
+            {
+                this.TowageOnArrivalBeam_MTR = copyTOWD.TowageOnDepartureBeam_MTR;
+                this.TowageOnArrivalDraught_DMT = copyTOWD.TowageOnDepartureDraught_DMT;
+                this.TowageOnArrivalFlag = copyTOWD.TowageOnDepartureFlag;
+                this.TowageOnArrivalLengthOverall_MTR = copyTOWD.TowageOnDepartureLengthOverall_MTR;
+                this.TowageOnArrivalName = copyTOWD.TowageOnDepartureName;
+                this.TowageOnArrivalOperatorCity = copyTOWD.TowageOnDepartureOperatorCity;
+                this.TowageOnArrivalOperatorCompanyName = copyTOWD.TowageOnDepartureOperatorCompanyName;
+                this.TowageOnArrivalOperatorCountry = copyTOWD.TowageOnDepartureOperatorCountry;
+                this.TowageOnArrivalOperatorEmail = copyTOWD.TowageOnDepartureOperatorEmail;
+                this.TowageOnArrivalOperatorFax = copyTOWD.TowageOnDepartureOperatorFax;
+                this.TowageOnArrivalOperatorPhone = copyTOWD.TowageOnDepartureOperatorPhone;
+                this.TowageOnArrivalOperatorPostalCode = copyTOWD.TowageOnDepartureOperatorPostalCode;
+                this.TowageOnArrivalOperatorStreetNameAndNumber = copyTOWD.TowageOnDepartureOperatorStreetNameAndNumber;
+                this.TowageOnArrivalRemarks = copyTOWD.TowageOnDepartureRemarks;
+            }
+        }
+
+        #endregion
+
     }
 }