@@ -21,4 +18,7 @@
else
{
} *@
+
+
+
diff --git a/MP-TAB/MP-TAB/Components/_Imports.razor b/MP-TAB/MP-TAB/Components/_Imports.razor
index 40a1a57c..8bb2ba63 100644
--- a/MP-TAB/MP-TAB/Components/_Imports.razor
+++ b/MP-TAB/MP-TAB/Components/_Imports.razor
@@ -12,3 +12,7 @@
@using MP.Data.Services
@using MP_TAB
@using MP_TAB.Components
+@*
+@using MP_TAB.Client.Components
+@using MP_TAB.Client.Pages
+*@
\ No newline at end of file
diff --git a/MP-TAB/MP-TAB/Controllers/ODLController.cs b/MP-TAB/MP-TAB/Controllers/ODLController.cs
index 3e62d12a..a6a0b3eb 100644
--- a/MP-TAB/MP-TAB/Controllers/ODLController.cs
+++ b/MP-TAB/MP-TAB/Controllers/ODLController.cs
@@ -20,7 +20,7 @@ namespace MP_TAB.Controllers
Log.Info("Starting ODLController");
_configuration = configuration;
CtrDataServ = DataService;
- Log.Info("Avviato ODLController");
+ Log.Trace("Avviato ODLController");
}
#endregion Public Constructors
diff --git a/MP-TAB/MP-TAB/MP-TAB.csproj b/MP-TAB/MP-TAB/MP-TAB.csproj
index 09aa5521..614b03dd 100644
--- a/MP-TAB/MP-TAB/MP-TAB.csproj
+++ b/MP-TAB/MP-TAB/MP-TAB.csproj
@@ -110,6 +110,12 @@
Always
+
+ Always
+
+
+ Always
+
Always
diff --git a/MP-TAB/MP-TAB/Program.cs b/MP-TAB/MP-TAB/Program.cs
index 8228ff64..862cc434 100644
--- a/MP-TAB/MP-TAB/Program.cs
+++ b/MP-TAB/MP-TAB/Program.cs
@@ -19,6 +19,7 @@ builder.Services.AddSingleton
();
builder.Services.AddSingleton();
builder.Services.AddSingleton();
builder.Services.AddScoped();
+builder.Services.AddScoped();
// nuova versione contenuti...
builder.Services.AddRazorComponents()
diff --git a/MP-TAB/MP-TAB/wwwroot/favicon.png b/MP-TAB/MP-TAB/wwwroot/favicon.png
deleted file mode 100644
index 8422b596..00000000
Binary files a/MP-TAB/MP-TAB/wwwroot/favicon.png and /dev/null differ
diff --git a/MP-TAB/MP-TAB/wwwroot/favicon.ico b/MP-TAB/MP-TAB/wwwroot/images/favicon.ico
similarity index 100%
rename from MP-TAB/MP-TAB/wwwroot/favicon.ico
rename to MP-TAB/MP-TAB/wwwroot/images/favicon.ico
diff --git a/MP.Data/Controllers/MpSpecController.cs b/MP.Data/Controllers/MpSpecController.cs
index f0952b6a..79db52c5 100644
--- a/MP.Data/Controllers/MpSpecController.cs
+++ b/MP.Data/Controllers/MpSpecController.cs
@@ -581,11 +581,11 @@ namespace MP.Data.Controllers
using (var dbCtx = new MoonProContext(_configuration))
{
dbResult = dbCtx
- .DbSetLinkMenu
- .Where(x => x.TipoLink == tipoLink)
- .AsNoTracking()
- .OrderBy(x => x.ordine)
- .ToList();
+ .DbSetLinkMenu
+ .Where(x => x.TipoLink == tipoLink)
+ .AsNoTracking()
+ .OrderBy(x => x.ordine)
+ .ToList();
}
return dbResult;
}
diff --git a/MP.Data/Services/MemStorUtil.cs b/MP.Data/Services/MemStorUtil.cs
new file mode 100644
index 00000000..c605d146
--- /dev/null
+++ b/MP.Data/Services/MemStorUtil.cs
@@ -0,0 +1,55 @@
+using MP.Data.DatabaseModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MP.Data.Services
+{
+ public class MemStorUtil
+ {
+
+ ///
+ /// Matricola operatore corrente (x filtraggio dati)
+ /// ToDo: gestire login!!!
+ ///
+ public static int MatrOpr = 102;
+
+ ///
+ /// Dizionario macchine
+ ///
+ public static Dictionary DictMacchine { get; set; } = new Dictionary();
+
+ ///
+ /// Dizionario Menu
+ ///
+ public static Dictionary> DictMenu {get;set;} = new Dictionary>();
+
+ ///
+ /// Reset cache memory
+ ///
+ public void ResetCache()
+ {
+ DictMacchine = new Dictionary();
+ DictMenu = new Dictionary>();
+ }
+
+ ///
+ /// Restituisce il livello pagina dato URL
+ /// - se contiene ?IdxMacc --> T2D (detail)
+ /// - altrimenti --> T2H
+ ///
+ ///
+ ///
+ public static string PageLevel(string pageUrl)
+ {
+ string answ = "T2H";
+ if(pageUrl.Contains("?IdxMacc="))
+ {
+ answ = "T2D";
+ }
+ return answ;
+ }
+ }
+}