diff --git a/Projects/ReleaseClienti/Somaschini ITA/GIM_site.zip b/Projects/ReleaseClienti/Somaschini ITA/GIM_site.zip index 065e860..0bec693 100644 Binary files a/Projects/ReleaseClienti/Somaschini ITA/GIM_site.zip and b/Projects/ReleaseClienti/Somaschini ITA/GIM_site.zip differ diff --git a/Projects/WebGIM/GIM_data/DS_applicazione.xsd b/Projects/WebGIM/GIM_data/DS_applicazione.xsd index 542b3e5..f7c9e26 100644 --- a/Projects/WebGIM/GIM_data/DS_applicazione.xsd +++ b/Projects/WebGIM/GIM_data/DS_applicazione.xsd @@ -734,6 +734,18 @@ ORDER BY numIntMtz DESC + + + + dbo.stp_IntMtz_updateStato + + + + + + + + @@ -2355,7 +2367,7 @@ FROM v_mtzProgExp - + @@ -2432,7 +2444,7 @@ FROM v_mtzProgExp - + @@ -2457,7 +2469,7 @@ FROM v_mtzProgExp - + @@ -2491,7 +2503,7 @@ FROM v_mtzProgExp - + @@ -2569,7 +2581,7 @@ FROM v_mtzProgExp - + @@ -2749,22 +2761,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 a061668..b85f523 100644 --- a/Projects/WebGIM/GIM_data/DS_applicazione.xss +++ b/Projects/WebGIM/GIM_data/DS_applicazione.xss @@ -13,7 +13,7 @@ - + @@ -84,12 +84,16 @@ - 810 - 429 + 843 + 562 - 784 - 429 + 843 + 579 + + + 826 + 579 diff --git a/Projects/WebGIM/GIM_data/DS_applicazione1.Designer.cs b/Projects/WebGIM/GIM_data/DS_applicazione1.Designer.cs index 87358d1..817abf9 100644 --- a/Projects/WebGIM/GIM_data/DS_applicazione1.Designer.cs +++ b/Projects/WebGIM/GIM_data/DS_applicazione1.Designer.cs @@ -18211,7 +18211,7 @@ namespace GIM_data.DS_applicazioneTableAdapters { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[11]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[12]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT numIntMtz, richiesta, dataLav, turnoLav, matr, guasto, idxAmbito, descrAmbitoGuasto, idxPriorita, descrPriorita, isFermo, idxTipo, descrTipo, idxImpianto, codImpianto, nomeImpianto, idxMacchina, codMacchina, @@ -18316,6 +18316,13 @@ ORDER BY numIntMtz DESC"; this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxTipo", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[10].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].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@presaInCarico", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[11] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[11].Connection = this.Connection; + this._commandCollection[11].CommandText = "dbo.stp_IntMtz_updateStato"; + this._commandCollection[11].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_numIntMtz", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxStato", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -18825,6 +18832,40 @@ ORDER BY numIntMtz DESC"; } return returnValue; } + + [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 updateStato(global::System.Nullable Original_numIntMtz, global::System.Nullable idxStato) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[11]; + if ((Original_numIntMtz.HasValue == true)) { + command.Parameters[1].Value = ((int)(Original_numIntMtz.Value)); + } + else { + command.Parameters[1].Value = global::System.DBNull.Value; + } + if ((idxStato.HasValue == true)) { + command.Parameters[2].Value = ((int)(idxStato.Value)); + } + else { + command.Parameters[2].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)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } } /// diff --git a/Projects/WebGIM/GIM_data/bin/GIM_data.dll b/Projects/WebGIM/GIM_data/bin/GIM_data.dll index 0b40aa3..8984d8f 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.XML b/Projects/WebGIM/GIM_data/bin/SteamWare.XML index 9dc9143..368792f 100644 --- a/Projects/WebGIM/GIM_data/bin/SteamWare.XML +++ b/Projects/WebGIM/GIM_data/bin/SteamWare.XML @@ -2295,6 +2295,56 @@ salvataggio di tutti i lemmi tradotti + + + modalità di chiamata userControl + + + + + modalità solo lettura + + + + + modalità edit abilitata + + + + + tipo evento userControl + + + + + evento: NEW + + + + + evento: NEW + + + + + evento: NEW + + + + + evento: reset selezione + + + + + evento: richiesta update parent + + + + + evento: selected + + Accesso in lettura e scrittura al filesystem per gestione files upload e download @@ -3197,6 +3247,13 @@ + + + carica dalla sessione un dato di tipo DateTime + + + + carica dalla sessione un dato di tipo long @@ -3720,6 +3777,16 @@ It is not meant to be be used directly. + + + event handler generico + + + + + sollevo evento selezione + + wrapper traduzione @@ -3727,6 +3794,17 @@ + + + modalità operativa controllo + + + + + escape dei parametri input dell'ODS + + + indica se i caratteri vadano forzati a maiuscoli @@ -3754,6 +3832,13 @@ + + + evento andata in editing del controllo + + + + classe gestione utente: auth e permission/ruoli - versione GENERICA @@ -4700,5 +4785,21 @@ + + + eventi associati a UserCOntrol SteamWare standard + + + + + tipo di evento segnalato + + + + + inizializzazione oggetto EventArg specifico + + + diff --git a/Projects/WebGIM/GIM_data/bin/SteamWare.dll b/Projects/WebGIM/GIM_data/bin/SteamWare.dll index 72a3139..c24f476 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/GIM_site.csproj b/Projects/WebGIM/GIM_site/GIM_site.csproj index cafa753..acc0862 100644 --- a/Projects/WebGIM/GIM_site/GIM_site.csproj +++ b/Projects/WebGIM/GIM_site/GIM_site.csproj @@ -754,6 +754,7 @@ + @@ -838,6 +839,7 @@ + @@ -944,6 +946,20 @@ magRic.aspx + + RegConsumoRic.aspx + ASPXCodeBehind + + + RegConsumoRic.aspx + + + UpdateVoc.aspx + ASPXCodeBehind + + + UpdateVoc.aspx + ViewSwitcher.ascx ASPXCodeBehind @@ -1232,6 +1248,20 @@ mod_dettaglioIntervento.ascx + + mod_dettInt_default.ascx + ASPXCodeBehind + + + mod_dettInt_default.ascx + + + mod_dettInt_full.ascx + ASPXCodeBehind + + + mod_dettInt_full.ascx + mod_dettMtzProg.ascx ASPXCodeBehind @@ -1667,6 +1697,8 @@ + + diff --git a/Projects/WebGIM/GIM_site/RegConsumoRic.aspx b/Projects/WebGIM/GIM_site/RegConsumoRic.aspx new file mode 100644 index 0000000..d0885e9 --- /dev/null +++ b/Projects/WebGIM/GIM_site/RegConsumoRic.aspx @@ -0,0 +1,98 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" CodeBehind="RegConsumoRic.aspx.cs" Inherits="GIM_site.RegConsumoRic" %> + +<%@ Register Src="~/WebUserControls/mod_ricercaItem.ascx" TagPrefix="uc1" TagName="mod_ricercaItem" %> +<%@ Register Src="~/WebUserControls/mod_MovMag2Int.ascx" TagPrefix="uc1" TagName="mod_MovMag2Int" %> + + + + + + + +
+
+
+
+

