From 2823c62d744b6c4bf24b6f0fa4255ca3ff6cc2b7 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 15 Oct 2021 15:36:14 +0200 Subject: [PATCH] Fix col-xs-12 --> col-12 --- .../WebUserControls/mod_ImportBazaarCSV.ascx | 110 ++++++++-------- .../mod_ImportBazaarCSV.ascx.designer.cs | 124 +++++++++--------- .../WebUserControls/mod_filtroComm.ascx | 60 ++++----- .../mod_filtroComm.ascx.designer.cs | 92 ++++++------- .../WebUserControls/mod_menuProj.ascx | 14 +- .../mod_menuProj.ascx.designer.cs | 36 ++--- .../WebUserControls/mod_navigaWeek.ascx | 44 +++---- .../mod_navigaWeek.ascx.designer.cs | 84 ++++++------ 8 files changed, 286 insertions(+), 278 deletions(-) diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_ImportBazaarCSV.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_ImportBazaarCSV.ascx index e6faa55..1c2ddd8 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_ImportBazaarCSV.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_ImportBazaarCSV.ascx @@ -2,66 +2,66 @@ <%@ Register Src="mod_navigaWeek.ascx" TagName="mod_navigaWeek" TagPrefix="uc1" %> <%@ Register Src="~/WebUserControls/mod_fileUpload.ascx" TagPrefix="uc1" TagName="mod_fileUpload" %> -
-
- -
+
+ +
-
-
- Step 1 : Import File +
+
+ Step 1 : Import File +
+
+ +
+
+ separatore:  +
-
- +
+
+ Step 2 : Info File +
+
+ +
-
- separatore:  +
+
+ Step 3 : Verifica commesse e risorse +
+
+ +
-
-
-
- Step 2 : Info File +
+
+ Step 4: Conferma +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ Carica dati +
-
- +
+
+ Step 5: Esito +
+
+

+

+
-
-
-
- Step 3 : Verifica commesse e risorse -
-
- -
-
-
-
- Step 4: Conferma -
-
- -
- -
-
-
- -
- -
-
-
- Carica dati -
-
-
-
- Step 5: Esito -
-
-

