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

Merge branch 'release/UpdateTabParametri04'

Browse Source
This commit is contained in:
Samuele Locatelli
2023-09-22 09:46:17 +02:00
parent 86c4d0f029 4305997c5f
commit d14fb28c38
43 changed files with 22255 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB/Allarmi.aspx
+1 -1
View File
@@ -9,7 +9,7 @@
<asp:Content ID="Content1" ContentPlaceHolderID="HeadContent" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-flow m-3" role="main">
<div class="container-fluid px-2 py-3" role="main">
<div class="row">
<div class="col-12 col-md-8 col-lg-9 col-xl-10">
<div class="my-2">
MP-TAB/App_Start/BundleConfig.cs
+23 -22
View File
@@ -2,26 +2,26 @@
namespace MoonProTablet
{
public class BundleConfig
{
// For more information on Bundling, visit http://go.microsoft.com/fwlink/?LinkId=254726
public static void RegisterBundles(BundleCollection bundles)
public class BundleConfig
{
bundles.Add(new ScriptBundle("~/bundles/WebFormsJs").Include(
"~/Scripts/WebForms/WebForms.js",
"~/Scripts/WebForms/WebUIValidation.js",
"~/Scripts/WebForms/MenuStandards.js",
"~/Scripts/WebForms/Focus.js",
"~/Scripts/WebForms/GridView.js",
"~/Scripts/WebForms/DetailsView.js",
"~/Scripts/WebForms/TreeView.js",
"~/Scripts/WebForms/WebParts.js"));
// For more information on Bundling, visit http://go.microsoft.com/fwlink/?LinkId=254726
public static void RegisterBundles(BundleCollection bundles)
{
bundles.Add(new ScriptBundle("~/bundles/WebFormsJs").Include(
"~/Scripts/WebForms/WebForms.js",
"~/Scripts/WebForms/WebUIValidation.js",
"~/Scripts/WebForms/MenuStandards.js",
"~/Scripts/WebForms/Focus.js",
"~/Scripts/WebForms/GridView.js",
"~/Scripts/WebForms/DetailsView.js",
"~/Scripts/WebForms/TreeView.js",
"~/Scripts/WebForms/WebParts.js"));
bundles.Add(new ScriptBundle("~/bundles/MsAjaxJs").Include(
"~/Scripts/WebForms/MsAjax/MicrosoftAjax.js",
"~/Scripts/WebForms/MsAjax/MicrosoftAjaxApplicationServices.js",
"~/Scripts/WebForms/MsAjax/MicrosoftAjaxTimer.js",
"~/Scripts/WebForms/MsAjax/MicrosoftAjaxWebForms.js"));
bundles.Add(new ScriptBundle("~/bundles/MsAjaxJs").Include(
"~/Scripts/WebForms/MsAjax/MicrosoftAjax.js",
"~/Scripts/WebForms/MsAjax/MicrosoftAjaxApplicationServices.js",
"~/Scripts/WebForms/MsAjax/MicrosoftAjaxTimer.js",
"~/Scripts/WebForms/MsAjax/MicrosoftAjaxWebForms.js"));
#if false
// Use the Development version of Modernizr to develop with and learn from. Then, when you’re
@@ -29,8 +29,6 @@ namespace MoonProTablet
bundles.Add(new ScriptBundle("~/bundles/modernizr").Include(
"~/Scripts/modernizr-*"));
bundles.Add(new ScriptBundle("~/bundles/jquery").Include(
"~/Scripts/jquery-{version}.js"));
bundles.Add(new ScriptBundle("~/bundles/jqueryui").Include(
"~/Scripts/jquery-ui-{version}.js"));
@@ -39,6 +37,9 @@ namespace MoonProTablet
"~/Scripts/BrowserWindowSize.js"));
#endif
bundles.Add(new ScriptBundle("~/bundles/jquery").Include(
"~/Scripts/jquery-{version}.js"));
bundles.Add(new ScriptBundle("~/bundles/bootstrap").Include(
"~/Scripts/bootstrap.bundle.js"));
@@ -58,7 +59,7 @@ namespace MoonProTablet
// abilito boundle "forzato"!
BundleTable.EnableOptimizations = true;
}
}
}
}
}
MP-TAB/Bundle.config
+2 -2
View File
@@ -10,7 +10,7 @@
<include path="~/Content/flashing.min.css" />
<include path="~/Content/baseStyle.min.css" />
</styleBundle>
<!--<styleBundle path="~/Content/themes/base/css">
<styleBundle path="~/Content/themes/base/css">
<include path="~/Content/themes/base/jquery.ui.css" />
<include path="~/Content/themes/base/jquery.ui.accordion.css" />
<include path="~/Content/themes/base/jquery.ui.autocomplete.css" />
@@ -28,5 +28,5 @@
<include path="~/Content/themes/base/jquery.ui.tabs.css" />
<include path="~/Content/themes/base/jquery.ui.theme.css" />
<include path="~/Content/themes/base/jquery.ui.tooltip.css" />
</styleBundle>-->
</styleBundle>
</bundles>
MP-TAB/Commenti.aspx
+1 -1
View File
@@ -8,7 +8,7 @@
<%@ Register Src="~/WebUserControls/mod_directLinks.ascx" TagPrefix="uc1" TagName="mod_directLinks" %>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-flow m-3" role="main">
<div class="container-fluid px-2 py-3" role="main">
<div class="row">
<div class="col-12 col-md-8 col-lg-9 col-xl-10">
<uc1:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
MP-TAB/Controlli.aspx
+1 -1
View File
@@ -8,7 +8,7 @@
<asp:Content ID="Content1" ContentPlaceHolderID="HeadContent" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-flow m-3" role="main">
<div class="container-fluid px-2 py-3" role="main">
<div class="row">
<div class="col-12 col-md-8 col-lg-9 col-xl-10">
<div class="my-2">
MP-TAB/DettaglioMacchina.aspx
+1 -1
View File
@@ -10,7 +10,7 @@
<%@ Register Src="~/WebUserControls/cmp_goPrint.ascx" TagPrefix="uc1" TagName="cmp_goPrint" %>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-flow m-3" role="main">
<div class="container-fluid px-2 py-3" role="main">
<div class="row">
<div class="col-12 col-md-8 col-lg-9 col-xl-10">
<uc6:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
MP-TAB/Dichiarazioni.aspx
+1 -1
View File
@@ -8,7 +8,7 @@
<asp:Content ID="Content1" ContentPlaceHolderID="HeadContent" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-flow m-3" role="main">
<div class="container-fluid px-2 py-3" role="main">
<div class="row">
<div class="col-12 col-md-8 col-lg-9 col-xl-10">
<div class="my-2">
MP-TAB/Fermate.aspx
+1 -1
View File
@@ -7,7 +7,7 @@
<asp:Content ID="Content1" ContentPlaceHolderID="HeadContent" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-flow m-3" role="main">
<div class="container-fluid px-2 py-3" role="main">
<div class="row">
<div class="col-12 col-md-8 col-lg-9 col-xl-10">
<uc1:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
MP-TAB/IOB-info.aspx
+1 -1
View File
@@ -6,7 +6,7 @@
<asp:Content ID="Content1" ContentPlaceHolderID="HeadContent" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-flow m-3" role="main">
<div class="container-fluid px-2 py-3" role="main">
<div class="row">
<div class="col-12 col-md-8 col-lg-9 col-xl-10">
<div class="my-2">
MP-TAB/MP-TAB.csproj
+21 -1
View File
@@ -419,7 +419,12 @@
<Content Include="images\LogoMapoFull.png" />
<Content Include="images\logoTextSteamware.png" />
<Content Include="images\logoSteamware.png" />
<Content Include="images\macchine\Steamware.png" />
<Content Include="images\macchine\small\Steamware.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="images\macchine\Steamware.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="images\ST_img\Steamware.png" />
<Content Include="IOB-info.aspx" />
<Content Include="jumper.aspx" />
@@ -491,6 +496,11 @@
</Content>
<Content Include="Scripts\bootstrap.esm.min.js.map" />
<Content Include="Scripts\bootstrap.esm.js.map" />
<None Include="Scripts\jquery-3.7.0.intellisense.js" />
<Content Include="Scripts\jquery-3.7.0.js" />
<Content Include="Scripts\jquery-3.7.0.min.js" />
<Content Include="Scripts\jquery-3.7.0.slim.js" />
<Content Include="Scripts\jquery-3.7.0.slim.min.js" />
<Content Include="Scripts\WebForms\DetailsView.js" />
<Content Include="Scripts\WebForms\Focus.js" />
<Content Include="Scripts\WebForms\GridView.js" />
@@ -581,11 +591,14 @@
<Content Include="WebUserControls\mod_title.ascx" />
<Content Include="WebUserControls\mod_turni.ascx" />
<Content Include="setupTgt.bat" />
<Content Include="Scripts\jquery-3.7.0.slim.min.map" />
<Content Include="Scripts\jquery-3.7.0.min.map" />
<None Include="Web.OVH-Demo.config">
<DependentUpon>Web.config</DependentUpon>
</None>
<Content Include="WebMasterPages\Bootstrap.Master" />
<Content Include="windowSize.ashx" />
<Content Include="WebMasterPages\QrScan.master" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\VersGen\MoonPro.cs">
@@ -833,6 +846,13 @@
<Compile Include="WebMasterPages\Bootstrap.Master.designer.cs">
<DependentUpon>Bootstrap.Master</DependentUpon>
</Compile>
<Compile Include="WebMasterPages\QrScan.master.cs">
<DependentUpon>QrScan.master</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebMasterPages\QrScan.master.designer.cs">
<DependentUpon>QrScan.master</DependentUpon>
</Compile>
<Compile Include="WebUserControls\BaseUserControl.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>
MP-TAB/MappaStato.aspx
+1 -1
View File
@@ -4,7 +4,7 @@
<%@ Register Src="~/WebUserControls/mod_checkHttps.ascx" TagPrefix="uc1" TagName="mod_checkHttps" %>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-fluid mt-0 mb-3 px-3 px-md-4" role="main">
<div class="container-fluid px-2 py-3" role="main">
<uc1:mod_checkHttps runat="server" ID="mod_checkHttps" />
<uc1:mod_mappaStato ID="mod_mappaStato1" runat="server" />
</div>
MP-TAB/MappaStato.aspx.designer.cs
Generated
+19 -17
View File
@@ -1,32 +1,34 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
// <auto-generated>
// 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.
// </generato automaticamente>
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace MoonProTablet {
public partial class MappaStato {
namespace MoonProTablet
{
public partial class MappaStato
{
/// <summary>
/// Controllo mod_checkHttps.
/// mod_checkHttps control.
/// </summary>
/// <remarks>
/// 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.
/// </remarks>
protected global::MoonProTablet.WebUserControls.mod_checkHttps mod_checkHttps;
/// <summary>
/// Controllo mod_mappaStato1.
/// mod_mappaStato1 control.
/// </summary>
/// <remarks>
/// 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.
/// </remarks>
protected global::MoonProTablet.WebUserControls.mod_mappaStato mod_mappaStato1;
}
MP-TAB/ODL.aspx
+1 -1
View File
@@ -7,7 +7,7 @@
<%@ Register Src="~/WebUserControls/cmp_SlaveMachine.ascx" TagPrefix="uc1" TagName="cmp_SlaveMachine" %>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-flow m-3" role="main">
<div class="container-fluid px-2 py-3" role="main">
<div class="row">
<div class="col-12 col-md-8 col-lg-9 col-xl-10">
<uc1:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
MP-TAB/PianoProd.aspx
+1 -1
View File
@@ -13,7 +13,7 @@
display: none;
}
</style>
<div class="container-flow m-3" role="main">
<div class="container-fluid px-2 py-3" role="main">
<div class="row">
<div class="col-12 col-md-8 col-lg-9 col-xl-10">
<uc6:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
MP-TAB/Scarti.aspx
+1 -1
View File
@@ -9,7 +9,7 @@
<asp:Content ID="Content1" ContentPlaceHolderID="HeadContent" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-flow m-3" role="main">
<div class="container-fluid px-2 py-3" role="main">
<div class="row">
<div class="col-12 col-md-8 col-lg-9 col-xl-10">
<div class="my-2">
MP-TAB/Scripts/jquery-3.7.0.intellisense.js
Vendored
+2670
View File
File diff suppressed because it is too large Load Diff
MP-TAB/Scripts/jquery-3.7.0.js
Vendored
+10704
View File
File diff suppressed because it is too large Load Diff
MP-TAB/Scripts/jquery-3.7.0.min.js
Vendored
+2
View File
File diff suppressed because one or more lines are too long
MP-TAB/Scripts/jquery-3.7.0.min.map
+1
View File
File diff suppressed because one or more lines are too long
MP-TAB/Scripts/jquery-3.7.0.slim.js
+8605
View File
File diff suppressed because it is too large Load Diff
MP-TAB/Scripts/jquery-3.7.0.slim.min.js
Vendored
+2
View File
File diff suppressed because one or more lines are too long
MP-TAB/Scripts/jquery-3.7.0.slim.min.map
+1
View File
File diff suppressed because one or more lines are too long
MP-TAB/SendParameters.aspx
+1 -1
View File
@@ -8,7 +8,7 @@
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-flow m-3" role="main">
<div class="container-fluid px-2 py-3" role="main">
<div class="row">
<div class="col-12 col-md-8 col-lg-9 col-xl-10">
<uc1:mod_dettMacchina runat="server" ID="mod_dettMacchina" />
MP-TAB/SheetTech.aspx
+1 -1
View File
@@ -8,7 +8,7 @@
<asp:Content ID="Content1" ContentPlaceHolderID="HeadContent" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-flow m-3" role="main">
<div class="container-fluid px-2 py-3" role="main">
<div class="row mb-5">
<div class="col-12 col-md-8 col-lg-9 col-xl-10">
<uc1:mod_dettMacchina runat="server" ID="mod_dettMacchina" />
MP-TAB/Turni.aspx
+1 -1
View File
@@ -7,7 +7,7 @@
<%@ Register Src="~/WebUserControls/mod_dettTurni.ascx" TagPrefix="uc1" TagName="mod_dettTurni" %>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-flow m-3" role="main">
<div class="container-fluid px-2 py-3" role="main">
<div class="row">
<div class="col-12 col-md-8 col-lg-9 col-xl-10">
<uc1:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
MP-TAB/WebMasterPages/Bootstrap.Master
+7 -5
View File
@@ -18,14 +18,16 @@
<asp:PlaceHolder ID="PlaceHolder1" runat="server">
<%--: Scripts.Render("~/bundles/modernizr") --%>
<%--: Scripts.Render("~/bundles/jquery") --%>
<%: Scripts.Render("~/bundles/jquery") %>
<%--: Scripts.Render("~/bundles/jqueryui") --%>
<%--: Scripts.Render("~/bundles/typeahead") --%>
<%--: Scripts.Render("~/bundles/BrowserWindowSize") --%>
<script type="text/javascript" src="Scripts/instascan.min.js"></script>
<%--<script type="text/javascript" src="Scripts/instascan.min.js"></script>--%>
</asp:PlaceHolder>
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<%--<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />--%>
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />
<asp:ContentPlaceHolder ID="HeadContent" runat="server">
</asp:ContentPlaceHolder>
</head>
@@ -51,8 +53,8 @@
<uc1:mod_title runat="server" ID="mod_title" />
<asp:UpdatePanel ID="uppContainer" runat="server">
<ContentTemplate>
<div class="row bodyDark pt-0 mt-0">
<div class="col-12 px-0">
<div class="row bodyDark">
<div class="col-12">
<asp:ContentPlaceHolder ID="MainContent" runat="server">
<div class="container" role="main">
<h1>hello world!</h1>
MP-TAB/WebMasterPages/Bootstrap.Master.designer.cs
Generated
+9
View File
@@ -32,6 +32,15 @@ namespace WebMasterPages
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1;
/// <summary>
/// BundleReference2 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2;
/// <summary>
/// HeadContent control.
/// </summary>
MP-TAB/WebMasterPages/QrScan.master
+11
View File
@@ -0,0 +1,11 @@
<%@ Master Language="C#" MasterPageFile="~/WebMasterPages/Bootstrap.Master" AutoEventWireup="true" CodeBehind="QrScan.master.cs" Inherits="MoonProTablet.WebMasterPages.QrScan" %>
<asp:Content ID="Content1" ContentPlaceHolderID="HeadContent" runat="server">
<asp:PlaceHolder ID="PlaceHolder1" runat="server">
<script type="text/javascript" src="Scripts/instascan.min.js"></script>
</asp:PlaceHolder>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<asp:ContentPlaceHolder ID="MainContentScan" runat="server">
</asp:ContentPlaceHolder>
</asp:Content>
MP-TAB/WebMasterPages/QrScan.master.cs
+17
View File
@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace MoonProTablet.WebMasterPages
{
public partial class QrScan : System.Web.UI.MasterPage
{
protected void Page_Load(object sender, EventArgs e)
{
}
}
}
MP-TAB/WebMasterPages/QrScan.master.designer.cs
Generated
+35
View File
@@ -0,0 +1,35 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace MoonProTablet.WebMasterPages
{
public partial class QrScan
{
/// <summary>
/// PlaceHolder1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolder1;
/// <summary>
/// MainContentScan control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.ContentPlaceHolder MainContentScan;
}
}
MP-TAB/WebUserControls/BaseUserControl.cs
+9 -3
View File
@@ -315,12 +315,18 @@ namespace MoonProTablet.WebUserControls
{
url = "Steamware.png";
}
// verifico esistenza macchina...
answ = $"./images/macchine/{url}";
// verifico esistenza macchina SMALL...
answ = $"./images/macchine/small/{url}";
string fullPath = Server.MapPath(answ);
if (!File.Exists(fullPath))
{
// metto default Steamware
// se non ci fosse cerco immagine fullsize
answ = $"./images/macchine/{url}";
fullPath = Server.MapPath(answ);
}
// altrimenti metto default Steamware
if (!File.Exists(fullPath))
{
answ = "./images/macchine/Steamware.png";
}
return answ;
MP-TAB/WebUserControls/mod_dettMacchina.ascx
+2 -2
View File
@@ -11,7 +11,7 @@
<div class="col-12 textCondens">
<asp:HyperLink runat="server" ID="hlControlli" Font-Size="2.5em" CssClass="btn w-100 btn-lg flashingPurple mb-2 p-3" NavigateUrl="~/Controlli.aspx" Visible='<%# showReqControl(Eval("IdxMacchina")) %>'><i class="fa fa-lg fa-flask"></i> EFFETTUARE CONTROLLO<i class="fa fa-lg fa-flask"></i></asp:HyperLink>
</div>
<div class="col-9 col-sm-10">
<div class='<%# cssMain(Eval("CodArticolo")) %>'>
<div class="card text-white mapBlock rCAll">
<div class='card <%# Eval("Semaforo") %> p-0 m-0 rCAll'>
<div class="row m-2 bg-black">
@@ -57,7 +57,7 @@
</div>
</div>
</div>
<div class="col-3 col-sm-2 pl-0">
<div class='<%# cssDisegno(Eval("CodArticolo")) %>'>
<asp:HyperLink runat="server" ID="hlDisegno" NavigateUrl='<%# urlDisegno(Eval("CodArticolo")) %>' Visible='<%# showDisegno(Eval("CodArticolo")) %>' CssClass="btn btn-secondary btn-sm w-100 small" Target="_blank">
<i class="fa fa-file-pdf-o fa-2x"></i><br /><div class="small">DISEGNO</div>
</asp:HyperLink>
MP-TAB/WebUserControls/mod_dettMacchina.ascx.cs
+24 -4
View File
@@ -37,6 +37,26 @@ namespace MoonProTablet.WebUserControls
#region Public Methods
/// <summary>
/// css blocco disegno dato codArt + check
/// </summary>
/// <param name="codArt"></param>
/// <returns></returns>
public string cssDisegno(object codArt)
{
return showDisegno(codArt) ? "col-3 col-sm-2 ps-1" : "d-none";
}
/// <summary>
/// css blocco principale dato codArt + check
/// </summary>
/// <param name="codArt"></param>
/// <returns></returns>
public string cssMain(object codArt)
{
return showDisegno(codArt) ? "col-9 col-sm-10 pe-0" : "col-12";
}
/// <summary>
/// fa update del controllo
/// </summary>
@@ -50,7 +70,7 @@ namespace MoonProTablet.WebUserControls
{
// default è ND...
bool answ = false;
// SE abilitata gestione controlli...
// SE abilitata gestione disegni...
if (enableDisegno)
{
// recupero da anagrafica articoli...
@@ -63,12 +83,12 @@ namespace MoonProTablet.WebUserControls
}
else
{
logger.lg.scriviLog(string.Format("Attenzione! nessuna informazione trovata per l'articolo {0}", _codArticolo), tipoLog.WARNING);
logger.lg.scriviLog($"showDisegno | nessuna informazione trovata per l'articolo {_codArticolo}", tipoLog.WARNING);
}
}
catch (Exception exc)
{
logger.lg.scriviLog(string.Format("Errore in ricostruzione URL disegno:{0}{1}", Environment.NewLine, exc), tipoLog.EXCEPTION);
logger.lg.scriviLog($"showDisegno | eccezione in ricostruzione URL disegno:{Environment.NewLine}{exc}", tipoLog.EXCEPTION);
}
}
return answ;
@@ -146,7 +166,7 @@ namespace MoonProTablet.WebUserControls
if (!Page.IsPostBack)
{
dmTimer.Interval = memLayer.ML.CRI("dtTimerInt");
}
}
// controllo se ho dett macchina altrimenti ritorno a pagina generale...
if (idxMacchina == "")
{
MP-TAB/WebUserControls/mod_footer.ascx
+11 -7
View File
@@ -1,11 +1,15 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_footer.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_footer" %>
<footer class="navbar fixed-bottom navbar-dark bg-dark text-light p-0 px-2 m-0 bg-black " style="font-size: 1em; height: 1.5em;">
<div class="d-flex justify-content-start pl-1 text-start align-self-center small">
<strong><%: System.Web.Configuration.WebConfigurationManager.AppSettings["Environment"] %></strong> - v.<%: currVersion.ToString() %> [ <%: videoSize %> ] | <%: DateTime.Now %>
<div class="d-flex justify-content-between w-100">
<div class="px-1 pl-1 text-start align-self-center small">
<span class="small"><%: DateTime.Now.ToString("ddd dd MMM, HH:mm") %></span> | <small>v.<%: currVersion.ToString() %></small>
</div>
<%--<div class="px-1 text-center align-self-center small">
</div>--%>
<div class="px-1 text-end align-self-center small">
<img src="./images/logoSteamware.png" height="20" />
EgalWare&nbsp;<span class="small">&copy; <%: DateTime.Now.Year %></span>
</div>
</div>
<div class="d-flex justify-content-end pr-1 text-end align-self-center small">
<img src="./images/logoSteamware.png" height="20" />
EgalWare&nbsp;&copy; <%: DateTime.Now.Year %>
</div>
</footer>
</footer>
MP-TAB/WebUserControls/mod_sendParameters.ascx
+18 -15
View File
@@ -5,16 +5,17 @@
<div class="card">
<div class="card-header bg-secondary text-warning px-2 py-1">
<div class="d-flex justify-content-between">
<div class="mr-auto p-2">
<h4>GESTIONE PARAMETRI MACCHINA</h4>
<div class="px-1">
<span class="fs-5 d-block d-md-none">GEST. PARAMETRI</span>
<span class="fs-5 d-none d-md-block">GESTIONE PARAMETRI MACCHINA</span>
</div>
<div class="p-2">
<div class="px-1">
<asp:LinkButton runat="server" ID="lbtReload" CssClass="btn btn-sm btn-primary" OnClick="lbtReload_Click"><i class="fa fa-refresh" aria-hidden="true"></i></asp:LinkButton>
</div>
</div>
</div>
<div class="card-body text-dark">
<i>Elenco parametri di configurazione ammessi per l'impianto</i>
<div class="card-body text-dark p-1">
<i>Elenco parametri di configurazione impianto</i>
<asp:GridView ID="grView" runat="server" DataSourceID="ods" AutoGenerateColumns="False" CssClass="table table-sm table-striped" DataKeyNames="uid" OnRowUpdating="grView_RowUpdating" OnRowEditing="grView_RowEditing">
<EmptyDataTemplate>Nessun parametro disponibile</EmptyDataTemplate>
<Columns>
@@ -43,7 +44,7 @@
</div>
<div class="row" runat="server" id="divRequest" visible='<%# !string.IsNullOrEmpty(Eval("reqValue").ToString()) %>'>
<div class="col-12">
<div class="fw-bold text-primary small">
<div class="fw-bold text-primary small text-nowrap">
<i class="fa fa-hand-o-right" aria-hidden="true"></i>
<asp:Label ID="Label2" runat="server" Text='<%# Eval("reqValue") %>' />&nbsp;
</div>
@@ -61,23 +62,25 @@
</div>
</EditItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="DTime" SortExpression="lastRead">
<asp:TemplateField HeaderText="DTime" SortExpression="lastRead" HeaderStyle-HorizontalAlign="Right">
<ItemTemplate>
<div class="row">
<div class="col-12">
<div class="fw-light my-0 small">
<small>
<asp:Label ID="lblLastRead" runat="server" Text='<%# Eval("lastRead","{0:yyyy-MM-dd HH:mm:ss}") %>' />
</small>
<div class="fw-light my-0 small text-end text-nowrap">
<small class="d-block d-md-none">
<asp:Label ID="lblLastReadSm" runat="server" Text='<%# Eval("lastRead","{0:HH:mm:ss}") %>' /></small>
<small class="d-none d-md-block">
<asp:Label ID="lblLastRead" runat="server" Text='<%# Eval("lastRead","{0:yyHH:mm:ss}") %>' /></small>
</div>
</div>
</div>
<div class="row" runat="server" visible='<%# !string.IsNullOrEmpty(Eval("reqValue").ToString()) %>'>
<div class="col-12">
<div class="fw-light my-0 text-primary small">
<small>
<asp:Label ID="Label3" runat="server" Text='<%# Eval("lastRequest","{0:yyyy-MM-dd HH:mm:ss}") %>' />
</small>
<div class="fw-light my-0 text-primary small text-end text-nowrap">
<small class="d-block d-md-none">
<asp:Label ID="lbllastRequestSm" runat="server" Text='<%# Eval("lastRequest","{0:HH:mm:ss}") %>' /></small>
<small class="d-none d-md-block">
<asp:Label ID="lbllastRequest" runat="server" Text='<%# Eval("lastRequest","{0:yyHH:mm:ss}") %>' /></small>
</div>
</div>
</div>
MP-TAB/WebUserControls/mod_sendParameters.ascx.cs
-3
View File
@@ -87,9 +87,6 @@ namespace MoonProTablet.WebUserControls
{
DataLayerObj.updateMachineParameter(idxMacchina, Original_uid, reqValue);
}
//grView.SelectedIndex = -1;
//grView.EditIndex = -1;
//grView.DataBind();
Log.Info($"updateParameter | end");
}
MP-TAB/WebUserControls/mod_slideMenu.ascx
+7 -85
View File
@@ -1,25 +1,17 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_slideMenu.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_slideMenu" %>
<div class="d-flex justify-content-between">
<div class="px-1">
<button class="btn btn-link text-light" type="button" data-bs-toggle="offcanvas" data-bs-target="#offcanvasExample" aria-controls="offcanvasExample">
<span class="fa fa-bars fa-lg"></span>
</button>
</div>
<div class="px-1">
<div class="py-2 ml-auto small"><%: string.Format("{0:ddd dd MMM yyyy}",DateTime.Now) %></div>
</div>
</div>
<button class="btn btn-link text-light" type="button" data-bs-toggle="offcanvas" data-bs-target="#offcanvasExample" aria-controls="offcanvasExample">
<span class="fa fa-bars fa-lg"></span>
</button>
<div class="offcanvas offcanvas-start" tabindex="-1" id="offcanvasExample" aria-labelledby="offcanvasExampleLabel">
<div class="offcanvas-header">
<div class="offcanvas-header bg-secondary text-light">
<div class="d-flex flex-row">
<div class="p-0">
<asp:Image ID="Image1" ImageUrl="../images/logoSteamware.png" runat="server" Height="40px" CssClass="img-fluid" />
<asp:Image ID="Image1" ImageUrl="../images/logoSteamware.png" runat="server" Width="40px" CssClass="img-fluid" />
</div>
<div class="p-0 pl-1">
<div class="flex-row">
<h5 class="modal-title">EgalWare</h5>
<b class="modal-title fs-2">EgalWare</b>
</div>
<div class="flex-row">
<small>Main Menu</small>
@@ -48,78 +40,8 @@
</asp:ObjectDataSource>
</div>
</div>
<div class="offcanvas-footer">
<div class="my-4">
<button type="button" class="btn btn-secondary w-100" data-bs-dismiss="offcanvas" aria-label="Close">Chiudi</button>
</div>
</div>
</div>
<%--<div class="row">
<div class="col-12">
<script type="text/javascript">
function openTemp() {
$('#MainSideMenu').modal('toggle');
myVar = setTimeout(closeModal, 10000);
function closeModal() {
$('#MainSideMenu').modal('hide');
clearTimeout(myVar);
}
}
</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="Image1" 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">EgalWare</h5>
</div>
<div class="flex-row">
<small>Main Menu</small>
</div>
</div>
</div>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<div class="d-flex flex-row">
<div class="p-2">
<b class="text-danger">LINK DIRETTI</b>
</div>
</div>
<div class="d-flex flex-column">
<div class="list-group">
<asp:Repeater ID="repLI" runat="server" DataSourceID="ods">
<ItemTemplate>
<asp:HyperLink runat="server" ID="btnMenuItem" CssClass='<%# checkPage(Eval("NavigateUrl")) %>' NavigateUrl='<%# Eval("NavigateUrl") %>'><i class='fa fa-lg <%# Eval("icona") %>'></i> <%# Eval("Testo") %></asp:HyperLink>
</ItemTemplate>
</asp:Repeater>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByTipo" TypeName="MapoDb.DS_applicazioneTableAdapters.LinkMenuJQMTableAdapter">
<SelectParameters>
<asp:SessionParameter DefaultValue="-" Name="TipoLink" SessionField="TipoLink" Type="String" />
</SelectParameters>
</asp:ObjectDataSource>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary w-100" data-bs-dismiss="modal" aria-label="Close">Chiudi</button>
</div>
</div>
</div>
</div>
<div class="d-flex flex-row">
<div class="p-0">
<button class="btn btn-link text-light" type="button" onclick="openTemp()">
<span class="fa fa-bars fa-lg"></span>
</button>
</div>
<div class="py-2 ml-auto small"><%: string.Format("{0:ddd dd MMM yyyy}",DateTime.Now) %></div>
</div>
</div>
</div>--%>
MP-TAB/WebUserControls/mod_title.ascx
+28 -28
View File
@@ -1,34 +1,34 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_title.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_title" %>
<%@ Register Src="~/WebUserControls/mod_slideMenu.ascx" TagPrefix="uc1" TagName="mod_slideMenu" %>
<nav class="navbar navbar-expand fixed-top navbar-dark bg-black text-light titleBlock">
<a class="navbar-brand p-0 align-text-bottom" href=".">
<div class="d-flex flex-row">
<div class="p-0" style="width: 1.5em;">
<asp:Image ID="logo" ImageUrl="../images/logoSteamware.png" runat="server" CssClass="img-fluid" />
</div>
<div class="p-0 pl-1">
<div class="flex-row">
<b>MoonProTAB</b>
<nav class="navbar fixed-top navbar-dark bg-black text-light titleBlock py-1">
<div class="row w-100">
<div class="col-4">
<uc1:mod_slideMenu runat="server" ID="mod_slideMenu" />
</div>
<div class="col-4 px-0">
<a class="text-light align-text-bottom" href=".">
<div class="d-flex justify-content-center fs-5">
<div class="px-1" style="width: 2em;">
<asp:Image ID="logo" ImageUrl="../images/logoSteamware.png" runat="server" CssClass="img-fluid" />
</div>
<div class="px-1">
<b>MapoTAB</b>
</div>
<div class="px-1">
<i class="fa fa-lg fa-home"></i>
</div>
</div>
</a>
</div>
<div class="col-4 text-end">
<div class="text-end small">
<b><%: CognomeNome %></b>
<div class="small">
[<%: MatrOpr %>]
</div>
</div>
</div>
</div>
<div class="p-0 pl-1">
<i class="fa fa-lg fa-home"></i>
</div>
</div>
</a>
<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>
<div class="collapse navbar-collapse" id="navbarText">
<div class="navbar-text ml-auto my-0 py-0">
<div class="text-end">
opr: <b><%: CognomeNome %></b> [<%: MatrOpr %>]
</div>
<div class="text-end">
</div>
</div>
</div>
</nav>
<div class="mb-4">&nbsp;</div>
<uc1:mod_slideMenu runat="server" ID="mod_slideMenu" />
<div class="mb-3">&nbsp;</div>
MP-TAB/WebUserControls/mod_title.ascx.designer.cs
Generated
+9 -9
View File
@@ -14,15 +14,6 @@ namespace MoonProTablet.WebUserControls
public partial class mod_title
{
/// <summary>
/// logo control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Image logo;
/// <summary>
/// mod_slideMenu control.
/// </summary>
@@ -31,5 +22,14 @@ namespace MoonProTablet.WebUserControls
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::MoonProTablet.WebUserControls.mod_slideMenu mod_slideMenu;
/// <summary>
/// logo control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Image logo;
}
}
MP-TAB/fixODL.aspx
+1 -1
View File
@@ -5,7 +5,7 @@
<%@ Register Src="~/WebUserControls/cmp_selPODL.ascx" TagPrefix="uc1" TagName="cmp_selPODL" %>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-flow m-3" role="main">
<div class="container-fluid px-2 py-3" role="main">
<div class="row">
<div class="col-12 col-md-8 col-lg-9 col-xl-10">
<uc1:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
MP-TAB/images/macchine/small/Steamware.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

