Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Altro test con toggle a tempo

Browse Source 
mette e registra di togliere menù laterale...
This commit is contained in:
Samuele E. Locatelli
2018-03-09 15:06:38 +01:00
parent d79108db5b
commit d53966673a
9 changed files with 145 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=689']) {
withEnv(['NEXT_BUILD_NUMBER=690']) {
// env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
MP-Tablet/DettaglioMacchina.aspx.cs
+11
View File
@@ -1,6 +1,7 @@
using SteamWare;
using System;
using System.Web.UI;
using WebMasterPages;
namespace MoonProTablet
{
@@ -29,6 +30,16 @@ namespace MoonProTablet
mod_confProd1.eh_inserting += mod_confProd1_eh_inserting;
mod_confProd1.eh_newVal += mod_confProd1_eh_newVal;
mod_confProd1.eh_reset += mod_confProd1_eh_reset;
mod_dettMacchina1.eh_reqRemoveModal += Mod_dettMacchina1_eh_reqRemoveModal;
}
/// <summary>
/// Fatto refresh dettaglio --> richeisto rimozione modal...
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void Mod_dettMacchina1_eh_reqRemoveModal(object sender, EventArgs e)
{
((Bootstrap)this.Master).removeModal();
}
void mod_confProd1_eh_reset(object sender, EventArgs e)
MP-Tablet/Web.config
+1 -1
View File
@@ -57,7 +57,7 @@
<add key="intUpdatePagina_ms" value="1000" />
<!--!!!FARE!!! riportare a 0!!!-->
<add key="refrMSE_5" value="5" />
<add key="dtTimerInt" value="3000" />
<add key="dtTimerInt" value="10000" />
<!-- Logging -->
<add key="_logDir" value="~/logs/" />
<add key="_logLevel" value="7" />
MP-Tablet/WebMasterPages/Bootstrap.Master.cs
+7
View File
@@ -13,5 +13,12 @@ namespace WebMasterPages
protected void Page_Load(object sender, EventArgs e)
{
}
/// <summary>
/// Chiede al menùTop di chiudere il pnl modale...
/// </summary>
public void removeModal()
{
mod_title.removeModal();
}
}
}
MP-Tablet/WebUserControls/mod_dettMacchina.ascx
+1 -1
View File
@@ -1,6 +1,6 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_dettMacchina.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_dettMacchina" %>
<%--Riporto dettaglio singola macchina--%>
<asp:UpdatePanel ID="UpdatePanel1" runat="server" UpdateMode="Always" >
<asp:UpdatePanel ID="UpdatePanel1" runat="server">
<ContentTemplate>
<asp:Panel runat="server" ID="pnlFullDet">
<div class="row">
MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs
+15 -2
View File
@@ -6,6 +6,10 @@ namespace MoonProTablet.WebUserControls
{
public partial class mod_dettMacchina : System.Web.UI.UserControl
{
/// <summary>
/// fatto refresh --> chiedo remove modal (se c'è)
/// </summary>
public event EventHandler eh_reqRemoveModal;
/// <summary>
/// idx macchina selezionata
/// </summary>
@@ -28,7 +32,10 @@ namespace MoonProTablet.WebUserControls
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
dmTimer.Interval = memLayer.ML.CRI("dtTimerInt");
if (!Page.IsPostBack)
{
dmTimer.Interval = memLayer.ML.CRI("dtTimerInt");
}
// controllo se ho dett macchina altrimenti ritorno a pagina generale...
if (idxMacchina == "")
{
@@ -71,7 +78,13 @@ namespace MoonProTablet.WebUserControls
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Timer1_Tick(object sender, EventArgs e)
{
{
// sollevo evento!
if (eh_reqRemoveModal != null)
{
eh_reqRemoveModal(this, new EventArgs());
}
// update
doUpdate();
//ScriptManager.RegisterStartupScript(Page, GetType(), "temp", "<script type='text/javascript'>$('div').trigger('create');</script>", false);
ScriptManager.RegisterStartupScript(Page, GetType(), "temp", "<script type='text/javascript'>$('#dettMacch').trigger('create');</script>", false);
MP-Tablet/WebUserControls/mod_title.ascx
+89 -67
View File
@@ -1,90 +1,112 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_title.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_title" %>
<div class="modal fade text-dark" id="MainSideMenu" tabindex="-1" role="dialog" aria-labelledby="MainSideMenu" aria-hidden="true">
<div class="modal-dialog modal-dialog-slideout modal-sm" role="document">
<div class="modal-content">
<div class="modal-header">
<div class="d-flex flex-row">
<div class="p-0">
<asp:Image ID="logo" ImageUrl="../images/logoSteamware.png" runat="server" Height="40px" CssClass="img-fluid" />
</div>
<div class="p-0 pl-1">
<div class="flex-row">
<h5 class="modal-title">Steamware MPTAB</h5>
</div>
<div class="flex-row">
<small>Main Menu</small>
</div>
</div>
</div>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">×</span>
</button>
</div>
<div class="modal-body">
<div class="d-flex">
<div class="flex-row">
<div class="p-2">
Mappa Stato
</div>
<div class="p-2">
<div class="btn-group">
<button type="button" class="btn btn-danger dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
ELENCO IMPIANTI
</button>
<div class="dropdown-menu">
<a class="dropdown-item" href="#">Action</a>
<a class="dropdown-item" href="#">Another action</a>
<a class="dropdown-item" href="#">Something else here</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="#">Separated link</a>
<asp:UpdatePanel ID="UPMenu" runat="server" RenderMode="Block" UpdateMode="Always">
<ContentTemplate>
<script type="text/javascript">
function closeModal() {
$('#MainSideMenu').modal('hide');
$('#btnClose').click();
}
function toggleTimer() {
$('#MainSideMenu').modal('toggle');
myVar = setTimeout(closeModal2, 2000);
function closeModal2() {
$('#MainSideMenu').modal('hide');
}
}
</script>
<div class="modal fade text-dark" id="MainSideMenu" tabindex="-1" role="dialog" aria-labelledby="MainSideMenu" aria-hidden="true">
<div class="modal-dialog modal-dialog-slideout modal-sm" role="document">
<div class="modal-content">
<div class="modal-header">
<div class="d-flex flex-row">
<div class="p-0">
<asp:Image ID="logo" ImageUrl="../images/logoSteamware.png" runat="server" Height="40px" CssClass="img-fluid" />
</div>
<div class="p-0 pl-1">
<div class="flex-row">
<h5 class="modal-title">Steamware MPTAB</h5>
</div>
<div class="flex-row">
<small>Main Menu</small>
</div>
</div>
</div>
<div class="p-2">
Dettaglio macchina
<button id="btnClose" type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">×</span>
</button>
</div>
<div class="modal-body">
<button id="btnClose2" type="button" onclick="closeModal()">
<span aria-hidden="true">del.....</span>
</button>
<div class="d-flex">
<div class="flex-row">
<div class="p-2">
Mappa Stato
</div>
<div class="p-2">
<div class="btn-group">
<button type="button" class="btn btn-danger dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
ELENCO IMPIANTI
</button>
<div class="dropdown-menu">
<a class="dropdown-item" href="#">Action</a>
<a class="dropdown-item" href="#">Another action</a>
<a class="dropdown-item" href="#">Something else here</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="#">Separated link</a>
</div>
</div>
</div>
<div class="p-2">
Dettaglio macchina
<div class="p-2">
Produzione
</div>
<div class="p-2">
ODL / Attrezzaggio
</div>
<div class="p-2">
Gest Turni
</div>
<div class="p-2">
Fermate
</div>
<div class="p-2">
Commenti
</div>
<div class="p-2">
Controlli
<div class="p-2">
ODL / Attrezzaggio
</div>
<div class="p-2">
Gest Turni
</div>
<div class="p-2">
Fermate
</div>
<div class="p-2">
Commenti
</div>
<div class="p-2">
Controlli
</div>
</div>
<div class="p-2">
Storico TC
</div>
<div class="p-2">
Utente
</div>
</div>
</div>
<div class="p-2">
Storico TC
</div>
<div class="p-2">
Utente
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary btn-block" data-dismiss="modal">Chiudi</button>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary btn-block" data-dismiss="modal">Chiudi</button>
</div>
</div>
</div>
</div>
</ContentTemplate>
</asp:UpdatePanel>
<nav class="navbar navbar-expand-md fixed-top navbar-dark bg-black my-0 py-0 text-light px-2 titleBlock">
<a class="navbar-brand p-0 align-text-bottom" href="." data-toggle="modal" data-target="#MainSideMenu">
<asp:Image ID="logoSW" ImageUrl="../images/logoSteamware.png" runat="server" Height="32px" CssClass="img-fluid" />
<strong>MPTAB</strong>
</a>
<button id="btnTogg" type="button" onclick="toggleTimer()">
<span aria-hidden="true">TOG</span>
</button>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarText" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
MP-Tablet/WebUserControls/mod_title.ascx.cs
+11 -2
View File
@@ -34,7 +34,7 @@ namespace MoonProTablet.WebUserControls
protected void Page_Load(object sender, EventArgs e)
{
// prima apertura registro NO popup = refresh enabled
if(!Page.IsPostBack)
if (!Page.IsPostBack)
{
memLayer.ML.setSessionVal("refreshEnabled", true);
}
@@ -199,6 +199,15 @@ namespace MoonProTablet.WebUserControls
return devicesAuthProxy.getPage(Request.Url);
}
}
/// <summary>
/// Elimina il pannello modale su richeista...
/// </summary>
public void removeModal()
{
// elimino modal...
//ScriptManager.RegisterStartupScript(this.Page, this.Page.GetType(), "ClsModal", "closeModal();", true);
ScriptManager.RegisterStartupScript(Page, GetType(), "ClsModal", "closeModal();", true);
ScriptManager.RegisterStartupScript(Page, GetType(), "MSM", "<script type='text/javascript'>$('#MainSideMenu').modal('hide');</script>", false);
}
}
}
MP-Tablet/WebUserControls/mod_title.ascx.designer.cs
Generated
+9
View File
@@ -12,6 +12,15 @@ namespace MoonProTablet.WebUserControls {
public partial class mod_title {
/// <summary>
/// Controllo UPMenu.
/// </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 UPMenu;
/// <summary>
/// Controllo logo.
/// </summary>