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

Version 5.0.3 für Go-live HIS-Nord NSW 5.0 am 21.3.2018

Browse Source
This commit is contained in:
Daniel Schick 2018-03-21 08:59:31 +00:00
parent ad7417f03c
commit a70b020eef
18 changed files with 171 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -303,6 +303,20 @@ namespace ENI2.DetailViewControls
#endregion
/// <summary>
/// Beim Hinzufügen der allerersten Gefahrgutposition sollen die Flags vorbelegt werden
/// </summary>
void SetHAZGlobalFlags()
{
int totalCount = this.haz.MARPOLPositions.Count + this.haz.IMDGPositions.Count + this.haz.IGCPositions.Count + this.haz.IBCPositions.Count + this.haz.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;
}
}
#region MARPOL datagrid handlers
private void DataGridMARPOLItems_DeleteRequested(DatabaseEntity obj)
@ -334,6 +348,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();
};
if (eld.ShowDialog() ?? false)
@ -341,7 +356,7 @@ namespace ENI2.DetailViewControls
if (!haz.MARPOLPositions.Contains(eld.MARPOL))
haz.MARPOLPositions.Add(eld.MARPOL);
this.dataGridMARPOLItems.Items.Refresh();
this.SublistElementChanged(this.IsDeparture ? Message.NotificationClass.HAZD : Message.NotificationClass.HAZA);
this.SublistElementChanged(this.IsDeparture ? Message.NotificationClass.HAZD : Message.NotificationClass.HAZA);
}
}
@ -368,6 +383,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();
};
if (ebd.ShowDialog() ?? false)
@ -376,6 +392,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();
}
}
@ -412,6 +429,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();
};
if (eld.ShowDialog() ?? false)
@ -445,6 +463,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();
};
if (ebd.ShowDialog() ?? false)
@ -453,6 +472,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();
}
}
@ -489,6 +509,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();
};
if (eld.ShowDialog() ?? false)
@ -530,6 +551,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();
}
}
@ -566,6 +588,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();
};
if (eld.ShowDialog() ?? false)
@ -607,6 +630,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();
}
}
@ -651,6 +675,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();
}
}
@ -684,6 +709,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();
}
}

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

@ -93,7 +93,7 @@
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" Orientation="Horizontal">
<Button Name="buttonImportFromSEC" Margin="2" Content="{x:Static p:Resources.textImportFromSEC}" Width="120" VerticalAlignment="Center" Click="buttonImportFromSEC_Click" />
<Button Name="buttonImportFromSEC" Margin="2" Content="{x:Static p:Resources.textImportFromSEC}" Width="120" VerticalAlignment="Center" Click="buttonImportFromSEC_Click" Background="Transparent" />
</StackPanel>
<enictrl:ENIDataGrid Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" x:Name="dataGridPortOfCallLast30Days" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch"
SelectionMode="Extended" AutoGenerateColumns="False" Margin="0,5,0,0">

11
ENI-2/ENI2/ENI2/DetailViewControls/SecurityDetailControl.xaml
View File

@ -140,7 +140,15 @@
</Grid>
</TabItem>
<TabItem Header="{x:Static p:Resources.textShipToShip}" Name="tabShipToShip">
<enictrl:ENIDataGrid Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" x:Name="dataGridShip2ShipActivities" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch"
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="28" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" Orientation="Horizontal">
<Button Name="buttonImportFromL10P" Margin="2" Content="{x:Static p:Resources.textCopyFromL10P}" Width="220" VerticalAlignment="Center" Click="buttonImportFromL10P_Click" Background="Transparent" />
</StackPanel>
<enictrl:ENIDataGrid Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" x:Name="dataGridShip2ShipActivities" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch"
SelectionMode="Single" AutoGenerateColumns="False" Margin="0,5,0,0">
<DataGrid.Columns>
<DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
@ -154,6 +162,7 @@
<DataGridTextColumn Header="{x:Static p:Resources.textLongitudeDecimal}" Binding="{Binding ShipToShipActivityLocationCoordinatesLongitude, StringFormat={}{0:N0}}" IsReadOnly="True" Width="0.1*" />
</DataGrid.Columns>
</enictrl:ENIDataGrid>
</Grid>
</TabItem>
</TabControl>
</src:DetailBaseControl>

