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

Änderungen Korrekturen Version 3.3.10

Browse Source 
(SEC DB Erweiterung,..)
This commit is contained in:
Daniel Schick 2017-01-23 20:52:50 +00:00
parent c7d7f01b2e
commit dc0a79bd1d
9 changed files with 75 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Stundensheet.xlsx
View File

Binary file not shown.

8
nsw/Source/SQL/Update_3.5.3_To_3.5.4.sql Normal file
View File

@ -0,0 +1,8 @@
PRINT N'Altering [dbo].[SEC]...';
GO
ALTER TABLE [dbo].[SEC] ADD [KielCanalPassagePlanned] BIT NULL;
ALTER TABLE [dbo].[SEC] ADD [KielCanalPassagePlannedIncomming] [datetime] NULL;
ALTER TABLE [dbo].[SEC] ADD [KielCanalPassagePlannedOutgoing] [datetime] NULL;
GO

2
nsw/Source/bsmd.ExcelReadService/ExcelReader.cs
View File

@ -475,7 +475,7 @@ namespace bsmd.ExcelReadService
{ {
DateTime date; DateTime date;
if (DateTime.TryParseExact(val, "HH:mm", CultureInfo.InvariantCulture, DateTimeStyles.NoCurrentDateDefault, out date)) if (DateTime.TryParseExact(val, "HH:mm", CultureInfo.InvariantCulture, DateTimeStyles.NoCurrentDateDefault, out date))
return date; result = date;
} }
if ((result == null) && (val != null)) if ((result == null) && (val != null))

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

