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

Korrekturen

Browse Source
This commit is contained in:
Daniel Schick 2023-08-02 17:15:32 +02:00
parent c1b7bce386
commit f4fd9595a1
6 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ENI2/DetailViewControls/PortNotificationDetailControl.xaml.cs
View File

@ -491,7 +491,7 @@ namespace ENI2.DetailViewControls
{
PortAreaInfo pai = this.comboBoxPortAreaHelper.SelectedItem as PortAreaInfo;
// this.comboBoxPortAreaHelper.ToolTip = $"{pai.Remark} Ships: {pai.Ships} Agentur: {pai.Agency} Liegeplatz: {pai.Berth}";
this.textBlockPortAreaRemarks.Text = $"Ag:{pai.Agency} Ship:{pai.Ships} :{pai.Remark}";
this.textBlockPortAreaRemarks.Text = $"Agency:{pai.Agency}\nShip:{pai.Ships}\nRemark:{pai.Remark}";
}
}

2
ENI2/ENI2.csproj
View File

@ -36,7 +36,7 @@
<MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.html</WebPage>
<ApplicationRevision>2</ApplicationRevision>
<ApplicationRevision>4</ApplicationRevision>
<ApplicationVersion>7.13.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>

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

@ -2,6 +2,7 @@
// Description: CREW Bearbeitungsdialog
//
using System;
using System.Windows;
using bsmd.database;
@ -15,6 +16,9 @@ namespace ENI2.EditControls
/// </summary>
public partial class EditCREWDialog : EditWindowBase
{
private static DateTime MAXDATE = new DateTime(2198, 12, 31);
public EditCREWDialog()
{
InitializeComponent();
@ -35,15 +39,25 @@ namespace ENI2.EditControls
this.textBoxPlaceOfBirth.Text = this.CREW.CrewMemberPlaceOfBirth;
this.comboBoxNationality.ItemsSource = bsmd.database.CREW.NationalityDict;
this.comboBoxNationality.SelectedValue = this.CREW.CrewMemberNationality;
this.datePickerDateOfBirth.SelectedDate = this.CREW.CrewMemberDateOfBirth;
if (this.CREW.CrewMemberDateOfBirth > MAXDATE)
this.CREW.CrewMemberDateOfBirth = MAXDATE;
else
this.datePickerDateOfBirth.SelectedDate = this.CREW.CrewMemberDateOfBirth;
this.comboBoxIdDocType.ItemsSource = GlobalStructures.IDDocTypeDict;
this.comboBoxIdDocType.SelectedValue = this.CREW.CrewMemberIdentityDocumentType?.ToString();
this.textBoxIdDocNumber.Text = this.CREW.CrewMemberIdentityDocumentId;
this.textBoxVisaNumber.Text = this.CREW.CrewMemberVisaNumber;
this.comboBoxIssuingState.ItemsSource = bsmd.database.CREW.NationalityDict;
this.comboBoxIssuingState.SelectedValue = this.CREW.CrewMemberIdentityDocumentIssuingState;
if(this.CREW.CrewMemberIdentityDocumentExpiryDate.HasValue)
this.datePickerExpiryDate.SelectedDate = this.CREW.CrewMemberIdentityDocumentExpiryDate;
if (this.CREW.CrewMemberIdentityDocumentExpiryDate > MAXDATE)
{
this.datePickerExpiryDate.SelectedDate = MAXDATE;
}
else
{
if (this.CREW.CrewMemberIdentityDocumentExpiryDate.HasValue)
this.datePickerExpiryDate.SelectedDate = MAXDATE;
}
// this.comboBoxCountryOfBirth.ItemsSource = bsmd.database.CREW.NationalityDict; // XXX: TODO
// this.comboBoxCountryOfBirth.SelectedValue = this.CREW.CrewMemberCountryOfBirth;
// this.textBoxEffects.Text = this.CREW.Effects;

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

@ -2,6 +2,7 @@
// Description: PAS Bearbeitungsdialog
//
using System;
using System.Windows;
using bsmd.database;
@ -15,6 +16,9 @@ namespace ENI2.EditControls
/// </summary>
public partial class EditPASDialog : EditWindowBase
{
private static DateTime MAXDATE = new DateTime(2198, 12, 31);
public EditPASDialog()
{
InitializeComponent();
@ -34,7 +38,10 @@ namespace ENI2.EditControls
this.textBoxPlaceOfBirth.Text = this.PAS.PassengerPlaceOfBirth;
this.comboBoxNationality.ItemsSource = bsmd.database.CREW.NationalityDict;
this.comboBoxNationality.SelectedValue = this.PAS.PassengerNationality;
this.datePickerDateOfBirth.SelectedDate = this.PAS.PassengerDateOfBirth;
if (this.PAS.PassengerDateOfBirth > MAXDATE)
this.datePickerDateOfBirth.SelectedDate = MAXDATE;
else
this.datePickerDateOfBirth.SelectedDate = this.PAS.PassengerDateOfBirth;
this.comboBoxIdDocType.ItemsSource = GlobalStructures.IDDocTypeDict;
this.comboBoxIdDocType.SelectedValue = this.PAS.PassengerIdentityDocumentType?.ToString();
this.textBoxIdDocNumber.Text = this.PAS.PassengerIdentityDocumentId;
@ -44,8 +51,16 @@ namespace ENI2.EditControls
this.checkBoxTransitPassenger.IsChecked = this.PAS.PassengerInTransit;
this.comboBoxIssuingState.ItemsSource = bsmd.database.CREW.NationalityDict;
this.comboBoxIssuingState.SelectedValue = this.PAS.PassengerIdentityDocumentIssuingState;
if(this.PAS.PassengerIdentityDocumentExpiryDate.HasValue)
this.datePickerExpiryDate.SelectedDate = this.PAS.PassengerIdentityDocumentExpiryDate;
if (this.PAS.PassengerIdentityDocumentExpiryDate > MAXDATE)
{
this.datePickerExpiryDate.SelectedDate = MAXDATE;
}
else
{
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;

4
ENI2/Excel/ExcelUtil.cs
View File

@ -1446,6 +1446,10 @@ namespace ENI2.Excel
string crewNameString = reader.ReadText(crewName);
poc30d.PortOfCallLast30DaysCrewMembersJoined = !crewNameString.IsNullOrEmpty();
// if crew members joined is set explicitly to true and the name is empty, still set the field to true
if (!(poc30d.PortOfCallLast30DaysCrewMembersJoined ?? false) && (PortOfCallLast30DaysCrewMembersJoinedFlag ?? false))
poc30d.PortOfCallLast30DaysCrewMembersJoined = true;
if (poc30d.PortOfCallLast30DaysCrewMembersJoined ?? false)
{
// try different separators

BIN
misc/db.sqlite
View File

Binary file not shown.