35
ENI-2/ENI2/ENI2/DetailViewControls/SecurityDetailControl.xaml.cs
View File

@ -384,6 +384,39 @@ namespace ENI2.DetailViewControls
#endregion
#region Copy l10p into Ship2Ship
private void buttonImportFromL10P_Click(object sender, RoutedEventArgs e)
{
if (this._sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.Count > 0)
{
MessageBox.Show(Properties.Resources.textOnlyIfGridIsEmpty, Properties.Resources.textCaptionError, MessageBoxButton.OK, MessageBoxImage.Warning);
}
else
{
foreach(LastTenPortFacilitiesCalled l10c in this._sec.LastTenPortFacilitesCalled)
{
ShipToShipActivitiesDuringLastTenPortFacilitiesCalled s2s = new ShipToShipActivitiesDuringLastTenPortFacilitiesCalled();
s2s.SEC = this._sec;
s2s.Identifier = ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.GetNewIdentifier(this._sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled);
s2s.ShipToShipActivityLocationName = l10c.PortFacilityPortName;
s2s.ShipToShipActivityLocationLoCode = l10c.PortFacilityPortLoCode;
s2s.ShipToShipActivityDateFrom = l10c.PortFacilityDateOfArrival;
s2s.ShipToShipActivityDateTo = l10c.PortFacilityDateOfDeparture;
s2s.ShipToShipActivitySecurityMattersToReport = l10c.PortFacilitySecurityMattersToReport;
this._sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.Add(s2s);
}
if(this._sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.Count > 0)
{
this.dataGridShip2ShipActivities.Items.Refresh();
this.SublistElementChanged(Message.NotificationClass.SEC);
}
}
}
#endregion
#region enable / disable controls
private void CheckBoxKielCanalPassagePlanned_Checked(object sender, RoutedEventArgs e)
@ -448,7 +481,7 @@ namespace ENI2.DetailViewControls
e.Handled = true;
}
#endregion
#endregion
}
}

2
ENI-2/ENI2/ENI2/ENI2.csproj
View File

@ -35,7 +35,7 @@
<MinimumRequiredVersion>3.5.1.0</MinimumRequiredVersion>
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.html</WebPage>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationRevision>1</ApplicationRevision>
<ApplicationVersion>5.0.3.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>

9
ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs generated
View File

