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 @@ + + + + @@ -56,5 +60,10 @@ + + + + + \ 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" %> + + + + 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"] ?? "/"; - - } /// 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 @@ +