diff --git a/C-TRACK/WebUserControls/mod_elencoRichResetUtenti.ascx b/C-TRACK/WebUserControls/mod_elencoRichResetUtenti.ascx index 0ad9cb5..c9e22da 100644 --- a/C-TRACK/WebUserControls/mod_elencoRichResetUtenti.ascx +++ b/C-TRACK/WebUserControls/mod_elencoRichResetUtenti.ascx @@ -1,17 +1,9 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_elencoRichResetUtenti.ascx.cs" Inherits="C_TRACK.WebUserControls.mod_elencoRichResetUtenti" %> - - - - - - - - - - - - - + + + + + diff --git a/C-TRACK/WebUserControls/mod_elencoRichResetUtenti.ascx.designer.cs b/C-TRACK/WebUserControls/mod_elencoRichResetUtenti.ascx.designer.cs index ea2b124..0fefad6 100644 --- a/C-TRACK/WebUserControls/mod_elencoRichResetUtenti.ascx.designer.cs +++ b/C-TRACK/WebUserControls/mod_elencoRichResetUtenti.ascx.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// -// This code was generated by a tool. +// +// Codice generato da uno strumento. // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// //------------------------------------------------------------------------------ namespace C_TRACK.WebUserControls { @@ -13,20 +13,20 @@ namespace C_TRACK.WebUserControls { public partial class mod_elencoRichResetUtenti { /// - /// grView control. + /// Controllo grView. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// 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; /// - /// ods control. + /// Controllo ods. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// 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/C-TRACK/WebUserControls/mod_faseCurr.ascx b/C-TRACK/WebUserControls/mod_faseCurr.ascx index 351030f..c3f44d9 100644 --- a/C-TRACK/WebUserControls/mod_faseCurr.ascx +++ b/C-TRACK/WebUserControls/mod_faseCurr.ascx @@ -7,8 +7,6 @@ <%: DescPost %>
<%: NomeOpr %> - <%-- -
--%>
FASE
<%: DescFaseCurr %>
diff --git a/C-TRACK/WebUserControls/mod_fasiAttive.ascx b/C-TRACK/WebUserControls/mod_fasiAttive.ascx index 00bd3b7..34a824e 100644 --- a/C-TRACK/WebUserControls/mod_fasiAttive.ascx +++ b/C-TRACK/WebUserControls/mod_fasiAttive.ascx @@ -17,11 +17,11 @@
- + - + Nessun Risultato diff --git a/C-TRACK/WebUserControls/mod_postazioni.ascx b/C-TRACK/WebUserControls/mod_postazioni.ascx index a1a9d9c..09cd2ab 100644 --- a/C-TRACK/WebUserControls/mod_postazioni.ascx +++ b/C-TRACK/WebUserControls/mod_postazioni.ascx @@ -3,7 +3,7 @@ - + Nessun Risultato diff --git a/C-TRACK/WebUserControls/mod_taskList.ascx b/C-TRACK/WebUserControls/mod_taskList.ascx index a0ca67a..403de2a 100644 --- a/C-TRACK/WebUserControls/mod_taskList.ascx +++ b/C-TRACK/WebUserControls/mod_taskList.ascx @@ -27,14 +27,14 @@ - + Nessun Risultato - + diff --git a/C-TRACK/WebUserControls/mod_taskRec.ascx b/C-TRACK/WebUserControls/mod_taskRec.ascx index 14f1dc7..76af77f 100644 --- a/C-TRACK/WebUserControls/mod_taskRec.ascx +++ b/C-TRACK/WebUserControls/mod_taskRec.ascx @@ -14,7 +14,7 @@ - + Nessun Risultato diff --git a/C-TRACK/barcode.aspx b/C-TRACK/barcode.aspx index 771ee4e..dacdf22 100644 --- a/C-TRACK/barcode.aspx +++ b/C-TRACK/barcode.aspx @@ -10,7 +10,7 @@
-

Gestione Dichiarazioni

+ Gestione Dichiarazioni
diff --git a/C-TRACK/task.aspx b/C-TRACK/task.aspx index 4f1711b..bf4ec87 100644 --- a/C-TRACK/task.aspx +++ b/C-TRACK/task.aspx @@ -10,7 +10,7 @@
-

Gestione Commesse

+ Gestione Commesse
diff --git a/Jenkinsfile b/Jenkinsfile index e8370ce..7ab0c05 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=68']) { + withEnv(['NEXT_BUILD_NUMBER=69']) { // env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2018-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2018-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'C.TRACK'