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

completata revisitazioen CONFERMA prod

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-03-12 11:40:35 +01:00
parent be48e93a6e
commit cc4670075a
9 changed files with 33 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-Tablet/Commenti.aspx.cs
-3
View File
@@ -26,7 +26,6 @@ namespace MoonProTablet
void mod_insComm1_eh_inserting(object sender, EventArgs e)
{
mod_dettMacchina1.detailLevel(false);
}
void mod_commenti1_eh_reqEdit(object sender, EventArgs e)
@@ -38,13 +37,11 @@ namespace MoonProTablet
{
showPnlDichiaraz(false);
mod_commenti1.doUpdate();
mod_dettMacchina1.detailLevel(true);
}
void mod_insComm1_eh_newVal(object sender, EventArgs e)
{
mod_commenti1.doUpdate();
mod_dettMacchina1.detailLevel(true);
}
void mod_dichiarazione1_eh_newVal(object sender, EventArgs e)
MP-Tablet/DettaglioMacchina.aspx
+1 -1
View File
@@ -11,7 +11,7 @@
<div class="row">
<div class="col-12 col-sm-6">
<uc1:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
<div class="card bg-dark">
<div class="card bg-dark mb-2">
<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">
MP-Tablet/DettaglioMacchina.aspx.cs
-3
View File
@@ -34,17 +34,14 @@ namespace MoonProTablet
void mod_confProd1_eh_reset(object sender, EventArgs e)
{
mod_dettMacchina1.detailLevel(true);
}
void mod_confProd1_eh_newVal(object sender, EventArgs e)
{
mod_dettMacchina1.detailLevel(true);
}
void mod_confProd1_eh_inserting(object sender, EventArgs e)
{
mod_dettMacchina1.detailLevel(false);
}
/// <summary>
/// evento timer
MP-Tablet/Dichiarazione.aspx.cs
-4
View File
@@ -11,7 +11,6 @@ namespace MoonProTablet
if (!Page.IsPostBack)
{
Session["TipoLink"] = "EditMacch";
mod_dettMacchina1.detailLevel(true);
// se c'è una data/ora in sessione la imposto...
if (memLayer.ML.isInSessionObject("inizioStato"))
{
@@ -19,7 +18,6 @@ namespace MoonProTablet
{
DateTime dataOraEv = Convert.ToDateTime(memLayer.ML.objSessionObj("inizioStato"));
mod_insComm.dataEv = dataOraEv;
mod_dettMacchina1.detailLevel(false);
memLayer.ML.emptySessionVal("inizioStato");
}
catch
@@ -33,12 +31,10 @@ namespace MoonProTablet
void mod_insComm1_eh_reset(object sender, EventArgs e)
{
mod_dettMacchina1.detailLevel(true);
}
void mod_insComm1_eh_inserting(object sender, EventArgs e)
{
mod_dettMacchina1.detailLevel(false);
}
/// <summary>
/// chiama udpate x evento in controller dichiarazioni
MP-Tablet/Web.config
+1 -1
View File
@@ -57,7 +57,7 @@
<add key="intUpdatePagina_ms" value="1000" />
<!--!!!FARE!!! riportare a 0!!!-->
<add key="refrMSE_5" value="5" />
<add key="dtTimerInt" value="10000" />
<add key="dtTimerInt" value="30000" />
<!-- Logging -->
<add key="_logDir" value="~/logs/" />
<add key="_logLevel" value="7" />
MP-Tablet/WebUserControls/mod_confProd.ascx
+1 -1
View File
@@ -33,7 +33,7 @@
</div>
<div class="row mt-2">
<div class="col-12">
<asp:LinkButton runat="server" ID="lbtSalva" Visible="false" CssClass="btn btn-success btn-lg btn-block" OnClick="lbtSalva_Click"><i class="fa fa-floppy-o"></i> Conferma produzione</asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtSalva" Visible="false" CssClass="btn btn-warning text-light btn-lg btn-block" OnClick="lbtSalva_Click"><i class="fa fa-floppy-o"></i> CONFERMA</asp:LinkButton>
</div>
</div>
<div class="row mb-2">
MP-Tablet/WebUserControls/mod_dettMacchina.ascx
+30 -44
View File
@@ -2,65 +2,51 @@
<%--Riporto dettaglio singola macchina--%>
<asp:UpdatePanel ID="UpdatePanel1" runat="server">
<ContentTemplate>
<asp:Panel runat="server" ID="pnlFullDet">
<div class="row">
<asp:Repeater ID="repLI" runat="server" DataSourceID="ods">
<ItemTemplate>
<div class="col-12 col-sm-6 col-md-4 col-lg-3 col-xl-2 mb-3 px-2">
<div class="card text-white mapBlock rCAll">
<img class="card-img bg-dark rCTop" src='<%# ImgUrl(Eval("url")) %>' alt='<%# Eval("CodMacchina") %>'>
<div class="card-img-overlay p-0 d-flex flex-row-reverse align-items-start rCTop">
<div class="labelTopDx text-right px-2">
<div class="row">
<asp:Repeater ID="repLI" runat="server" DataSourceID="ods">
<ItemTemplate>
<div class="col-12">
<div class="card text-white mapBlock rCAll">
<div class='card <%# Eval("Semaforo") %> p-0 m-0 rCAll'>
<div class="row justify-content-center m-2 bg-black">
<div class="col-7 px-1">
<b class="text-left">
<asp:Label runat="server" ID="lblTitle" Text='<%# Eval("Nome") %>' /></b>
</div>
<div class="col-5 px-1 labelTopDx small text-right">
<asp:Label runat="server" ID="lblBadge" Text='<%# Eval("CodArticolo","art: {0}") %>' />
<asp:Label runat="server" ID="lblODC" Text='<%# Eval("idxODL","(ODL {0})") %>' />
</div>
</div>
<div class="card bg-black p-0 rCBot">
<div class='row justify-content-center mx-0'>
<div class="col-12 px-1">
<h4 class="text-left">
<asp:Label runat="server" ID="lblTitle" Text='<%# Eval("Nome") %>' /></h4>
</div>
<div class='col-12 px-1 <%# Eval("Semaforo") %>'>
<div class="d-flex">
<div class="p-1 mr-auto">
<b>
<asp:Label runat="server" ID="lblStato" Text='<%# Eval("DescrizioneStato") %>' /></b>
</div>
<div class="p-1">
<asp:Label runat="server" ID="lblDurata" Text='<%# formatDurata(Eval("Durata")) %>' />
</div>
<div class='col-12 px-1 <%# Eval("Semaforo") %>'>
<div class="d-flex">
<div class="p-1 mr-auto">
<b>
<asp:Label runat="server" ID="lblStato" Text='<%# Eval("DescrizioneStato") %>' /></b>
</div>
<div class="p-1">
<asp:Label runat="server" ID="lblDurata" Text='<%# formatDurata(Eval("Durata")) %>' />
</div>
</div>
<div class="col-12 px-1 pb-1">
<div class="d-flex">
<div class="p-1 mr-auto">
<asp:Label runat="server" ID="Label2" Text='<%# Eval("PezziProd","prod: {0}") %>' ToolTip="pz prodotti" />
/
</div>
<div class="col-12 px-1 py-0">
<div class="d-flex">
<div class="p-1 mr-auto">
<asp:Label runat="server" ID="Label2" Text='<%# Eval("PezziProd","prod: {0}") %>' ToolTip="pz prodotti" />
/
<asp:Label runat="server" ID="lblPzLanciati" Text='<%# Eval("NumPezzi","tot: {0}") %>' ToolTip="pz lanciati" />
</div>
<div class="p-1">
<asp:Label runat="server" ID="Label1" Text='<%# Eval("PezziConf","conf: {0}") %>' ToolTip="pz confermati" />
</div>
</div>
<div class="p-1">
<asp:Label runat="server" ID="Label1" Text='<%# Eval("PezziConf","conf: {0}") %>' ToolTip="pz confermati" />
</div>
</div>
</div>
</div>
</div>
</div>
</ItemTemplate>
</asp:Repeater>
</div>
</asp:Panel>
<asp:Panel runat="server" ID="pnlLessDet" Visible="false">
<asp:Repeater ID="repTestata" runat="server" DataSourceID="ods">
<ItemTemplate>
<div class='<%# Eval("Semaforo") %>' style="padding: 2px 0px; text-align: center; margin: auto; font-size: 20pt;">
<asp:Label runat="server" ID="lblTitle" Text='<%# Eval("Nome") %>' />
</div>
</ItemTemplate>
</asp:Repeater>
</asp:Panel>
</div>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByRefreshData"
TypeName="MapoDb.DS_ProdTempiTableAdapters.MappaStatoExplTableAdapter" FilterExpression="IdxMacchina = '{0}'">
<FilterParameters>
MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs
-11
View File
@@ -90,17 +90,6 @@ namespace MoonProTablet.WebUserControls
ScriptManager.RegisterStartupScript(Page, GetType(), "temp", "<script type='text/javascript'>$('#dettMacch').trigger('create');</script>", false);
}
/// <summary>
/// determina se nascondere la visualizzazione completa (e mostrare solo nome macchina)
/// </summary>
/// <param name="full">mostra tutto (true) o solo header(false)</param>
public void detailLevel(bool full)
{
// mostro sempre minimo...
full = false;
pnlFullDet.Visible = full;
pnlLessDet.Visible = !full;
}
/// <summary>
/// Determina se il refresh (via timer) sia o meno abilitato
/// </summary>
public bool refreshEnabled
MP-Tablet/WebUserControls/mod_dettMacchina.ascx.designer.cs
Generated
-27
View File
@@ -21,15 +21,6 @@ namespace MoonProTablet.WebUserControls {
/// </remarks>
protected global::System.Web.UI.UpdatePanel UpdatePanel1;
/// <summary>
/// Controllo pnlFullDet.
/// </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.Panel pnlFullDet;
/// <summary>
/// Controllo repLI.
/// </summary>
@@ -39,24 +30,6 @@ namespace MoonProTablet.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater repLI;
/// <summary>
/// Controllo pnlLessDet.
/// </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.Panel pnlLessDet;
/// <summary>
/// Controllo repTestata.
/// </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 repTestata;
/// <summary>
/// Controllo ods.
/// </summary>