diff --git a/GPW_Smart/Content/Site.css b/GPW_Smart/Content/Site.css index 015bc8b..c3bcff6 100644 --- a/GPW_Smart/Content/Site.css +++ b/GPW_Smart/Content/Site.css @@ -31,59 +31,6 @@ textarea { max-width: 100%; } } -/* FIX modali sx */ -.modal.left .modal-dialog { - position: fixed; - margin: auto; - width: 320px; - height: 100%; - -webkit-transform: translate3d(0%, 0, 0); - -ms-transform: translate3d(0%, 0, 0); - -o-transform: translate3d(0%, 0, 0); - transform: translate3d(0%, 0, 0); -} -.modal.left .modal-content { - height: 100%; - overflow-y: auto; -} -.modal.left .modal-body { - padding: 15px 15px 80px; -} -.modal.left.fade .modal-dialog { - left: -320px; - -webkit-transition: opacity 0.3s linear, left 0.3s ease-out; - -moz-transition: opacity 0.3s linear, left 0.3s ease-out; - -o-transition: opacity 0.3s linear, left 0.3s ease-out; - transition: opacity 0.3s linear, left 0.3s ease-out; -} -.modal.left.fade.show .modal-dialog { - left: 0; -} -/* ----- MODAL STYLE ----- */ -.modal-content { - border-radius: 0; - border: none; -} -.modal-header { - border-bottom-color: #eeeeee; - background-color: #fafafa; -} -/*.demo { - padding-top: 60px; - padding-bottom: 110px; -} - -.btn-demo { - margin: 15px; - padding: 10px 15px; - border-radius: 0; - font-size: 16px; - background-color: #ffffff; -} - -.btn-demo:focus { - outline: 0; -}*/ .elTimbSmart { padding: 0.2em; font-size: 1.1em; diff --git a/GPW_Smart/Site.Master b/GPW_Smart/Site.Master index e6e0a8d..c25d5d4 100644 --- a/GPW_Smart/Site.Master +++ b/GPW_Smart/Site.Master @@ -50,21 +50,8 @@
-
- - opzioni bottom - -
-
- -
-
- - opzioni SX - -
+
- diff --git a/GPW_Smart/Site.Master.designer.cs b/GPW_Smart/Site.Master.designer.cs index 7d87444..37b132a 100644 --- a/GPW_Smart/Site.Master.designer.cs +++ b/GPW_Smart/Site.Master.designer.cs @@ -30,15 +30,6 @@ namespace GPW_Smart { /// protected global::System.Web.UI.WebControls.ContentPlaceHolder MainContent; - /// - /// Controllo btOptContent. - /// - /// - /// 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.ContentPlaceHolder btOptContent; - /// /// Controllo cmp_footer. /// @@ -47,14 +38,5 @@ namespace GPW_Smart { /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::GPW_Smart.WebUserControls.cmp_footer cmp_footer; - - /// - /// Controllo sxOptContent. - /// - /// - /// 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.ContentPlaceHolder sxOptContent; } } diff --git a/GPW_Smart/Timbrature.aspx b/GPW_Smart/Timbrature.aspx index cf977f6..eef703b 100644 --- a/GPW_Smart/Timbrature.aspx +++ b/GPW_Smart/Timbrature.aspx @@ -1,34 +1,54 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/JQMob.Master" Culture="it-IT" AutoEventWireup="true" CodeBehind="Timbrature.aspx.cs" Inherits="GPW_Smart.Timbrature" %> -<%@ Register Src="~/WebUserControls/mod_timbrature.ascx" TagName="mod_timbrature" TagPrefix="uc1" %> -<%@ Register Src="~/WebUserControls/mod_opzioniSx.ascx" TagPrefix="uc1" TagName="mod_opzioniSx" %> +<%@ Register Src="~/WebUserControls/mod_timbrature.ascx" TagPrefix="uc1" TagName="mod_timbrature" %> <%@ Register Src="~/WebUserControls/mod_mancTimb.ascx" TagPrefix="uc1" TagName="mod_mancTimb" %> +<%@ Register Src="~/WebUserControls/mod_opzioniSx.ascx" TagPrefix="uc1" TagName="mod_opzioniSx" %> - - Timbrature - - - - - - - - - - - - - - - - - - - - + + + + + +
+
+ +
+
+ +
+
+ + + + + + + + \ No newline at end of file diff --git a/GPW_Smart/Timbrature.aspx.cs b/GPW_Smart/Timbrature.aspx.cs index 64305fa..27f9c05 100644 --- a/GPW_Smart/Timbrature.aspx.cs +++ b/GPW_Smart/Timbrature.aspx.cs @@ -1,49 +1,42 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; +using GPW_data; +using System; using System.Web.UI; -using System.Web.UI.WebControls; -using GPW_data; -using GPW.WebMasterPages; namespace GPW_Smart { - public partial class Timbrature : System.Web.UI.Page + public partial class Timbrature : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) { - protected void Page_Load(object sender, EventArgs e) - { - if (!Page.IsPostBack) - { - utils.mng.dailyDuties(); - } - ((JQMob)Master).showSettings = true; - ((JQMob)Master).showLeftPnl = true; - mod_opzioniSx.ev_reqAbilitaAll += Mod_opzioniSx_ev_reqAbilitaAll; - mod_opzioniSx.ev_reqUpdate += Mod_opzioniSx_ev_reqUpdate; - mod_mancTimb.ev_reqUpdate += Mod_mancTimb_ev_reqUpdate; - } - - private void Mod_mancTimb_ev_reqUpdate(object sender, EventArgs e) - { - mod_timbrature1.doUpdate(); - } - - /// - /// update visualizzazione timbrature - /// - /// - /// - private void Mod_opzioniSx_ev_reqUpdate(object sender, EventArgs e) - { - mod_timbrature1.doUpdate(); - } - - private void Mod_opzioniSx_ev_reqAbilitaAll(object sender, EventArgs e) - { - mod_timbrature1.abilitaAll(); - mod_timbrature1.doUpdate(); - } - + if (!Page.IsPostBack) + { + utils.mng.dailyDuties(); + } + ((Site)Master).showSettings = true; + ((Site)Master).showLeftPnl = true; + mod_opzioniSx.ev_reqAbilitaAll += Mod_opzioniSx_ev_reqAbilitaAll; + mod_opzioniSx.ev_reqUpdate += Mod_opzioniSx_ev_reqUpdate; + mod_mancTimb.ev_reqUpdate += Mod_mancTimb_ev_reqUpdate; } + private void Mod_mancTimb_ev_reqUpdate(object sender, EventArgs e) + { + mod_timbrature.doUpdate(); + } + + /// + /// update visualizzazione timbrature + /// + /// + /// + private void Mod_opzioniSx_ev_reqUpdate(object sender, EventArgs e) + { + mod_timbrature.doUpdate(); + } + + private void Mod_opzioniSx_ev_reqAbilitaAll(object sender, EventArgs e) + { + mod_timbrature.abilitaAll(); + mod_timbrature.doUpdate(); + } + } } \ No newline at end of file diff --git a/GPW_Smart/Timbrature.aspx.designer.cs b/GPW_Smart/Timbrature.aspx.designer.cs index 6b3a246..f2afd8d 100644 --- a/GPW_Smart/Timbrature.aspx.designer.cs +++ b/GPW_Smart/Timbrature.aspx.designer.cs @@ -22,31 +22,13 @@ namespace GPW_Smart { protected global::System.Web.UI.UpdatePanel pnlTimbrature; /// - /// Controllo mod_timbrature1. + /// Controllo mod_timbrature. /// /// /// Campo generato automaticamente. /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// - protected global::GPW.WebUserControls.mod_timbrature mod_timbrature1; - - /// - /// Controllo pnlBottom. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.UpdatePanel pnlBottom; - - /// - /// Controllo mod_mancTimb. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::GPW.WebUserControls.mod_mancTimb mod_mancTimb; + protected global::GPW.WebUserControls.mod_timbrature mod_timbrature; /// /// Controllo mod_opzioniSx. @@ -56,5 +38,14 @@ namespace GPW_Smart { /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::GPW_Smart.WebUserControls.mod_opzioniSx mod_opzioniSx; + + /// + /// Controllo mod_mancTimb. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::GPW.WebUserControls.mod_mancTimb mod_mancTimb; } } diff --git a/GPW_Smart/WebUserControls/cmp_footer.ascx b/GPW_Smart/WebUserControls/cmp_footer.ascx index b3f5913..c256b72 100644 --- a/GPW_Smart/WebUserControls/cmp_footer.ascx +++ b/GPW_Smart/WebUserControls/cmp_footer.ascx @@ -1,18 +1,17 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_footer.ascx.cs" Inherits="GPW_Smart.WebUserControls.cmp_footer" %> diff --git a/GPW_Smart/WebUserControls/cmp_footer.ascx.cs b/GPW_Smart/WebUserControls/cmp_footer.ascx.cs index c227169..f66a0f1 100644 --- a/GPW_Smart/WebUserControls/cmp_footer.ascx.cs +++ b/GPW_Smart/WebUserControls/cmp_footer.ascx.cs @@ -1,5 +1,4 @@ using System; -using System.Configuration; namespace GPW_Smart.WebUserControls { @@ -8,11 +7,7 @@ namespace GPW_Smart.WebUserControls public event EventHandler eh_doRefresh; protected void Page_Load(object sender, EventArgs e) { - // sistemo le stringhe... - lblApp.Text = string.Format("{0} v.{1}", ConfigurationManager.AppSettings.Get("appName"), System.Reflection.Assembly.GetExecutingAssembly().GetName().Version); - lblCopyRight.Text = string.Format("{0}-{1}", ConfigurationManager.AppSettings.Get("copyRight"), DateTime.Now.Year); setTimer(); - setClock(); } /// /// imposta il tempo di scadenza del timer x il refresh della pagina (della parte top) per evitare che la sessione sul server scada @@ -23,18 +18,11 @@ namespace GPW_Smart.WebUserControls } protected void Timer1_Tick(object sender, EventArgs e) { - setClock(); // se qualcuno ascolta sollevo evento nuovo valore... if (eh_doRefresh != null) { eh_doRefresh(this, new EventArgs()); } } - - private void setClock() - { - lblDateTime.Text = DateTime.Now.ToString("ddd dd.MM.yyyy, HH:mm:ss"); - lblCodOperatore.Text = "FIXME";// $"{AppData.DataLayer.man.CodSoggCurrUser} - {AppData.DataLayer.man.CognNomeCurrUser}"; - } } } \ No newline at end of file diff --git a/GPW_Smart/WebUserControls/cmp_footer.ascx.designer.cs b/GPW_Smart/WebUserControls/cmp_footer.ascx.designer.cs index 19436f8..e110098 100644 --- a/GPW_Smart/WebUserControls/cmp_footer.ascx.designer.cs +++ b/GPW_Smart/WebUserControls/cmp_footer.ascx.designer.cs @@ -13,40 +13,31 @@ namespace GPW_Smart.WebUserControls { public partial class cmp_footer { /// - /// Controllo lblDateTime. + /// Controllo btnTimbra. /// /// /// 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 lblDateTime; + protected global::System.Web.UI.WebControls.HyperLink btnTimbra; /// - /// Controllo lblCodOperatore. + /// Controllo btnProgetti. /// /// /// 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 lblCodOperatore; + protected global::System.Web.UI.WebControls.HyperLink btnProgetti; /// - /// Controllo lblApp. + /// Controllo btnAdmin. /// /// /// 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 lblApp; - - /// - /// Controllo lblCopyRight. - /// - /// - /// 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 lblCopyRight; + protected global::System.Web.UI.WebControls.HyperLink btnAdmin; /// /// Controllo Timer1.