diff --git a/GMW/PostRX.aspx.cs b/GMW/PostRX.aspx.cs index 2e63855a..260fba6e 100644 --- a/GMW/PostRX.aspx.cs +++ b/GMW/PostRX.aspx.cs @@ -22,6 +22,34 @@ namespace GMW } } /// + /// codice Linea corrente (x scambio norm/Dtx) + /// + public string codLinea + { + get + { + return memLayer.ML.StringSessionObj("LineaRx"); + } + set + { + memLayer.ML.setSessionVal("LineaRx", value); + } + } + /// + /// codice Cella corrente (x scambio norm/Dtx) + /// + public string codCella + { + get + { + return memLayer.ML.StringSessionObj("CellaRx"); + } + set + { + memLayer.ML.setSessionVal("CellaRx", value); + } + } + /// /// caricamento pagina! /// /// @@ -31,6 +59,9 @@ namespace GMW if (!Page.IsPostBack) { calcolaPostazione(); + // resetto linea! + Postazione.currCodLinea = codLinea; + Postazione.currCodCella = codCella; // fix css... Postazione.CssClass = "stileAttesa"; // fix storico @@ -112,6 +143,8 @@ namespace GMW } protected void lbtDT_Click(object sender, EventArgs e) { + codLinea = Postazione.currCodLinea; + codCella = Postazione.currCodCella; Response.Redirect("PostRX_DT"); } @@ -285,7 +318,7 @@ namespace GMW private void calcolaPostazione() { Postazione.IP = Request.UserHostName; - Postazione.setup(); + Postazione.setupPrinter(); // mostro warning se postazione non configurata... if (Postazione.printer == "n.d.") { diff --git a/GMW/PostRX_DT.aspx b/GMW/PostRX_DT.aspx index 9c0d06df..aaefdfd7 100644 --- a/GMW/PostRX_DT.aspx +++ b/GMW/PostRX_DT.aspx @@ -20,7 +20,7 @@ - + diff --git a/GMW/PostRX_DT.aspx.cs b/GMW/PostRX_DT.aspx.cs index 21d1da7f..6b28bd13 100644 --- a/GMW/PostRX_DT.aspx.cs +++ b/GMW/PostRX_DT.aspx.cs @@ -22,6 +22,34 @@ namespace GMW } } /// + /// codice linea corrente (x scambio norm/Dtx) + /// + public string codLinea + { + get + { + return memLayer.ML.StringSessionObj("LineaRxDtx"); + } + set + { + memLayer.ML.setSessionVal("LineaRxDtx", value); + } + } + /// + /// codice Cella corrente (x scambio norm/Dtx) + /// + public string codCella + { + get + { + return memLayer.ML.StringSessionObj("CellaRxDtx"); + } + set + { + memLayer.ML.setSessionVal("CellaRxDtx", value); + } + } + /// /// caricamento pagina! /// /// @@ -31,6 +59,9 @@ namespace GMW if (!Page.IsPostBack) { calcolaPostazione(); + // resetto linea! + Postazione.currCodLinea = codLinea; + Postazione.currCodCella = codCella; // fix css... Postazione.CssClass = "stileAttesa"; // fix storico @@ -114,6 +145,8 @@ namespace GMW protected void lbtNT_Click(object sender, EventArgs e) { + codLinea = Postazione.currCodLinea; + codCella = Postazione.currCodCella; Response.Redirect("PostRX"); } protected void lbtDT_Click(object sender, EventArgs e) @@ -293,7 +326,7 @@ namespace GMW private void calcolaPostazione() { Postazione.IP = Request.UserHostName; - Postazione.setup(); + Postazione.setupPrinter(); // mostro warning se postazione non configurata... if (Postazione.printer == "n.d.") { diff --git a/GMW/WebUserControls/mod_PostRX_DT.ascx b/GMW/WebUserControls/mod_PostRX_DT.ascx index 2230d9f1..7c82e07d 100644 --- a/GMW/WebUserControls/mod_PostRX_DT.ascx +++ b/GMW/WebUserControls/mod_PostRX_DT.ascx @@ -130,7 +130,7 @@
- + <%-- --%>
diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll index 1bc13d14..1a71354d 100644 Binary files a/GMW/bin/GMW.dll and b/GMW/bin/GMW.dll differ diff --git a/GMW/bin/GMW_data.dll b/GMW/bin/GMW_data.dll index c9175a3b..4f960409 100644 Binary files a/GMW/bin/GMW_data.dll and b/GMW/bin/GMW_data.dll differ diff --git a/GMW/bin/SteamWare.dll b/GMW/bin/SteamWare.dll index e381483e..a76eed0c 100644 Binary files a/GMW/bin/SteamWare.dll and b/GMW/bin/SteamWare.dll differ diff --git a/GMW/bin/VersGen.dll b/GMW/bin/VersGen.dll index 005a1cef..67469eb7 100644 Binary files a/GMW/bin/VersGen.dll and b/GMW/bin/VersGen.dll differ diff --git a/GMW_data/Postazione.cs b/GMW_data/Postazione.cs index d143b0e0..06122340 100644 --- a/GMW_data/Postazione.cs +++ b/GMW_data/Postazione.cs @@ -155,7 +155,7 @@ namespace GMW_data /// /// effettua calcolo parametri postazioen dato IP /// - public static void setup() + public static void setupPrinter() { name = dnsUtils.DetermineCompName(IP); // cerco stampante x postazione diff --git a/GMW_data/bin/Debug/GMW_data.dll.config b/GMW_data/bin/Debug/GMW_data.dll.config index 136a4cb4..4999d20a 100644 --- a/GMW_data/bin/Debug/GMW_data.dll.config +++ b/GMW_data/bin/Debug/GMW_data.dll.config @@ -9,5 +9,8 @@ + \ No newline at end of file