Update visualizzazione tablet pre conferma

This commit is contained in:
Samuele E. Locatelli
2019-02-12 18:27:10 +01:00
parent 4d2f7ade97
commit 36dc9741ce
7 changed files with 215 additions and 15 deletions
+8
View File
@@ -518,6 +518,7 @@
<Content Include="Web.Release.config">
<DependentUpon>Web.config</DependentUpon>
</Content>
<Content Include="WebUserControls\cmp_dettODL.ascx" />
<Content Include="WebUserControls\cmp_newODL.ascx" />
<Content Include="WebUserControls\cmp_selPzPallet.ascx" />
<Content Include="WebUserControls\mod_checkHttps.ascx" />
@@ -744,6 +745,13 @@
<Compile Include="WebMasterPages\Bootstrap.Master.designer.cs">
<DependentUpon>Bootstrap.Master</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_dettODL.ascx.cs">
<DependentUpon>cmp_dettODL.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_dettODL.ascx.designer.cs">
<DependentUpon>cmp_dettODL.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_newODL.ascx.cs">
<DependentUpon>cmp_newODL.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
+87
View File
@@ -0,0 +1,87 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_dettODL.ascx.cs" Inherits="MoonProTablet.WebUserControls.cmp_dettODL" %>
<div class="card text-dark">
<div class="card-header bg-warning text-light">
<h4 class="card-title">Verifica parametri attrezzaggio</h4>
</div>
<div class="card-body">
<%--<p class="card-text">Some example text. Some example text.</p>
<a href="#" class="card-link">Card link</a>
<a href="#" class="card-link">Another link</a>--%>
<asp:FormView ID="frmView" runat="server" DataKeyNames="idxPromessa" DataSourceID="ods">
<ItemTemplate>
<div class="row">
<div class="col-sm-6 col-md-2">
P.ODL:
</div>
<div class="col-sm-6 col-md-2 text-right">
<b>
<asp:Label ID="idxPromessaLabel" runat="server" Text='<%# Eval("idxPromessa") %>' /></b>
</div>
<div class="col-sm-6 col-md-2">
Rif:
</div>
<div class="col-sm-6 col-md-2 text-right">
<b>
<asp:Label ID="KeyRichiestaLabel" runat="server" Text='<%# Bind("KeyRichiesta") %>' /></b>
</div>
<div class="col-sm-6 col-md-2">
CodArt:
</div>
<div class="col-sm-6 col-md-2 text-right">
<b>
<asp:Label ID="CodArticoloLabel" runat="server" Text='<%# Bind("CodArticolo") %>' /></b>
</div>
<div class="col-sm-6">
DescArticolo:
<asp:Label ID="DescArticoloLabel" runat="server" Text='<%# Bind("DescArticolo") %>' />
</div>
<div class="col-sm-6">
CodGruppo:
<asp:Label ID="CodGruppoLabel" runat="server" Text='<%# Bind("CodGruppo") %>' />
</div>
<div class="col-sm-4">
NumPezzi:
<asp:Label ID="NumPezziLabel" runat="server" Text='<%# Bind("NumPezzi") %>' />
</div>
<div class="col-sm-4">
TCAssegnato:
<asp:Label ID="TCAssegnatoLabel" runat="server" Text='<%# Bind("TCAssegnato") %>' />
</div>
<div class="col-sm-4">
PzPallet:
<asp:Label ID="PzPalletLabel" runat="server" Text='<%# Bind("PzPallet") %>' />
</div>
<div class="col-sm-4">
Nome:
<asp:Label ID="NomeLabel" runat="server" Text='<%# Bind("Nome") %>' />
</div>
<div class="col-sm-4">
Priorita:
<asp:Label ID="PrioritaLabel" runat="server" Text='<%# Bind("Priorita") %>' />
</div>
<div class="col-sm-4">
DueDate:
<asp:Label ID="DueDateLabel" runat="server" Text='<%# Bind("DueDate") %>' />
</div>
</div>
</ItemTemplate>
</asp:FormView>
</div>
<div class="card-footer text-muted">
2 days ago
</div>
</div>
<asp:ObjectDataSource runat="server" ID="ods" OldValuesParameterFormatString="original_{0}" SelectMethod="getByKey" TypeName="MapoDb.DS_ProdTempiTableAdapters.PromesseODLTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="hfIdxODL" DefaultValue="0" Name="IdxPromessa" PropertyName="Value" Type="Int32" />
</SelectParameters>
</asp:ObjectDataSource>
<asp:HiddenField runat="server" ID="hfIdxODL" />
@@ -0,0 +1,34 @@
using System;
namespace MoonProTablet.WebUserControls
{
public partial class cmp_dettODL : System.Web.UI.UserControl
{
protected void Page_Load(object sender, EventArgs e)
{
}
/// <summary>
/// codice odl selezionato
/// </summary>
public int idxODLSel
{
get
{
int answ = 0;
try
{
answ = Convert.ToInt32(hfIdxODL.Value);
}
catch
{ }
return answ;
}
set
{
hfIdxODL.Value = value.ToString();
frmView.DataBind();
}
}
}
}
+42
View File
@@ -0,0 +1,42 @@
//------------------------------------------------------------------------------
// <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.WebUserControls {
public partial class cmp_dettODL {
/// <summary>
/// Controllo frmView.
/// </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.FormView frmView;
/// <summary>
/// Controllo ods.
/// </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.ObjectDataSource ods;
/// <summary>
/// Controllo hfIdxODL.
/// </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.HiddenField hfIdxODL;
}
}
+15 -6
View File
@@ -2,6 +2,8 @@
<%@ Register Src="~/WebUserControls/mod_tempoMSMC.ascx" TagPrefix="uc1" TagName="mod_tempoMSMC" %>
<%@ Register Src="~/WebUserControls/cmp_newODL.ascx" TagPrefix="uc1" TagName="cmp_newODL" %>
<%@ Register Src="~/WebUserControls/cmp_selPzPallet.ascx" TagPrefix="uc1" TagName="cmp_selPzPallet" %>
<%@ Register Src="~/WebUserControls/cmp_dettODL.ascx" TagPrefix="uc1" TagName="cmp_dettODL" %>
<div class="row">
@@ -31,7 +33,10 @@
<asp:LinkButton runat="server" ID="lbtConfNewRevProd" OnClick="lbtConfNewRevProd_Click" OnClientClick='<%# SteamWare.jsUtils.getCBE("confermaNuovaRev") %>' CssClass="btn btn-block"><i class="fa fa-star"></i> CONFERMA produzione nuova REV</asp:LinkButton>
</div>
</div>
<div class="row pb-3">
<div class="row pb-3">
<div class="col-sm-12 py-2" id="divDettOdl" runat="server" visible="false">
<uc1:cmp_dettODL runat="server" id="cmp_dettODL" />
</div>
<div class="col-sm-6">
<div class="col-auto px-0">
<label class="sr-only" for="inlineFormInputGroup">Username</label>
@@ -50,24 +55,28 @@
</div>
</div>
</div>
<div runat="server" id="divNote" visible="false" class="pt-2">
</div>
<div class="col-sm-6">
<asp:LinkButton runat="server" ID="lbtStartAttr" OnClick="lbtStartAttr_Click" CssClass="btn btn-block btn-primary"><i class="fa fa-check"></i> INIZIO Attrezzaggio</asp:LinkButton>
</div>
<div class="col-sm-6">
<div runat="server" id="divNote" visible="false" >
<asp:TextBox runat="server" ID="txtNote" TextMode="MultiLine" Height="4em" CssClass="form-control" placeholder="Note attrezzaggio" />
</div>
</div>
<div class="col-sm-6">
<asp:LinkButton runat="server" ID="lbtStartAttr" OnClick="lbtStartAttr_Click" CssClass="btn btn-block btn-primary"><i class="fa fa-check"></i> INIZIO Attrezzaggio</asp:LinkButton>
<div runat="server" id="divTempo" visible="false" class="pt-2">
<div runat="server" id="divTempo" visible="false">
<uc1:mod_tempoMSMC runat="server" ID="mod_tempoMSMC" modoControllo="selettori" />
</div>
<div runat="server" id="divPzPallet" visible="false" class="pt-2">
<uc1:cmp_selPzPallet runat="server" ID="cmp_selPzPallet" />
</div>
</div>
</div>
</div>
<div class="row py-2 bg-danger textCondens" runat="server" id="divOpRiattr">
<div class="col-sm-6">
<asp:LinkButton runat="server" ID="lbtSplitOdlSuTav" CssClass="btn btn-block btn-warning" OnClick="lbtSplitOdlSuTav_Click" OnClientClick='<%# SteamWare.jsUtils.getCBE("confermaSplitODL") %>'><i class="fa fa-check"></i> Attrezza stesso ODL da altra tavola <i class="fa fa-check"></i></asp:LinkButton>
</div>
</div>
<div class="col-sm-6">
<asp:LinkButton runat="server" ID="lbtReopOdlSuTav" CssClass="btn btn-block btn-info" OnClientClick='<%# SteamWare.jsUtils.getCBE("confermaReopenODL") %>' OnClick="lbtReopOdlSuTav_Click"><i class="fa fa-exclamation-triangle"></i> Riprendi ODL chiuso su tavola</asp:LinkButton>
</div>
+2
View File
@@ -980,6 +980,8 @@ namespace MoonProTablet.WebUserControls
divTempo.Visible = show;
divNote.Visible = show;
divPzPallet.Visible = show;
divDettOdl.Visible = show;
cmp_dettODL.idxODLSel = idxODLSel;
// se abilitato da config su DB mostro selezione del numPzPallet...
cmp_selPzPallet.enableSet = memLayer.ML.CRB("enableTabSetPzPallet");
+27 -9
View File
@@ -39,6 +39,24 @@ namespace MoonProTablet.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtConfNewRevProd;
/// <summary>
/// Controllo divDettOdl.
/// </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 divDettOdl;
/// <summary>
/// Controllo cmp_dettODL.
/// </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.cmp_dettODL cmp_dettODL;
/// <summary>
/// Controllo ddlODL.
/// </summary>
@@ -75,6 +93,15 @@ namespace MoonProTablet.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.CheckBox chkTutti;
/// <summary>
/// Controllo lbtStartAttr.
/// </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 lbtStartAttr;
/// <summary>
/// Controllo divNote.
/// </summary>
@@ -93,15 +120,6 @@ namespace MoonProTablet.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtNote;
/// <summary>
/// Controllo lbtStartAttr.
/// </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 lbtStartAttr;
/// <summary>
/// Controllo divTempo.
/// </summary>