diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx index cce8987d..489ebb06 100644 Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ diff --git a/nsw/HIS-NORD/xsd.assert/bpol_reeder.xsd b/nsw/HIS-NORD/xsd.assert/bpol_reeder.xsd new file mode 100644 index 00000000..07a0d412 --- /dev/null +++ b/nsw/HIS-NORD/xsd.assert/bpol_reeder.xsd @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nsw/HIS-NORD/xsd.assert/crew_reeder.xsd b/nsw/HIS-NORD/xsd.assert/crew_reeder.xsd new file mode 100644 index 00000000..ac442e93 --- /dev/null +++ b/nsw/HIS-NORD/xsd.assert/crew_reeder.xsd @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nsw/HIS-NORD/xsd.assert/his-nord_nsw_v-1-0_all_reeder.xsd b/nsw/HIS-NORD/xsd.assert/his-nord_nsw_v-1-0_all_reeder.xsd new file mode 100644 index 00000000..e2b99dc0 --- /dev/null +++ b/nsw/HIS-NORD/xsd.assert/his-nord_nsw_v-1-0_all_reeder.xsd @@ -0,0 +1,803 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nsw/HIS-NORD/xsd.assert/mdh_reeder.xsd b/nsw/HIS-NORD/xsd.assert/mdh_reeder.xsd new file mode 100644 index 00000000..6a5609b3 --- /dev/null +++ b/nsw/HIS-NORD/xsd.assert/mdh_reeder.xsd @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nsw/HIS-NORD/xsd.assert/pas_reeder.xsd b/nsw/HIS-NORD/xsd.assert/pas_reeder.xsd new file mode 100644 index 00000000..3948a196 --- /dev/null +++ b/nsw/HIS-NORD/xsd.assert/pas_reeder.xsd @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nsw/HIS-NORD/xsd.assert/prearrival72_reeder.xsd b/nsw/HIS-NORD/xsd.assert/prearrival72_reeder.xsd new file mode 100644 index 00000000..4990b801 --- /dev/null +++ b/nsw/HIS-NORD/xsd.assert/prearrival72_reeder.xsd @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nsw/HIS-NORD/xsd.assert/sec_reeder.xsd b/nsw/HIS-NORD/xsd.assert/sec_reeder.xsd new file mode 100644 index 00000000..3cb27de5 --- /dev/null +++ b/nsw/HIS-NORD/xsd.assert/sec_reeder.xsd @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nsw/HIS-NORD/xsd.assert/serv_reeder.xsd b/nsw/HIS-NORD/xsd.assert/serv_reeder.xsd new file mode 100644 index 00000000..fe07ad99 --- /dev/null +++ b/nsw/HIS-NORD/xsd.assert/serv_reeder.xsd @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nsw/HIS-NORD/xsd.assert/tow_reeder.xsd b/nsw/HIS-NORD/xsd.assert/tow_reeder.xsd new file mode 100644 index 00000000..bda4fe26 --- /dev/null +++ b/nsw/HIS-NORD/xsd.assert/tow_reeder.xsd @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nsw/HIS-NORD/xsd.assert/waste_reeder.xsd b/nsw/HIS-NORD/xsd.assert/waste_reeder.xsd new file mode 100644 index 00000000..07af9fb9 --- /dev/null +++ b/nsw/HIS-NORD/xsd.assert/waste_reeder.xsd @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nsw/HIS-NORD/xsd/bpol_reeder.xsd b/nsw/HIS-NORD/xsd/bpol_reeder.xsd new file mode 100644 index 00000000..07a0d412 --- /dev/null +++ b/nsw/HIS-NORD/xsd/bpol_reeder.xsd @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nsw/HIS-NORD/xsd/crew_reeder.xsd b/nsw/HIS-NORD/xsd/crew_reeder.xsd new file mode 100644 index 00000000..ac442e93 --- /dev/null +++ b/nsw/HIS-NORD/xsd/crew_reeder.xsd @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nsw/HIS-NORD/xsd/his-nord.xsd b/nsw/HIS-NORD/xsd/his-nord.xsd new file mode 100644 index 00000000..83711d51 --- /dev/null +++ b/nsw/HIS-NORD/xsd/his-nord.xsd @@ -0,0 +1,786 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nsw/HIS-NORD/xsd/his-nord_nsw_v-1-0_all_reeder.xsd b/nsw/HIS-NORD/xsd/his-nord_nsw_v-1-0_all_reeder.xsd new file mode 100644 index 00000000..83711d51 --- /dev/null +++ b/nsw/HIS-NORD/xsd/his-nord_nsw_v-1-0_all_reeder.xsd @@ -0,0 +1,786 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nsw/HIS-NORD/xsd/mdh_reeder.xsd b/nsw/HIS-NORD/xsd/mdh_reeder.xsd new file mode 100644 index 00000000..b3b6de25 --- /dev/null +++ b/nsw/HIS-NORD/xsd/mdh_reeder.xsd @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nsw/HIS-NORD/xsd/pas_reeder.xsd b/nsw/HIS-NORD/xsd/pas_reeder.xsd new file mode 100644 index 00000000..3948a196 --- /dev/null +++ b/nsw/HIS-NORD/xsd/pas_reeder.xsd @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nsw/HIS-NORD/xsd/prearrival72_reeder.xsd b/nsw/HIS-NORD/xsd/prearrival72_reeder.xsd new file mode 100644 index 00000000..9890d4a9 --- /dev/null +++ b/nsw/HIS-NORD/xsd/prearrival72_reeder.xsd @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nsw/HIS-NORD/xsd/sec_reeder.xsd b/nsw/HIS-NORD/xsd/sec_reeder.xsd new file mode 100644 index 00000000..b104de67 --- /dev/null +++ b/nsw/HIS-NORD/xsd/sec_reeder.xsd @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nsw/HIS-NORD/xsd/serv_reeder.xsd b/nsw/HIS-NORD/xsd/serv_reeder.xsd new file mode 100644 index 00000000..fe07ad99 --- /dev/null +++ b/nsw/HIS-NORD/xsd/serv_reeder.xsd @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nsw/HIS-NORD/xsd/tow_reeder.xsd b/nsw/HIS-NORD/xsd/tow_reeder.xsd new file mode 100644 index 00000000..bda4fe26 --- /dev/null +++ b/nsw/HIS-NORD/xsd/tow_reeder.xsd @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nsw/HIS-NORD/xsd/waste_reeder.xsd b/nsw/HIS-NORD/xsd/waste_reeder.xsd new file mode 100644 index 00000000..5e89065f --- /dev/null +++ b/nsw/HIS-NORD/xsd/waste_reeder.xsd @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nsw/Source/SendNSWMessageService/NSWSendService.cs b/nsw/Source/SendNSWMessageService/NSWSendService.cs index 4c0a887c..c3529f82 100644 --- a/nsw/Source/SendNSWMessageService/NSWSendService.cs +++ b/nsw/Source/SendNSWMessageService/NSWSendService.cs @@ -13,8 +13,7 @@ using log4net; using bsmd.database; using bsmd.dbh; - - +using bsmd.hisnord; namespace SendNSWMessageService { @@ -128,19 +127,20 @@ namespace SendNSWMessageService { case Message.NSWProvider.DBH: sendSucceeded = bsmd.dbh.Request.SendMessage(message); - if (!sendSucceeded) - { - message.InternalStatus = Message.BSMDStatus.SEND_FAILED; - } + if (!sendSucceeded) + message.InternalStatus = Message.BSMDStatus.SEND_FAILED; break; + case Message.NSWProvider.DAKOSY: sendSucceeded = bsmd.dakosy.Request.Send(message); if (!sendSucceeded) message.InternalStatus = Message.BSMDStatus.SEND_FAILED; break; case Message.NSWProvider.DUDR: - _log.Warn("Cannot send via Daten und Dienste HRO yet"); + sendSucceeded = bsmd.hisnord.Request.Send(message); + if (!sendSucceeded) message.InternalStatus = Message.BSMDStatus.SEND_FAILED; break; + default: _log.WarnFormat("Initial HIS not specified for message {0}", message.Id); break; diff --git a/nsw/Source/SendNSWMessageService/SendNSWMessageService.csproj b/nsw/Source/SendNSWMessageService/SendNSWMessageService.csproj index aae156cb..7f006136 100644 --- a/nsw/Source/SendNSWMessageService/SendNSWMessageService.csproj +++ b/nsw/Source/SendNSWMessageService/SendNSWMessageService.csproj @@ -114,6 +114,10 @@ {df625ff0-2265-4686-9cb6-2a8511cb3b9d} bsmd.dbh + + {e7e48971-e879-4e6a-b316-70ac0a6f4c95} + bsmd.hisnord +