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

Continuo fix pagine scarti e controlli

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-05-29 18:31:03 +02:00
parent 0f2b77606b
commit 799bdeedf6
7 changed files with 60 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB/Controlli.aspx
+3 -1
View File
@@ -11,7 +11,9 @@
<div class="container-flow m-3" role="main">
<div class="row">
<div class="col-12 col-sm-8 col-md-9 col-xl-10">
<uc1:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
<div class="my-2">
<uc1:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
</div>
<uc1:mod_controlliProd runat="server" ID="mod_controlliProd" />
<uc1:mod_elencoControlli runat="server" ID="mod_elencoControlli" />
</div>
MP-TAB/MP-TAB.csproj
+8
View File
@@ -492,6 +492,7 @@
<Content Include="WebUserControls\mod_dichiarazione.ascx" />
<Content Include="WebUserControls\mod_directLinks.ascx" />
<Content Include="WebUserControls\mod_elencoControlli.ascx" />
<Content Include="WebUserControls\mod_elencoScarti.ascx" />
<Content Include="WebUserControls\mod_enrollByAuthKey.ascx" />
<Content Include="WebUserControls\mod_enrollByJumperAuthKey.ascx" />
<Content Include="WebUserControls\mod_fermate.ascx" />
@@ -758,6 +759,13 @@
<Compile Include="WebUserControls\mod_elencoControlli.ascx.designer.cs">
<DependentUpon>mod_elencoControlli.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\mod_elencoScarti.ascx.cs">
<DependentUpon>mod_elencoScarti.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\mod_elencoScarti.ascx.designer.cs">
<DependentUpon>mod_elencoScarti.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\mod_enrollByAuthKey.ascx.cs">
<DependentUpon>mod_enrollByAuthKey.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
MP-TAB/Scarti.aspx
+5 -15
View File
@@ -1,9 +1,10 @@
<%@ 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" %>
<%@ Register Src="~/WebUserControls/mod_elencoScarti.ascx" TagPrefix="uc1" TagName="mod_elencoScarti" %>
<asp:Content ID="Content1" ContentPlaceHolderID="HeadContent" runat="server">
</asp:Content>
@@ -11,22 +12,11 @@
<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 class="my-2">
<uc6:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
</div>
<uc3:mod_regScarti runat="server" ID="mod_regScarti1" />
<uc1:mod_elencoScarti runat="server" ID="mod_elencoScarti" />
</div>
<div class="col-12 col-sm-4 col-md-3 col-xl-2">
<uc1:mod_directLinks runat="server" ID="mod_directLinks" />
MP-TAB/Scarti.aspx.designer.cs
Generated
+9 -18
View File
@@ -21,24 +21,6 @@ namespace MoonProTablet {
/// </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>
@@ -48,6 +30,15 @@ namespace MoonProTablet {
/// </remarks>
protected global::MoonProTablet.WebUserControls.mod_regScarti mod_regScarti1;
/// <summary>
/// Controllo mod_elencoScarti.
/// </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_elencoScarti mod_elencoScarti;
/// <summary>
/// Controllo mod_directLinks.
/// </summary>
MP-TAB/WebUserControls/mod_elencoScarti.ascx
+1
View File
@@ -0,0 +1 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_elencoScarti.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_elencoScarti" %>
MP-TAB/WebUserControls/mod_elencoScarti.ascx.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.WebUserControls
{
public partial class mod_elencoScarti : System.Web.UI.UserControl
{
protected void Page_Load(object sender, EventArgs e)
{
}
}
}
MP-TAB/WebUserControls/mod_elencoScarti.ascx.designer.cs
Generated
+17
View File
@@ -0,0 +1,17 @@
//------------------------------------------------------------------------------
// <auto-generated>
// Codice generato da uno strumento.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </auto-generated>
//------------------------------------------------------------------------------
namespace MoonProTablet.WebUserControls
{
public partial class mod_elencoScarti
{
}
}