From af9117d717fead3ee92b081d575d40fca665ca7c Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Wed, 21 Feb 2018 16:16:05 +0000 Subject: [PATCH] 3.9.11: Kleine Korrekturen zwischenzeitlich aufgelaufen sind --- .../OverViewDetailControl.xaml.cs | 15 +- .../PortCallDetailControl.xaml | 20 +- ENI-2/ENI2/ENI2/ENI2.csproj | 4 +- ENI-2/ENI2/ENI2/SucheControl.xaml.cs | 4 +- Stundensheet.xlsx | Bin 36244 -> 36342 bytes nsw/HIS-NORD/xsd.5.0.2018/agent_reeder.xsd | 19 + nsw/HIS-NORD/xsd.5.0.2018/basic_types.xsd | 191 + nsw/HIS-NORD/xsd.5.0.2018/bpol_reeder.xsd | 18 + nsw/HIS-NORD/xsd.5.0.2018/bunker_reeder.xsd | 24 + nsw/HIS-NORD/xsd.5.0.2018/crew_reeder.xsd | 26 + nsw/HIS-NORD/xsd.5.0.2018/hazmat_reeder.xsd | 287 + nsw/HIS-NORD/xsd.5.0.2018/his-nord.cs | 5674 +++++++++++++++++ .../his-nord_nsw_v-1-0_all_reeder.xsd | 195 + nsw/HIS-NORD/xsd.5.0.2018/info_reeder.xsd | 27 + nsw/HIS-NORD/xsd.5.0.2018/mdh_reeder.xsd | 80 + nsw/HIS-NORD/xsd.5.0.2018/noanod_reeder.xsd | 33 + nsw/HIS-NORD/xsd.5.0.2018/owner_reeder.xsd | 41 + nsw/HIS-NORD/xsd.5.0.2018/pas_reeder.xsd | 28 + nsw/HIS-NORD/xsd.5.0.2018/pob_reeder.xsd | 29 + .../xsd.5.0.2018/prearrival72_reeder.xsd | 41 + nsw/HIS-NORD/xsd.5.0.2018/sec_reeder.xsd | 142 + nsw/HIS-NORD/xsd.5.0.2018/serv_reeder.xsd | 19 + nsw/HIS-NORD/xsd.5.0.2018/tow_reeder.xsd | 68 + nsw/HIS-NORD/xsd.5.0.2018/vessel_reeder.xsd | 98 + nsw/HIS-NORD/xsd.5.0.2018/waste_reeder.xsd | 62 + .../Properties/AssemblyProductInfo.cs | 4 +- .../Properties/AssemblyProjectInfo.cs | 2 +- ...vitiesDuringLastTenPortFacilitiesCalled.cs | 9 +- nsw/Source/bsmd.database/Waste.cs | 6 +- 29 files changed, 7140 insertions(+), 26 deletions(-) create mode 100644 nsw/HIS-NORD/xsd.5.0.2018/agent_reeder.xsd create mode 100644 nsw/HIS-NORD/xsd.5.0.2018/basic_types.xsd create mode 100644 nsw/HIS-NORD/xsd.5.0.2018/bpol_reeder.xsd create mode 100644 nsw/HIS-NORD/xsd.5.0.2018/bunker_reeder.xsd create mode 100644 nsw/HIS-NORD/xsd.5.0.2018/crew_reeder.xsd create mode 100644 nsw/HIS-NORD/xsd.5.0.2018/hazmat_reeder.xsd create mode 100644 nsw/HIS-NORD/xsd.5.0.2018/his-nord.cs create mode 100644 nsw/HIS-NORD/xsd.5.0.2018/his-nord_nsw_v-1-0_all_reeder.xsd create mode 100644 nsw/HIS-NORD/xsd.5.0.2018/info_reeder.xsd create mode 100644 nsw/HIS-NORD/xsd.5.0.2018/mdh_reeder.xsd create mode 100644 nsw/HIS-NORD/xsd.5.0.2018/noanod_reeder.xsd create mode 100644 nsw/HIS-NORD/xsd.5.0.2018/owner_reeder.xsd create mode 100644 nsw/HIS-NORD/xsd.5.0.2018/pas_reeder.xsd create mode 100644 nsw/HIS-NORD/xsd.5.0.2018/pob_reeder.xsd create mode 100644 nsw/HIS-NORD/xsd.5.0.2018/prearrival72_reeder.xsd create mode 100644 nsw/HIS-NORD/xsd.5.0.2018/sec_reeder.xsd create mode 100644 nsw/HIS-NORD/xsd.5.0.2018/serv_reeder.xsd create mode 100644 nsw/HIS-NORD/xsd.5.0.2018/tow_reeder.xsd create mode 100644 nsw/HIS-NORD/xsd.5.0.2018/vessel_reeder.xsd create mode 100644 nsw/HIS-NORD/xsd.5.0.2018/waste_reeder.xsd diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs index 1e97b4c1..5b7cfbb8 100644 --- a/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs +++ b/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs @@ -660,14 +660,21 @@ namespace ENI2.DetailViewControls private void buttonCreatePDF_Click(object sender, RoutedEventArgs e) { + bool aMessageToReportPDFFound = false; + for(int i = 0; i < this.dataGridMessages.SelectedItems.Count; i++) { Message selectedMessage = this.dataGridMessages.SelectedItems[i] as Message; - selectedMessage.InternalStatus = Message.BSMDStatus.REPORT; - selectedMessage.ReportingPartyId = App.UserId; // wichtig damit der Richtige(!) die Mail mit dem PDF bekommt - DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(selectedMessage); + if ((selectedMessage.InternalStatus != Message.BSMDStatus.SENT) && (selectedMessage.InternalStatus != Message.BSMDStatus.TOSEND)) + { + aMessageToReportPDFFound = true; + selectedMessage.InternalStatus = Message.BSMDStatus.REPORT; + selectedMessage.ReportingPartyId = App.UserId; // wichtig damit der Richtige(!) die Mail mit dem PDF bekommt + DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(selectedMessage); + } } - if (this.dataGridMessages.SelectedItems.Count > 0) + + if (aMessageToReportPDFFound) { this.Core.ReportStatus = MessageCore.ReportStatusEnum.SINGLE; DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(this.Core); diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/PortCallDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/PortCallDetailControl.xaml index 90210d54..3b607eb8 100644 --- a/ENI-2/ENI2/ENI2/DetailViewControls/PortCallDetailControl.xaml +++ b/ENI-2/ENI2/ENI2/DetailViewControls/PortCallDetailControl.xaml @@ -98,16 +98,16 @@