diff --git a/Jenkinsfile b/Jenkinsfile index 93dcfdf0..fea33727 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=761']) { + withEnv(['NEXT_BUILD_NUMBER=763']) { // env.versionNumber = VersionNumber(versionNumberString : '5.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '5.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO' diff --git a/MP-TAB/DettaglioMacchina.aspx b/MP-TAB/DettaglioMacchina.aspx index 8f520104..84c6d329 100644 --- a/MP-TAB/DettaglioMacchina.aspx +++ b/MP-TAB/DettaglioMacchina.aspx @@ -30,10 +30,10 @@
- Registra SCARTI + Registro SCARTI
- Registra CONTROLLI + Registro CONTROLLI
<%-- diff --git a/MP-TAB/Scarti.aspx.cs b/MP-TAB/Scarti.aspx.cs index d9535d1a..febfa718 100644 --- a/MP-TAB/Scarti.aspx.cs +++ b/MP-TAB/Scarti.aspx.cs @@ -11,7 +11,12 @@ namespace MoonProTablet { protected void Page_Load(object sender, EventArgs e) { + mod_regScarti1.eh_newVal += Mod_regScarti1_eh_newVal; + } + private void Mod_regScarti1_eh_newVal(object sender, EventArgs e) + { + mod_elencoScarti.doUpdate(); } } } \ No newline at end of file diff --git a/MP-TAB/WebUserControls/mod_elencoScarti.ascx b/MP-TAB/WebUserControls/mod_elencoScarti.ascx index b4a97806..1b24f165 100644 --- a/MP-TAB/WebUserControls/mod_elencoScarti.ascx +++ b/MP-TAB/WebUserControls/mod_elencoScarti.ascx @@ -1 +1,57 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_elencoScarti.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_elencoScarti" %> +<%@ Register Src="~/WebUserControls/mod_selPeriodo.ascx" TagPrefix="uc1" TagName="mod_selPeriodo" %> + +
+
+ + + + + +
+
+
+ Art: + +
+
+ <%# Eval("Descrizione") %>' +
+
+
+ + <%# Eval("Qta") %> + pz +
+
+
+ + +
+
+ + + +
+
+
+ Nota: + +
+
+ + + + + + + + + + + +
+
+ + + diff --git a/MP-TAB/WebUserControls/mod_elencoScarti.ascx.cs b/MP-TAB/WebUserControls/mod_elencoScarti.ascx.cs index 8c1dc398..3652e652 100644 --- a/MP-TAB/WebUserControls/mod_elencoScarti.ascx.cs +++ b/MP-TAB/WebUserControls/mod_elencoScarti.ascx.cs @@ -13,5 +13,10 @@ namespace MoonProTablet.WebUserControls { } + + public void doUpdate() + { + grView.DataBind(); + } } } \ No newline at end of file diff --git a/MP-TAB/WebUserControls/mod_elencoScarti.ascx.designer.cs b/MP-TAB/WebUserControls/mod_elencoScarti.ascx.designer.cs index f3f19ab1..3ced51f7 100644 --- a/MP-TAB/WebUserControls/mod_elencoScarti.ascx.designer.cs +++ b/MP-TAB/WebUserControls/mod_elencoScarti.ascx.designer.cs @@ -1,17 +1,42 @@ //------------------------------------------------------------------------------ -// +// // Codice generato da uno strumento. // // Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// +// il codice viene rigenerato. +// //------------------------------------------------------------------------------ -namespace MoonProTablet.WebUserControls -{ - - - public partial class mod_elencoScarti - { - } +namespace MoonProTablet.WebUserControls { + + + public partial class mod_elencoScarti { + + /// + /// Controllo mod_selPeriodo. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::MoonProTablet.WebUserControls.mod_selPeriodo mod_selPeriodo; + + /// + /// Controllo grView. + /// + /// + /// 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.GridView grView; + + /// + /// Controllo ods. + /// + /// + /// 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 ods; + } } diff --git a/MP-TAB/WebUserControls/mod_regScarti.ascx b/MP-TAB/WebUserControls/mod_regScarti.ascx index eaa09c4e..be35ebc7 100644 --- a/MP-TAB/WebUserControls/mod_regScarti.ascx +++ b/MP-TAB/WebUserControls/mod_regScarti.ascx @@ -48,7 +48,7 @@
- + <%# Eval("label") %>
diff --git a/MP-TAB/WebUserControls/mod_regScarti.ascx.cs b/MP-TAB/WebUserControls/mod_regScarti.ascx.cs index b840122e..97a05c33 100644 --- a/MP-TAB/WebUserControls/mod_regScarti.ascx.cs +++ b/MP-TAB/WebUserControls/mod_regScarti.ascx.cs @@ -139,11 +139,11 @@ namespace MoonProTablet.WebUserControls divDetail.Visible = showConf; if (showConf) { - lblShowScarti.Text = "Nascondi Registra SCARTI"; + lblShowScarti.Text = "Nascondi Registrazione SCARTI"; } else { - lblShowScarti.Text = "Mostra Registra SCARTI"; + lblShowScarti.Text = "Mostra Registrazione SCARTI"; // sollevo evento! if (eh_reset != null) { diff --git a/MapoDb/DS_ProdTempi.xsd b/MapoDb/DS_ProdTempi.xsd index 147224c5..0b8fbd16 100644 --- a/MapoDb/DS_ProdTempi.xsd +++ b/MapoDb/DS_ProdTempi.xsd @@ -1886,10 +1886,11 @@ FROM v_RegistroControlli - + - - SELECT IdxMacchina, DataOra, Causale, Operatore, Qta, Note, CodArticolo, MatrOpr, DataOraProdRec FROM dbo.v_RegistroScarti + + SELECT * +FROM dbo.v_RegistroScarti @@ -1905,6 +1906,9 @@ FROM v_RegistroControlli + + + @@ -2407,7 +2411,7 @@ FROM v_RegistroControlli - + @@ -2488,7 +2492,7 @@ FROM v_RegistroControlli - + @@ -2517,7 +2521,7 @@ FROM v_RegistroControlli - + @@ -2529,7 +2533,7 @@ FROM v_RegistroControlli - + @@ -2554,7 +2558,7 @@ FROM v_RegistroControlli - + @@ -2592,7 +2596,7 @@ FROM v_RegistroControlli - + @@ -2631,7 +2635,7 @@ FROM v_RegistroControlli - + @@ -2673,10 +2677,31 @@ FROM v_RegistroControlli + + + + + + + + + + + + + + + + + + + + + - + diff --git a/MapoDb/DS_ProdTempi.xss b/MapoDb/DS_ProdTempi.xss index 06578a84..fdb8b280 100644 --- a/MapoDb/DS_ProdTempi.xss +++ b/MapoDb/DS_ProdTempi.xss @@ -6,29 +6,28 @@ --> - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MapoDb/DS_ProdTempi1.Designer.cs b/MapoDb/DS_ProdTempi1.Designer.cs index e2de2e10..cb1bfbd1 100644 --- a/MapoDb/DS_ProdTempi1.Designer.cs +++ b/MapoDb/DS_ProdTempi1.Designer.cs @@ -8583,6 +8583,12 @@ namespace MapoDb { private global::System.Data.DataColumn columnDataOraProdRec; + private global::System.Data.DataColumn columnDescrizione; + + private global::System.Data.DataColumn columncssClass; + + private global::System.Data.DataColumn columnicona; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public RegistroScartiDataTable() { @@ -8688,6 +8694,30 @@ namespace MapoDb { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn DescrizioneColumn { + get { + return this.columnDescrizione; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn cssClassColumn { + get { + return this.columncssClass; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn iconaColumn { + get { + return this.columnicona; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -8725,7 +8755,7 @@ namespace MapoDb { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - public RegistroScartiRow AddRegistroScartiRow(string IdxMacchina, System.DateTime DataOra, string Causale, string Operatore, int Qta, string Note, string CodArticolo, int MatrOpr, System.DateTime DataOraProdRec) { + public RegistroScartiRow AddRegistroScartiRow(string IdxMacchina, System.DateTime DataOra, string Causale, string Operatore, int Qta, string Note, string CodArticolo, int MatrOpr, System.DateTime DataOraProdRec, string Descrizione, string cssClass, string icona) { RegistroScartiRow rowRegistroScartiRow = ((RegistroScartiRow)(this.NewRow())); object[] columnValuesArray = new object[] { IdxMacchina, @@ -8736,7 +8766,10 @@ namespace MapoDb { Note, CodArticolo, MatrOpr, - DataOraProdRec}; + DataOraProdRec, + Descrizione, + cssClass, + icona}; rowRegistroScartiRow.ItemArray = columnValuesArray; this.Rows.Add(rowRegistroScartiRow); return rowRegistroScartiRow; @@ -8777,6 +8810,9 @@ namespace MapoDb { this.columnCodArticolo = base.Columns["CodArticolo"]; this.columnMatrOpr = base.Columns["MatrOpr"]; this.columnDataOraProdRec = base.Columns["DataOraProdRec"]; + this.columnDescrizione = base.Columns["Descrizione"]; + this.columncssClass = base.Columns["cssClass"]; + this.columnicona = base.Columns["icona"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -8800,6 +8836,12 @@ namespace MapoDb { base.Columns.Add(this.columnMatrOpr); this.columnDataOraProdRec = new global::System.Data.DataColumn("DataOraProdRec", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnDataOraProdRec); + this.columnDescrizione = new global::System.Data.DataColumn("Descrizione", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnDescrizione); + this.columncssClass = new global::System.Data.DataColumn("cssClass", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columncssClass); + this.columnicona = new global::System.Data.DataColumn("icona", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnicona); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnIdxMacchina, this.columnDataOra, @@ -8817,6 +8859,12 @@ namespace MapoDb { this.columnCodArticolo.AllowDBNull = false; this.columnCodArticolo.MaxLength = 50; this.columnMatrOpr.AllowDBNull = false; + this.columnDescrizione.AllowDBNull = false; + this.columnDescrizione.MaxLength = 250; + this.columncssClass.AllowDBNull = false; + this.columncssClass.MaxLength = 50; + this.columnicona.AllowDBNull = false; + this.columnicona.MaxLength = 50; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -13817,6 +13865,39 @@ namespace MapoDb { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public string Descrizione { + get { + return ((string)(this[this.tableRegistroScarti.DescrizioneColumn])); + } + set { + this[this.tableRegistroScarti.DescrizioneColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public string cssClass { + get { + return ((string)(this[this.tableRegistroScarti.cssClassColumn])); + } + set { + this[this.tableRegistroScarti.cssClassColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public string icona { + get { + return ((string)(this[this.tableRegistroScarti.iconaColumn])); + } + set { + this[this.tableRegistroScarti.iconaColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IsOperatoreNull() { @@ -25058,6 +25139,9 @@ FROM MappaStatoExpl"; tableMapping.ColumnMappings.Add("CodArticolo", "CodArticolo"); tableMapping.ColumnMappings.Add("MatrOpr", "MatrOpr"); tableMapping.ColumnMappings.Add("DataOraProdRec", "DataOraProdRec"); + tableMapping.ColumnMappings.Add("Descrizione", "Descrizione"); + tableMapping.ColumnMappings.Add("cssClass", "cssClass"); + tableMapping.ColumnMappings.Add("icona", "icona"); this._adapter.TableMappings.Add(tableMapping); } @@ -25074,8 +25158,7 @@ FROM MappaStatoExpl"; this._commandCollection = new global::System.Data.SqlClient.SqlCommand[6]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT IdxMacchina, DataOra, Causale, Operatore, Qta, Note, CodArticolo, MatrOpr," + - " DataOraProdRec FROM dbo.v_RegistroScarti"; + this._commandCollection[0].CommandText = "SELECT *\r\nFROM dbo.v_RegistroScarti"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection;