diff --git a/Jenkinsfile b/Jenkinsfile index 6ef5338b..69e10bee 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=655']) { + withEnv(['NEXT_BUILD_NUMBER=660']) { // env.versionNumber = VersionNumber(versionNumberString : '4.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '4.9.${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-Tablet/WebUserControls/mod_commenti.ascx b/MP-Tablet/WebUserControls/mod_commenti.ascx index 1e9f3100..44eddd5e 100644 --- a/MP-Tablet/WebUserControls/mod_commenti.ascx +++ b/MP-Tablet/WebUserControls/mod_commenti.ascx @@ -1,20 +1,23 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_commenti.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_commenti" %> -
- - - - - - - - -
+
+
+ +
+ + + + + + +
+
+
-
-
+
+
@@ -24,11 +27,11 @@
-
- +
+
-
- +
+
diff --git a/MP-Tablet/WebUserControls/mod_insComm.ascx b/MP-Tablet/WebUserControls/mod_insComm.ascx index a3b70bbd..584e92c4 100644 --- a/MP-Tablet/WebUserControls/mod_insComm.ascx +++ b/MP-Tablet/WebUserControls/mod_insComm.ascx @@ -4,7 +4,7 @@
- + Commento diff --git a/MP-Tablet/WebUserControls/mod_insComm.ascx.cs b/MP-Tablet/WebUserControls/mod_insComm.ascx.cs index 13016250..5da5e81c 100644 --- a/MP-Tablet/WebUserControls/mod_insComm.ascx.cs +++ b/MP-Tablet/WebUserControls/mod_insComm.ascx.cs @@ -139,6 +139,7 @@ namespace MoonProTablet.WebUserControls try { inizioStato = Convert.ToDateTime(memLayer.ML.objSessionObj("inizioStato")); + dataOraEv = inizioStato; riga = DataLayer.obj.taEventi.GetByMacchinaPeriodo(idxMacchina, inizioStato, inizioStato)[0]; txtDate.Text = riga.InizioStato.ToString("yyyy-MM-dd"); txtTime.Text = riga.InizioStato.ToString("HH:mm"); diff --git a/MapoDb/DS_applicazione.Designer.cs b/MapoDb/DS_applicazione.Designer.cs index d0003c05..8c910d89 100644 --- a/MapoDb/DS_applicazione.Designer.cs +++ b/MapoDb/DS_applicazione.Designer.cs @@ -17141,7 +17141,7 @@ SELECT IdxMacchina, InizioStato, IdxTipo, CodArticolo, Value, MatrOpr, pallet FR this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxMacchina", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxTipo", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodArticolo", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Value", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Value", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MatrOpr", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pallet", global::System.Data.SqlDbType.NVarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[11] = new global::System.Data.SqlClient.SqlCommand(); diff --git a/MapoDb/DS_applicazione.xsd b/MapoDb/DS_applicazione.xsd index a81dde2f..c2c948ad 100644 --- a/MapoDb/DS_applicazione.xsd +++ b/MapoDb/DS_applicazione.xsd @@ -701,7 +701,7 @@ SELECT IdxMacchina, InizioStato, IdxTipo, CodArticolo, Value, MatrOpr, pallet FR - + @@ -2905,7 +2905,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux = - + @@ -2927,7 +2927,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux = - + @@ -2963,7 +2963,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux = - + @@ -2999,7 +2999,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux = - + @@ -3016,7 +3016,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux = - + @@ -3040,7 +3040,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux = - + @@ -3075,7 +3075,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux = - + @@ -3154,7 +3154,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux = - + @@ -3303,26 +3303,26 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux = - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MapoDb/DS_applicazione.xss b/MapoDb/DS_applicazione.xss index 999bd2b1..8129b39e 100644 --- a/MapoDb/DS_applicazione.xss +++ b/MapoDb/DS_applicazione.xss @@ -4,33 +4,33 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - + - + - - + + - - - - + + + + - - + + - - + +