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

6.9.5: Weitere Korrekturen am PDF und Excel

Browse Source
This commit is contained in:
Daniel Schick 2022-01-05 08:15:08 +01:00
parent af138d7047
commit 64d8a6dbe3
5 changed files with 42 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ENI2/ENI2.csproj
View File

@ -37,7 +37,7 @@
<CreateWebPageOnPublish>true</CreateWebPageOnPublish> <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.html</WebPage> <WebPage>publish.html</WebPage>
<ApplicationRevision>0</ApplicationRevision> <ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>6.9.5.0</ApplicationVersion> <ApplicationVersion>6.9.6.0</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut> <CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted> <PublishWizardCompleted>true</PublishWizardCompleted>

37
ENI2/Excel/ExcelWriter.cs
View File

@ -117,7 +117,11 @@ namespace ENI2.Excel
if (message.Elements[0] is POBD pobd) this.WriteMessage(pobd); if (message.Elements[0] is POBD pobd) this.WriteMessage(pobd);
break; break;
case Message.NotificationClass.PRE72H: case Message.NotificationClass.PRE72H:
if (message.Elements[0] is PRE72H pre72h) this.WriteMessage(pre72h); if (message.Elements[0] is PRE72H pre72h)
{
this.WriteMessage(pre72h);
this.WritePRE72H(pre72h);
}
break; break;
case Message.NotificationClass.SEC: case Message.NotificationClass.SEC:
if (message.Elements[0] is SEC sec) this.WriteMessage(sec); if (message.Elements[0] is SEC sec) this.WriteMessage(sec);
@ -993,6 +997,35 @@ namespace ENI2.Excel
#endregion #endregion
#region PRE72H
private void WritePRE72H(PRE72H pre72h)
{
if(pre72h != null)
{
if(pre72h.TankerHullConfiguration.HasValue)
{
switch(pre72h.TankerHullConfiguration.Value)
{
case 0: WriteText("PRE72H.TankerHullConfiguration", "SINGLE HULL"); break;
case 1: WriteText("PRE72H.TankerHullConfiguration", "SINGLE HULL WITH SBT"); break;
case 2: WriteText("PRE72H.TankerHullConfiguration", "DOUBLE HULL"); break;
}
}
if(pre72h.ConditionCargoBallastTanks.HasValue)
{
switch(pre72h.ConditionCargoBallastTanks.Value)
{
case 0: WriteText("PRE72H.ConditionCargoBallastTanks", "FULL"); break;
case 1: WriteText("PRE72H.ConditionCargoBallastTanks", "EMPTY"); break;
case 2: WriteText("PRE72H.ConditionCargoBallastTanks", "INERTED"); break;
}
}
}
}
#endregion
#endregion #endregion
#region write simple things #region write simple things
@ -1088,7 +1121,7 @@ namespace ENI2.Excel
{ {
if (v != null) if (v != null)
{ {
_nameDict[lookupName].RefersToRange.Value = ((DateTime)v).ToShortTimeString(); _nameDict[lookupName].RefersToRange.Value = ((DateTime)v).ToLocalTime().ToShortTimeString();
} }
} }

6
ENI2/Report/ReportDocument.cs
View File

@ -1381,10 +1381,10 @@ namespace ENI2.Report
row.Cells[7].AddParagraph(towa.TowageOnArrivalDraught_DMT.HasValue ? towa.TowageOnArrivalDraught_DMT.Value.ToString("N1") : ""); row.Cells[7].AddParagraph(towa.TowageOnArrivalDraught_DMT.HasValue ? towa.TowageOnArrivalDraught_DMT.Value.ToString("N1") : "");
row.Cells[8].AddParagraph(towa.TowageOnArrivalRemarks ?? ""); row.Cells[8].AddParagraph(towa.TowageOnArrivalRemarks ?? "");
row.Cells[9].AddParagraph(towa.TowageOnArrivalOperatorCompanyName ?? ""); row.Cells[9].AddParagraph(towa.TowageOnArrivalOperatorCompanyName ?? "");
row.Cells[10].AddParagraph(towa.TowageOnArrivalOperatorStreetNameAndNumber); row.Cells[10].AddParagraph(towa.TowageOnArrivalOperatorStreetNameAndNumber ?? "");
row.Cells[11].AddParagraph(towa.TowageOnArrivalOperatorPostalCode); row.Cells[11].AddParagraph(towa.TowageOnArrivalOperatorPostalCode ?? "");
row.Cells[12].AddParagraph(towa.TowageOnArrivalOperatorCountry ?? ""); row.Cells[12].AddParagraph(towa.TowageOnArrivalOperatorCountry ?? "");
row.Cells[13].AddParagraph(towa.TowageOnArrivalOperatorPhone); row.Cells[13].AddParagraph(towa.TowageOnArrivalOperatorPhone ?? "");
row.Cells[14].AddParagraph(towa.TowageOnArrivalOperatorFax ?? ""); row.Cells[14].AddParagraph(towa.TowageOnArrivalOperatorFax ?? "");
row.Cells[15].AddParagraph(towa.TowageOnArrivalOperatorEmail ?? ""); row.Cells[15].AddParagraph(towa.TowageOnArrivalOperatorEmail ?? "");
} }

2
bsmd.database/Properties/AssemblyProductInfo.cs
View File

@ -2,6 +2,6 @@
[assembly: AssemblyCompany("schick Informatik")] [assembly: AssemblyCompany("schick Informatik")]
[assembly: AssemblyProduct("BSMD NSW interface")] [assembly: AssemblyProduct("BSMD NSW interface")]
[assembly: AssemblyInformationalVersion("6.9.5")] [assembly: AssemblyInformationalVersion("6.9.6")]
[assembly: AssemblyCopyright("Copyright © 2014-2021 schick Informatik")] [assembly: AssemblyCopyright("Copyright © 2014-2021 schick Informatik")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]

2
bsmd.database/Properties/AssemblyProjectInfo.cs
View File

@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("6.9.5.*")] [assembly: AssemblyVersion("6.9.6.*")]