diff --git a/GPW_Data/DS_Applicazione.Designer.cs b/GPW_Data/DS_Applicazione.Designer.cs index ab41ecb..25f3ea6 100644 --- a/GPW_Data/DS_Applicazione.Designer.cs +++ b/GPW_Data/DS_Applicazione.Designer.cs @@ -31476,13 +31476,15 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt this._commandCollection[0].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxDipendente", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@lastDate", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@maxNum", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)] - public virtual int Fill(DS_Applicazione.HistTempDataTable dataTable, global::System.Nullable idxDipendente) { + public virtual int Fill(DS_Applicazione.HistTempDataTable dataTable, global::System.Nullable idxDipendente, global::System.Nullable lastDate, global::System.Nullable maxNum) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((idxDipendente.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(idxDipendente.Value)); @@ -31490,6 +31492,18 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt else { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } + if ((lastDate.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[2].Value = ((System.DateTime)(lastDate.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + if ((maxNum.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[3].Value = ((int)(maxNum.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; + } if ((this.ClearBeforeFill == true)) { dataTable.Clear(); } @@ -31501,7 +31515,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] - public virtual DS_Applicazione.HistTempDataTable GetData(global::System.Nullable idxDipendente) { + public virtual DS_Applicazione.HistTempDataTable GetData(global::System.Nullable idxDipendente, global::System.Nullable lastDate, global::System.Nullable maxNum) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((idxDipendente.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(idxDipendente.Value)); @@ -31509,6 +31523,18 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt else { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } + if ((lastDate.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[2].Value = ((System.DateTime)(lastDate.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + if ((maxNum.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[3].Value = ((int)(maxNum.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; + } DS_Applicazione.HistTempDataTable dataTable = new DS_Applicazione.HistTempDataTable(); this.Adapter.Fill(dataTable); return dataTable; diff --git a/GPW_Data/DS_Applicazione.xsd b/GPW_Data/DS_Applicazione.xsd index c679eaf..0a965fd 100644 --- a/GPW_Data/DS_Applicazione.xsd +++ b/GPW_Data/DS_Applicazione.xsd @@ -2837,13 +2837,15 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + dbo.stp_RT_getHistByUser + + @@ -2863,7 +2865,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -2887,7 +2889,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -2944,7 +2946,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -2982,7 +2984,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -3110,7 +3112,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -3203,7 +3205,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -3248,7 +3250,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -3262,7 +3264,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -3312,7 +3314,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -3348,7 +3350,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -3368,7 +3370,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -3389,7 +3391,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -3425,7 +3427,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -3450,7 +3452,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -3466,7 +3468,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -3487,7 +3489,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -3552,7 +3554,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -3600,7 +3602,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -3641,7 +3643,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -3662,7 +3664,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -3671,7 +3673,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - + @@ -3775,13 +3777,13 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt - - - - - - - + + + + + + + \ No newline at end of file diff --git a/GPW_Data/DS_Applicazione.xss b/GPW_Data/DS_Applicazione.xss index 35393ca..b8e590b 100644 --- a/GPW_Data/DS_Applicazione.xss +++ b/GPW_Data/DS_Applicazione.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -21,12 +21,12 @@ - + - - + + @@ -124,12 +124,12 @@ - 553 - 859 + 279 + 617 - 553 - 1434 + 204 + 617 diff --git a/GPW_Data/Objects.cs b/GPW_Data/Objects.cs index d08d000..549b2e0 100644 --- a/GPW_Data/Objects.cs +++ b/GPW_Data/Objects.cs @@ -6,9 +6,14 @@ using System.Threading.Tasks; namespace GPW_data { - public class chartJsTSerie + public class chartJsTSerie { public DateTime x { get; set; } public decimal y { get; set; } } + public class chartJsXY + { + public decimal x { get; set; } + public decimal y { get; set; } + } } diff --git a/GPW_Smart/Controllers/TempHistController.cs b/GPW_Smart/Controllers/TempHistController.cs index adba048..33109e5 100644 --- a/GPW_Smart/Controllers/TempHistController.cs +++ b/GPW_Smart/Controllers/TempHistController.cs @@ -1,4 +1,5 @@ -using System; +using GPW_data; +using System; using System.Collections.Generic; using System.Linq; using System.Net; @@ -9,31 +10,49 @@ namespace GPW_Smart.Controllers { public class TempHistController : ApiController { - // GET api/ - public IEnumerable Get() + /// + /// Metodo effettivo recupero dati + /// + /// + /// + /// + /// + private static List getDataFilt(int id, int numRec, DateTime dtRif) { - return new string[] { "value1", "value2" }; + List answ = new List(); + 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//5 - public string Get(int id) + // GET api/TempHist + public string Get() { - return "value"; + return "NA"; } - // POST api/ - public void Post([FromBody] string value) + // GET api/TempHist/5 + public List Get(int id) { + int numRec = 0; + DateTime dtRif = DateTime.Today; + // restituisco oggetto! + return getDataFilt(id, numRec, dtRif); } - // PUT api//5 - public void Put(int id, [FromBody] string value) - { - } - // DELETE api//5 - public void Delete(int id) + // GET api/TempHist/5?date=2020-09-01&numRec=10 + public List Get(int id, string date, int numRec) { + DateTime dtRif = DateTime.Today; + DateTime.TryParse(date, out dtRif); + // restituisco oggetto! + return getDataFilt(id, numRec, dtRif); } } } \ No newline at end of file diff --git a/GPW_Smart/Controllers/TempRilController.cs b/GPW_Smart/Controllers/TempRilController.cs index 30950f7..dbccead 100644 --- a/GPW_Smart/Controllers/TempRilController.cs +++ b/GPW_Smart/Controllers/TempRilController.cs @@ -10,6 +10,25 @@ namespace GPW_Smart.Controllers { public class TempRilController : ApiController { + /// + /// Metodo effettivo recupero dati + /// + /// + /// + /// + /// + private static List getDataFilt(int id, int numRec, DateTime dtRif) + { + List answ = new List(); + 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() { @@ -19,54 +38,19 @@ namespace GPW_Smart.Controllers // GET api/TempRil/5 public List Get(int id) { - - - List answ = new List(); - - // recupero dati - var tabDati = DataProxy.DP.taRT.getByUserPeriod(id, DateTime.Today, 0); - - foreach (var item in tabDati) - { - answ.Add(new chartJsTSerie() { x = item.dtRilievo, y = item.tempRil }); - } - + int numRec = 0; + DateTime dtRif = DateTime.Today; // restituisco oggetto! - return answ; + return getDataFilt(id, numRec, dtRif); } // GET api/TempRil/5?date=2020-09-01&numRec=10 public List Get(int id, string date, int numRec) { DateTime dtRif = DateTime.Today; DateTime.TryParse(date, out dtRif); - - List answ = new List(); - - // recupero dati - var tabDati = DataProxy.DP.taRT.getByUserPeriod(id, dtRif, numRec); - - foreach (var item in tabDati) - { - answ.Add(new chartJsTSerie() { x = item.dtRilievo, y = item.tempRil }); - } - // restituisco oggetto! - return answ; + return getDataFilt(id, numRec, dtRif); } - //// POST api/TempRil - //public void Post([FromBody] string value) - //{ - //} - - //// PUT api/TempRil/5 - //public void Put(int id, [FromBody] string value) - //{ - //} - - //// DELETE api/TempRil/5 - //public void Delete(int id) - //{ - //} } } \ No newline at end of file diff --git a/GPW_Smart/TempRil.aspx b/GPW_Smart/TempRil.aspx index 398e82a..31dc4f1 100644 --- a/GPW_Smart/TempRil.aspx +++ b/GPW_Smart/TempRil.aspx @@ -4,10 +4,13 @@ <%@ Register Src="~/WebUserControls/cmp_chart.ascx" TagPrefix="uc1" TagName="cmp_chart" %> + - + - + - +
+ +
diff --git a/GPW_Smart/WebUserControls/cmp_chart.ascx b/GPW_Smart/WebUserControls/cmp_chart.ascx index 0d64935..cbfcbfb 100644 --- a/GPW_Smart/WebUserControls/cmp_chart.ascx +++ b/GPW_Smart/WebUserControls/cmp_chart.ascx @@ -1,9 +1,10 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_chart.ascx.cs" Inherits="GPW_Smart.WebUserControls.cmp_chart" %> - +<%--https://www.chartjs.org/--%> + - +
Periodo
@@ -17,6 +18,8 @@
+ + diff --git a/GPW_Smart/WebUserControls/cmp_params.ascx b/GPW_Smart/WebUserControls/cmp_params.ascx index 751008f..fd5a728 100644 --- a/GPW_Smart/WebUserControls/cmp_params.ascx +++ b/GPW_Smart/WebUserControls/cmp_params.ascx @@ -44,6 +44,8 @@ + +
diff --git a/Jenkinsfile b/Jenkinsfile index 898d91e..ce93d10 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=4119']) { + withEnv(['NEXT_BUILD_NUMBER=4120']) { // 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'