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

Differenziazione pag PL e Carico merce

Browse Source
This commit is contained in:
Samuele Locatelli
2021-04-20 18:18:22 +02:00
parent b990558813
commit 13d4c4101e
10 changed files with 146 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-MAG/MP-MAG.csproj
+8
View File
@@ -392,6 +392,13 @@
<Compile Include="SMART\SmartStarter.aspx.designer.cs">
<DependentUpon>SmartStarter.aspx</DependentUpon>
</Compile>
<Compile Include="SMART\SpedScanner.aspx.cs">
<DependentUpon>SpedScanner.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="SMART\SpedScanner.aspx.designer.cs">
<DependentUpon>SpedScanner.aspx</DependentUpon>
</Compile>
<Compile Include="SMART\tryLogin.aspx.cs">
<DependentUpon>tryLogin.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -887,6 +894,7 @@
<Content Include="SMART\printCartOdl.aspx" />
<Content Include="SMART\Reset.aspx" />
<Content Include="SMART\SmartStarter.aspx" />
<Content Include="SMART\SpedScanner.aspx" />
<Content Include="SMART\tryLogin.aspx" />
<Content Include="snappy32.dll" />
<Content Include="snappy64.dll" />
MP-MAG/SMART/PLScanner.aspx
-4
View File
@@ -1,15 +1,11 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="PLScanner.aspx.cs" Inherits="MP_MAG.SMART.PLScanner" %>
<%@ Register Src="~/WebUserControls/cmp_PLScanner.ascx" TagPrefix="uc1" TagName="cmp_PLScanner" %>
<%@ Register Src="~/WebUserControls/cmp_toggler.ascx" TagPrefix="uc1" TagName="cmp_toggler" %>
<%@ Register Src="~/WebUserControls/cmp_LoadScan.ascx" TagPrefix="uc1" TagName="cmp_LoadScan" %>
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<div class="row px-1">
<div class="col-12">
<uc1:cmp_toggler runat="server" ID="cmp_toggler" textOn="Carico Vettore" textOff="Gestione Pedane" classOn="text-success" classOff="text-info" />
<uc1:cmp_PLScanner runat="server" ID="cmp_PLScanner" />
<uc1:cmp_LoadScan runat="server" ID="cmp_LoadScan" />
</div>
</div>
</asp:Content>
MP-MAG/SMART/PLScanner.aspx.cs
+1 -17
View File
@@ -10,30 +10,14 @@ namespace MP_MAG.SMART
{
public partial class PLScanner : BasePage
{
#region Private Methods
private void Cmp_toggler_ehToggle(object sender, EventArgs e)
{
fixDisplay();
}
private void fixDisplay()
{
cmp_LoadScan.Visible = cmp_toggler.toggleValue;
cmp_PLScanner.Visible = !cmp_toggler.toggleValue;
}
#endregion Private Methods
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
fixDisplay();
((Site)this.Master).showSearch = false;
}
cmp_toggler.ehToggle += Cmp_toggler_ehToggle;
}
#endregion Protected Methods
MP-MAG/SMART/PLScanner.aspx.designer.cs
Generated
-18
View File
@@ -14,15 +14,6 @@ namespace MP_MAG.SMART
public partial class PLScanner
{
/// <summary>
/// cmp_toggler control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::MP_MAG.WebUserControls.cmp_toggler cmp_toggler;
/// <summary>
/// cmp_PLScanner control.
/// </summary>
@@ -31,14 +22,5 @@ namespace MP_MAG.SMART
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::MP_MAG.WebUserControls.cmp_PLScanner cmp_PLScanner;
/// <summary>
/// cmp_LoadScan control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::MP_MAG.WebUserControls.cmp_LoadScan cmp_LoadScan;
}
}
MP-MAG/SMART/SpedScanner.aspx
+11
View File
@@ -0,0 +1,11 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="SpedScanner.aspx.cs" Inherits="MP_MAG.SMART.SpedScanner" %>
<%@ Register Src="~/WebUserControls/cmp_LoadScan.ascx" TagPrefix="uc1" TagName="cmp_LoadScan" %>
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<div class="row px-1">
<div class="col-12">
<uc1:cmp_LoadScan runat="server" ID="cmp_LoadScan" />
</div>
</div>
</asp:Content>
MP-MAG/SMART/SpedScanner.aspx.cs
+24
View File
@@ -0,0 +1,24 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace MP_MAG.SMART
{
public partial class SpedScanner : System.Web.UI.Page
{
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((Site)this.Master).showSearch = false;
}
}
#endregion Protected Methods
}
}
MP-MAG/SMART/SpedScanner.aspx.designer.cs
Generated
+26
View File
@@ -0,0 +1,26 @@
//------------------------------------------------------------------------------
// <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 MP_MAG.SMART
{
public partial class SpedScanner
{
/// <summary>
/// cmp_LoadScan control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::MP_MAG.WebUserControls.cmp_LoadScan cmp_LoadScan;
}
}
MP-MAG/WebUserControls/cmp_menuTop.ascx
+10 -7
View File
@@ -1,7 +1,9 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_menuTop.ascx.cs" Inherits="MP_MAG.WebUserControls.cmp_menuTop" %>
<nav class="navbar navbar-expand-lg navbar-dark bg-dark text-light py-1 mb-0">
<asp:LinkButton runat="server" ID="lbnUpdate" Text="---" OnClick="lbnUpdate_Click" CssClass="navbar-brand" ToolTip="Update + HOME"><i class="fas fa-warehouse"></i> MP-MAG </asp:LinkButton>
<asp:LinkButton runat="server" ID="lbnUpdate" OnClick="lbnUpdate_Click" CssClass="navbar-brand textCondens" ToolTip="Update + HOME">
<i class="fas fa-warehouse"></i>&nbsp;MP-MAG&nbsp;|&nbsp;<asp:Label runat="server" ID="lblTitle" Text='<%# Page.Title %>'></asp:Label>
</asp:LinkButton>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -29,18 +31,19 @@
</li>
<%--<li class="nav-item">
<a class="nav-link text-light" href="About"><i class="fa fa-dot-circle-o" aria-hidden="true"></i> <%: traduci ("About") %></a>
</li>
<li class="nav-item">
<a class="nav-link text-light" href="Contact"><i class="fa fa-handshake-o" aria-hidden="true"></i> <%: traduci ("Contacts") %></a>
</li>--%>
<li class="nav-item">
<a class="nav-link text-light" href="Refresh"><i class="fas fa-refresh" aria-hidden="true"></i>aaa<%: traduci ("Refresh") %></a>
</li>
</ItemTemplate>
<SeparatorTemplate>
</SeparatorTemplate>
</asp:Repeater>
<asp:XmlDataSource ID="XmlMenu" runat="server" EnableCaching="true" CacheDuration="5"></asp:XmlDataSource>
<li class="nav-item">
<a class="nav-link text-light" href="PLScanner"><i class="fas fa-boxes"></i>&nbsp;Pedane</a>
</li>
<li class="nav-item">
<a class="nav-link text-light" href="SpedScanner"><i class="fas fa-truck-loading"></i>&nbsp;Spedizioni</a>
</li>
</ul>
<div runat="server" id="divSearch" class="form-inline my-2 my-lg-0">
<asp:TextBox runat="server" ID="txtSearch" class="form-control mr-sm-2" type="search" placeholder="[S]earch" aria-label="Search" AccessKey="s" AutoPostBack="true" OnTextChanged="txtSearch_TextChanged" />
MP-MAG/WebUserControls/cmp_menuTop.ascx.cs
+1
View File
@@ -158,6 +158,7 @@ namespace MP_MAG.WebUserControls
{
if (!Page.IsPostBack)
{
lblTitle.Text = titolo;
searchVal = "";
doSearch();
updateTreeMenu();
MP-MAG/WebUserControls/cmp_menuTop.ascx.designer.cs
Generated
+65 -56
View File
@@ -1,71 +1,80 @@
//------------------------------------------------------------------------------
// <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 MP_MAG.WebUserControls
{
public partial class cmp_menuTop
{
public partial class cmp_menuTop
{
/// <summary>
/// Controllo lbnUpdate.
/// </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.LinkButton lbnUpdate;
/// <summary>
/// lbnUpdate 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.LinkButton lbnUpdate;
/// <summary>
/// Controllo menu.
/// </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.Repeater menu;
/// <summary>
/// lblTitle 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.Label lblTitle;
/// <summary>
/// Controllo XmlMenu.
/// </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.XmlDataSource XmlMenu;
/// <summary>
/// menu 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.Repeater menu;
/// <summary>
/// Controllo divSearch.
/// </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.HtmlControls.HtmlGenericControl divSearch;
/// <summary>
/// XmlMenu 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.XmlDataSource XmlMenu;
/// <summary>
/// Controllo txtSearch.
/// </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.TextBox txtSearch;
/// <summary>
/// divSearch control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divSearch;
/// <summary>
/// Controllo lbtSearch.
/// </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.LinkButton lbtSearch;
}
/// <summary>
/// txtSearch 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.TextBox txtSearch;
/// <summary>
/// lbtSearch 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.LinkButton lbtSearch;
}
}