From 7125207f37181e83117a9504f08e8b2992d6cdc2 Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Sat, 13 Aug 2016 06:51:13 +0000 Subject: [PATCH] 3.1.5 kleine KOrrektur Report --- Stundensheet.xlsx | Bin 22619 -> 22886 bytes nsw/Dänemark/SafeSeaNetTest/Program.cs | 33 +++++++++++------- nsw/Dänemark/readme.txt | 5 ++- .../bsmd.ReportGenerator/BSMDDocument.cs | 8 ++--- .../bsmd.ReportGenerator/ReportService.cs | 2 +- .../bsmd.ReportGenerator.csproj | 5 +-- .../bsmd.ReportGenerator/packages.config | 2 +- .../Properties/AssemblyProductInfo.cs | 2 +- .../Properties/AssemblyProjectInfo.cs | 2 +- 9 files changed, 35 insertions(+), 24 deletions(-) diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx index 687b161a5cd2ae9d62abb3369a8806f087b703af..5eb9667e65da10f97407b19e5ec9f4a51800c367 100644 GIT binary patch delta 13586 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 delta 13332 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 diff --git a/nsw/Dänemark/SafeSeaNetTest/Program.cs b/nsw/Dänemark/SafeSeaNetTest/Program.cs index 099acf95..05bff7bb 100644 --- a/nsw/Dänemark/SafeSeaNetTest/Program.cs +++ b/nsw/Dänemark/SafeSeaNetTest/Program.cs @@ -18,7 +18,7 @@ namespace SafeSeaNetTest static void Main(string[] args) { - Login2(); + Login(); Console.Read(); @@ -26,7 +26,7 @@ namespace SafeSeaNetTest private static async void Login() { - NetworkCredential credential = new NetworkCredential("bsm-schick", "Melder2016"); + NetworkCredential credential = new NetworkCredential("bsm-schick", "R1g048r20l"); /* WebRequest req = WebRequest.Create(baseUri); @@ -43,21 +43,23 @@ namespace SafeSeaNetTest // Variante 2 // Create a network credential with username, password, and damain name // var credential = new NetworkCredential("username", "password", "domainname"); - var myCache = new CredentialCache(); + //var myCache = new CredentialCache(); // Add the target Uri to the CredentialCache with credential object - myCache.Add(new Uri(baseUri), "NTLM", credential); + //myCache.Add(new Uri(baseUri), "NTLM", credential); // Create an HttpClientHandler to add some settings - var handler = new HttpClientHandler(); - handler.AllowAutoRedirect = true; - handler.Credentials = myCache; + var handler = new HttpClientHandler(); + // handler.AllowAutoRedirect = true; + handler.Credentials = credential; // Create an HttpClient with the handler object HttpClient httpClient = new HttpClient(handler); // Wait to get the reponse, and you can use the reponse in your code - HttpResponseMessage responseMessage = await httpClient.GetAsync(baseUri); + string querystring = Path.Combine(baseUri, searchUri); + + HttpResponseMessage responseMessage = await httpClient.GetAsync(querystring); string jsonMessage; using (Stream responseStream = await responseMessage.Content.ReadAsStreamAsync()) @@ -71,24 +73,29 @@ namespace SafeSeaNetTest private static async void Login2() { - NetworkCredential credential = new NetworkCredential("bsm-schick", "Melder2016"); - CredentialCache cc = new CredentialCache(); - cc.Add(new Uri(baseUri), "NTLM", credential); + NetworkCredential credential = new NetworkCredential("bsm-schick", "R1g048r20l", "SSNTEST"); + //CredentialCache cc = new CredentialCache(); + //cc.Add(new Uri(baseUri), "NTLM", credential); HttpClientHandler handler = new HttpClientHandler(); + handler.Credentials = credential; handler.AllowAutoRedirect = true; - handler.Credentials = cc; + //handler.Credentials = cc; string querystring = Path.Combine(baseUri, searchUri); //var encoded = Convert.ToBase64String(Encoding.ASCII.GetBytes("bsm-schick:Melder2016")); handler.PreAuthenticate = true; Uri uri = new Uri(querystring); + + + HttpRequestMessage hrm = new HttpRequestMessage(HttpMethod.Get, uri); HttpClient httpClient = new HttpClient(handler); - httpClient.DefaultRequestHeaders.Add("accept", "application/json"); + httpClient.DefaultRequestHeaders.Accept.Clear(); + httpClient.DefaultRequestHeaders.Accept.Add(new System.Net.Http.Headers.MediaTypeWithQualityHeaderValue("application/json")); //httpClient.DefaultRequestHeaders.Add("Content-Type", "application/json"); diff --git a/nsw/Dänemark/readme.txt b/nsw/Dänemark/readme.txt index 0064feae..c169ca03 100644 --- a/nsw/Dänemark/readme.txt +++ b/nsw/Dänemark/readme.txt @@ -2,7 +2,10 @@ Gültige Beispiel#URL: Anmeldung: bsm-schick -PW: Melder2016 +PW: Melder2016 + Januar-2016 + +(funktioniert aktuell beides nicht) https://nswtest.safeseanet.dk/api/v1/search?query=contentType: ship&take=5 diff --git a/nsw/Source/bsmd.ReportGenerator/BSMDDocument.cs b/nsw/Source/bsmd.ReportGenerator/BSMDDocument.cs index 9eb99d56..adc1e9e0 100644 --- a/nsw/Source/bsmd.ReportGenerator/BSMDDocument.cs +++ b/nsw/Source/bsmd.ReportGenerator/BSMDDocument.cs @@ -764,11 +764,11 @@ namespace bsmd.ReportGenerator if (waste.WasteType.Value == index) { row.Cells[1].AddParagraph(waste.WasteDescription ?? ""); - row.Cells[2].AddParagraph(waste.WasteDisposalAmount_MTQ.HasValue ? waste.WasteDisposalAmount_MTQ.Value.ToString("N2") : ""); - row.Cells[3].AddParagraph(waste.WasteCapacity_MTQ.HasValue ? waste.WasteCapacity_MTQ.Value.ToString("N2") : ""); - row.Cells[4].AddParagraph(waste.WasteAmountRetained_MTQ.HasValue ? waste.WasteAmountRetained_MTQ.Value.ToString("N2") : ""); + row.Cells[2].AddParagraph(waste.WasteDisposalAmount_MTQ.HasValue ? waste.WasteDisposalAmount_MTQ.Value.ToString("N3") : ""); + row.Cells[3].AddParagraph(waste.WasteCapacity_MTQ.HasValue ? waste.WasteCapacity_MTQ.Value.ToString("N3") : ""); + row.Cells[4].AddParagraph(waste.WasteAmountRetained_MTQ.HasValue ? waste.WasteAmountRetained_MTQ.Value.ToString("N3") : ""); row.Cells[5].AddParagraph(waste.WasteDisposalPort ?? ""); - row.Cells[6].AddParagraph(waste.WasteAmountGeneratedTillNextPort_MTQ.HasValue ? waste.WasteAmountGeneratedTillNextPort_MTQ.Value.ToString("N2") : ""); + row.Cells[6].AddParagraph(waste.WasteAmountGeneratedTillNextPort_MTQ.HasValue ? waste.WasteAmountGeneratedTillNextPort_MTQ.Value.ToString("N3") : ""); } } } diff --git a/nsw/Source/bsmd.ReportGenerator/ReportService.cs b/nsw/Source/bsmd.ReportGenerator/ReportService.cs index 96de96a9..4362ed07 100644 --- a/nsw/Source/bsmd.ReportGenerator/ReportService.cs +++ b/nsw/Source/bsmd.ReportGenerator/ReportService.cs @@ -104,7 +104,7 @@ namespace bsmd.ReportGenerator private void CreateReport(MessageCore reportCore) { - List messages = DBManager.Instance.GetMessagesForCore(reportCore); + List messages = DBManager.Instance.GetMessagesForCore(reportCore, DBManager.MessageLoad.ALL); messages.Sort(new ANSWMessageComparer()); Dictionary coverInfos = new Dictionary(); bool isReportUpdate = reportCore.ReportStatus != MessageCore.ReportStatusEnum.COMPLETE; diff --git a/nsw/Source/bsmd.ReportGenerator/bsmd.ReportGenerator.csproj b/nsw/Source/bsmd.ReportGenerator/bsmd.ReportGenerator.csproj index da4f6e77..e4de90bf 100644 --- a/nsw/Source/bsmd.ReportGenerator/bsmd.ReportGenerator.csproj +++ b/nsw/Source/bsmd.ReportGenerator/bsmd.ReportGenerator.csproj @@ -41,8 +41,9 @@ ..\bsmdKey.snk - - ..\packages\log4net.2.0.3\lib\net40-full\log4net.dll + + ..\packages\log4net.2.0.5\lib\net45-full\log4net.dll + True ..\packages\PDFsharp-MigraDoc-GDI.1.32.4334.0\lib\net20\MigraDoc.DocumentObjectModel.dll diff --git a/nsw/Source/bsmd.ReportGenerator/packages.config b/nsw/Source/bsmd.ReportGenerator/packages.config index c4a193b9..0748b064 100644 --- a/nsw/Source/bsmd.ReportGenerator/packages.config +++ b/nsw/Source/bsmd.ReportGenerator/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs index b01fbf3d..493a3a02 100644 --- a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs +++ b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs @@ -2,6 +2,6 @@ [assembly: AssemblyCompany("Informatikbüro Daniel Schick")] [assembly: AssemblyProduct("BSMD NSW interface")] -[assembly: AssemblyInformationalVersion("3.1.4")] +[assembly: AssemblyInformationalVersion("3.1.5")] [assembly: AssemblyCopyright("Copyright © 2014-2016 Informatikbüro Daniel Schick. All rights reserved.")] [assembly: AssemblyTrademark("")] \ No newline at end of file diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs index c2324952..3718188b 100644 --- a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs +++ b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("3.1.4.*")] +[assembly: AssemblyVersion("3.1.5.*")]