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

Version 6.4.3, ein paar Korrekturen

Browse Source
This commit is contained in:
Daniel Schick 2021-07-30 10:26:02 +00:00
parent ebeac4845f
commit d8a84d4a70
4 changed files with 54 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ENI-2/ENI2/ENI2/App.config
View File

@ -26,12 +26,12 @@
<value>1000</value> <value>1000</value>
</setting> </setting>
<setting name="LockingServerAddress" serializeAs="String"> <setting name="LockingServerAddress" serializeAs="String">
<!--value>http://192.168.2.24/LockingService/LockingService.svc</value--> <value>http://192.168.2.24/LockingService/LockingService.svc</value>
<value>http://heupferd/bsmd.LockingService/LockingService.svc</value> <!--value>http://heupferd/bsmd.LockingService/LockingService.svc</value-->
</setting> </setting>
<setting name="ConnectionString" serializeAs="String"> <setting name="ConnectionString" serializeAs="String">
<!--value>Initial Catalog=nsw;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value--> <value>Initial Catalog=nsw;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value>
<value>Data Source=(localdb)\MSSQLLocalDB;Initial Catalog=E:\DATA\DB\NSW.MDF;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False</value> <!--value>Data Source=(localdb)\MSSQLLocalDB;Initial Catalog=E:\DATA\DB\NSW.MDF;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False</value-->
</setting> </setting>
</ENI2.Properties.Settings> </ENI2.Properties.Settings>
</applicationSettings> </applicationSettings>

2
ENI-2/ENI2/ENI2/ENI2.csproj
View File

@ -35,7 +35,7 @@
<CreateWebPageOnPublish>true</CreateWebPageOnPublish> <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.html</WebPage> <WebPage>publish.html</WebPage>
<ApplicationRevision>0</ApplicationRevision> <ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>6.4.2.%2a</ApplicationVersion> <ApplicationVersion>6.4.3.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut> <CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted> <PublishWizardCompleted>true</PublishWizardCompleted>

BIN
Stundensheet.xlsx
View File

Binary file not shown.

81
nsw/Source/bsmd.ExcelReadService/Util.cs
View File

@ -1554,38 +1554,44 @@ namespace bsmd.ExcelReadService
poc30d.PortOfCallLast30DaysDateOfDeparture = reader.ReadDate(depDate); poc30d.PortOfCallLast30DaysDateOfDeparture = reader.ReadDate(depDate);
poc30d.PortOfCallLast30DaysLocode = reader.ReadLoCode(locode); poc30d.PortOfCallLast30DaysLocode = reader.ReadLoCode(locode);
poc30d.PortOfCallLast30DaysCrewMembersJoined = reader.ReadBoolean(crewJoined);
// Verbesserungsvorschlag Jul/21: CrewMembersJoined Häkchen abhängig von den Namen in der Spalte
bool? PortOfCallLast30DaysCrewMembersJoinedFlag = reader.ReadBoolean(crewJoined);
string crewNameString = reader.ReadText(crewName);
if (!crewNameString.IsNullOrEmpty())
poc30d.PortOfCallLast30DaysCrewMembersJoined = true;
else
poc30d.PortOfCallLast30DaysCrewMembersJoined = false;
if (poc30d.PortOfCallLast30DaysCrewMembersJoined ?? false) if (poc30d.PortOfCallLast30DaysCrewMembersJoined ?? false)
{ {
string crewNameString = reader.ReadText(crewName); // try different separators
if (!crewNameString.IsNullOrEmpty()) string[] crew = crewNameString.Split(';');
if (crew.Length == 1)
crew = crewNameString.Split(',');
ExcelReader.ReadState readState = ExcelReader.ReadState.OK;
for (int j = 0; j < crew.Length; j++)
{ {
// try different separators if (!(poc30d.GetSublistElementWithIdentifier((j + 1).ToString()) is PortOfCallLast30DaysCrewJoinedShip poc30dCrew))
string[] crew = crewNameString.Split(';');
if (crew.Length == 1)
crew = crewNameString.Split(',');
ExcelReader.ReadState readState = ExcelReader.ReadState.OK;
for (int j = 0; j < crew.Length; j++)
{ {
if (!(poc30d.GetSublistElementWithIdentifier((j + 1).ToString()) is PortOfCallLast30DaysCrewJoinedShip poc30dCrew)) poc30dCrew = new PortOfCallLast30DaysCrewJoinedShip();
{ poc30dCrew.Identifier = (j + 1).ToString();
poc30dCrew = new PortOfCallLast30DaysCrewJoinedShip(); poc30dCrew.PortOfCallLast30Days = poc30d;
poc30dCrew.Identifier = (j + 1).ToString(); poc30d.CrewJoinedShip.Add(poc30dCrew);
poc30dCrew.PortOfCallLast30Days = poc30d;
poc30d.CrewJoinedShip.Add(poc30dCrew);
}
poc30dCrew.PortOfCallLast30DaysCrewJoinedShipName = crew[j];
if (crew[j].Length > 90)
readState = ExcelReader.ReadState.FAIL;
} }
reader.Conf.ConfirmText(crewName, crewNameString, readState);
} else poc30dCrew.PortOfCallLast30DaysCrewJoinedShipName = crew[j];
{ if (crew[j].Length > 90)
reader.Conf.ConfirmText(crewName, null, ExcelReader.ReadState.FAIL); readState = ExcelReader.ReadState.FAIL;
} }
reader.Conf.ConfirmText(crewName, crewNameString, readState);
}
// falls Häkchen gesetzt aber Namensfeld leer: Fehler markieren
if((PortOfCallLast30DaysCrewMembersJoinedFlag ?? false) && crewNameString.IsNullOrEmpty())
{
reader.Conf.ConfirmText(crewName, null, ExcelReader.ReadState.FAIL);
} }
// Leer/def. Zeilen entfernen // Leer/def. Zeilen entfernen
@ -1763,16 +1769,27 @@ namespace bsmd.ExcelReadService
reader.Conf.ConfirmText("SEC.ISSCIssuerType", isscIssuerType, sec.ISSCIssuerType.HasValue ? ExcelReader.ReadState.OK : ExcelReader.ReadState.FAIL); reader.Conf.ConfirmText("SEC.ISSCIssuerType", isscIssuerType, sec.ISSCIssuerType.HasValue ? ExcelReader.ReadState.OK : ExcelReader.ReadState.FAIL);
sec.GeneralDescriptionOfCargo = reader.ReadGeneralDescriptionOfCargo("SEC.GeneralDescriptionOfCargo"); sec.GeneralDescriptionOfCargo = reader.ReadGeneralDescriptionOfCargo("SEC.GeneralDescriptionOfCargo");
bool? secKielArrival = reader.ReadBoolean("SEC.KielCanalPassagePlanned_Arrival"); bool? secKielArrival = reader.ReadBoolean("SEC.KielCanalPassagePlanned_Arrival");
bool? secKielDeparture = reader.ReadBoolean("SEC.KielCanalPassagePlanned_Departure"); bool? secKielDeparture = reader.ReadBoolean("SEC.KielCanalPassagePlanned_Departure");
// Leichter Umbau ("Verbesserung") der Logik Jul 21: Wenn ETA Werte drin stehen und das Flag nicht gesetzt ist
// wird es gesetzt sonst nicht gesetzt
sec.KielCanalPassagePlanned = (secKielArrival ?? false) || (secKielDeparture ?? false); sec.KielCanalPassagePlanned = (secKielArrival ?? false) || (secKielDeparture ?? false);
if (sec.KielCanalPassagePlanned ?? false) // if (sec.KielCanalPassagePlanned ?? false)
{ // {
sec.KielCanalPassagePlannedIncomming = reader.ReadDateTime("SEC.ETADateKielCanalPassagePlannedIncomming", "SEC.ETATimeKielCanalPassagePlannedIncomming", !(secKielArrival ?? false)); sec.KielCanalPassagePlannedIncomming = reader.ReadDateTime("SEC.ETADateKielCanalPassagePlannedIncomming", "SEC.ETATimeKielCanalPassagePlannedIncomming", !(secKielArrival ?? false));
sec.KielCanalPassagePlannedOutgoing = reader.ReadDateTime("SEC.ETADateKielCanalPassagePlannedOutgoing", "SEC.ETATimeKielCanalPassagePlannedOutgoing", !(secKielDeparture ?? false)); sec.KielCanalPassagePlannedOutgoing = reader.ReadDateTime("SEC.ETADateKielCanalPassagePlannedOutgoing", "SEC.ETATimeKielCanalPassagePlannedOutgoing", !(secKielDeparture ?? false));
} // }
if ((!sec.KielCanalPassagePlanned ?? false) && sec.KielCanalPassagePlannedIncomming.HasValue) sec.KielCanalPassagePlanned = true;
if ((!sec.KielCanalPassagePlanned ?? false) && sec.KielCanalPassagePlannedOutgoing.HasValue) sec.KielCanalPassagePlanned = true;
if (!sec.KielCanalPassagePlannedIncomming.HasValue && !sec.KielCanalPassagePlannedOutgoing.HasValue)
sec.KielCanalPassagePlanned = false;
// Last10PortFacilitesCalled // Last10PortFacilitesCalled
for (int i = 1; i <= 10; i++) for (int i = 1; i <= 10; i++)