diff --git a/CMS-SC-Data/DS_Applicazione.Designer.cs b/CMS-SC-Data/DS_Applicazione.Designer.cs index 4e2e4f1..cc53003 100644 --- a/CMS-SC-Data/DS_Applicazione.Designer.cs +++ b/CMS-SC-Data/DS_Applicazione.Designer.cs @@ -16935,6 +16935,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa this._commandCollection[1].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[1].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[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Fase", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Rev", 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()] @@ -16965,7 +16966,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] - public virtual DS_Applicazione.StatoCollaudiDataTable getByDossFase(global::System.Nullable idxDossier, string Fase) { + public virtual DS_Applicazione.StatoCollaudiDataTable getByDossFase(global::System.Nullable idxDossier, string Fase, global::System.Nullable Rev) { this.Adapter.SelectCommand = this.CommandCollection[1]; if ((idxDossier.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(idxDossier.Value)); @@ -16979,6 +16980,12 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa else { this.Adapter.SelectCommand.Parameters[2].Value = ((string)(Fase)); } + if ((Rev.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[3].Value = ((int)(Rev.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; + } DS_Applicazione.StatoCollaudiDataTable dataTable = new DS_Applicazione.StatoCollaudiDataTable(); this.Adapter.Fill(dataTable); return dataTable; diff --git a/CMS-SC-Data/DS_Applicazione.xsd b/CMS-SC-Data/DS_Applicazione.xsd index 4f7765f..fc92a60 100644 --- a/CMS-SC-Data/DS_Applicazione.xsd +++ b/CMS-SC-Data/DS_Applicazione.xsd @@ -1479,6 +1479,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa + diff --git a/CMS-SC-Data/DS_Applicazione.xss b/CMS-SC-Data/DS_Applicazione.xss index 3b406c3..ca7af86 100644 --- a/CMS-SC-Data/DS_Applicazione.xss +++ b/CMS-SC-Data/DS_Applicazione.xss @@ -8,20 +8,20 @@ - + - + - - + + 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 a1a2beb..63e307b 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/StatoDossiers.aspx b/CMS_SC/StatoDossiers.aspx index 783a63d..fedc7a0 100644 --- a/CMS_SC/StatoDossiers.aspx +++ b/CMS_SC/StatoDossiers.aspx @@ -34,20 +34,16 @@ - - + - <%----%> - <%-- OnSelectedIndexChanged="ddlRev_SelectedIndexChanged"--%> - - - - - - - - - <%----%> + + + + + + + + diff --git a/CMS_SC/StatoDossiers.aspx.cs b/CMS_SC/StatoDossiers.aspx.cs index 1960b69..2766648 100644 --- a/CMS_SC/StatoDossiers.aspx.cs +++ b/CMS_SC/StatoDossiers.aspx.cs @@ -161,10 +161,25 @@ namespace CMS_SC protected void ddlFase_SelectedIndexChanged(object sender, EventArgs e) { - // salvo! savePar("ddlFase", ddlFase.SelectedValue); + // aggiorno rev e salvo... + ddlRev.DataBind(); + updateFaseRev(); + } + protected void ddlRev_SelectedIndexChanged(object sender, EventArgs e) + { + savePar("ddlRev", ddlRev.SelectedValue); + updateFaseRev(); + } + /// + /// Salva ed aggiorna fase e rev selezionate + /// + private void updateFaseRev() + { + // salvo! // fix visualizzazione mod_StatoCollaudi.Fase = ddlFase.SelectedValue; + mod_StatoCollaudi.Rev = ddlRev.SelectedValue; } } diff --git a/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx b/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx index 743c6b6..30143c1 100644 --- a/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx +++ b/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx @@ -51,7 +51,9 @@ + + diff --git a/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx.cs b/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx.cs index 9accb63..7511b2d 100644 --- a/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx.cs +++ b/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx.cs @@ -46,7 +46,7 @@ namespace CMS_SC.WebUserControls } } /// - /// dossier selezionato + /// FASE selezionato /// public string Fase { @@ -60,6 +60,21 @@ namespace CMS_SC.WebUserControls grView.DataBind(); } } + /// + /// REV selezionata + /// + public string Rev + { + get + { + return hfRev.Value; + } + set + { + hfRev.Value = value; + grView.DataBind(); + } + } public string CodSchedaVersNum { diff --git a/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx.designer.cs b/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx.designer.cs index e6b5853..fc55a59 100644 --- a/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx.designer.cs +++ b/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx.designer.cs @@ -47,5 +47,14 @@ namespace CMS_SC.WebUserControls { /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.HiddenField hfFase; + + /// + /// Controllo hfRev. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HiddenField hfRev; } } diff --git a/CMS_SC/bin/CMS-SC-Data.dll b/CMS_SC/bin/CMS-SC-Data.dll index d27d9d1..9883a4a 100644 Binary files a/CMS_SC/bin/CMS-SC-Data.dll and b/CMS_SC/bin/CMS-SC-Data.dll differ