@ -1430,6 +1430,15 @@ namespace ENI2.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to Copy from last 10 port facilities called.
/// </summary>
public static string textCopyFromL10P {
get {
return ResourceManager.GetString("textCopyFromL10P", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Copy to HAZD.
/// </summary>

3
ENI-2/ENI2/ENI2/Properties/Resources.resx
View File

@ -1636,4 +1636,7 @@
<data name="id_card_new" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\id_card_new.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="textCopyFromL10P" xml:space="preserve">
<value>Copy from last 10 port facilities called</value>
</data>
</root>

BIN
Stundensheet.xlsx
View File

Binary file not shown.

6
nsw/Source/bsmd.database/BPOL.cs
View File

@ -179,7 +179,11 @@ namespace bsmd.database
bpol.poi = new ObservableCollection<DatabaseEntity>();
foreach (PortOfItinerary po in this.PortOfItineraries)
bpol.PortOfItineraries.Add(po.Clone() as PortOfItinerary);
{
PortOfItinerary clonedPO = po.Clone() as PortOfItinerary;
clonedPO.BPOL = bpol;
bpol.PortOfItineraries.Add(clonedPO);
}
return bpol;
}

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

@ -486,15 +486,35 @@ namespace bsmd.database
haz.marpolPositions = new ObservableCollection<DatabaseEntity>();
foreach (IMDGPosition imdgPosition in this.IMDGPositions)
haz.IMDGPositions.Add(imdgPosition.Clone() as IMDGPosition);
{
IMDGPosition clonedIMDG = imdgPosition.Clone() as IMDGPosition;
clonedIMDG.HAZ = haz;
haz.IMDGPositions.Add(clonedIMDG);
}
foreach (IGCPosition igcPosition in this.IGCPositions)
haz.IGCPositions.Add(igcPosition.Clone() as IGCPosition);
{
IGCPosition clonedIGC = igcPosition.Clone() as IGCPosition;
clonedIGC.HAZ = haz;
haz.IGCPositions.Add(clonedIGC);
}
foreach (IBCPosition ibcPosition in this.IBCPositions)
haz.IBCPositions.Add(ibcPosition.Clone() as IBCPosition);
{
IBCPosition clonedIBC = ibcPosition.Clone() as IBCPosition;
clonedIBC.HAZ = haz;
haz.IBCPositions.Add(clonedIBC);
}
foreach (IMSBCPosition imsbcPosition in this.IMSBCPositions)
haz.IMSBCPositions.Add(imsbcPosition.Clone() as IMSBCPosition);
{
IMSBCPosition clonedIMSBC = imsbcPosition.Clone() as IMSBCPosition;
clonedIMSBC.HAZ = haz;
haz.IMSBCPositions.Add(clonedIMSBC);
}
foreach (MARPOL_Annex_I_Position marpolPosition in this.MARPOLPositions)
haz.MARPOLPositions.Add(marpolPosition.Clone() as MARPOL_Annex_I_Position);
{
MARPOL_Annex_I_Position clonedMARPOL = marpolPosition.Clone() as MARPOL_Annex_I_Position;
clonedMARPOL.HAZ = haz;
haz.MARPOLPositions.Add(clonedMARPOL);
}
return haz;
}

6
nsw/Source/bsmd.database/IMDGPosition.cs
View File

@ -526,7 +526,11 @@ namespace bsmd.database
imdg.subsidiaryRisksList = new List<SubsidiaryRisks>();
foreach (SubsidiaryRisks sr in this.SubsidiaryRiskList)
imdg.SubsidiaryRiskList.Add(sr.Clone() as SubsidiaryRisks);
{
SubsidiaryRisks clonedSR = sr.Clone() as SubsidiaryRisks;
clonedSR.IMDGPosition = imdg;
imdg.SubsidiaryRiskList.Add(clonedSR);
}
return imdg;
}

24
nsw/Source/bsmd.database/MDH.cs
View File

@ -576,16 +576,32 @@ namespace bsmd.database
mdh.stowawaysJoiningLocations = new ObservableCollection<DatabaseEntity>();
foreach (InfectedArea ia in this.InfectedAreas)
mdh.InfectedAreas.Add(ia.Clone() as InfectedArea);
{
InfectedArea clonedIA = ia.Clone() as InfectedArea;
clonedIA.MDH = mdh;
mdh.InfectedAreas.Add(clonedIA);
}
foreach (PortOfCallLast30Days poc in this.PortOfCallLast30Days)
mdh.PortOfCallLast30Days.Add(poc.Clone() as PortOfCallLast30Days);
{
PortOfCallLast30Days clonedPOC = poc.Clone() as PortOfCallLast30Days;
clonedPOC.MDH = mdh;
mdh.PortOfCallLast30Days.Add(clonedPOC);
}
foreach (SanitaryMeasuresDetail smd in this.sanitaryMeasuresDetails)
mdh.SanitaryMeasuresDetails.Add(smd.Clone() as SanitaryMeasuresDetail);
{
SanitaryMeasuresDetail clonedSMD = smd.Clone() as SanitaryMeasuresDetail;
clonedSMD.MDH = mdh;
mdh.SanitaryMeasuresDetails.Add(clonedSMD);
}
foreach (StowawaysJoiningLocation sjl in this.StowawaysJoiningLocations)
mdh.StowawaysJoiningLocations.Add(sjl.Clone() as StowawaysJoiningLocation);
{
StowawaysJoiningLocation clonedSJL = sjl.Clone() as StowawaysJoiningLocation;
clonedSJL.MDH = mdh;
mdh.StowawaysJoiningLocations.Add(clonedSJL);
}
return mdh;
}

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

