diff --git a/ENI-2/ENI2/ENI2/App.config b/ENI-2/ENI2/ENI2/App.config index b54015b3..28528d5d 100644 --- a/ENI-2/ENI2/ENI2/App.config +++ b/ENI-2/ENI2/ENI2/App.config @@ -17,7 +17,7 @@ Sample license text. - Data Source=192.168.2.12;Initial Catalog=nsw;Uid=dfuser;Pwd=dfpasswd;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False + Data Source=(localdb)\Projects;Initial Catalog=nsw;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False diff --git a/ENI-2/ENI2/ENI2/EditControls/VisitIdDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/VisitIdDialog.xaml index e2211ce7..1b8efc25 100644 --- a/ENI-2/ENI2/ENI2/EditControls/VisitIdDialog.xaml +++ b/ENI-2/ENI2/ENI2/EditControls/VisitIdDialog.xaml @@ -8,7 +8,7 @@ xmlns:p="clr-namespace:ENI2.Properties" xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" mc:Ignorable="d" - Title="Id" Height="192" Width="300" WindowStyle="SingleBorderWindow" Background="AliceBlue"> + Title="{x:Static p:Resources.textNewVisitTransitId}" Height="192" Width="300" WindowStyle="SingleBorderWindow" Background="AliceBlue" ResizeMode="NoResize"> @@ -38,7 +38,7 @@ DisplayDefaultValueOnEmptyText="False" ButtonSpinnerLocation="Right" ParsingNumberStyle="Integer" - Watermark="Enter IMO"/> + Watermark="Enter IMO" ValueChanged="doubleUpDownIMO_ValueChanged"/> + Watermark="Enter ENI" ValueChanged="doubleUpDownENI_ValueChanged"/> diff --git a/ENI-2/ENI2/ENI2/EditControls/VisitIdDialog.xaml.cs b/ENI-2/ENI2/ENI2/EditControls/VisitIdDialog.xaml.cs index 6eaa98fc..22c31aa7 100644 --- a/ENI-2/ENI2/ENI2/EditControls/VisitIdDialog.xaml.cs +++ b/ENI-2/ENI2/ENI2/EditControls/VisitIdDialog.xaml.cs @@ -2,19 +2,7 @@ // Description: Mit diesem Dialog können neue Visit/Transit-Id's beantragt werden (DE only) // -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Shapes; using ENI2.Controls; using bsmd.database; @@ -61,5 +49,21 @@ namespace ENI2.EditControls public MessageCore Core { get; set; } + #region event handler + + private void doubleUpDownIMO_ValueChanged(object sender, RoutedPropertyChangedEventArgs e) + { + bool hasValue = (doubleUpDownIMO.Value.HasValue && doubleUpDownIMO.Value > 0); + doubleUpDownENI.IsReadOnly = hasValue; + } + + private void doubleUpDownENI_ValueChanged(object sender, RoutedPropertyChangedEventArgs e) + { + bool hasValue = (doubleUpDownENI.Value.HasValue && doubleUpDownENI.Value > 0); + doubleUpDownIMO.IsReadOnly = hasValue; + } + + #endregion + } } diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx index 9bfc79d5..34ae8485 100644 Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ diff --git a/nsw/HIS-NORD/HIS-NORD - zusätzl. Vertragsbedingungen - - 05.04.2017 - Entwurf Lastenhef tzur Schnittstelle BSMD-.docx b/nsw/HIS-NORD/HIS-NORD - zusätzl. Vertragsbedingungen - - 05.04.2017 - Entwurf Lastenhef tzur Schnittstelle BSMD-.docx new file mode 100644 index 00000000..21e2b08d Binary files /dev/null and b/nsw/HIS-NORD/HIS-NORD - zusätzl. Vertragsbedingungen - - 05.04.2017 - Entwurf Lastenhef tzur Schnittstelle BSMD-.docx differ diff --git a/nsw/HIS-NORD/StatusInfoNSW.xml b/nsw/HIS-NORD/StatusInfoNSW.xml new file mode 100644 index 00000000..5df7fbf8 --- /dev/null +++ b/nsw/HIS-NORD/StatusInfoNSW.xml @@ -0,0 +1,62 @@ + + + + 2017-05-15T15:28:33.306+02:00 + DERSK-2017-LQRTWW + + + Y + + AGNT, BPOL, CREW, INFO, LADG, MDH, NOA_NOD, PAS, PRE_72_H, SEC, SERV, STAT, TOWA, WAS + ATA, ATD, BKRA, BKRD, HAZA, HAZD, NAME, POBA, POBD, TIEFA, TIEFD, TOWD + + + + \ No newline at end of file diff --git a/nsw/HIS-NORD/SystemError-ProcessStatus/SystemError-ProcessStatus-5.xml b/nsw/HIS-NORD/SystemError-ProcessStatus/SystemError-ProcessStatus-5.xml new file mode 100644 index 00000000..2dd4937d --- /dev/null +++ b/nsw/HIS-NORD/SystemError-ProcessStatus/SystemError-ProcessStatus-5.xml @@ -0,0 +1,25 @@ + + + 2017-04-21T09:30:40.109+02:00 + MDH + 7696 + 5 + ZZNOK-2017-AVNBEF_TRANSIT.xml + ZZNOK-2017-AVNBEF + -275 + Fehler in Feld "MDH_NOTIFIED_LOCODE" (Unlocode) wert=null + Fehler in Feld "MDH_NOTIFIED_LOCODE" (Unlocode) wert=null (Unlocode String - [A-Z]{2}[A-Z0-9]{3}) + \ No newline at end of file diff --git a/nsw/HIS-NORD/SystemError-ProcessStatus/SystemError-ProcessStatus-6.xml b/nsw/HIS-NORD/SystemError-ProcessStatus/SystemError-ProcessStatus-6.xml new file mode 100644 index 00000000..07348cb0 --- /dev/null +++ b/nsw/HIS-NORD/SystemError-ProcessStatus/SystemError-ProcessStatus-6.xml @@ -0,0 +1,26 @@ + + + 2017-04-21T09:34:49.208+02:00 + ATD + 976642 + 6 + 2017-04-21T09:39:49.208+02:00 + DEBRB-2017-SRAJKA_VISIT.xml + DEBRB-2017-SRAJKA + -560 + WebServiceException; + WebServiceException (Could not send Message. java.net.ConnectException: ConnectException invoking https://api.national-single-window.de/atd: Verbindungsaufbau abgelehnt invoke); + \ No newline at end of file diff --git a/nsw/Source/SendNSWMessageService.sln b/nsw/Source/SendNSWMessageService.sln index b6814230..105cdb1f 100644 --- a/nsw/Source/SendNSWMessageService.sln +++ b/nsw/Source/SendNSWMessageService.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.21005.1 +# Visual Studio 14 +VisualStudioVersion = 14.0.25123.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SendNSWMessageService", "SendNSWMessageService\SendNSWMessageService.csproj", "{E6F8F110-77E7-4348-9875-CAD095BF8E24}" EndProject @@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "bsmd.dakosy", "bsmd.dakosy\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "bsmd.hisnord", "bsmd.hisnord\bsmd.hisnord.csproj", "{E7E48971-E879-4E6A-B316-70AC0A6F4C95}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "bsmd.status", "bsmd.status\bsmd.status.csproj", "{1EA7D5CE-4051-45CB-BE70-F8DD3DE0416A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,6 +41,10 @@ Global {E7E48971-E879-4E6A-B316-70AC0A6F4C95}.Debug|Any CPU.Build.0 = Debug|Any CPU {E7E48971-E879-4E6A-B316-70AC0A6F4C95}.Release|Any CPU.ActiveCfg = Release|Any CPU {E7E48971-E879-4E6A-B316-70AC0A6F4C95}.Release|Any CPU.Build.0 = Release|Any CPU + {1EA7D5CE-4051-45CB-BE70-F8DD3DE0416A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1EA7D5CE-4051-45CB-BE70-F8DD3DE0416A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1EA7D5CE-4051-45CB-BE70-F8DD3DE0416A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1EA7D5CE-4051-45CB-BE70-F8DD3DE0416A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/nsw/Source/SendNSWMessageService/SendNSWMessageService.csproj b/nsw/Source/SendNSWMessageService/SendNSWMessageService.csproj index 7fd1f48c..396e5352 100644 --- a/nsw/Source/SendNSWMessageService/SendNSWMessageService.csproj +++ b/nsw/Source/SendNSWMessageService/SendNSWMessageService.csproj @@ -119,6 +119,10 @@ {e7e48971-e879-4e6a-b316-70ac0a6f4c95} bsmd.hisnord + + {1ea7d5ce-4051-45cb-be70-f8dd3de0416a} + bsmd.status + + + + +
+ + + + + + BSMD-REF + + + Hd47%23fz9Bl48sxU%232 + + + xml + + + https://ref-app.his-nord.de/HIS-Service/StatusInfoNSW.jsp + + + + \ No newline at end of file diff --git a/nsw/Source/bsmd.status/bsmd.status.csproj b/nsw/Source/bsmd.status/bsmd.status.csproj new file mode 100644 index 00000000..a1d6005d --- /dev/null +++ b/nsw/Source/bsmd.status/bsmd.status.csproj @@ -0,0 +1,84 @@ + + + + + Debug + AnyCPU + {1EA7D5CE-4051-45CB-BE70-F8DD3DE0416A} + Library + Properties + bsmd.status + bsmd.status + v4.5 + 512 + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + Properties\AssemblyProductInfo.cs + + + Properties\AssemblyProjectInfo.cs + + + Properties\AssemblyProjectKeyInfo.cs + + + + True + True + Settings.settings + + + + + + + {19945af2-379b-46a5-b27a-303b5ec1d557} + bsmd.database + + + + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + + \ No newline at end of file diff --git a/nsw/Source/bsmd.status/bsmd.status.licenseheader b/nsw/Source/bsmd.status/bsmd.status.licenseheader new file mode 100644 index 00000000..ab2a9863 --- /dev/null +++ b/nsw/Source/bsmd.status/bsmd.status.licenseheader @@ -0,0 +1,15 @@ +extensions: designer.cs generated.cs +extensions: .cs .cpp .h +// Copyright (c) 2017 schick Informatik +// Description: + +extensions: .aspx .ascx +<%-- +Copyright (c) 2017 schick Informatik +--%> +extensions: .vb +'Sample license text. +extensions: .xml .config .xsd + \ No newline at end of file diff --git a/nsw/Source/bsmd.status/dataset.cs b/nsw/Source/bsmd.status/dataset.cs new file mode 100644 index 00000000..73d1954c --- /dev/null +++ b/nsw/Source/bsmd.status/dataset.cs @@ -0,0 +1,97 @@ +// Copyright (c) 2017 schick Informatik +// Description: Container-Klasse für die Status-Informationen des NSW (zur Deserialisierung) + +using System; +using System.IO; +using System.Xml.Serialization; + +using log4net; + +namespace bsmd.status +{ + [Serializable] + public class dataset + { + private static ILog _log = LogManager.GetLogger(typeof(bsmd.status.dataset)); + + /// + /// this class needs a public empty constructor for deserialization + /// + public dataset() {} + + #region Properties + + public DateTime SendAt { get; set; } + + public string VisitIdTransitId { get; set; } + + #endregion + + #region Deserialization + + public static dataset ReadStatus(string statusString) + { + dataset aStatus = null; + try + { + XmlSerializer serializer = new XmlSerializer(typeof(bsmd.status.dataset)); + using (TextReader reader = new StringReader(statusString)) + { + aStatus = serializer.Deserialize(reader) as dataset; + } + } + catch (Exception ex) + { + _log.ErrorFormat("Exception occurred during deserialization: {0}", ex.Message); + } + + return aStatus; + } + + #endregion + + } + + [Serializable] + public class NswResponse + { + #region Properties + + public string Cancelled { get; set; } + + [XmlIgnore] + public bool IsCancelled + { + get + { + if ((this.Cancelled != null) && (this.Cancelled == "Y")) return true; + return false; + } + } + + public string VisitIdOrTransitIdCancellable { get; set; } + + [XmlIgnore] + public bool IsVisitIdOrTransitIdCancellable + { + get + { + if ((this.VisitIdOrTransitIdCancellable != null) && (this.VisitIdOrTransitIdCancellable == "Y")) return true; + return false; + } + } + + public string BlockedNotificationClasses { get; set; } + + public string OwnNotificationClasses { get; set; } + + public string FreeNotificationClasses { get; set; } + + public string ErrorCode { get; set; } + + public string ErrorMessage { get; set; } + + #endregion + + } +} diff --git a/nsw/Source/bsmd.status/packages.config b/nsw/Source/bsmd.status/packages.config new file mode 100644 index 00000000..9a0551c5 --- /dev/null +++ b/nsw/Source/bsmd.status/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file