MP-TAB/packages.config
+1
View File
@@ -8,6 +8,7 @@
<package id="elmah" version="1.2.2" targetFramework="net40" />
<package id="elmah.corelibrary" version="1.2.2" targetFramework="net40" />
<package id="FontAwesome" version="4.7.0" targetFramework="net462" />
<package id="jQuery" version="3.7.0" targetFramework="net462" />
<package id="Microsoft.AspNet.FriendlyUrls" version="1.0.2" targetFramework="net45" />
<package id="Microsoft.AspNet.FriendlyUrls.Core" version="1.0.2" targetFramework="net45" />
<package id="Microsoft.AspNet.ScriptManager.MSAjax" version="5.0.0" targetFramework="net45" />
MP-TAB/regNewDevice.aspx
+2 -2
View File
@@ -1,10 +1,10 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Bootstrap.Master" AutoEventWireup="true" CodeBehind="regNewDevice.aspx.cs" Inherits="MoonProTablet.regNewDevice" %>
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/QrScan.Master" AutoEventWireup="true" CodeBehind="regNewDevice.aspx.cs" Inherits="MoonProTablet.regNewDevice" %>
<%@ Register Src="WebUserControls/mod_regNewDevice.ascx" TagName="mod_regNewDevice" TagPrefix="uc1" %>
<%@ Register Src="~/WebUserControls/mod_QRScanner.ascx" TagPrefix="uc1" TagName="mod_QRScanner" %>
<%@ Register Src="~/WebUserControls/mod_checkHttps.ascx" TagPrefix="uc1" TagName="mod_checkHttps" %>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<asp:Content ID="Content2" ContentPlaceHolderID="MainContentScan" runat="server">
<div class="container-fluid my-3" role="main">
<uc1:mod_QRScanner runat="server" ID="mod_QRScanner" />
<hr />