@ -313,7 +313,11 @@ namespace bsmd.database
noanod.callPurposes = new ObservableCollection<DatabaseEntity>();
foreach (CallPurpose cp in this.CallPurposes)
noanod.CallPurposes.Add(cp.Clone() as CallPurpose);
{
CallPurpose clonedCP = cp.Clone() as CallPurpose;
clonedCP.NOA_NOD = noanod;
noanod.CallPurposes.Add(clonedCP);
}
return noanod;
}

6
nsw/Source/bsmd.database/PortOfCallLast30Days.cs
View File

@ -275,7 +275,11 @@ namespace bsmd.database
p30.poc30Crew = new List<DatabaseEntity>();
foreach (PortOfCallLast30DaysCrewJoinedShip p30Crew in this.CrewJoinedShip)
p30.CrewJoinedShip.Add(p30Crew.Clone() as PortOfCallLast30DaysCrewJoinedShip);
{
PortOfCallLast30DaysCrewJoinedShip clonedP30Crew = p30Crew.Clone() as PortOfCallLast30DaysCrewJoinedShip;
clonedP30Crew.PortOfCallLast30Days = p30;
p30.CrewJoinedShip.Add(clonedP30Crew);
}
return p30;
}

12
nsw/Source/bsmd.database/SEC.cs
View File

@ -428,10 +428,18 @@ namespace bsmd.database
sec.ltpfc = new ObservableCollection<DatabaseEntity>();
foreach (LastTenPortFacilitiesCalled ltp in this.LastTenPortFacilitesCalled)
sec.LastTenPortFacilitesCalled.Add(ltp.Clone() as bsmd.database.LastTenPortFacilitiesCalled);
{
bsmd.database.LastTenPortFacilitiesCalled clonedLTP = ltp.Clone() as bsmd.database.LastTenPortFacilitiesCalled;
clonedLTP.SEC = sec;
sec.LastTenPortFacilitesCalled.Add(clonedLTP);
}
foreach (ShipToShipActivitiesDuringLastTenPortFacilitiesCalled s2s in this.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled)
sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.Add(s2s.Clone() as bsmd.database.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled);
{
ShipToShipActivitiesDuringLastTenPortFacilitiesCalled clonedS2S = s2s.Clone() as ShipToShipActivitiesDuringLastTenPortFacilitiesCalled;
clonedS2S.SEC = sec;
sec.ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.Add(clonedS2S);
}
return sec;
}

12
nsw/Source/bsmd.database/WAS.cs
View File

@ -450,10 +450,18 @@ namespace bsmd.database
was.wdsp = new ObservableCollection<DatabaseEntity>();
foreach (Waste waste in this.Waste)
was.Waste.Add(waste.Clone() as Waste);
{
Waste clonedWaste = waste.Clone() as Waste;
clonedWaste.WAS = was;
was.Waste.Add(clonedWaste);
}
foreach (WasteDisposalServiceProvider wdsp in this.WasteDisposalServiceProvider)
was.WasteDisposalServiceProvider.Add(wdsp.Clone() as WasteDisposalServiceProvider);
{
WasteDisposalServiceProvider clonedWDSP = wdsp.Clone() as WasteDisposalServiceProvider;
clonedWDSP.WAS = was;
was.WasteDisposalServiceProvider.Add(clonedWDSP);
}
return was;

4
nsw/Source/bsmd.dbh.ResponseService/IResponseService.cs
View File

@ -1,10 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.Serialization;
using System.ServiceModel;
using System.ServiceModel.Web;
using System.Text;
namespace bsmd.dbh.ResponseService
{

2
nsw/dbh/NSWResponse.xsd
View File

@ -152,7 +152,7 @@
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Messages">
<xs:element minOccurs="0" name="Messages">
<xs:annotation>
<xs:documentation>Errors, Violations, etc.</xs:documentation>
</xs:annotation>