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

Alles klar für 5.0.4 (nach Tests 5.0 Go-Live)

Browse Source
This commit is contained in:
Daniel Schick 2018-03-21 15:25:48 +00:00
parent a70b020eef
commit a4070c5ecf
10 changed files with 58 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
ENI-2/ENI2/ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml.cs
View File

@ -218,6 +218,7 @@ namespace ENI2.DetailViewControls
this.hazd.MARPOLPositions.Add(copyMARPOL);
this.SublistElementChanged(Message.NotificationClass.HAZD);
this.OnControlCacheReset(Properties.Resources.textDGDeparture);
this.SetHAZGlobalFlags(this.hazd);
}
}
}
@ -237,6 +238,7 @@ namespace ENI2.DetailViewControls
this.hazd.IMSBCPositions.Add(copyIMSBC);
this.SublistElementChanged(Message.NotificationClass.HAZD);
this.OnControlCacheReset(Properties.Resources.textDGDeparture);
this.SetHAZGlobalFlags(this.hazd);
}
}
}
@ -256,6 +258,7 @@ namespace ENI2.DetailViewControls
this.hazd.IMDGPositions.Add(copyIMDG);
this.SublistElementChanged(Message.NotificationClass.HAZD);
this.OnControlCacheReset(Properties.Resources.textDGDeparture);
this.SetHAZGlobalFlags(this.hazd);
}
}
}
@ -275,6 +278,7 @@ namespace ENI2.DetailViewControls
this.hazd.IGCPositions.Add(copyIGC);
this.SublistElementChanged(Message.NotificationClass.HAZD);
this.OnControlCacheReset(Properties.Resources.textDGDeparture);
this.SetHAZGlobalFlags(this.hazd);
}
}
}
@ -296,6 +300,7 @@ namespace ENI2.DetailViewControls
this.hazd.IBCPositions.Add(copyIBC);
this.SublistElementChanged(Message.NotificationClass.HAZD);
this.OnControlCacheReset(Properties.Resources.textDGDeparture);
this.SetHAZGlobalFlags(this.hazd);
}
}
}
@ -306,14 +311,23 @@ namespace ENI2.DetailViewControls
/// <summary>
/// Beim Hinzufügen der allerersten Gefahrgutposition sollen die Flags vorbelegt werden
/// </summary>
void SetHAZGlobalFlags()
void SetHAZGlobalFlags(HAZ theHAZ)
{
int totalCount = this.haz.MARPOLPositions.Count + this.haz.IMDGPositions.Count + this.haz.IGCPositions.Count + this.haz.IBCPositions.Count + this.haz.IMSBCPositions.Count;
int totalCount = theHAZ.MARPOLPositions.Count + theHAZ.IMDGPositions.Count + theHAZ.IGCPositions.Count + theHAZ.IBCPositions.Count + theHAZ.IMSBCPositions.Count;
if(totalCount == 1)
{
if (!(this.checkBoxDangerousGoodsOnBoard.IsChecked ?? false)) this.checkBoxDangerousGoodsOnBoard.IsChecked = true;
if(!(this.checkBoxDGManifestOnBoard.IsChecked ?? false)) this.checkBoxDGManifestOnBoard.IsChecked = true;
if (this.checkBoxMoUBaltic.IsChecked ?? true) this.checkBoxMoUBaltic.IsChecked = false;
if (theHAZ == this.haz)
{
if (!(this.checkBoxDangerousGoodsOnBoard.IsChecked ?? false)) this.checkBoxDangerousGoodsOnBoard.IsChecked = true;
if (!(this.checkBoxDGManifestOnBoard.IsChecked ?? false)) this.checkBoxDGManifestOnBoard.IsChecked = true;
if (this.checkBoxMoUBaltic.IsChecked ?? true) this.checkBoxMoUBaltic.IsChecked = false;
}
else
{
theHAZ.NoDPGOnBoardOnArrival = false;
theHAZ.DPGManifestOnBoardOnArrival = true;
theHAZ.MOUBaltic = false;
}
}
}
@ -348,7 +362,7 @@ namespace ENI2.DetailViewControls
eld.Identifier = DatabaseEntity.GetNewIdentifier(haz.MARPOLPositions, "MARPOL-");
eld.MARPOL.HAZ = this.haz;
this.SublistElementChanged(this.IsDeparture ? Message.NotificationClass.HAZD : Message.NotificationClass.HAZA);
this.SetHAZGlobalFlags();
this.SetHAZGlobalFlags(this.haz);
};
if (eld.ShowDialog() ?? false)
@ -383,7 +397,7 @@ namespace ENI2.DetailViewControls
ebd.MARPOL.HAZ = this.haz;
ebd.Identifier = DatabaseEntity.GetNewIdentifier(this.haz.MARPOLPositions, "MARPOL-");
this.SublistElementChanged(this.IsDeparture ? Message.NotificationClass.HAZD : Message.NotificationClass.HAZA);
this.SetHAZGlobalFlags();
this.SetHAZGlobalFlags(this.haz);
};
if (ebd.ShowDialog() ?? false)
@ -392,7 +406,7 @@ namespace ENI2.DetailViewControls
haz.MARPOLPositions.Add(ebd.MARPOL);
this.dataGridMARPOLItems.Items.Refresh();
this.SublistElementChanged(this.IsDeparture ? Message.NotificationClass.HAZD : Message.NotificationClass.HAZA);
this.SetHAZGlobalFlags();
this.SetHAZGlobalFlags(this.haz);
}
}
@ -429,7 +443,7 @@ namespace ENI2.DetailViewControls
eld.Identifier = DatabaseEntity.GetNewIdentifier(this.haz.IMSBCPositions, "IMSBC-");
eld.IMSBC.HAZ = this.haz;
this.SublistElementChanged(this.IsDeparture ? Message.NotificationClass.HAZD : Message.NotificationClass.HAZA);
this.SetHAZGlobalFlags();
this.SetHAZGlobalFlags(this.haz);
};
if (eld.ShowDialog() ?? false)
@ -463,7 +477,7 @@ namespace ENI2.DetailViewControls
ebd.IMSBC.HAZ = this.haz;
ebd.Identifier = DatabaseEntity.GetNewIdentifier(this.haz.IMSBCPositions, "IMSBC-");
this.SublistElementChanged(this.IsDeparture ? Message.NotificationClass.HAZD : Message.NotificationClass.HAZA);
this.SetHAZGlobalFlags();
this.SetHAZGlobalFlags(this.haz);
};
if (ebd.ShowDialog() ?? false)
@ -472,7 +486,7 @@ namespace ENI2.DetailViewControls
haz.IMSBCPositions.Add(ebd.IMSBC);
this.dataGridIMSBCItems.Items.Refresh();
this.SublistElementChanged(this.IsDeparture ? Message.NotificationClass.HAZD : Message.NotificationClass.HAZA);
this.SetHAZGlobalFlags();
this.SetHAZGlobalFlags(this.haz);
}
}
@ -509,7 +523,7 @@ namespace ENI2.DetailViewControls
eld.Identifier = DatabaseEntity.GetNewIdentifier(this.haz.IGCPositions, "IGC-");
eld.IGC.HAZ = this.haz;
this.SublistElementChanged(this.IsDeparture ? Message.NotificationClass.HAZD : Message.NotificationClass.HAZA);
this.SetHAZGlobalFlags();
this.SetHAZGlobalFlags(this.haz);
};
if (eld.ShowDialog() ?? false)
@ -551,7 +565,7 @@ namespace ENI2.DetailViewControls
haz.IGCPositions.Add(ebd.IGC);
this.dataGridIGCItems.Items.Refresh();
this.SublistElementChanged(this.IsDeparture ? Message.NotificationClass.HAZD : Message.NotificationClass.HAZA);
this.SetHAZGlobalFlags();
this.SetHAZGlobalFlags(this.haz);
}
}
@ -588,7 +602,7 @@ namespace ENI2.DetailViewControls
eld.Identifier = DatabaseEntity.GetNewIdentifier(this.haz.IBCPositions, "IBC-");
eld.IBC.HAZ = this.haz;
this.SublistElementChanged(this.IsDeparture ? Message.NotificationClass.HAZD : Message.NotificationClass.HAZA);
this.SetHAZGlobalFlags();
this.SetHAZGlobalFlags(this.haz);
};
if (eld.ShowDialog() ?? false)
@ -630,7 +644,7 @@ namespace ENI2.DetailViewControls
haz.IBCPositions.Add(ebd.IBC);
this.dataGridIBCItems.Items.Refresh();
this.SublistElementChanged(this.IsDeparture ? Message.NotificationClass.HAZD : Message.NotificationClass.HAZA);
this.SetHAZGlobalFlags();
this.SetHAZGlobalFlags(this.haz);
}
}
@ -675,7 +689,7 @@ namespace ENI2.DetailViewControls
haz.IMDGPositions.Add(eld.IMDG);
this.dataGridIMDGItems.Items.Refresh();
this.SublistElementChanged(this.IsDeparture ? Message.NotificationClass.HAZD : Message.NotificationClass.HAZA);
this.SetHAZGlobalFlags();
this.SetHAZGlobalFlags(this.haz);
}
}
@ -709,7 +723,7 @@ namespace ENI2.DetailViewControls
haz.IMDGPositions.Add(ebd.IMDG);
this.dataGridIMDGItems.Items.Refresh();
this.SublistElementChanged(this.IsDeparture ? Message.NotificationClass.HAZD : Message.NotificationClass.HAZA);
this.SetHAZGlobalFlags();
this.SetHAZGlobalFlags(this.haz);
}
}

