diff --git a/GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index a1f2a11..0f25778 100644 Binary files a/GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/GPW_Commesse/GPW_Commesse.csproj b/GPW_Commesse/GPW_Commesse.csproj index ada7e74..06a4870 100644 --- a/GPW_Commesse/GPW_Commesse.csproj +++ b/GPW_Commesse/GPW_Commesse.csproj @@ -495,6 +495,7 @@ + @@ -684,6 +685,13 @@ cmp_chart.ascx + + cmp_dailyCheck.ascx + ASPXCodeBehind + + + cmp_dailyCheck.ascx + cmp_rilTemp.ascx ASPXCodeBehind diff --git a/GPW_Commesse/WebUserControls/mod_commUtLog.ascx b/GPW_Commesse/WebUserControls/mod_commUtLog.ascx index 615a935..ffd2079 100644 --- a/GPW_Commesse/WebUserControls/mod_commUtLog.ascx +++ b/GPW_Commesse/WebUserControls/mod_commUtLog.ascx @@ -8,6 +8,8 @@ <%@ 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" %> +<%@ Register Src="~/WebUserControls/cmp_dailyCheck.ascx" TagPrefix="uc2" TagName="cmp_dailyCheck" %> + @@ -21,7 +23,10 @@
+ + + Sel globale:
@@ -67,8 +72,11 @@ - - +
+
+ +
+
@@ -121,13 +129,33 @@ -
+
- + + + + + + +
+ + + + +
+ +
+ + +
+ + + +
@@ -151,7 +179,7 @@
- +
@@ -171,7 +199,7 @@ - + @@ -196,4 +224,4 @@
-
\ No newline at end of file +
diff --git a/GPW_Commesse/WebUserControls/mod_commUtLog.ascx.cs b/GPW_Commesse/WebUserControls/mod_commUtLog.ascx.cs index d1e6e8d..08c2ec3 100644 --- a/GPW_Commesse/WebUserControls/mod_commUtLog.ascx.cs +++ b/GPW_Commesse/WebUserControls/mod_commUtLog.ascx.cs @@ -30,7 +30,12 @@ namespace GPW_Commesse.WebUserControls /// /// edit Rilievo Temperatura attivo /// - editRilTemp + editRilTemp, + + /// + /// display ultimi check eseguiti + /// + showCheck } public partial class mod_commUtLog : BaseUserControl @@ -66,6 +71,20 @@ namespace GPW_Commesse.WebUserControls } } + protected bool checkVisible + { + get + { + bool answ = false; + bool.TryParse(hfShowCheck.Value, out answ); + return answ; + } + set + { + hfShowCheck.Value = $"{value}"; + } + } + #endregion Protected Properties #region Public Properties @@ -129,6 +148,18 @@ namespace GPW_Commesse.WebUserControls raiseEvent(ucEvType.Reset); } + private void closeShowCheck() + { + activeMode = modoCommesse.elenco; + grView.SelectedIndex = -1; + grView.DataBind(); + + tempVisible = false; + checkVisible = false; + showPanels(); + raiseEvent(ucEvType.Reset); + } + private void cmp_rilTemp_ehCancel(object sender, EventArgs e) { closeEditTemp(); @@ -175,6 +206,21 @@ namespace GPW_Commesse.WebUserControls raiseEvent(ucEvType.ReqUpdateParent); } + private void showCheck(string dataRif) + { + CultureInfo ita = new CultureInfo("it-IT"); + cmp_dailyCheck.dataFrom = Convert.ToDateTime(dataRif, ita).AddDays(-3); + cmp_dailyCheck.dataTo = Convert.ToDateTime(dataRif, ita); + //salvo in sessione dati x detail timbrature + memLayer.ML.setSessionVal("idxDip_det", DataProxy.idxDipendente); + // imposto modalità + checkVisible = true; + activeMode = modoCommesse.showCheck; + showPanels(); + + raiseEvent(ucEvType.ReqUpdateParent); + } + private void editTimbr(string dataRif) { DateTime adesso = DateTime.Now; @@ -242,6 +288,11 @@ namespace GPW_Commesse.WebUserControls grView.DataBind(); } + /// + /// edit temperatura rilevata + /// + /// + /// protected void lbShowTemp_Click(object sender, EventArgs e) { string dataRif = ((LinkButton)sender).CommandArgument; @@ -253,6 +304,23 @@ namespace GPW_Commesse.WebUserControls } } + /// + /// visualizzazione controlli C19 + /// + /// + /// + protected void lbShowCheck_Click(object sender, EventArgs e) + { + string dataRif = ((LinkButton)sender).CommandArgument; + activeMode = modoCommesse.showCheck; + // verifico se dip sia attivo... + if (DataProxy.currDipIsActive && DataProxy.currDipHasPayloadActive) + { + showCheck(dataRif); + } + } + + protected void lbtShowAll_Click(object sender, EventArgs e) { openBoth = true; @@ -346,6 +414,12 @@ namespace GPW_Commesse.WebUserControls cmp_toggle.ehToggle += Cmp_toggle_ehToggle; cmp_rilTemp.ehCancel += cmp_rilTemp_ehCancel; cmp_rilTemp.ehSave += cmp_rilTemp_ehSave; + cmp_dailyCheck.ehCancel += Cmp_dailyCheck_ehCancel; + } + + private void Cmp_dailyCheck_ehCancel(object sender, EventArgs e) + { + closeShowCheck(); } protected void showCharts(bool doShow) @@ -370,6 +444,7 @@ namespace GPW_Commesse.WebUserControls // imposto valori default bool commesse = false; bool temp = false; + bool check = false; bool timbr = false; divDx.Attributes.Remove("class"); divCn.Attributes.Remove("class"); @@ -391,10 +466,16 @@ namespace GPW_Commesse.WebUserControls case modoCommesse.editRilTemp: temp = true; - divCn.Attributes.Add("class", "col-sm-7 col-md-8 col-lg-9"); - divSx.Attributes.Add("class", "col-sm-5 col-md-4 col-lg-3"); + divCn.Attributes.Add("class", "col-12"); divDx.Visible = false; - divSx.Visible = true; + divSx.Visible = false; + break; + + case modoCommesse.showCheck: + check = true; + divCn.Attributes.Add("class", "col-12"); + divDx.Visible = false; + divSx.Visible = false; break; case modoCommesse.elenco: @@ -424,6 +505,13 @@ namespace GPW_Commesse.WebUserControls divSx.Visible = false; break; + case modoCommesse.showCheck: + check = true; + divCn.Attributes.Add("class", "col-12"); + divDx.Visible = false; + divSx.Visible = false; + break; + case modoCommesse.editRegAtt: commesse = true; divCn.Attributes.Add("class", "col-sm-6 col-md-7 col-lg-8"); @@ -445,6 +533,7 @@ namespace GPW_Commesse.WebUserControls pnlEditOre.Visible = timbr; mod_commAttivitaDesk1.Visible = commesse; mod_commUtMancTimbr1.Visible = timbr; + cmp_dailyCheck.Visible = check; showCharts(temp && tempVisible); upMain.Update(); } diff --git a/GPW_Commesse/WebUserControls/mod_commUtLog.ascx.designer.cs b/GPW_Commesse/WebUserControls/mod_commUtLog.ascx.designer.cs index bd0bd0e..84861df 100644 --- a/GPW_Commesse/WebUserControls/mod_commUtLog.ascx.designer.cs +++ b/GPW_Commesse/WebUserControls/mod_commUtLog.ascx.designer.cs @@ -32,6 +32,15 @@ namespace GPW_Commesse.WebUserControls /// protected global::mod_periodoAnalisi mod_periodoAnalisi1; + /// + /// hfShowCheck control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HiddenField hfShowCheck; + /// /// hfTempVisible control. /// @@ -41,6 +50,24 @@ namespace GPW_Commesse.WebUserControls /// protected global::System.Web.UI.WebControls.HiddenField hfTempVisible; + /// + /// hfDataFrom control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HiddenField hfDataFrom; + + /// + /// hfDataTo control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HiddenField hfDataTo; + /// /// cmp_toggle control. /// @@ -87,22 +114,13 @@ namespace GPW_Commesse.WebUserControls protected global::GPW_Commesse.WebUserControls.cmp_chart cmp_chart; /// - /// hfDataFrom control. + /// cmp_dailyCheck control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.HiddenField hfDataFrom; - - /// - /// hfDataTo control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.HiddenField hfDataTo; + protected global::GPW_Commesse.WebUserControls.cmp_dailyCheck cmp_dailyCheck; /// /// divSx control.