From f59655861027904e2267f760c4a79e6b7ec6281c Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Thu, 26 May 2016 08:12:25 +0000 Subject: [PATCH] =?UTF-8?q?Version=203.1.1=20Korrekturen=20und=20DB=20Erwe?= =?UTF-8?q?iterung=20f=C3=BCr=20ENI-2=20(Historisierung)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Stundensheet.xlsx | Bin 21804 -> 21978 bytes nsw/Source/SQL/Update_3.0.1_To_3.1.sql | 8 + .../SendNSWMessageService/NSWSendService.cs | 5 +- nsw/Source/bsmd.ExcelReadService/App.config | 12 ++ .../bsmd.ExcelReadService/ExcelReadService.cs | 45 +++-- .../Properties/Settings.Designer.cs | 16 ++ .../Properties/Settings.settings | 10 ++ nsw/Source/bsmd.ExcelReadService/Util.cs | 5 +- .../bsmd.ExcelReadService.csproj | 15 +- .../bsmd.ExcelReadService/packages.config | 2 +- nsw/Source/bsmd.Tool/CheckRules.cs | 2 +- nsw/Source/bsmd.Tool/bsmd.Tool.csproj | 5 +- nsw/Source/bsmd.Tool/packages.config | 2 +- nsw/Source/bsmd.dakosy/Request.cs | 56 ++++--- nsw/Source/bsmd.database/DBManager.cs | 26 ++- nsw/Source/bsmd.database/Message.cs | 53 +++++- .../Properties/AssemblyProductInfo.cs | 2 +- .../Properties/AssemblyProjectInfo.cs | 2 +- nsw/Source/bsmd.email/BSMDMail.cs | 158 +++++++++++------- .../Properties/Settings.Designer.cs | 13 +- .../bsmd.email/Properties/Settings.settings | 3 + nsw/Source/bsmd.email/app.config | 3 + nsw/Source/bsmd.email/bsmd.email.csproj | 4 +- nsw/Source/bsmd.email/packages.config | 2 +- nsw/Source/bsmd.herberg.FormService/Util.cs | 13 +- nsw/Source/bsmd.hisnord/Request.cs | 39 +++-- nsw/Source/bsmd.hisnord/transmitter.cs | 6 +- 27 files changed, 360 insertions(+), 147 deletions(-) create mode 100644 nsw/Source/SQL/Update_3.0.1_To_3.1.sql diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx index bfab2cfbd405327c8bd237f06b82030209b31371..29c1f5c67f3cb39d2fbf9e7d06281725694d1243 100644 GIT binary patch delta 11924 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%0DGB1i)BWzLcsE7*RP-{ht8^nnFl)5IAaQv|Um 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 delta 11770 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 messages = DBManager.Instance.GetMessagesForCore(core); + // TODO: Hier sollten jeweils die "neuesten" Nachrichten geladen werden, wenn es mehrere geben sollte!! + List messages = DBManager.Instance.GetMessagesForCore(core, DBManager.MessageLoad.ALL); - // TODO: Das muss wieder entfernt werden wenn 3.0 funktional ist + // // if (core.InitialHIS != Message.NSWProvider.DBH_TEST) continue; // ignore everything else if (core.InitialHIS == Message.NSWProvider.DUDR) diff --git a/nsw/Source/bsmd.ExcelReadService/App.config b/nsw/Source/bsmd.ExcelReadService/App.config index 695aa4fa..631df383 100644 --- a/nsw/Source/bsmd.ExcelReadService/App.config +++ b/nsw/Source/bsmd.ExcelReadService/App.config @@ -34,6 +34,18 @@ True + + + + report@bsmd.de + hsok@gmx.de + bald@puls200.de + d.schick@gmx.de + hollmann@bsmd.de + + + \ No newline at end of file diff --git a/nsw/Source/bsmd.ExcelReadService/ExcelReadService.cs b/nsw/Source/bsmd.ExcelReadService/ExcelReadService.cs index 7eb65f00..549a9163 100644 --- a/nsw/Source/bsmd.ExcelReadService/ExcelReadService.cs +++ b/nsw/Source/bsmd.ExcelReadService/ExcelReadService.cs @@ -40,7 +40,7 @@ namespace bsmd.ExcelReadService System.Reflection.Assembly assembly = System.Reflection.Assembly.GetExecutingAssembly(); FileVersionInfo fvi = FileVersionInfo.GetVersionInfo(assembly.Location); string version = fvi.FileVersion; - this._log.InfoFormat("Starting NSW Excel Read Service. v.{0}", version); + this._log.InfoFormat("Starting NSW Excel Read Service. v.{0} -------------- ", version); this.DoOnce(); } @@ -106,23 +106,42 @@ namespace bsmd.ExcelReadService else { - // try to read/import attachment - using (ExcelReader reader = new ExcelReader(attachmentLocalPath)) + // only a valid sender gets a reply + bool isValidSender = false; + foreach (string aValidSender in Properties.Settings.Default.ValidSender) { - readResult = Util.ProcessSheet(reader, out readMessage, out messageCore); - if (!readResult) - _log.Error("Excel sheet could not be interpreted"); + if (mailSender.Equals(aValidSender, StringComparison.OrdinalIgnoreCase)) + { + isValidSender = true; + break; + } } - // TODO: Quittung / set messagecore to createreport and let reportGenerator create a reply? + if (!isValidSender) + { + _log.WarnFormat("ignored e-mail from illegal sender: {0}", mailSender); + } + else + { + // try to read/import attachment + using (ExcelReader reader = new ExcelReader(attachmentLocalPath)) + { + readResult = Util.ProcessSheet(reader, out readMessage, out messageCore); + if (!readResult) + _log.Error("Excel sheet could not be interpreted"); + } - // create a reply sheet (template + scanned highlighted content for verification + // TODO: Quittung / set messagecore to createreport and let reportGenerator create a reply? - string confirmationExcelFilePath = Util.CreateConfirmationSheet(messageCore); - List sendItems = new List(); - sendItems.Add(confirmationExcelFilePath); - // send reply sheet back to sender - BSMDMail.SendNSWReportWithAttachments(Properties.Settings.Default.SendEMailSubject, sendItems); + // create a reply sheet (template + scanned highlighted content for verification + + string confirmationExcelFilePath = Util.CreateConfirmationSheet(messageCore); + List sendItems = new List(); + sendItems.Add(confirmationExcelFilePath); + // send reply sheet back to sender + BSMDMail.SendNSWReportWithAttachments(Properties.Settings.Default.SendEMailSubject, sendItems); + + } // remove e-Mail _log.InfoFormat("deleting mail with messageId {0}", messageId); diff --git a/nsw/Source/bsmd.ExcelReadService/Properties/Settings.Designer.cs b/nsw/Source/bsmd.ExcelReadService/Properties/Settings.Designer.cs index 21c75b48..9058be63 100644 --- a/nsw/Source/bsmd.ExcelReadService/Properties/Settings.Designer.cs +++ b/nsw/Source/bsmd.ExcelReadService/Properties/Settings.Designer.cs @@ -94,5 +94,21 @@ namespace bsmd.ExcelReadService.Properties { return ((bool)(this["TestMode"])); } } + + [global::System.Configuration.ApplicationScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute(@" + + report@bsmd.de + hsok@gmx.de + bald@puls200.de + d.schick@gmx.de + hollmann@bsmd.de +")] + public global::System.Collections.Specialized.StringCollection ValidSender { + get { + return ((global::System.Collections.Specialized.StringCollection)(this["ValidSender"])); + } + } } } diff --git a/nsw/Source/bsmd.ExcelReadService/Properties/Settings.settings b/nsw/Source/bsmd.ExcelReadService/Properties/Settings.settings index b387ba0c..fddb6043 100644 --- a/nsw/Source/bsmd.ExcelReadService/Properties/Settings.settings +++ b/nsw/Source/bsmd.ExcelReadService/Properties/Settings.settings @@ -26,5 +26,15 @@ True + + <?xml version="1.0" encoding="utf-16"?> +<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <string>report@bsmd.de</string> + <string>hsok@gmx.de</string> + <string>bald@puls200.de</string> + <string>d.schick@gmx.de</string> + <string>hollmann@bsmd.de</string> +</ArrayOfString> + \ No newline at end of file diff --git a/nsw/Source/bsmd.ExcelReadService/Util.cs b/nsw/Source/bsmd.ExcelReadService/Util.cs index df42838e..3c3b77c9 100644 --- a/nsw/Source/bsmd.ExcelReadService/Util.cs +++ b/nsw/Source/bsmd.ExcelReadService/Util.cs @@ -29,7 +29,7 @@ namespace bsmd.ExcelReadService if (messageCore == null) return false; // cannot work with this sheet or create one // load messages if already present - List messages = DBManager.Instance.GetMessagesForCore(messageCore); + List messages = DBManager.Instance.GetMessagesForCore(messageCore, DBManager.MessageLoad.EXCEL); // start parsing fields if (messageCore.IsTransit) @@ -134,10 +134,9 @@ namespace bsmd.ExcelReadService foreach(Message message in messages) { + message.CreatedBy = "EXCEL"; DBManager.Instance.Save(message); - message.SaveElements(); - } return true; diff --git a/nsw/Source/bsmd.ExcelReadService/bsmd.ExcelReadService.csproj b/nsw/Source/bsmd.ExcelReadService/bsmd.ExcelReadService.csproj index 24cf7ba9..a8d72038 100644 --- a/nsw/Source/bsmd.ExcelReadService/bsmd.ExcelReadService.csproj +++ b/nsw/Source/bsmd.ExcelReadService/bsmd.ExcelReadService.csproj @@ -11,6 +11,8 @@ bsmd.ExcelReadService v4.5 512 + + AnyCPU @@ -46,8 +48,9 @@ - - ..\packages\System.Data.SQLite.Core.1.0.99.0\lib\net45\System.Data.SQLite.dll + + ..\packages\System.Data.SQLite.Core.1.0.101.0\lib\net45\System.Data.SQLite.dll + True @@ -125,7 +128,13 @@ - + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + +