dschick/git_bsmd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for 7.2 pt 2 (extra Funktion : Copy TOWD to TOWA)

Browse Source
This commit is contained in:
Daniel Schick 2022-05-28 09:28:31 +02:00
parent 0533b579b2
commit 9cb40ad699
3 changed files with 69 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ENI2/DetailViewControls/TowageDetailControl.xaml.cs
View File

@ -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();

20
ENI2/ENI2.csproj
View File

@ -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">

25
bsmd.database/TOWA.cs
View File

@ -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
}
}