Sachstand 15.7.16

nsw/Dänemark/SafeSeaNetTest/App.config

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
     </startup>
-</configuration>
+</configuration>

nsw/Dänemark/SafeSeaNetTest/Program.cs

@@ -13,11 +13,12 @@ namespace SafeSeaNetTest
     class Program
     {
 
-        private static string baseUri = "https://nswtest.safeseanet.dk/api/v1/search?query=contentType: ship&take=5";
+        private static string baseUri = "https://nswtestapi.safeseanet.dk/api/v1/";
+        private static string searchUri = "search?query=contentType: ship&take=5";
 
         static void Main(string[] args)
         {
-            Login();
+            Login2();
 
 
             Console.Read();
@@ -68,5 +69,52 @@ 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);
+
+            HttpClientHandler handler = new HttpClientHandler();
+            handler.AllowAutoRedirect = true;            
+            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.Add("Content-Type", "application/json");
+            
+
+            //httpClient.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Basic", encoded);
+            Console.WriteLine("Query: " + querystring);
+            HttpResponseMessage responseMessage = await httpClient.GetAsync(querystring);
+
+            if(responseMessage.StatusCode == HttpStatusCode.Unauthorized)
+            {
+                // do NTLM auth
+               // hrm.Headers.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("NTLM")
+
+            }
+
+            string jsonMessage;
+            using (Stream responseStream = await responseMessage.Content.ReadAsStreamAsync())
+            {
+                jsonMessage = new StreamReader(responseStream).ReadToEnd();
+            }
+
+            Console.WriteLine(jsonMessage);
+
+
+
+        }
+
+
     }
 }

nsw/Dänemark/SafeSeaNetTest/SafeSeaNetTest.csproj

@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SafeSeaNetTest</RootNamespace>
     <AssemblyName>SafeSeaNetTest</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -50,6 +51,9 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
+  <ItemGroup>
+    <WCFMetadata Include="Service References\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

nsw/Source/bsmd.database/NOA_NOD.cs

@@ -187,6 +187,12 @@ namespace bsmd.database
                 if(this.ETDFromPortOfCall.HasValue && this.ETAToPortOfCall.HasValue &&
                     (this.ETDFromPortOfCall < this.ETAToPortOfCall))
                     errors.Add(RuleEngine.CreateError(ValidationCode.E121, "Departure time before arrival time!", null));
+
+                if(this.CallPurposes.Count == 0)
+                {
+                    errors.Add(RuleEngine.CreateError(ValidationCode.NOT_NULL, "Purpose of call missing!", null));
+                }
+
             }
             else
             {

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.3")]
+[assembly: AssemblyInformationalVersion("3.1.4")]
 [assembly: AssemblyCopyright("Copyright ©  2014-2016 Informatikbüro Daniel Schick. All rights reserved.")]
 [assembly: AssemblyTrademark("")]

nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs

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