diff --git a/Projects/WebGIM/GIM_data/DS_applicazione.xsd b/Projects/WebGIM/GIM_data/DS_applicazione.xsd index a29ab4e..542b3e5 100644 --- a/Projects/WebGIM/GIM_data/DS_applicazione.xsd +++ b/Projects/WebGIM/GIM_data/DS_applicazione.xsd @@ -700,6 +700,9 @@ ORDER BY numIntMtz DESC + + + @@ -2352,7 +2355,7 @@ FROM v_mtzProgExp - + @@ -2429,7 +2432,7 @@ FROM v_mtzProgExp - + @@ -2454,7 +2457,7 @@ FROM v_mtzProgExp - + @@ -2488,7 +2491,7 @@ FROM v_mtzProgExp - + @@ -2566,7 +2569,7 @@ FROM v_mtzProgExp - + @@ -2746,22 +2749,22 @@ FROM v_mtzProgExp - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Projects/WebGIM/GIM_data/DS_applicazione.xss b/Projects/WebGIM/GIM_data/DS_applicazione.xss index a63db69..a061668 100644 --- a/Projects/WebGIM/GIM_data/DS_applicazione.xss +++ b/Projects/WebGIM/GIM_data/DS_applicazione.xss @@ -4,33 +4,33 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - + - - + + - + - - - - - + + + + + @@ -93,7 +93,7 @@ - + 448 @@ -213,7 +213,7 @@ - + 121 @@ -229,7 +229,7 @@ - + 569 diff --git a/Projects/WebGIM/GIM_data/DS_applicazione1.Designer.cs b/Projects/WebGIM/GIM_data/DS_applicazione1.Designer.cs index dff7bfd..87358d1 100644 --- a/Projects/WebGIM/GIM_data/DS_applicazione1.Designer.cs +++ b/Projects/WebGIM/GIM_data/DS_applicazione1.Designer.cs @@ -18291,6 +18291,9 @@ ORDER BY numIntMtz DESC"; this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@fineIntervento", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@isPreventivabile", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@descrizioneIntervento", global::System.Data.SqlDbType.NVarChar, 2500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@isFermo", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxAmbito", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxCausale", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[10] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[10].Connection = this.Connection; this._commandCollection[10].CommandText = "dbo.sp_updateInterventoFull"; @@ -18609,7 +18612,7 @@ ORDER BY numIntMtz DESC"; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int sp_updateIntervento(global::System.Nullable Original_numIntMtz, global::System.Nullable idxStato, global::System.Nullable inizioIntervento, global::System.Nullable fineIntervento, global::System.Nullable isPreventivabile, string descrizioneIntervento) { + public virtual int sp_updateIntervento(global::System.Nullable Original_numIntMtz, global::System.Nullable idxStato, global::System.Nullable inizioIntervento, global::System.Nullable fineIntervento, global::System.Nullable isPreventivabile, string descrizioneIntervento, global::System.Nullable isFermo, global::System.Nullable idxAmbito, global::System.Nullable idxCausale) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[9]; if ((Original_numIntMtz.HasValue == true)) { command.Parameters[1].Value = ((int)(Original_numIntMtz.Value)); @@ -18647,6 +18650,24 @@ ORDER BY numIntMtz DESC"; else { command.Parameters[6].Value = ((string)(descrizioneIntervento)); } + if ((isFermo.HasValue == true)) { + command.Parameters[7].Value = ((bool)(isFermo.Value)); + } + else { + command.Parameters[7].Value = global::System.DBNull.Value; + } + if ((idxAmbito.HasValue == true)) { + command.Parameters[8].Value = ((int)(idxAmbito.Value)); + } + else { + command.Parameters[8].Value = global::System.DBNull.Value; + } + if ((idxCausale.HasValue == true)) { + command.Parameters[9].Value = ((int)(idxCausale.Value)); + } + else { + command.Parameters[9].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { diff --git a/Projects/WebGIM/GIM_data/bin/GIM_data.dll b/Projects/WebGIM/GIM_data/bin/GIM_data.dll index 87b3299..0b40aa3 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_data/bin/SteamWare.dll b/Projects/WebGIM/GIM_data/bin/SteamWare.dll index 1b44faf..72a3139 100644 Binary files a/Projects/WebGIM/GIM_data/bin/SteamWare.dll and b/Projects/WebGIM/GIM_data/bin/SteamWare.dll differ diff --git a/Projects/WebGIM/GIM_site/Bootstrap.Master b/Projects/WebGIM/GIM_site/Bootstrap.Master index 64b2e9b..3035a03 100644 --- a/Projects/WebGIM/GIM_site/Bootstrap.Master +++ b/Projects/WebGIM/GIM_site/Bootstrap.Master @@ -9,11 +9,11 @@ - + - GIM_site - <%: Page.Title %> + WebGIM - <%: Page.Title %> <%: Scripts.Render("~/bundles/modernizr") %> diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx index 376fd4c..504d55f 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx @@ -246,14 +246,19 @@
- -
- +
+ + +
+ +

- + + + <%----%>
@@ -269,7 +274,7 @@

- + <%-- @@ -286,7 +291,18 @@
- + + + + + + + + +
@@ -434,16 +450,18 @@
- -
- +
+ + +
+ +

-
@@ -506,165 +524,6 @@ ControlToValidate="txtDescrizione" Display="Dynamic">
- - <%-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - -
- - - - - - - - - - - -
- - - -
- - - - - - -
- - - - - -
- - - - - -
- - - - - - - - - - - -
- - - -
-
- - -
- - -
- -
-
- - - -
--%>
<%: traduci("RicambiImpiegati") %> @@ -753,9 +612,9 @@
- + UpdateMethod="sp_updateIntervento" OnUpdated="ods_default_Updated"> @@ -763,6 +622,9 @@ + + + + diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx.cs index e666ba8..7c4d44d 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx.cs @@ -145,6 +145,10 @@ public partial class mod_dettaglioIntervento : System.Web.UI.UserControl protected void odsCausali_DataBinding(object sender, EventArgs e) { + } + protected void odsCausali2_DataBinding(object sender, EventArgs e) + { + } /// /// determina visibilità modulo ricambi (SE abilitato) @@ -159,4 +163,9 @@ public partial class mod_dettaglioIntervento : System.Web.UI.UserControl return answ; } } + + protected void ods_default_Updated(object sender, ObjectDataSourceStatusEventArgs e) + { + btnCancel.Visible = false; + } } diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx.designer.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx.designer.cs index 3148d0a..a2d1d38 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx.designer.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx.designer.cs @@ -91,4 +91,13 @@ public partial class mod_dettaglioIntervento { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ObjectDataSource ods_full; + + /// + /// odsAmbiti control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsAmbiti; } diff --git a/Projects/WebGIM/GIM_site/bin/GIM_data.dll b/Projects/WebGIM/GIM_site/bin/GIM_data.dll index 87b3299..0b40aa3 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 80fb8b8..cbf0621 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/bin/SteamWare.dll b/Projects/WebGIM/GIM_site/bin/SteamWare.dll index 1b44faf..72a3139 100644 Binary files a/Projects/WebGIM/GIM_site/bin/SteamWare.dll and b/Projects/WebGIM/GIM_site/bin/SteamWare.dll differ diff --git a/Projects/WebGIM/GIM_site/bin/VersGen.dll b/Projects/WebGIM/GIM_site/bin/VersGen.dll index c56c5c5..b405afe 100644 Binary files a/Projects/WebGIM/GIM_site/bin/VersGen.dll and b/Projects/WebGIM/GIM_site/bin/VersGen.dll differ diff --git a/Projects/WebGIM/GIM_site/imagecache/0f/d4aa650bbc57b2228d53698d5555ffd750274de489bcbc096fcc63410eba0d7e.png b/Projects/WebGIM/GIM_site/imagecache/0f/d4aa650bbc57b2228d53698d5555ffd750274de489bcbc096fcc63410eba0d7e.png new file mode 100644 index 0000000..3da84f0 Binary files /dev/null and b/Projects/WebGIM/GIM_site/imagecache/0f/d4aa650bbc57b2228d53698d5555ffd750274de489bcbc096fcc63410eba0d7e.png differ diff --git a/Projects/WebGIM/GIM_site/imagecache/15/f5c670591dde0bb070c0c6e14693d804dea9facb8135f0fa02ab87e27f0289ad.png b/Projects/WebGIM/GIM_site/imagecache/15/f5c670591dde0bb070c0c6e14693d804dea9facb8135f0fa02ab87e27f0289ad.png new file mode 100644 index 0000000..2c052ed Binary files /dev/null and b/Projects/WebGIM/GIM_site/imagecache/15/f5c670591dde0bb070c0c6e14693d804dea9facb8135f0fa02ab87e27f0289ad.png differ diff --git a/Projects/WebGIM/GIM_site/obj/Somaschini/CSAutoParameterize.parameters.xml b/Projects/WebGIM/GIM_site/obj/Somaschini/CSAutoParameterize.parameters.xml deleted file mode 100644 index 5ef06a2..0000000 --- a/Projects/WebGIM/GIM_site/obj/Somaschini/CSAutoParameterize.parameters.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/Projects/WebGIM/VersGen/bin/Release/VersGen.dll b/Projects/WebGIM/VersGen/bin/Release/VersGen.dll index c56c5c5..b405afe 100644 Binary files a/Projects/WebGIM/VersGen/bin/Release/VersGen.dll and b/Projects/WebGIM/VersGen/bin/Release/VersGen.dll differ