diff --git a/MP-TAB3/Components/InsManual.razor.cs b/MP-TAB3/Components/InsManual.razor.cs
index 8a9944ea..07edccd1 100644
--- a/MP-TAB3/Components/InsManual.razor.cs
+++ b/MP-TAB3/Components/InsManual.razor.cs
@@ -148,6 +148,9 @@ namespace MP_TAB3.Components
// imposto altri campi secondo il TIPO di record...
if (EditRecord.IsWork)
{
+ // controllo min pezzi a 1
+ EditRecord.PzBuoni = EditRecord.PzBuoni > 0 ? EditRecord.PzBuoni : 1;
+ // calcolo durata
EditRecord.MinProd = EditRecord.TCiclo * EditRecord.PzBuoni;
}
else
@@ -200,7 +203,7 @@ namespace MP_TAB3.Components
if (ListPeriod != null && ListPeriod.Count > 0)
{
// chiamo insert con eventi spenta (12) HardCoded...
- int numAdd = await TabDServ.InsManFillMissing(ListDay, 12, MServ.MatrOpr);
+ int numAdd = await TabDServ.InsManFillMissing(dtCurr, ListDay, 12, MServ.MatrOpr);
// rileggo i dati...
ReloadData();
RecalcDayData(dtCurr);
@@ -352,9 +355,10 @@ namespace MP_TAB3.Components
{
string IdxMacc = RecMSE.IdxMacchina;
fatto = await TabDServ.InsManFreezeDay(IdxMacc, dtCurr);
- if(fatto)
+ if (fatto)
{
EditRecord = null;
+ ReloadData();
}
}
return;
diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj
index fde96a5c..1b2142a9 100644
--- a/MP-TAB3/MP-TAB3.csproj
+++ b/MP-TAB3/MP-TAB3.csproj
@@ -3,7 +3,7 @@
net6.0
enable
- 6.16.2504.811
+ 6.16.2504.813
enable
MP_TAB3
diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html
index 70b6e9f7..d3d1ead2 100644
--- a/MP-TAB3/Resources/ChangeLog.html
+++ b/MP-TAB3/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo MAPOSPEC
- Versione: 6.16.2504.811
+ Versione: 6.16.2504.813
Note di rilascio:
-
diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt
index 66f883f5..761c1eb4 100644
--- a/MP-TAB3/Resources/VersNum.txt
+++ b/MP-TAB3/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2504.811
+6.16.2504.813
diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml
index a9142f53..1d1a1155 100644
--- a/MP-TAB3/Resources/manifest.xml
+++ b/MP-TAB3/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 6.16.2504.811
+ 6.16.2504.813
https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip
https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html
false
diff --git a/MP.Data/Services/TabDataService.cs b/MP.Data/Services/TabDataService.cs
index 9ba9c38d..3118bbc5 100644
--- a/MP.Data/Services/TabDataService.cs
+++ b/MP.Data/Services/TabDataService.cs
@@ -970,11 +970,12 @@ namespace MP.Data.Services
///
/// Riempie eventuali buchi con evento indicato
///
+ /// Data per cui effettuare ricalcolo giornata
/// Record dettaglio giornata
/// IdxTipo da riempire
/// MatrOperatore corrente
///
- public async Task InsManFillMissing(List listDetail, int idxTipoEv, int matrOpr)
+ public async Task InsManFillMissing(DateTime dtRif, List listDetail, int idxTipoEv, int matrOpr)
{
List rec2add = new List();
InsManualiModel newRec = new InsManualiModel();
@@ -1007,10 +1008,15 @@ namespace MP.Data.Services
rec2add.Add(newRec);
}
- // cerco ultimo record...
- currRec = listDetail.LastOrDefault();
+ // cerco ultimo record... che sia della data odierna!
+ currRec = listDetail.Where(x => x.InizioStato.Date == dtRif.Date).LastOrDefault();
periodStart = currRec.InizioStato;
periodEnd = currRec.FineStato.Value;
+ // se andassi a domani lo "accorcio"...
+ if (periodEnd > dtRif.Date.AddDays(1))
+ {
+ periodEnd = dtRif.Date.AddDays(1);
+ }
// se non arrivo a mezzanotte aggiungo "pad finale"
var lastPeriod = TimeSpan.FromHours(24).Subtract(periodEnd.TimeOfDay).TotalMinutes;
if (lastPeriod > 1)
@@ -1152,7 +1158,7 @@ namespace MP.Data.Services
}
// se non arrivo a mezzanotte aggiungo "pad finale"
var deltaFin = TimeSpan.FromHours(24).Subtract(periodEnd.TimeOfDay);
- if (deltaFin.TotalMinutes > 0.01)
+ if (deltaFin.TotalMinutes > 0.01)
{
lastIdxTipo = 0;
currRec = new ManualStatusDTO
@@ -1160,7 +1166,7 @@ namespace MP.Data.Services
IdxTipo = lastIdxTipo,
CssBlock = "bg-light text-dark",
Title = "missing",
- Value = deltaFin.TotalMinutes,
+ Value = deltaFin.TotalMinutes,
ValueMax = 1440
};
result.Add(currRec);