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

NSW / ENI-2 Laufende Kleinigkeiten (3.9.10)

Browse Source
This commit is contained in:
Daniel Schick 2018-01-26 17:03:41 +00:00
parent 14d48d2b20
commit 6f4dbdb5bc
14 changed files with 101 additions and 23 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>
</setting>
<setting name="LockingServerAddress" serializeAs="String">
<!--value>http://192.168.2.4/LockingService/LockingService.svc</value-->
<value>http://heupferd/bsmd.LockingService/LockingService.svc</value>
<value>http://192.168.2.4/LockingService/LockingService.svc</value>
<!--value>http://heupferd/bsmd.LockingService/LockingService.svc</value-->
</setting>
<setting name="ConnectionString" serializeAs="String">
<!--value>Data Source=192.168.2.12;Initial Catalog=nsw;Uid=dfuser;Pwd=dfpasswd;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False</value-->
<value>Data Source=(localdb)\Projects;Initial Catalog=nsw;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False</value>
<value>Data Source=192.168.2.12;Initial Catalog=nsw;Uid=dfuser;Pwd=dfpasswd;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False</value>
<!--value>Data Source=(localdb)\Projects;Initial Catalog=nsw;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False</value-->
</setting>
</ENI2.Properties.Settings>
</applicationSettings>

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

@ -36,7 +36,7 @@
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.html</WebPage>
<ApplicationRevision>1</ApplicationRevision>
<ApplicationVersion>3.9.8.%2a</ApplicationVersion>
<ApplicationVersion>3.9.9.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted>

2
ENI-2/ENI2/ENI2/EditControls/EditCallPurposeDialog.xaml
View File

@ -20,7 +20,7 @@
<Label Grid.Row="0" Grid.Column="0" Content="{x:Static p:Resources.textCode}" />
<Label Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textDescription}" />
<ComboBox Grid.Row="0" Grid.Column="1" Width="auto" Name="comboBoxCode" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" TextBlock.TextAlignment="Center" SelectionChanged="comboBoxCode_Selected"/>
<TextBox Grid.Row="1" Grid.Column="1" Width="auto" Name="textBoxDescription" Margin="2" MinLines="2" TextWrapping="Wrap" AcceptsReturn="True" MaxLength="100" />
<TextBox Grid.Row="1" Grid.Column="1" Width="auto" Name="textBoxDescription" Margin="2" MinLines="2" TextWrapping="Wrap" AcceptsReturn="True" MaxLength="99" />
</Grid>
</enictrl:EditWindowBase>

BIN
Stundensheet.xlsx
View File

Binary file not shown.

BIN
nsw/5.0/2018_01_12_NSW-5_Abweichungen.docx Normal file
View File

Binary file not shown.

BIN
nsw/5.0/Entwicklungsversion_NSW_Schnittstelle_Meldeklassen_und_Attribute_API_5.0_(V12).xlsx Normal file
View File

Binary file not shown.

BIN
nsw/5.0/Entwicklungsversion_NSW_Schnittstelle_Validierungsregeln_API_5.0_(V12).xlsx Normal file
View File

Binary file not shown.

2
nsw/Source/SQL/Update_To_3.8.10.2.sql Normal file
View File

@ -0,0 +1,2 @@
select * from ErrorText
insert into ErrorText (ErrorCode, ErrorText) VALUES (17 , '{0} is empty or too long!')

13
nsw/Source/SQL/Update_To_4.0.sql Normal file
View File

@ -0,0 +1,13 @@
-- neue Spalte
ALTER TABLE [dbo].[LastTenPortFacilitiesCalled]
ADD [PortFacilityGISISCodeLoCode] NCHAR (5) NULL;
GO
-- vergrößern auf 250
ALTER TABLE [dbo].[STAT] ALTER COLUMN [InmarsatCallNumber] NVARCHAR (250) NULL;
GO

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

