diff --git a/GPW_Barcode/Web.config b/GPW_Barcode/Web.config index 1d43c7f..058d2d5 100644 --- a/GPW_Barcode/Web.config +++ b/GPW_Barcode/Web.config @@ -135,206 +135,206 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/GPW_Smart/Content/fonts.css b/GPW_Smart/Content/fonts.css index 2e44251..77b5c23 100644 --- a/GPW_Smart/Content/fonts.css +++ b/GPW_Smart/Content/fonts.css @@ -10,16 +10,15 @@ font-weight: 300; src: url('OpenSansCondensed.woff') format('woff'); } -/*@font-face { +@font-face { font-family: 'Roboto'; font-style: normal; font-weight: 400; src: url('Roboto.woff2') format('woff2'); } - @font-face { font-family: 'Roboto Condensed'; font-style: normal; font-weight: 300; src: url('RobotoCondensed.woff2') format('woff2'); -}*/ \ No newline at end of file +} \ No newline at end of file diff --git a/GPW_Smart/Content/fonts.less b/GPW_Smart/Content/fonts.less index 9ac0f3f..1679aa2 100644 --- a/GPW_Smart/Content/fonts.less +++ b/GPW_Smart/Content/fonts.less @@ -12,7 +12,7 @@ src: url('OpenSansCondensed.woff') format('woff'); } -/*@font-face { +@font-face { font-family: 'Roboto'; font-style: normal; font-weight: 400; @@ -24,4 +24,4 @@ font-style: normal; font-weight: 300; src: url('RobotoCondensed.woff2') format('woff2'); -}*/ +} diff --git a/GPW_Smart/Content/fonts.min.css b/GPW_Smart/Content/fonts.min.css index 846107e..8b10746 100644 --- a/GPW_Smart/Content/fonts.min.css +++ b/GPW_Smart/Content/fonts.min.css @@ -1 +1 @@ -@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:url('OpenSans.woff') format('woff');}@font-face{font-family:'Open Sans Condensed';font-style:normal;font-weight:300;src:url('OpenSansCondensed.woff') format('woff');} \ No newline at end of file +@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:url('OpenSans.woff') format('woff');}@font-face{font-family:'Open Sans Condensed';font-style:normal;font-weight:300;src:url('OpenSansCondensed.woff') format('woff');}@font-face{font-family:'Roboto';font-style:normal;font-weight:400;src:url('Roboto.woff2') format('woff2');}@font-face{font-family:'Roboto Condensed';font-style:normal;font-weight:300;src:url('RobotoCondensed.woff2') format('woff2');} \ No newline at end of file diff --git a/GPW_Smart/Web.config b/GPW_Smart/Web.config index 1602748..cf4a173 100644 --- a/GPW_Smart/Web.config +++ b/GPW_Smart/Web.config @@ -136,6 +136,8 @@ + diff --git a/GPW_Smart/WebUserControls/cmp_rilTemp.ascx b/GPW_Smart/WebUserControls/cmp_rilTemp.ascx index 72d5182..537e871 100644 --- a/GPW_Smart/WebUserControls/cmp_rilTemp.ascx +++ b/GPW_Smart/WebUserControls/cmp_rilTemp.ascx @@ -1,53 +1,20 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_rilTemp.ascx.cs" Inherits="GPW_Smart.WebUserControls.cmp_rilTemp" %> -
-
-

Temperatura

-
-
- <%: string.Format("{0:yyyy-MM-dd, dddd}",dtRif) %> -
-
- -
-
- Cancel -
-
- Save -
-
- -<%-- - -
-
-

Temperatura

-
-
- <%: SteamWare.memLayer.ML.QSS("dataRif") %> -
-
- -
-
- Cancel -
-
- Save -
-
- - - - -   - - - - - - - ---%> +
+
+

Temperatura

