Egalware/GPW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-09-04 08:26:08 +02:00
parent e3e6f049ba 03919920a9
commit e71cbb3bf4
43 changed files with 79883 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW_Admin/Content/Chart.css
+47
View File
@@ -0,0 +1,47 @@
/*
* DOM element rendering detection
* https://davidwalsh.name/detect-node-insertion
*/
@keyframes chartjs-render-animation {
from { opacity: 0.99; }
to { opacity: 1; }
}
.chartjs-render-monitor {
animation: chartjs-render-animation 0.001s;
}
/*
* DOM element resizing detection
* https://github.com/marcj/css-element-queries
*/
.chartjs-size-monitor,
.chartjs-size-monitor-expand,
.chartjs-size-monitor-shrink {
position: absolute;
direction: ltr;
left: 0;
top: 0;
right: 0;
bottom: 0;
overflow: hidden;
pointer-events: none;
visibility: hidden;
z-index: -1;
}
.chartjs-size-monitor-expand > div {
position: absolute;
width: 1000000px;
height: 1000000px;
left: 0;
top: 0;
}
.chartjs-size-monitor-shrink > div {
position: absolute;
width: 200%;
height: 200%;
left: 0;
top: 0;
}
GPW_Admin/Content/Chart.min.css
Vendored
+1
View File
@@ -0,0 +1 @@
@keyframes chartjs-render-animation{from{opacity:.99}to{opacity:1}}.chartjs-render-monitor{animation:chartjs-render-animation 1ms}.chartjs-size-monitor,.chartjs-size-monitor-expand,.chartjs-size-monitor-shrink{position:absolute;direction:ltr;left:0;top:0;right:0;bottom:0;overflow:hidden;pointer-events:none;visibility:hidden;z-index:-1}.chartjs-size-monitor-expand>div{position:absolute;width:1000000px;height:1000000px;left:0;top:0}.chartjs-size-monitor-shrink>div{position:absolute;width:200%;height:200%;left:0;top:0}
GPW_Admin/GPW_Admin.csproj
+10
View File
@@ -226,6 +226,8 @@
</Content>
<Content Include="Content\BtnReport.css" />
<Content Include="Content\BuildBlocks.css" />
<Content Include="Content\Chart.css" />
<Content Include="Content\Chart.min.css" />
<Content Include="Content\ExtraComp.css" />
<Content Include="Content\font-awesome.css" />
<Content Include="Content\font-awesome.min.css" />
@@ -372,6 +374,8 @@
<Content Include="Scripts\bootstrap.bundle.min.js" />
<Content Include="Scripts\bootstrap.js" />
<Content Include="Scripts\bootstrap.min.js" />
<Content Include="Scripts\Chart.js" />
<Content Include="Scripts\Chart.min.js" />
<Content Include="Scripts\esm\popper-utils.js" />
<Content Include="Scripts\esm\popper-utils.min.js" />
<Content Include="Scripts\esm\popper.js" />
@@ -411,6 +415,10 @@
<Content Include="Scripts\jquery-3.4.1.slim.min.js" />
<Content Include="Scripts\jquery-ui-1.12.1.js" />
<Content Include="Scripts\jquery-ui-1.12.1.min.js" />
<Content Include="Scripts\moment-with-locales.js" />
<Content Include="Scripts\moment-with-locales.min.js" />
<Content Include="Scripts\moment.js" />
<Content Include="Scripts\moment.min.js" />
<Content Include="Scripts\popper-utils.js" />
<Content Include="Scripts\popper-utils.min.js" />
<Content Include="Scripts\popper.js" />
@@ -580,6 +588,8 @@
<Content Include="Scripts\popper.js.map" />
<Content Include="Scripts\popper-utils.min.js.map" />
<Content Include="Scripts\popper-utils.js.map" />
<Content Include="Scripts\moment.min.js.map" />
<Content Include="Scripts\moment-with-locales.min.js.map" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
GPW_Admin/Scripts/Chart.js
Vendored
+16151
View File
File diff suppressed because it is too large Load Diff
GPW_Admin/Scripts/Chart.min.js
Vendored
+7
View File
File diff suppressed because one or more lines are too long
GPW_Admin/Scripts/moment-with-locales.js
+17757
View File
File diff suppressed because it is too large Load Diff
GPW_Admin/Scripts/moment-with-locales.min.js
Vendored
+2
View File
File diff suppressed because one or more lines are too long
GPW_Admin/Scripts/moment-with-locales.min.js.map
+1
View File
File diff suppressed because one or more lines are too long
GPW_Admin/Scripts/moment.js
+5668
View File
File diff suppressed because it is too large Load Diff
GPW_Admin/Scripts/moment.min.js
Vendored
+2
View File
File diff suppressed because one or more lines are too long
GPW_Admin/Scripts/moment.min.js.map
+1
View File
File diff suppressed because one or more lines are too long
GPW_Admin/Web.config
+2 -3
View File
@@ -142,8 +142,7 @@
</appSettings>
<connectionStrings>
<add name="GPW_data.Properties.Settings.GPWConnectionString" connectionString="Data Source=SQL-STEAM\SQL2012;Initial Catalog=GPW;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient" />
<add name="ErrorLog" connectionString="Data Source=SQL2016DEV;Initial Catalog=Elmah;Persist Security Info=True;User ID=sa;Password=keyhammer16;"
providerName="System.Data.SqlClient"/>
<add name="ErrorLog" connectionString="Data Source=SQL2016DEV;Initial Catalog=Elmah;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
</connectionStrings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -442,7 +441,7 @@
</staticContent>
</system.webServer>
<elmah>
<errorLog type="Elmah.SqlErrorLog, Elmah" connectionStringName="ErrorLog"/>
<errorLog type="Elmah.SqlErrorLog, Elmah" connectionStringName="ErrorLog" />
<security allowRemoteAccess="false" />
</elmah>
<location path="elmah.axd" inheritInChildApplications="false">
GPW_Admin/packages.config
+2
View File
@@ -6,6 +6,7 @@
<package id="AspNet.ScriptManager.bootstrap" version="4.4.1" targetFramework="net462" />
<package id="AspNet.ScriptManager.jQuery" version="3.4.1" targetFramework="net462" />
<package id="bootstrap" version="4.4.1" targetFramework="net462" />
<package id="Chart.js" version="2.9.3" targetFramework="net462" />
<package id="Crc32C.NET" version="1.0.5.0" targetFramework="net462" />
<package id="DnsClient" version="1.3.1" targetFramework="net462" />
<package id="elmah" version="1.2.2" targetFramework="net462" />
@@ -31,6 +32,7 @@
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net462" />
<package id="Microsoft.Web.RedisSessionStateProvider" version="4.0.1" targetFramework="net462" />
<package id="Modernizr" version="2.8.3" targetFramework="net462" />
<package id="Moment.js" version="2.27.0" targetFramework="net462" />
<package id="MongoDB.Bson" version="2.10.3" targetFramework="net462" />
<package id="MongoDB.Driver" version="2.10.3" targetFramework="net462" />
<package id="MongoDB.Driver.Core" version="2.10.3" targetFramework="net462" />
GPW_Commesse/App_Start/BundleConfig.cs
+47 -41
View File
@@ -3,57 +3,63 @@ using System.Web.UI;
namespace GPW_Commesse
{
public class BundleConfig
{
// For more information on Bundling, visit http://go.microsoft.com/fwlink/?LinkID=303951
public static void RegisterBundles(BundleCollection bundles)
public class BundleConfig
{
bundles.Add(new ScriptBundle("~/bundles/WebFormsJs").Include(
"~/Scripts/WebForms/WebForms.js",
"~/Scripts/WebForms/WebUIValidation.js",
"~/Scripts/WebForms/MenuStandards.js",
"~/Scripts/WebForms/Focus.js",
"~/Scripts/WebForms/GridView.js",
"~/Scripts/WebForms/DetailsView.js",
"~/Scripts/WebForms/TreeView.js",
"~/Scripts/WebForms/WebParts.js"));
// For more information on Bundling, visit http://go.microsoft.com/fwlink/?LinkID=303951
public static void RegisterBundles(BundleCollection bundles)
{
bundles.Add(new ScriptBundle("~/bundles/WebFormsJs").Include(
"~/Scripts/WebForms/WebForms.js",
"~/Scripts/WebForms/WebUIValidation.js",
"~/Scripts/WebForms/MenuStandards.js",
"~/Scripts/WebForms/Focus.js",
"~/Scripts/WebForms/GridView.js",
"~/Scripts/WebForms/DetailsView.js",
"~/Scripts/WebForms/TreeView.js",
"~/Scripts/WebForms/WebParts.js"));
// Order is very important for these files to work, they have explicit dependencies
bundles.Add(new ScriptBundle("~/bundles/MsAjaxJs").Include(
"~/Scripts/WebForms/MsAjax/MicrosoftAjax.js",
"~/Scripts/WebForms/MsAjax/MicrosoftAjaxApplicationServices.js",
"~/Scripts/WebForms/MsAjax/MicrosoftAjaxTimer.js",
"~/Scripts/WebForms/MsAjax/MicrosoftAjaxWebForms.js"));
// Order is very important for these files to work, they have explicit dependencies
bundles.Add(new ScriptBundle("~/bundles/MsAjaxJs").Include(
"~/Scripts/WebForms/MsAjax/MicrosoftAjax.js",
"~/Scripts/WebForms/MsAjax/MicrosoftAjaxApplicationServices.js",
"~/Scripts/WebForms/MsAjax/MicrosoftAjaxTimer.js",
"~/Scripts/WebForms/MsAjax/MicrosoftAjaxWebForms.js"));
// Use the Development version of Modernizr to develop with and learn from. Then, when you’re
// ready for production, use the build tool at http://modernizr.com to pick only the tests you need
bundles.Add(new ScriptBundle("~/bundles/modernizr").Include(
"~/Scripts/modernizr-*"));
// Use the Development version of Modernizr to develop with and learn from. Then, when you’re
// ready for production, use the build tool at http://modernizr.com to pick only the tests you need
bundles.Add(new ScriptBundle("~/bundles/modernizr").Include(
"~/Scripts/modernizr-*"));
bundles.Add(new ScriptBundle("~/bundles/jquery").Include(
"~/Scripts/jquery-{version}.js"));
bundles.Add(new ScriptBundle("~/bundles/jquery").Include(
"~/Scripts/jquery-{version}.js"));
bundles.Add(new ScriptBundle("~/bundles/jqueryui").Include(
"~/Scripts/jquery-ui-{version}.js"));
bundles.Add(new ScriptBundle("~/bundles/jqueryui").Include(
"~/Scripts/jquery-ui-{version}.js"));
bundles.Add(new ScriptBundle("~/bundles/jSteamware").Include(
"~/Scripts/jSteamware*"));
bundles.Add(new ScriptBundle("~/bundles/jSteamware").Include(
"~/Scripts/jSteamware*"));
//// aggiungo bundle dinamico x less --> css
//bundles.Add(new DynamicFolderBundle("less", "*.less"));
bundles.Add(new ScriptBundle("~/bundles/jsMoment").Include(
"~/Scripts/moment.js"));
bundles.Add(new ScriptBundle("~/bundles/jsChart").Include(
"~/Scripts/Chart.js"));
// abilito boundle "forzato"!
BundleTable.EnableOptimizations = true;
ScriptManager.ScriptResourceMapping.AddDefinition(
"respond",
new ScriptResourceDefinition
{
Path = "~/Scripts/respond.min.js",
DebugPath = "~/Scripts/respond.js",
});
//// aggiungo bundle dinamico x less --> css
//bundles.Add(new DynamicFolderBundle("less", "*.less"));
// abilito boundle "forzato"!
BundleTable.EnableOptimizations = true;
ScriptManager.ScriptResourceMapping.AddDefinition(
"respond",
new ScriptResourceDefinition
{
Path = "~/Scripts/respond.min.js",
DebugPath = "~/Scripts/respond.js",
});
}
}
}
}
GPW_Commesse/App_Start/WebApiConfig.cs
+21
View File
@@ -0,0 +1,21 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web.Http;
namespace GPW_Commesse
{
public static class WebApiConfig
{
public static void Register(HttpConfiguration config)
{
config.MapHttpAttributeRoutes();
config.Routes.MapHttpRoute(
name: "DefaultApi",
routeTemplate: "api/{controller}/{id}",
defaults: new { id = RouteParameter.Optional }
);
}
}
}
GPW_Commesse/Content/Chart.css
+47
View File
@@ -0,0 +1,47 @@
/*
* DOM element rendering detection
* https://davidwalsh.name/detect-node-insertion
*/
@keyframes chartjs-render-animation {
from { opacity: 0.99; }
to { opacity: 1; }
}
.chartjs-render-monitor {
animation: chartjs-render-animation 0.001s;
}
/*
* DOM element resizing detection
* https://github.com/marcj/css-element-queries
*/
.chartjs-size-monitor,
.chartjs-size-monitor-expand,
.chartjs-size-monitor-shrink {
position: absolute;
direction: ltr;
left: 0;
top: 0;
right: 0;
bottom: 0;
overflow: hidden;
pointer-events: none;
visibility: hidden;
z-index: -1;
}
.chartjs-size-monitor-expand > div {
position: absolute;
width: 1000000px;
height: 1000000px;
left: 0;
top: 0;
}
.chartjs-size-monitor-shrink > div {
position: absolute;
width: 200%;
height: 200%;
left: 0;
top: 0;
}
GPW_Commesse/Content/Chart.min.css
Vendored
+1
View File
@@ -0,0 +1 @@
@keyframes chartjs-render-animation{from{opacity:.99}to{opacity:1}}.chartjs-render-monitor{animation:chartjs-render-animation 1ms}.chartjs-size-monitor,.chartjs-size-monitor-expand,.chartjs-size-monitor-shrink{position:absolute;direction:ltr;left:0;top:0;right:0;bottom:0;overflow:hidden;pointer-events:none;visibility:hidden;z-index:-1}.chartjs-size-monitor-expand>div{position:absolute;width:1000000px;height:1000000px;left:0;top:0}.chartjs-size-monitor-shrink>div{position:absolute;width:200%;height:200%;left:0;top:0}
GPW_Commesse/Controllers/TempHistController.cs
+58
View File
@@ -0,0 +1,58 @@
using GPW_data;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Web.Http;
namespace GPW_Commesse.Controllers
{
public class TempHistController : ApiController
{
/// <summary>
/// Metodo effettivo recupero dati
/// </summary>
/// <param name="id"></param>
/// <param name="numRec"></param>
/// <param name="dtRif"></param>
/// <returns></returns>
private static List<chartJsXY> getDataFilt(int id, int numRec, DateTime dtRif)
{
List<chartJsXY> answ = new List<chartJsXY>();
var tabDati = DataProxy.DP.taHT.GetData(id, dtRif, numRec);
// ciclo
foreach (var item in tabDati)
{
answ.Add(new chartJsXY() { x = item.tempRil, y = item.freq });
}
// restituisco
return answ;
}
// GET api/TempHist
public string Get()
{
return "NA";
}
// GET api/TempHist/5
public List<chartJsXY> Get(int id)
{
int numRec = 0;
DateTime dtRif = DateTime.Today;
// restituisco oggetto!
return getDataFilt(id, numRec, dtRif);
}
// GET api/TempHist/5?date=2020-09-01&numRec=10
public List<chartJsXY> Get(int id, string date, int numRec)
{
DateTime dtRif = DateTime.Today;
DateTime.TryParse(date, out dtRif);
// restituisco oggetto!
return getDataFilt(id, numRec, dtRif);
}
}
}
GPW_Commesse/Controllers/TempRilController.cs
+56
View File
@@ -0,0 +1,56 @@
using GPW_data;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Web.Http;
namespace GPW_Commesse.Controllers
{
public class TempRilController : ApiController
{
/// <summary>
/// Metodo effettivo recupero dati
/// </summary>
/// <param name="id"></param>
/// <param name="numRec"></param>
/// <param name="dtRif"></param>
/// <returns></returns>
private static List<chartJsTSerie> getDataFilt(int id, int numRec, DateTime dtRif)
{
List<chartJsTSerie> answ = new List<chartJsTSerie>();
var tabDati = DataProxy.DP.taRT.getByUserPeriod(id, dtRif, numRec);
// ciclo
foreach (var item in tabDati)
{
answ.Add(new chartJsTSerie() { x = item.dtRilievo, y = item.tempRil });
}
// restituisco
return answ;
}
// GET api/TempRil
public string Get()
{
return "NA";
}
// GET api/TempRil/5
public List<chartJsTSerie> Get(int id)
{
int numRec = 0;
DateTime dtRif = DateTime.Today;
// restituisco oggetto!
return getDataFilt(id, numRec, dtRif);
}
// GET api/TempRil/5?date=2020-09-01&numRec=10
public List<chartJsTSerie> Get(int id, string date, int numRec)
{
DateTime dtRif = DateTime.Today;
DateTime.TryParse(date, out dtRif);
// restituisco oggetto!
return getDataFilt(id, numRec, dtRif);
}
}
}
GPW_Commesse/GPW_Commesse.csproj
+31
View File
@@ -140,6 +140,10 @@
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
</Reference>
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
@@ -165,6 +169,12 @@
</Reference>
<Reference Include="System.Transactions" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Web.Http, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll</HintPath>
</Reference>
<Reference Include="System.Web.Http.WebHost, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Drawing" />
<Reference Include="System.Web" />
@@ -233,6 +243,8 @@
<Content Include="Content\BuildBlocks.min.css">
<DependentUpon>BuildBlocks.css</DependentUpon>
</Content>
<Content Include="Content\Chart.css" />
<Content Include="Content\Chart.min.css" />
<Content Include="Content\ExtraComp.css" />
<Content Include="Content\font-awesome.css" />
<Content Include="Content\font-awesome.min.css">
@@ -355,6 +367,8 @@
<Content Include="Scripts\bootstrap.js.map" />
<Content Include="Scripts\bootstrap.bundle.min.js.map" />
<Content Include="Scripts\bootstrap.bundle.js.map" />
<Content Include="Scripts\Chart.js" />
<Content Include="Scripts\Chart.min.js" />
<Content Include="Scripts\esm\popper-utils.js" />
<Content Include="Scripts\esm\popper-utils.min.js" />
<Content Include="Scripts\esm\popper.js" />
@@ -372,6 +386,10 @@
<Content Include="Scripts\jquery-3.4.1.slim.min.js" />
<Content Include="Scripts\jquery-ui-1.12.1.js" />
<Content Include="Scripts\jquery-ui-1.12.1.min.js" />
<Content Include="Scripts\moment-with-locales.js" />
<Content Include="Scripts\moment-with-locales.min.js" />
<Content Include="Scripts\moment.js" />
<Content Include="Scripts\moment.min.js" />
<Content Include="Scripts\popper-utils.js" />
<Content Include="Scripts\popper-utils.min.js" />
<Content Include="Scripts\popper.js" />
@@ -444,6 +462,7 @@
<Content Include="Scripts\umd\popper.js" />
<Content Include="Scripts\umd\popper.min.js" />
<Content Include="WebMasterPages\AjaxSimpleFull.Master" />
<Content Include="WebUserControls\cmp_chart.ascx" />
<Content Include="WebUserControls\cmp_rilTemp.ascx" />
<Content Include="WebUserControls\cmp_toggle.ascx" />
<Content Include="WebUserControls\mod_autocomplete.ascx" />
@@ -536,6 +555,8 @@
<Content Include="Scripts\popper.js.map" />
<Content Include="Scripts\popper-utils.min.js.map" />
<Content Include="Scripts\popper-utils.js.map" />
<Content Include="Scripts\moment.min.js.map" />
<Content Include="Scripts\moment-with-locales.min.js.map" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -565,6 +586,7 @@
</Compile>
<Compile Include="App_Start\BundleConfig.cs" />
<Compile Include="App_Start\RouteConfig.cs" />
<Compile Include="App_Start\WebApiConfig.cs" />
<Compile Include="BaseUserControl.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>
@@ -575,6 +597,8 @@
<Compile Include="commesseUtente.aspx.designer.cs">
<DependentUpon>commesseUtente.aspx</DependentUpon>
</Compile>
<Compile Include="Controllers\TempHistController.cs" />
<Compile Include="Controllers\TempRilController.cs" />
<Compile Include="Default.aspx.cs">
<DependentUpon>Default.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -614,6 +638,13 @@
<Compile Include="WebMasterPages\AjaxSimpleFull.Master.designer.cs">
<DependentUpon>AjaxSimpleFull.Master</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_chart.ascx.cs">
<DependentUpon>cmp_chart.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_chart.ascx.designer.cs">
<DependentUpon>cmp_chart.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_rilTemp.ascx.cs">
<DependentUpon>cmp_rilTemp.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
GPW_Commesse/GPW_Commesse.csproj.user
+8
View File
@@ -11,6 +11,14 @@
<IISExpressSSLPort />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Controller</Controller_SelectedScaffolderCategoryPath>
<WebStackScaffolding_ControllerDialogWidth>600</WebStackScaffolding_ControllerDialogWidth>
<WebStackScaffolding_IsLayoutPageSelected>True</WebStackScaffolding_IsLayoutPageSelected>
<WebStackScaffolding_IsPartialViewSelected>False</WebStackScaffolding_IsPartialViewSelected>
<WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
<WebStackScaffolding_LayoutPageFile />
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
GPW_Commesse/Global.asax.cs
+2
View File
@@ -6,6 +6,7 @@ using System.Web.Optimization;
using System.Web.Routing;
using System.Web.Security;
using System.Web.SessionState;
using System.Web.Http;
namespace GPW_Commesse
{
@@ -13,6 +14,7 @@ namespace GPW_Commesse
{
void Application_Start(object sender, EventArgs e)
{
GlobalConfiguration.Configure(WebApiConfig.Register);
// Code that runs on application startup
RouteConfig.RegisterRoutes(RouteTable.Routes);
BundleConfig.RegisterBundles(BundleTable.Bundles);
GPW_Commesse/Scripts/Chart.js
Vendored
+16151
View File
File diff suppressed because it is too large Load Diff
GPW_Commesse/Scripts/Chart.min.js
Vendored
+7
View File
File diff suppressed because one or more lines are too long
GPW_Commesse/Scripts/moment-with-locales.js
+17757
View File
File diff suppressed because it is too large Load Diff
GPW_Commesse/Scripts/moment-with-locales.min.js
Vendored
+2
View File
File diff suppressed because one or more lines are too long
GPW_Commesse/Scripts/moment-with-locales.min.js.map
+1
View File
File diff suppressed because one or more lines are too long
GPW_Commesse/Scripts/moment.js
+5668
View File
File diff suppressed because it is too large Load Diff
GPW_Commesse/Scripts/moment.min.js
Vendored
+2
View File
File diff suppressed because one or more lines are too long
GPW_Commesse/Scripts/moment.min.js.map
+1
View File
File diff suppressed because one or more lines are too long
GPW_Commesse/Web.config
+8 -4
View File
@@ -144,8 +144,7 @@
</appSettings>
<connectionStrings>
<add name="GPW_data.Properties.Settings.GPWConnectionString" connectionString="Data Source=SQL-STEAM\SQL2012;Initial Catalog=GPW;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient" />
<add name="ErrorLog" connectionString="Data Source=SQL2016DEV;Initial Catalog=Elmah;Persist Security Info=True;User ID=sa;Password=keyhammer16;"
providerName="System.Data.SqlClient"/>
<add name="ErrorLog" connectionString="Data Source=SQL2016DEV;Initial Catalog=Elmah;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
</connectionStrings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -442,9 +441,14 @@
<remove fileExtension=".json" />
<mimeMap fileExtension=".json" mimeType="application/json" />
</staticContent>
</system.webServer>
<handlers>
<remove name="ExtensionlessUrlHandler-Integrated-4.0" />
<remove name="OPTIONSVerbHandler" />
<remove name="TRACEVerbHandler" />
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
</handlers></system.webServer>
<elmah>
<errorLog type="Elmah.SqlErrorLog, Elmah" connectionStringName="ErrorLog"/>
<errorLog type="Elmah.SqlErrorLog, Elmah" connectionStringName="ErrorLog" />
<security allowRemoteAccess="false" />
</elmah>
<location path="elmah.axd" inheritInChildApplications="false">
GPW_Commesse/WebMasterPages/AjaxSimple.master
+6 -3
View File
@@ -9,9 +9,12 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>GPW <%: Page.Title %></title>
<asp:PlaceHolder runat="server">
<%: Scripts.Render("~/bundles/modernizr") %>
</asp:PlaceHolder>
<asp:PlaceHolder runat="server">
<%: Scripts.Render("~/bundles/jsMoment") %>
<%: Scripts.Render("~/bundles/jsChart") %>
<%: Scripts.Render("~/bundles/modernizr") %>
</asp:PlaceHolder>
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/bootstrap" />
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
GPW_Commesse/WebMasterPages/AjaxSimpleFull.Master
+63 -60
View File
@@ -7,75 +7,78 @@
<!DOCTYPE html>
<html lang="it">
<head id="Head1" runat="server">
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>GPW <%: Page.Title %></title>
<asp:PlaceHolder runat="server">
<%: Scripts.Render("~/bundles/modernizr") %>
</asp:PlaceHolder>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>GPW <%: Page.Title %></title>
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/bootstrap" />
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<asp:PlaceHolder runat="server">
<%: Scripts.Render("~/bundles/modernizr") %>
</asp:PlaceHolder>
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<link rel="icon" href="~/images/favicon.png" type="image/png" />
<link rel="shortcut icon" href="~/images/favicon.png" type="image/png" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/bootstrap" />
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<asp:PlaceHolder ID="PlaceHolder1" runat="server">
<%: Scripts.Render("~/bundles/jquery") %>
<%: Scripts.Render("~/bundles/jqueryui") %>
<%: Scripts.Render("~/bundles/jSteamware") %>
</asp:PlaceHolder>
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<link rel="icon" href="~/images/favicon.png" type="image/png" />
<link rel="shortcut icon" href="~/images/favicon.png" type="image/png" />
<%-- <link href="~/Content/StyleCustom.css" rel="stylesheet" type="text/css" />--%>
<asp:PlaceHolder ID="PlaceHolder1" runat="server">
<%: Scripts.Render("~/bundles/jquery") %>
<%: Scripts.Render("~/bundles/jqueryui") %>
<%: Scripts.Render("~/bundles/jSteamware") %>
<%: Scripts.Render("~/bundles/jsMoment") %>
<%: Scripts.Render("~/bundles/jsChart") %>
</asp:PlaceHolder>
<script lang="javascript" type="text/javascript">
$(document).ready(function () {
$("span.radioBtn input").checkboxradio({ icon: false });
$(".JQbutton").button();
$("#accordion").accordion({
heightStyle: "content"
});
<%-- <link href="~/Content/StyleCustom.css" rel="stylesheet" type="text/css" />--%>
// oggetto da legare all'update parziale ajax x sistemare btns & co
var prm = Sys.WebForms.PageRequestManager.getInstance();
prm.add_endRequest(function () {
// re-bind your jQuery events here
$("span.radioBtn input").checkboxradio({ icon: false });
$(".JQbutton").button();
$("#accordion").accordion({
heightStyle: "content"
<script lang="javascript" type="text/javascript">
$(document).ready(function () {
$("span.radioBtn input").checkboxradio({ icon: false });
$(".JQbutton").button();
$("#accordion").accordion({
heightStyle: "content"
});
// oggetto da legare all'update parziale ajax x sistemare btns & co
var prm = Sys.WebForms.PageRequestManager.getInstance();
prm.add_endRequest(function () {
// re-bind your jQuery events here
$("span.radioBtn input").checkboxradio({ icon: false });
$(".JQbutton").button();
$("#accordion").accordion({
heightStyle: "content"
});
});
});
});
});
</script>
</script>
</head>
<body class="body">
<form id="form1" runat="server">
<asp:ScriptManager ID="sm" runat="server" EnablePartialRendering="true" EnableScriptGlobalization="true" EnableScriptLocalization="true" EnableCdn="false">
</asp:ScriptManager>
<div class="container-fluid">
<div class="row">
<div class="col-12">
<uc1:mod_menuTopFull ID="mod_menuTopFull1" runat="server" titolo="Gestione Commesse Utente" returnUrl="../HOME/" />
<form id="form1" runat="server">
<asp:ScriptManager ID="sm" runat="server" EnablePartialRendering="true" EnableScriptGlobalization="true" EnableScriptLocalization="true" EnableCdn="false">
</asp:ScriptManager>
<div class="container-fluid">
<div class="row">
<div class="col-12">
<uc1:mod_menuTopFull ID="mod_menuTopFull1" runat="server" titolo="Gestione Commesse Utente" returnUrl="../HOME/" />
</div>
</div>
<div class="row my-5">
<div class="col-12">
<asp:UpdatePanel ID="upMain" runat="server" UpdateMode="Conditional" RenderMode="Inline">
<ContentTemplate>
<asp:ContentPlaceHolder ID="cph1" runat="server">
</asp:ContentPlaceHolder>
</ContentTemplate>
</asp:UpdatePanel>
</div>
</div>
<div class="row">
<div class="col-12">
<uc1:mod_menuBottomFullpage runat="server" ID="mod_menuBottomFullpage" />
</div>
</div>
</div>
</div>
<div class="row my-5">
<div class="col-12">
<asp:UpdatePanel ID="upMain" runat="server" UpdateMode="Conditional" RenderMode="Inline">
<ContentTemplate>
<asp:ContentPlaceHolder ID="cph1" runat="server">
</asp:ContentPlaceHolder>
</ContentTemplate>
</asp:UpdatePanel>
</div>
</div>
<div class="row">
<div class="col-12">
<uc1:mod_menuBottomFullpage runat="server" ID="mod_menuBottomFullpage" />
</div>
</div>
</div>
</form>
</form>
</body>
</html>
GPW_Commesse/WebUserControls/cmp_chart.ascx
+166
View File
@@ -0,0 +1,166 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_chart.ascx.cs" Inherits="GPW_Commesse.WebUserControls.cmp_chart" %>
<%--https://www.chartjs.org/--%>
<asp:HiddenField runat="server" ID="hfIdxDip" />
<asp:HiddenField runat="server" ID="hfData" />
<canvas id="myChartTS" width="300" height="120"></canvas>
<div class="row">
<div class="col-6 text-right">Periodo</div>
<div class="col-6">
<asp:DropDownList runat="server" ID="ddlMaxNum" AutoPostBack="true">
<asp:ListItem Text="1 mese" Value="30"></asp:ListItem>
<asp:ListItem Text="2 mesi" Value="60"></asp:ListItem>
<asp:ListItem Text="3 mesi" Value="90"></asp:ListItem>
<asp:ListItem Text="6 mesi" Value="180"></asp:ListItem>
<asp:ListItem Text="1 anno" Value="366"></asp:ListItem>
<asp:ListItem Text="Tutto" Value="0"></asp:ListItem>
</asp:DropDownList>
</div>
</div>
<canvas id="myChartHist" width="300" height="120"></canvas>
<script type="text/javascript">
//var prm = Sys.WebForms.PageRequestManager.getInstance();
//prm.add_pageLoaded(pageLoaded);
//function pageLoaded(sender, args) {
// console.log('pageLoaded!');
// // chiamo recupero dati + plot della TS e dell'Histogram
// plotTS();
// plotHist();
//}
// funzione eseguita se successo al caricamento
function OnSuccess_(reponse) {
// recupero dati restituiti
var dataTS = reponse;
//console.log('Recieved our data', dataTS);
var myOptions = {
scales: {
yAxes: [{
//type: 'linear',
display: true,
ticks: {
maxTicksLimit: 10,
}
}],
xAxes: [{
type: 'time',
distribution: 'linear',
}]
}
, animation: {
duration: 100
},
};
// recupero obj chart
var ctx = document.getElementById('myChartTS').getContext('2d');
var chart = new Chart(ctx, {
type: 'line',
data: {
datasets: [{
borderColor: 'rgb(7, 173, 236)',
lineTension: 0,
steppedLine: true,
label: 'Temperatura Rilevata',
data: dataTS
}]
},
options: myOptions
});
}
// errore in reload!
function OnErrorCall_(repo) {
alert("Errore recupero dati grafico!");
}
// funzione eseguita se successo al caricamento
function HistOnSuccess_(reponse) {
// recupero dati restituiti
var dataHist = reponse;
//console.log('Recieved our data', dataHist);
// opzioni
var myOptions = {
scales: {
yAxes: [{
//type: 'linear',
display: true,
ticks: {
beginAtZero: true,
maxTicksLimit: 10,
}
}]
},
animation: {
duration: 300
},
};
// converto i valori etichette/freq
var barVal = [], barLabels = [];
dataHist.forEach(function (entry) {
barVal.push(entry.y);
barLabels.push(entry.x);
});
//console.log('labels: ', barLabels);
//console.log('bars: ', barVal);
// recupero obj chart
var ctx = document.getElementById('myChartHist').getContext('2d');
var chart = new Chart(ctx, {
type: 'bar',
data: {
labels: barLabels,
datasets: [{
label: 'Freq. Osservate',
backgroundColor: 'rgb(7, 173, 236)',
data: barVal
}]
},
options: myOptions
});
}
// errore in reload!
function HistOnErrorCall_(repo) {
alert("Errore recupero dati grafico HIST!");
}
// effettuo plotting grafico TimeSerie!
function plotTS() {
// caricamento pagina
$.ajax({
type: "GET",
url: "api/TempRil/<%=hfIdxDip.Value %>?date=<%=hfData.Value%>&numRec=<%=ddlMaxNum.SelectedValue%>",
contentType: "application/json; charset=utf-8",
dataType: "json",
success: OnSuccess_,
error: OnErrorCall_
});
}
// effettuo plotting grafico Hist!
function plotHist() {
// caricamento pagina
$.ajax({
type: "GET",
url: "api/TempHist/<%=hfIdxDip.Value %>?date=<%=hfData.Value%>&numRec=<%=ddlMaxNum.SelectedValue%>",
contentType: "application/json; charset=utf-8",
dataType: "json",
success: HistOnSuccess_,
error: HistOnErrorCall_
});
}
// funzione di drawing ad OGNI pageload!
function pageLoad() {
//console.log('pageLoad!');
// chiamo recupero dati + plot della TS e dell'Histogram
plotTS();
plotHist();
}
</script>
GPW_Commesse/WebUserControls/cmp_chart.ascx.cs
+37
View File
@@ -0,0 +1,37 @@
using GPW_data;
using SteamWare;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace GPW_Commesse.WebUserControls
{
public partial class cmp_chart : BaseUserControl
{
public DateTime dtRif
{
get
{
DateTime answ = DateTime.Today;
DateTime.TryParse(hfData.Value, out answ);
return answ;
}
set
{
hfData.Value = value.ToString("yyyy-MM-dd");
ddlMaxNum.DataBind();
}
}
protected void Page_Load(object sender, EventArgs e)
{
// imposto valori...
hfIdxDip.Value = $"{DataProxy.idxDipendente}";
}
}
}
GPW_Commesse/WebUserControls/cmp_chart.ascx.designer.cs
Generated
+44
View File
@@ -0,0 +1,44 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace GPW_Commesse.WebUserControls
{
public partial class cmp_chart
{
/// <summary>
/// Controllo hfIdxDip.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfIdxDip;
/// <summary>
/// Controllo hfData.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfData;
/// <summary>
/// Controllo ddlMaxNum.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList ddlMaxNum;
}
}
GPW_Commesse/WebUserControls/mod_commUtLog.ascx
+15 -5
View File
@@ -1,12 +1,14 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_commUtLog.ascx.cs" Inherits="GPW_Commesse.WebUserControls.mod_commUtLog" %>
<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %>
<%@ Register Src="mod_periodoAnalisi.ascx" TagName="mod_periodoAnalisi" TagPrefix="uc2" %>
<%@ Register Src="mod_commAttivitaDesk.ascx" TagName="mod_commAttivitaDesk" TagPrefix="uc3" %>
<%@ Register Src="mod_commUtMancTimbr.ascx" TagName="mod_commUtMancTimbr" TagPrefix="uc4" %>
<%@ Register Src="mod_elencoTimbr.ascx" TagName="mod_elencoTimbr" TagPrefix="uc5" %>
<%@ Register Src="mod_TagCloudProgetti.ascx" TagName="mod_TagCloudProgetti" TagPrefix="uc6" %>
<%@ Register Src="~/WebUserControls/mod_periodoAnalisi.ascx" TagName="mod_periodoAnalisi" TagPrefix="uc2" %>
<%@ Register Src="~/WebUserControls/mod_commAttivitaDesk.ascx" TagName="mod_commAttivitaDesk" TagPrefix="uc3" %>
<%@ Register Src="~/WebUserControls/mod_commUtMancTimbr.ascx" TagName="mod_commUtMancTimbr" TagPrefix="uc4" %>
<%@ Register Src="~/WebUserControls/mod_elencoTimbr.ascx" TagName="mod_elencoTimbr" TagPrefix="uc5" %>
<%@ Register Src="~/WebUserControls/mod_TagCloudProgetti.ascx" TagName="mod_TagCloudProgetti" TagPrefix="uc6" %>
<%@ Register Src="~/WebUserControls/cmp_toggle.ascx" TagPrefix="uc2" TagName="cmp_toggle" %>
<%@ Register Src="~/WebUserControls/cmp_rilTemp.ascx" TagPrefix="uc2" TagName="cmp_rilTemp" %>
<%@ Register Src="~/WebUserControls/cmp_chart.ascx" TagPrefix="uc2" TagName="cmp_chart" %>
@@ -30,6 +32,7 @@
<div runat="server" id="divSx" visible="false">
<asp:Panel ID="pnlEditTemp" runat="server" Height="100%" Visible="false" CssClass="table-secondary">
<uc2:cmp_rilTemp runat="server" ID="cmp_rilTemp" />
<uc2:cmp_chart runat="server" ID="cmp_chart" />
</asp:Panel>
<asp:Panel ID="pnlEditOre" runat="server" Height="100%" Visible="false" CssClass="table-secondary">
<div class="blockSpac">
@@ -81,9 +84,16 @@
<ItemTemplate>
<div class="text-center">
<asp:LinkButton runat="server" ID="lbShowTemp" CausesValidation="False" CommandName="Select" CommandArgument='<%# Eval("Data") %>' CssClass="btn btn-outline-secondary btn-sm" OnClick="lbShowTemp_Click">
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<i runat="server" visible='<%# !gtZero(Eval("tempRil")) %>' class="fa fa-thermometer-empty text-danger" aria-hidden="true"></i>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<i runat="server" visible='<%# gtZero(Eval("tempRil")) %>' class="fa fa-thermometer text-success" aria-hidden="true"></i>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</asp:LinkButton>
</div>
</ItemTemplate>
GPW_Commesse/WebUserControls/mod_commUtLog.ascx.cs
+1 -1
View File
@@ -191,9 +191,9 @@ namespace GPW_Commesse.WebUserControls
private void editTemp(string dataRif)
{
DateTime adesso = DateTime.Today;
CultureInfo ita = new CultureInfo("it-IT");
cmp_rilTemp.dtRif = Convert.ToDateTime(dataRif, ita);
cmp_chart.dtRif = Convert.ToDateTime(dataRif, ita);
//salvo in sessione dati x detail timbrature
memLayer.ML.setSessionVal("idxDip_det", DataProxy.idxDipendente);
// imposto modalità
GPW_Commesse/WebUserControls/mod_commUtLog.ascx.designer.cs
Generated
+9
View File
@@ -86,6 +86,15 @@ namespace GPW_Commesse.WebUserControls
/// </remarks>
protected global::GPW_Commesse.WebUserControls.cmp_rilTemp cmp_rilTemp;
/// <summary>
/// Controllo cmp_chart.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::GPW_Commesse.WebUserControls.cmp_chart cmp_chart;
/// <summary>
/// Controllo pnlEditOre.
/// </summary>
GPW_Commesse/packages.config
+6
View File
@@ -6,6 +6,7 @@
<package id="AspNet.ScriptManager.bootstrap" version="4.4.1" targetFramework="net462" />
<package id="AspNet.ScriptManager.jQuery" version="3.4.1" targetFramework="net462" />
<package id="bootstrap" version="4.4.1" targetFramework="net462" />
<package id="Chart.js" version="2.9.3" targetFramework="net462" />
<package id="Crc32C.NET" version="1.0.5.0" targetFramework="net462" />
<package id="DnsClient" version="1.3.1" targetFramework="net462" />
<package id="elmah" version="1.2.2" targetFramework="net462" />
@@ -20,11 +21,16 @@
<package id="Microsoft.AspNet.SessionState.SessionStateModule" version="1.1.0" targetFramework="net462" />
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net462" />
<package id="Microsoft.AspNet.Web.Optimization.WebForms" version="1.1.3" targetFramework="net462" />
<package id="Microsoft.AspNet.WebApi" version="5.2.7" targetFramework="net462" />
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.7" targetFramework="net462" />
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net462" />
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net462" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="1.1.0" targetFramework="net462" />
<package id="Microsoft.NETCore.Platforms" version="3.1.0" targetFramework="net462" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net462" />
<package id="Microsoft.Web.RedisSessionStateProvider" version="4.0.1" targetFramework="net462" />
<package id="Modernizr" version="2.8.3" targetFramework="net462" />
<package id="Moment.js" version="2.27.0" targetFramework="net462" />
<package id="MongoDB.Bson" version="2.10.3" targetFramework="net462" />
<package id="MongoDB.Driver" version="2.10.3" targetFramework="net462" />
<package id="MongoDB.Driver.Core" version="2.10.3" targetFramework="net462" />
GPW_Smart/App_Start/BundleConfig.cs
+2 -2
View File
@@ -41,10 +41,10 @@ namespace GPW_Smart
bundles.Add(new ScriptBundle("~/bundles/jSteamware").Include(
"~/Scripts/jSteamware*"));
bundles.Add(new ScriptBundle("~/bundles/jsChart").Include(
"~/Scripts/Chart.js"));
bundles.Add(new ScriptBundle("~/bundles/jsMoment").Include(
"~/Scripts/moment.js"));
bundles.Add(new ScriptBundle("~/bundles/jsChart").Include(
"~/Scripts/Chart.js"));
//// aggiungo bundle dinamico x less --> css
//bundles.Add(new DynamicFolderBundle("less", "*.less"));
GPW_Smart/WebUserControls/cmp_chart.ascx
+14 -2
View File
@@ -20,8 +20,18 @@
</div>
<canvas id="myChartHist" width="300" height="120"></canvas>
<script type="text/javascript">
//var prm = Sys.WebForms.PageRequestManager.getInstance();
//prm.add_pageLoaded(pageLoaded);
//function pageLoaded(sender, args) {
// console.log('pageLoaded!');
// // chiamo recupero dati + plot della TS e dell'Histogram
// plotTS();
// plotHist();
//}
<script>
// funzione eseguita se successo al caricamento
function OnSuccess_(reponse) {
@@ -148,8 +158,10 @@
// funzione di drawing ad OGNI pageload!
function pageLoad() {
//console.log('pageLoad!');
// chiamo recupero dati + plot della TS e dell'Histogram
plotTS();
plotHist();
}
</script>
</script>
Jenkinsfile
Vendored
+1 -1
View File
@@ -10,7 +10,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=4120']) {
withEnv(['NEXT_BUILD_NUMBER=4121']) {
// env.versionNumber = VersionNumber(versionNumberString : '2.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '2.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'GPW'