@ -463,7 +463,15 @@ namespace bsmd.ExcelReadService
imdgPosition.PackingGroup = reader.ReadPackingGroup(imdg_packingGroup);
imdgPosition.MarinePollutant = reader.ReadBoolean(imdg_marinePollutant);
imdgPosition.Flashpoint_CEL = reader.ReadText(imdg_flashpoint);
reader.Conf.ConfirmText(imdg_flashpoint, imdgPosition.Flashpoint_CEL, imdgPosition.Flashpoint_CEL.IsNullOrEmpty() ? ExcelReader.ReadState.NONE : ExcelReader.ReadState.OK);
ExcelReader.ReadState aReadState = ExcelReader.ReadState.NONE;
if (!imdgPosition.Flashpoint_CEL.IsNullOrEmpty())
{
if (imdgPosition.Flashpoint_CEL == "-")
aReadState = ExcelReader.ReadState.FAIL;
else
aReadState = ExcelReader.ReadState.OK;
}
reader.Conf.ConfirmText(imdg_flashpoint, imdgPosition.Flashpoint_CEL, aReadState);
imdgPosition.NumberOfPackages = (int?)reader.ReadNumber(imdg_numberOfPackages);
imdgPosition.PackageType = reader.ReadText(imdg_packageType);
reader.Conf.ConfirmText(imdg_packageType, imdgPosition.PackageType, imdgPosition.PackageType.IsNullOrEmpty() ? ExcelReader.ReadState.FAIL : ExcelReader.ReadState.OK);
@ -527,7 +535,15 @@ namespace bsmd.ExcelReadService
reader.Conf.ConfirmText(ibc_pollutionCategory, pollutionCategory, ibcPosition.PollutionCategory.HasValue ? ExcelReader.ReadState.OK : ExcelReader.ReadState.FAIL);
ibcPosition.Flashpoint_CEL = reader.ReadText(ibc_flash);
reader.Conf.ConfirmText(ibc_flash, ibcPosition.Flashpoint_CEL, ExcelReader.ReadState.NONE);
ExcelReader.ReadState aReadState = ExcelReader.ReadState.NONE;
if (!ibcPosition.Flashpoint_CEL.IsNullOrEmpty())
{
if (ibcPosition.Flashpoint_CEL == "-")
aReadState = ExcelReader.ReadState.FAIL;
else
aReadState = ExcelReader.ReadState.OK;
}
reader.Conf.ConfirmText(ibc_flash, ibcPosition.Flashpoint_CEL, aReadState);
ibcPosition.Quantity_KGM = (int ?) reader.ReadNumber(ibc_quantity);
ibcPosition.StowagePosition = reader.ReadText(ibc_stowagePosition);
reader.Conf.ConfirmText(ibc_stowagePosition, ibcPosition.StowagePosition, ibcPosition.StowagePosition.IsNullOrEmpty() ? ExcelReader.ReadState.FAIL : ExcelReader.ReadState.OK);
@ -649,7 +665,15 @@ namespace bsmd.ExcelReadService
marpolPosition.Name = name;
reader.Conf.ConfirmText(marpol_name, name, ExcelReader.ReadState.OK);
marpolPosition.Flashpoint_CEL = reader.ReadText(marpol_flash);
reader.Conf.ConfirmText(marpol_flash, marpolPosition.Flashpoint_CEL, marpolPosition.Flashpoint_CEL.IsNullOrEmpty() ? ExcelReader.ReadState.FAIL : ExcelReader.ReadState.OK);
ExcelReader.ReadState aReadState = ExcelReader.ReadState.NONE;
if (!marpolPosition.Flashpoint_CEL.IsNullOrEmpty())
{
if (marpolPosition.Flashpoint_CEL == "-")
aReadState = ExcelReader.ReadState.FAIL;
else
aReadState = ExcelReader.ReadState.OK;
}
reader.Conf.ConfirmText(marpol_flash, marpolPosition.Flashpoint_CEL, aReadState);
if (marpolPosition.Flashpoint_CEL.IsNullOrEmpty()) { marpolPosition.FlashpointInformation = 0; } // NF // Ableitung Flashpoint-Info: Christin, 22.3.2017
else
@ -767,7 +791,15 @@ namespace bsmd.ExcelReadService
imdgPosition.PackingGroup = reader.ReadPackingGroup(imdg_packingGroup);
imdgPosition.MarinePollutant = reader.ReadBoolean(imdg_marinePollutant);
imdgPosition.Flashpoint_CEL = reader.ReadText(imdg_flashpoint);
reader.Conf.ConfirmText(imdg_flashpoint, imdgPosition.Flashpoint_CEL, imdgPosition.Flashpoint_CEL.IsNullOrEmpty() ? ExcelReader.ReadState.NONE : ExcelReader.ReadState.OK);
ExcelReader.ReadState aReadState = ExcelReader.ReadState.NONE;
if (!imdgPosition.Flashpoint_CEL.IsNullOrEmpty())
{
if (imdgPosition.Flashpoint_CEL == "-")
aReadState = ExcelReader.ReadState.FAIL;
else
aReadState = ExcelReader.ReadState.OK;
}
reader.Conf.ConfirmText(imdg_flashpoint, imdgPosition.Flashpoint_CEL, aReadState);
imdgPosition.NumberOfPackages = (int?)reader.ReadNumber(imdg_numberOfPackages);
imdgPosition.PackageType = reader.ReadText(imdg_packageType);
reader.Conf.ConfirmText(imdg_packageType, imdgPosition.PackageType, imdgPosition.PackageType.IsNullOrEmpty() ? ExcelReader.ReadState.FAIL : ExcelReader.ReadState.OK);
@ -831,7 +863,15 @@ namespace bsmd.ExcelReadService
reader.Conf.ConfirmText(ibc_pollutionCategory, pollutionCategory, ibcPosition.PollutionCategory.HasValue ? ExcelReader.ReadState.OK : ExcelReader.ReadState.FAIL);
ibcPosition.Flashpoint_CEL = reader.ReadText(ibc_flash);
reader.Conf.ConfirmText(ibc_flash, ibcPosition.Flashpoint_CEL, ExcelReader.ReadState.NONE);
ExcelReader.ReadState aReadState = ExcelReader.ReadState.NONE;
if (!ibcPosition.Flashpoint_CEL.IsNullOrEmpty())
{
if (ibcPosition.Flashpoint_CEL == "-")
aReadState = ExcelReader.ReadState.FAIL;
else
aReadState = ExcelReader.ReadState.OK;
}
reader.Conf.ConfirmText(ibc_flash, ibcPosition.Flashpoint_CEL, aReadState);
ibcPosition.Quantity_KGM = (int?)reader.ReadNumber(ibc_quantity);
ibcPosition.StowagePosition = reader.ReadText(ibc_stowagePosition);
reader.Conf.ConfirmText(ibc_stowagePosition, ibcPosition.StowagePosition, ibcPosition.StowagePosition.IsNullOrEmpty() ? ExcelReader.ReadState.FAIL : ExcelReader.ReadState.OK);
@ -953,7 +993,15 @@ namespace bsmd.ExcelReadService
marpolPosition.Name = name;
reader.Conf.ConfirmText(marpol_name, name, ExcelReader.ReadState.OK);
marpolPosition.Flashpoint_CEL = reader.ReadText(marpol_flash);
reader.Conf.ConfirmText(marpol_flash, marpolPosition.Flashpoint_CEL, marpolPosition.Flashpoint_CEL.IsNullOrEmpty() ? ExcelReader.ReadState.FAIL : ExcelReader.ReadState.OK);
ExcelReader.ReadState aReadState = ExcelReader.ReadState.NONE;
if (!marpolPosition.Flashpoint_CEL.IsNullOrEmpty())
{
if (marpolPosition.Flashpoint_CEL == "-")
aReadState = ExcelReader.ReadState.FAIL;
else
aReadState = ExcelReader.ReadState.OK;
}
reader.Conf.ConfirmText(marpol_flash, marpolPosition.Flashpoint_CEL, aReadState);
if (marpolPosition.Flashpoint_CEL.IsNullOrEmpty()) { marpolPosition.FlashpointInformation = 0; } // NF // Ableitung Flashpoint-Info: Christin, 22.3.2017
else
@ -1117,7 +1165,10 @@ namespace bsmd.ExcelReadService
callPurpose.CallPurposeCode = ((int?)reader.ReadNumber(callPurposeCodeKey)) ?? 0;
callPurpose.CallPurposeDescription = callPurposeDescription;
reader.Conf.ConfirmText(callPurposeDescriptionKey, callPurposeDescription, callPurposeDescription.IsNullOrEmpty() ? ExcelReader.ReadState.WARN : ExcelReader.ReadState.OK);
ExcelReader.ReadState aReadState = ExcelReader.ReadState.OK;
if (callPurposeDescription.IsNullOrEmpty()) aReadState = ExcelReader.ReadState.WARN;
else if (callPurposeDescription.Length > 90) aReadState = ExcelReader.ReadState.FAIL;
reader.Conf.ConfirmText(callPurposeDescriptionKey, callPurposeDescription, aReadState);
if (i == 1)
reader.Conf.ConfirmText("NOA_NOD.CallPuposeDescription_1_DK", callPurposeDescription, callPurposeDescription.IsNullOrEmpty() ? ExcelReader.ReadState.WARN : ExcelReader.ReadState.OK);
}

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

