+ }
+ else
+ {
+
diff --git a/MP-TAB3/Components/InsManual.razor.cs b/MP-TAB3/Components/InsManual.razor.cs
index 50b23044..422d588d 100644
--- a/MP-TAB3/Components/InsManual.razor.cs
+++ b/MP-TAB3/Components/InsManual.razor.cs
@@ -45,7 +45,7 @@ namespace MP_TAB3.Components
#region Protected Methods
- protected void AddNew()
+ protected void AddNew(bool isWork)
{
if (RecMSE != null)
{
@@ -63,12 +63,14 @@ namespace MP_TAB3.Components
startPeriod = dtCurr.Date.AddHours(6);
}
}
+ // evento da richiesta: default lavora/spenta
+ int idxTipo = isWork ? 1 : 12;
// creazione nuovo record ed aggiunta in coda agli esistenti...
EditRecord = new InsManualiModel()
{
IdxMacchina = idxMacc,
InizioStato = startPeriod,
- IdxTipoEv = 1,
+ IdxTipoEv = idxTipo,
MatrOpr = MServ.MatrOpr
};
}
@@ -233,8 +235,6 @@ namespace MP_TAB3.Components
var dayDto = ListDTO.FirstOrDefault(x => x.DataRif == reqDate.Date);
if (dayDto != null && (ListDay != null || (reloadDay && ListPeriod != null)))
{
-#if false
-#endif
if (reloadDay)
{
// calcolo eventi giorno
@@ -313,6 +313,7 @@ namespace MP_TAB3.Components
DateCFF = new Dictionary
();
string cssImport = "bg-success text-light rounded-circle p-2";
string cssOkDay = "bg-success bg-opacity-50 text-light rounded-circle p-2";
+ string cssPartDay = "bg-info bg-opacity-25 text-light rounded-circle p-2";
string cssHasData = "bg-warning text-light rounded-circle p-2";
string cssToday = "bg-info text-dark rounded-circle p-2";
string cssFest = "bg-danger text-warning rounded-pill2 px-0 opacity-50";
@@ -323,32 +324,27 @@ namespace MP_TAB3.Components
string currCss = "";
foreach (var item in ListDTO)
{
- currCss = item.MinProdTot == 0 ? "" : cssHasData;
+ currCss = "";// item.MinProdTot == 0 ? "" : cssHasData;
// controllo minuti dichiarati...
- if (IsTimeInfoOk(item.DataRif.Date, true))
+ if (item.RatioImport == 1)
{
- currCss = cssOkDay;
+ currCss = cssImport;
}
else if (item.DataRif == DateTime.Today)
{
currCss = cssToday;
}
- else if (item.RatioImport == 1)
+ else if (IsTimeInfoOk(item.DataRif.Date, true))
{
- currCss = cssOkDay;
+ currCss = item.MinProdTot < 1440 ? cssPartDay : cssOkDay;
+ }
+ else
+ {
+ currCss = item.MinProdTot == 0 ? "" : cssHasData;
}
DateCheck.Add(item.DataRif, currCss);
}
}
-
-#if false
- // verifico dati giornalieri...
- if (!IsTimeInfoOk())
- {
- // se non ok --> sposo primo e poi ricalcolo...
- //int numChange = await DoRecalcDay();
- }
-#endif
}
}
diff --git a/MP-TAB3/Components/SlideMenu.razor b/MP-TAB3/Components/SlideMenu.razor
index 05ba1295..c1fce655 100644
--- a/MP-TAB3/Components/SlideMenu.razor
+++ b/MP-TAB3/Components/SlideMenu.razor
@@ -28,7 +28,8 @@
@foreach (var item in MenuItems)
{
- if (IsManual && item.ordine > 20)
+ @* if (IsManual && item.ordine > 20) *@
+ if (IsManual && item.ordine > 40)
{
}
diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj
index 46ae4934..d297c1a3 100644
--- a/MP-TAB3/MP-TAB3.csproj
+++ b/MP-TAB3/MP-TAB3.csproj
@@ -3,7 +3,7 @@
net6.0
enable
- 6.16.2504.216
+ 6.16.2504.217
enable
MP_TAB3
diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html
index d22b27eb..ee15a13d 100644
--- a/MP-TAB3/Resources/ChangeLog.html
+++ b/MP-TAB3/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo MAPOSPEC
-
Versione: 6.16.2504.216
+
Versione: 6.16.2504.217
Note di rilascio:
-
diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt
index 5877ff0c..88839317 100644
--- a/MP-TAB3/Resources/VersNum.txt
+++ b/MP-TAB3/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2504.216
+6.16.2504.217
diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml
index 16e4348f..8275e382 100644
--- a/MP-TAB3/Resources/manifest.xml
+++ b/MP-TAB3/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 6.16.2504.216
+ 6.16.2504.217
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/DbModels/InsManualiModel.cs b/MP.Data/DbModels/InsManualiModel.cs
index 46f49a05..577eb868 100644
--- a/MP.Data/DbModels/InsManualiModel.cs
+++ b/MP.Data/DbModels/InsManualiModel.cs
@@ -47,6 +47,12 @@ namespace MP.Data.DbModels
///
public DateTime? Imported { get; set; } = null;
+ [NotMapped]
+ public bool IsWork
+ {
+ get => IdxTipoEv == 1;
+ }
+
///
/// Navigazione oggetto Machine