diff --git a/GPW_Commesse/Controllers/TempHistController.cs b/GPW_Commesse/Controllers/TempHistController.cs index 6f00993..fa41145 100644 --- a/GPW_Commesse/Controllers/TempHistController.cs +++ b/GPW_Commesse/Controllers/TempHistController.cs @@ -32,15 +32,20 @@ namespace GPW_Commesse.Controllers } else { - var tabDati = DataProxy.DP.taHT.GetData(id, dtRif, numRec); - // ciclo - foreach (var item in tabDati) + try { - answ.Add(new chartJsXY() { x = item.tempRil, y = item.freq }); + 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 }); + } + // salvo + rawData = JsonConvert.SerializeObject(answ); + SteamWare.memLayer.ML.setRSV(histTemp, rawData, 5); } - // salvo - rawData = JsonConvert.SerializeObject(answ); - SteamWare.memLayer.ML.setRSV(histTemp, rawData, 5); + catch + { } } // restituisco return answ; diff --git a/GPW_Commesse/Controllers/TempRilController.cs b/GPW_Commesse/Controllers/TempRilController.cs index 7877262..5949884 100644 --- a/GPW_Commesse/Controllers/TempRilController.cs +++ b/GPW_Commesse/Controllers/TempRilController.cs @@ -33,15 +33,20 @@ namespace GPW_Commesse.Controllers } else { - var tabDati = DataProxy.DP.taRT.getByUserPeriod(id, dtRif, numRec); - // ciclo - foreach (var item in tabDati) + try { - answ.Add(new chartJsTSerie() { x = item.dtRilievo, y = item.tempRil }); + 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 }); + } + // salvo + rawData = JsonConvert.SerializeObject(answ); + SteamWare.memLayer.ML.setRSV(histTemp, rawData, 5); } - // salvo - rawData = JsonConvert.SerializeObject(answ); - SteamWare.memLayer.ML.setRSV(histTemp, rawData, 5); + catch + { } } // restituisco return answ; diff --git a/GPW_Commesse/WebUserControls/cmp_chart.ascx b/GPW_Commesse/WebUserControls/cmp_chart.ascx index 75765bf..2cfe5ba 100644 --- a/GPW_Commesse/WebUserControls/cmp_chart.ascx +++ b/GPW_Commesse/WebUserControls/cmp_chart.ascx @@ -3,16 +3,16 @@ @@ -172,7 +187,7 @@ Periodo
- + @@ -180,7 +195,6 @@ -
diff --git a/GPW_Commesse/WebUserControls/cmp_chart.ascx.cs b/GPW_Commesse/WebUserControls/cmp_chart.ascx.cs index 2815883..93ad430 100644 --- a/GPW_Commesse/WebUserControls/cmp_chart.ascx.cs +++ b/GPW_Commesse/WebUserControls/cmp_chart.ascx.cs @@ -32,6 +32,11 @@ namespace GPW_Commesse.WebUserControls #region Protected Methods + protected void ddlMaxNum_SelectedIndexChanged(object sender, EventArgs e) + { + doUpdate(); + } + protected void Page_Load(object sender, EventArgs e) { if (!Page.IsPostBack) @@ -46,5 +51,14 @@ namespace GPW_Commesse.WebUserControls } #endregion Protected Methods + + #region Public Methods + + public void doUpdate() + { + ScriptManager.RegisterStartupScript(divGraphs, this.GetType(), "ForceAction", $"forceRedrawAll({ddlMaxNum.SelectedValue});", true); + } + + #endregion Public Methods } } \ No newline at end of file diff --git a/GPW_Commesse/WebUserControls/cmp_chart.ascx.designer.cs b/GPW_Commesse/WebUserControls/cmp_chart.ascx.designer.cs index 161fa96..22cd135 100644 --- a/GPW_Commesse/WebUserControls/cmp_chart.ascx.designer.cs +++ b/GPW_Commesse/WebUserControls/cmp_chart.ascx.designer.cs @@ -41,15 +41,6 @@ namespace GPW_Commesse.WebUserControls /// protected global::System.Web.UI.WebControls.DropDownList ddlMaxNum; - /// - /// lbtUpdate control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.LinkButton lbtUpdate; - /// /// divGraphs control. /// diff --git a/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx b/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx index f9b206f..aafbbf5 100644 --- a/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx +++ b/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx @@ -2,79 +2,79 @@ <%@ Register Src="~/WebUserControls/cmp_toggle.ascx" TagPrefix="uc1" TagName="cmp_toggle" %>
-
- - - - - - - - - - - -
+
+ + + + + + + + + + + +
-
- - - <%--Modo standard: tag cloud--%> - - +
+ + + <%--Modo standard: tag cloud--%> + + <%# Eval("nomeProj") %> - - - <%--Modo piramide--%> - - + + + <%--Modo piramide--%> + + <%# "[" + Eval("nomeComm") + "] " + Eval("nomeFase") %> - - - <%--Modo elenco--%> -
- + + + <%--Modo elenco--%> +
+ <%# Eval("RowNum","{0:00}") + ") " + Eval("nomeProj").ToString().ToUpper() + " | " + Eval("nomeComm") + " | " + Eval("nomeFase") %> - -
- <%--Modo elencoCPF--%> -
- + +
+ <%--Modo elencoCPF--%> +
+ <%# Eval("RowNum","{0:00}") + ") " + Eval("nomeComm") + " | " + Eval("nomeProj") + " | " + Eval("nomeFase") %> - -
- - -
+ +
+ + +
-
- - elenco - elencoCPF - piramide - standard - -
-
- - 5 - 10 - 15 - 20 - 25 - 30 - -
+
+ + elenco + elencoCPF + piramide + standard + +
+
+ + 5 + 10 + 15 + 20 + 25 + 30 + +
- - - - - <%----%> - - - + + + + + <%----%> + + + \ No newline at end of file diff --git a/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx.cs b/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx.cs index d807e56..88b551b 100644 --- a/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx.cs +++ b/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx.cs @@ -9,324 +9,376 @@ using SteamWare; namespace GPW_Commesse.WebUserControls { - public partial class mod_TagCloudProgetti : System.Web.UI.UserControl - { - /// - /// evento selezione valore tag - /// - public event EventHandler eh_newVal; - /// - /// evento refresh numero items - /// - public event EventHandler eh_refresh; - /// - /// data di riferimento per controllo - /// - public DateTime dataRif + public enum TagCloudMode { - get - { - return Convert.ToDateTime(memLayer.ML.StringSessionObj("dataRifTC")); - } - set - { - memLayer.ML.setSessionVal("dataRifTC", value); - } + /// + /// modalità elenco (con codice colore) standard (Progetto-Fase-Sottofase) + /// + elenco, + + /// + /// modalità elenco Commessa-Progetto-Fase (con codice colore) + /// + elencoCPF, + + /// + /// modalità piramide 1 | 2-2 | 3-3-3 | 4-4-4-4 | ... + /// + piramide, + + /// + /// modalità normale + /// + standard } - /// - /// valore in sessione dello show add new - /// - public bool showAdd + + public partial class mod_TagCloudProgetti : System.Web.UI.UserControl { - get - { - bool answ = true; - if (memLayer.ML.isInSessionObject("showAddNewRec")) + #region Public Events + + /// + /// evento selezione valore tag + /// + public event EventHandler eh_newVal; + + /// + /// evento refresh numero items + /// + public event EventHandler eh_refresh; + + #endregion Public Events + + #region Public Properties + + /// + /// data di riferimento per controllo + /// + public DateTime dataRif { - answ = memLayer.ML.BoolSessionObj("showAddNewRec"); + get + { + return Convert.ToDateTime(memLayer.ML.StringSessionObj("dataRifTC")); + } + set + { + memLayer.ML.setSessionVal("dataRifTC", value); + } } - return answ; - } - set - { - memLayer.ML.setSessionVal("showAddNewRec", value); - setShowAdd(); - } - } - /// - /// sistema visualizzazione - /// - protected void setShowAdd() - { - tagBlock.Visible = showAdd; - } - /// - /// load pagina - /// - /// - /// - protected void Page_Load(object sender, EventArgs e) - { - if (!Page.IsPostBack) - { - // se vuoto lo imposto... - if (!memLayer.ML.isInSessionObject("TagCloudMode")) + + public TagCloudMode modo { - modo = TagCloudMode.standard; + get + { + return (TagCloudMode)memLayer.ML.objSessionObj("TagCloudMode"); + } + set + { + memLayer.ML.setSessionVal("TagCloudMode", value); + } } - cmp_toggle.toggleValue = showAdd; - setShowAdd(); - } - cmp_toggle.ehToggle += Cmp_toggle_ehToggle; - } - /// - /// Gestione evento toggle - /// - /// - /// - private void Cmp_toggle_ehToggle(object sender, EventArgs e) - { - showAdd = cmp_toggle.toggleValue; - } - /// - /// calcola calsse css data freq ripetizione - /// - /// - /// - public string tagClass(object _freq) - { - string answ = ""; - double freq = Convert.ToDouble(_freq); - if (freq > 0.25) - { - answ = "w1"; - } - else if (freq > 0.16) - { - answ = "w2"; - } - else if (freq > 0.1) - { - answ = "w3"; - } - else if (freq > 0.05) - { - answ = "w4"; - } - else - { - answ = "w5"; - } - return answ; - } - /// - /// calcola calsse css data posizione in elenco - /// - /// - /// - public string tagClassElenco(object _posiz) - { - string answ = ""; - int posiz = Convert.ToInt32(_posiz); - if (posiz <= 1) - { - answ = "e1"; - } - else if (posiz <= 3) - { - answ = "e2"; - } - else if (posiz <= 6) - { - answ = "e3"; - } - else if (posiz <= 10) - { - answ = "e4"; - } - else - { - answ = "e5"; - } - return answ; - } - /// - /// calcola calsse css data posizione in piramide - /// - /// - /// - public string tagClassPiram(object _posiz) - { - string answ = ""; - int posiz = Convert.ToInt32(_posiz); - if (posiz == 1) - { - answ = "p1"; - } - else if (posiz <= 3) - { - answ = "p2"; - } - else if (posiz <= 6) - { - answ = "p3"; - } - else if (posiz <= 10) - { - answ = "p4"; - } - else if (posiz <= 15) - { - answ = "p5"; - } - else if (posiz <= 21) - { - answ = "p6"; - } - else - { - answ = "p7"; - } - return answ; - } - /// - /// crea una nuova attività dal tag indicato - /// - /// - /// - protected void lnkTag_Click(object sender, EventArgs e) - { - // variabili! - int idxDipCurr = memLayer.ML.IntSessionObj("idxDipCurr"); - // inizia con dataRif = 8 del mattino - DateTime inizio = dataRif.Date.AddHours(8); - int idxFase = 0; - // leggo valore fase - LinkButton lbtn = (LinkButton)sender; - try - { - idxFase = Convert.ToInt32(lbtn.CommandArgument); - } - catch - { } - // chiamo clona! - int minuti = 0; - try - { - minuti = Convert.ToInt32(rblOre.SelectedValue); - } - catch - { } - DataProxy.DP.taRA.clonaLastRA_byFaseUtente(idxDipCurr, inizio, idxFase, minuti); - repTagCloud.DataBind(); - // riporto evento! - if (eh_newVal != null) - { - eh_newVal(this, new EventArgs()); - } - } - /// - /// evento selezione nuovo valore durata - /// - /// - /// - protected void rblOre_SelectedIndexChanged(object sender, EventArgs e) - { - // salvo il valore scelto - memLayer.ML.setSessionVal("stdMinDurata", rblOre.SelectedValue); - repTagCloud.DataBind(); - // riporto evento! - if (eh_newVal != null) - { - eh_newVal(this, new EventArgs()); - } - } - /// - /// chiamata aggiornamento controllo - /// - public void doUpdate() - { - repTagCloud.DataBind(); - } + /// + /// valore in sessione dello show add new + /// + public bool showAdd + { + get + { + bool answ = true; + if (memLayer.ML.isInSessionObject("showAddNewRec")) + { + answ = memLayer.ML.BoolSessionObj("showAddNewRec"); + } + return answ; + } + set + { + memLayer.ML.setSessionVal("showAddNewRec", value); + setShowAdd(); + } + } - public TagCloudMode modo - { - get - { - return (TagCloudMode)memLayer.ML.objSessionObj("TagCloudMode"); - } - set - { - memLayer.ML.setSessionVal("TagCloudMode", value); - } - } + #endregion Public Properties - protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) - { - // riporto evento! - if (eh_refresh != null) - { - eh_refresh(this, new EventArgs()); - } - } + #region Private Methods - protected void ddlModoTag_SelectedIndexChanged(object sender, EventArgs e) - { - // cambio modo! - switch (ddlModoTag.SelectedValue) - { - case "elenco": - modo = TagCloudMode.elenco; - break; - case "elencoCPF": - modo = TagCloudMode.elencoCPF; - break; - case "piramide": - modo = TagCloudMode.piramide; - break; - case "standard": - modo = TagCloudMode.standard; - break; - default: - break; - } - repTagCloud.DataBind(); - // riporto evento! - if (eh_refresh != null) - { - eh_refresh(this, new EventArgs()); - } - } + /// + /// Gestione evento toggle + /// + /// + /// + private void Cmp_toggle_ehToggle(object sender, EventArgs e) + { + showAdd = cmp_toggle.toggleValue; + } - protected void lbtToggleOn_Click(object sender, EventArgs e) - { - showAdd = !showAdd; - } + #endregion Private Methods - protected void lbtToggleOff_Click(object sender, EventArgs e) - { - showAdd = !showAdd; - } - } + #region Protected Methods - public enum TagCloudMode - { - /// - /// modalità elenco (con codice colore) standard (Progetto-Fase-Sottofase) - /// - elenco, - /// - /// modalità elenco Commessa-Progetto-Fase (con codice colore) - /// - elencoCPF, - /// - /// modalità piramide 1 | 2-2 | 3-3-3 | 4-4-4-4 | ... - /// - piramide, - /// - /// modalità normale - /// - standard - } + protected void ddlModoTag_SelectedIndexChanged(object sender, EventArgs e) + { + // cambio modo! + switch (ddlModoTag.SelectedValue) + { + case "elenco": + modo = TagCloudMode.elenco; + break; + + case "elencoCPF": + modo = TagCloudMode.elencoCPF; + break; + + case "piramide": + modo = TagCloudMode.piramide; + break; + + case "standard": + modo = TagCloudMode.standard; + break; + + default: + break; + } + repTagCloud.DataBind(); + // riporto evento! + if (eh_refresh != null) + { + eh_refresh(this, new EventArgs()); + } + } + + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + // riporto evento! + if (eh_refresh != null) + { + eh_refresh(this, new EventArgs()); + } + } + + protected void lbtToggleOff_Click(object sender, EventArgs e) + { + showAdd = !showAdd; + } + + protected void lbtToggleOn_Click(object sender, EventArgs e) + { + showAdd = !showAdd; + } + + /// + /// crea una nuova attività dal tag indicato + /// + /// + /// + protected void lnkTag_Click(object sender, EventArgs e) + { + // variabili! + int idxDipCurr = memLayer.ML.IntSessionObj("idxDipCurr"); + + // default: inizia ora la dichiarazione + double oraStart = DateTime.Now.Hour; + int durataMinuti = memLayer.ML.IntSessionObj("stdMinDurata"); + // se c'è timbratura ingresso prendo quella come ora inizio... + try + { + DS_Applicazione.TimbratureRow riga = DataProxy.DP.taTimb.getByIdxDipPeriodo(DataProxy.idxDipendente, dataRif, dataRif.AddDays(1))[0]; + oraStart = Convert.ToDouble(riga.dataOra.Hour + (double)riga.dataOra.Minute / 60); + } + catch + { } + + // inizia con dataRif = 8 del mattino + DateTime inizio = dataRif.Date.AddHours(oraStart); + + int idxFase = 0; + // leggo valore fase + LinkButton lbtn = (LinkButton)sender; + try + { + idxFase = Convert.ToInt32(lbtn.CommandArgument); + } + catch + { } + // chiamo clona! + int minuti = 0; + try + { + minuti = Convert.ToInt32(rblOre.SelectedValue); + } + catch + { } + DataProxy.DP.taRA.clonaLastRA_byFaseUtente(idxDipCurr, inizio, idxFase, minuti); + repTagCloud.DataBind(); + // riporto evento! + if (eh_newVal != null) + { + eh_newVal(this, new EventArgs()); + } + } + + /// + /// load pagina + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + // se vuoto lo imposto... + if (!memLayer.ML.isInSessionObject("TagCloudMode")) + { + modo = TagCloudMode.standard; + } + cmp_toggle.toggleValue = showAdd; + setShowAdd(); + } + cmp_toggle.ehToggle += Cmp_toggle_ehToggle; + } + + /// + /// evento selezione nuovo valore durata + /// + /// + /// + protected void rblOre_SelectedIndexChanged(object sender, EventArgs e) + { + // salvo il valore scelto + memLayer.ML.setSessionVal("stdMinDurata", rblOre.SelectedValue); + repTagCloud.DataBind(); + // riporto evento! + if (eh_newVal != null) + { + eh_newVal(this, new EventArgs()); + } + } + + /// + /// sistema visualizzazione + /// + protected void setShowAdd() + { + tagBlock.Visible = showAdd; + } + + #endregion Protected Methods + + #region Public Methods + + /// + /// chiamata aggiornamento controllo + /// + public void doUpdate() + { + repTagCloud.DataBind(); + } + + /// + /// calcola calsse css data freq ripetizione + /// + /// + /// + public string tagClass(object _freq) + { + string answ = ""; + double freq = Convert.ToDouble(_freq); + if (freq > 0.25) + { + answ = "w1"; + } + else if (freq > 0.16) + { + answ = "w2"; + } + else if (freq > 0.1) + { + answ = "w3"; + } + else if (freq > 0.05) + { + answ = "w4"; + } + else + { + answ = "w5"; + } + return answ; + } + + /// + /// calcola calsse css data posizione in elenco + /// + /// + /// + public string tagClassElenco(object _posiz) + { + string answ = ""; + int posiz = Convert.ToInt32(_posiz); + if (posiz <= 1) + { + answ = "e1"; + } + else if (posiz <= 3) + { + answ = "e2"; + } + else if (posiz <= 6) + { + answ = "e3"; + } + else if (posiz <= 10) + { + answ = "e4"; + } + else + { + answ = "e5"; + } + return answ; + } + + /// + /// calcola calsse css data posizione in piramide + /// + /// + /// + public string tagClassPiram(object _posiz) + { + string answ = ""; + int posiz = Convert.ToInt32(_posiz); + if (posiz == 1) + { + answ = "p1"; + } + else if (posiz <= 3) + { + answ = "p2"; + } + else if (posiz <= 6) + { + answ = "p3"; + } + else if (posiz <= 10) + { + answ = "p4"; + } + else if (posiz <= 15) + { + answ = "p5"; + } + else if (posiz <= 21) + { + answ = "p6"; + } + else + { + answ = "p7"; + } + return answ; + } + + #endregion Public Methods + } } \ No newline at end of file diff --git a/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx.designer.cs b/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx.designer.cs index 6534da4..8f79eaf 100644 --- a/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx.designer.cs +++ b/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx.designer.cs @@ -1,80 +1,80 @@ //------------------------------------------------------------------------------ -// -// Codice generato da uno strumento. +// +// This code was generated by a tool. // -// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// //------------------------------------------------------------------------------ namespace GPW_Commesse.WebUserControls { - public partial class mod_TagCloudProgetti - { + public partial class mod_TagCloudProgetti + { - /// - /// Controllo rblOre. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.RadioButtonList rblOre; + /// + /// rblOre control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.RadioButtonList rblOre; - /// - /// Controllo cmp_toggle. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::GPW_Commesse.WebUserControls.cmp_toggle cmp_toggle; + /// + /// cmp_toggle control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GPW_Commesse.WebUserControls.cmp_toggle cmp_toggle; - /// - /// Controllo tagBlock. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl tagBlock; + /// + /// tagBlock control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl tagBlock; - /// - /// Controllo repTagCloud. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.Repeater repTagCloud; + /// + /// repTagCloud control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater repTagCloud; - /// - /// Controllo ddlModoTag. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.DropDownList ddlModoTag; + /// + /// ddlModoTag control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList ddlModoTag; - /// - /// Controllo ddlPageSize. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.DropDownList ddlPageSize; + /// + /// ddlPageSize control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList ddlPageSize; - /// - /// Controllo ods. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.ObjectDataSource ods; - } + /// + /// ods control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource ods; + } } diff --git a/GPW_Commesse/WebUserControls/mod_commAttivitaDesk.ascx.cs b/GPW_Commesse/WebUserControls/mod_commAttivitaDesk.ascx.cs index 80339d1..7a6519a 100644 --- a/GPW_Commesse/WebUserControls/mod_commAttivitaDesk.ascx.cs +++ b/GPW_Commesse/WebUserControls/mod_commAttivitaDesk.ascx.cs @@ -202,7 +202,7 @@ namespace GPW_Commesse.WebUserControls try { DS_Applicazione.TimbratureRow riga = DataProxy.DP.taTimb.getByIdxDipPeriodo(DataProxy.idxDipendente, valoreDateTime, valoreDateTime.AddDays(1))[0]; - oraStart = Convert.ToDouble(riga.dataOra.Hour + riga.dataOra.Minute / 60); + oraStart = Convert.ToDouble(riga.dataOra.Hour + (double)riga.dataOra.Minute / 60); } catch { } diff --git a/GPW_Commesse/WebUserControls/mod_commUtLog.ascx b/GPW_Commesse/WebUserControls/mod_commUtLog.ascx index 91ddfa9..483ad4d 100644 --- a/GPW_Commesse/WebUserControls/mod_commUtLog.ascx +++ b/GPW_Commesse/WebUserControls/mod_commUtLog.ascx @@ -54,17 +54,17 @@ function toggleCharts() { $("#<%:divRilTemp.ClientID%>").toggle(); $("#<%:divCharts.ClientID%>").toggle(); - console.log("toggleCharts"); + //console.log("toggleCharts"); } function showCharts() { $("#<%:divRilTemp.ClientID%>").toggle(true); $("#<%:divCharts.ClientID%>").toggle(true); - console.log("showCharts"); + //console.log("showCharts"); } function hideCharts() { $("#<%:divRilTemp.ClientID%>").toggle(false); $("#<%:divCharts.ClientID%>").toggle(false); - console.log("hideCharts"); + //console.log("hideCharts"); } diff --git a/GPW_Commesse/WebUserControls/mod_commUtLog.ascx.cs b/GPW_Commesse/WebUserControls/mod_commUtLog.ascx.cs index f428367..8b3797f 100644 --- a/GPW_Commesse/WebUserControls/mod_commUtLog.ascx.cs +++ b/GPW_Commesse/WebUserControls/mod_commUtLog.ascx.cs @@ -358,6 +358,10 @@ namespace GPW_Commesse.WebUserControls { divRilTemp.Visible = doShow; divCharts.Visible = doShow; + if (doShow) + { + cmp_chart.doUpdate(); + } } /// diff --git a/Jenkinsfile b/Jenkinsfile index ad2e258..ca883d2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=4153']) { + withEnv(['NEXT_BUILD_NUMBER=4154']) { // env.versionNumber = VersionNumber(versionNumberString : '2.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '2.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'GPW'