2
ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml
View File

@ -79,7 +79,7 @@
<Label Grid.Column="0" Grid.Row="6" Margin="0,0,10,0" HorizontalContentAlignment="Right" Name="labelBSMDStatusInternal" Content="{Binding BSMDStatusInternal, StringFormat={}{0}}" VerticalContentAlignment="Center" FontWeight="Bold" />
<Button IsEnabled="True" Name="buttonStorno" Grid.Column="1" Grid.Row="6" Margin="2" Click="buttonStorno_Click" Content="{x:Static p:Resources.textCancelDeclaration}"/>
<Button IsEnabled="True" Name="buttonCopy" Grid.Column="2" Grid.Row="6" Margin="2" Click="buttonCopy_Click" Content="{x:Static p:Resources.textCopyData}"/>
<Button IsEnabled="False" Name="buttonCopy" Grid.Column="2" Grid.Row="6" Margin="2" Click="buttonCopy_Click" Content="{x:Static p:Resources.textCopyData}"/>
<Button IsEnabled="False" Name="buttonSendPDF" Grid.Column="3" Grid.Row="6" Margin="2" Click="buttonSendPDF_Click" Content="{x:Static p:Resources.textCreatePDF}"/>
<Button Name="buttonQueryHIS" Grid.Column="4" Grid.Row="6" Margin="2" Click="buttonQueryHIS_Click" Content="{x:Static p:Resources.textQueryHIS}"/>
<StackPanel Orientation="Horizontal" Grid.Column="5" Grid.Row="6">

