diff --git a/INTERFACE/WebLCP/Content/Site.css b/INTERFACE/WebLCP/Content/Site.css
index d709462..e093f02 100644
--- a/INTERFACE/WebLCP/Content/Site.css
+++ b/INTERFACE/WebLCP/Content/Site.css
@@ -10,11 +10,11 @@ body {
padding-right: 15px;
}
/* Set widths on the form inputs since otherwise they're 100% wide */
-input,
+/*input,
select,
textarea {
max-width: 280px;
-}
+}*/
/* Responsive: Portrait tablets and up */
@media screen and (min-width: 768px) {
.jumbotron {
diff --git a/INTERFACE/WebLCP/Default.aspx b/INTERFACE/WebLCP/Default.aspx
index ee28cfc..ba13d99 100644
--- a/INTERFACE/WebLCP/Default.aspx
+++ b/INTERFACE/WebLCP/Default.aspx
@@ -1,13 +1,7 @@
<%@ Page Title="Home Page" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="WebLCP._Default" %>
<%@ Register Src="~/WUC/mod_home.ascx" TagPrefix="uc1" TagName="mod_home" %>
-<%@ Register Src="~/WUC/tmp_WIP.ascx" TagPrefix="uc1" TagName="tmp_WIP" %>
-<%@ Register Src="~/WUC/mod_userLogin.ascx" TagPrefix="uc1" TagName="mod_userLogin" %>
-
-
-
-
diff --git a/INTERFACE/WebLCP/Default.aspx.designer.cs b/INTERFACE/WebLCP/Default.aspx.designer.cs
index 5a77070..c50f72b 100644
--- a/INTERFACE/WebLCP/Default.aspx.designer.cs
+++ b/INTERFACE/WebLCP/Default.aspx.designer.cs
@@ -20,14 +20,5 @@ namespace WebLCP {
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::WebLCP.WUC.mod_home mod_home;
-
- ///
- /// Controllo mod_userLogin.
- ///
- ///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
- ///
- protected global::WebLCP.WUC.mod_userLogin mod_userLogin;
}
}
diff --git a/INTERFACE/WebLCP/JobsList.aspx b/INTERFACE/WebLCP/JobsList.aspx
index 8fc2c2f..91e54a9 100644
--- a/INTERFACE/WebLCP/JobsList.aspx
+++ b/INTERFACE/WebLCP/JobsList.aspx
@@ -1,3 +1,7 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="JobsList.aspx.cs" Inherits="WebLCP.JobsList" %>
+
+<%@ Register Src="~/WUC/mod_jobsList.ascx" TagPrefix="uc1" TagName="mod_jobsList" %>
+
+
diff --git a/INTERFACE/WebLCP/JobsList.aspx.designer.cs b/INTERFACE/WebLCP/JobsList.aspx.designer.cs
index 3be55ad..f611be9 100644
--- a/INTERFACE/WebLCP/JobsList.aspx.designer.cs
+++ b/INTERFACE/WebLCP/JobsList.aspx.designer.cs
@@ -1,17 +1,24 @@
//------------------------------------------------------------------------------
-//
+//
// 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 WebLCP
-{
-
-
- public partial class JobsList
- {
- }
+namespace WebLCP {
+
+
+ public partial class JobsList {
+
+ ///
+ /// Controllo mod_jobsList.
+ ///
+ ///
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ ///
+ protected global::WebLCP.WUC.mod_jobsList mod_jobsList;
+ }
}
diff --git a/INTERFACE/WebLCP/RegisterUser.aspx b/INTERFACE/WebLCP/RegisterUser.aspx
index 2c75596..6ee85ff 100644
--- a/INTERFACE/WebLCP/RegisterUser.aspx
+++ b/INTERFACE/WebLCP/RegisterUser.aspx
@@ -6,5 +6,4 @@
-
diff --git a/INTERFACE/WebLCP/RegisterUser.aspx.designer.cs b/INTERFACE/WebLCP/RegisterUser.aspx.designer.cs
index f001cb8..6a38f54 100644
--- a/INTERFACE/WebLCP/RegisterUser.aspx.designer.cs
+++ b/INTERFACE/WebLCP/RegisterUser.aspx.designer.cs
@@ -20,14 +20,5 @@ namespace WebLCP {
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::WebLCP.WUC.mod_register mod_register;
-
- ///
- /// Controllo tmp_WIP.
- ///
- ///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
- ///
- protected global::WebLCP.WUC.tmp_WIP tmp_WIP;
}
}
diff --git a/INTERFACE/WebLCP/Site.Master b/INTERFACE/WebLCP/Site.Master
index 25f253f..896db48 100644
--- a/INTERFACE/WebLCP/Site.Master
+++ b/INTERFACE/WebLCP/Site.Master
@@ -45,10 +45,9 @@
-
+
diff --git a/INTERFACE/WebLCP/WUC/cmp_footer.ascx.cs b/INTERFACE/WebLCP/WUC/cmp_footer.ascx.cs
index 95cdc78..79ec629 100644
--- a/INTERFACE/WebLCP/WUC/cmp_footer.ascx.cs
+++ b/INTERFACE/WebLCP/WUC/cmp_footer.ascx.cs
@@ -35,7 +35,7 @@ namespace WebLCP.WUC
private void setClock()
{
lblDateTime.Text = DateTime.Now.ToString("ddd dd.MM.yyyy, HH:mm:ss");
- lblCurrUser.Text = $"{devicesAuthProxy.stObj.utente} - {devicesAuthProxy.stObj.CognomeNome}";
+ lblCurrUser.Text = $"{devicesAuthProxy.stObj.utente}";
}
}
}
\ No newline at end of file
diff --git a/INTERFACE/WebLCP/WUC/cmp_header.ascx b/INTERFACE/WebLCP/WUC/cmp_header.ascx
index 27edec1..1943141 100644
--- a/INTERFACE/WebLCP/WUC/cmp_header.ascx
+++ b/INTERFACE/WebLCP/WUC/cmp_header.ascx
@@ -21,6 +21,9 @@
Contatti
+
+ Condizioni d'uso
+
+
+
diff --git a/INTERFACE/WebLCP/WUC/mod_register.ascx.designer.cs b/INTERFACE/WebLCP/WUC/mod_register.ascx.designer.cs
index f7c6000..66e56f9 100644
--- a/INTERFACE/WebLCP/WUC/mod_register.ascx.designer.cs
+++ b/INTERFACE/WebLCP/WUC/mod_register.ascx.designer.cs
@@ -12,15 +12,6 @@ namespace WebLCP.WUC {
public partial class mod_register {
- ///
- /// Controllo lblOut.
- ///
- ///
- /// 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.Label lblOut;
-
///
/// Controllo rfvEmail.
///
@@ -128,5 +119,14 @@ namespace WebLCP.WUC {
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.WebControls.LinkButton lbtResedToken;
+
+ ///
+ /// Controllo lblOut.
+ ///
+ ///
+ /// 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.Label lblOut;
}
}
diff --git a/INTERFACE/WebLCP/WUC/mod_userLogin.ascx b/INTERFACE/WebLCP/WUC/mod_userLogin.ascx
deleted file mode 100644
index e84de72..0000000
--- a/INTERFACE/WebLCP/WUC/mod_userLogin.ascx
+++ /dev/null
@@ -1,63 +0,0 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_userLogin.ascx.cs" Inherits="WebLCP.WUC.mod_userLogin" %>
-
-
-
-
-
-
-
-
-
-
- Per accedere alla piattaforma è necessario registrarsi tramite un account email valido ed impiegare il link di autorizzazione che riceverete all'indirizzo email
-
-
-
-
-
-
-
-
-
diff --git a/INTERFACE/WebLCP/WUC/mod_userLogin.ascx.cs b/INTERFACE/WebLCP/WUC/mod_userLogin.ascx.cs
deleted file mode 100644
index 6b0b93a..0000000
--- a/INTERFACE/WebLCP/WUC/mod_userLogin.ascx.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using System.Web.UI;
-
-namespace WebLCP.WUC
-{
- public partial class mod_userLogin : System.Web.UI.UserControl
- {
- protected void Page_Load(object sender, EventArgs e)
- {
- if (!Page.IsPostBack)
- {
- lblOut.Visible = false;
- }
- }
-
- protected void lbtSendToken_Click(object sender, EventArgs e)
- {
- // verifico esistenza email
-
- // se c'è invio email e segnalo
- }
-
- protected void lbtNewUser_Click(object sender, EventArgs e)
- {
- // rimando alla pagina di registrazione
- Response.Redirect("RegisterUser");
- }
- }
-}
\ No newline at end of file
diff --git a/INTERFACE/WebLCP/WUC/mod_userLogin.ascx.designer.cs b/INTERFACE/WebLCP/WUC/mod_userLogin.ascx.designer.cs
deleted file mode 100644
index fc250f1..0000000
--- a/INTERFACE/WebLCP/WUC/mod_userLogin.ascx.designer.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-//------------------------------------------------------------------------------
-//
-// Codice generato da uno strumento.
-//
-// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
-// il codice viene rigenerato.
-//
-//------------------------------------------------------------------------------
-
-namespace WebLCP.WUC {
-
-
- public partial class mod_userLogin {
-
- ///
- /// Controllo txtEmail.
- ///
- ///
- /// 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.TextBox txtEmail;
-
- ///
- /// Controllo lbtSendToken.
- ///
- ///
- /// 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.LinkButton lbtSendToken;
-
- ///
- /// Controllo lbtNewUser.
- ///
- ///
- /// 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.LinkButton lbtNewUser;
-
- ///
- /// Controllo lblOut.
- ///
- ///
- /// 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.Label lblOut;
- }
-}
diff --git a/INTERFACE/WebLCP/WUC/tmp_WIP.ascx b/INTERFACE/WebLCP/WUC/tmp_WIP.ascx
index 63c66c2..4174715 100644
--- a/INTERFACE/WebLCP/WUC/tmp_WIP.ascx
+++ b/INTERFACE/WebLCP/WUC/tmp_WIP.ascx
@@ -5,7 +5,7 @@
Work In Progress
-

+
\ No newline at end of file
diff --git a/INTERFACE/WebLCP/Web.config b/INTERFACE/WebLCP/Web.config
index 8b88c72..89ba223 100644
--- a/INTERFACE/WebLCP/Web.config
+++ b/INTERFACE/WebLCP/Web.config
@@ -21,8 +21,8 @@
-
-
+
+
diff --git a/INTERFACE/WebLCP/WebLCP.csproj b/INTERFACE/WebLCP/WebLCP.csproj
index 742ad01..58c896e 100644
--- a/INTERFACE/WebLCP/WebLCP.csproj
+++ b/INTERFACE/WebLCP/WebLCP.csproj
@@ -272,9 +272,9 @@
+
-
@@ -415,6 +415,13 @@
mod_home.ascx
+
+ mod_jobsList.ascx
+ ASPXCodeBehind
+
+
+ mod_jobsList.ascx
+
mod_register.ascx
ASPXCodeBehind
@@ -429,13 +436,6 @@
mod_sendToken.ascx
-
- mod_userLogin.ascx
- ASPXCodeBehind
-
-
- mod_userLogin.ascx
-
tmp_WIP.ascx
ASPXCodeBehind
diff --git a/Jenkinsfile b/Jenkinsfile
index 186a110..584f1be 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=32']) {
+ withEnv(['NEXT_BUILD_NUMBER=33']) {
// env.versionNumber = VersionNumber(versionNumberString : '0.8.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '0.8.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'LCP'