diff --git a/MP-Admin/WebUserControls/mod_gestPromODL.ascx b/MP-Admin/WebUserControls/mod_gestPromODL.ascx
index a9da1cc4..db553b53 100644
--- a/MP-Admin/WebUserControls/mod_gestPromODL.ascx
+++ b/MP-Admin/WebUserControls/mod_gestPromODL.ascx
@@ -101,6 +101,9 @@
+
diff --git a/MP-Admin/WebUserControls/mod_newPromessaODL.ascx.cs b/MP-Admin/WebUserControls/mod_newPromessaODL.ascx.cs
index 6eca11bd..7af75908 100644
--- a/MP-Admin/WebUserControls/mod_newPromessaODL.ascx.cs
+++ b/MP-Admin/WebUserControls/mod_newPromessaODL.ascx.cs
@@ -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();
}