diff --git a/.vs/config/applicationhost.config b/.vs/config/applicationhost.config index 3a7d55e..8906b2d 100644 --- a/.vs/config/applicationhost.config +++ b/.vs/config/applicationhost.config @@ -162,7 +162,7 @@ - + @@ -170,7 +170,7 @@ - + diff --git a/GIM_data/bin/GIM_data.dll b/GIM_data/bin/GIM_data.dll index 3aef1cc..e96c4b6 100644 Binary files a/GIM_data/bin/GIM_data.dll and b/GIM_data/bin/GIM_data.dll differ diff --git a/GIM_data/bin/SteamWare.dll b/GIM_data/bin/SteamWare.dll index 0504428..e21275b 100644 Binary files a/GIM_data/bin/SteamWare.dll and b/GIM_data/bin/SteamWare.dll differ diff --git a/GIM_data/obj/Debug/GIM_data.csprojResolveAssemblyReference.cache b/GIM_data/obj/Debug/GIM_data.csprojResolveAssemblyReference.cache index 9128e8e..ea9e57a 100644 Binary files a/GIM_data/obj/Debug/GIM_data.csprojResolveAssemblyReference.cache and b/GIM_data/obj/Debug/GIM_data.csprojResolveAssemblyReference.cache differ diff --git a/GIM_site/AllegatiRichiesta.aspx b/GIM_site/AllegatiRichiesta.aspx index c78878f..0b0485f 100644 --- a/GIM_site/AllegatiRichiesta.aspx +++ b/GIM_site/AllegatiRichiesta.aspx @@ -9,5 +9,7 @@ - +
+ +
diff --git a/GIM_site/AllegatiRichiesta.aspx.cs b/GIM_site/AllegatiRichiesta.aspx.cs index e6d98bc..8ea4a07 100644 --- a/GIM_site/AllegatiRichiesta.aspx.cs +++ b/GIM_site/AllegatiRichiesta.aspx.cs @@ -12,12 +12,9 @@ namespace GIM_site { protected void Page_Load(object sender, EventArgs e) { - //if (!Page.IsPostBack) - //{ - mod_fileUpload.numIntMtz = memLayer.ML.QSI("numIntMtz"); - mod_fileUpload.enableMod = true; - mod_fileUpload.doUpdate(); - //} + mod_fileUpload.numIntMtz = memLayer.ML.QSI("numIntMtz"); + mod_fileUpload.enableMod = true; + mod_fileUpload.doUpdate(); } } } \ No newline at end of file diff --git a/GIM_site/WebUserControls/mod_elencoRichieste.ascx b/GIM_site/WebUserControls/mod_elencoRichieste.ascx index ca256eb..1931f95 100644 --- a/GIM_site/WebUserControls/mod_elencoRichieste.ascx +++ b/GIM_site/WebUserControls/mod_elencoRichieste.ascx @@ -37,14 +37,9 @@ - - - + + + diff --git a/GIM_site/WebUserControls/mod_fileUpload.ascx b/GIM_site/WebUserControls/mod_fileUpload.ascx index b9ff4d1..1eb507e 100644 --- a/GIM_site/WebUserControls/mod_fileUpload.ascx +++ b/GIM_site/WebUserControls/mod_fileUpload.ascx @@ -1,75 +1,85 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_fileUpload.ascx.cs" Inherits="GIM_site.WebUserControls.mod_fileUpload" %> -
- - <%: numAllegati %> files allegati -
-
- - -
- -
-
- +
+
+
+ + +
-
- +
+
+
+ +
+
+ +
+
+
+
+
+
+ + <%: numAllegati %> files allegati +
+
+
+
+ + + + + + + + + + + + + + + + + + +
+ + + +
+
+ + +
+
+ +
+ + +
+   + +
+
+ +
+
+
+ + + + + + + + + +
- - - - - - - - - - - - - - - - - - -
- - - -
-
- - -
-
- -
- - -
-   - -
-
- -
-
-
- - - - - - - - - - -
diff --git a/GIM_site/WebUserControls/mod_fileUpload.ascx.cs b/GIM_site/WebUserControls/mod_fileUpload.ascx.cs index af7810d..607f932 100644 --- a/GIM_site/WebUserControls/mod_fileUpload.ascx.cs +++ b/GIM_site/WebUserControls/mod_fileUpload.ascx.cs @@ -43,6 +43,10 @@ namespace GIM_site.WebUserControls { if (!IsPostBack) { + if (memLayer.ML.QSI("numIntMtz") != 0) + { + numIntMtz = memLayer.ML.QSI("numIntMtz"); + } hlOpenNew.NavigateUrl = string.Format("~/AllegatiRichiesta?numIntMtz={0}", numIntMtz); fisVisFU(false); grView.DataBind(); @@ -199,7 +203,7 @@ namespace GIM_site.WebUserControls fileMover.obj.setDirectoryMapPath(WebGimUtils.dirPathIntMtz(numIntMtz)); fileMover.obj.eliminaFile(e.InputParameters["Original_Nome"].ToString()); // fermo procedura... - e.Cancel=true; + e.Cancel = true; } } } \ No newline at end of file diff --git a/GIM_site/WebUserControls/mod_fileUpload.ascx.designer.cs b/GIM_site/WebUserControls/mod_fileUpload.ascx.designer.cs index ff203fe..b01b45f 100644 --- a/GIM_site/WebUserControls/mod_fileUpload.ascx.designer.cs +++ b/GIM_site/WebUserControls/mod_fileUpload.ascx.designer.cs @@ -12,24 +12,6 @@ namespace GIM_site.WebUserControls { public partial class mod_fileUpload { - /// - /// divOpenNew control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl divOpenNew; - - /// - /// hlOpenNew control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.HyperLink hlOpenNew; - /// /// divNormal control. /// @@ -93,6 +75,24 @@ namespace GIM_site.WebUserControls { /// protected global::System.Web.UI.WebControls.Button btnUpload; + /// + /// divOpenNew control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divOpenNew; + + /// + /// hlOpenNew control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HyperLink hlOpenNew; + /// /// grView control. /// diff --git a/GIM_site/bin/SteamWare.dll b/GIM_site/bin/SteamWare.dll index 0504428..e21275b 100644 Binary files a/GIM_site/bin/SteamWare.dll and b/GIM_site/bin/SteamWare.dll differ diff --git a/GIM_site/dettaglioIntervento.aspx.cs b/GIM_site/dettaglioIntervento.aspx.cs index 5dc8acf..864753f 100644 --- a/GIM_site/dettaglioIntervento.aspx.cs +++ b/GIM_site/dettaglioIntervento.aspx.cs @@ -9,7 +9,15 @@ public partial class dettaglioIntervento : UserPage { protected void Page_Load(object sender, EventArgs e) { - mod_dettaglioIntervento1.eh_chiudi += new EventHandler(mod_dettaglioIntervento1_eh_chiudi); + if (!Page.IsPostBack) + { + // se ho valore in URL lo salvo in sessione... + if (memLayer.ML.QSS("numIntMtz") != "") + { + memLayer.ML.setSessionVal("numIntMtz_sel", memLayer.ML.QSI("numIntMtz")); + } + } + mod_dettaglioIntervento1.eh_chiudi += new EventHandler(mod_dettaglioIntervento1_eh_chiudi); } /// /// resetto selezione, nascondo dettaglio diff --git a/GIM_site/elencoRichieste.aspx.cs b/GIM_site/elencoRichieste.aspx.cs index 0e54d75..6bbdf66 100644 --- a/GIM_site/elencoRichieste.aspx.cs +++ b/GIM_site/elencoRichieste.aspx.cs @@ -41,8 +41,6 @@ public partial class elencoRichieste : UserPage /// void mod_elencoRichieste1_eh_selValore(object sender, EventArgs e) { - Response.Redirect("dettaglioIntervento.aspx"); + Response.Redirect(string.Format("dettaglioIntervento.aspx?numIntMtz={0}", memLayer.ML.IntSessionObj("numIntMtz_sel"))); } - - } diff --git a/GIM_site/obj/Debug/GIM_site.csprojResolveAssemblyReference.cache b/GIM_site/obj/Debug/GIM_site.csprojResolveAssemblyReference.cache index d808640..7cebdb2 100644 Binary files a/GIM_site/obj/Debug/GIM_site.csprojResolveAssemblyReference.cache and b/GIM_site/obj/Debug/GIM_site.csprojResolveAssemblyReference.cache differ