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

2.4.13 (vor Besuch Bremen)

Browse Source
This commit is contained in:
Daniel Schick 2015-11-25 20:11:14 +00:00
parent 4eca10bfb4
commit c9e5e5e96e
6 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nsw/Source/SendNSWMessageService/NSWSendService.cs
View File

@ -42,7 +42,6 @@ namespace SendNSWMessageService
this.EventLog.WriteEntry("NSW Send Service started", EventLogEntryType.Information); this.EventLog.WriteEntry("NSW Send Service started", EventLogEntryType.Information);
_log.InfoFormat("NSW Send Service started. v.{0}", version); _log.InfoFormat("NSW Send Service started. v.{0}", version);
this.DoOnce(); this.DoOnce();
} }

2
nsw/Source/bsmd.database/HAZ.cs
View File

@ -288,9 +288,11 @@ namespace bsmd.database
{ {
if (this.GetValidationBlock() == ValidationBlock.BLOCK2) if (this.GetValidationBlock() == ValidationBlock.BLOCK2)
{ {
/*
if ((this.IMDGPositions.Count == 0) && (this.IBCPositions.Count == 0) && (this.IGCPositions.Count == 0) && if ((this.IMDGPositions.Count == 0) && (this.IBCPositions.Count == 0) && (this.IGCPositions.Count == 0) &&
(this.IMSBCPositions.Count == 0) && (this.MARPOLPositions.Count == 0)) (this.IMSBCPositions.Count == 0) && (this.MARPOLPositions.Count == 0))
violations.Add(RuleEngine.CreateViolation(ValidationCode.V805, "At least one DPG item has to be provided!", null)); violations.Add(RuleEngine.CreateViolation(ValidationCode.V805, "At least one DPG item has to be provided!", null));
*/
foreach (IMDGPosition imdg in this.IMDGPositions) foreach (IMDGPosition imdg in this.IMDGPositions)
{ {

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("2.4.12")] [assembly: AssemblyInformationalVersion("2.4.13")]
[assembly: AssemblyCopyright("Copyright © 2014-2015 Informatikbüro Daniel Schick. All rights reserved.")] [assembly: AssemblyCopyright("Copyright © 2014-2015 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("2.4.12.*")] [assembly: AssemblyVersion("2.4.13.*")]

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

@ -661,10 +661,13 @@ namespace bsmd.dbh
List<ItemsChoiceType2> choiceTypes2 = new List<ItemsChoiceType2>(); List<ItemsChoiceType2> choiceTypes2 = new List<ItemsChoiceType2>();
choiceTypes2.Add(ItemsChoiceType2.NonAccidentialDeathsDuringVoyage); choiceTypes2.Add(ItemsChoiceType2.NonAccidentialDeathsDuringVoyage);
mdhItems.Add(mdh.NonAccidentalDeathsDuringVoyage ?? false ? RootMDHNonAccidentialDeathsDuringVoyage.Y : RootMDHNonAccidentialDeathsDuringVoyage.N); mdhItems.Add((mdh.NonAccidentalDeathsDuringVoyage ?? false) ? RootMDHNonAccidentialDeathsDuringVoyage.Y : RootMDHNonAccidentialDeathsDuringVoyage.N);
choiceTypes2.Add(ItemsChoiceType2.NonAccidentialDeathsDuringVoyageCount); if (mdh.NonAccidentalDeathsDuringVoyage ?? false)
mdhItems.Add(mdh.NonAccidentalDeathsDuringVoyageCount ?? 0); {
choiceTypes2.Add(ItemsChoiceType2.NonAccidentialDeathsDuringVoyageCount);
mdhItems.Add(mdh.NonAccidentalDeathsDuringVoyageCount ?? 0);
}
choiceTypes2.Add(ItemsChoiceType2.SuspisionInfectiousNature); choiceTypes2.Add(ItemsChoiceType2.SuspisionInfectiousNature);
mdhItems.Add(mdh.SuspisionInfectiousNature ?? false ? RootMDHSuspisionInfectiousNature.Y : RootMDHSuspisionInfectiousNature.N); mdhItems.Add(mdh.SuspisionInfectiousNature ?? false ? RootMDHSuspisionInfectiousNature.Y : RootMDHSuspisionInfectiousNature.N);
@ -672,8 +675,11 @@ namespace bsmd.dbh
choiceTypes2.Add(ItemsChoiceType2.NumberOfIllPersonsHigherThanExpected); choiceTypes2.Add(ItemsChoiceType2.NumberOfIllPersonsHigherThanExpected);
mdhItems.Add(mdh.NumberOfIllPersonsHigherThanExpected ?? false ? RootMDHNumberOfIllPersonsHigherThanExpected.Y : RootMDHNumberOfIllPersonsHigherThanExpected.N); mdhItems.Add(mdh.NumberOfIllPersonsHigherThanExpected ?? false ? RootMDHNumberOfIllPersonsHigherThanExpected.Y : RootMDHNumberOfIllPersonsHigherThanExpected.N);
choiceTypes2.Add(ItemsChoiceType2.NumberOfIllPersons); if (mdh.NumberOfIllPersonsHigherThanExpected ?? false)
mdhItems.Add(mdh.NumberOfIllPersons ?? 0); {
choiceTypes2.Add(ItemsChoiceType2.NumberOfIllPersons);
mdhItems.Add(mdh.NumberOfIllPersons ?? 0);
}
choiceTypes2.Add(ItemsChoiceType2.SickPersonsOnBoard); choiceTypes2.Add(ItemsChoiceType2.SickPersonsOnBoard);
mdhItems.Add(mdh.SickPersonsOnBoard ?? false ? RootMDHSickPersonsOnBoard.Y : RootMDHSickPersonsOnBoard.N); mdhItems.Add(mdh.SickPersonsOnBoard ?? false ? RootMDHSickPersonsOnBoard.Y : RootMDHSickPersonsOnBoard.N);
@ -1406,6 +1412,7 @@ namespace bsmd.dbh
} }
} }
_log.InfoFormat("Send Url: {0}", client.Url);
string result = client.Root( string result = client.Root(
version, version,

3
nsw/Source/bsmd.herberg.FormService/XtraLogic.cs
View File

@ -69,9 +69,6 @@ namespace bsmd.herberg.FormService
core.PoC = "ZZNOK"; core.PoC = "ZZNOK";
core.ETA = core.ETAKielCanal; core.ETA = core.ETAKielCanal;
} }
} }
} }
} }