<%: traduci("GestConsumoRicLong") %>

+
+
+
+
+
+ +
+
+ <%: traduci("lblImpianto") %>
+ + +
+
+
+
+ <%: traduci("lblMacchina") %>
+ + + + + + +
+
+
+
+ <%: traduci("lblCausale") %>
+ + + + + + +
+
+
+
+ <%: traduci("lblMatr") %>
+ + +
+
+ <%: traduci("lblDescrTipo") %>
+ + + +
+
+ <%: traduci("lblDescrPriorita") %>
+ + +
+
+ <%: traduci("lblIsFermo") %>
+ +
+
+
+
+ <%: traduci("AddRicambi2Int") %> +
+
+ <%: traduci("unlockSel") %> +
+
+
+
+ <%: traduci("RicambiDisponibili") %> + +
+
+ <%: traduci("RicambiImpiegati") %> + +
+
+
+
+
+ diff --git a/Projects/WebGIM/GIM_site/RegConsumoRic.aspx.cs b/Projects/WebGIM/GIM_site/RegConsumoRic.aspx.cs new file mode 100644 index 0000000..ca71a90 --- /dev/null +++ b/Projects/WebGIM/GIM_site/RegConsumoRic.aspx.cs @@ -0,0 +1,182 @@ +using SteamWare; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace GIM_site +{ + public partial class RegConsumoRic : SteamWare.UserPage + { + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + resetCtrls(); + } + mod_ricercaItem.eh_newrecord += Mod_ricercaItem_eh_newrecord; + } + + private void resetCtrls() + { + memLayer.ML.emptySessionVal("numIntMtz_sel"); + fixCtrlEnable(true); + fixMacchine(); + fixCausali(); + fixDefaults(); + // blocco inserimento ricambi sino a selezione... + mod_ricercaItem.Visible = false; + } + + private void Mod_ricercaItem_eh_newrecord(object sender, EventArgs e) + { + mod_MovMag2Int.doUpdate(); + } + + private void fixDefaults() + { + txtMatr.Text = "9999"; + ddlPrior.SelectedValue = "5"; + ddlTipo.SelectedValue = "4"; + } + + protected void ddlImpianto_SelectedIndexChanged(object sender, EventArgs e) + { + fixMacchine(); + fixCausali(); + } + + private void fixMacchine() + { + ddlMacchine.DataBind(); + } + + protected void ddlMacchine_SelectedIndexChanged(object sender, EventArgs e) + { + int idxMacchina = 0; + try + { + idxMacchina = Convert.ToInt32(ddlMacchine.SelectedValue); + } + catch + { } + mod_ricercaItem.idxMacchina = idxMacchina; + fixCausali(); + } + + private void fixCausali() + { + ddlCausale.DataBind(); + // provo a selezionare ricambi... + try + { + ddlCausale.SelectedValue = memLayer.ML.CRS("defCausale"); + } + catch + { } + } + /// + /// creo intervento e mostro gestione ricambi... + /// + /// + /// + protected void lbtCreate_Click(object sender, EventArgs e) + { + // creo nuovo intMtz... + int idxIntMtz = getNewIdxIntMtz(); + if (idxIntMtz > 0) + { + // salvo in sessione + memLayer.ML.setSessionVal("numIntMtz_sel", idxIntMtz); + try + { + mod_ricercaItem.idxMacchina = TA_app.obj.taInterventiMtz.getByIdx(idxIntMtz)[0].idxMacchina; + } + catch + { } + // blocco cambio impianto/macchina/causale + fixCtrlEnable(false); + } + else + { + fixCtrlEnable(true); + } + } + + private int getNewIdxIntMtz() + { + int answ = 0; + // salvare valori... + int? numReq = 0; + try + { + // sistemo i valori + DateTime adesso = DateTime.Now; + DateTime richiesta = adesso; + DateTime dataLav = adesso; + DateTime inizioGuasto = adesso; + + // recupero valori di riferimento + int shift = memLayer.ML.confReadInt("shiftTurno"); + int durataTurno = memLayer.ML.confReadInt("durataTurno"); + int turno = Convert.ToInt32(Math.Ceiling((double)Convert.ToDouble(DateTime.Now.AddHours(-shift + 1).Hour) / durataTurno)); + + string matr = txtMatr.Text.Trim(); + int idxAmbito = memLayer.ML.CRI("idxAmbitoRicambi"); + int idxPrior = Convert.ToInt32(ddlPrior.SelectedValue); + bool isFermo = chkImpFermo.Checked; + int idxTipo = Convert.ToInt32(ddlTipo.SelectedValue); + int idxImpianto = Convert.ToInt32(ddlImpianto.SelectedValue); + int idxMacchina = Convert.ToInt32(ddlMacchine.SelectedValue); + string descrizione = "-"; + int idxCausale = Convert.ToInt32(ddlCausale.SelectedValue); + if (memLayer.ML.confReadInt("_logLevel") > 5) + { + logger.lg.scriviLog(string.Format("sp_insRichiesta, valori: {0} | {1} | {2} | {3} | {4} | {5} | {6} | {7} | {8} | {9} | {10} | {11} | {12} | {13}", richiesta, dataLav, turno, matr, inizioGuasto, idxAmbito, idxPrior, isFermo, idxTipo, idxImpianto, idxMacchina, descrizione, idxCausale, false)); + } + // stored inserimento! + TA_app.obj.taInterventiMtz.sp_insRichiesta(richiesta, dataLav, turno, matr, inizioGuasto, idxAmbito, idxPrior, isFermo, idxTipo, idxImpianto, idxMacchina, descrizione, idxCausale, false, ref numReq); + // porto intervento a CHIUSO... + TA_app.obj.taInterventiMtz.updateStato(numReq, 3); + } + catch (Exception exc) + { + logger.lg.scriviLog("Errore inserimento nuova richiesta!", tipoLog.ERROR); + logger.lg.scriviLog(exc.ToString(), tipoLog.EXCEPTION); + } + if (numReq != null) + { + answ = Convert.ToInt32(numReq); + } + return answ; + } + + private void fixCtrlEnable(bool canSelMacc) + { + string css = "textEv_1"; + if (canSelMacc) + { + css = "textEv_2"; + } + // ddl e btn default + ddlImpianto.Enabled = canSelMacc; + ddlMacchine.Enabled = canSelMacc; + ddlCausale.Enabled = canSelMacc; + ddlImpianto.CssClass = css; + ddlMacchine.CssClass = css; + ddlCausale.CssClass = css; + + lbtCreate.Visible = canSelMacc; + lbtEnable.Visible = !canSelMacc; + // abilito gestione ricambi... + mod_ricercaItem.Visible = !canSelMacc; + } + + protected void lbtEnable_Click(object sender, EventArgs e) + { + resetCtrls(); + } + } +} \ No newline at end of file diff --git a/Projects/WebGIM/GIM_site/RegConsumoRic.aspx.designer.cs b/Projects/WebGIM/GIM_site/RegConsumoRic.aspx.designer.cs new file mode 100644 index 0000000..7564ac8 --- /dev/null +++ b/Projects/WebGIM/GIM_site/RegConsumoRic.aspx.designer.cs @@ -0,0 +1,231 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace GIM_site { + + + public partial class RegConsumoRic { + + /// + /// lblImpianto control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblImpianto; + + /// + /// ddlImpianto control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList ddlImpianto; + + /// + /// odsImpianti control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsImpianti; + + /// + /// lblMacchina control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblMacchina; + + /// + /// ddlMacchine control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList ddlMacchine; + + /// + /// odsMacchine control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsMacchine; + + /// + /// lblCausale control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblCausale; + + /// + /// ddlCausale control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList ddlCausale; + + /// + /// odsCausali control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsCausali; + + /// + /// lblMatr control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblMatr; + + /// + /// txtMatr control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtMatr; + + /// + /// rfvMatr control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.RequiredFieldValidator rfvMatr; + + /// + /// lblDescrTipo control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblDescrTipo; + + /// + /// ddlTipo control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList ddlTipo; + + /// + /// odsTipo control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsTipo; + + /// + /// lblDescrPriorita control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblDescrPriorita; + + /// + /// ddlPrior control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList ddlPrior; + + /// + /// odsPrior control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsPrior; + + /// + /// lblIsFermo control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblIsFermo; + + /// + /// chkImpFermo control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.CheckBox chkImpFermo; + + /// + /// lbtCreate control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbtCreate; + + /// + /// lbtEnable control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbtEnable; + + /// + /// mod_ricercaItem control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GIM_site.WebUserControls.mod_ricercaItem mod_ricercaItem; + + /// + /// mod_MovMag2Int control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GIM_site.WebUserControls.mod_MovMag2Int mod_MovMag2Int; + } +} diff --git a/Projects/WebGIM/GIM_site/UpdateVoc.aspx b/Projects/WebGIM/GIM_site/UpdateVoc.aspx new file mode 100644 index 0000000..9d3fd0a --- /dev/null +++ b/Projects/WebGIM/GIM_site/UpdateVoc.aspx @@ -0,0 +1,15 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="UpdateVoc.aspx.cs" Inherits="UpdateVoc" %> + + + + + + + + +
+
+
+
+ + diff --git a/Projects/WebGIM/GIM_site/UpdateVoc.aspx.cs b/Projects/WebGIM/GIM_site/UpdateVoc.aspx.cs new file mode 100644 index 0000000..6a05062 --- /dev/null +++ b/Projects/WebGIM/GIM_site/UpdateVoc.aspx.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using SteamWare; + +public partial class UpdateVoc : System.Web.UI.Page +{ + protected void Page_Load(object sender, EventArgs e) + { + // aggiorno vocabolario + DataWrap.DW.resetVocabolario(); + // torno a menu... + if (user_std.pagPrecedente == user_std.pagCorrente) + { + user_std.pagPrecedente = "~/Default"; + } + Response.Redirect(user_std.pagPrecedente); + } +} diff --git a/Projects/WebGIM/GIM_site/UpdateVoc.aspx.designer.cs b/Projects/WebGIM/GIM_site/UpdateVoc.aspx.designer.cs new file mode 100644 index 0000000..f0884ce --- /dev/null +++ b/Projects/WebGIM/GIM_site/UpdateVoc.aspx.designer.cs @@ -0,0 +1,23 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + + +public partial class UpdateVoc +{ + + /// + /// form1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; +} + diff --git a/Projects/WebGIM/GIM_site/Web.config b/Projects/WebGIM/GIM_site/Web.config index 2a522ed..59bddae 100644 --- a/Projects/WebGIM/GIM_site/Web.config +++ b/Projects/WebGIM/GIM_site/Web.config @@ -130,6 +130,9 @@ + + + @@ -249,7 +252,7 @@ - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_MovMag2Int.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_MovMag2Int.ascx index 95ff8d6..bf7c2d3 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_MovMag2Int.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_MovMag2Int.ascx @@ -92,22 +92,6 @@ - <%-- - - - - - - - - - - - - - - - --%> diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettInt_default.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettInt_default.ascx new file mode 100644 index 0000000..33b0427 --- /dev/null +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettInt_default.ascx @@ -0,0 +1,410 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_dettInt_default.ascx.cs" Inherits="GIM_site.WebUserControls.mod_dettInt_default" %> + +<%@ Register Src="~/WebUserControls/mod_interventoOpMtz.ascx" TagName="mod_interventoOpMtz" TagPrefix="uc1" %> +<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> +<%@ Register Src="~/WebUserControls/mod_dataOra.ascx" TagName="mod_dataOra" TagPrefix="uc2" %> +<%@ Register Src="~/WebUserControls/mod_impiegoRisorse.ascx" TagPrefix="uc3" TagName="mod_impiegoRisorse" %> +<%@ Register Src="~/WebUserControls/mod_ricercaItem.ascx" TagPrefix="uc1" TagName="mod_ricercaItem" %> +<%@ Register Src="~/WebUserControls/mod_MovMag2Int.ascx" TagPrefix="uc1" TagName="mod_MovMag2Int" %> + + + +
+
+
+
+
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ + +
+ + +
+
+ +
+ +
+
+
+
+ +
+ +
+
+ +
+ +
+
+ +
+ + + +
+
+
+
+
+
+ +
+ + + <%-- + + + + --%> + +
+
+
+
+ +
+
+ +
+
+
+
+ +
+ +
+ + +
+ +
+
+ +
+ +
+
+
+
+ <%: traduci("RicambiImpiegati") %> + + <%# traduci("AddRicambi2Int") %> +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + +
+ + + + + + + + + + + + + +
+ + + + +
+ +
+
+
+ + +
+
+
+ +
+
+
+
+
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ + +
+ + +
+
+ +
+ +
+
+
+
+
+ + +
+ +
+
+
+ +
+ + + <%----%> +
+
+ +
+ + + +
+
+
+
+
+
+ +
+ + + <%-- + + + + --%> + +
+
+
+
+ +
+
+ + + + + + + + + +
+
+
+
+ +
+ +
+ +
+ +
+
+ +
+ +
+
+
+
+ <%: traduci("RicambiImpiegati") %> + + <%--<%# traduci("AddRicambi2Int") %>--%> +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + +
+ + + + + + + + + + + + + +
+ + + + +
+ +
+
+
+
+ + + + + + + + + + + + + + + + + + + diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettInt_default.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettInt_default.ascx.cs new file mode 100644 index 0000000..77b6e4c --- /dev/null +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettInt_default.ascx.cs @@ -0,0 +1,64 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace GIM_site.WebUserControls +{ + public partial class mod_dettInt_default : SteamWare.UserControl + { + public event EventHandler eh_updated; + + private void raiseEventUpd() + { + if (eh_updated != null) + { + eh_updated(this, new EventArgs()); + } + } + + protected void Page_Load(object sender, EventArgs e) + { + + } + + public void doUpdate() + { + frmView_default.DataBind(); + } + + public FormViewMode currMode + { + get + { + return frmView_default.CurrentMode; + } + set + { + frmView_default.ChangeMode(value); + } + } + + protected void odsCausali_DataBinding(object sender, EventArgs e) + { + + } + + /// + /// impostazione visibilità modulo ricambi + /// + public bool showMR { get; set; } + /// + /// modificabilità controlli da parte dell'utente + /// + public bool userCanEditData { get; set; } + + protected void ods_default_Updated(object sender, ObjectDataSourceStatusEventArgs e) + { + raiseEventUpd(); + } + + } +} \ No newline at end of file diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettInt_default.ascx.designer.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettInt_default.ascx.designer.cs new file mode 100644 index 0000000..b7fb344 --- /dev/null +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettInt_default.ascx.designer.cs @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace GIM_site.WebUserControls { + + + public partial class mod_dettInt_default { + + /// + /// frmView_default control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.FormView frmView_default; + + /// + /// ods_default control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource ods_default; + + /// + /// 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/WebUserControls/mod_dettInt_full.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettInt_full.ascx new file mode 100644 index 0000000..b559188 --- /dev/null +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettInt_full.ascx @@ -0,0 +1,233 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_dettInt_full.ascx.cs" Inherits="GIM_site.WebUserControls.mod_dettInt_full" %> + +<%@ Register Src="~/WebUserControls/mod_interventoOpMtz.ascx" TagName="mod_interventoOpMtz" TagPrefix="uc1" %> +<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> +<%@ Register Src="~/WebUserControls/mod_dataOra.ascx" TagName="mod_dataOra" TagPrefix="uc2" %> +<%@ Register Src="~/WebUserControls/mod_impiegoRisorse.ascx" TagPrefix="uc3" TagName="mod_impiegoRisorse" %> +<%@ Register Src="~/WebUserControls/mod_ricercaItem.ascx" TagPrefix="uc1" TagName="mod_ricercaItem" %> +<%@ Register Src="~/WebUserControls/mod_MovMag2Int.ascx" TagPrefix="uc1" TagName="mod_MovMag2Int" %> + + + +
+
+
+ +
+
+
+
+
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ + +
+ + +
+
+ +
+ +
+
+
+
+
+ + +
+ +
+
+
+ +
+ + +
+
+ +
+ + + +
+
+
+
+
+
+ +
+ + + +
+
+
+
+ +
+
+ + + + + + + + + +
+
+
+
+ +
+ + +
+ +
+ + + +
+
+ +
+ + +
+
+
+
+ <%: traduci("RicambiImpiegati") %> + + <%--<%# traduci("AddRicambi2Int") %>--%> +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + +
+ + + + + + + + + + + + + +
+ + + + +
+ +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettInt_full.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettInt_full.ascx.cs new file mode 100644 index 0000000..4604aa8 --- /dev/null +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettInt_full.ascx.cs @@ -0,0 +1,64 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace GIM_site.WebUserControls +{ + public partial class mod_dettInt_full : SteamWare.UserControl + { + public event EventHandler eh_updated; + + private void raiseEventUpd() + { + if (eh_updated != null) + { + eh_updated(this, new EventArgs()); + } + } + + protected void Page_Load(object sender, EventArgs e) + { + + } + + public void doUpdate() + { + frmView_full.DataBind(); + } + + public FormViewMode currMode + { + get + { + return frmView_full.CurrentMode; + } + set + { + frmView_full.ChangeMode(value); + } + } + + protected void odsCausali_DataBinding(object sender, EventArgs e) + { + + } + + /// + /// impostazione visibilità modulo ricambi + /// + public bool showMR { get; set; } + /// + /// modificabilità controlli da parte dell'utente + /// + public bool userCanEditData { get; set; } + + + protected void ods_full_Updated(object sender, ObjectDataSourceStatusEventArgs e) + { + raiseEventUpd(); + } + } +} \ No newline at end of file diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettInt_full.ascx.designer.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettInt_full.ascx.designer.cs new file mode 100644 index 0000000..28ee8e0 --- /dev/null +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettInt_full.ascx.designer.cs @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace GIM_site.WebUserControls { + + + public partial class mod_dettInt_full { + + /// + /// frmView_full control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.FormView frmView_full; + + /// + /// ods_full control. + /// + /// + /// Auto-generated field. + /// 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/WebUserControls/mod_dettaglioIntervento.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx index 504d55f..e8e970b 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx @@ -6,6 +6,10 @@ <%@ Register Src="~/WebUserControls/mod_impiegoRisorse.ascx" TagPrefix="uc3" TagName="mod_impiegoRisorse" %> <%@ Register Src="~/WebUserControls/mod_ricercaItem.ascx" TagPrefix="uc1" TagName="mod_ricercaItem" %> <%@ Register Src="~/WebUserControls/mod_MovMag2Int.ascx" TagPrefix="uc1" TagName="mod_MovMag2Int" %> +<%@ Register Src="~/WebUserControls/mod_dettInt_default.ascx" TagPrefix="uc1" TagName="mod_dettInt_default" %> +<%@ Register Src="~/WebUserControls/mod_dettInt_full.ascx" TagPrefix="uc1" TagName="mod_dettInt_full" %> + + @@ -25,638 +29,6 @@ - - -
-
-
-
-
-
- -
- -
-
- -
- -
-
- -
- -
-
- - -
- - -
-
- -
- -
-
-
-
- -
- -
-
- -
- -
-
- -
- - - -
-
-
-
-
-
- -
- - - <%-- - - - - --%> - -
-
-
-
- -
-
- -
-
-
-
- -
- -
- - -
- -
-
- -
- -
-
-
-
- <%: traduci("RicambiImpiegati") %> - - <%# traduci("AddRicambi2Int") %> -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - -
- - - - - - - - - - - - - -
- - - - -
- -
-
-
- - -
-
-
- -
-
-
-
-
-
- -
- -
-
- -
- -
-
- -
- -
-
- - -
- - -
-
- -
- -
-
-
-
-
- - -
- -
-
-
- -
- - - <%----%> -
-
- -
- - - -
-
-
-
-
-
- -
- - - <%-- - - - - --%> - -
-
-
-
- -
-
- - - - - - - - - -
-
-
-
- -
- -
- - -
- -
-
- -
- -
-
-
-
- <%: traduci("RicambiImpiegati") %> - - <%--<%# traduci("AddRicambi2Int") %>--%> -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - -
- - - - - - - - - - - - - -
- - - - -
- -
-
-
-
- - - - -
-
-
- -
-
-
-
-
-
- -
- -
-
- -
- -
-
- -
- -
-
- - -
- - -
-
- -
- -
-
-
-
-
- - -
- -
-
-
- -
- - -
-
- -
- - - -
-
-
-
-
-
- -
- - - -
-
-
-
- -
-
- - - - - - - - - -
-
-
-
- -
- - -
- -
- - - -
-
- -
- - -
-
-
-
- <%: traduci("RicambiImpiegati") %> - - <%--<%# traduci("AddRicambi2Int") %>--%> -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - -
- <%----%> - - - - - - - - - - - - - -
- - - - -
- -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx.cs index 7c4d44d..ab604f4 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx.cs @@ -21,25 +21,89 @@ public partial class mod_dettaglioIntervento : System.Web.UI.UserControl { setupInizialeControlli(); } - if (frmView_default.CurrentMode == FormViewMode.ReadOnly) + if (mod_dettInt_default.currMode == FormViewMode.ReadOnly) { btnCancel.Visible = false; } + // imposto parametri controllo visibilità moduli + setVisibility(); + + // connetto eventi... + mod_dettInt_default.eh_updated += Mod_dettInt_default_eh_updated; + mod_dettInt_full.eh_updated += Mod_dettInt_full_eh_updated; } + + private void Mod_dettInt_full_eh_updated(object sender, EventArgs e) + { + refreshPostUpdate(); + } + + private void refreshPostUpdate() + { + mod_dettInt_default.currMode = FormViewMode.ReadOnly; + mod_dettInt_default.Visible = true; + mod_dettInt_full.Visible = false; + mod_dettInt_default.doUpdate(); + btnCancel.Visible = false; + } + + private void Mod_dettInt_default_eh_updated(object sender, EventArgs e) + { + //refreshPostUpdate(); + Response.Redirect(devicesAuthProxy.pagCorrente); + } + /// /// setup iniziale e di reset dei controlli /// private void setupInizialeControlli() { traduciObj(); - frmView_default.ChangeMode(FormViewMode.ReadOnly); - frmView_default.Visible = true; - frmView_full.Visible = false; + mod_dettInt_default.currMode = FormViewMode.ReadOnly; + mod_dettInt_default.Visible = true; + mod_dettInt_full.Visible = false; btnCancel.Enabled = userCanEditData; btnCompilaMtz.Enabled = userCanEditData; btnEditFull.Enabled = userCanEditData; + } + + private void setVisibility() + { + // modificabilità dati... + mod_dettInt_default.userCanEditData = userCanEditData; + mod_dettInt_full.userCanEditData = userCanEditData; + + // mostrare ricambi + mod_dettInt_default.showMR = showMR; + mod_dettInt_full.showMR = showMR; + } + + /// + /// determina visibilità modulo ricambi (SE abilitato) + /// + public bool showMR + { + get + { + // FARE!!! check su db + file?... + bool answ = true; + + return answ; + } + } + /// + /// determina se l'utente possa editare i dati (permesso "_SU" + /// + public bool userCanEditData + { + get + { + return (user_std.UtSn.diritti.Select("COD_FUNZIONE = 'GIM_SU'").Length > 0); + } + } + /// /// effettua traduzione pagina in lingua corrente /// @@ -74,10 +138,11 @@ public partial class mod_dettaglioIntervento : System.Web.UI.UserControl /// protected void btnCompilaMtz_Click(object sender, EventArgs e) { - frmView_default.ChangeMode(FormViewMode.Edit); - frmView_default.Visible = true; - frmView_full.Visible = false; + mod_dettInt_default.currMode = FormViewMode.Edit; + mod_dettInt_default.Visible = true; + mod_dettInt_full.Visible = false; btnCancel.Visible = true; + mod_dettInt_default.DataBind(); } /// /// permette editing di tutto @@ -86,12 +151,11 @@ public partial class mod_dettaglioIntervento : System.Web.UI.UserControl /// protected void btnEditFull_Click(object sender, EventArgs e) { - frmView_full.ChangeMode(FormViewMode.Edit); - frmView_full.Visible = true; - frmView_default.Visible = false; + mod_dettInt_full.currMode = FormViewMode.Edit; + mod_dettInt_full.Visible = true; + mod_dettInt_default.Visible = false; btnCancel.Visible = true; - frmView_default.DataBind(); - frmView_full.DataBind(); + mod_dettInt_full.DataBind(); } /// /// chiude la parte di editing @@ -100,12 +164,15 @@ public partial class mod_dettaglioIntervento : System.Web.UI.UserControl /// protected void btnCancel_Click(object sender, EventArgs e) { - frmView_default.ChangeMode(FormViewMode.ReadOnly); - frmView_default.Visible = true; - frmView_full.Visible = false; + Response.Redirect(devicesAuthProxy.pagCorrente); +#if false + mod_dettInt_default.currMode = FormViewMode.ReadOnly; + mod_dettInt_default.Visible = true; + mod_dettInt_full.Visible = false; btnCancel.Visible = false; - frmView_default.DataBind(); - frmView_full.DataBind(); + mod_dettInt_default.doUpdate(); + mod_dettInt_full.doUpdate(); +#endif } /// /// chiude la parte di editing @@ -119,53 +186,5 @@ public partial class mod_dettaglioIntervento : System.Web.UI.UserControl eh_chiudi(this, new EventArgs()); } } - protected void ods_full_Updated(object sender, ObjectDataSourceStatusEventArgs e) - { - frmView_default.ChangeMode(FormViewMode.ReadOnly); - frmView_default.Visible = true; - frmView_full.Visible = false; - frmView_default.DataBind(); - } - protected void listCausali_TextChanged(object sender, EventArgs e) - { - btnCancel.Visible = true; - } - - /// - /// determina se l'utente possa editare i dati (permesso "_SU" - /// - public bool userCanEditData - { - get - { - return (user_std.UtSn.diritti.Select("COD_FUNZIONE = 'GIM_SU'").Length > 0); - } - } - - protected void odsCausali_DataBinding(object sender, EventArgs e) - { - - } - protected void odsCausali2_DataBinding(object sender, EventArgs e) - { - - } - /// - /// determina visibilità modulo ricambi (SE abilitato) - /// - public bool showMR - { - get - { - // FARE!!! check su db + file?... - bool answ = true; - - 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 a2d1d38..679feb6 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx.designer.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx.designer.cs @@ -57,47 +57,20 @@ public partial class mod_dettaglioIntervento { protected global::AjaxControlToolkit.ConfirmButtonExtender cbeCancel; /// - /// frmView_default control. + /// mod_dettInt_default control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.FormView frmView_default; + protected global::GIM_site.WebUserControls.mod_dettInt_default mod_dettInt_default; /// - /// frmView_full control. + /// mod_dettInt_full control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.FormView frmView_full; - - /// - /// ods_default control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.ObjectDataSource ods_default; - - /// - /// ods_full control. - /// - /// - /// Auto-generated field. - /// 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; + protected global::GIM_site.WebUserControls.mod_dettInt_full mod_dettInt_full; } diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx index 60f8689..e75b6f8 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx @@ -75,7 +75,10 @@ - +
+ + +
diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs index 061ca90..7595ec1 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs @@ -432,17 +432,20 @@ public partial class mod_elencoRichieste : ApplicationUserControl checkFixOds(); } /// - /// determina se sia o meno un intervento di mtz programmata + /// determina se sia o meno un intervento dell'ambito richiesto /// - /// + /// valore ambito corrente + /// idxAmbitoMtzProg/idxAmbitoRicambi /// - public bool isMtzProg(object _idxAmbitoGuasto) + public bool checkAmbito(object _idxAmbitoGuasto, object _tipoAmbito) { bool answ = false; try { - int idxAmbito = Convert.ToInt32(_idxAmbitoGuasto); - if (idxAmbito == 7) answ = true; + // verifico ambito... + if (_idxAmbitoGuasto.ToString() == memLayer.ML.CRS(_tipoAmbito.ToString())) answ = true; + //int idxAmbito = Convert.ToInt32(_idxAmbitoGuasto); + //if (idxAmbito == memLayer.ML.CRI(_tipoAmbito.ToString())) answ = true; } catch { } diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_main_help.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_main_help.ascx index 4142a1a..ec9ab41 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_main_help.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_main_help.ascx @@ -28,13 +28,12 @@ <%: traduci("MtzProg") %> - + + <%: traduci("consumoRicambi") %> + + <%: traduci("ADV_MTZ_MagRic") %> - - <%-- - <%: traduci("Logout") %> - --%> diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_main_help.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_main_help.ascx.cs index 56c2444..dc2aa09 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_main_help.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_main_help.ascx.cs @@ -19,6 +19,7 @@ public partial class mod_main_help : ApplicationUserControl { base.OnInit(e); hlMagRic.DataBind(); + hlConsRic.DataBind(); } protected string defaultApp; diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_main_help.ascx.designer.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_main_help.ascx.designer.cs index 413673a..6512f76 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_main_help.ascx.designer.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_main_help.ascx.designer.cs @@ -56,6 +56,15 @@ public partial class mod_main_help { /// protected global::System.Web.UI.WebControls.HyperLink hlMtzProg; + /// + /// hlConsRic control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HyperLink hlConsRic; + /// /// hlMagRic control. /// diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_ricercaItem.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_ricercaItem.ascx index da0dbf9..311808e 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_ricercaItem.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_ricercaItem.ascx @@ -7,7 +7,7 @@
- + @@ -26,8 +26,7 @@
- - - + -
diff --git a/Projects/WebGIM/GIM_site/bin/GIM_data.dll b/Projects/WebGIM/GIM_site/bin/GIM_data.dll index 0b40aa3..8984d8f 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 cbf0621..53b39d6 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/GIM_site.dll.config b/Projects/WebGIM/GIM_site/bin/GIM_site.dll.config index 2a522ed..59bddae 100644 --- a/Projects/WebGIM/GIM_site/bin/GIM_site.dll.config +++ b/Projects/WebGIM/GIM_site/bin/GIM_site.dll.config @@ -130,6 +130,9 @@ + + + @@ -249,7 +252,7 @@ - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/Projects/WebGIM/GIM_site/bin/SteamWare.dll b/Projects/WebGIM/GIM_site/bin/SteamWare.dll index 72a3139..c24f476 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/SteamWare.xml b/Projects/WebGIM/GIM_site/bin/SteamWare.xml index b586d38..0065fd9 100644 --- a/Projects/WebGIM/GIM_site/bin/SteamWare.xml +++ b/Projects/WebGIM/GIM_site/bin/SteamWare.xml @@ -2295,6 +2295,56 @@ salvataggio di tutti i lemmi tradotti
+ + + modalità di chiamata userControl + + + + + modalità solo lettura + + + + + modalità edit abilitata + + + + + tipo evento userControl + + + + + evento: NEW + + + + + evento: NEW + + + + + evento: NEW + + + + + evento: reset selezione + + + + + evento: richiesta update parent + + + + + evento: selected + + Accesso in lettura e scrittura al filesystem per gestione files upload e download @@ -3197,6 +3247,13 @@ + + + carica dalla sessione un dato di tipo DateTime + + + + carica dalla sessione un dato di tipo long @@ -3720,6 +3777,16 @@ It is not meant to be be used directly. + + + event handler generico + + + + + sollevo evento selezione + + wrapper traduzione @@ -3727,6 +3794,17 @@ + + + modalità operativa controllo + + + + + escape dei parametri input dell'ODS + + + indica se i caratteri vadano forzati a maiuscoli @@ -3754,6 +3832,13 @@ + + + evento andata in editing del controllo + + + + classe gestione utente: auth e permission/ruoli - versione GENERICA @@ -4700,5 +4785,21 @@ + + + eventi associati a UserCOntrol SteamWare standard + + + + + tipo di evento segnalato + + + + + inizializzazione oggetto EventArg specifico + + + diff --git a/Projects/WebGIM/GIM_site/bin/VersGen.dll b/Projects/WebGIM/GIM_site/bin/VersGen.dll index b405afe..b3fc345 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/VersGen/WebGIM.cs b/Projects/WebGIM/VersGen/WebGIM.cs index d5d8ec6..44633df 100644 --- a/Projects/WebGIM/VersGen/WebGIM.cs +++ b/Projects/WebGIM/VersGen/WebGIM.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("1.6.292.526")] -[assembly: AssemblyFileVersion("1.6.292.526")] +[assembly: AssemblyVersion("1.6.295.534")] +[assembly: AssemblyFileVersion("1.6.295.534")] [assembly: AssemblyCopyright("Steamware © 2006-2016")] [assembly: AssemblyCompany("Steamware")] diff --git a/Projects/WebGIM/VersGen/WebGIM.tt b/Projects/WebGIM/VersGen/WebGIM.tt index 49fb46e..e2fd0fc 100644 --- a/Projects/WebGIM/VersGen/WebGIM.tt +++ b/Projects/WebGIM/VersGen/WebGIM.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("1.6.292.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("1.6.292.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("1.6.295.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("1.6.295.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware © 2006-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+ diff --git a/Projects/WebGIM/VersGen/bin/Debug/VersGen.dll b/Projects/WebGIM/VersGen/bin/Debug/VersGen.dll index c4e9b87..b3fc345 100644 Binary files a/Projects/WebGIM/VersGen/bin/Debug/VersGen.dll and b/Projects/WebGIM/VersGen/bin/Debug/VersGen.dll differ diff --git a/Projects/WebGIM/VersGen/bin/Release/VersGen.dll b/Projects/WebGIM/VersGen/bin/Release/VersGen.dll index b405afe..3c4e939 100644 Binary files a/Projects/WebGIM/VersGen/bin/Release/VersGen.dll and b/Projects/WebGIM/VersGen/bin/Release/VersGen.dll differ