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

Nuova pagina x scarti abbozzata + btn x rimando scarti/controlli

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-05-29 18:26:35 +02:00
parent f972e54154
commit 0f2b77606b
7 changed files with 135 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB/DettaglioMacchina.aspx
+10 -2
View File
@@ -28,8 +28,16 @@
</div>
</div>
<uc4:mod_confProd ID="mod_confProd1" runat="server" />
<uc3:mod_regScarti runat="server" ID="mod_regScarti" />
<uc5:mod_controlliProd runat="server" ID="mod_controlliProd" />
<div class="row">
<div class="col-6">
<asp:HyperLink runat="server" ID="hlScarti" NavigateUrl="~/Scarti.aspx" CssClass="btn btn-info btn-lg btn-block"><i class="fa fa-bug"></i>Registra SCARTI</asp:HyperLink>
</div>
<div class="col-6">
<asp:HyperLink runat="server" ID="hlCOntrolli" NavigateUrl="~/Controlli.aspx" CssClass="btn btn-primary btn-lg btn-block"><i class="fa fa-wrench"></i> Registra CONTROLLI</asp:HyperLink>
</div>
</div>
<%--<uc3:mod_regScarti runat="server" ID="mod_regScarti" />
<uc5:mod_controlliProd runat="server" ID="mod_controlliProd" />--%>
</div>
<div class="col-12 col-sm-4 col-md-3 col-xl-2">
<uc1:mod_directLinks runat="server" ID="mod_directLinks" />
MP-TAB/DettaglioMacchina.aspx.cs
-14
View File
@@ -27,17 +27,8 @@ namespace MoonProTablet
{
Session["TipoLink"] = "DetMacc";
}
#if false
mod_confProd1.eh_inserting += mod_confProd1_eh_inserting;
#endif
mod_confProd1.eh_newVal += mod_confProd1_eh_newVal;
mod_confProd1.eh_reset += mod_confProd1_eh_reset;
mod_regScarti.eh_newVal += Mod_regScarti_eh_newVal;
}
private void Mod_regScarti_eh_newVal(object sender, EventArgs e)
{
mod_confProd1.doUpdate();
}
void mod_confProd1_eh_reset(object sender, EventArgs e)
@@ -48,11 +39,6 @@ namespace MoonProTablet
{
}
#if false
void mod_confProd1_eh_inserting(object sender, EventArgs e)
{
}
#endif
/// <summary>
/// evento timer
/// </summary>
MP-TAB/DettaglioMacchina.aspx.designer.cs
Generated
+4 -4
View File
@@ -49,22 +49,22 @@ namespace MoonProTablet {
protected global::MoonProTablet.WebUserControls.mod_confProd mod_confProd1;
/// <summary>
/// Controllo mod_regScarti.
/// Controllo hlScarti.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::MoonProTablet.WebUserControls.mod_regScarti mod_regScarti;
protected global::System.Web.UI.WebControls.HyperLink hlScarti;
/// <summary>
/// Controllo mod_controlliProd.
/// Controllo hlCOntrolli.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::MoonProTablet.WebUserControls.mod_controlliProd mod_controlliProd;
protected global::System.Web.UI.WebControls.HyperLink hlCOntrolli;
/// <summary>
/// Controllo mod_directLinks.
MP-TAB/MP-TAB.csproj
+8
View File
@@ -418,6 +418,7 @@
<Content Include="Resources\manifest.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Scarti.aspx" />
<Content Include="Scripts\bootstrap.bundle.js" />
<Content Include="Scripts\bootstrap.bundle.min.js" />
<Content Include="Scripts\bootstrap.js" />
@@ -637,6 +638,13 @@
<Compile Include="RepProd_GG.aspx.designer.cs">
<DependentUpon>RepProd_GG.aspx</DependentUpon>
</Compile>
<Compile Include="Scarti.aspx.cs">
<DependentUpon>Scarti.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Scarti.aspx.designer.cs">
<DependentUpon>Scarti.aspx</DependentUpon>
</Compile>
<Compile Include="StoricoTC.aspx.cs">
<DependentUpon>StoricoTC.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
MP-TAB/Scarti.aspx
+36
View File
@@ -0,0 +1,36 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Bootstrap.Master" AutoEventWireup="true" CodeBehind="Scarti.aspx.cs" Inherits="MoonProTablet.Scarti" %>
<%@ Register Src="~/WebUserControls/mod_directLinks.ascx" TagPrefix="uc1" TagName="mod_directLinks" %>
<%@ Register Src="~/WebUserControls/mod_dettaglioProd.ascx" TagName="mod_dettaglioProd" TagPrefix="uc2" %>
<%@ Register Src="~/WebUserControls/mod_dettMacchina.ascx" TagName="mod_dettMacchina" TagPrefix="uc6" %>
<%@ Register Src="~/WebUserControls/mod_regScarti.ascx" TagPrefix="uc3" TagName="mod_regScarti" %>
<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="row">
<div class="col-12 col-sm-8 col-md-9 col-xl-10">
<uc6:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
<%--statistiche produzione--%>
<div class="card bg-dark my-3">
<div class="card-header bg-light" id="heading01">
<p class="mb-0">
<asp:LinkButton runat="server" ID="lbtGrp03" class="btn btn-light btn-block collapsed p-0" data-toggle="collapse" data-target="#collapse01" aria-expanded="false" aria-controls="collapse01"> <i class="fa fa-gear"></i><b>Statistiche produzione</b>
</asp:LinkButton>
</p>
</div>
<div id="collapse01" class="collapse" aria-labelledby="headingThree" data-parent="#accordion">
<div class="card-body p-1">
<uc2:mod_dettaglioProd ID="mod_dettaglioProd2" runat="server" />
</div>
</div>
</div>
<uc3:mod_regScarti runat="server" ID="mod_regScarti1" />
</div>
<div class="col-12 col-sm-4 col-md-3 col-xl-2">
<uc1:mod_directLinks runat="server" ID="mod_directLinks" />
</div>
</div>
</div>
</asp:Content>
MP-TAB/Scarti.aspx.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
{
public partial class Scarti : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
}
}
}
MP-TAB/Scarti.aspx.designer.cs
Generated
+60
View File
@@ -0,0 +1,60 @@
//------------------------------------------------------------------------------
// <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 MoonProTablet {
public partial class Scarti {
/// <summary>
/// Controllo mod_dettMacchina1.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::MoonProTablet.WebUserControls.mod_dettMacchina mod_dettMacchina1;
/// <summary>
/// Controllo lbtGrp03.
/// </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 lbtGrp03;
/// <summary>
/// Controllo mod_dettaglioProd2.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::MoonProTablet.WebUserControls.mod_dettaglioProd mod_dettaglioProd2;
/// <summary>
/// Controllo mod_regScarti1.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::MoonProTablet.WebUserControls.mod_regScarti mod_regScarti1;
/// <summary>
/// Controllo mod_directLinks.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::MoonProTablet.WebUserControls.mod_directLinks mod_directLinks;
}
}