diff --git a/CMS-SC-Data/DS_Applicazione.Designer.cs b/CMS-SC-Data/DS_Applicazione.Designer.cs index 8c9b8db..0cfb885 100644 --- a/CMS-SC-Data/DS_Applicazione.Designer.cs +++ b/CMS-SC-Data/DS_Applicazione.Designer.cs @@ -4711,6 +4711,8 @@ namespace CMS_SC_Data { private global::System.Data.DataColumn columnFase; + private global::System.Data.DataColumn columnRev; + private global::System.Data.DataColumn columnOperatore; private global::System.Data.DataColumn columnDataOra; @@ -4737,6 +4739,10 @@ namespace CMS_SC_Data { private global::System.Data.DataColumn columnLSVal; + private global::System.Data.DataColumn columnCodVisib; + + private global::System.Data.DataColumn columnOrdinale; + private global::System.Data.DataColumn columnDescFase; private global::System.Data.DataColumn columnCliente; @@ -4834,6 +4840,14 @@ namespace CMS_SC_Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn RevColumn { + get { + return this.columnRev; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn OperatoreColumn { @@ -4938,6 +4952,22 @@ namespace CMS_SC_Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn CodVisibColumn { + get { + return this.columnCodVisib; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.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", "15.0.0.0")] public global::System.Data.DataColumn DescFaseColumn { @@ -5015,6 +5045,7 @@ namespace CMS_SC_Data { int NumScheda, string CodMisura, string Fase, + int Rev, string Operatore, System.DateTime DataOra, double ValorePar, @@ -5028,6 +5059,8 @@ namespace CMS_SC_Data { double MaxPar, double LIVal, double LSVal, + string CodVisib, + int Ordinale, string DescFase, string Cliente, string MatrMacchina, @@ -5041,6 +5074,7 @@ namespace CMS_SC_Data { NumScheda, CodMisura, Fase, + Rev, Operatore, DataOra, ValorePar, @@ -5054,6 +5088,8 @@ namespace CMS_SC_Data { MaxPar, LIVal, LSVal, + CodVisib, + Ordinale, DescFase, Cliente, MatrMacchina, @@ -5087,6 +5123,7 @@ namespace CMS_SC_Data { this.columnNumScheda = base.Columns["NumScheda"]; this.columnCodMisura = base.Columns["CodMisura"]; this.columnFase = base.Columns["Fase"]; + this.columnRev = base.Columns["Rev"]; this.columnOperatore = base.Columns["Operatore"]; this.columnDataOra = base.Columns["DataOra"]; this.columnValorePar = base.Columns["ValorePar"]; @@ -5100,6 +5137,8 @@ namespace CMS_SC_Data { this.columnMaxPar = base.Columns["MaxPar"]; this.columnLIVal = base.Columns["LIVal"]; this.columnLSVal = base.Columns["LSVal"]; + this.columnCodVisib = base.Columns["CodVisib"]; + this.columnOrdinale = base.Columns["Ordinale"]; this.columnDescFase = base.Columns["DescFase"]; this.columnCliente = base.Columns["Cliente"]; this.columnMatrMacchina = base.Columns["MatrMacchina"]; @@ -5123,6 +5162,8 @@ namespace CMS_SC_Data { base.Columns.Add(this.columnCodMisura); this.columnFase = new global::System.Data.DataColumn("Fase", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnFase); + this.columnRev = new global::System.Data.DataColumn("Rev", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnRev); this.columnOperatore = new global::System.Data.DataColumn("Operatore", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnOperatore); this.columnDataOra = new global::System.Data.DataColumn("DataOra", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); @@ -5149,6 +5190,10 @@ namespace CMS_SC_Data { base.Columns.Add(this.columnLIVal); this.columnLSVal = new global::System.Data.DataColumn("LSVal", typeof(double), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnLSVal); + 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.columnDescFase = new global::System.Data.DataColumn("DescFase", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnDescFase); this.columnCliente = new global::System.Data.DataColumn("Cliente", typeof(string), null, global::System.Data.MappingType.Element); @@ -5168,6 +5213,7 @@ namespace CMS_SC_Data { this.columnCodMisura.MaxLength = 50; this.columnFase.AllowDBNull = false; this.columnFase.MaxLength = 50; + this.columnRev.AllowDBNull = false; this.columnOperatore.AllowDBNull = false; this.columnOperatore.MaxLength = 250; this.columnDataOra.AllowDBNull = false; @@ -5178,11 +5224,18 @@ namespace CMS_SC_Data { this.columnCodDeroga.AllowDBNull = false; this.columnCodDeroga.MaxLength = 50; this.columnNomeMisura.AllowDBNull = false; - this.columnNomeMisura.MaxLength = 50; + this.columnNomeMisura.MaxLength = 500; this.columnTipoValMisura.AllowDBNull = false; this.columnTipoValMisura.MaxLength = 50; this.columnNomePar.AllowDBNull = false; - this.columnNomePar.MaxLength = 50; + this.columnNomePar.MaxLength = 100; + this.columnMinPar.ReadOnly = true; + this.columnMaxPar.ReadOnly = true; + this.columnLIVal.ReadOnly = true; + this.columnLSVal.ReadOnly = true; + this.columnCodVisib.AllowDBNull = false; + this.columnCodVisib.MaxLength = 50; + this.columnOrdinale.AllowDBNull = false; this.columnDescFase.MaxLength = 50; this.columnCliente.AllowDBNull = false; this.columnCliente.MaxLength = 50; @@ -8541,6 +8594,17 @@ namespace CMS_SC_Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public int Rev { + get { + return ((int)(this[this.tableReportData.RevColumn])); + } + set { + this[this.tableReportData.RevColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public string Operatore { @@ -8704,6 +8768,28 @@ namespace CMS_SC_Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public string CodVisib { + get { + return ((string)(this[this.tableReportData.CodVisibColumn])); + } + set { + this[this.tableReportData.CodVisibColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public int Ordinale { + get { + return ((int)(this[this.tableReportData.OrdinaleColumn])); + } + set { + this[this.tableReportData.OrdinaleColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public string DescFase { @@ -15388,6 +15474,7 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin tableMapping.ColumnMappings.Add("NumScheda", "NumScheda"); tableMapping.ColumnMappings.Add("CodMisura", "CodMisura"); tableMapping.ColumnMappings.Add("Fase", "Fase"); + tableMapping.ColumnMappings.Add("Rev", "Rev"); tableMapping.ColumnMappings.Add("Operatore", "Operatore"); tableMapping.ColumnMappings.Add("DataOra", "DataOra"); tableMapping.ColumnMappings.Add("ValorePar", "ValorePar"); @@ -15401,6 +15488,8 @@ 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("CodVisib", "CodVisib"); + tableMapping.ColumnMappings.Add("Ordinale", "Ordinale"); tableMapping.ColumnMappings.Add("DescFase", "DescFase"); tableMapping.ColumnMappings.Add("Cliente", "Cliente"); tableMapping.ColumnMappings.Add("MatrMacchina", "MatrMacchina"); @@ -15426,13 +15515,14 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin this._commandCollection[0].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[0].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[0].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[0].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()] [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.Fill, true)] - public virtual int Fill(DS_Applicazione.ReportDataDataTable dataTable, global::System.Nullable IdxDossier, string Fase) { + public virtual int Fill(DS_Applicazione.ReportDataDataTable dataTable, global::System.Nullable IdxDossier, string Fase, global::System.Nullable Rev) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((IdxDossier.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(IdxDossier.Value)); @@ -15446,6 +15536,12 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin 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; + } if ((this.ClearBeforeFill == true)) { dataTable.Clear(); } @@ -15457,7 +15553,7 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin [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, true)] - public virtual DS_Applicazione.ReportDataDataTable GetData(global::System.Nullable IdxDossier, string Fase) { + public virtual DS_Applicazione.ReportDataDataTable GetData(global::System.Nullable IdxDossier, string Fase, global::System.Nullable Rev) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((IdxDossier.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(IdxDossier.Value)); @@ -15471,6 +15567,12 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin 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.ReportDataDataTable dataTable = new DS_Applicazione.ReportDataDataTable(); this.Adapter.Fill(dataTable); return dataTable; diff --git a/CMS-SC-Data/DS_Applicazione.xsd b/CMS-SC-Data/DS_Applicazione.xsd index 897c1e3..0d0402b 100644 --- a/CMS-SC-Data/DS_Applicazione.xsd +++ b/CMS-SC-Data/DS_Applicazione.xsd @@ -1182,6 +1182,7 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin + @@ -1195,6 +1196,7 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin + @@ -1208,6 +1210,8 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin + + @@ -1544,7 +1548,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1565,7 +1569,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1603,7 +1607,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1623,7 +1627,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1665,7 +1669,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1714,7 +1718,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1739,7 +1743,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1797,7 +1801,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1844,7 +1848,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1882,7 +1886,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1977,7 +1981,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -2011,6 +2015,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa + @@ -2038,7 +2043,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -2050,16 +2055,24 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa + + + + + + + + + + + - - - - + @@ -2091,7 +2104,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -2111,7 +2124,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -2131,7 +2144,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -2158,7 +2171,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -2215,7 +2228,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -2311,16 +2324,16 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/CMS-SC-Data/DS_Applicazione.xss b/CMS-SC-Data/DS_Applicazione.xss index 849704d..cc3c3d9 100644 --- a/CMS-SC-Data/DS_Applicazione.xss +++ b/CMS-SC-Data/DS_Applicazione.xss @@ -4,24 +4,24 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -84,7 +84,7 @@ - + 1053 @@ -100,7 +100,7 @@ - + 355 @@ -124,7 +124,7 @@ - + 1329 @@ -136,7 +136,7 @@ - + 1476 diff --git a/CMS-SC-Data/obj/Debug/CMS-SC-Data.csproj.CoreCompileInputs.cache b/CMS-SC-Data/obj/Debug/CMS-SC-Data.csproj.CoreCompileInputs.cache index 9147403..81395e3 100644 --- a/CMS-SC-Data/obj/Debug/CMS-SC-Data.csproj.CoreCompileInputs.cache +++ b/CMS-SC-Data/obj/Debug/CMS-SC-Data.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -c355ee6932ff22a2f6c7d84b3449927b5b4b5506 +73bbb3de17cae454ab54595b2c5a3ff7389a549e diff --git a/CMS-SC-Data/obj/Debug/CMS-SC-Data.csprojResolveAssemblyReference.cache b/CMS-SC-Data/obj/Debug/CMS-SC-Data.csprojResolveAssemblyReference.cache index 9facb23..3ef38d9 100644 Binary files a/CMS-SC-Data/obj/Debug/CMS-SC-Data.csprojResolveAssemblyReference.cache and b/CMS-SC-Data/obj/Debug/CMS-SC-Data.csprojResolveAssemblyReference.cache 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 31d234e..7a1eb0d 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/CMS_SC.csproj b/CMS_SC/CMS_SC.csproj index 326f35b..3fb6823 100644 --- a/CMS_SC/CMS_SC.csproj +++ b/CMS_SC/CMS_SC.csproj @@ -100,15 +100,13 @@ - ..\packages\Microsoft.Report.Viewer.11.0.0.0\lib\net\Microsoft.ReportViewer.Common.dll - True + ..\packages\Microsoft.ReportViewer.2012.Runtime.11.0.3452.0\lib\Microsoft.ReportViewer.Common.dll - ..\packages\Microsoft.Report.Viewer.11.0.0.0\lib\net\Microsoft.ReportViewer.ProcessingObjectModel.DLL + ..\packages\Microsoft.ReportViewer.2012.Runtime.11.0.3452.0\lib\Microsoft.ReportViewer.ProcessingObjectModel.DLL - ..\packages\Microsoft.Report.Viewer.11.0.0.0\lib\net\Microsoft.ReportViewer.WebForms.DLL - True + ..\packages\Microsoft.ReportViewer.2012.Runtime.11.0.3452.0\lib\Microsoft.ReportViewer.WebForms.DLL ..\packages\Microsoft.AspNet.ScriptManager.MSAjax.5.0.0\lib\net45\Microsoft.ScriptManager.MSAjax.dll diff --git a/CMS_SC/ElencoSchede.aspx.cs b/CMS_SC/ElencoSchede.aspx.cs index b87bbc5..76a0f59 100644 --- a/CMS_SC/ElencoSchede.aspx.cs +++ b/CMS_SC/ElencoSchede.aspx.cs @@ -7,6 +7,20 @@ namespace CMS_SC { public partial class ElencoSchede : SteamWare.UserPage { + /// + /// IdxDossier selezionato + /// + public int idxDossier + { + get + { + return memLayer.ML.IntSessionObj("idxDossierEdit"); + } + set + { + memLayer.ML.setSessionVal("idxDossierEdit", value); + } + } /// /// caricamento pagina /// @@ -80,9 +94,24 @@ namespace CMS_SC /// private void fixHiperLinks() { - hlShowReportFull.NavigateUrl = string.Format("ReportCompleto?IdxDossier={0}", mod_elencoDossiers.idxDossier); - hlShowReportComp.NavigateUrl = string.Format("ReportCompatto?IdxDossier={0}", mod_elencoDossiers.idxDossier); - hlShowReportCli.NavigateUrl = string.Format("ReportCliente?IdxDossier={0}", mod_elencoDossiers.idxDossier); + // devo recuperare fase act x dossier... + string faseAct = "000"; + try + { + if (idxDossier > 0) + { + DS_Applicazione.ElencoDossierRow riga = DtProxy.man.taED.getByDossier(idxDossier)[0]; + faseAct = riga.FaseAct; + } + } + catch + { + idxDossier = 0; + } + // sistemo links! + hlShowReportFull.NavigateUrl = string.Format("ReportCompleto?IdxDossier={0}&Fase={1}", mod_elencoDossiers.idxDossier, faseAct); + hlShowReportComp.NavigateUrl = string.Format("ReportCompatto?IdxDossier={0}&Fase={1}", mod_elencoDossiers.idxDossier, faseAct); + hlShowReportCli.NavigateUrl = string.Format("ReportCliente?IdxDossier={0}&Fase={1}", mod_elencoDossiers.idxDossier, faseAct); } /// /// url base area services diff --git a/CMS_SC/ReportCompleto.aspx b/CMS_SC/ReportCompleto.aspx index 309a128..ce991e0 100644 --- a/CMS_SC/ReportCompleto.aspx +++ b/CMS_SC/ReportCompleto.aspx @@ -11,15 +11,27 @@
-
+

<%: traduci("ReportCompleto") %>

+
-
+
Fase
-
+
+ Rev + + + + + + + + +
+
Lingua diff --git a/CMS_SC/ReportCompleto.aspx.cs b/CMS_SC/ReportCompleto.aspx.cs index ad08d39..1783dba 100644 --- a/CMS_SC/ReportCompleto.aspx.cs +++ b/CMS_SC/ReportCompleto.aspx.cs @@ -4,46 +4,72 @@ using System.Web.UI; namespace CMS_SC { - public partial class ReportCompleto : System.Web.UI.Page + public partial class ReportCompleto : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) { - protected void Page_Load(object sender, EventArgs e) - { - if (!Page.IsPostBack) - { - mod_reportCompleto.Fase = ddlFase.SelectedValue; - mod_reportCompleto.Lingua = ddlLingue.SelectedValue; - } - } - /// - /// wrapper traduzione - /// - /// - /// - public string traduci(string lemma) - { - return user_std.UtSn.Traduci(lemma); - } - /// - /// cambio fase - /// - /// - /// - protected void ddlFase_SelectedIndexChanged(object sender, EventArgs e) - { - mod_reportCompleto.Fase = ddlFase.SelectedValue; - mod_reportCompleto.Lingua = ddlLingue.SelectedValue; - mod_reportCompleto.fixReport(); - } - /// - /// cambio lingua - /// - /// - /// - protected void ddlLingue_SelectedIndexChanged(object sender, EventArgs e) - { - mod_reportCompleto.Fase = ddlFase.SelectedValue; - mod_reportCompleto.Lingua = ddlLingue.SelectedValue; - mod_reportCompleto.fixReport(); - } + if (!Page.IsPostBack) + { + ddlFase.DataBind(); + ddlRev.DataBind(); + ddlLingue.DataBind(); + hfIdxDossier.Value = memLayer.ML.QSS("IdxDossier"); + // se c'è seleziono fase... + ddlFase.SelectedValue= memLayer.ML.QSS("Fase"); + //mod_reportCompleto.Fase = ddlFase.SelectedValue; + //mod_reportCompleto.Lingua = ddlLingue.SelectedValue; + fixSelReport(); + } } + /// + /// wrapper traduzione + /// + /// + /// + public string traduci(string lemma) + { + return user_std.UtSn.Traduci(lemma); + } + /// + /// cambio fase + /// + /// + /// + protected void ddlFase_SelectedIndexChanged(object sender, EventArgs e) + { + fixSelReport(); + } + /// + /// cambio lingua + /// + /// + /// + protected void ddlLingue_SelectedIndexChanged(object sender, EventArgs e) + { + fixSelReport(); + } + /// + /// Cambio revisione + /// + /// + /// + protected void ddlRev_SelectedIndexChanged(object sender, EventArgs e) + { + fixSelReport(); + } + /// + /// Sistemazione report con parametri + /// + private void fixSelReport() + { + // recupero num revisione + int rev = 0; + int.TryParse(ddlRev.SelectedValue, out rev); + // imposto! + mod_reportCompleto.Fase = ddlFase.SelectedValue; + mod_reportCompleto.Rev = rev; + mod_reportCompleto.Lingua = ddlLingue.SelectedValue; + mod_reportCompleto.fixReport(); + } + } } \ No newline at end of file diff --git a/CMS_SC/ReportCompleto.aspx.designer.cs b/CMS_SC/ReportCompleto.aspx.designer.cs index ac76eda..6d478e6 100644 --- a/CMS_SC/ReportCompleto.aspx.designer.cs +++ b/CMS_SC/ReportCompleto.aspx.designer.cs @@ -12,6 +12,15 @@ namespace CMS_SC { public partial class ReportCompleto { + /// + /// Controllo hfIdxDossier. + /// + /// + /// 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 hfIdxDossier; + /// /// Controllo ddlFase. /// @@ -30,6 +39,24 @@ namespace CMS_SC { /// protected global::System.Web.UI.WebControls.ObjectDataSource odsFase; + /// + /// Controllo ddlRev. + /// + /// + /// 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.DropDownList ddlRev; + + /// + /// Controllo odsRev. + /// + /// + /// 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.ObjectDataSource odsRev; + /// /// Controllo ddlLingue. /// diff --git a/CMS_SC/Web.config b/CMS_SC/Web.config index 48c682e..bb83e40 100644 --- a/CMS_SC/Web.config +++ b/CMS_SC/Web.config @@ -26,7 +26,7 @@ - + diff --git a/CMS_SC/WebUserControls/mod_reportCompleto.ascx.cs b/CMS_SC/WebUserControls/mod_reportCompleto.ascx.cs index 6c41449..e3320ec 100644 --- a/CMS_SC/WebUserControls/mod_reportCompleto.ascx.cs +++ b/CMS_SC/WebUserControls/mod_reportCompleto.ascx.cs @@ -7,64 +7,68 @@ using System.Web.UI; namespace CMS_SC.WebUserControls { - public partial class mod_reportCompleto : System.Web.UI.UserControl + public partial class mod_reportCompleto : System.Web.UI.UserControl + { + /// + /// Tipo di report richiesto (da URL): Full / Cli / Short + /// + public string TipoReport { get; set; } + /// + /// Fase x report richiesto + /// + public string Fase { get; set; } + /// + /// REV Fase x report richiesto + /// + public int Rev { get; set; } + /// + /// Lingua x report richiesto + /// + public string Lingua { get; set; } + /// + /// dossier di cui creare report + /// + protected int IdxDossier { - /// - /// Tipo di report richiesto (da URL): Full / Cli / Short - /// - public string TipoReport { get; set; } - /// - /// Fase x report richiesto - /// - public string Fase { get; set; } - /// - /// Lingua x report richiesto - /// - public string Lingua { get; set; } - /// - /// dossier di cui creare report - /// - protected int IdxDossier - { - get - { - return memLayer.ML.QSI("IdxDossier"); - } - } - protected void Page_Load(object sender, EventArgs e) - { - if (!Page.IsPostBack) - { - // collego il report... - fixReport(); - } - } - /// - /// sistema dati x report - /// - public void fixReport() - { - ReportCMS.ProcessingMode = Microsoft.Reporting.WebForms.ProcessingMode.Local; - LocalReport localReport = ReportCMS.LocalReport; - localReport.EnableExternalImages = true; + get + { + return memLayer.ML.QSI("IdxDossier"); + } + } + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + // collego il report... + fixReport(); + } + } + /// + /// sistema dati x report + /// + public void fixReport() + { + ReportCMS.ProcessingMode = Microsoft.Reporting.WebForms.ProcessingMode.Local; + LocalReport localReport = ReportCMS.LocalReport; + localReport.EnableExternalImages = true; - // se HO un dossier e ho un tipo report... - if (TipoReport != "" && IdxDossier > 0) - { + // se HO un dossier e ho un tipo report... + if (TipoReport != "" && IdxDossier > 0) + { - // 1) impostazione file report - localReport.ReportPath = string.Format(@".\Reports\Report_{0}.rdlc", TipoReport); + // 1) impostazione file report + localReport.ReportPath = string.Format(@".\Reports\Report_{0}.rdlc", TipoReport); - // 2) caricamento tab dati - DataTable tabDati = new DataTable(); - DataTable tabVoc = new DataTable(); - tabDati = (DataTable)DtProxy.man.taRep.GetData(IdxDossier, Fase); - tabVoc = (DataTable)DtProxy.man.taVoc.getByLinguaLemmaLike(Lingua,"SC_PRT"); - - // 3) inserimento dataset nel report - localReport.DataSources.Clear(); - localReport.DataSources.Add(new ReportDataSource("dsSchedaCollaudo", tabDati)); - localReport.DataSources.Add(new ReportDataSource("dsVocabolario", tabVoc)); + // 2) caricamento tab dati + DataTable tabDati = new DataTable(); + DataTable tabVoc = new DataTable(); + tabDati = (DataTable)DtProxy.man.taRep.GetData(IdxDossier, Fase, Rev); + tabVoc = (DataTable)DtProxy.man.taVoc.getByLinguaLemmaLike(Lingua, "SC_PRT"); + + // 3) inserimento dataset nel report + localReport.DataSources.Clear(); + localReport.DataSources.Add(new ReportDataSource("dsSchedaCollaudo", tabDati)); + localReport.DataSources.Add(new ReportDataSource("dsVocabolario", tabVoc)); #if false // 4) aggiungo parametro @@ -79,31 +83,31 @@ namespace CMS_SC.WebUserControls } localReport.SetParameters(filtroPag); #endif - showReport(true); - } - else - { - // indico che mancano dati... - showReport(false); - } - } - /// - /// wrapper traduzione - /// - /// - /// - public string traduci(string lemma) - { - return user_std.UtSn.Traduci(lemma); - } - /// - /// sistema visibilità report - /// - /// - private void showReport(bool showRep) - { - ReportCMS.Visible = showRep; - lblOut.Visible = !showRep; - } + showReport(true); + } + else + { + // indico che mancano dati... + showReport(false); + } } + /// + /// wrapper traduzione + /// + /// + /// + public string traduci(string lemma) + { + return user_std.UtSn.Traduci(lemma); + } + /// + /// sistema visibilità report + /// + /// + private void showReport(bool showRep) + { + ReportCMS.Visible = showRep; + lblOut.Visible = !showRep; + } + } } \ 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 e93858e..63cfe2a 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.config b/CMS_SC/bin/CMS_SC.dll.config index 48c682e..bb83e40 100644 --- a/CMS_SC/bin/CMS_SC.dll.config +++ b/CMS_SC/bin/CMS_SC.dll.config @@ -26,7 +26,7 @@ - + diff --git a/CMS_SC/bin/Microsoft.ReportViewer.Common.dll b/CMS_SC/bin/Microsoft.ReportViewer.Common.dll index b418a45..56e5d41 100644 Binary files a/CMS_SC/bin/Microsoft.ReportViewer.Common.dll and b/CMS_SC/bin/Microsoft.ReportViewer.Common.dll differ diff --git a/CMS_SC/bin/Microsoft.ReportViewer.WebForms.dll b/CMS_SC/bin/Microsoft.ReportViewer.WebForms.dll index 2ca9b6a..7952e9c 100644 Binary files a/CMS_SC/bin/Microsoft.ReportViewer.WebForms.dll and b/CMS_SC/bin/Microsoft.ReportViewer.WebForms.dll differ diff --git a/CMS_SC/bin/SteamWare.dll b/CMS_SC/bin/SteamWare.dll index e7143d1..de5038e 100644 Binary files a/CMS_SC/bin/SteamWare.dll and b/CMS_SC/bin/SteamWare.dll differ diff --git a/CMS_SC/packages.config b/CMS_SC/packages.config index f342785..164a63d 100644 --- a/CMS_SC/packages.config +++ b/CMS_SC/packages.config @@ -26,6 +26,7 @@ + diff --git a/CMS_SC/sql/Update_3.2.sql b/CMS_SC/sql/Update_3.2.sql index 34c65f9..ab6547b 100644 --- a/CMS_SC/sql/Update_3.2.sql +++ b/CMS_SC/sql/Update_3.2.sql @@ -21,3 +21,47 @@ exec voc.stp_insNewLemma 'EnableIfCompiled','(in presenza di record misure)' -- 2018.03.05 aggiunta nuovi step da vers 4236+ exec voc.stp_insNewLemma 'FiltroSearchMatr','Filtro Ricerca Matricola (elenco)' +-- 2018.03.19 - update getDossier +/****** Object: StoredProcedure [dbo].[stp_rep_getDossier] Script Date: 19/03/2018 09:37:05 ******/ +SET ANSI_NULLS ON +GO +SET QUOTED_IDENTIFIER ON +GO + +-- ============================================= +-- Author: Steamware +-- Create date: 2015.06.18 +-- Description: elenco records x dossier +-- ============================================= +ALTER PROCEDURE [dbo].[stp_rep_getDossier] +( + @IdxDossier INT + ,@Fase NVARCHAR(50) + ,@Rev INT = 0 +-- ,@Lingua NVARCHAR(3) +) +AS + +SELECT mi.*, + fa.Descrizione AS DescFase, + em.Cliente AS Cliente, + em.Matricola AS MatrMacchina, + em.Descrizione AS DescMacchina +FROM dbo.v_Misure AS mi + INNER JOIN dbo.AnagFasi AS fa ON mi.Fase = fa.Fase + INNER JOIN dbo.ElencoDossier AS do ON mi.IdxDossier = do.IdxDossier + INNER JOIN dbo.ElencoMacchineCN AS em ON do.Matricola = em.Matricola +WHERE ( mi.IdxDossier = @IdxDossier OR @IdxDossier = 0 ) -- mettere ISNULL su variabile x estrarre anche con NULL? + AND ( mi.Fase = @Fase OR @Fase = '' ) + AND ( mi.Rev = @Rev) +ORDER BY CodScheda, Vers, NumScheda, CodMisura, NomeMisura + +/* +SELECT * +FROM dbo.v_Misure +WHERE IdxDossier = CASE WHEN @IdxDossier <> 0 THEN @IdxDossier ELSE IdxDossier END -- così non estrae ev. IdxDossier nulli + AND Fase = CASE WHEN @Fase <> '' THEN @Fase ELSE Fase END +ORDER BY CodScheda, Vers, NumScheda, CodMisura, NomeMisura +*/ +RETURN +