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

kleine Korrekturen für 7.5.0.6

Browse Source
This commit is contained in:
Daniel Schick 2022-10-18 09:41:26 +02:00
parent 6513762adc
commit 3722223c64
4 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml.cs
View File

@ -852,8 +852,7 @@ namespace ENI2.DetailViewControls
case HAZPosTemplate.SublistType.MARPOL:
this.tabControlPositions.SelectedIndex = 4;
MARPOL_Annex_I_Position marpolPos = new MARPOL_Annex_I_Position();
marpolPos.FlashpointInformation = selectedTemplate.Flashpoint;
marpolPos.Flashpoint_CEL = selectedTemplate.FP1;
marpolPos.FlashpointInformation = selectedTemplate.Flashpoint;
marpolPos.Identifier = DatabaseEntity.GetNewIdentifier(haz.MARPOLPositions, "MARPOL-");
marpolPos.HAZ = haz;
haz.MARPOLPositions.Add(marpolPos);

2
ENI2/ENI2.csproj
View File

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

19
ENI2/Excel/ExcelUtil.cs
View File

@ -2214,6 +2214,8 @@ namespace ENI2.Excel
pas.PassengerIdentityDocumentId = reader.ReadCellAsText(sheetTitle, string.Format("N{0}", i + 17));
pas.PassengerIdentityDocumentExpiryDate = reader.ReadCellAsDateTime(sheetTitle, string.Format("P{0}", i + 17));
if(!pas.PassengerIdentityDocumentExpiryDate.HasValue)
pas.PassengerIdentityDocumentExpiryDate = new DateTime(2100, 12, 31);
pas.PassengerVisaNumber = reader.ReadCellAsText(sheetTitle, string.Format("Q{0}", i + 17));
pas.EmergencyCare = reader.ReadCellAsText(sheetTitle, string.Format("R{0}", i + 17));
@ -2273,7 +2275,7 @@ namespace ENI2.Excel
pas.PassengerFirstName = reader.ReadText(pasFirstName);
pas.PassengerGender = reader.ReadGender(pasGender);
pas.PassengerNationality = reader.ReadNationality(pasNationality);
// TODO: Nicht klar ob hier LOCODEs kommen oder nicht
pas.PassengerPortOfEmbarkation = reader.ReadTextNoWhitespace(pasEmbarkation);
pas.PassengerPortOfDisembarkation = reader.ReadTextNoWhitespace(pasDebarkation);
pas.PassengerInTransit = reader.ReadBoolean(pasTransit);
@ -2284,6 +2286,8 @@ namespace ENI2.Excel
pas.PassengerVisaNumber = reader.ReadText(pasVisaNo);
pas.PassengerIdentityDocumentIssuingState = reader.ReadNationality(pasIssuing);
pas.PassengerIdentityDocumentExpiryDate = reader.ReadDate(pasExpiryDate);
if (!pas.PassengerIdentityDocumentExpiryDate.HasValue)
pas.PassengerIdentityDocumentExpiryDate = new DateTime(2100, 12, 31);
pas.PassengerCountryOfBirth = reader.ReadNationality(pasCountryOfBirth);
pas.EmergencyCare = reader.ReadText(pasEmergencyCare);
pas.EmergencyContactNumber = reader.ReadText(pasEmergencyContact);
@ -2477,6 +2481,10 @@ namespace ENI2.Excel
}
}
}
}
else
{
result = 5; // OTHER_LEGAL_IDENTITY_DOCUMENT (CH, 17.10.22)
}
return result;
@ -2486,8 +2494,11 @@ namespace ENI2.Excel
{
string result = null;
nationality = nationality.Trim();
if(CREW.NationalityDict.ContainsKey(nationality))
if (nationality.IsNullOrEmpty())
{
result = "XX";
}
else if(CREW.NationalityDict.ContainsKey(nationality))
{
result = nationality;
}
@ -2524,7 +2535,7 @@ namespace ENI2.Excel
val = val.ToUpper();
if (val.IsNullOrEmpty()) return val;
if (val.IsNullOrEmpty()) return "ZZUKN";
// check if this is a legitimate Locode
if (!LocodeDB.LocationNameFromLocode(val).IsNullOrEmpty()) return val;

16
bsmd.database/HAZPosTemplate.cs
View File

@ -42,11 +42,7 @@ namespace bsmd.database
public string UNNr { get; set; }
public string IMOClass { get; set; }
public string FP1 { get; set; }
public string FP2 { get; set; }
public string IMOClass { get; set; }
public string Comment { get; set; }
@ -60,7 +56,7 @@ namespace bsmd.database
public static string GetQuery()
{
return "SELECT Beschreibung, HAZARD_ENUM, FP_ENUM, \"15.19?\", Typ, MHB, IMSBC_HAZ, \"UN-Nr.\", \"IMO-Cl.\", POLLUTION_CATEGORY_ENUM, \"FP.1\", \"FP.2\", Bemerkung FROM GEFAHRGUTLISTE ORDER BY Beschreibung";
return "SELECT Beschreibung, HAZARD_ENUM, FP_ENUM, \"15.19?\", Typ, MHB, IMSBC_HAZ, \"UN-Nr.\", \"IMO-Cl.\", POLLUTION_CATEGORY_ENUM, Bemerkung FROM GEFAHRGUTLISTE ORDER BY Beschreibung";
}
public static List<HAZPosTemplate> LoadList(IDataReader reader)
@ -108,13 +104,9 @@ namespace bsmd.database
if(!reader.IsDBNull(8))
hpt.IMOClass = reader.GetString(8);
if (!reader.IsDBNull(9))
hpt.PollutionCategory = (byte) reader.GetDouble(9);
hpt.PollutionCategory = (byte) reader.GetDouble(9);
if (!reader.IsDBNull(10))
hpt.FP1 = reader.GetString(10);
if (!reader.IsDBNull(11))
hpt.FP2 = reader.GetString(11);
if (!reader.IsDBNull(12))
hpt.Comment = reader.GetString(12);
hpt.Comment = reader.GetString(10);
result.Add(hpt);
}