diff --git a/CMS-SC-Data/CMS-SC-Data.csproj b/CMS-SC-Data/CMS-SC-Data.csproj index 4e50847..37c4c29 100644 --- a/CMS-SC-Data/CMS-SC-Data.csproj +++ b/CMS-SC-Data/CMS-SC-Data.csproj @@ -48,7 +48,7 @@ - + True True DS_Applicazione.xsd @@ -75,7 +75,7 @@ Designer MSDataSetGenerator - DS_Applicazione1.Designer.cs + DS_Applicazione.Designer.cs DS_Applicazione.xsd diff --git a/CMS-SC-Data/DS_Applicazione1.Designer.cs b/CMS-SC-Data/DS_Applicazione.Designer.cs similarity index 99% rename from CMS-SC-Data/DS_Applicazione1.Designer.cs rename to CMS-SC-Data/DS_Applicazione.Designer.cs index 38a0b40..04e6b05 100644 --- a/CMS-SC-Data/DS_Applicazione1.Designer.cs +++ b/CMS-SC-Data/DS_Applicazione.Designer.cs @@ -4042,6 +4042,8 @@ namespace CMS_SC_Data { private global::System.Data.DataColumn columnCodVisib; + private global::System.Data.DataColumn columnOrdinale; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public MisureDataTable() { @@ -4243,6 +4245,14 @@ namespace CMS_SC_Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn OrdinaleColumn { + get { + return this.columnOrdinale; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -4301,7 +4311,8 @@ namespace CMS_SC_Data { double LIVal, double LSVal, string CodSchedaVersNum, - string CodVisib) { + string CodVisib, + int Ordinale) { MisureRow rowMisureRow = ((MisureRow)(this.NewRow())); object[] columnValuesArray = new object[] { IdxDossier, @@ -4324,7 +4335,8 @@ namespace CMS_SC_Data { LIVal, LSVal, CodSchedaVersNum, - CodVisib}; + CodVisib, + Ordinale}; if ((parentAnagFasiRowByFK_IstanzeMisura_AnagFasi1 != null)) { columnValuesArray[5] = parentAnagFasiRowByFK_IstanzeMisura_AnagFasi1[0]; } @@ -4383,6 +4395,7 @@ namespace CMS_SC_Data { this.columnLSVal = base.Columns["LSVal"]; this.columnCodSchedaVersNum = base.Columns["CodSchedaVersNum"]; this.columnCodVisib = base.Columns["CodVisib"]; + this.columnOrdinale = base.Columns["Ordinale"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -4430,6 +4443,8 @@ namespace CMS_SC_Data { base.Columns.Add(this.columnCodSchedaVersNum); this.columnCodVisib = new global::System.Data.DataColumn("CodVisib", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnCodVisib); + this.columnOrdinale = new global::System.Data.DataColumn("Ordinale", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnOrdinale); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnIdxDossier, this.columnCodScheda, @@ -4465,6 +4480,7 @@ namespace CMS_SC_Data { this.columnCodSchedaVersNum.MaxLength = 152; this.columnCodVisib.AllowDBNull = false; this.columnCodVisib.MaxLength = 50; + this.columnOrdinale.AllowDBNull = false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -7571,6 +7587,17 @@ namespace CMS_SC_Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public int Ordinale { + get { + return ((int)(this[this.tableMisure.OrdinaleColumn])); + } + set { + this[this.tableMisure.OrdinaleColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public AnagFasiRow AnagFasiRow { @@ -13445,8 +13472,9 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin tableMapping.ColumnMappings.Add("MaxPar", "MaxPar"); tableMapping.ColumnMappings.Add("LIVal", "LIVal"); tableMapping.ColumnMappings.Add("LSVal", "LSVal"); - tableMapping.ColumnMappings.Add("CodSchedaVersNum", "CodSchedaVersNum"); tableMapping.ColumnMappings.Add("CodVisib", "CodVisib"); + tableMapping.ColumnMappings.Add("Codschedaversnum", "Codschedaversnum"); + tableMapping.ColumnMappings.Add("Ordinale", "Ordinale"); this._adapter.TableMappings.Add(tableMapping); } @@ -13463,7 +13491,9 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin this._commandCollection = new global::System.Data.SqlClient.SqlCommand[8]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT *\r\nFROM v_Misure"; + this._commandCollection[0].CommandText = "SELECT IdxDossier, CodScheda, Vers, NumScheda, CodMisura, Fase, Operatore, DataOr" + + "a, ValorePar, ValoreMis, OkValMis, CodDeroga, NomeMisura, TipoValMisura, NomePar" + + ", MinPar, MaxPar, LIVal, LSVal, CodVisib, Ordinale FROM v_Misure"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; diff --git a/CMS-SC-Data/DS_Applicazione.xsd b/CMS-SC-Data/DS_Applicazione.xsd index 9a8a040..7bb90ee 100644 --- a/CMS-SC-Data/DS_Applicazione.xsd +++ b/CMS-SC-Data/DS_Applicazione.xsd @@ -992,8 +992,7 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin - SELECT * -FROM v_Misure + SELECT IdxDossier, CodScheda, Vers, NumScheda, CodMisura, Fase, Operatore, DataOra, ValorePar, ValoreMis, OkValMis, CodDeroga, NomeMisura, TipoValMisura, NomePar, MinPar, MaxPar, LIVal, LSVal, CodVisib, Ordinale FROM v_Misure @@ -1019,8 +1018,9 @@ FROM v_Misure - + + @@ -1838,6 +1838,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa + diff --git a/CMS-SC-Data/bin/Release/CMS-SC-Data.dll b/CMS-SC-Data/bin/Release/CMS-SC-Data.dll index b403068..88dee24 100644 Binary files a/CMS-SC-Data/bin/Release/CMS-SC-Data.dll and b/CMS-SC-Data/bin/Release/CMS-SC-Data.dll differ diff --git a/CMS-SC-Data/bin/Release/CMS-SC-Data.dll.config b/CMS-SC-Data/bin/Release/CMS-SC-Data.dll.config index e0a1490..71b6150 100644 --- a/CMS-SC-Data/bin/Release/CMS-SC-Data.dll.config +++ b/CMS-SC-Data/bin/Release/CMS-SC-Data.dll.config @@ -4,7 +4,7 @@ \ No newline at end of file diff --git a/CMS-SC-Data/bin/Release/SteamWare.dll b/CMS-SC-Data/bin/Release/SteamWare.dll index c263e3c..c7181a1 100644 Binary files a/CMS-SC-Data/bin/Release/SteamWare.dll and b/CMS-SC-Data/bin/Release/SteamWare.dll differ diff --git a/CMS-SC-Data/obj/Release/CMS-SC-Data.dll b/CMS-SC-Data/obj/Release/CMS-SC-Data.dll index b403068..88dee24 100644 Binary files a/CMS-SC-Data/obj/Release/CMS-SC-Data.dll and b/CMS-SC-Data/obj/Release/CMS-SC-Data.dll differ diff --git a/CMS-SC-Data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll b/CMS-SC-Data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll index 160a6eb..9a5e0b6 100644 Binary files a/CMS-SC-Data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll and b/CMS-SC-Data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll differ diff --git a/CMS_SC/CMS_SC.csproj b/CMS_SC/CMS_SC.csproj index e431baf..3309fe4 100644 --- a/CMS_SC/CMS_SC.csproj +++ b/CMS_SC/CMS_SC.csproj @@ -865,6 +865,7 @@ + diff --git a/CMS_SC/WebUserControls/mod_DettScheda.ascx.cs b/CMS_SC/WebUserControls/mod_DettScheda.ascx.cs index 50e146f..b8514c4 100644 --- a/CMS_SC/WebUserControls/mod_DettScheda.ascx.cs +++ b/CMS_SC/WebUserControls/mod_DettScheda.ascx.cs @@ -16,7 +16,7 @@ namespace CMS_SC.WebUserControls /// public event EventHandler eh_selezioneValore; /// - /// richeista SAVE (da enter) + /// richiesta SAVE (da enter) /// public event EventHandler eh_reqSave; /// diff --git a/CMS_SC/WebUserControls/mod_SchemaCollFamMacc.ascx b/CMS_SC/WebUserControls/mod_SchemaCollFamMacc.ascx index 1eed348..d6e2d9e 100644 --- a/CMS_SC/WebUserControls/mod_SchemaCollFamMacc.ascx +++ b/CMS_SC/WebUserControls/mod_SchemaCollFamMacc.ascx @@ -36,6 +36,21 @@ + + + <%# traduci("moveMis") %> + + + + +
+ +
+
+ +
+ + diff --git a/CMS_SC/WebUserControls/mod_SchemaCollFamMacc.ascx.cs b/CMS_SC/WebUserControls/mod_SchemaCollFamMacc.ascx.cs index 9f957c4..588d0ff 100644 --- a/CMS_SC/WebUserControls/mod_SchemaCollFamMacc.ascx.cs +++ b/CMS_SC/WebUserControls/mod_SchemaCollFamMacc.ascx.cs @@ -10,7 +10,34 @@ using SteamWare; namespace CMS_SC.WebUserControls { public partial class mod_SchemaCollFamMacc : SteamWare.UserControl - { + {/// + /// selezione valore in DettScheda + /// + public event EventHandler eh_selezioneValore; + /// + /// richiesta SAVE (da enter) + /// + public event EventHandler eh_reqSave; + /// + /// sollevo evento selezione + /// + protected void raiseEvent() + { + // sollevo evento nuovo valore... + if (eh_selezioneValore != null) + { + eh_selezioneValore(this, new EventArgs()); + } + } + /// + /// resetto selezione + /// + private void resetSelezione() + { + grView.SelectedIndex = -1; + grView.DataBind(); + raiseEvent(); + } protected void Page_Load(object sender, EventArgs e) { } @@ -61,5 +88,89 @@ namespace CMS_SC.WebUserControls protected void ods_Updating(object sender, ObjectDataSourceMethodEventArgs e) { } + /// + /// selezionato valore + /// + /// + /// + protected void grView_SelectedIndexChanged(object sender, EventArgs e) + { + // verifico se ho un argomento di tipo moveUp / moveDown... quale comando? + string _comando = ""; + if (SteamWare.memLayer.ML.isInSessionObject("nextObjCommand")) + { + _comando = SteamWare.memLayer.ML.StringSessionObj("nextObjCommand"); + SteamWare.memLayer.ML.emptySessionVal("nextObjCommand"); + } + if (_comando != "") + { +#if false + // SE c'era comando eseguo move... + switch (_comando) + { + case "moveUp": + case "moveDown": + DtProxy.man.taDS.moveUpDown(_comando, CodSchedaSel, VersSel, CodMisuraSel); + break; + case "clone": + DtProxy.man.taDS.clone(memLayer.ML.QSS("CodSchedaVers"), grView.SelectedDataKey["CodMisura"].ToString()); + break; + default: + break; + } +#endif + resetSelezione(); + } + else + { + raiseEvent(); + } + } + /// + /// salvo in session il prox comando + /// + /// + /// + protected void lb_Click(object sender, EventArgs e) + { + SteamWare.memLayer.ML.setSessionVal("nextObjCommand", ((LinkButton)sender).CommandArgument); + } + /// + /// determina visibilità frecce spostamento + /// + /// direzione: UP / DOWN + /// CodFam da verificare + /// CodSchedaVers da verificare + /// + public bool arrowVisible(object _direction, object _CodFam, object _CodSchedaVers) + { + bool answ = false; + string direction = _direction.ToString(); + string CodFam = _CodFam.ToString(); + string CodSchedaVers = _CodSchedaVers.ToString(); + if (memLayer.ML.BoolSessionObj("filtByFamMac")) + { + answ = true; +#if false + // recupero TUTTE le righe della scheda dett corrente + DS_Applicazione.DettSchedaDataTable tab = DtProxy.man.taDS.getByScheda(memLayer.ML.QSS("CodSchedaVers")); + // a seconda della direzione CERCO se ci siano misure prima/dopo... + string where = ""; + switch (direction) + { + case "UP": + where = string.Format("CodSchedaVers < '{0}'", CodSchedaVers); + break; + case "DOWN": + where = string.Format("CodSchedaVers > '{0}'", CodSchedaVers); + break; + default: + break; + } + answ = tab.Select(where).Length > 0; +#endif + } + return answ; + } } } \ No newline at end of file diff --git a/CMS_SC/bin/CMS-SC-Data.dll b/CMS_SC/bin/CMS-SC-Data.dll index b403068..88dee24 100644 Binary files a/CMS_SC/bin/CMS-SC-Data.dll and b/CMS_SC/bin/CMS-SC-Data.dll differ diff --git a/CMS_SC/bin/CMS_SC.dll b/CMS_SC/bin/CMS_SC.dll index 6892204..604b27c 100644 Binary files a/CMS_SC/bin/CMS_SC.dll and b/CMS_SC/bin/CMS_SC.dll differ diff --git a/CMS_SC/bin/SteamWare.dll b/CMS_SC/bin/SteamWare.dll index c263e3c..c7181a1 100644 Binary files a/CMS_SC/bin/SteamWare.dll and b/CMS_SC/bin/SteamWare.dll differ diff --git a/VersGen/bin/Release/VersGen.dll b/VersGen/bin/Release/VersGen.dll index ed54b49..9efb739 100644 Binary files a/VersGen/bin/Release/VersGen.dll and b/VersGen/bin/Release/VersGen.dll differ