diff --git a/GPW_Commesse/BaseUserControl.cs b/GPW_Commesse/BaseUserControl.cs
index b025037..3b42235 100644
--- a/GPW_Commesse/BaseUserControl.cs
+++ b/GPW_Commesse/BaseUserControl.cs
@@ -50,16 +50,22 @@ namespace GPW_Commesse
///
/// controllo stato licenze!
///
- public bool chkLicOk
- {
- get
- {
- return (licenzeGPW.checkLicenze);
- }
- }
+ public bool chkLicOk => doChkLicOk();
#endregion Public Properties
+ #region Private Methods
+
+ ///
+ /// controllo stato licenze!
+ ///
+ private bool doChkLicOk()
+ {
+ return (licenzeGPW.checkLicenze);
+ }
+
+ #endregion Private Methods
+
#region Protected Methods
///
diff --git a/GPW_Commesse/WebUserControls/mod_commUtLog.ascx b/GPW_Commesse/WebUserControls/mod_commUtLog.ascx
index ffd2079..e60f5aa 100644
--- a/GPW_Commesse/WebUserControls/mod_commUtLog.ascx
+++ b/GPW_Commesse/WebUserControls/mod_commUtLog.ascx
@@ -135,7 +135,7 @@
-
+
@@ -152,7 +152,7 @@
-
+
diff --git a/GPW_Commesse/WebUserControls/mod_commUtLog.ascx.cs b/GPW_Commesse/WebUserControls/mod_commUtLog.ascx.cs
index 08c2ec3..6f34a1e 100644
--- a/GPW_Commesse/WebUserControls/mod_commUtLog.ascx.cs
+++ b/GPW_Commesse/WebUserControls/mod_commUtLog.ascx.cs
@@ -42,6 +42,20 @@ namespace GPW_Commesse.WebUserControls
{
#region Protected Properties
+ protected bool checkVisible
+ {
+ get
+ {
+ bool answ = false;
+ bool.TryParse(hfShowCheck.Value, out answ);
+ return answ;
+ }
+ set
+ {
+ hfShowCheck.Value = $"{value}";
+ }
+ }
+
///
/// Determina se visualizzare entrambe le schede...
///
@@ -71,20 +85,6 @@ 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
@@ -160,6 +160,11 @@ namespace GPW_Commesse.WebUserControls
raiseEvent(ucEvType.Reset);
}
+ private void Cmp_dailyCheck_ehCancel(object sender, EventArgs e)
+ {
+ closeShowCheck();
+ }
+
private void cmp_rilTemp_ehCancel(object sender, EventArgs e)
{
closeEditTemp();
@@ -206,21 +211,6 @@ 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;
@@ -271,6 +261,21 @@ namespace GPW_Commesse.WebUserControls
grView.DataBind();
}
+ private void showCheck(string dataRif)
+ {
+ CultureInfo ita = new CultureInfo("it-IT");
+ cmp_dailyCheck.dataFrom = Convert.ToDateTime(dataRif, ita).AddDays(-2);
+ cmp_dailyCheck.dataTo = Convert.ToDateTime(dataRif, ita).AddDays(1);
+ //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);
+ }
+
#endregion Private Methods
#region Protected Methods
@@ -288,22 +293,6 @@ namespace GPW_Commesse.WebUserControls
grView.DataBind();
}
- ///
- /// edit temperatura rilevata
- ///
- ///
- ///
- protected void lbShowTemp_Click(object sender, EventArgs e)
- {
- string dataRif = ((LinkButton)sender).CommandArgument;
- activeMode = modoCommesse.editRilTemp;
- // verifico se dip sia attivo...
- if (DataProxy.currDipIsActive && DataProxy.currDipHasPayloadActive)
- {
- editTemp(dataRif);
- }
- }
-
///
/// visualizzazione controlli C19
///
@@ -320,6 +309,21 @@ namespace GPW_Commesse.WebUserControls
}
}
+ ///
+ /// edit temperatura rilevata
+ ///
+ ///
+ ///
+ protected void lbShowTemp_Click(object sender, EventArgs e)
+ {
+ string dataRif = ((LinkButton)sender).CommandArgument;
+ activeMode = modoCommesse.editRilTemp;
+ // verifico se dip sia attivo...
+ if (DataProxy.currDipIsActive && DataProxy.currDipHasPayloadActive)
+ {
+ editTemp(dataRif);
+ }
+ }
protected void lbtShowAll_Click(object sender, EventArgs e)
{
@@ -373,7 +377,7 @@ namespace GPW_Commesse.WebUserControls
{
activeMode = modoCommesse.elenco;
intervalloDate periodo = new intervalloDate();
- periodo.fine = DateTime.Now.AddDays(1);
+ periodo.fine = DateTime.Today.AddDays(1);
periodo.inizio = periodo.fine.AddDays(memLayer.ML.confReadInt("defDayFrom"));
mod_periodoAnalisi1.intervalloAnalisi = periodo;
// salvo link in HF
@@ -417,11 +421,6 @@ namespace GPW_Commesse.WebUserControls
cmp_dailyCheck.ehCancel += Cmp_dailyCheck_ehCancel;
}
- private void Cmp_dailyCheck_ehCancel(object sender, EventArgs e)
- {
- closeShowCheck();
- }
-
protected void showCharts(bool doShow)
{
divRilTemp.Visible = doShow;
diff --git a/GPW_Commesse/WebUserControls/mod_periodoAnalisi.ascx.cs b/GPW_Commesse/WebUserControls/mod_periodoAnalisi.ascx.cs
index a3a0d9e..0faec98 100644
--- a/GPW_Commesse/WebUserControls/mod_periodoAnalisi.ascx.cs
+++ b/GPW_Commesse/WebUserControls/mod_periodoAnalisi.ascx.cs
@@ -130,7 +130,7 @@ public partial class mod_periodoAnalisi : System.Web.UI.UserControl
oraFine = Convert.ToInt32(ddlOraFine.SelectedValue);
}
_intervallo.inizio = Convert.ToDateTime(txtInizio.Text).AddHours(oraInizio);
- _intervallo.fine = Convert.ToDateTime(txtFine.Text).AddHours(oraFine);
+ _intervallo.fine = Convert.ToDateTime(txtFine.Text).AddHours(oraFine).AddDays(1);
verificaCoerenzaDate();
int _durataMin;
_durataMin = Convert.ToInt32(txtDurataMin.Text);