diff --git a/CMS-SC-Data/DS_Applicazione.Designer.cs b/CMS-SC-Data/DS_Applicazione.Designer.cs index a84c512..20133f4 100644 --- a/CMS-SC-Data/DS_Applicazione.Designer.cs +++ b/CMS-SC-Data/DS_Applicazione.Designer.cs @@ -12533,7 +12533,7 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab FROM S [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[6]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[7]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT *\r\nFROM dbo.SchemaCollMacc"; @@ -12569,16 +12569,22 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab FROM S this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodFam", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[5].Connection = this.Connection; - this._commandCollection[5].CommandText = "dbo.stp_SCM_updateQuery"; + this._commandCollection[5].CommandText = "dbo.stp_SCM_insMisFasiMissing"; this._commandCollection[5].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[5].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[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Descrizione", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@opz", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@FasiEnab", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxDossier", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodScheda", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Vers", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_NumScheda", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxDossier", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[6].Connection = this.Connection; + this._commandCollection[6].CommandText = "dbo.stp_SCM_updateQuery"; + this._commandCollection[6].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[6].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[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Descrizione", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@opz", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@FasiEnab", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxDossier", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodScheda", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Vers", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_NumScheda", 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()] @@ -12939,8 +12945,36 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab FROM S [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 updateQuery(string Descrizione, string opz, string FasiEnab, global::System.Nullable Original_IdxDossier, string Original_CodScheda, global::System.Nullable Original_Vers, global::System.Nullable Original_NumScheda) { + public virtual int insMisFasiMissing(global::System.Nullable IdxDossier) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5]; + if ((IdxDossier.HasValue == true)) { + command.Parameters[1].Value = ((int)(IdxDossier.Value)); + } + else { + command.Parameters[1].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; + } + + [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 updateQuery(string Descrizione, string opz, string FasiEnab, global::System.Nullable Original_IdxDossier, string Original_CodScheda, global::System.Nullable Original_Vers, global::System.Nullable Original_NumScheda) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[6]; if ((Descrizione == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } diff --git a/CMS-SC-Data/DS_Applicazione.xsd b/CMS-SC-Data/DS_Applicazione.xsd index bf8d957..bad7722 100644 --- a/CMS-SC-Data/DS_Applicazione.xsd +++ b/CMS-SC-Data/DS_Applicazione.xsd @@ -4,7 +4,7 @@ - + @@ -997,6 +997,17 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab FROM S + + + + dbo.stp_SCM_insMisFasiMissing + + + + + + + diff --git a/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll b/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll index 535fd88..6f11655 100644 Binary files a/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll and b/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll differ diff --git a/CMS-SC-Data/bin/Debug/SteamWare.dll b/CMS-SC-Data/bin/Debug/SteamWare.dll index e469a3f..7a4f7e8 100644 Binary files a/CMS-SC-Data/bin/Debug/SteamWare.dll and b/CMS-SC-Data/bin/Debug/SteamWare.dll differ diff --git a/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll b/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll index 535fd88..6f11655 100644 Binary files a/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll and b/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll differ diff --git a/CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll b/CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll index b47e7e7..2617177 100644 Binary files a/CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll and b/CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll differ diff --git a/CMS_SC/ElencoSchede.aspx b/CMS_SC/ElencoSchede.aspx index ab1cd46..00b92e6 100644 --- a/CMS_SC/ElencoSchede.aspx +++ b/CMS_SC/ElencoSchede.aspx @@ -51,7 +51,10 @@
-
+
+ +
+

diff --git a/CMS_SC/ElencoSchede.aspx.cs b/CMS_SC/ElencoSchede.aspx.cs index bb85fcb..06c55e6 100644 --- a/CMS_SC/ElencoSchede.aspx.cs +++ b/CMS_SC/ElencoSchede.aspx.cs @@ -11,6 +11,11 @@ namespace CMS_SC { public partial class ElencoSchede : System.Web.UI.Page { + /// + /// caricamento pagina + /// + /// + /// protected void Page_Load(object sender, EventArgs e) { if (!Page.IsPostBack) @@ -20,6 +25,7 @@ namespace CMS_SC mod_elencoDossiers.pageSize = mod_righePag.numRowPag; btnAddFromFam.DataBind(); btnAddFromScheda.DataBind(); + btnInsMisFasi.DataBind(); fixBtnVisibility(); } mod_righePag.eh_newNum += mod_righePag_eh_newNum; @@ -103,6 +109,17 @@ namespace CMS_SC DtProxy.man.taSCM.insByCodSchedaVers(mod_elencoDossiers.idxDossier, ddlSelScheda.SelectedValue); mod_elencoSchedeDossier.doUpdate(); } + /// + /// aggiungo scheda selezionata + /// + /// + /// + protected void btnInsMisFasi_Click(object sender, EventArgs e) + { + // inserisco tutte le schede da template x tutte le fasi indicate nella struttura di setup... + DtProxy.man.taSCM.insMisFasiMissing(mod_elencoDossiers.idxDossier); + mod_elencoSchedeDossier.doUpdate(); + } } } \ No newline at end of file diff --git a/CMS_SC/ElencoSchede.aspx.designer.cs b/CMS_SC/ElencoSchede.aspx.designer.cs index 7fe4f69..44717f8 100644 --- a/CMS_SC/ElencoSchede.aspx.designer.cs +++ b/CMS_SC/ElencoSchede.aspx.designer.cs @@ -93,6 +93,15 @@ namespace CMS_SC { /// protected global::System.Web.UI.WebControls.Button btnAddFromFam; + /// + /// btnInsMisFasi control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnInsMisFasi; + /// /// ddlSelScheda control. /// diff --git a/CMS_SC/ToDo.txt b/CMS_SC/ToDo.txt index e5e31f1..c95dd44 100644 --- a/CMS_SC/ToDo.txt +++ b/CMS_SC/ToDo.txt @@ -9,22 +9,17 @@ - export excel "in bianco" (da compilare) da verificare - gestione allegati tipo FILE (blob? in scheda o "generale"?) +- allegati FILE (su DB come link) -- gestione creazione delle MISURE per le fasi definite da template in fase di creazione scheda (assegnazione a dossier) -- gestione template fasi da tabellone (in maschera) con selettore multiplo (1..n fasi) - - Potrebbero servire schede speciali in cui i valori di Minimo e Massimo sono variabili (tolleranze variabili a FDO) -> si è deciso con Carlo di costruire delle schede con 2 valori TESTUALI + un file allegato, x cui misura 1 = valori massimi da ORDINE, misura 2 valori massimi rilevati, misura 3 OK / KO (con deroga...), misura 4 = allegato file - in generale F1 = help del significato delle varie Icone. --> TOOLTIP -- selezione multipla delle schede ( es. cancellazione dal dossier ) --> inserire selezione con checkbox - -- allegati FILE (su DB come link) - ---------------------------------------------------------------------------------------------------------------- + ................................................................................................................ - DONE ................................................................................................................ @@ -60,6 +55,20 @@ GESTIONE FASI - gestita con "fase attiva" unica editabile TEMPLATE FASI per schede - In fase di definizione delle famiglie, poter dire per ciascuna scheda, in quale fase deve finire. In questo modo quando creo nuova scheda macchina, indicandone il modello nelle varie fasi mi trovo già le schede di collaudo previste. Struttura come FCS; ovvero campo testo; separatore da web.config, x cui 001#002#003 --> fasi 001, 002, 003 (magari cambiare fasi a 2 digit..) - valore default: 001#002 (costruzione + collaudo) +- gestione creazione delle MISURE per le fasi definite da template in fase di creazione scheda (assegnazione a dossier) +- gestione template fasi da tabellone (in maschera) con TESTO LIBERO +- fix stored clonazione misure (con valore std) +- fix procedura inserimento template fasi "massivo" -................................................................................................................ \ No newline at end of file +................................................................................................................ + + + +................................................................................................................ +- NOT DONE (perché con modifiche potrebbero NON servire) +................................................................................................................ + +- selezione multipla delle schede ( es. cancellazione dal dossier ) --> inserire selezione con checkbox? NO x ora, provare versioen con nuove gestioni... + +................................................................................................................ diff --git a/CMS_SC/bin/CMS-SC-Data.dll b/CMS_SC/bin/CMS-SC-Data.dll index 535fd88..6f11655 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 7d04725..64623b9 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 e469a3f..7a4f7e8 100644 Binary files a/CMS_SC/bin/SteamWare.dll and b/CMS_SC/bin/SteamWare.dll differ