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

Version 5.0.4, alles neu ausgeliefert

Browse Source
This commit is contained in:
Daniel Schick 2018-03-25 11:13:16 +00:00
parent 8bddcb3af1
commit 09c4e38513
13 changed files with 30 additions and 20 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.4/LockingService/LockingService.svc</value--> <value>http://192.168.2.4/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>Data Source=192.168.2.12;Initial Catalog=nsw;Uid=dfuser;Pwd=dfpasswd;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> <!--value>Data Source=(localdb)\Projects;Initial Catalog=nsw;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False</value-->
</setting> </setting>
</ENI2.Properties.Settings> </ENI2.Properties.Settings>
</applicationSettings> </applicationSettings>

4
ENI-2/ENI2/ENI2/DetailViewControls/SecurityDetailControl.xaml.cs
View File

@ -354,8 +354,8 @@ namespace ENI2.DetailViewControls
if (!reader.IsDBNull(7)) l10c.PortFacilityGISISCode = gisis.ToString().PadLeft(4, '0'); if (!reader.IsDBNull(7)) l10c.PortFacilityGISISCode = gisis.ToString().PadLeft(4, '0');
if (!reader.IsDBNull(8)) l10c.PortFacilitySecurityMattersToReport = reader.GetString(8); if (!reader.IsDBNull(8)) l10c.PortFacilitySecurityMattersToReport = reader.GetString(8);
if (l10c.PortFacilitySecurityMattersToReport.Equals("nil", StringComparison.CurrentCultureIgnoreCase)) if (l10c.PortFacilitySecurityMattersToReport.Equals("nil", StringComparison.CurrentCultureIgnoreCase))
l10c.PortFacilitySecurityMattersToReport = null; l10c.PortFacilitySecurityMattersToReport = null;
if (!reader.IsDBNull(9)) l10c.PortFacilityGISISCodeLocode = reader.GetString(9);
l10c.SEC = this._sec; l10c.SEC = this._sec;
l10c.IsDirty = true; l10c.IsDirty = true;
l10c.Identifier = LastTenPortFacilitiesCalled.GetNewIdentifier(this._sec.LastTenPortFacilitesCalled); l10c.Identifier = LastTenPortFacilitiesCalled.GetNewIdentifier(this._sec.LastTenPortFacilitesCalled);

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

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

3
ENI-2/ENI2/ENI2/EditControls/CopyDeclarationDialog.xaml.cs
View File

@ -127,12 +127,13 @@ namespace ENI2.EditControls
{ {
this.NewCore.IsTransit = true; this.NewCore.IsTransit = true;
this.NewCore.ETAKielCanal = this.datePickerETA.SelectedDate; this.NewCore.ETAKielCanal = this.datePickerETA.SelectedDate;
this.NewCore.TransitId = this.textBoxVisitTransitId.Text.Trim();
} }
else else
{ {
this.NewCore.IsTransit = false; this.NewCore.IsTransit = false;
this.NewCore.ETA = this.datePickerETA.SelectedDate; this.NewCore.ETA = this.datePickerETA.SelectedDate;
this.NewCore.VisitId = this.textBoxVisitTransitId.Text.Trim();
} }
if (this.doubleUpDownIMO.Value.HasValue) if (this.doubleUpDownIMO.Value.HasValue)

BIN
Stundensheet.xlsx
View File

Binary file not shown.

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

@ -1363,7 +1363,8 @@ namespace bsmd.ExcelReadService
// RM am 24.1.18, ich hoffe das stimmt so wie sie meint.. // RM am 24.1.18, ich hoffe das stimmt so wie sie meint..
if((reader.Mode == ExcelReader.CountryMode.DK) && (i==9)) if((reader.Mode == ExcelReader.CountryMode.DK) && (i==9))
{ {
waste.WasteType = 2300; _log.DebugFormat("DK: Changing Waste code {0} to 2300 for line {1}", waste.WasteType, i);
waste.WasteType = 2300;
} }
reader.Conf.ConfirmText(wasteDescription, waste.WasteDescription, waste.WasteDescription.IsNullOrEmpty() ? ExcelReader.ReadState.WARN : ExcelReader.ReadState.OK); reader.Conf.ConfirmText(wasteDescription, waste.WasteDescription, waste.WasteDescription.IsNullOrEmpty() ? ExcelReader.ReadState.WARN : ExcelReader.ReadState.OK);

