diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx index 687b161a..5eb9667e 100644 Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ 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.*")]