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

Merge branch 'release/eni_7.0.3'

Browse Source
This commit is contained in:
Daniel Schick 2022-04-13 16:30:56 +02:00
commit 424d118ab8
7 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ENI2/ENI2.csproj
View File

@ -36,8 +36,8 @@
<MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion> <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
<CreateWebPageOnPublish>true</CreateWebPageOnPublish> <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.html</WebPage> <WebPage>publish.html</WebPage>
<ApplicationRevision>3</ApplicationRevision> <ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>7.0.2.3</ApplicationVersion> <ApplicationVersion>7.0.3.0</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut> <CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted> <PublishWizardCompleted>true</PublishWizardCompleted>

1
ENI2/EditControls/EditCREWDialog.xaml.cs
View File

@ -47,6 +47,7 @@ namespace ENI2.EditControls
this.textBoxVisaNumber.Text = this.CREW.CrewMemberVisaNumber; this.textBoxVisaNumber.Text = this.CREW.CrewMemberVisaNumber;
this.comboBoxIssuingState.ItemsSource = bsmd.database.CREW.NationalityDict; this.comboBoxIssuingState.ItemsSource = bsmd.database.CREW.NationalityDict;
this.comboBoxIssuingState.SelectedValue = this.CREW.CrewMemberIdentityDocumentIssuingState; this.comboBoxIssuingState.SelectedValue = this.CREW.CrewMemberIdentityDocumentIssuingState;
if(this.CREW.CrewMemberIdentityDocumentExpiryDate.HasValue)
this.datePickerExpiryDate.SelectedDate = this.CREW.CrewMemberIdentityDocumentExpiryDate; this.datePickerExpiryDate.SelectedDate = this.CREW.CrewMemberIdentityDocumentExpiryDate;
// this.comboBoxCountryOfBirth.ItemsSource = bsmd.database.CREW.NationalityDict; // XXX: TODO // this.comboBoxCountryOfBirth.ItemsSource = bsmd.database.CREW.NationalityDict; // XXX: TODO
// this.comboBoxCountryOfBirth.SelectedValue = this.CREW.CrewMemberCountryOfBirth; // this.comboBoxCountryOfBirth.SelectedValue = this.CREW.CrewMemberCountryOfBirth;

1
ENI2/EditControls/EditPasDialog.xaml.cs
View File

@ -49,6 +49,7 @@ namespace ENI2.EditControls
this.checkBoxTransitPassenger.IsChecked = this.PAS.PassengerInTransit; this.checkBoxTransitPassenger.IsChecked = this.PAS.PassengerInTransit;
this.comboBoxIssuingState.ItemsSource = bsmd.database.CREW.NationalityDict; this.comboBoxIssuingState.ItemsSource = bsmd.database.CREW.NationalityDict;
this.comboBoxIssuingState.SelectedValue = this.PAS.PassengerIdentityDocumentIssuingState; this.comboBoxIssuingState.SelectedValue = this.PAS.PassengerIdentityDocumentIssuingState;
if(this.PAS.PassengerIdentityDocumentExpiryDate.HasValue)
this.datePickerExpiryDate.SelectedDate = this.PAS.PassengerIdentityDocumentExpiryDate; this.datePickerExpiryDate.SelectedDate = this.PAS.PassengerIdentityDocumentExpiryDate;
// XXX : TODO // XXX : TODO
//this.comboBoxCountryOfBirth.ItemsSource = bsmd.database.CREW.NationalityDict; //this.comboBoxCountryOfBirth.ItemsSource = bsmd.database.CREW.NationalityDict;

2
ENI2/Excel/ExcelWriter.cs
View File

@ -466,7 +466,7 @@ namespace ENI2.Excel
string mouBaltic = isArrival ? "HAZA.MOUBaltic" : "HAZD.MOUBaltic"; string mouBaltic = isArrival ? "HAZA.MOUBaltic" : "HAZD.MOUBaltic";
string shipClass = isArrival ? "HAZA.INFShipClass" : "HAZD.INFShipClass"; string shipClass = isArrival ? "HAZA.INFShipClass" : "HAZD.INFShipClass";
HAZ haz = hazMessage.Elements[0] as HAZ; HAZ haz = hazMessage.Elements[0] as HAZ;
WriteBoolean(noDPGOnBoard, haz.NoDPGOnBoardOnArrival); WriteBoolean(noDPGOnBoard, !haz.NoDPGOnBoardOnArrival); // inverted "logic" in exported sheet
WriteBoolean(dpgManifestOnBoard, haz.DPGManifestOnBoardOnArrival); WriteBoolean(dpgManifestOnBoard, haz.DPGManifestOnBoardOnArrival);
WriteText(dpgContactFamilyName, haz.DPGContactFamilyName); WriteText(dpgContactFamilyName, haz.DPGContactFamilyName);
WriteText(dpgContactPhone, haz.DPGContactPhone); WriteText(dpgContactPhone, haz.DPGContactPhone);

12
bsmd.hisnord/Request.cs
View File

@ -1619,15 +1619,15 @@ namespace bsmd.hisnord
hn_towa.TowageOnArrival[i] = hn_arrival; hn_towa.TowageOnArrival[i] = hn_arrival;
if (towa.TowageOnArrivalBeam_MTR.HasValue) if (towa.TowageOnArrivalBeam_MTR.HasValue)
hn_arrival.TowageOnArrivalBeam_MTR = (decimal)towa.TowageOnArrivalBeam_MTR.Value; hn_arrival.TowageOnArrivalBeam_MTR = decimal.Round((decimal)towa.TowageOnArrivalBeam_MTR.Value, 2);
if (towa.TowageOnArrivalDraught_DMT.HasValue) if (towa.TowageOnArrivalDraught_DMT.HasValue)
hn_arrival.TowageOnArrivalDraught_DMT = (decimal)towa.TowageOnArrivalDraught_DMT.Value; hn_arrival.TowageOnArrivalDraught_DMT = decimal.Round((decimal)towa.TowageOnArrivalDraught_DMT.Value, 1);
if(!towa.TowageOnArrivalFlag.IsNullOrEmpty()) if(!towa.TowageOnArrivalFlag.IsNullOrEmpty())
hn_arrival.TowageOnArrivalFlag = towa.TowageOnArrivalFlag; hn_arrival.TowageOnArrivalFlag = towa.TowageOnArrivalFlag;
if (towa.TowageOnArrivalGrossTonnage.HasValue) if (towa.TowageOnArrivalGrossTonnage.HasValue)
hn_arrival.TowageOnArrivalGrossTonnage = towa.TowageOnArrivalGrossTonnage.Value.ToString(); hn_arrival.TowageOnArrivalGrossTonnage = towa.TowageOnArrivalGrossTonnage.Value.ToString();
if (towa.TowageOnArrivalLengthOverall_MTR.HasValue) if (towa.TowageOnArrivalLengthOverall_MTR.HasValue)
hn_arrival.TowageOnArrivalLengthOverall_MTR = (decimal)towa.TowageOnArrivalLengthOverall_MTR.Value; hn_arrival.TowageOnArrivalLengthOverall_MTR = decimal.Round((decimal)towa.TowageOnArrivalLengthOverall_MTR.Value, 2);
if(!towa.TowageOnArrivalName.IsNullOrEmpty()) if(!towa.TowageOnArrivalName.IsNullOrEmpty())
hn_arrival.TowageOnArrivalName = towa.TowageOnArrivalName; hn_arrival.TowageOnArrivalName = towa.TowageOnArrivalName;
@ -1682,9 +1682,9 @@ namespace bsmd.hisnord
hn_departure.TowageOnDepartureBeam_MTRSpecified = towd.TowageOnDepartureBeam_MTR.HasValue; hn_departure.TowageOnDepartureBeam_MTRSpecified = towd.TowageOnDepartureBeam_MTR.HasValue;
if (hn_departure.TowageOnDepartureBeam_MTRSpecified) if (hn_departure.TowageOnDepartureBeam_MTRSpecified)
hn_departure.TowageOnDepartureBeam_MTR = (decimal)towd.TowageOnDepartureBeam_MTR.Value; hn_departure.TowageOnDepartureBeam_MTR = decimal.Round((decimal)towd.TowageOnDepartureBeam_MTR.Value, 2);
if (towd.TowageOnDepartureDraught_DMT.HasValue) if (towd.TowageOnDepartureDraught_DMT.HasValue)
hn_departure.TowageOnDepartureDraught_DMT = (decimal)towd.TowageOnDepartureDraught_DMT.Value; hn_departure.TowageOnDepartureDraught_DMT = decimal.Round((decimal)towd.TowageOnDepartureDraught_DMT.Value, 1);
if(!towd.TowageOnDepartureFlag.IsNullOrEmpty()) if(!towd.TowageOnDepartureFlag.IsNullOrEmpty())
hn_departure.TowageOnDepartureFlag = towd.TowageOnDepartureFlag; hn_departure.TowageOnDepartureFlag = towd.TowageOnDepartureFlag;
if(!towd.TowageOnDepartureName.IsNullOrEmpty()) if(!towd.TowageOnDepartureName.IsNullOrEmpty())
@ -1709,7 +1709,7 @@ namespace bsmd.hisnord
hn_departure.TowageOnDepartureLengthOverall_MTRSpecified = towd.TowageOnDepartureLengthOverall_MTR.HasValue; hn_departure.TowageOnDepartureLengthOverall_MTRSpecified = towd.TowageOnDepartureLengthOverall_MTR.HasValue;
if (hn_departure.TowageOnDepartureLengthOverall_MTRSpecified) if (hn_departure.TowageOnDepartureLengthOverall_MTRSpecified)
hn_departure.TowageOnDepartureLengthOverall_MTR = (decimal)towd.TowageOnDepartureLengthOverall_MTR.Value; hn_departure.TowageOnDepartureLengthOverall_MTR = decimal.Round((decimal)towd.TowageOnDepartureLengthOverall_MTR.Value, 2);
if(!towd.TowageOnDepartureRemarks.IsNullOrEmpty()) if(!towd.TowageOnDepartureRemarks.IsNullOrEmpty())
hn_departure.TowageOnDepartureRemarks = towd.TowageOnDepartureRemarks; hn_departure.TowageOnDepartureRemarks = towd.TowageOnDepartureRemarks;
} }

BIN
misc/db.sqlite
View File

Binary file not shown.

1
misc/info_deployment.txt
View File

@ -6,3 +6,4 @@ auswählen, das am 15.7.22 abläuft. Das Test Zertifikat läuft am 12.11.22 ab.
Auswahl über "Select from Store.." Auswahl über "Select from Store.."
5) komplett neu bauen (clean!) 5) komplett neu bauen (clean!)
6) In Description bei Product name "ENI" statt "ENI Testversion" 6) In Description bei Product name "ENI" statt "ENI Testversion"
7) Build-Typ auf "Release"