diff --git a/GPW_Smart/GPW_Smart.csproj b/GPW_Smart/GPW_Smart.csproj
index f3d5371..28e24be 100644
--- a/GPW_Smart/GPW_Smart.csproj
+++ b/GPW_Smart/GPW_Smart.csproj
@@ -627,7 +627,7 @@
-
+
@@ -728,6 +728,9 @@
attivitaIns.aspx
+
+ ASPXCodeBehind
+
Default.aspx
ASPXCodeBehind
@@ -844,12 +847,12 @@
cmp_rilTemp.ascx
-
- cmq_params.ascx
+
+ cmp_params.ascx
ASPXCodeBehind
-
- cmq_params.ascx
+
+ cmp_params.ascx
mod_attivitaIns.ascx
diff --git a/GPW_Smart/Parametri.aspx b/GPW_Smart/Parametri.aspx
index 0c7fb11..33f1366 100644
--- a/GPW_Smart/Parametri.aspx
+++ b/GPW_Smart/Parametri.aspx
@@ -1,7 +1,7 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="Parametri.aspx.cs" Inherits="GPW_Smart.Parametri" %>
-<%@ Register Src="~/WebUserControls/cmq_params.ascx" TagPrefix="uc1" TagName="cmq_params" %>
+<%@ Register Src="~/WebUserControls/cmp_params.ascx" TagPrefix="uc1" TagName="cmp_params" %>
-
+
diff --git a/GPW_Smart/Parametri.aspx.designer.cs b/GPW_Smart/Parametri.aspx.designer.cs
index c830048..43fc7ba 100644
--- a/GPW_Smart/Parametri.aspx.designer.cs
+++ b/GPW_Smart/Parametri.aspx.designer.cs
@@ -13,12 +13,12 @@ namespace GPW_Smart {
public partial class Parametri {
///
- /// Controllo cmq_params.
+ /// Controllo cmp_params.
///
///
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
- protected global::GPW_Smart.WebUserControls.cmq_params cmq_params;
+ protected global::GPW_Smart.WebUserControls.cmp_params cmp_params;
}
}
diff --git a/GPW_Smart/Site.Master b/GPW_Smart/Site.Master
index 90735f0..65c460c 100644
--- a/GPW_Smart/Site.Master
+++ b/GPW_Smart/Site.Master
@@ -49,7 +49,7 @@
-
+
diff --git a/GPW_Smart/Timbrature.aspx b/GPW_Smart/Timbrature.aspx
index a5c9003..5c6c752 100644
--- a/GPW_Smart/Timbrature.aspx
+++ b/GPW_Smart/Timbrature.aspx
@@ -2,7 +2,6 @@
<%@ Register Src="~/WebUserControls/mod_timbrature.ascx" TagPrefix="uc1" TagName="mod_timbrature" %>
-
diff --git a/GPW_Smart/WebUserControls/mod_timbrature.ascx.cs b/GPW_Smart/WebUserControls/mod_timbrature.ascx.cs
index 02e676b..53179ca 100644
--- a/GPW_Smart/WebUserControls/mod_timbrature.ascx.cs
+++ b/GPW_Smart/WebUserControls/mod_timbrature.ascx.cs
@@ -1,4 +1,5 @@
using GPW_data;
+using GPW_Smart;
using SteamWare;
using System;
using System.Web.UI;
@@ -6,7 +7,7 @@ using System.Web.UI.WebControls;
namespace GPW.WebUserControls
{
- public partial class mod_timbrature : System.Web.UI.UserControl
+ public partial class mod_timbrature : BaseUserControl
{
protected bool forceButtons
{
@@ -19,26 +20,6 @@ namespace GPW.WebUserControls
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)
@@ -58,53 +39,6 @@ namespace GPW.WebUserControls
divTable.Style.Add("font-size", textSize);
}
- public int numColEU
- {
- get
- {
- int answ = 2;
- try
- {
- answ = memLayer.ML.IntSessionObj("numColEU");
- }
- catch
- { }
- if (answ <= 0) answ = 2;
- return answ;
- }
- set
- {
- memLayer.ML.setSessionVal("numColEU", value);
- }
- }
- public int numRowTimb
- {
- get
- {
- return memLayer.ML.IntSessionObj("numRowTimb");
- }
- set
- {
- memLayer.ML.setSessionVal("numRowTimb", value);
- }
- }
-
-
- public string textSize
- {
- get
- {
- string answ = memLayer.ML.StringSessionObj("textSize");
- if (string.IsNullOrEmpty(answ))
- answ = "1em";
- return answ;
- }
- set
- {
- memLayer.ML.setSessionVal("textSize", value);
- }
- }
-
///
/// fix buttons button
///
@@ -218,23 +152,7 @@ namespace GPW.WebUserControls
}
return IdxDipendente;
}
- ///
- /// idx dipendente loggato
- ///
- protected int IdxDipendente
- {
- get
- {
- int idx = 0;
- try
- {
- idx = memLayer.ML.IntSessionObj("IdxDipendente");
- }
- catch
- { }
- return idx;
- }
- }
+
///
/// inverte valore booleano
///