+
INFORMAZIONI installazione
-
+
diff --git a/GPW_Smart/WebUserControls/cmq_params.ascx b/GPW_Smart/WebUserControls/cmq_params.ascx
index 3e46893..2474aff 100644
--- a/GPW_Smart/WebUserControls/cmq_params.ascx
+++ b/GPW_Smart/WebUserControls/cmq_params.ascx
@@ -1 +1,62 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmq_params.ascx.cs" Inherits="GPW_Smart.WebUserControls.cmq_params" %>
+
+
+
+
+
+//
// Codice generato da uno strumento.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
-// il codice viene rigenerato.
-//
+// il codice viene rigenerato.
+//
//------------------------------------------------------------------------------
-namespace GPW_Smart.WebUserControls
-{
-
-
- public partial class cmq_params
- {
- }
+namespace GPW_Smart.WebUserControls {
+
+
+ public partial class cmq_params {
+
+ ///
+ /// Controllo chkAbilitaAll.
+ ///
+ ///
+ /// 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.CheckBox chkAbilitaAll;
+
+ ///
+ /// Controllo ddlNumCol.
+ ///
+ ///
+ /// 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 ddlNumCol;
+
+ ///
+ /// Controllo ddlNumRow.
+ ///
+ ///
+ /// 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 ddlNumRow;
+
+ ///
+ /// Controllo lbtSalva.
+ ///
+ ///
+ /// 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.LinkButton lbtSalva;
+ }
}
diff --git a/GPW_Smart/WebUserControls/mod_timbrature.ascx.cs b/GPW_Smart/WebUserControls/mod_timbrature.ascx.cs
index 8f21514..6c3e73e 100644
--- a/GPW_Smart/WebUserControls/mod_timbrature.ascx.cs
+++ b/GPW_Smart/WebUserControls/mod_timbrature.ascx.cs
@@ -8,7 +8,37 @@ namespace GPW.WebUserControls
{
public partial class mod_timbrature : System.Web.UI.UserControl
{
- protected bool forceButtons = true;
+ protected bool forceButtons
+ {
+ get
+ {
+ return !abilitaAll;
+ }
+ set
+ {
+ abilitaAll = !(value);
+ }
+ }
+ public bool abilitaAll
+ {
+ get
+ {
+ bool answ = false;
+ try
+ {
+ string rawData = memLayer.ML.getRSV("abilitaAll");
+ bool.TryParse(rawData, out answ);
+ }
+ catch
+ { }
+ return answ;
+ }
+ set
+ {
+ int ttlSec = value ? memLayer.ML.CRI("ttlAbilitaAll") : 0;
+ memLayer.ML.setRSV("abilitaAll", value.ToString(), ttlSec);
+ }
+ }
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
@@ -52,7 +82,7 @@ namespace GPW.WebUserControls
}
}
///
- /// imposto highlight di un area intorno al button
+ /// fix buttons button
///
private void setButtons()
{
@@ -115,13 +145,15 @@ namespace GPW.WebUserControls
bool isEntrata = false;
registraTimbratura(isEntrata);
}
+#if false
///
/// Abilita tutti i buttons
///
public void abilitaAll()
{
forceButtons = false;
- }
+ }
+#endif
///
/// Aggiorno visualizzazione
///
@@ -158,6 +190,7 @@ namespace GPW.WebUserControls
}
timbratrice.registraTimbratura(IdxDipendente, DateTime.Now, isEntrata, IPv4, "Web", approvata);
lblWarning.Visible = false;
+ abilitaAll = false;
//aggiorno timbrature visualizzate
setButtons();
updateTimbrature();
diff --git a/Jenkinsfile b/Jenkinsfile
index b8c64d3..717de12 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,7 +14,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=4070']) {
+ withEnv(['NEXT_BUILD_NUMBER=4071']) {
// env.versionNumber = VersionNumber(versionNumberString : '2.5.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '2.5.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'GPW'
+
+
+
+
+
+
+
+
+ <%: cognomeNome %>
+ <%: email %>
+ <%: IP %>
+
+ 
+
+
+
+
diff --git a/GPW_Smart/WebUserControls/cmq_params.ascx.cs b/GPW_Smart/WebUserControls/cmq_params.ascx.cs
index d5fba43..808c274 100644
--- a/GPW_Smart/WebUserControls/cmq_params.ascx.cs
+++ b/GPW_Smart/WebUserControls/cmq_params.ascx.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
+using SteamWare;
+using System;
namespace GPW_Smart.WebUserControls
{
@@ -11,7 +7,111 @@ namespace GPW_Smart.WebUserControls
{
protected void Page_Load(object sender, EventArgs e)
{
-
+ if (!Page.IsPostBack)
+ {
+ try
+ {
+ ddlNumCol.SelectedValue = numColEU.ToString();
+ ddlNumRow.SelectedValue = numRowTimb.ToString();
+ chkAbilitaAll.Checked = abilitaAll;
+ }
+ catch
+ { }
+ }
}
+
+ public string hashEmail
+ {
+ get
+ {
+ return memLayer.ML.StringSessionObj("hashEmail");
+ }
+ }
+ public string email
+ {
+ get
+ {
+ return memLayer.ML.StringSessionObj("email");
+ }
+ }
+ public string cognomeNome
+ {
+ get
+ {
+ return memLayer.ML.StringSessionObj("cognomeNome");
+ }
+ }
+ public string IP
+ {
+ get
+ {
+ return Request.UserHostName;
+ }
+ }
+
+ public int numColEU
+ {
+ get
+ {
+ return memLayer.ML.IntSessionObj("numColEU");
+ }
+ set
+ {
+ memLayer.ML.setSessionVal("numColEU", value);
+ }
+ }
+ public int numRowTimb
+ {
+ get
+ {
+ return memLayer.ML.IntSessionObj("numRowTimb");
+ }
+ set
+ {
+ memLayer.ML.setSessionVal("numRowTimb", value);
+ }
+ }
+ public bool abilitaAll
+ {
+ get
+ {
+ bool answ = false;
+ try
+ {
+ string rawData = memLayer.ML.getRSV("abilitaAll");
+ bool.TryParse(rawData, out answ);
+ }
+ catch
+ { }
+ return answ;
+ }
+ set
+ {
+ int ttlSec = value ? memLayer.ML.CRI("ttlAbilitaAll") : 0;
+ memLayer.ML.setRSV("abilitaAll", value.ToString(), ttlSec);
+ }
+ }
+
+ protected void ddlNumRow_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ lbtSalva.Visible = true;
+ }
+ protected void ddlNumCol_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ lbtSalva.Visible = true;
+ }
+ protected void chkAbilitaAll_CheckedChanged(object sender, EventArgs e)
+ {
+ lbtSalva.Visible = true;
+ }
+
+ protected void lbtSalva_Click(object sender, EventArgs e)
+ {
+ numRowTimb = Convert.ToInt32(ddlNumRow.SelectedValue);
+ numColEU = Convert.ToInt32(ddlNumCol.SelectedValue);
+ abilitaAll = chkAbilitaAll.Checked;
+ Response.Redirect("Timbrature");
+ }
+
}
}
\ No newline at end of file
diff --git a/GPW_Smart/WebUserControls/cmq_params.ascx.designer.cs b/GPW_Smart/WebUserControls/cmq_params.ascx.designer.cs
index 7ef29bb..b6fc1b0 100644
--- a/GPW_Smart/WebUserControls/cmq_params.ascx.designer.cs
+++ b/GPW_Smart/WebUserControls/cmq_params.ascx.designer.cs
@@ -1,17 +1,51 @@
//------------------------------------------------------------------------------
-//
+
+
+
+
+ Opzioni VISUALIZZAZIONE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Salva
+
+