2
nsw/Source/bsmd.dbh.ResponseService/IResponseService.cs
View File

@ -21,7 +21,7 @@ namespace bsmd.dbh.ResponseService
bsmd.dbh.response.RootReportingClassesPartial ReportingClassesPartial, bsmd.dbh.response.RootReportingClassesPartial ReportingClassesPartial,
bsmd.dbh.response.RootReportingClassesError RootReportingClassesError, bsmd.dbh.response.RootReportingClassesError RootReportingClassesError,
bsmd.dbh.response.RootReportingClassesResetted ReportingClassesResetted, bsmd.dbh.response.RootReportingClassesResetted ReportingClassesResetted,
List<bsmd.dbh.response.RootMessage> Messages); bsmd.dbh.response.Message[] Messages);
} }

4
nsw/Source/bsmd.dbh.ResponseService/ResponseService.svc.cs
View File

@ -18,7 +18,7 @@ namespace bsmd.dbh.ResponseService
bsmd.dbh.response.RootReportingClassesPartial ReportingClassesPartial, bsmd.dbh.response.RootReportingClassesPartial ReportingClassesPartial,
bsmd.dbh.response.RootReportingClassesError RootReportingClassesError, bsmd.dbh.response.RootReportingClassesError RootReportingClassesError,
bsmd.dbh.response.RootReportingClassesResetted ReportingClassesResetted, bsmd.dbh.response.RootReportingClassesResetted ReportingClassesResetted,
List<bsmd.dbh.response.RootMessage> Messages) bsmd.dbh.response.Message[] Messages)
{ {
// Der Fehler hier aktuell ist dass alles funktioniert, außer dass "Messages" nicht // Der Fehler hier aktuell ist dass alles funktioniert, außer dass "Messages" nicht
@ -36,7 +36,7 @@ namespace bsmd.dbh.ResponseService
else else
{ {
_log.InfoFormat(Messages.GetType().ToString()); _log.InfoFormat(Messages.GetType().ToString());
_log.InfoFormat("{0} RootMessage elements received", (Messages.Count)); _log.InfoFormat("{0} Message elements received", Messages.Length);
} }

6
nsw/Source/bsmd.dbh/NSWResponse.cs
View File

@ -46,7 +46,7 @@ namespace bsmd.dbh.response
private RootReportingClassesResetted reportingClassesResettedField; private RootReportingClassesResetted reportingClassesResettedField;
private RootMessage[] messagesField; private Message[] messagesField;
/// <remarks/> /// <remarks/>
public string Version public string Version
@ -180,7 +180,7 @@ namespace bsmd.dbh.response
/// <remarks/> /// <remarks/>
[System.Xml.Serialization.XmlArrayItemAttribute("Message", IsNullable = false)] [System.Xml.Serialization.XmlArrayItemAttribute("Message", IsNullable = false)]
public RootMessage[] Messages public Message[] Messages
{ {
get get
{ {
@ -658,7 +658,7 @@ namespace bsmd.dbh.response
[System.Diagnostics.DebuggerStepThroughAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")] [System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true)]
public partial class RootMessage public partial class Message
{ {
private string idField; private string idField;

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

@ -773,7 +773,9 @@ namespace bsmd.dbh
rootInfo.ShippingArea = (ShippingArea)info.ShippingArea.Value; rootInfo.ShippingArea = (ShippingArea)info.ShippingArea.Value;
rootInfo.PortArea = info.PortArea; rootInfo.PortArea = info.PortArea;
rootInfo.RequestedPositionInPortOfCall = info.RequestedPositionInPortOfCall; rootInfo.RequestedPositionInPortOfCall = info.RequestedPositionInPortOfCall;
rootInfo.SpecialRequirementsOfShipAtBerth = info.SpecialRequirementsOfShipAtBerth; if(!info.SpecialRequirementsOfShipAtBerth.IsNullOrEmpty())
rootInfo.SpecialRequirementsOfShipAtBerth = info.SpecialRequirementsOfShipAtBerth;
if(info.SpecialRequirementsOfShipAtBerth.IsNullOrEmpty()) if(info.SpecialRequirementsOfShipAtBerth.IsNullOrEmpty())
{ {
_log.Info("dbh INFO send: SpecialRequirementsOfShipAtBerth is empty."); _log.Info("dbh INFO send: SpecialRequirementsOfShipAtBerth is empty.");

8
nsw/Source/bsmd.dbh/Response.cs
View File

@ -22,7 +22,7 @@ namespace bsmd.dbh
private static ILog _log = LogManager.GetLogger("dbh Response"); private static ILog _log = LogManager.GetLogger("dbh Response");
public static void ProcessResponse(string VisitId, string TransitId, DateTime Timestamp, public static void ProcessResponse(string VisitId, string TransitId, DateTime Timestamp,
string SenderReference, response.RootType Type, List<bsmd.dbh.response.RootMessage> Messages, string SenderReference, response.RootType Type, bsmd.dbh.response.Message[] Messages,
bsmd.dbh.response.RootReportingClassesFull ReportingClassesFull, bsmd.dbh.response.RootReportingClassesFull ReportingClassesFull,
bsmd.dbh.response.RootReportingClassesPartial ReportingClassesPartial, bsmd.dbh.response.RootReportingClassesPartial ReportingClassesPartial,
bsmd.dbh.response.RootReportingClassesError RootReportingClassesError, bsmd.dbh.response.RootReportingClassesError RootReportingClassesError,
@ -130,7 +130,7 @@ namespace bsmd.dbh
// Status zu den jeweiligen Nachrichten. Bei uns sollte die Anzahl hier immer 1 sein, da wir die Dinger // Status zu den jeweiligen Nachrichten. Bei uns sollte die Anzahl hier immer 1 sein, da wir die Dinger
// einzeln verschicken. // einzeln verschicken.
for (int i = 0; i < Messages.Count; i++) for (int i = 0; i < Messages.Length; i++)
{ {
_log.InfoFormat("message {0} type {1}: {2}", i, _log.InfoFormat("message {0} type {1}: {2}", i,
Messages[i].Type, Messages[i].Type,
@ -144,6 +144,7 @@ namespace bsmd.dbh
_log.WarnFormat("Error received for {0}: {1}", Messages[i].Type, error.ErrorText); _log.WarnFormat("Error received for {0}: {1}", Messages[i].Type, error.ErrorText);
error.MessageHeaderId = aMessage.Id.Value; error.MessageHeaderId = aMessage.Id.Value;
aMessage.InternalStatus = Message.BSMDStatus.ERROR; aMessage.InternalStatus = Message.BSMDStatus.ERROR;
aMessage.StatusInfo = string.Format("Id:{0} Loc:{1} - {2}", Messages[i].ID, Messages[i].Location, Messages[i].Text);
DBManager.Instance.Save(error); DBManager.Instance.Save(error);
aMessage.SendSuccess = false; aMessage.SendSuccess = false;
break; break;
@ -154,6 +155,7 @@ namespace bsmd.dbh
_log.WarnFormat("Violation received for {0}: {1}", Messages[i].Type, violation.ViolationText); _log.WarnFormat("Violation received for {0}: {1}", Messages[i].Type, violation.ViolationText);
violation.MessageHeaderId = aMessage.Id.Value; violation.MessageHeaderId = aMessage.Id.Value;
aMessage.InternalStatus = Message.BSMDStatus.VIOLATION; aMessage.InternalStatus = Message.BSMDStatus.VIOLATION;
aMessage.StatusInfo = string.Format("Id:{0} Loc:{1} - {2}", Messages[i].ID, Messages[i].Location, Messages[i].Text);
aMessage.SendSuccess = true; aMessage.SendSuccess = true;
DBManager.Instance.Save(violation); DBManager.Instance.Save(violation);
@ -161,12 +163,14 @@ namespace bsmd.dbh
case dbh.response.RootMessageType.WARNING: case dbh.response.RootMessageType.WARNING:
_log.InfoFormat("WARNING received for {0}: {1}", Messages[i].Type, Messages[i].Text); _log.InfoFormat("WARNING received for {0}: {1}", Messages[i].Type, Messages[i].Text);
aMessage.StatusInfo = string.Format("Id:{0} Loc:{1} - {2}", Messages[i].ID, Messages[i].Location, Messages[i].Text);
aMessage.SendSuccess = true; aMessage.SendSuccess = true;
break; break;
case dbh.response.RootMessageType.INFO: case dbh.response.RootMessageType.INFO:
default: default:
_log.InfoFormat("INFO received for {0}: {1}", Messages[i].Type, Messages[i].Text); _log.InfoFormat("INFO received for {0}: {1}", Messages[i].Type, Messages[i].Text);
aMessage.StatusInfo = string.Format("Id:{0} Loc:{1} - {2}", Messages[i].ID, Messages[i].Location, Messages[i].Text);
aMessage.SendSuccess = true; aMessage.SendSuccess = true;
break; break;
} }

3
nsw/Source/bsmd.hisnord/Request.cs
View File

@ -478,7 +478,8 @@ namespace bsmd.hisnord
hn_info.ShippingArea = (shippingareatype)info.ShippingArea.Value; hn_info.ShippingArea = (shippingareatype)info.ShippingArea.Value;
hn_info.PortArea = info.PortArea; hn_info.PortArea = info.PortArea;
hn_info.RequestedPositionInPortOfCall = info.RequestedPositionInPortOfCall; hn_info.RequestedPositionInPortOfCall = info.RequestedPositionInPortOfCall;
hn_info.SpecialRequirementsOfShipAtBerth = info.SpecialRequirementsOfShipAtBerth; if(!info.SpecialRequirementsOfShipAtBerth.IsNullOrEmpty())
hn_info.SpecialRequirementsOfShipAtBerth = info.SpecialRequirementsOfShipAtBerth;
hn_info.ConstructionCharacteristicsOfShip = info.ConstructionCharacteristicsOfShip; hn_info.ConstructionCharacteristicsOfShip = info.ConstructionCharacteristicsOfShip;
hn_info.BowThrusterPower = info.BowThrusterPower; hn_info.BowThrusterPower = info.BowThrusterPower;
hn_info.SternThrusterPower = info.SternThrusterPower; hn_info.SternThrusterPower = info.SternThrusterPower;

3
nsw/Source/bsmd.hisnord/Response.cs
View File

@ -148,6 +148,7 @@ namespace bsmd.hisnord
if ((nswResponse.Status == "REJECTED") && ((core.Cancelled ?? false) == true)) if ((nswResponse.Status == "REJECTED") && ((core.Cancelled ?? false) == true))
{ {
core.Cancelled = false; // CANCEL fehlgeschlagen core.Cancelled = false; // CANCEL fehlgeschlagen
core.BSMDStatusInternal = MessageCore.BSMDStatus.FAILURE;
_log.InfoFormat("Cancel rejected for {0}", core.DisplayId); _log.InfoFormat("Cancel rejected for {0}", core.DisplayId);
} }
@ -237,7 +238,7 @@ namespace bsmd.hisnord
} }
if(!aMessageStillInSENTstate) if(!aMessageStillInSENTstate && !(core.Cancelled ?? false))
core.BSMDStatusInternal = MessageCore.BSMDStatus.RESPONDED; core.BSMDStatusInternal = MessageCore.BSMDStatus.RESPONDED;
DBManager.Instance.Save(core); DBManager.Instance.Save(core);