-
-
-
+
\ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_ImportBazaarCSV.ascx.designer.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_ImportBazaarCSV.ascx.designer.cs index 936c4f0..f4a2e97 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_ImportBazaarCSV.ascx.designer.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_ImportBazaarCSV.ascx.designer.cs @@ -1,131 +1,133 @@ //------------------------------------------------------------------------------ -// -// Codice generato da uno strumento. +// +// This code was generated by a tool. // -// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// //------------------------------------------------------------------------------ -namespace PROJ_ETS.WebUserControls { - - - public partial class mod_ImportBazaarCSV { - +namespace PROJ_ETS.WebUserControls +{ + + + public partial class mod_ImportBazaarCSV + { + /// - /// Controllo mod_navigaWeek1. + /// mod_navigaWeek1 control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::PROJ_ETS.WebUserControls.mod_navigaWeek mod_navigaWeek1; - + /// - /// Controllo mod_fileUpload. + /// mod_fileUpload control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::MedPred.WebUserControls.mod_fileUpload mod_fileUpload; - + /// - /// Controllo txtCharSep. + /// txtCharSep control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.TextBox txtCharSep; - + /// - /// Controllo lblStep02. + /// lblStep02 control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblStep02; - + /// - /// Controllo lblStep03. + /// lblStep03 control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblStep03; - + /// - /// Controllo lbtShow. + /// lbtShow control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lbtShow; - + /// - /// Controllo divPreview. + /// divPreview control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl divPreview; - + /// - /// Controllo lblStep04. + /// lblStep04 control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblStep04; - + /// - /// Controllo lbtShowErr. + /// lbtShowErr control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lbtShowErr; - + /// - /// Controllo divErr. + /// divErr control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl divErr; - + /// - /// Controllo lblErr. + /// lblErr control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblErr; - + /// - /// Controllo lbtConferma. + /// lbtConferma control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lbtConferma; - + /// - /// Controllo lblOut. + /// lblOut control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblOut; } diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_filtroComm.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_filtroComm.ascx index 0114cb5..35aad26 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_filtroComm.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_filtroComm.ascx @@ -2,34 +2,34 @@ <%@ Register Src="mod_autocomplete.ascx" TagName="mod_autocomplete" TagPrefix="uc1" %>
-
- -
- -
- -
- +
+ +
+ +
+ +
+ +
+
+ + + + + + + + +
+
+ + + + + + + +
-
- - - - - - - - -
-
- - - - - - - -
-
-
+
\ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_filtroComm.ascx.designer.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_filtroComm.ascx.designer.cs index 001bb03..393d7e8 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_filtroComm.ascx.designer.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_filtroComm.ascx.designer.cs @@ -1,95 +1,97 @@ //------------------------------------------------------------------------------ -// -// Codice generato da uno strumento. +// +// This code was generated by a tool. // -// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// //------------------------------------------------------------------------------ -namespace PROJ_ETS.WebUserControls { - - - public partial class mod_filtroComm { - +namespace PROJ_ETS.WebUserControls +{ + + + public partial class mod_filtroComm + { + /// - /// Controllo pnlCli. + /// pnlCli control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Panel pnlCli; - + /// - /// Controllo filtroCli. + /// filtroCli control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::PROJ_ETS.WebUserControls.mod_autocomplete filtroCli; - + /// - /// Controllo chkShowAttivi. + /// chkShowAttivi control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.CheckBox chkShowAttivi; - + /// - /// Controllo lblProj. + /// lblProj control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblProj; - + /// - /// Controllo ddlProgetti. + /// ddlProgetti control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.DropDownList ddlProgetti; - + /// - /// Controllo OdsProgetti. + /// OdsProgetti control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ObjectDataSource OdsProgetti; - + /// - /// Controllo lblComm. + /// lblComm control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblComm; - + /// - /// Controllo ddlCommesse. + /// ddlCommesse control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.DropDownList ddlCommesse; - + /// - /// Controllo OdsCommesse. + /// OdsCommesse control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ObjectDataSource OdsCommesse; } diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menuProj.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menuProj.ascx index 1477fc2..f450647 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menuProj.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menuProj.ascx @@ -1,10 +1,10 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_menuProj.ascx.cs" Inherits="PROJ_ETS.WebUserControls.mod_menuProj" %>
-
- - - - -
-
+
+ + + + +
+
\ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menuProj.ascx.designer.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menuProj.ascx.designer.cs index 5a74343..8360caa 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menuProj.ascx.designer.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menuProj.ascx.designer.cs @@ -1,32 +1,34 @@ //------------------------------------------------------------------------------ -// -// Codice generato da uno strumento. +// +// This code was generated by a tool. // -// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// //------------------------------------------------------------------------------ -namespace PROJ_ETS.WebUserControls { - - - public partial class mod_menuProj { - +namespace PROJ_ETS.WebUserControls +{ + + + public partial class mod_menuProj + { + /// - /// Controllo MenuNavPrj. + /// MenuNavPrj control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Menu MenuNavPrj; - + /// - /// Controllo NavProgetti. + /// NavProgetti control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.SiteMapDataSource NavProgetti; } diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_navigaWeek.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_navigaWeek.ascx index 394cd87..8f68745 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_navigaWeek.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_navigaWeek.ascx @@ -1,30 +1,30 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_navigaWeek.ascx.cs" Inherits="PROJ_ETS.WebUserControls.mod_navigaWeek" %>
-
-
- Anno:  +
+
+ Anno:  - -
-
- Settimana:  + +
+
+ Settimana:  - + +
+
+ +
+
+ +
+
+ +
+
+ +
-
- -
-
- -
-
- -
-
- -
-
-
+
\ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_navigaWeek.ascx.designer.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_navigaWeek.ascx.designer.cs index b007654..596c1ae 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_navigaWeek.ascx.designer.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_navigaWeek.ascx.designer.cs @@ -1,86 +1,88 @@ //------------------------------------------------------------------------------ -// -// Codice generato da uno strumento. +// +// This code was generated by a tool. // -// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// //------------------------------------------------------------------------------ -namespace PROJ_ETS.WebUserControls { - - - public partial class mod_navigaWeek { - +namespace PROJ_ETS.WebUserControls +{ + + + public partial class mod_navigaWeek + { + /// - /// Controllo ddlAnno. + /// ddlAnno control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.DropDownList ddlAnno; - + /// - /// Controllo odsYear. + /// odsYear control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ObjectDataSource odsYear; - + /// - /// Controllo ddlWeek. + /// ddlWeek control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.DropDownList ddlWeek; - + /// - /// Controllo odsWeek. + /// odsWeek control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ObjectDataSource odsWeek; - + /// - /// Controllo lnkWPrev. + /// lnkWPrev control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lnkWPrev; - + /// - /// Controllo lnkW. + /// lnkW control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lnkW; - + /// - /// Controllo lnkWNext. + /// lnkWNext control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lnkWNext; - + /// - /// Controllo lblPeriodo. + /// lblPeriodo control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblPeriodo; }