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

aggunta traduzione min:sec in promesse ODL + fix input

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-10-13 14:12:38 +02:00
parent 083d1939f9
commit 5a4b0c7c53
2 changed files with 8 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-Admin/WebUserControls/mod_gestPromODL.ascx
+3
View File
@@ -101,6 +101,9 @@
<asp:TemplateField HeaderText="TCAssegnato" SortExpression="TCAssegnato">
<ItemTemplate>
<asp:Label runat="server" ID="txtTCAssegnato" Text='<%# Eval("TCAssegnato","{0:0.000}") %>' />
<div class="small">
<asp:Label runat="server" ID="txtTCAssMs" Text='<%# SteamWare.TempiCiclo.minSec(Eval("TCAssegnato")) %>' /> (m:s)
</div>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="PzPallet" SortExpression="PzPallet">
MP-Admin/WebUserControls/mod_newPromessaODL.ascx.cs
+5 -31
View File
@@ -54,26 +54,13 @@ namespace MoonProAdmin.WebUserControls
txtNumPz.Text = rPODL.NumPezzi.ToString();
txtPzPallet.Text = rPODL.PzPallet.ToString();
txtPrio.Text = rPODL.Priorita.ToString();
int min = 0;
int sec = 0;
string TC_MinSec = "";
try
{
// cerco di convertire in min/sec
min = Convert.ToInt32(Math.Floor(Convert.ToDouble(rPODL.TCAssegnato)));
sec = Convert.ToInt32((Convert.ToDouble(rPODL.TCAssegnato) - min) * 60);
TC_MinSec = string.Format("{0}:{1:00}", min, sec);
}
catch
{
}
if (memLayer.ML.cdvb("ADM_TC_MinSec"))
{
txtTCms.Text = TC_MinSec;
txtTCms.Text = TempiCiclo.minSec(rPODL.TCAssegnato);
}
else
{
txtTCmc.Text = rPODL.TCAssegnato.ToString();
txtTCmc.Text = rPODL.TCAssegnato.ToString("N3");
}
ddlMacchine.SelectedValue = rPODL.IdxMacchina;
txtKeyExt.Text = rPODL.KeyRichiesta;
@@ -162,7 +149,7 @@ namespace MoonProAdmin.WebUserControls
}
else
{
decimal.TryParse(txtTCmc.Text, out TCiclo);
decimal.TryParse(txtTCmc.Text.Replace(".", ","), out TCiclo);
}
pzPallet = Convert.ToInt32(txtPzPallet.Text.Trim());
attiv = chkAttiv.Checked;
@@ -302,26 +289,13 @@ namespace MoonProAdmin.WebUserControls
MapoDb.DS_ProdTempi.ODLRow rigaOdl = MapoDb.DataLayer.obj.taODL.getByIdx(idxOdl, false)[0];
// precompilo dati pezzi/tempi
txtNumPz.Text = rigaOdl.NumPezzi.ToString();
int min = 0;
int sec = 0;
if (memLayer.ML.cdvb("ADM_TC_MinSec"))
{
string TC_MinSec = "";
try
{
// cerco di convertire in min/sec
min = Convert.ToInt32(Math.Floor(Convert.ToDouble(rigaOdl.TCAssegnato)));
sec = Convert.ToInt32((Convert.ToDouble(rigaOdl.TCAssegnato) - min) * 60);
TC_MinSec = string.Format("{0}:{1:00}", min, sec);
}
catch
{ }
txtTCms.Text = TC_MinSec;
txtTCms.Text = TempiCiclo.minSec(rigaOdl.TCAssegnato);
}
else
{
txtTCmc.Text = rigaOdl.TCAssegnato.ToString();
txtTCmc.Text = rigaOdl.TCAssegnato.ToString("N3");
}
txtPzPallet.Text = rigaOdl.PzPallet.ToString();
}