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

Update amster x contenuto pagina unload

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-09-16 12:59:55 +02:00
parent e037b2b184
commit 6fa9a8dca3
12 changed files with 101 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NKC_WF/Default.aspx
+1 -1
View File
@@ -1,4 +1,4 @@
<%@ Page Title="Home Page" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="NKC_WF._Default" %>
<%@ Page Title="Home Page" Language="C#" MasterPageFile="~/SiteContent.Master" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="NKC_WF._Default" %>
<%@ Register Src="~/WebUserControls/cmp_homeButtons.ascx" TagPrefix="uc1" TagName="cmp_homeButtons" %>
NKC_WF/MachineLoad.aspx
+1 -1
View File
@@ -1,4 +1,4 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="MachineLoad.aspx.cs" Inherits="NKC_WF.MachineLoad" %>
<%@ Page Title="" Language="C#" MasterPageFile="~/SiteContent.Master" AutoEventWireup="true" CodeBehind="MachineLoad.aspx.cs" Inherits="NKC_WF.MachineLoad" %>
<%@ Register Src="~/WebUserControls/cmp_barcode.ascx" TagPrefix="uc1" TagName="cmp_barcode" %>
<%@ Register Src="~/WebUserControls/cmp_stackLoading.ascx" TagPrefix="uc1" TagName="cmp_stackLoading" %>
NKC_WF/MachineUnload.aspx
+27 -18
View File
@@ -2,14 +2,14 @@
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<asp:UpdatePanel runat="server" ID="uplTavola">
<asp:UpdatePanel runat="server" ID="uplTavola">
<ContentTemplate>
<asp:Timer runat="server" ID="timReloadCss" Interval="1000" ></asp:Timer>
<asp:Timer runat="server" ID="timReloadCss" Interval="1000"></asp:Timer>
<link href="getDynCss" rel="stylesheet" />
</ContentTemplate>
</asp:UpdatePanel>
<%--
<%--
<div id="uplTavola">
<link href="getDynCss" rel="stylesheet" id="dynCss" />
</div>
@@ -22,25 +22,34 @@
<asp:UpdatePanel runat="server" ID="upnlDrawings">
<ContentTemplate>
<div class="row">
<div class="col-2">
<div style="width: 200px; height: 200px;">
<div class="m-2">
<div class="card text-center" style="width: 100%;">
<h3 class="card-header"><%: traduci("MachineLoad") %></h3>
<div class="card-body py-1">
<div class="row">
<div class="col-2">
BATCH<br />
Stack<br />
Sheet<br />
<%--<div style="width: 200px; height: 200px;">
<svg viewBox='0 0 105 93' xmlns='http://www.w3.org/2000/svg'>
<path id="IT000006" d='M66,0h39v93zM38,0h-38v93zM52,35l25,58h-16l-8-18h-18z' fill='#ED1C24' />
</svg>
</div>
</div>
<div class="col-8">
<svg viewBox='0 0 1000 1000' xmlns='http://www.w3.org/2000/svg' runat="server" id="svgTable">
</svg>
<%--<object type="image/svg+xml" data="Images/test.svg">
</div>--%>
</div>
<div class="col-8">
<svg viewBox='0 0 1000 1000' xmlns='http://www.w3.org/2000/svg' runat="server" id="svgTable">
</svg>
<%--<object type="image/svg+xml" data="Images/test.svg">
</object>--%>
</div>
<div class="col-2">
<%--<svg>
<rect x="10" y="10" width="50" height="50" fill="blue" id="IT000007" />
<rect x="25" y="25" width="50" height="50" fill="orange" id="IT000008" />
</svg>--%>
</div>
<div class="col-2">
CARTS<br />
BINS
</div>
</div>
</div>
</div>
</div>
</ContentTemplate>
NKC_WF/MachineUnload.aspx.cs
+1 -1
View File
@@ -3,7 +3,7 @@ using System.IO;
namespace NKC_WF
{
public partial class MachineUnload : System.Web.UI.Page
public partial class MachineUnload : BasePage
{
protected void Page_Load(object sender, EventArgs e)
{
NKC_WF/NKC_WF.csproj
+8
View File
@@ -379,6 +379,13 @@
<Compile Include="Site.Master.designer.cs">
<DependentUpon>Site.Master</DependentUpon>
</Compile>
<Compile Include="SiteContent.master.cs">
<DependentUpon>SiteContent.master</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="SiteContent.master.designer.cs">
<DependentUpon>SiteContent.master</DependentUpon>
</Compile>
<Compile Include="StackManager.aspx.cs">
<DependentUpon>StackManager.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -564,6 +571,7 @@
<Content Include="Scripts\popper.js.map" />
<Content Include="Scripts\popper-utils.min.js.map" />
<Content Include="Scripts\popper-utils.js.map" />
<Content Include="SiteContent.master" />
<None Include="Web.Debug-LELE.config">
<DependentUpon>Web.config</DependentUpon>
</None>
NKC_WF/OrderManager.aspx
+1 -1
View File
@@ -1,4 +1,4 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="OrderManager.aspx.cs" Inherits="NKC_WF.OrderManager" %>
<%@ Page Title="" Language="C#" MasterPageFile="~/SiteContent.Master" AutoEventWireup="true" CodeBehind="OrderManager.aspx.cs" Inherits="NKC_WF.OrderManager" %>
<%@ Register Src="~/WebUserControls/cmp_fileUpload.ascx" TagPrefix="uc1" TagName="cmp_fileUpload" %>
<%@ Register Src="~/WebUserControls/cmp_orderStatus.ascx" TagPrefix="uc1" TagName="cmp_orderStatus" %>
NKC_WF/Site.Master
+1 -1
View File
@@ -46,7 +46,7 @@
<uc1:cmp_menuTop runat="server" ID="cmp_menuTop" />
<div class="container body-content">
<div class="container-flow body-content">
<asp:ContentPlaceHolder ID="MainContent" runat="server">
</asp:ContentPlaceHolder>
<uc1:cmp_footer runat="server" ID="cmp_footer" />
NKC_WF/SiteContent.master
+8
View File
@@ -0,0 +1,8 @@
<%@ Master Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="SiteContent.master.cs" Inherits="NKC_WF.SiteContent" %>
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<div class="container body-content">
<asp:ContentPlaceHolder ID="MainContent" runat="server">
</asp:ContentPlaceHolder>
</div>
</asp:Content>
NKC_WF/SiteContent.master.cs
+26
View File
@@ -0,0 +1,26 @@
using System;
namespace NKC_WF
{
public partial class SiteContent : System.Web.UI.MasterPage
{
protected void Page_Load(object sender, EventArgs e)
{
}
/// <summary>
/// Imposta vilibilità componente search globale
/// </summary>
public bool showSearch
{
get
{
return ((SiteMaster)Master).showSearch;
}
set
{
((SiteMaster)Master).showSearch = value;
}
}
}
}
NKC_WF/SiteContent.master.designer.cs
Generated
+24
View File
@@ -0,0 +1,24 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace NKC_WF {
public partial class SiteContent {
/// <summary>
/// Controllo MainContent.
/// </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 MainContent;
}
}
NKC_WF/StackManager.aspx
+1 -1
View File
@@ -1,4 +1,4 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="StackManager.aspx.cs" Inherits="NKC_WF.StackManager" %>
<%@ Page Title="" Language="C#" MasterPageFile="~/SiteContent.Master" AutoEventWireup="true" CodeBehind="StackManager.aspx.cs" Inherits="NKC_WF.StackManager" %>
<%@ Register Src="~/WebUserControls/cmp_taktList.ascx" TagPrefix="uc1" TagName="cmp_taktList" %>
<%@ Register Src="~/WebUserControls/cmp_stackList.ascx" TagPrefix="uc1" TagName="cmp_stackList" %>
NKC_WF/WebUserControls/cmp_homeButtons.ascx
+2 -3
View File
@@ -11,11 +11,10 @@
<i class="fa fa-book shortcut-icon"></i><span class="shortcut-label"><%: traduci("StackManager") %></span>
</a>
<a href="MachineLoad" class="shortcut">
<i class="fa fa-upload
shortcut-icon"></i><span class="shortcut-label"><%: traduci("MachineLoad") %></span>
<i class="fa fa-upload shortcut-icon"></i><span class="shortcut-label"><%: traduci("MachineLoad") %></span>
</a>
<a href="MachineUnload" class="shortcut">
<i class="fa fa-download text-secondary shortcut-icon"></i><span class="shortcut-label"><%: traduci("MachineUnload") %></span>
<i class="fa fa-download shortcut-icon"></i><span class="shortcut-label"><%: traduci("MachineUnload") %></span>
</a>
<a href="MachineOffline" class="shortcut">
<i class="fa fa-wrench text-secondary shortcut-icon"></i><span class="shortcut-label"><%: traduci("MachineOffline") %></span>