dschick/git_bsmd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

3.1.5 kleine KOrrektur Report

Browse Source
This commit is contained in:
Daniel Schick 2016-08-13 06:51:13 +00:00
parent 75ebfbdbee
commit 7125207f37
9 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Stundensheet.xlsx
View File

Binary file not shown.

33
nsw/Dänemark/SafeSeaNetTest/Program.cs
View File

@ -18,7 +18,7 @@ namespace SafeSeaNetTest
static void Main(string[] args) static void Main(string[] args)
{ {
Login2(); Login();
Console.Read(); Console.Read();
@ -26,7 +26,7 @@ namespace SafeSeaNetTest
private static async void Login() private static async void Login()
{ {
NetworkCredential credential = new NetworkCredential("bsm-schick", "Melder2016"); NetworkCredential credential = new NetworkCredential("bsm-schick", "R1g048r20l");
/* /*
WebRequest req = WebRequest.Create(baseUri); WebRequest req = WebRequest.Create(baseUri);
@ -43,21 +43,23 @@ namespace SafeSeaNetTest
// Variante 2 // Variante 2
// Create a network credential with username, password, and damain name // Create a network credential with username, password, and damain name
// var credential = new NetworkCredential("username", "password", "domainname"); // 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 // 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 // Create an HttpClientHandler to add some settings
var handler = new HttpClientHandler(); var handler = new HttpClientHandler();
handler.AllowAutoRedirect = true; // handler.AllowAutoRedirect = true;
handler.Credentials = myCache; handler.Credentials = credential;
// Create an HttpClient with the handler object // Create an HttpClient with the handler object
HttpClient httpClient = new HttpClient(handler); HttpClient httpClient = new HttpClient(handler);
// Wait to get the reponse, and you can use the reponse in your code // 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; string jsonMessage;
using (Stream responseStream = await responseMessage.Content.ReadAsStreamAsync()) using (Stream responseStream = await responseMessage.Content.ReadAsStreamAsync())
@ -71,24 +73,29 @@ namespace SafeSeaNetTest
private static async void Login2() private static async void Login2()
{ {
NetworkCredential credential = new NetworkCredential("bsm-schick", "Melder2016"); NetworkCredential credential = new NetworkCredential("bsm-schick", "R1g048r20l", "SSNTEST");
CredentialCache cc = new CredentialCache(); //CredentialCache cc = new CredentialCache();
cc.Add(new Uri(baseUri), "NTLM", credential); //cc.Add(new Uri(baseUri), "NTLM", credential);
HttpClientHandler handler = new HttpClientHandler(); HttpClientHandler handler = new HttpClientHandler();
handler.Credentials = credential;
handler.AllowAutoRedirect = true; handler.AllowAutoRedirect = true;
handler.Credentials = cc; //handler.Credentials = cc;
string querystring = Path.Combine(baseUri, searchUri); string querystring = Path.Combine(baseUri, searchUri);
//var encoded = Convert.ToBase64String(Encoding.ASCII.GetBytes("bsm-schick:Melder2016")); //var encoded = Convert.ToBase64String(Encoding.ASCII.GetBytes("bsm-schick:Melder2016"));
handler.PreAuthenticate = true; handler.PreAuthenticate = true;
Uri uri = new Uri(querystring); Uri uri = new Uri(querystring);
HttpRequestMessage hrm = new HttpRequestMessage(HttpMethod.Get, uri); HttpRequestMessage hrm = new HttpRequestMessage(HttpMethod.Get, uri);
HttpClient httpClient = new HttpClient(handler); 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"); //httpClient.DefaultRequestHeaders.Add("Content-Type", "application/json");

5
nsw/Dänemark/readme.txt
View File

@ -2,7 +2,10 @@
Gültige Beispiel#URL: Gültige Beispiel#URL:
Anmeldung: bsm-schick 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 https://nswtest.safeseanet.dk/api/v1/search?query=contentType: ship&take=5

8
nsw/Source/bsmd.ReportGenerator/BSMDDocument.cs
View File

@ -764,11 +764,11 @@ namespace bsmd.ReportGenerator
if (waste.WasteType.Value == index) if (waste.WasteType.Value == index)
{ {
row.Cells[1].AddParagraph(waste.WasteDescription ?? ""); row.Cells[1].AddParagraph(waste.WasteDescription ?? "");
row.Cells[2].AddParagraph(waste.WasteDisposalAmount_MTQ.HasValue ? waste.WasteDisposalAmount_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("N2") : ""); 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("N2") : ""); row.Cells[4].AddParagraph(waste.WasteAmountRetained_MTQ.HasValue ? waste.WasteAmountRetained_MTQ.Value.ToString("N3") : "");
row.Cells[5].AddParagraph(waste.WasteDisposalPort ?? ""); 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") : "");
} }
} }
} }

2
nsw/Source/bsmd.ReportGenerator/ReportService.cs
View File

@ -104,7 +104,7 @@ namespace bsmd.ReportGenerator
private void CreateReport(MessageCore reportCore) private void CreateReport(MessageCore reportCore)
{ {
List<Message> messages = DBManager.Instance.GetMessagesForCore(reportCore); List<Message> messages = DBManager.Instance.GetMessagesForCore(reportCore, DBManager.MessageLoad.ALL);
messages.Sort(new ANSWMessageComparer()); messages.Sort(new ANSWMessageComparer());
Dictionary<string, string> coverInfos = new Dictionary<string, string>(); Dictionary<string, string> coverInfos = new Dictionary<string, string>();
bool isReportUpdate = reportCore.ReportStatus != MessageCore.ReportStatusEnum.COMPLETE; bool isReportUpdate = reportCore.ReportStatus != MessageCore.ReportStatusEnum.COMPLETE;

5
nsw/Source/bsmd.ReportGenerator/bsmd.ReportGenerator.csproj
View File

@ -41,8 +41,9 @@
<AssemblyOriginatorKeyFile>..\bsmdKey.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>..\bsmdKey.snk</AssemblyOriginatorKeyFile>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="log4net"> <Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath> <HintPath>..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
<Private>True</Private>
</Reference> </Reference>
<Reference Include="MigraDoc.DocumentObjectModel"> <Reference Include="MigraDoc.DocumentObjectModel">
<HintPath>..\packages\PDFsharp-MigraDoc-GDI.1.32.4334.0\lib\net20\MigraDoc.DocumentObjectModel.dll</HintPath> <HintPath>..\packages\PDFsharp-MigraDoc-GDI.1.32.4334.0\lib\net20\MigraDoc.DocumentObjectModel.dll</HintPath>

2
nsw/Source/bsmd.ReportGenerator/packages.config
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="log4net" version="2.0.3" targetFramework="net45" /> <package id="log4net" version="2.0.5" targetFramework="net45" />
<package id="PDFsharp-MigraDoc-GDI" version="1.32.4334.0" targetFramework="net45" /> <package id="PDFsharp-MigraDoc-GDI" version="1.32.4334.0" targetFramework="net45" />
</packages> </packages>

2
nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
View File

@ -2,6 +2,6 @@
[assembly: AssemblyCompany("Informatikbüro Daniel Schick")] [assembly: AssemblyCompany("Informatikbüro Daniel Schick")]
[assembly: AssemblyProduct("BSMD NSW interface")] [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: AssemblyCopyright("Copyright © 2014-2016 Informatikbüro Daniel Schick. All rights reserved.")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]

2
nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
View File

@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("3.1.4.*")] [assembly: AssemblyVersion("3.1.5.*")]