@ -66,6 +66,13 @@ namespace bsmd.database
[MaxLength(4)]
[ENI2Validation]
public string PortFacilityGISISCode { get; set; }
// NSW5
//[ShowReport]
//[Validation(ValidationCode.LOCODE)]
//[ENI2Validation]
[MaxLength(5)]
public string PortFacilityGISICodeLocode { get; set; }
public string Identifier { get; set; }
@ -89,7 +96,8 @@ namespace bsmd.database
scmd.Parameters.AddWithNullableValue("@P7", this.PortFacilityShipSecurityLevel);
scmd.Parameters.AddWithNullableValue("@P8", this.PortFacilitySecurityMattersToReport);
scmd.Parameters.AddWithNullableValue("@P9", this.PortFacilityGISISCode);
scmd.Parameters.AddWithNullableValue("@P10", this.Identifier);
scmd.Parameters.AddWithNullableValue("@P10", this.PortFacilityGISICodeLocode);
scmd.Parameters.AddWithNullableValue("@P11", this.Identifier);
if (this.IsNew)
{
@ -97,8 +105,8 @@ namespace bsmd.database
scmd.Parameters.AddWithValue("@ID", this.Id);
scmd.CommandText = string.Format("INSERT INTO {0} (Id, SEC_Id, PortFacilityPortName, PortFacilityPortCountry, " +
"PortFacilityPortLoCode, PortFacilityDateOfArrival, PortFacilityDateOfDeparture, PortFacilityShipSecurityLevel, " +
"PortFacilitySecurityMattersToReport, PortFacilityGISISCode, Identifier) VALUES ( @ID, @P1, @P2, @P3, @P4, @P5, @P6, @P7, @P8, @P9, @P10)",
this.Tablename);
"PortFacilitySecurityMattersToReport, PortFacilityGISISCode, PortFacilityGISICodeLoCode, Identifier) VALUES " +
"( @ID, @P1, @P2, @P3, @P4, @P5, @P6, @P7, @P8, @P9, @P10, @P11)", this.Tablename);
}
else
{
@ -106,7 +114,7 @@ namespace bsmd.database
scmd.CommandText = string.Format("UPDATE {0} SET PortFacilityPortName = @P2, PortFacilityPortCountry = @P3, " +
"PortFacilityPortLoCode = @P4, PortFacilityDateOfArrival = @P5, PortFacilityDateOfDeparture = @P6," +
"PortFacilityShipSecurityLevel = @P7, PortFacilitySecurityMattersToReport = @P8, PortFacilityGISISCode = @P9, " +
"Identifier = @P10 WHERE Id = @ID", this.Tablename);
"PortFacilityGISICodeLoCode = @P10, Identifier = @P11 WHERE Id = @ID", this.Tablename);
}
}
@ -114,7 +122,7 @@ namespace bsmd.database
{
string query = string.Format("SELECT Id, PortFacilityPortName, PortFacilityPortCountry, PortFacilityPortLoCode, " +
"PortFacilityDateOfArrival, PortFacilityDateOfDeparture, PortFacilityShipSecurityLevel, PortFacilitySecurityMattersToReport, " +
"PortFacilityGISISCode, Identifier FROM {0} ", this.Tablename);
"PortFacilityGISISCode, PortFacilityGISICodeLoCode, Identifier FROM {0} ", this.Tablename);
switch (filter)
{
@ -150,7 +158,8 @@ namespace bsmd.database
if (!reader.IsDBNull(6)) ltpfc.PortFacilityShipSecurityLevel = reader.GetByte(6);
if (!reader.IsDBNull(7)) ltpfc.PortFacilitySecurityMattersToReport = reader.GetString(7);
if (!reader.IsDBNull(8)) ltpfc.PortFacilityGISISCode = reader.GetString(8);
if (!reader.IsDBNull(9)) ltpfc.Identifier = reader.GetString(9);
if (!reader.IsDBNull(9)) ltpfc.PortFacilityGISICodeLocode = reader.GetString(9);
if (!reader.IsDBNull(10)) ltpfc.Identifier = reader.GetString(10);
result.Add(ltpfc);
}
reader.Close();

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

