From 493a3dee8f323ae0e9e0e8be4d7dd9f324c0c2de Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Tue, 12 Apr 2022 08:10:46 +0200 Subject: [PATCH] Kleinigkeiten korrigiert --- ENI2/ENI2.csproj | 4 ++-- ENI2/EditControls/EditCREWDialog.xaml.cs | 3 ++- ENI2/EditControls/EditPasDialog.xaml.cs | 3 ++- ENI2/Excel/ExcelWriter.cs | 2 +- misc/db.sqlite | Bin 14106624 -> 14106624 bytes 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj index 7d567f8c..17c558b6 100644 --- a/ENI2/ENI2.csproj +++ b/ENI2/ENI2.csproj @@ -36,8 +36,8 @@ 5.4.0.0 true publish.html - 3 - 7.0.2.3 + 0 + 7.0.3.0 false true true diff --git a/ENI2/EditControls/EditCREWDialog.xaml.cs b/ENI2/EditControls/EditCREWDialog.xaml.cs index fda9db33..91b20c30 100644 --- a/ENI2/EditControls/EditCREWDialog.xaml.cs +++ b/ENI2/EditControls/EditCREWDialog.xaml.cs @@ -47,7 +47,8 @@ namespace ENI2.EditControls this.textBoxVisaNumber.Text = this.CREW.CrewMemberVisaNumber; this.comboBoxIssuingState.ItemsSource = bsmd.database.CREW.NationalityDict; this.comboBoxIssuingState.SelectedValue = this.CREW.CrewMemberIdentityDocumentIssuingState; - this.datePickerExpiryDate.SelectedDate = this.CREW.CrewMemberIdentityDocumentExpiryDate; + if(this.CREW.CrewMemberIdentityDocumentExpiryDate.HasValue) + this.datePickerExpiryDate.SelectedDate = this.CREW.CrewMemberIdentityDocumentExpiryDate; // this.comboBoxCountryOfBirth.ItemsSource = bsmd.database.CREW.NationalityDict; // XXX: TODO // this.comboBoxCountryOfBirth.SelectedValue = this.CREW.CrewMemberCountryOfBirth; // this.textBoxEffects.Text = this.CREW.Effects; diff --git a/ENI2/EditControls/EditPasDialog.xaml.cs b/ENI2/EditControls/EditPasDialog.xaml.cs index 53494ac0..f4587979 100644 --- a/ENI2/EditControls/EditPasDialog.xaml.cs +++ b/ENI2/EditControls/EditPasDialog.xaml.cs @@ -49,7 +49,8 @@ namespace ENI2.EditControls this.checkBoxTransitPassenger.IsChecked = this.PAS.PassengerInTransit; this.comboBoxIssuingState.ItemsSource = bsmd.database.CREW.NationalityDict; this.comboBoxIssuingState.SelectedValue = this.PAS.PassengerIdentityDocumentIssuingState; - this.datePickerExpiryDate.SelectedDate = this.PAS.PassengerIdentityDocumentExpiryDate; + if(this.PAS.PassengerIdentityDocumentExpiryDate.HasValue) + this.datePickerExpiryDate.SelectedDate = this.PAS.PassengerIdentityDocumentExpiryDate; // XXX : TODO //this.comboBoxCountryOfBirth.ItemsSource = bsmd.database.CREW.NationalityDict; //this.comboBoxCountryOfBirth.SelectedValue = this.PAS.PassengerCountryOfBirth; diff --git a/ENI2/Excel/ExcelWriter.cs b/ENI2/Excel/ExcelWriter.cs index 580074c5..9a0c9098 100644 --- a/ENI2/Excel/ExcelWriter.cs +++ b/ENI2/Excel/ExcelWriter.cs @@ -466,7 +466,7 @@ namespace ENI2.Excel string mouBaltic = isArrival ? "HAZA.MOUBaltic" : "HAZD.MOUBaltic"; string shipClass = isArrival ? "HAZA.INFShipClass" : "HAZD.INFShipClass"; HAZ haz = hazMessage.Elements[0] as HAZ; - WriteBoolean(noDPGOnBoard, haz.NoDPGOnBoardOnArrival); + WriteBoolean(noDPGOnBoard, !haz.NoDPGOnBoardOnArrival); // inverted "logic" in exported sheet WriteBoolean(dpgManifestOnBoard, haz.DPGManifestOnBoardOnArrival); WriteText(dpgContactFamilyName, haz.DPGContactFamilyName); WriteText(dpgContactPhone, haz.DPGContactPhone); diff --git a/misc/db.sqlite b/misc/db.sqlite index f9050a716cbff63cf4137aeb7ad3f6050bdcfa96..eb2c3e29df6ca922eb2a7380883ef75b40b9d4c0 100644 GIT binary patch delta 702 zcmWO2Q+p5q7(n4?*>=memTlWU*|rx>u4UVc3v1bK8F&4czKiz{yvfP`awLa6WfM~O zCU#CpU5_M47Rf5vB)jC0oRUj&OCHH9`6Ry-kb+W33QG|wD#fI@l#r5AN=i!^DJzLm zPRdIKsVJ4CvQ&|(QcbE$4XG)$q_)(Nx>8T-O9N>rjij+OktAs<&7`@ske1R)T1y*g zEA6DcbdZkHNjggx=_=i%yY!Hr(o1?vAL%Roq`wT1fig%2%MckV!(_OOkdZPaGEe5q0$C`FWU(xfrLs(x%L-X3t7NsT zk+rf;l4ZSYkd3lQl+Ch5w#qiyE<0qW?2_G*B70=7?34X+Kn}_wIV?xys2r2yazakZ zDLE}?N^KwBh$|bohS0q)g$~CzzH{_<=k~Fz3cjT_zlXSVCPR6X1gf3e$Q!>JX z@Gv|IkHeGjG&~E>!;A1Tyb7~0?F5&MCK-GPmP*xlGQ^G6tY2m1$hB=Rpd z5~Rh&WTwX_#$=`-F_KU6O93e;u~JA1OA#q5#iY2DkdjhLN=q3jE9IoTRFH~NNh(Vf zsVZ?2FV&>F)R3A|OKM9UsVnuQzBG`A(nuOh6KN{Vq`4$W3u!5>q_wn>w$e`8O9$yF zouspLk*?BBx=Rn~DZM07dP^VaEB&Ou43L2`NCwLg87jkMxQvjIGD=3v7#S<$WV}p} zi84th%M_U^(}<9O_c4DDm!GS?2_HGNA}7-iAtKJ%YHc^2j!3)mJB%}N9C9t zmlJYQPRVIGBWLBDoR;6?B