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

Update pagina piano PROD x TAB

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-10-04 12:49:03 +02:00
parent 7e6e0b6325
commit 92ab637363
3 changed files with 105 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=841']) {
withEnv(['NEXT_BUILD_NUMBER=842']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
MP-TAB/WebUserControls/mod_pianoProdMacc.ascx
+85 -29
View File
@@ -1,32 +1,88 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_pianoProdMacc.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_pianoProdMacc" %>
<div class="text-center small">
<h3>ELENCO PROSSIMI PODL</h3>
<asp:CheckBox runat="server" ID="chkOnlyMacc" Text="Solo assegnazione diretta" Checked="true" AutoPostBack="true" />
<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataKeyNames="idxPromessa" DataSourceID="ods" AllowPaging="true" CssClass="table table-condensed table-striped">
<Columns>
<%--<asp:BoundField DataField="idxPromessa" HeaderText="idxPromessa" InsertVisible="False" ReadOnly="True" SortExpression="idxPromessa" />--%>
<asp:BoundField DataField="KeyRichiesta" HeaderText="KeyRichiesta" SortExpression="KeyRichiesta" />
<%--<asp:BoundField DataField="KeyBCode" HeaderText="KeyBCode" SortExpression="KeyBCode" />--%>
<asp:CheckBoxField DataField="Attivabile" HeaderText="Attivabile" SortExpression="Attivabile" />
<%--<asp:BoundField DataField="IdxODL" HeaderText="IdxODL" SortExpression="IdxODL" />--%>
<asp:BoundField DataField="CodArticolo" HeaderText="CodArticolo" SortExpression="CodArticolo" />
<asp:BoundField DataField="DescArticolo" HeaderText="DescArticolo" ReadOnly="True" SortExpression="DescArticolo" />
<%--<asp:BoundField DataField="CodGruppo" HeaderText="CodGruppo" SortExpression="CodGruppo" />--%>
<%--<asp:BoundField DataField="IdxMacchina" HeaderText="IdxMacchina" SortExpression="IdxMacchina" />--%>
<%--<asp:BoundField DataField="CodMacchina" HeaderText="CodMacchina" ReadOnly="True" SortExpression="CodMacchina" />--%>
<asp:BoundField DataField="Nome" HeaderText="Nome Macc" SortExpression="Nome" />
<asp:BoundField DataField="NumPezzi" HeaderText="NumPezzi" SortExpression="NumPezzi" />
<asp:BoundField DataField="TCAssegnato" HeaderText="TCAssegnato" SortExpression="TCAssegnato" />
<asp:BoundField DataField="DueDate" HeaderText="DueDate" SortExpression="DueDate" />
<asp:BoundField DataField="Priorita" HeaderText="Priorita" SortExpression="Priorita" />
<asp:BoundField DataField="PzPallet" HeaderText="PzPallet" SortExpression="PzPallet" />
</Columns>
</asp:GridView>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByIdxMacc" TypeName="MapoDb.DS_ProdTempiTableAdapters.PromesseODLTableAdapter">
<SelectParameters>
<asp:SessionParameter Type="String" DefaultValue="0" SessionField="IdxMacchina" Name="IdxMacchina" />
<asp:Parameter DefaultValue="True" Name="onlyFree" Type="Boolean" />
<asp:ControlParameter ControlID="chkOnlyMacc" DefaultValue="" Name="onlyDirect" PropertyName="Checked" Type="Boolean" />
</SelectParameters>
</asp:ObjectDataSource>
<h3>ELENCO PROSSIMI PODL</h3>
<asp:CheckBox runat="server" ID="chkOnlyMacc" Text="Solo assegnazione diretta" Checked="true" AutoPostBack="true" />
<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataKeyNames="idxPromessa" DataSourceID="ods" AllowPaging="true" CssClass="table table-dark table-striped">
<RowStyle CssClass="ctrRowStyle" />
<AlternatingRowStyle CssClass="ctrAltRowStyle" />
<EditRowStyle CssClass="ctrEditRowStyle" />
<SelectedRowStyle CssClass="ctrSelRowStyle" />
<FooterStyle CssClass="ctrFooter" />
<PagerStyle CssClass="active GridPager" />
<PagerSettings Mode="NumericFirstLast" />
<HeaderStyle CssClass="ctrHeaderPager" ForeColor="White" Font-Bold="True" />
<EmptyDataRowStyle CssClass="ctrRowStyle" />
<EmptyDataTemplate>
<asp:Label runat="server" ID="lblNoRecord" Text="Nessun record trovato" />
</EmptyDataTemplate>
<Columns>
<asp:TemplateField HeaderText="Data" SortExpression="DueDate">
<ItemTemplate>
<div class="row">
<div class="col-12 text-nowrap">
<%# Eval("DueDate","{0:dd.MM.yy}") %>
<br />
[<%# Eval("IdxPromessa") %>]
</div>
</div>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Articolo" SortExpression="CodArticolo">
<ItemTemplate>
<div class="row">
<div class="col-6 text-left">
<b>
<asp:Label runat="server" ID="txtCodArticolo" Text='<%# Eval("CodArticolo") %>' /></b>
</div>
<div class="col-6 text-right">
<asp:Label runat="server" ID="Label1" Text='<%# Eval("KeyRichiesta") %>' />
</div>
<div class="col-12 text-center small">
<asp:Label runat="server" ID="txtDescArticolo" CssClass="text-warning" Text='<%# Eval("DescArticolo") %>' />
</div>
</div>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Macchina" SortExpression="CodMacchina">
<ItemTemplate>
<div class="row">
<div class="col-12 text-nowrap">
<b>
<asp:Label runat="server" ID="txtCodMacchina" Text='<%# Eval("CodMacchina") %>' /></b>
<br />
<asp:Label runat="server" ID="txtNome" CssClass="text-warning" Text='<%# Eval("Nome") %>' />
</div>
</div>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Pezzi" SortExpression="NumPezzi">
<ItemTemplate>
<div class="row">
<div class="col-12 col-lg-6 text-nowrap text-success">
Tot: <%# Eval("NumPezzi") %>
<div class="text-secondary">
<%# Eval("PzPallet") %> pz/pal
</div>
</div>
<div class="col-12 col-lg-6 text-nowrap text-success">
TC: <%# Eval("TCAssegnato","{0:0.000}") %>
<div class="text-secondary small">
<%# TCMinSec(Eval("TCAssegnato")) %> (min:sec)
</div>
</div>
</div>
</ItemTemplate>
</asp:TemplateField>
</Columns>
</asp:GridView>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByIdxMacc" TypeName="MapoDb.DS_ProdTempiTableAdapters.PromesseODLTableAdapter" FilterExpression=" Attivabile = 1">
<SelectParameters>
<asp:SessionParameter Type="String" DefaultValue="0" SessionField="IdxMacchina" Name="IdxMacchina" />
<asp:Parameter DefaultValue="True" Name="onlyFree" Type="Boolean" />
<asp:ControlParameter ControlID="chkOnlyMacc" DefaultValue="" Name="onlyDirect" PropertyName="Checked" Type="Boolean" />
</SelectParameters>
</asp:ObjectDataSource>
</div>
MP-TAB/WebUserControls/mod_pianoProdMacc.ascx.cs
+19 -5
View File
@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace MoonProTablet.WebUserControls
{
@@ -13,5 +8,24 @@ namespace MoonProTablet.WebUserControls
{
}
public string TCMinSec(object _TC)
{
string TC_MinSec = "";
decimal TC = 0;
decimal.TryParse(_TC.ToString(), out TC);
int min = 0;
int sec = 0;
try
{
// cerco di convertire in min/sec
min = Convert.ToInt32(Math.Floor(Convert.ToDouble(TC)));
sec = Convert.ToInt32((Convert.ToDouble(TC) - min) * 60);
TC_MinSec = string.Format("{0}:{1:00}", min, sec);
}
catch
{ }
return TC_MinSec;
}
}
}