@ -157,6 +157,12 @@ namespace bsmd.ExcelReadService
} }
ATA ata = ataMessage.Elements[0] as ATA; ATA ata = ataMessage.Elements[0] as ATA;
Util.ScanMessage(ata, reader); Util.ScanMessage(ata, reader);
if(!ata.ATAPortOfCall.HasValue)
{
reader.ReadDateTime("ATA.ATADatePortOfCall", "ATA.ATATimePortOfCall");
}
if (!ata.ATAPortOfCall.HasValue && ataMessage.IsNew) if (!ata.ATAPortOfCall.HasValue && ataMessage.IsNew)
messages.Remove(ataMessage); messages.Remove(ataMessage);
} }
@ -176,7 +182,13 @@ namespace bsmd.ExcelReadService
} }
ATD atd = atdMessage.Elements[0] as ATD; ATD atd = atdMessage.Elements[0] as ATD;
Util.ScanMessage(atd, reader); Util.ScanMessage(atd, reader);
if (!atd.ATDPortOfCall.HasValue && atdMessage.IsNew)
if (!atd.ATDPortOfCall.HasValue)
{
reader.ReadDateTime("ATD.ATDDatePortOfCall", "ATD.ATDTimePortOfCall");
}
if (!atd.ATDPortOfCall.HasValue && atdMessage.IsNew)
messages.Remove(atdMessage); messages.Remove(atdMessage);
} }
@ -318,6 +330,13 @@ namespace bsmd.ExcelReadService
Util.ScanMessage(poba, reader); Util.ScanMessage(poba, reader);
if (((poba.TotalPersonsOnBoardUponArrival ?? 0) == 0) && poba.IsNew) if (((poba.TotalPersonsOnBoardUponArrival ?? 0) == 0) && poba.IsNew)
messages.Remove(pobaMessage); messages.Remove(pobaMessage);
reader.Conf.ConfirmNumber("POBA.TotalCrewMembersOnBoardUponArrival_DK", poba.TotalCrewMembersOnBoardUponArrival,
(poba.TotalCrewMembersOnBoardUponArrival.HasValue && poba.TotalCrewMembersOnBoardUponArrival > 0) ?
ExcelReader.ReadState.OK : ExcelReader.ReadState.WARN);
reader.Conf.ConfirmNumber("POBA.TotalPassengersOnBoardUponArrival_DK", poba.TotalPassengersOnBoardUponArrival,
ExcelReader.ReadState.OK);
} }
#endregion #endregion
@ -338,7 +357,15 @@ namespace bsmd.ExcelReadService
Util.ScanMessage(pobd, reader); Util.ScanMessage(pobd, reader);
if (((pobd.TotalPersonsOnBoardUponDeparture ?? 0) == 0) && pobd.IsNew) if (((pobd.TotalPersonsOnBoardUponDeparture ?? 0) == 0) && pobd.IsNew)
messages.Remove(pobdMessage); messages.Remove(pobdMessage);
}
reader.Conf.ConfirmNumber("POBD.TotalCrewMembersOnBoardUponDeparture_DK", pobd.TotalCrewMembersOnBoardUponDeparture,
(pobd.TotalCrewMembersOnBoardUponDeparture.HasValue && pobd.TotalCrewMembersOnBoardUponDeparture > 0) ?
ExcelReader.ReadState.OK : ExcelReader.ReadState.WARN);
reader.Conf.ConfirmNumber("POBD.TotalPassengersOnBoardUponDeparture_DK", pobd.TotalPassengersOnBoardUponDeparture,
ExcelReader.ReadState.OK);
}
#endregion #endregion
@ -1403,6 +1430,14 @@ namespace bsmd.ExcelReadService
reader.Conf.ConfirmText("SEC.GeneralDescriptionOfCargo", genDescCargo, sec.GeneralDescriptionOfCargo.HasValue ? ExcelReader.ReadState.OK : ExcelReader.ReadState.FAIL); reader.Conf.ConfirmText("SEC.GeneralDescriptionOfCargo", genDescCargo, sec.GeneralDescriptionOfCargo.HasValue ? ExcelReader.ReadState.OK : ExcelReader.ReadState.FAIL);
bool? secKielArrival = reader.ReadBoolean("SEC.KielCanalPassagePlanned_Arrival");
bool? secKielDeparture = reader.ReadBoolean("SEC.KielCanalPassagePlanned_Departure");
sec.KielCanalPassagePlanned = (secKielArrival ?? false) || (secKielDeparture ?? false);
sec.KielCanalPassagePlannedIncomming = reader.ReadDateTime("SEC.ETADateKielCanalPassagePlannedIncomming", "SEC.ETATimeKielCanalPassagePlannedIncomming");
sec.KielCanalPassagePlannedOutgoing = reader.ReadDateTime("SEC.ETADateKielCanalPassagePlannedOutgoing", "SEC.ETATimeKielCanalPassagePlannedOutgoing");
// Last10PortFacilitesCalled // Last10PortFacilitesCalled
for (int i = 1; i <= 10; i++) for (int i = 1; i <= 10; i++)
{ {
@ -2294,6 +2329,8 @@ namespace bsmd.ExcelReadService
result.Portname = LocodeDB.PortNameFromLocode(poc); result.Portname = LocodeDB.PortNameFromLocode(poc);
result.HerbergEmailContactReportingVessel = reader.ReadText("ShipMail"); result.HerbergEmailContactReportingVessel = reader.ReadText("ShipMail");
result.HerbergReportType = reader.ReadText("ReferenceNumber");
reader.Conf.ConfirmText("ReferenceNumber", result.HerbergReportType, result.HerbergReportType.IsNullOrEmpty() ? ExcelReader.ReadState.FAIL : ExcelReader.ReadState.OK);
if (result.IsTransit) if (result.IsTransit)
result.ETAKielCanal = eta; result.ETAKielCanal = eta;

2
nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
View File

@ -2,6 +2,6 @@
[assembly: AssemblyCompany("Informatikbüro Daniel Schick")] [assembly: AssemblyCompany("Informatikbüro Daniel Schick")]
[assembly: AssemblyProduct("BSMD NSW interface")] [assembly: AssemblyProduct("BSMD NSW interface")]
[assembly: AssemblyInformationalVersion("3.3.9")] [assembly: AssemblyInformationalVersion("3.3.10")]
[assembly: AssemblyCopyright("Copyright © 2014-2016 Informatikbüro Daniel Schick. All rights reserved.")] [assembly: AssemblyCopyright("Copyright © 2014-2016 Informatikbüro Daniel Schick. All rights reserved.")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]

2
nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
View File

@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("3.3.9.*")] [assembly: AssemblyVersion("3.3.10.*")]

21
nsw/Source/bsmd.database/SEC.cs
View File

@ -120,6 +120,12 @@ namespace bsmd.database
[LookupName("SEC.MatterToReport")] [LookupName("SEC.MatterToReport")]
[MaxLength(1024)] [MaxLength(1024)]
public string MatterToReport { get; set; } public string MatterToReport { get; set; }
public bool? KielCanalPassagePlanned { get; set; }
public DateTime? KielCanalPassagePlannedIncomming { get; set; }
public DateTime? KielCanalPassagePlannedOutgoing { get; set; }
public List<LastTenPortFacilitiesCalled> LastTenPortFacilitesCalled { get { return this.ltpfc; } } public List<LastTenPortFacilitiesCalled> LastTenPortFacilitesCalled { get { return this.ltpfc; } }
@ -153,6 +159,9 @@ namespace bsmd.database
scmd.Parameters.AddWithNullableValue("@P17", this.GeneralDescriptionOfCargo); scmd.Parameters.AddWithNullableValue("@P17", this.GeneralDescriptionOfCargo);
scmd.Parameters.AddWithNullableValue("@P18", this.CSOFax); scmd.Parameters.AddWithNullableValue("@P18", this.CSOFax);
scmd.Parameters.AddWithNullableValue("@P19", this.MatterToReport); scmd.Parameters.AddWithNullableValue("@P19", this.MatterToReport);
scmd.Parameters.AddWithNullableValue("@P20", this.KielCanalPassagePlanned);
scmd.Parameters.AddWithNullableValue("@P21", this.KielCanalPassagePlannedIncomming);
scmd.Parameters.AddWithNullableValue("@P22", this.KielCanalPassagePlannedOutgoing);
if (this.IsNew) if (this.IsNew)
{ {
@ -161,7 +170,8 @@ namespace bsmd.database
scmd.CommandText = string.Format("INSERT INTO {0} (Id, MessageHeaderId, SECSimplification, PortOfCallWhereCompleteSECNotified, " + scmd.CommandText = string.Format("INSERT INTO {0} (Id, MessageHeaderId, SECSimplification, PortOfCallWhereCompleteSECNotified, " +
"CSOLastName, CSOFirstName, CSOPhone, CSOEMail, ValidISSCOnBoard, ReasonsForNoValidISSC, " + "CSOLastName, CSOFirstName, CSOPhone, CSOEMail, ValidISSCOnBoard, ReasonsForNoValidISSC, " +
"ISSCType, ISSCIssuerType, ISSCIssuerName,ISSCDateOfExpiration, ApprovedSecurityPlanOnBoard, " + "ISSCType, ISSCIssuerType, ISSCIssuerName,ISSCDateOfExpiration, ApprovedSecurityPlanOnBoard, " +
"CurrentShipSecurityLevel, PortFacilityOfArrival, GeneralDescriptionOfCargo, CSOFax, MatterToReport) " + "CurrentShipSecurityLevel, PortFacilityOfArrival, GeneralDescriptionOfCargo, CSOFax, MatterToReport, " +
"KielCanalPassagePlanned, KielCanalPassagePlannedIncomming, KielCanalPassagePlannedOutgoing) " +
"VALUES ( @ID, @P1, @P2, @P3, @P4, @P5, @P6, @P7, @P8, @P9, @P10, @P11, @P12, @P13, @P14, @P15, @P16, " + "VALUES ( @ID, @P1, @P2, @P3, @P4, @P5, @P6, @P7, @P8, @P9, @P10, @P11, @P12, @P13, @P14, @P15, @P16, " +
"@P17, @P18, @P19 )", this.Tablename); "@P17, @P18, @P19 )", this.Tablename);
} }
@ -173,7 +183,8 @@ namespace bsmd.database
"CSOEMail = @P7, ValidISSCOnBoard = @P8, ReasonsForNoValidISSC = @P9, " + "CSOEMail = @P7, ValidISSCOnBoard = @P8, ReasonsForNoValidISSC = @P9, " +
"ISSCType = @P10, ISSCIssuerType = @P11, ISSCIssuerName = @P12, ISSCDateOfExpiration = @P13, " + "ISSCType = @P10, ISSCIssuerType = @P11, ISSCIssuerName = @P12, ISSCDateOfExpiration = @P13, " +
"ApprovedSecurityPlanOnBoard = @P14, CurrentShipSecurityLevel = @P15, PortFacilityOfArrival = @P16, " + "ApprovedSecurityPlanOnBoard = @P14, CurrentShipSecurityLevel = @P15, PortFacilityOfArrival = @P16, " +
"GeneralDescriptionOfCargo = @P17, CSOFax = @P18, MatterToReport = @P19 WHERE Id = @ID", this.Tablename); "GeneralDescriptionOfCargo = @P17, CSOFax = @P18, MatterToReport = @P19, KielCanalPassagePlanned = @P20, " +
"KielCanalPassagePlannedIncomming = @P21, KielCanalPassagePlannedOutgoing = @P22 WHERE Id = @ID", this.Tablename);
} }
} }
@ -182,7 +193,8 @@ namespace bsmd.database
string query = string.Format("SELECT Id, SECSimplification, PortOfCallWhereCompleteSECNotified, CSOLastName, " + string query = string.Format("SELECT Id, SECSimplification, PortOfCallWhereCompleteSECNotified, CSOLastName, " +
"CSOFirstName, CSOPhone, CSOEMail, ValidISSCOnBoard, ReasonsForNoValidISSC, " + "CSOFirstName, CSOPhone, CSOEMail, ValidISSCOnBoard, ReasonsForNoValidISSC, " +
"ISSCType, ISSCIssuerType, ISSCIssuerName, ISSCDateOfExpiration, ApprovedSecurityPlanOnBoard, " + "ISSCType, ISSCIssuerType, ISSCIssuerName, ISSCDateOfExpiration, ApprovedSecurityPlanOnBoard, " +
"CurrentShipSecurityLevel, PortFacilityOfArrival, GeneralDescriptionOfCargo, CSOFax, MatterToReport FROM {0}", this.Tablename); "CurrentShipSecurityLevel, PortFacilityOfArrival, GeneralDescriptionOfCargo, CSOFax, MatterToReport, " +
"KielCanalPassagePlanned, KielCanalPassagePlannedIncomming, KielCanalPassagePlannedOutgoing FROM {0}", this.Tablename);
switch (filter) switch (filter)
{ {
@ -226,6 +238,9 @@ namespace bsmd.database
if (!reader.IsDBNull(16)) sec.GeneralDescriptionOfCargo = reader.GetByte(16); if (!reader.IsDBNull(16)) sec.GeneralDescriptionOfCargo = reader.GetByte(16);
if (!reader.IsDBNull(17)) sec.CSOFax = reader.GetString(17); if (!reader.IsDBNull(17)) sec.CSOFax = reader.GetString(17);
if (!reader.IsDBNull(18)) sec.MatterToReport = reader.GetString(18); if (!reader.IsDBNull(18)) sec.MatterToReport = reader.GetString(18);
if (!reader.IsDBNull(19)) sec.KielCanalPassagePlanned = reader.GetBoolean(19);
if (!reader.IsDBNull(20)) sec.KielCanalPassagePlannedIncomming = reader.GetDateTime(20);
if (!reader.IsDBNull(21)) sec.KielCanalPassagePlannedOutgoing = reader.GetDateTime(21);
result.Add(sec); result.Add(sec);
} }

4
nsw/Source/bsmd.database/bsmd.database.csproj
View File

@ -125,7 +125,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\bsmdKey.snk" /> <None Include="..\bsmdKey.snk" />
<None Include="packages.config" /> <None Include="packages.config">
<SubType>Designer</SubType>
</None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" /> <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />

4
nsw/Source/bsmd.database/packages.config Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="log4net" version="2.0.7" targetFramework="net45" />
</packages>