+
+
+ <%: string.Format("{0:yyyy-MM-dd, dddd}",dtRif) %> +
+
+ +
+
+ Cancel +
+
+ Save +
+
diff --git a/GPW_Smart/WebUserControls/cmq_params.ascx b/GPW_Smart/WebUserControls/cmq_params.ascx index 2474aff..d49d1b3 100644 --- a/GPW_Smart/WebUserControls/cmq_params.ascx +++ b/GPW_Smart/WebUserControls/cmq_params.ascx @@ -4,59 +4,75 @@
-
-
-
-
-
-
-
<%: cognomeNome %>
-
<%: email %>
-
<%: IP %>
-
-
- -
+
+
+
+
+
+
+
<%: cognomeNome %>
+
<%: email %>
+
<%: IP %>
+
+
+ +
-
-
-
- Opzioni VISUALIZZAZIONE -
-
-
-
- -
-
-
-
-
- - - - - +
+
+
+ Opzioni VISUALIZZAZIONE
-
- - - - - - - - +
+
+
+ +
+
+
+
+
+ + + + + +
+
+ + + + + + + + +
+
+ + + + + + + + + + + + + + +
+
+
+
+
+ Salva +
+
-
-
-
- Salva -
-
-
-
diff --git a/GPW_Smart/WebUserControls/cmq_params.ascx.cs b/GPW_Smart/WebUserControls/cmq_params.ascx.cs index 808c274..de62e33 100644 --- a/GPW_Smart/WebUserControls/cmq_params.ascx.cs +++ b/GPW_Smart/WebUserControls/cmq_params.ascx.cs @@ -3,115 +3,132 @@ using System; namespace GPW_Smart.WebUserControls { - public partial class cmq_params : System.Web.UI.UserControl - { - protected void Page_Load(object sender, EventArgs e) + public partial class cmq_params : System.Web.UI.UserControl { - if (!Page.IsPostBack) - { - try + protected void Page_Load(object sender, EventArgs e) { - ddlNumCol.SelectedValue = numColEU.ToString(); - ddlNumRow.SelectedValue = numRowTimb.ToString(); - chkAbilitaAll.Checked = abilitaAll; + if (!Page.IsPostBack) + { + try + { + ddlNumCol.SelectedValue = numColEU.ToString(); + ddlNumRow.SelectedValue = numRowTimb.ToString(); + chkAbilitaAll.Checked = abilitaAll; + ddlTextSize.SelectedValue = textSize.ToString(); + } + catch + { } + } } - 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 + public string hashEmail { - string rawData = memLayer.ML.getRSV("abilitaAll"); - bool.TryParse(rawData, out answ); + 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; + } } - 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; - } + 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); + } + } + public string textSize + { + get + { + return memLayer.ML.StringSessionObj("textSize"); + } + set + { + memLayer.ML.setSessionVal("textSize", value); + } + } - protected void lbtSalva_Click(object sender, EventArgs e) - { - numRowTimb = Convert.ToInt32(ddlNumRow.SelectedValue); - numColEU = Convert.ToInt32(ddlNumCol.SelectedValue); - abilitaAll = chkAbilitaAll.Checked; - Response.Redirect("Timbrature"); - } + 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; + textSize = ddlTextSize.SelectedValue; + Response.Redirect("Timbrature"); + } + + protected void ddlTextSize_SelectedIndexChanged(object sender, EventArgs e) + { + lbtSalva.Visible = true; + } + } } \ 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 b6fc1b0..7826e2a 100644 --- a/GPW_Smart/WebUserControls/cmq_params.ascx.designer.cs +++ b/GPW_Smart/WebUserControls/cmq_params.ascx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace GPW_Smart.WebUserControls { - - - public partial class cmq_params { - +namespace GPW_Smart.WebUserControls +{ + + + public partial class cmq_params + { + /// /// Controllo chkAbilitaAll. /// @@ -20,7 +22,7 @@ namespace GPW_Smart.WebUserControls { /// 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. /// @@ -29,7 +31,7 @@ namespace GPW_Smart.WebUserControls { /// 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. /// @@ -38,7 +40,16 @@ namespace GPW_Smart.WebUserControls { /// 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 ddlTextSize. + /// + /// + /// 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 ddlTextSize; + /// /// Controllo lbtSalva. /// diff --git a/GPW_Smart/WebUserControls/mod_timbrature.ascx b/GPW_Smart/WebUserControls/mod_timbrature.ascx index 9b7fcfc..44c60db 100644 --- a/GPW_Smart/WebUserControls/mod_timbrature.ascx +++ b/GPW_Smart/WebUserControls/mod_timbrature.ascx @@ -12,8 +12,8 @@
-
-
+
+
@@ -61,9 +61,9 @@
- - - + + + diff --git a/GPW_Smart/WebUserControls/mod_timbrature.ascx.cs b/GPW_Smart/WebUserControls/mod_timbrature.ascx.cs index 9663592..02e676b 100644 --- a/GPW_Smart/WebUserControls/mod_timbrature.ascx.cs +++ b/GPW_Smart/WebUserControls/mod_timbrature.ascx.cs @@ -49,6 +49,13 @@ namespace GPW.WebUserControls memLayer.ML.setSessionVal("dataRif", DateTime.Today); } setButtons(); + fixFont(); + } + + private void fixFont() + { + divTable.Style.Clear(); + divTable.Style.Add("font-size", textSize); } public int numColEU @@ -81,6 +88,23 @@ namespace GPW.WebUserControls 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 /// diff --git a/GPW_Smart/WebUserControls/mod_timbrature.ascx.designer.cs b/GPW_Smart/WebUserControls/mod_timbrature.ascx.designer.cs index 90e24d8..86e216f 100644 --- a/GPW_Smart/WebUserControls/mod_timbrature.ascx.designer.cs +++ b/GPW_Smart/WebUserControls/mod_timbrature.ascx.designer.cs @@ -41,6 +41,15 @@ namespace GPW.WebUserControls /// protected global::System.Web.UI.WebControls.Label lblWarning; + /// + /// Controllo divTable. + /// + /// + /// 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 divTable; + /// /// Controllo grView. /// diff --git a/HOME/Web.config b/HOME/Web.config index 4b8a626..dd903da 100644 --- a/HOME/Web.config +++ b/HOME/Web.config @@ -4,34 +4,35 @@ https://go.microsoft.com/fwlink/?LinkId=301880 --> - - -
- -
-
-
-
- - - - - - - - - - - - - - - - - - - - +
+ +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file