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

Version 6.5.0 begonnen, work in progress

Browse Source
This commit is contained in:
Daniel Schick 2021-08-27 06:52:27 +00:00
parent d8a84d4a70
commit 015a8665a8
6 changed files with 95 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Stundensheet.xlsx
View File

Binary file not shown.

2
nsw/Source/bsmd.ExcelReadService/Util.cs
View File

@ -1898,7 +1898,7 @@ namespace bsmd.ExcelReadService
s2sActivity.ShipToShipActivityDateFrom = reader.ReadDate(s2sFromDate);
s2sActivity.ShipToShipActivityDateTo = reader.ReadDate(s2sToDate);
s2sActivity.ShipToShipActivityTypeCode = (int?) reader.ReadNumber(s2sActivityString);
s2sActivity.ShipToShipActivityType = reader.ReadShip2ShipActivityType(s2sActivityString);
reader.ReadShip2ShipActivityType(s2sActivityString); // 24.8.21 nicht Code dem Klartext zuordnen, nur das Feld kolorieren
s2sActivity.ShipToShipActivitySecurityMattersToReport = reader.ReadText(s2sSec);
reader.Conf.ConfirmText(s2sSec, s2sActivity.ShipToShipActivitySecurityMattersToReport, s2sActivity.ShipToShipActivitySecurityMattersToReport.IsNullOrEmpty() ? ExcelReader.ReadState.NONE : ExcelReader.ReadState.OK);
}

91
nsw/Source/bsmd.ReportGenerator/BSMDDocument.cs
View File

@ -436,7 +436,7 @@ namespace bsmd.ReportGenerator
// Add clone of paragraph to footer for odd pages. Cloning is necessary because an object must
// not belong to more than one other object. If you forget cloning an exception is thrown.
section.Footers.EvenPage.Add(paragraph.Clone());
}
}
#endregion
@ -518,7 +518,33 @@ namespace bsmd.ReportGenerator
#endregion
document.LastSection.AddParagraph(BSMDDocument.ReplaceTitle(messageParagraph.Title), "Heading2");
#region Landscape für HAZ
if ((message != null) &&
((message.MessageNotificationClass == Message.NotificationClass.HAZA) || (message.MessageNotificationClass == Message.NotificationClass.HAZD)) &&
(message.Elements.Count > 0)
)
{
HAZ haz = message.Elements[0] as HAZ;
if ((haz != null) &&
((haz.IMDGPositions.Count > 0) || (haz.IBCPositions.Count > 0) || (haz.IGCPositions.Count > 0) || (haz.IMSBCPositions.Count > 0) || (haz.MARPOLPositions.Count > 0)))
{
// Landscape!
BSMDDocument.DefineContentSection(document, Orientation.Landscape, false);
document.LastSection.AddParagraph(BSMDDocument.ReplaceTitle(messageParagraph.Title), "Heading2");
document.LastSection.AddParagraph(BSMDDocument.ReplaceTitle(messageParagraph.Subtitle), "Heading3");
BSMDDocument.CreateHAZPage(document, haz);
BSMDDocument.DefineContentSection(document, Orientation.Portrait, false);
}
}
#endregion
document.LastSection.AddParagraph(BSMDDocument.ReplaceTitle(messageParagraph.Title), "Heading2");
document.LastSection.AddParagraph(BSMDDocument.ReplaceTitle(messageParagraph.Subtitle), "Heading3");
#region Spezialbehandlung WAS Meldung
@ -1496,9 +1522,68 @@ namespace bsmd.ReportGenerator
#endregion
#region HAZ
private static void CreateHAZPage(Document document, HAZ haz)
{
// für jede Liste (IMDG, IGC, IBC, IMSBC, Marpol) wird eine eigene Seite angelegt, falls > 0 Elemente vorhanden sind
bool didPage = false;
if(haz.IMDGPositions.Count > 0)
{
didPage = true;
}
if(didPage)
{
document.LastSection.AddPageBreak();
didPage = false;
}
if(haz.IGCPositions.Count > 0)
{
}
if (didPage)
{
document.LastSection.AddPageBreak();
didPage = false;
}
if (haz.IBCPositions.Count > 0)
{
}
if (didPage)
{
document.LastSection.AddPageBreak();
didPage = false;
}
if (haz.IMSBCPositions.Count > 0)
{
}
if (didPage)
{
document.LastSection.AddPageBreak();
}
if (haz.MARPOLPositions.Count > 0)
{
}
}
#endregion
#region CallPurpose
static void CreateCallPurposeTable(Document document, Message message)
static void CreateCallPurposeTable(Document document, Message message)
{
if (message.Elements[0] is NOA_NOD noa_nod && noa_nod.CallPurposes.Count > 0)
{

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

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

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

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

8
nsw/Source/bsmd.database/versions.md
View File

@ -5,8 +5,8 @@ ___
# Planung
ENI 6.4.3 (Updates abh. Libraries, neuer ClickOnce Key (!!!) da abgelaufen, kleinere Änderungen)
ReportGenerator 6.4.3 (?), mit den Restpunkten, z.B. verbesserte IMDG Darstellung
ENI 6.5.0
# Aktuell installiert bei BSMD
@ -38,9 +38,9 @@ ExcelReadService (neu mit BouncyCastle) vom 24.6.21
SendNSWMessageService vom 1.6.21
## 6.4.1
## 6.4.3
ENI vom 2.6.21, freigegebene Version
ENI vom 29.7.21, freigegebene Version
log4net 2.0.8