5
ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
View File

@ -67,6 +67,7 @@ namespace ENI2.DetailViewControls
this.textBoxIMO.IsReadOnly = false;
this.locodePoC.IsEnabled = true;
this.textBoxDisplayId.IsReadOnly = false;
this.buttonCopy.IsEnabled = true;
}
this.textBoxENI.DataContext = this.Core;
@ -662,9 +663,9 @@ namespace ENI2.DetailViewControls
{
bool cannotCreateReport = false;
for (int i = 0; i < this.dataGridMessages.SelectedItems.Count; i++)
for (int i = 0; i < this.Messages.Count; i++)
{
Message selectedMessage = this.dataGridMessages.SelectedItems[i] as Message;
Message selectedMessage = this.Messages[i];
if ((selectedMessage.InternalStatus == Message.BSMDStatus.SENT) || (selectedMessage.InternalStatus == Message.BSMDStatus.TOSEND))
{
cannotCreateReport = true;

BIN
Stundensheet.xlsx
View File

Binary file not shown.

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

@ -1121,6 +1121,17 @@ namespace bsmd.ReportGenerator
}
}
break;
case "Packing Group":
{
switch (value)
{
case "0": result = "I"; break;
case "1": result = "II"; break;
case "2": result = "III"; break;
default: break;
}
}
break;
default:
break;
}

2
nsw/Source/bsmd.database/HAZ.cs
View File

@ -427,7 +427,7 @@ namespace bsmd.database
public override void Validate(List<MessageError> errors, List<MessageViolation> violations)
{
if (this.NoDPGOnBoardOnArrival ?? false)
if (this.NoDPGOnBoardOnArrival ?? false) // && this.MessageHeader.InternalStatus == Message.BSMDStatus.TOSEND)
{
violations.Add(RuleEngine.CreateViolation(ValidationCode.IMPLAUSIBLE, "No DPG on board set!", null, this.Title, null, this.Tablename));
}

7
nsw/Source/bsmd.database/NOA_NOD.cs
View File

@ -308,7 +308,12 @@ namespace bsmd.database
public override object Clone()
{
NOA_NOD noanod = this.MemberwiseClone() as NOA_NOD;
// NOA_NOD noanod = this.MemberwiseClone() as NOA_NOD;
NOA_NOD noanod = new NOA_NOD();
noanod.LastPort = this.LastPort;
noanod.NextPort = this.NextPort;
noanod.IsAnchored = this.IsAnchored;
noanod.id = null;
noanod.callPurposes = new ObservableCollection<DatabaseEntity>();

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("5.0.3")]
[assembly: AssemblyInformationalVersion("5.0.4")]
[assembly: AssemblyCopyright("Copyright © 2014-2018 schick Informatik")]
[assembly: AssemblyTrademark("")]

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

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

3
nsw/Source/bsmd.hisnord/Request.cs
View File

@ -1673,6 +1673,9 @@ namespace bsmd.hisnord
pi.MarinePollutant = (imdgPosition.MarinePollutant ?? false) ? yorntype.Y : yorntype.N;
pi.NumberOfPackages = imdgPosition.NumberOfPackages?.ToString();
pi.PackageType = imdgPosition.PackageType;
pi.PackingGroupSpecified = imdgPosition.PackingGroup.HasValue;
if (pi.PackingGroupSpecified)
pi.PackingGroup = (packinggrouptype)imdgPosition.PackingGroup;
pi.LimitedQuantities = (imdgPosition.LimitedQuantities ?? false) ? yorntype.Y : yorntype.N;
pi.ExceptedQuantities = (imdgPosition.ExceptedQuantities ?? false) ? yorntype.Y : yorntype.N;
pi.NetQuantity_KGMSpecified = imdgPosition.NetQuantity_KGM.HasValue;