diff --git a/.vs/MAPO.sqlite b/.vs/MAPO.sqlite index bbbce5ff..1f806ca8 100644 Binary files a/.vs/MAPO.sqlite and b/.vs/MAPO.sqlite differ diff --git a/.vs/MAPO/v15/.suo b/.vs/MAPO/v15/.suo index 70a943a1..c6dfacf0 100644 Binary files a/.vs/MAPO/v15/.suo and b/.vs/MAPO/v15/.suo differ diff --git a/MP-Site/Web.config b/MP-Site/Web.config index 7d30c991..286f1ac8 100644 --- a/MP-Site/Web.config +++ b/MP-Site/Web.config @@ -69,6 +69,9 @@ + + + - - - + @@ -94,9 +90,6 @@ - - - + - + + @@ -158,11 +153,12 @@ - + - + + @@ -173,13 +169,14 @@ - + - + + @@ -192,11 +189,12 @@ - --> + --> - \ No newline at end of file + + \ No newline at end of file diff --git a/MP-Tablet/MP-Tablet.csproj b/MP-Tablet/MP-Tablet.csproj index ca17ee3d..14e3bfae 100644 --- a/MP-Tablet/MP-Tablet.csproj +++ b/MP-Tablet/MP-Tablet.csproj @@ -673,7 +673,7 @@ - + {2872dcfe-8b46-43b2-baa0-842a816a2dd5} SteamWare diff --git a/MP-Tablet/Web.config b/MP-Tablet/Web.config index 5d5e2767..18b60f1e 100644 --- a/MP-Tablet/Web.config +++ b/MP-Tablet/Web.config @@ -88,17 +88,26 @@ - - - + + + + + + + + - - + + + + + diff --git a/MP-Tablet/WebUserControls/mod_dettTurni.ascx b/MP-Tablet/WebUserControls/mod_dettTurni.ascx index 21bd68e4..b794dd39 100644 --- a/MP-Tablet/WebUserControls/mod_dettTurni.ascx +++ b/MP-Tablet/WebUserControls/mod_dettTurni.ascx @@ -1,8 +1,8 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_dettTurni.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_dettTurni" %> -
-
+
+
Turni Attivi - + @@ -33,11 +33,11 @@
-
-
+
+
Turno Aperto
-
+
Turno Chiuso
diff --git a/MP-Tablet/WebUserControls/mod_dettTurni.ascx.cs b/MP-Tablet/WebUserControls/mod_dettTurni.ascx.cs index c71a2b29..54ff729d 100644 --- a/MP-Tablet/WebUserControls/mod_dettTurni.ascx.cs +++ b/MP-Tablet/WebUserControls/mod_dettTurni.ascx.cs @@ -1,11 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; -using MapoDb; -using SteamWare; namespace MoonProTablet.WebUserControls { @@ -28,7 +21,7 @@ namespace MoonProTablet.WebUserControls /// public string coloreDaTurno(object turno) { - string answ = "semaforoSpento"; + string answ = "sGr"; bool aperto = false; try { @@ -36,7 +29,7 @@ namespace MoonProTablet.WebUserControls } catch { } - if (aperto) answ = "semaforoVerde"; + if (aperto) answ = "sVe"; return answ; } } diff --git a/MP-Tablet/WebUserControls/mod_dettTurni.ascx.designer.cs b/MP-Tablet/WebUserControls/mod_dettTurni.ascx.designer.cs index 97f2753e..0e18187b 100644 --- a/MP-Tablet/WebUserControls/mod_dettTurni.ascx.designer.cs +++ b/MP-Tablet/WebUserControls/mod_dettTurni.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,20 +13,20 @@ namespace MoonProTablet.WebUserControls { public partial class mod_dettTurni { /// - /// dtView control. + /// Controllo dtView. /// /// - /// 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.DetailsView dtView; /// - /// odsTurni control. + /// Controllo odsTurni. /// /// - /// 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 odsTurni; } diff --git a/MP-Tablet/utility.cs b/MP-Tablet/utility.cs index 17bcbf94..5bef003c 100644 --- a/MP-Tablet/utility.cs +++ b/MP-Tablet/utility.cs @@ -1,8 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using SteamWare; +using SteamWare; +using System; namespace MoonProTablet { @@ -54,8 +51,6 @@ namespace MoonProTablet string answ = ""; DateTime tempo = new DateTime(); double minuti = 0; - decimal ore = 0; - decimal gg = 0; try { minuti = Convert.ToDouble(min); @@ -63,30 +58,13 @@ namespace MoonProTablet } catch { } -#if false - if (minuti < memLayer.ML.confReadInt("maxMinuti")) - { - answ = string.Format("{0:0.##} min", minuti); - } - else if (minuti < memLayer.ML.confReadInt("maxOre")) - { - ore = Math.Floor(minuti / 60); - answ = string.Format("{0} h {1:0} min", ore, minuti - 60 * ore); - } - else - { - gg = Math.Floor(minuti / (24 * 60)); - ore = (minuti - (24 * 60 * gg)) / 60; - answ = string.Format("{0} gg {1:0.##} h", gg, ore); - } -#endif if (minuti < memLayer.ML.confReadInt("maxMinuti")) { answ = string.Format("{0}m {1}s", tempo.Minute, tempo.Second); } else if (minuti < memLayer.ML.confReadInt("maxOre")) { - answ = string.Format("{0}h {1}m",tempo.Hour, tempo.Minute); + answ = string.Format("{0}h {1}m", tempo.Hour, tempo.Minute); } else {