From 4b8c4fc8d8eda74875c6b7b30e8398900a9bbd36 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 13 Mar 2018 12:00:31 +0100 Subject: [PATCH] refresh pagine controlli, turni, mappa stato, dettaglio --- .vs/config/applicationhost.config | 30 ++++++++++++++++----- MP-Admin/MP-Admin.csproj.user | 27 ++----------------- MP-IO/MP-IO.csproj | 2 +- MP-IO/MP-IO.csproj.user | 8 +++--- MP-MON/MP-MON.csproj.user | 27 ++----------------- MP-Site/MP-Site.csproj.user | 27 ++----------------- MP-Tablet/Controlli.aspx | 8 +++--- MP-Tablet/DettaglioMacchina.aspx | 9 ++++--- MP-Tablet/MP-Tablet.csproj.user | 27 ++----------------- MP-Tablet/MappaStato.aspx | 2 +- MP-Tablet/Turni.aspx | 18 ++++++++++--- MP-Tablet/Turni.aspx.cs | 10 +++++++ MP-Tablet/Turni.aspx.designer.cs | 18 +++++++++++++ MP-Tablet/WebMasterPages/Bootstrap.Master | 2 +- MP-Tablet/WebUserControls/mod_turni.ascx.cs | 9 +++++++ MP/MP.csproj.user | 27 ++----------------- 16 files changed, 102 insertions(+), 149 deletions(-) diff --git a/.vs/config/applicationhost.config b/.vs/config/applicationhost.config index e6d526bc..4c1a361d 100644 --- a/.vs/config/applicationhost.config +++ b/.vs/config/applicationhost.config @@ -162,7 +162,7 @@ - + @@ -170,7 +170,7 @@ - + @@ -178,7 +178,7 @@ - + @@ -186,7 +186,7 @@ - + @@ -194,7 +194,7 @@ - + @@ -202,7 +202,7 @@ - + @@ -218,12 +218,28 @@ - + + + + + + + + + + + + + + + + + diff --git a/MP-Admin/MP-Admin.csproj.user b/MP-Admin/MP-Admin.csproj.user index 8ac28a54..827cc98d 100644 --- a/MP-Admin/MP-Admin.csproj.user +++ b/MP-Admin/MP-Admin.csproj.user @@ -10,30 +10,7 @@ + Debug|Any CPU - - - - - - - CurrentPage - True - False - False - False - - - - - - - - - False - True - - - - + \ No newline at end of file diff --git a/MP-IO/MP-IO.csproj b/MP-IO/MP-IO.csproj index f7364efe..86aadf1a 100644 --- a/MP-IO/MP-IO.csproj +++ b/MP-IO/MP-IO.csproj @@ -337,7 +337,7 @@ True 0 / - http://localhost:64103/ + http://localhost:20967/ False False diff --git a/MP-IO/MP-IO.csproj.user b/MP-IO/MP-IO.csproj.user index 133078b6..970efc09 100644 --- a/MP-IO/MP-IO.csproj.user +++ b/MP-IO/MP-IO.csproj.user @@ -10,13 +10,15 @@ + Debug|Any CPU - default.aspx - SpecificPage + + + CurrentPage True False False @@ -29,7 +31,7 @@ - False + True True diff --git a/MP-MON/MP-MON.csproj.user b/MP-MON/MP-MON.csproj.user index cc64793d..3fd4c7cd 100644 --- a/MP-MON/MP-MON.csproj.user +++ b/MP-MON/MP-MON.csproj.user @@ -19,30 +19,7 @@ + Debug|Any CPU - - - - - - - CurrentPage - True - False - False - False - - - - - - - - - True - True - - - - + \ No newline at end of file diff --git a/MP-Site/MP-Site.csproj.user b/MP-Site/MP-Site.csproj.user index 43e0e3b8..a05c9cdc 100644 --- a/MP-Site/MP-Site.csproj.user +++ b/MP-Site/MP-Site.csproj.user @@ -10,30 +10,7 @@ + Debug|Any CPU - - - - - - - CurrentPage - True - False - False - False - - - - - - - - - True - True - - - - + \ No newline at end of file diff --git a/MP-Tablet/Controlli.aspx b/MP-Tablet/Controlli.aspx index d52df536..169ca719 100644 --- a/MP-Tablet/Controlli.aspx +++ b/MP-Tablet/Controlli.aspx @@ -12,12 +12,12 @@
-
+
+ +
-
- - +
diff --git a/MP-Tablet/DettaglioMacchina.aspx b/MP-Tablet/DettaglioMacchina.aspx index 138cbfa9..ac71e1ff 100644 --- a/MP-Tablet/DettaglioMacchina.aspx +++ b/MP-Tablet/DettaglioMacchina.aspx @@ -13,7 +13,7 @@
-
+
@@ -30,10 +30,11 @@
-
-
+ - + +
+
<%----%> diff --git a/MP-Tablet/MP-Tablet.csproj.user b/MP-Tablet/MP-Tablet.csproj.user index 2536db6d..6ee978d6 100644 --- a/MP-Tablet/MP-Tablet.csproj.user +++ b/MP-Tablet/MP-Tablet.csproj.user @@ -10,30 +10,7 @@ + Debug|Any CPU - - - - - - - CurrentPage - True - False - False - False - - - - - - - - - True - True - - - - + \ No newline at end of file diff --git a/MP-Tablet/MappaStato.aspx b/MP-Tablet/MappaStato.aspx index 6eeee6ea..1ca7cb1a 100644 --- a/MP-Tablet/MappaStato.aspx +++ b/MP-Tablet/MappaStato.aspx @@ -3,7 +3,7 @@ <%@ Register Src="~/WebUserControls/mod_mappaStato.ascx" TagName="mod_mappaStato" TagPrefix="uc1" %> -
+
diff --git a/MP-Tablet/Turni.aspx b/MP-Tablet/Turni.aspx index ed381caf..9053a4b9 100644 --- a/MP-Tablet/Turni.aspx +++ b/MP-Tablet/Turni.aspx @@ -3,15 +3,27 @@ <%@ Register Src="WebUserControls/mod_dettMacchina.ascx" TagName="mod_dettMacchina" TagPrefix="uc1" %> <%@ Register Src="WebUserControls/mod_turni.ascx" TagName="mod_turni" TagPrefix="uc2" %> +<%@ Register Src="~/WebUserControls/mod_directLinks.ascx" TagPrefix="uc1" TagName="mod_directLinks" %> +<%@ Register Src="~/WebUserControls/mod_dettTurni.ascx" TagPrefix="uc1" TagName="mod_dettTurni" %> + +
-
+
+
+
+ +
+
+ +
+
-
- +
+
diff --git a/MP-Tablet/Turni.aspx.cs b/MP-Tablet/Turni.aspx.cs index 3b55e51b..7263132d 100644 --- a/MP-Tablet/Turni.aspx.cs +++ b/MP-Tablet/Turni.aspx.cs @@ -12,6 +12,16 @@ namespace MoonProTablet { Session["TipoLink"] = "EditMacch"; } + mod_turni1.eh_updated += Mod_turni1_eh_updated; + } + /// + /// Aggiorno visualizzzazione x update + /// + /// + /// + private void Mod_turni1_eh_updated(object sender, EventArgs e) + { + mod_dettTurni.DataBind(); } } } \ No newline at end of file diff --git a/MP-Tablet/Turni.aspx.designer.cs b/MP-Tablet/Turni.aspx.designer.cs index 9bd2fb37..f1aef340 100644 --- a/MP-Tablet/Turni.aspx.designer.cs +++ b/MP-Tablet/Turni.aspx.designer.cs @@ -29,5 +29,23 @@ namespace MoonProTablet { /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::MoonProTablet.WebUserControls.mod_turni mod_turni1; + + /// + /// Controllo mod_dettTurni. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::MoonProTablet.WebUserControls.mod_dettTurni mod_dettTurni; + + /// + /// Controllo mod_directLinks. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::MoonProTablet.WebUserControls.mod_directLinks mod_directLinks; } } diff --git a/MP-Tablet/WebMasterPages/Bootstrap.Master b/MP-Tablet/WebMasterPages/Bootstrap.Master index 0afa1b59..159fdc6d 100644 --- a/MP-Tablet/WebMasterPages/Bootstrap.Master +++ b/MP-Tablet/WebMasterPages/Bootstrap.Master @@ -57,7 +57,7 @@
-
+

