Egalware/GPW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Test su IIS01...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-09-28 10:17:47 +02:00
parent cf67039d21
commit bdec75e1b5
9 changed files with 111 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW_Smart/Content/Site.css
-53
View File
@@ -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;
GPW_Smart/Site.Master
+1 -14
View File
@@ -50,21 +50,8 @@
<div class="container-flow body-content">
<asp:ContentPlaceHolder ID="MainContent" runat="server">
</asp:ContentPlaceHolder>
<div data-role="panel" id="bottomsheet" data-animate="false" data-position='bottom' data-display="overlay" style="padding: -1em;">
<asp:ContentPlaceHolder ID="btOptContent" runat="server">
opzioni bottom
</asp:ContentPlaceHolder>
</div>
<div data-role="footer" data-position="fixed" data-theme="a">
<uc1:cmp_footer runat="server" ID="cmp_footer" />
</div>
<div data-role="panel" id="leftpanel" data-display="overlay" data-position-fixed="true">
<asp:ContentPlaceHolder ID="sxOptContent" runat="server">
opzioni SX
</asp:ContentPlaceHolder>
</div>
<uc1:cmp_footer runat="server" ID="cmp_footer" />
</div>
</form>
</body>
</html>
GPW_Smart/Site.Master.designer.cs
Generated
-18
View File
@@ -30,15 +30,6 @@ namespace GPW_Smart {
/// </remarks>
protected global::System.Web.UI.WebControls.ContentPlaceHolder MainContent;
/// <summary>
/// Controllo btOptContent.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.ContentPlaceHolder btOptContent;
/// <summary>
/// Controllo cmp_footer.
/// </summary>
@@ -47,14 +38,5 @@ namespace GPW_Smart {
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::GPW_Smart.WebUserControls.cmp_footer cmp_footer;
/// <summary>
/// Controllo sxOptContent.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.ContentPlaceHolder sxOptContent;
}
}
GPW_Smart/Timbrature.aspx
+49 -29
View File
@@ -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" %>
<asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
Timbrature
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<asp:ScriptManager EnablePartialRendering="true" EnableScriptGlobalization="true" EnableScriptLocalization="true" EnableCdn="false" runat="server"></asp:ScriptManager>
<asp:UpdatePanel runat="server" ID="pnlTimbrature">
<ContentTemplate>
<uc1:mod_timbrature ID="mod_timbrature1" runat="server" />
</ContentTemplate>
</asp:UpdatePanel>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="btOptContent" runat="server">
<asp:UpdatePanel runat="server" ID="pnlBottom">
<ContentTemplate>
<uc1:mod_mancTimb runat="server" ID="mod_mancTimb" />
</ContentTemplate>
</asp:UpdatePanel>
<script type="text/javascript">
function pageLoad(sender, args) {
$('#<%= pnlTimbrature.ClientID %>').trigger('create');
$('#<%= pnlBottom.ClientID %>').trigger('create');
}
</script>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="sxOptContent" runat="server">
<uc1:mod_opzioniSx runat="server" ID="mod_opzioniSx" />
</asp:Content>
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<asp:UpdatePanel runat="server" ID="pnlTimbrature">
<ContentTemplate>
<uc1:mod_timbrature runat="server" ID="mod_timbrature" />
<div class="row">
<div class="col">
<button type="button" class="btn btn-block btn-warning" data-toggle="modal" data-target="#panelSxModal">
Left Sidebar Modal
</button>
</div>
<div class="col">
<button type="button" class="btn btn-block btn-warning" data-toggle="modal" data-target="#bottomModal">
Other Modal
</button>
</div>
</div>
<div class="modal left fade" id="panelSxModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-body">
<uc1:mod_opzioniSx runat="server" ID="mod_opzioniSx" />
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>
<div class="modal fade" id="bottomModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-body">
<uc1:mod_mancTimb runat="server" ID="mod_mancTimb" />
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>
</ContentTemplate>
</asp:UpdatePanel>
</asp:Content>
GPW_Smart/Timbrature.aspx.cs
+35 -42
View File
@@ -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();
}
/// <summary>
/// update visualizzazione timbrature
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
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();
}
/// <summary>
/// update visualizzazione timbrature
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
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();
}
}
}
GPW_Smart/Timbrature.aspx.designer.cs
Generated
+11 -20
View File
@@ -22,31 +22,13 @@ namespace GPW_Smart {
protected global::System.Web.UI.UpdatePanel pnlTimbrature;
/// <summary>
/// Controllo mod_timbrature1.
/// Controllo mod_timbrature.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::GPW.WebUserControls.mod_timbrature mod_timbrature1;
/// <summary>
/// Controllo pnlBottom.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.UpdatePanel pnlBottom;
/// <summary>
/// Controllo mod_mancTimb.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::GPW.WebUserControls.mod_mancTimb mod_mancTimb;
protected global::GPW.WebUserControls.mod_timbrature mod_timbrature;
/// <summary>
/// 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.
/// </remarks>
protected global::GPW_Smart.WebUserControls.mod_opzioniSx mod_opzioniSx;
/// <summary>
/// Controllo mod_mancTimb.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::GPW.WebUserControls.mod_mancTimb mod_mancTimb;
}
}
GPW_Smart/WebUserControls/cmp_footer.ascx
+9 -10
View File
@@ -1,18 +1,17 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_footer.ascx.cs" Inherits="GPW_Smart.WebUserControls.cmp_footer" %>
<nav class="navbar fixed-bottom navbar-dark bg-dark text-light small">
<div class="row" style="width: 100%;">
<div class="col-6 text-left">
<span class="d-none d-lg-inline">
<asp:Label ID="lblDateTime" runat="server" Text="..." />
&nbsp;|&nbsp;</span>
<asp:Label ID="lblCodOperatore" runat="server" Text="-" />
<div class="row">
<div class="col">
<asp:HyperLink runat="server" ID="btnTimbra" class="btn btn-secondary btn-block py-1" NavigateUrl="~/Timbrature"><i class="fa fa-home" aria-hidden="true"></i><br />Timbra</asp:HyperLink>
</div>
<div class="col-6 text-right fontCond">
<asp:Label runat="server" ID="lblApp" Text="." />&nbsp;-&nbsp;
<asp:Label runat="server" ID="lblCopyRight" CssClass="d-none d-lg-inline" Text="..." />
<div class="col">
<asp:HyperLink runat="server" ID="btnProgetti" class="btn btn-secondary btn-block py-1" NavigateUrl="~/Progetti"><i class="fa fa-tasks" aria-hidden="true"></i><br />Progetti</asp:HyperLink>
</div>
<div class="col">
<asp:HyperLink runat="server" ID="btnAdmin" class="btn btn-secondary btn-block py-1" NavigateUrl="~/Admin"><i class="fa fa-gear" aria-hidden="true"></i><br />Admin</asp:HyperLink>
</div>
</div>
<asp:Timer ID="Timer1" runat="server" Interval="10000" OnTick="Timer1_Tick">
</asp:Timer>
</nav>
GPW_Smart/WebUserControls/cmp_footer.ascx.cs
-12
View File
@@ -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("<b>{0}</b> v.{1}", ConfigurationManager.AppSettings.Get("appName"), System.Reflection.Assembly.GetExecutingAssembly().GetName().Version);
lblCopyRight.Text = string.Format("<b>{0}-{1}</b>", ConfigurationManager.AppSettings.Get("copyRight"), DateTime.Now.Year);
setTimer();
setClock();
}
/// <summary>
/// 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}";
}
}
}
GPW_Smart/WebUserControls/cmp_footer.ascx.designer.cs
Generated
+6 -15
View File
@@ -13,40 +13,31 @@ namespace GPW_Smart.WebUserControls {
public partial class cmp_footer {
/// <summary>
/// Controllo lblDateTime.
/// Controllo btnTimbra.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblDateTime;
protected global::System.Web.UI.WebControls.HyperLink btnTimbra;
/// <summary>
/// Controllo lblCodOperatore.
/// Controllo btnProgetti.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblCodOperatore;
protected global::System.Web.UI.WebControls.HyperLink btnProgetti;
/// <summary>
/// Controllo lblApp.
/// Controllo btnAdmin.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblApp;
/// <summary>
/// Controllo lblCopyRight.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblCopyRight;
protected global::System.Web.UI.WebControls.HyperLink btnAdmin;
/// <summary>
/// Controllo Timer1.