@ -2,6 +2,6 @@
[assembly: AssemblyCompany("schick Informatik")]
[assembly: AssemblyProduct("BSMD NSW interface")]
[assembly: AssemblyInformationalVersion("3.9.9")]
[assembly: AssemblyInformationalVersion("3.9.10")]
[assembly: AssemblyCopyright("Copyright © 2014-2017 schick Informatik")]
[assembly: AssemblyTrademark("")]

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

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

7
nsw/Source/bsmd.dbh/Request.cs
View File

@ -385,8 +385,11 @@ namespace bsmd.dbh
secItems.Add(sec.CSOEMail);
choiceType1s.Add(ItemsChoiceType1.ValidISSCOnBoard);
secItems.Add(sec.ValidISSCOnBoard ?? false ? RootSECValidISSCOnBoard.Y : RootSECValidISSCOnBoard.N);
choiceType1s.Add(ItemsChoiceType1.ReasonsForNoValidISSC);
secItems.Add(sec.ReasonsForNoValidISSC);
if (!(sec.ValidISSCOnBoard ?? false) && !sec.ReasonsForNoValidISSC.IsNullOrEmpty())
{
choiceType1s.Add(ItemsChoiceType1.ReasonsForNoValidISSC);
secItems.Add(sec.ReasonsForNoValidISSC);
}
choiceType1s.Add(ItemsChoiceType1.ISSCType);
secItems.Add((ISSCType)(sec.ISSCType ?? 0));
choiceType1s.Add(ItemsChoiceType1.ISSCIssuerType);