diff --git a/.vs/MAPO/v15/.suo b/.vs/MAPO/v15/.suo
index c6dfacf0..495406c9 100644
Binary files a/.vs/MAPO/v15/.suo and b/.vs/MAPO/v15/.suo differ
diff --git a/MP-Site/MappaStatoSeq.aspx.cs b/MP-Site/MappaStatoSeq.aspx.cs
index 0e54ffde..3e441cb0 100644
--- a/MP-Site/MappaStatoSeq.aspx.cs
+++ b/MP-Site/MappaStatoSeq.aspx.cs
@@ -102,10 +102,6 @@ namespace MoonPro
{
string answ = "...";
string codColore = resoconti.mngr.semaforoDaIdxStato(resoconti.mngr.statoMacchina(idxMacchina));
-#if false
- answ = resoconti.mngr.cssDaCodColore(codColore);
-
-#endif
answ = codColore;
return answ;
}
diff --git a/MP-Site/WebUserControls/mod_immagineStato.ascx.cs b/MP-Site/WebUserControls/mod_immagineStato.ascx.cs
index 9afe6e14..cf0b1c4a 100644
--- a/MP-Site/WebUserControls/mod_immagineStato.ascx.cs
+++ b/MP-Site/WebUserControls/mod_immagineStato.ascx.cs
@@ -83,10 +83,6 @@ namespace MoonPro.WebUserControls
{
// in base allo stato recupero il colore...
string codColore = _resoconti.semaforoDaIdxStato(_resoconti.statoMacchina(idxMacchina));
-#if false
- string cssClass = _resoconti.cssDaCodColore(codColore);
- pnlImg.CssClass = cssClass;
-#endif
pnlImg.CssClass = codColore;
}
}
diff --git a/MP-Site/WebUserControls/mod_semaforo.ascx.cs b/MP-Site/WebUserControls/mod_semaforo.ascx.cs
index 032e661a..59d8250b 100644
--- a/MP-Site/WebUserControls/mod_semaforo.ascx.cs
+++ b/MP-Site/WebUserControls/mod_semaforo.ascx.cs
@@ -96,25 +96,6 @@ namespace MoonPro.WebUserControls
int stato = ((DS_applicazione.StatoMacchineRow)tabStatoMacchine.Select(filtro)[0]).IdxStato;
// in base allo stato recupero il colore...
string codColore = ((DS_applicazione.AnagraficaStatiRow)tabAnagStati.FindByIdxStato(stato)).Semaforo;
-#if false
- string cssClass = "";
- switch (codColore)
- {
- case "V":
- cssClass = "semaforoVerde";
- break;
- case "G":
- cssClass = "semaforoGiallo";
- break;
- case "R":
- cssClass = "semaforoRosso";
- break;
- case "S":
- cssClass = "semaforoSpento";
- break;
- }
- pnlMacchina.CssClass = cssClass;
-#endif
pnlMacchina.CssClass = codColore;
}
}
diff --git a/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs b/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs
index 4359ae1e..d1af0ace 100644
--- a/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs
+++ b/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs
@@ -186,10 +186,6 @@ namespace MoonPro.WebUserControls
{
// in base allo stato recupero il colore...
string codColore = resoconti.mngr.semaforoDaIdxStato(resoconti.mngr.statoMacchina(_IdxMacchina));
-#if false
- string cssClass = resoconti.mngr.cssDaCodColore(codColore);
- pnlMacchina.CssClass = cssClass;
-#endif
pnlMacchina.CssClass = codColore;
}
catch
diff --git a/MP-Tablet/WebUserControls/mod_dettMacchina.ascx b/MP-Tablet/WebUserControls/mod_dettMacchina.ascx
index 251d0a8e..66cd8fa3 100644
--- a/MP-Tablet/WebUserControls/mod_dettMacchina.ascx
+++ b/MP-Tablet/WebUserControls/mod_dettMacchina.ascx
@@ -12,7 +12,7 @@
-
+
@@ -38,7 +38,7 @@
-
+
diff --git a/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs b/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs
index 474e3d2e..c36f67af 100644
--- a/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs
+++ b/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs
@@ -1,11 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
+using SteamWare;
+using System;
using System.Web.UI;
-using System.Web.UI.WebControls;
-using SteamWare;
-using MapoDb;
namespace MoonProTablet.WebUserControls
{
@@ -49,15 +44,6 @@ namespace MoonProTablet.WebUserControls
return string.Format("./images/macchine/{0}", url);
}
///
- /// restituisce cod CSS dato cod semaforo
- ///
- ///
- ///
- public string cssDaSemaforo(object semaforo)
- {
- return resoconti.mngr.cssDaCodColore(semaforo.ToString());
- }
- ///
/// fomratta durata in minuti/ore/gg a seconda del totale...
///
///
diff --git a/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.designer.cs b/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.designer.cs
index 3b24645e..cfb2c455 100644
--- a/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.designer.cs
+++ b/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.designer.cs
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
+//
+// Codice generato da uno strumento.
//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
+// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
+// il codice viene rigenerato.
+//
//------------------------------------------------------------------------------
namespace MoonProTablet.WebUserControls {
@@ -13,65 +13,65 @@ namespace MoonProTablet.WebUserControls {
public partial class mod_dettMacchina {
///
- /// UpdatePanel1 control.
+ /// Controllo UpdatePanel1.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.UpdatePanel UpdatePanel1;
///
- /// pnlFullDet control.
+ /// Controllo pnlFullDet.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// 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.Panel pnlFullDet;
///
- /// repLI control.
+ /// Controllo repLI.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// 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.Repeater repLI;
///
- /// pnlLessDet control.
+ /// Controllo pnlLessDet.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// 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.Panel pnlLessDet;
///
- /// repTestata control.
+ /// Controllo repTestata.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// 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.Repeater repTestata;
///
- /// ods control.
+ /// Controllo ods.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// 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.ObjectDataSource ods;
///
- /// Timer1 control.
+ /// Controllo Timer1.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.Timer Timer1;
}
diff --git a/MP-Tablet/WebUserControls/mod_fermate.ascx b/MP-Tablet/WebUserControls/mod_fermate.ascx
index 2c32f817..f63f148d 100644
--- a/MP-Tablet/WebUserControls/mod_fermate.ascx
+++ b/MP-Tablet/WebUserControls/mod_fermate.ascx
@@ -30,7 +30,7 @@
<%--
--%>
-
+
diff --git a/MP-Tablet/WebUserControls/mod_fermate.ascx.cs b/MP-Tablet/WebUserControls/mod_fermate.ascx.cs
index f8cc7ad9..bbd74ac9 100644
--- a/MP-Tablet/WebUserControls/mod_fermate.ascx.cs
+++ b/MP-Tablet/WebUserControls/mod_fermate.ascx.cs
@@ -1,11 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
+using SteamWare;
+using System;
using System.Web.UI;
using System.Web.UI.WebControls;
-using MapoDb;
-using SteamWare;
namespace MoonProTablet.WebUserControls
{
@@ -62,15 +58,6 @@ namespace MoonProTablet.WebUserControls
{
return utility.formatDurata(durataMinuti);
}
- ///
- /// restituisce cod CSS dato cod semaforo
- ///
- ///
- ///
- public string cssDaSemaforo(object semaforo)
- {
- return resoconti.mngr.cssDaCodColore(semaforo.ToString());
- }
protected int prevDays
{
diff --git a/MP-Tablet/WebUserControls/mod_fermate.ascx.designer.cs b/MP-Tablet/WebUserControls/mod_fermate.ascx.designer.cs
index 03d3e27e..4532383c 100644
--- a/MP-Tablet/WebUserControls/mod_fermate.ascx.designer.cs
+++ b/MP-Tablet/WebUserControls/mod_fermate.ascx.designer.cs
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
+//
+// Codice generato da uno strumento.
//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
+// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
+// il codice viene rigenerato.
+//
//------------------------------------------------------------------------------
namespace MoonProTablet.WebUserControls {
@@ -13,56 +13,56 @@ namespace MoonProTablet.WebUserControls {
public partial class mod_fermate {
///
- /// lblNumGG control.
+ /// Controllo lblNumGG.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// 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.Label lblNumGG;
///
- /// ddlPrevDays control.
+ /// Controllo ddlPrevDays.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// 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 ddlPrevDays;
///
- /// lblDurataMin control.
+ /// Controllo lblDurataMin.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// 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.Label lblDurataMin;
///
- /// ddlDurataMin control.
+ /// Controllo ddlDurataMin.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// 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 ddlDurataMin;
///
- /// repComm control.
+ /// Controllo repComm.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// 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.Repeater repComm;
///
- /// odsFerm control.
+ /// Controllo odsFerm.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// 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.ObjectDataSource odsFerm;
}
diff --git a/MP-Tablet/WebUserControls/mod_mappaStato.ascx b/MP-Tablet/WebUserControls/mod_mappaStato.ascx
index 14e3a9c5..44f63790 100644
--- a/MP-Tablet/WebUserControls/mod_mappaStato.ascx
+++ b/MP-Tablet/WebUserControls/mod_mappaStato.ascx
@@ -11,7 +11,7 @@
-
+
diff --git a/MP-Tablet/WebUserControls/mod_mappaStato.ascx.cs b/MP-Tablet/WebUserControls/mod_mappaStato.ascx.cs
index ef266774..09782842 100644
--- a/MP-Tablet/WebUserControls/mod_mappaStato.ascx.cs
+++ b/MP-Tablet/WebUserControls/mod_mappaStato.ascx.cs
@@ -1,10 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
+using SteamWare;
+using System;
using System.Web.UI;
using System.Web.UI.WebControls;
-using SteamWare;
namespace MoonProTablet.WebUserControls
{
@@ -24,15 +21,6 @@ namespace MoonProTablet.WebUserControls
return string.Format("./images/macchine/{0}", url);
}
///
- /// restituisce cod CSS dato cod semaforo
- ///
- ///
- ///
- public string cssDaSemaforo(object semaforo)
- {
- return resoconti.mngr.cssDaCodColore(semaforo.ToString());
- }
- ///
/// fomratta durata in minuti/ore/gg a seconda del totale...
///
///
diff --git a/MP-Tablet/WebUserControls/mod_mappaStato.ascx.designer.cs b/MP-Tablet/WebUserControls/mod_mappaStato.ascx.designer.cs
index 290b6254..82de845c 100644
--- a/MP-Tablet/WebUserControls/mod_mappaStato.ascx.designer.cs
+++ b/MP-Tablet/WebUserControls/mod_mappaStato.ascx.designer.cs
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
+//
+// Codice generato da uno strumento.
//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
+// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
+// il codice viene rigenerato.
+//
//------------------------------------------------------------------------------
namespace MoonProTablet.WebUserControls {
@@ -13,38 +13,38 @@ namespace MoonProTablet.WebUserControls {
public partial class mod_mappaStato {
///
- /// UpdatePanel1 control.
+ /// Controllo UpdatePanel1.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.UpdatePanel UpdatePanel1;
///
- /// repLI control.
+ /// Controllo repLI.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// 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.Repeater repLI;
///
- /// ods control.
+ /// Controllo ods.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// 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.ObjectDataSource ods;
///
- /// Timer1 control.
+ /// Controllo Timer1.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.Timer Timer1;
}
diff --git a/MapoDb/resoconti.cs b/MapoDb/resoconti.cs
index 92b5b2d8..3f1dfa86 100644
--- a/MapoDb/resoconti.cs
+++ b/MapoDb/resoconti.cs
@@ -382,37 +382,6 @@ public class resoconti
return Stati.FindByIdxStato(idx).Semaforo;
}
///
- /// restituisce cod CSS dato IdxStato
- ///
- ///
- ///
- public string cssDaCodColore(string codColore)
- {
-#if false
- string cssClass = "";
- switch (codColore)
- {
- case "V":
- cssClass = "semaforoVerde";
- break;
- case "G":
- cssClass = "semaforoGiallo";
- break;
- case "R":
- cssClass = "semaforoRosso";
- break;
- case "S":
- cssClass = "semaforoSpento";
- break;
- default:
- cssClass = "semaforoSpento";
- break;
- }
- return cssClass;
-#endif
- return codColore;
- }
- ///
/// fornisce una torta stati
///
///