Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

eliminazione funzione conversione css da resoconti (cssDaCodColore)

Browse Source
This commit is contained in:
Samuele E. Locatelli
2017-04-14 11:00:41 +02:00
parent 8b13dde5bd
commit df004355cc
15 changed files with 76 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-Tablet/WebUserControls/mod_dettMacchina.ascx
+2 -2
View File
@@ -12,7 +12,7 @@
<h2>
<asp:Label runat="server" ID="lblTitle" Text='<%# Eval("Nome") %>' /></h2>
<p>
<span class='<%# cssDaSemaforo(Eval("Semaforo")) %>' style="width: 100%; display: block; padding-right: 0px;"><span style="float: left;">
<span class='<%# Eval("Semaforo") %>' style="width: 100%; display: block; padding-right: 0px;"><span style="float: left;">
<b>
<asp:Label runat="server" ID="lblStato" Text='<%# Eval("DescrizioneStato") %>' /></b></span> <span style="float: right; padding-right: 8px;">
<asp:Label runat="server" ID="lblDurata" Text='<%# formatDurata(Eval("Durata")) %>' /></span>
@@ -38,7 +38,7 @@
<asp:Panel runat="server" ID="pnlLessDet" Visible="false">
<asp:Repeater ID="repTestata" runat="server" DataSourceID="ods">
<ItemTemplate>
<div class='<%# cssDaSemaforo(Eval("Semaforo")) %>' style="padding: 2px 0px; text-align: center; margin: auto; font-size: 20pt;">
<div class='<%# Eval("Semaforo") %>' style="padding: 2px 0px; text-align: center; margin: auto; font-size: 20pt;">
<asp:Label runat="server" ID="lblTitle" Text='<%# Eval("Nome") %>' />
</div>
</ItemTemplate>
MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs
+2 -16
View File
@@ -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);
}
/// <summary>
/// restituisce cod CSS dato cod semaforo
/// </summary>
/// <param name="idx"></param>
/// <returns></returns>
public string cssDaSemaforo(object semaforo)
{
return resoconti.mngr.cssDaCodColore(semaforo.ToString());
}
/// <summary>
/// fomratta durata in minuti/ore/gg a seconda del totale...
/// </summary>
/// <param name="minuti"></param>
MP-Tablet/WebUserControls/mod_dettMacchina.ascx.designer.cs
Generated
+26 -26
View File
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// <generato automaticamente>
// Codice generato da uno strumento.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace MoonProTablet.WebUserControls {
@@ -13,65 +13,65 @@ namespace MoonProTablet.WebUserControls {
public partial class mod_dettMacchina {
/// <summary>
/// UpdatePanel1 control.
/// Controllo UpdatePanel1.
/// </summary>
/// <remarks>
/// 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.
/// </remarks>
protected global::System.Web.UI.UpdatePanel UpdatePanel1;
/// <summary>
/// pnlFullDet control.
/// Controllo pnlFullDet.
/// </summary>
/// <remarks>
/// 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.
/// </remarks>
protected global::System.Web.UI.WebControls.Panel pnlFullDet;
/// <summary>
/// repLI control.
/// Controllo repLI.
/// </summary>
/// <remarks>
/// 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.
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater repLI;
/// <summary>
/// pnlLessDet control.
/// Controllo pnlLessDet.
/// </summary>
/// <remarks>
/// 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.
/// </remarks>
protected global::System.Web.UI.WebControls.Panel pnlLessDet;
/// <summary>
/// repTestata control.
/// Controllo repTestata.
/// </summary>
/// <remarks>
/// 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.
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater repTestata;
/// <summary>
/// ods control.
/// Controllo ods.
/// </summary>
/// <remarks>
/// 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.
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource ods;
/// <summary>
/// Timer1 control.
/// Controllo Timer1.
/// </summary>
/// <remarks>
/// 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.
/// </remarks>
protected global::System.Web.UI.Timer Timer1;
}
MP-Tablet/WebUserControls/mod_fermate.ascx
+1 -1
View File
@@ -30,7 +30,7 @@
<%--<div class="divSx">--%>
<asp:LinkButton runat="server" ID="btnEdit" CommandArgument='<%# Eval("InizioStato") %>' OnClick="btnEdit_Click">
<%--</div>--%>
<div style="font-size: small;" class='<%# cssDaSemaforo(Eval("Semaforo")) %>'>
<div style="font-size: small;" class='<%# Eval("Semaforo") %>'>
<div style="padding-top: 6px;">
<div class="divSx" style="font-size: small;">
<asp:Label ID="Label3" runat="server" Text='<%# Eval("Stato", "<b>{0}</b>") %>' />
MP-Tablet/WebUserControls/mod_fermate.ascx.cs
+2 -15
View File
@@ -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);
}
/// <summary>
/// restituisce cod CSS dato cod semaforo
/// </summary>
/// <param name="idx"></param>
/// <returns></returns>
public string cssDaSemaforo(object semaforo)
{
return resoconti.mngr.cssDaCodColore(semaforo.ToString());
}
protected int prevDays
{
MP-Tablet/WebUserControls/mod_fermate.ascx.designer.cs
Generated
+23 -23
View File
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// <generato automaticamente>
// Codice generato da uno strumento.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace MoonProTablet.WebUserControls {
@@ -13,56 +13,56 @@ namespace MoonProTablet.WebUserControls {
public partial class mod_fermate {
/// <summary>
/// lblNumGG control.
/// Controllo lblNumGG.
/// </summary>
/// <remarks>
/// 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.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblNumGG;
/// <summary>
/// ddlPrevDays control.
/// Controllo ddlPrevDays.
/// </summary>
/// <remarks>
/// 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.
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList ddlPrevDays;
/// <summary>
/// lblDurataMin control.
/// Controllo lblDurataMin.
/// </summary>
/// <remarks>
/// 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.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblDurataMin;
/// <summary>
/// ddlDurataMin control.
/// Controllo ddlDurataMin.
/// </summary>
/// <remarks>
/// 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.
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList ddlDurataMin;
/// <summary>
/// repComm control.
/// Controllo repComm.
/// </summary>
/// <remarks>
/// 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.
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater repComm;
/// <summary>
/// odsFerm control.
/// Controllo odsFerm.
/// </summary>
/// <remarks>
/// 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.
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource odsFerm;
}
MP-Tablet/WebUserControls/mod_mappaStato.ascx
+1 -1
View File
@@ -11,7 +11,7 @@
<h2>
<asp:Label runat="server" ID="lblTitle" Text='<%# Eval("Nome") %>' /></h2>
<p>
<span class='<%# cssDaSemaforo(Eval("Semaforo")) %>' style="width: 100%; display: block; padding-right: 0px;"><span style="float: left;">
<span class='<%# Eval("Semaforo") %>' style="width: 100%; display: block; padding-right: 0px;"><span style="float: left;">
<b>
<asp:Label runat="server" ID="lblStato" Text='<%# Eval("DescrizioneStato") %>' /></b></span> <span style="float: right; padding-right: 8px;">
<asp:Label runat="server" ID="lblDurata" Text='<%# formatDurata(Eval("Durata")) %>' /></span>
MP-Tablet/WebUserControls/mod_mappaStato.ascx.cs
+2 -14
View File
@@ -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);
}
/// <summary>
/// restituisce cod CSS dato cod semaforo
/// </summary>
/// <param name="idx"></param>
/// <returns></returns>
public string cssDaSemaforo(object semaforo)
{
return resoconti.mngr.cssDaCodColore(semaforo.ToString());
}
/// <summary>
/// fomratta durata in minuti/ore/gg a seconda del totale...
/// </summary>
/// <param name="minuti"></param>
MP-Tablet/WebUserControls/mod_mappaStato.ascx.designer.cs
Generated
+17 -17
View File
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// <generato automaticamente>
// Codice generato da uno strumento.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace MoonProTablet.WebUserControls {
@@ -13,38 +13,38 @@ namespace MoonProTablet.WebUserControls {
public partial class mod_mappaStato {
/// <summary>
/// UpdatePanel1 control.
/// Controllo UpdatePanel1.
/// </summary>
/// <remarks>
/// 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.
/// </remarks>
protected global::System.Web.UI.UpdatePanel UpdatePanel1;
/// <summary>
/// repLI control.
/// Controllo repLI.
/// </summary>
/// <remarks>
/// 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.
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater repLI;
/// <summary>
/// ods control.
/// Controllo ods.
/// </summary>
/// <remarks>
/// 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.
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource ods;
/// <summary>
/// Timer1 control.
/// Controllo Timer1.
/// </summary>
/// <remarks>
/// 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.
/// </remarks>
protected global::System.Web.UI.Timer Timer1;
}