diff --git a/Projects/WebGIM/GIM_data/bin/GIM_data.dll b/Projects/WebGIM/GIM_data/bin/GIM_data.dll index fb36ea7..e4c3a03 100644 Binary files a/Projects/WebGIM/GIM_data/bin/GIM_data.dll and b/Projects/WebGIM/GIM_data/bin/GIM_data.dll differ diff --git a/Projects/WebGIM/GIM_site/Style.css b/Projects/WebGIM/GIM_site/Style.css index 737e20d..5711068 100644 --- a/Projects/WebGIM/GIM_site/Style.css +++ b/Projects/WebGIM/GIM_site/Style.css @@ -396,7 +396,7 @@ .topTitle { - color: White; + color: #663300; font-family: Verdana; font-size: 26px; font-weight: bold; diff --git a/Projects/WebGIM/GIM_site/Web.config b/Projects/WebGIM/GIM_site/Web.config index 9d6e6eb..e92c2eb 100644 --- a/Projects/WebGIM/GIM_site/Web.config +++ b/Projects/WebGIM/GIM_site/Web.config @@ -102,7 +102,7 @@ - + diff --git a/Projects/WebGIM/GIM_site/WebConfigSomaschini_AppSettings.config b/Projects/WebGIM/GIM_site/WebConfigSomaschini_AppSettings.config index 3c2116f..85afe53 100644 --- a/Projects/WebGIM/GIM_site/WebConfigSomaschini_AppSettings.config +++ b/Projects/WebGIM/GIM_site/WebConfigSomaschini_AppSettings.config @@ -18,7 +18,7 @@ - + diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_assegnazioniMacchineImpianti.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_assegnazioniMacchineImpianti.ascx index 57b84ed..7334903 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_assegnazioniMacchineImpianti.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_assegnazioniMacchineImpianti.ascx @@ -6,13 +6,17 @@ + AutoPostBack="true" DataValueField="value" + OnSelectedIndexChanged="ddlImpianto_A_SelectedIndexChanged" + ondatabound="ddlImpianto_A_DataBound" /> + AutoPostBack="true" DataValueField="value" + OnSelectedIndexChanged="ddlImpianto_B_SelectedIndexChanged" + ondatabound="ddlImpianto_B_DataBound" /> @@ -29,7 +33,7 @@
-
diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_assegnazioniMacchineImpianti.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_assegnazioniMacchineImpianti.ascx.cs index 7df721e..d9cf3e8 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_assegnazioniMacchineImpianti.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_assegnazioniMacchineImpianti.ascx.cs @@ -7,9 +7,6 @@ using SteamWare; public partial class mod_assegnazioniMacchineImpianti : System.Web.UI.UserControl { - protected void Page_Load(object sender, EventArgs e) - { - } /// /// click spostamento da A a B /// @@ -90,4 +87,22 @@ public partial class mod_assegnazioniMacchineImpianti : System.Web.UI.UserContro mod_macchine2.idxImpiantoSel = Convert.ToInt32(ddlImpianto_B.SelectedValue); mod_macchine2.doUpdate(); } + + protected void ddlImpianto_A_DataBound(object sender, EventArgs e) + { + // se è primo caricamento aggiorno filtro! + if (!Page.IsPostBack) + { + update_A(); + } + } + + protected void ddlImpianto_B_DataBound(object sender, EventArgs e) + { + // se è primo caricamento aggiorno filtro! + if (!Page.IsPostBack) + { + update_B(); + } + } } diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_main_help.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_main_help.ascx index a554ea1..f5be30c 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_main_help.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_main_help.ascx @@ -1,15 +1,15 @@ <%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_main_help" Codebehind="mod_main_help.ascx.cs" %> - + +
+
-
-
diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_menuTop.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_menuTop.ascx index e143b4c..99e9edd 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_menuTop.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_menuTop.ascx @@ -11,7 +11,7 @@ OnClick="btnLogOut_Click"> - + @@ -24,8 +24,8 @@ Text="Menu" /> - - + + diff --git a/Projects/WebGIM/GIM_site/bin/GIM_data.dll b/Projects/WebGIM/GIM_site/bin/GIM_data.dll index fb36ea7..e4c3a03 100644 Binary files a/Projects/WebGIM/GIM_site/bin/GIM_data.dll and b/Projects/WebGIM/GIM_site/bin/GIM_data.dll differ diff --git a/Projects/WebGIM/GIM_site/bin/GIM_site.dll b/Projects/WebGIM/GIM_site/bin/GIM_site.dll index 1abbdd9..7c61d5f 100644 Binary files a/Projects/WebGIM/GIM_site/bin/GIM_site.dll and b/Projects/WebGIM/GIM_site/bin/GIM_site.dll differ diff --git a/Projects/WebGIM/GIM_site/obj/Debug/GIM_site.dll b/Projects/WebGIM/GIM_site/obj/Debug/GIM_site.dll index 7792a5f..1b06353 100644 Binary files a/Projects/WebGIM/GIM_site/obj/Debug/GIM_site.dll and b/Projects/WebGIM/GIM_site/obj/Debug/GIM_site.dll differ diff --git a/Projects/WebGIM/GIM_site/obj/Debug/ResolveAssemblyReference.cache b/Projects/WebGIM/GIM_site/obj/Debug/ResolveAssemblyReference.cache index 5da8fda..39cbbb8 100644 Binary files a/Projects/WebGIM/GIM_site/obj/Debug/ResolveAssemblyReference.cache and b/Projects/WebGIM/GIM_site/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/Projects/WebGIM/WebGIM/Release/WebGIM.msi b/Projects/WebGIM/WebGIM/Release/WebGIM.msi index a1efa47..e67745e 100644 Binary files a/Projects/WebGIM/WebGIM/Release/WebGIM.msi and b/Projects/WebGIM/WebGIM/Release/WebGIM.msi differ diff --git a/Projects/WebGIM/WebGIM/WebGIM.vdproj b/Projects/WebGIM/WebGIM/WebGIM.vdproj index 5e18284..5e16ab7 100644 --- a/Projects/WebGIM/WebGIM/WebGIM.vdproj +++ b/Projects/WebGIM/WebGIM/WebGIM.vdproj @@ -351,14 +351,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:WebGIM" - "ProductCode" = "8:{78F4CF95-981F-443B-BEA1-4BE0CAA41FAB}" - "PackageCode" = "8:{48E26F4C-6216-4795-8E3D-855EE28931C4}" + "ProductCode" = "8:{BBD618C8-B3A4-4D19-B95C-EF0E5919334F}" + "PackageCode" = "8:{9F7440E5-441B-46A7-8018-245A03AAE09E}" "UpgradeCode" = "8:{7739196B-46A3-4BC7-AC29-DB8493976F04}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.1.160" + "ProductVersion" = "8:1.1.165" "Manufacturer" = "8:SteamWare s.r.l." "ARPHELPTELEPHONE" = "8:035-460560" "ARPHELPLINK" = "8:http://www.steamware.net"