diff --git a/GPW_Commesse/GPW_Commesse.csproj b/GPW_Commesse/GPW_Commesse.csproj index 4016c52..98b5b2d 100644 --- a/GPW_Commesse/GPW_Commesse.csproj +++ b/GPW_Commesse/GPW_Commesse.csproj @@ -140,6 +140,10 @@ ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + + + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll @@ -165,6 +169,12 @@ + + ..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll + + + ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll + @@ -233,6 +243,8 @@ BuildBlocks.css + + @@ -355,6 +367,8 @@ + + @@ -444,6 +458,7 @@ + @@ -565,6 +580,7 @@ + ASPXCodeBehind @@ -575,6 +591,8 @@ commesseUtente.aspx + + Default.aspx ASPXCodeBehind @@ -614,6 +632,13 @@ AjaxSimpleFull.Master + + cmp_chart.ascx + ASPXCodeBehind + + + cmp_chart.ascx + cmp_rilTemp.ascx ASPXCodeBehind diff --git a/GPW_Commesse/GPW_Commesse.csproj.user b/GPW_Commesse/GPW_Commesse.csproj.user index 44a4d1c..f746a5c 100644 --- a/GPW_Commesse/GPW_Commesse.csproj.user +++ b/GPW_Commesse/GPW_Commesse.csproj.user @@ -11,6 +11,14 @@ Debug|Any CPU + ApiControllerEmptyScaffolder + root/Controller + 600 + True + False + True + + False diff --git a/GPW_Commesse/WebMasterPages/AjaxSimple.master b/GPW_Commesse/WebMasterPages/AjaxSimple.master index 321c639..6aeba79 100644 --- a/GPW_Commesse/WebMasterPages/AjaxSimple.master +++ b/GPW_Commesse/WebMasterPages/AjaxSimple.master @@ -9,9 +9,12 @@ GPW <%: Page.Title %> - - <%: Scripts.Render("~/bundles/modernizr") %> - + + + <%: Scripts.Render("~/bundles/modernizr") %> + <%: Scripts.Render("~/bundles/jsMoment") %> + <%: Scripts.Render("~/bundles/jsChart") %> + diff --git a/GPW_Commesse/WebMasterPages/AjaxSimpleFull.Master b/GPW_Commesse/WebMasterPages/AjaxSimpleFull.Master index efef6da..9568903 100644 --- a/GPW_Commesse/WebMasterPages/AjaxSimpleFull.Master +++ b/GPW_Commesse/WebMasterPages/AjaxSimpleFull.Master @@ -7,75 +7,78 @@ - - - GPW <%: Page.Title %> - - <%: Scripts.Render("~/bundles/modernizr") %> - + + + GPW <%: Page.Title %> - - + + <%: Scripts.Render("~/bundles/modernizr") %> + <%: Scripts.Render("~/bundles/jsMoment") %> + <%: Scripts.Render("~/bundles/jsChart") %> + - - - + + - - <%: Scripts.Render("~/bundles/jquery") %> - <%: Scripts.Render("~/bundles/jqueryui") %> - <%: Scripts.Render("~/bundles/jSteamware") %> - + + + - <%-- --%> + + <%: Scripts.Render("~/bundles/jquery") %> + <%: Scripts.Render("~/bundles/jqueryui") %> + <%: Scripts.Render("~/bundles/jSteamware") %> + - + -
- - -
-
-
- + + + +
+
+
+ +
+
+
+
+ + + + + + +
+
+
+
+ +
+
-
-
-
- - - - - - -
-
-
-
- -
-
-
- +