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

Changes pt. 1

Browse Source
This commit is contained in:
Daniel Schick 2022-05-23 13:19:59 +02:00
parent d867c9567e
commit 9732060654
6 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ENI2/DetailRootControl.xaml.cs
View File

@ -690,7 +690,7 @@ namespace ENI2
vViolations.AddRange(violations);
}
#region 12.11.18 / 6.3.21: globale Plausi-Prüfungen
#region 12.11.18 / 6.3.21 / 23.5.22: globale Plausi-Prüfungen
Message crewaMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.CREW);
Message crewdMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.CREWD);
Message pasaMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.PAS);
@ -700,6 +700,7 @@ namespace ENI2
Message noanodMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.NOA_NOD);
Message mdhMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.MDH);
Message was_rcptMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.WAS_RCPT);
Message wasMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.WAS);
#region CREW / PAS Count Plausibility
@ -1006,6 +1007,25 @@ namespace ENI2
#endregion
#region Waste disposal service provider for DEHAM
if ((!this.Core.DisplayId.IsNullOrEmpty() && this.Core.DisplayId.StartsWith("DEHAM")) ||
this.Core.PoC.Equals("DEHAM"))
{
if (wasMessage.Elements.Count > 0)
{
WAS was = wasMessage.Elements[0] as WAS;
if ((!was.WasteDisposalValidExemption ?? true) && (was.WasteDisposalServiceProvider.Count == 0))
{
MessageViolation mv = RuleEngine.CreateViolation(ValidationCode.NOT_NULL, "Check waste disposal service provider", null, "WAS service provider", null, "WAS");
mv.MessageGroupName = Properties.Resources.textOverview;
vViolations.Add(mv);
}
}
}
#endregion
#endregion
foreach (MessageError me in vErrors)

6
ENI2/EditControls/SelectImportClassesDialog.xaml
View File

@ -11,11 +11,11 @@
Title="{x:Static p:Resources.textSelectImportClasses}" Height="600" Width="250" Background="AliceBlue">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="27" />
<RowDefinition Height="1*" />
<RowDefinition Height="27" />
<RowDefinition Height="27" />
</Grid.RowDefinitions>
<Grid Grid.Row="0">
<Grid Grid.Row="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width=".5*"/>
<ColumnDefinition Width=".5*"/>
@ -23,6 +23,6 @@
<Button x:Name="buttonAll" Grid.Column="0" Margin="2" Content="{x:Static p:Resources.textSelectAll}" Click="buttonAll_Click" />
<Button x:Name="buttonNone" Grid.Column="1" Margin="2" Content="{x:Static p:Resources.textSelectNone}" Click="buttonNone_Click"/>
</Grid>
<xctk:CheckListBox x:Name="checkListBoxClasses" Grid.Row="1" Margin="2" VerticalAlignment="Stretch" ValueMemberPath="Class" DisplayMemberPath="Name" SelectedMemberPath="IsSelected" />
<xctk:CheckListBox x:Name="checkListBoxClasses" Grid.Row="0" Margin="2" VerticalAlignment="Stretch" ValueMemberPath="Class" DisplayMemberPath="Name" SelectedMemberPath="IsSelected" />
</Grid>
</enictrl:EditWindowBase>

4
ENI2/Excel/ExcelUtil.cs
View File

@ -1794,6 +1794,8 @@ namespace ENI2.Excel
towa.TowageOnArrivalFlag = reader.ReadNationality(tFlag);
towa.TowageOnArrivalPurposeOfCall = reader.ReadText(tPoC);
towa.TowageOnArrivalDraught_DMT = reader.ReadNumber(tDraft);
if (towa.TowageOnArrivalDraught_DMT.HasValue)
towa.TowageOnArrivalDraught_DMT *= 10;
towa.TowageOnArrivalGrossTonnage = (int?) reader.ReadNumber(tGT);
towa.TowageOnArrivalLengthOverall_MTR = reader.ReadNumber(tLen);
towa.TowageOnArrivalBeam_MTR = reader.ReadNumber(tBeam);
@ -1850,6 +1852,8 @@ namespace ENI2.Excel
towd.TowageOnDepartureName = towageName;
towd.TowageOnDepartureFlag = reader.ReadNationality(tFlag);
towd.TowageOnDepartureDraught_DMT = reader.ReadNumber(tDraft);
if (towd.TowageOnDepartureDraught_DMT.HasValue)
towd.TowageOnDepartureDraught_DMT *= 10;
towd.TowageOnDepartureLengthOverall_MTR = reader.ReadNumber(tLen);
towd.TowageOnDepartureBeam_MTR = reader.ReadNumber(tBeam);
towd.TowageOnDepartureOperatorCompanyName = reader.ReadText(tOp);

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

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

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

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

3
bsmd.database/SEC.cs
View File

@ -409,6 +409,9 @@ namespace bsmd.database
if ((this.LastTenPortFacilitesCalled.Count == 0) || (this.LastTenPortFacilitesCalled.Count > 10))
errors.Add(RuleEngine.CreateError(ValidationCode.IMPLAUSIBLE, "LastTenPortFacilitiesCalled", null, this.Title, null, this.Tablename));
if (this.CurrentShipSecurityLevel > 1)
violations.Add(RuleEngine.CreateViolation(ValidationCode.IMPLAUSIBLE, "Please check ship security level", null, this.Title, null, this.Tablename));
if (!(this.ApprovedSecurityPlanOnBoard ?? false))
violations.Add(RuleEngine.CreateViolation(ValidationCode.IMPLAUSIBLE, "No valid security plan on board?", null, this.Title, null, this.Tablename));