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

Testversion 7.8.0.1 ausgeliefert

Browse Source
This commit is contained in:
Daniel Schick 2023-01-05 14:53:34 +01:00
parent e013591a40
commit 3dac392452
5 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ENI2/ENI2.csproj
View File

@ -36,7 +36,7 @@
<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>1</ApplicationRevision> <ApplicationRevision>2</ApplicationRevision>
<ApplicationVersion>7.8.0.%2a</ApplicationVersion> <ApplicationVersion>7.8.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut> <CreateDesktopShortcut>true</CreateDesktopShortcut>

7
ENI2/Excel/ExcelUtil.cs
View File

@ -2061,8 +2061,7 @@ namespace ENI2.Excel
private static bool ScanCREW(Message crewMessage, ExcelReader reader, bool isOldVersion) private static bool ScanCREW(Message crewMessage, ExcelReader reader, bool isOldVersion)
{ {
crewMessage.DeleteElements(); crewMessage.DeleteElements();
const string sheetTitle = "6. CREW - Arrival";
string sheetTitle = "6. CREW - Arrival";
// 6. CREW - Arrival // 6. CREW - Arrival
// 5.9.22: Changed this area to work like reading from a Dakosy Sheet (by values in rows, not cell names) // 5.9.22: Changed this area to work like reading from a Dakosy Sheet (by values in rows, not cell names)
if (reader.HasWorksheetNamed(sheetTitle)) if (reader.HasWorksheetNamed(sheetTitle))
@ -2174,7 +2173,7 @@ namespace ENI2.Excel
private static bool ScanCREWD(Message crewdMessage, ExcelReader reader) private static bool ScanCREWD(Message crewdMessage, ExcelReader reader)
{ {
crewdMessage.DeleteElements(); crewdMessage.DeleteElements();
string sheetTitle = "7. CREW - Departure"; const string sheetTitle = "7. CREW - Departure";
// CREW DEPARTURE // CREW DEPARTURE
if (reader.HasWorksheetNamed(sheetTitle)) if (reader.HasWorksheetNamed(sheetTitle))
{ {
@ -2286,7 +2285,7 @@ namespace ENI2.Excel
{ {
List<PAS> newPasList = new List<PAS>(); List<PAS> newPasList = new List<PAS>();
string sheetTitle = "8. PAX - Arrival"; const string sheetTitle = "8. PAX - Arrival";
if (reader.HasWorksheetNamed(sheetTitle)) if (reader.HasWorksheetNamed(sheetTitle))
{ {

7
ENI2/MainWindow.xaml.cs
View File

@ -593,11 +593,8 @@ namespace ENI2
} }
this.showIdDict.Remove(changedCore.Id.Value); this.showIdDict.Remove(changedCore.Id.Value);
// this._dbWatchDog.UnRegister(changedCore); // wird ggf später abgeräumt wenn der Tab geschlossen wird // this._dbWatchDog.UnRegister(changedCore); // wird ggf später abgeräumt wenn der Tab geschlossen wird
this.Dispatcher.Invoke(new Action(() => this.Dispatcher.Invoke(new Action(() => UpdateWaitIdLabel()));
{ }
UpdateWaitIdLabel();
}));
}
if (this.openTabs.ContainsKey(changedCore.Id.Value)) if (this.openTabs.ContainsKey(changedCore.Id.Value))
{ {

8
bsmd.database/Extensions.cs
View File

@ -142,6 +142,14 @@ namespace bsmd.database
return source.ToString("yyyy'-'MM'-'dd'T'HH':'mm':'ss'Z'"); return source.ToString("yyyy'-'MM'-'dd'T'HH':'mm':'ss'Z'");
} }
public static DateTime ToUTCSerializableDateTime(this DateTime source)
{
return new DateTime(
source.Ticks - (source.Ticks % TimeSpan.TicksPerSecond),
DateTimeKind.Utc
);
}
public static List<string> RegexSplit(this string source) public static List<string> RegexSplit(this string source)
{ {
List<string> result = new List<string>(); List<string> result = new List<string>();

16
bsmd.dbh/RequestUtil.cs
View File

@ -179,10 +179,10 @@ namespace bsmd.dbh
RootNOA_NOD rootNOA_NOD = new RootNOA_NOD(); RootNOA_NOD rootNOA_NOD = new RootNOA_NOD();
rootNOA_NOD.ETAToNextPortSpecified = noa_nod.ETAToNextPort.HasValue; rootNOA_NOD.ETAToNextPortSpecified = noa_nod.ETAToNextPort.HasValue;
if (noa_nod.ETAToNextPort.HasValue) if (noa_nod.ETAToNextPort.HasValue)
rootNOA_NOD.ETAToNextPort = noa_nod.ETAToNextPort.Value; rootNOA_NOD.ETAToNextPort = noa_nod.ETAToNextPort.Value.ToUTCSerializableDateTime();
rootNOA_NOD.ETDFromLastPortSpecified = noa_nod.ETDFromLastPort.HasValue; rootNOA_NOD.ETDFromLastPortSpecified = noa_nod.ETDFromLastPort.HasValue;
if (noa_nod.ETDFromLastPort.HasValue) if (noa_nod.ETDFromLastPort.HasValue)
rootNOA_NOD.ETDFromLastPort = noa_nod.ETDFromLastPort.Value; rootNOA_NOD.ETDFromLastPort = noa_nod.ETDFromLastPort.Value.ToUTCSerializableDateTime();
rootNOA_NOD.LastPort = noa_nod.LastPort; rootNOA_NOD.LastPort = noa_nod.LastPort;
rootNOA_NOD.NextPort = noa_nod.NextPort; rootNOA_NOD.NextPort = noa_nod.NextPort;
List<ItemsChoiceType> choiceList = new List<ItemsChoiceType>(); List<ItemsChoiceType> choiceList = new List<ItemsChoiceType>();
@ -192,13 +192,13 @@ namespace bsmd.dbh
if (noa_nod.ETAToKielCanal.HasValue) if (noa_nod.ETAToKielCanal.HasValue)
{ {
choiceList.Add(ItemsChoiceType.ETAToKielCanal); choiceList.Add(ItemsChoiceType.ETAToKielCanal);
choices.Add(noa_nod.ETAToKielCanal.Value); choices.Add(noa_nod.ETAToKielCanal.Value.ToUTCSerializableDateTime());
} }
if (noa_nod.ETDFromKielCanal.HasValue) if (noa_nod.ETDFromKielCanal.HasValue)
{ {
choiceList.Add(ItemsChoiceType.ETDFromKielCanal); choiceList.Add(ItemsChoiceType.ETDFromKielCanal);
choices.Add(noa_nod.ETDFromKielCanal.Value); choices.Add(noa_nod.ETDFromKielCanal.Value.ToUTCSerializableDateTime());
} }
} }
else else
@ -206,13 +206,13 @@ namespace bsmd.dbh
if (noa_nod.ETAToPortOfCall.HasValue) if (noa_nod.ETAToPortOfCall.HasValue)
{ {
choiceList.Add(ItemsChoiceType.ETAToPortOfCall); choiceList.Add(ItemsChoiceType.ETAToPortOfCall);
choices.Add(noa_nod.ETAToPortOfCall.Value); choices.Add(noa_nod.ETAToPortOfCall.Value.ToUTCSerializableDateTime());
} }
if (noa_nod.ETDFromPortOfCall.HasValue) if (noa_nod.ETDFromPortOfCall.HasValue)
{ {
choiceList.Add(ItemsChoiceType.ETDFromPortOfCall); choiceList.Add(ItemsChoiceType.ETDFromPortOfCall);
choices.Add(noa_nod.ETDFromPortOfCall.Value); choices.Add(noa_nod.ETDFromPortOfCall.Value.ToUTCSerializableDateTime());
} }
for (int i = 0; i < noa_nod.CallPurposes.Count; i++) for (int i = 0; i < noa_nod.CallPurposes.Count; i++)
@ -434,9 +434,9 @@ namespace bsmd.dbh
for (int i = 0; i < bpol.PortOfItineraries.Count; i++) for (int i = 0; i < bpol.PortOfItineraries.Count; i++)
{ {
RootBPOLPortOfItinerary port = new RootBPOLPortOfItinerary(); RootBPOLPortOfItinerary port = new RootBPOLPortOfItinerary();
PortOfItinerary portOfItinerary = bpol.PortOfItineraries[i] as PortOfItinerary; PortOfItinerary portOfItinerary = bpol.PortOfItineraries[i];
if (portOfItinerary.PortOfItineraryETA.HasValue) if (portOfItinerary.PortOfItineraryETA.HasValue)
port.PortOfItineraryETA = portOfItinerary.PortOfItineraryETA.Value; port.PortOfItineraryETA = portOfItinerary.PortOfItineraryETA.Value.ToUTCSerializableDateTime();
port.PortOfItineraryName = portOfItinerary.PortOfItineraryName; port.PortOfItineraryName = portOfItinerary.PortOfItineraryName;
poiArray[i] = port; poiArray[i] = port;
} }