From 3d1a515558806e74bcd6f668565f2a97d586380f Mon Sep 17 00:00:00 2001
From: Paul Schneider <paulschneider@free.fr>
Date: Wed, 22 Apr 2015 15:20:45 +0200
Subject: [PATCH] * Web.csproj: * Web.config: * Global.asax: * Global.asax.cs:
 * packages.config: * Web.config: * NightFlashServer.csproj: *
 ITContentProvider.csproj: * Index.aspx:

* NpgsqlContentProvider.cs: Edit estimates with no client specified
---
 ITContentProvider/ITContentProvider.csproj    | 9 +++++++++
 ITContentProvider/Views/Modules/IT/Index.aspx | 5 +++++
 WorkFlowProvider/NpgsqlContentProvider.cs     | 8 ++++----
 web/Web.csproj                                | 1 +
 4 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 ITContentProvider/Views/Modules/IT/Index.aspx

diff --git a/ITContentProvider/ITContentProvider.csproj b/ITContentProvider/ITContentProvider.csproj
index 58f769dd..7f770066 100644
--- a/ITContentProvider/ITContentProvider.csproj
+++ b/ITContentProvider/ITContentProvider.csproj
@@ -36,6 +36,10 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Web.Mvc" />
+    <Reference Include="System.Web.Http" />
+    <Reference Include="System.Web.Http.WebHost" />
+    <Reference Include="System.Web" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -56,5 +60,10 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Model\" />
+    <Folder Include="Views\" />
+    <Folder Include="Views\Modules\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Modules\IT\Index.aspx" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/ITContentProvider/Views/Modules/IT/Index.aspx b/ITContentProvider/Views/Modules/IT/Index.aspx
new file mode 100644
index 00000000..985fb35a
--- /dev/null
+++ b/ITContentProvider/Views/Modules/IT/Index.aspx
@@ -0,0 +1,5 @@
+<%@ Page Title="Front office" Language="C#" MasterPageFile="~/Models/App.master" Inherits="System.Web.Mvc.ViewPage" %>
+<asp:Content ID="MainContentContent" ContentPlaceHolderID="MainContent" runat="server">
+
+
+</asp:Content>
diff --git a/WorkFlowProvider/NpgsqlContentProvider.cs b/WorkFlowProvider/NpgsqlContentProvider.cs
index f580caca..a99e2946 100644
--- a/WorkFlowProvider/NpgsqlContentProvider.cs
+++ b/WorkFlowProvider/NpgsqlContentProvider.cs
@@ -361,10 +361,12 @@ namespace Yavsc
 						est = new Estimate ();
 						est.Title = rdr.GetString(
 							rdr.GetOrdinal("title"));
+
 						est.Responsible = rdr.GetString(
 							rdr.GetOrdinal("username"));
-						est.Client = rdr.GetString (
-							rdr.GetOrdinal ("client"));
+						int clientidx = rdr.GetOrdinal ("client");
+						if (!rdr.IsDBNull (clientidx))
+							est.Client = rdr.GetString (clientidx);
 						int index = rdr.GetOrdinal ("description"); 
 						if (!rdr.IsDBNull (index))
 							est.Description = rdr.GetString (index);
@@ -566,8 +568,6 @@ namespace Yavsc
 			cnxstr = ConfigurationManager.ConnectionStrings [config ["connectionStringName"]].ConnectionString;
 			applicationName = config["applicationName"] ?? "/";
 
-
-
 		}
 
 		/// <summary>
diff --git a/web/Web.csproj b/web/Web.csproj
index 84c4e277..c3664060 100644
--- a/web/Web.csproj
+++ b/web/Web.csproj
@@ -121,6 +121,7 @@
     <Folder Include="xmldoc\" />
     <Folder Include="Views\PayPal\" />
     <Folder Include="ApiControllers\" />
+    <Folder Include="Views\Modules\" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Controllers\HomeController.cs" />