hello world!

diff --git a/MP-Tablet/WebUserControls/mod_turni.ascx.cs b/MP-Tablet/WebUserControls/mod_turni.ascx.cs index dd040fe8..f4762e7a 100644 --- a/MP-Tablet/WebUserControls/mod_turni.ascx.cs +++ b/MP-Tablet/WebUserControls/mod_turni.ascx.cs @@ -6,6 +6,10 @@ namespace MoonProTablet.WebUserControls { public partial class mod_turni : System.Web.UI.UserControl { + /// + /// registrato nuovo valore + /// + public event EventHandler eh_updated; /// /// idx macchina selezionata /// @@ -54,6 +58,11 @@ namespace MoonProTablet.WebUserControls { DataLayer.obj.taTurniMacc.stp_turniMacchineUpdateTurno(idxMacchina.ToString(), turno); setupTurni(); + // sollevo evento! + if (eh_updated != null) + { + eh_updated(this, new EventArgs()); + } } protected void chkT1_CheckedChanged(object sender, EventArgs e) diff --git a/MP/MP.csproj.user b/MP/MP.csproj.user index 5c7d4aac..2695a840 100644 --- a/MP/MP.csproj.user +++ b/MP/MP.csproj.user @@ -10,30 +10,7 @@ + Debug|Any CPU - - - - - - - CurrentPage - True - False - False - False - - - - - - - - - True - True - - - - + \ No newline at end of file