diff --git a/MP.INVE/Components/CmpTop.razor.cs b/MP.INVE/Components/CmpTop.razor.cs
index 1da748b8..0fc621ce 100644
--- a/MP.INVE/Components/CmpTop.razor.cs
+++ b/MP.INVE/Components/CmpTop.razor.cs
@@ -12,7 +12,6 @@ namespace MP.INVE.Components
public async Task flushCache()
{
await Task.Delay(1);
- await MDService.FlushRedisCache();
await Task.Delay(1);
// rimando a pagina corrente
NavManager.NavigateTo(NavManager.Uri, true);
@@ -25,18 +24,12 @@ namespace MP.INVE.Components
[Inject]
protected IJSRuntime JSRuntime { get; set; } = null!;
- [Inject]
- protected MpDataService MDService { get; set; } = null!;
-
- protected bool ShowSearch { get => MService.ShowSearch; set => MService.ShowSearch = value; }
-
#endregion Protected Properties
#region Protected Methods
protected override async Task OnInitializedAsync()
{
- MService.EA_ShowSearch += MService_EA_ShowSearch;
await forceReload();
}
@@ -53,7 +46,7 @@ namespace MP.INVE.Components
[Inject]
private NavigationManager NavManager { get; set; } = null!;
- private string TipoSearch { get => MService.TipoSearch; set => MService.TipoSearch = value; }
+
#endregion Private Properties
diff --git a/MP.INVE/Data/MiDataService.cs b/MP.INVE/Data/MiDataService.cs
index ec8ffa65..ad77c49e 100644
--- a/MP.INVE/Data/MiDataService.cs
+++ b/MP.INVE/Data/MiDataService.cs
@@ -13,10 +13,10 @@ namespace MP.INVE.Data
{
#region Public Constructors
- public MiDataService(IConfiguration configuration, ILogger
logger)
+ public MiDataService(IConfiguration configuration, ILogger logger)
{
_logger = logger;
- _logger.LogInformation("Starting MpDataService INIT");
+ _logger.LogInformation("Starting MiDataService INIT");
_configuration = configuration;
// setup compoenti REDIS
@@ -30,10 +30,11 @@ namespace MP.INVE.Data
_logger.LogInformation("Redis INIT");
// conf DB
- string connStr = _configuration.GetConnectionString("Mp.Data");
- if (string.IsNullOrEmpty(connStr))
+ string connStrData = _configuration.GetConnectionString("Mp.Data");
+ string connStrInve = _configuration.GetConnectionString("Mp.Inve");
+ if (string.IsNullOrEmpty(connStrData) || string.IsNullOrEmpty(connStrInve))
{
- _logger.LogError("DbController: ConnString empty!");
+ _logger.LogError($"DbController: ConnString empty! connStrData: {connStrData} | connStrInve: {connStrInve}");
}
else
{
@@ -44,6 +45,10 @@ namespace MP.INVE.Data
#endregion Public Constructors
+ public void Dispose()
+ {
+ }
+
#region Public Properties
public static MP.Data.Controllers.MpInveController dbController { get; set; } = null!;
@@ -55,7 +60,24 @@ namespace MP.INVE.Data
#endregion Public Properties
-
+ #region Public Methods
+
+ public List ElencoOperatori()
+ {
+ List? result = new List();
+ result = dbController.ElencoOperatori();
+ return result;
+ }
+
+ public bool LoginOperatore(int MatrOpr, string authKey)
+ {
+ bool result = false;
+ result = dbController.LoginOperatore(MatrOpr, authKey);
+ return result;
+ }
+
+
+ #endregion Public Methods
#region Protected Fields
@@ -80,38 +102,6 @@ namespace MP.INVE.Data
#region Private Fields
- private const string redisArtByDossier = redisBaseAddr + "SPEC:Cache:ArtByDossier";
-
- private const string redisArtList = redisBaseAddr + "SPEC:Cache:ArtList";
-
- private const string redisBaseAddr = "MP:";
-
- private const string redisConfKey = redisBaseAddr + "SPEC:Cache:Config";
-
- private const string redisDossByMac = redisBaseAddr + "SPEC:Cache:DossByMac";
-
- private const string redisFluxByMac = redisBaseAddr + "SPEC:Cache:FluxByMac";
-
- private const string redisFluxLogFilt = redisBaseAddr + "SPEC:Cache:FluxLogFilt";
-
- private const string redisMacByFlux = redisBaseAddr + "SPEC:Cache:MacByFlux";
-
- private const string redisMacList = redisBaseAddr + "SPEC:Cache:MacList";
-
- private const string redisOdlCurrByMac = redisBaseAddr + "SPEC:Cache:OdlByMac";
-
- private const string redisPOdlList = redisBaseAddr + "SPEC:Cache:POdlList";
-
- private const string redisPOdlByPOdl = redisBaseAddr + "SPEC:Cache:POdlByPOdl";
-
- private const string redisPOdlByOdl = redisBaseAddr + "SPEC:Cache:POdlByOdl";
-
- private const string redisStatoCom = redisBaseAddr + "SPEC:Cache:StatoCom";
-
- private const string redisTipoArt = redisBaseAddr + "SPEC:Cache:TipoArt";
-
- private const string redisVocabolario = redisBaseAddr + "SPEC:Cache:Vocabolario";
-
private static IConfiguration _configuration = null!;
private static ILogger _logger = null!;
diff --git a/MP.INVE/MP.INVE.csproj b/MP.INVE/MP.INVE.csproj
index e54368a5..28000fb5 100644
--- a/MP.INVE/MP.INVE.csproj
+++ b/MP.INVE/MP.INVE.csproj
@@ -5,7 +5,7 @@
enable
enable
MP.INVE
- 6.16.2211.1412
+ 6.16.2211.1417
diff --git a/MP.INVE/Pages/Index.razor.cs b/MP.INVE/Pages/Index.razor.cs
index 34b76e70..1bf390b6 100644
--- a/MP.INVE/Pages/Index.razor.cs
+++ b/MP.INVE/Pages/Index.razor.cs
@@ -12,16 +12,6 @@ namespace MP.INVE.Pages
#endregion Public Properties
- #region Protected Properties
-
- //[Inject]
- //protected MpDataService MDService { get; set; } = null!;
-
- //[Inject]
- //protected MessageService MessageService { get; set; } = null!;
-
- #endregion Protected Properties
-
#region Protected Methods
protected override async Task OnInitializedAsync()
diff --git a/MP.INVE/Pages/OperatoreLogin.razor b/MP.INVE/Pages/OperatoreLogin.razor
new file mode 100644
index 00000000..73e37eab
--- /dev/null
+++ b/MP.INVE/Pages/OperatoreLogin.razor
@@ -0,0 +1,27 @@
+@page "/OperatoreLogin"
+
+OperatoreLogin
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/MP.INVE/Pages/OperatoreLogin.razor.cs b/MP.INVE/Pages/OperatoreLogin.razor.cs
new file mode 100644
index 00000000..e6b2a3a5
--- /dev/null
+++ b/MP.INVE/Pages/OperatoreLogin.razor.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components;
+using System.Net.Http;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Components.Authorization;
+using Microsoft.AspNetCore.Components.Forms;
+using Microsoft.AspNetCore.Components.Routing;
+using Microsoft.AspNetCore.Components.Web;
+using Microsoft.AspNetCore.Components.Web.Virtualization;
+using Microsoft.JSInterop;
+using MP.INVE;
+using MP.INVE.Data;
+using MP.INVE.Shared;
+using MP.INVE.Components;
+using MP.Data.DatabaseModels;
+
+namespace MP.INVE.Pages
+{
+ public partial class OperatoreLogin
+ {
+ [Inject]
+ private MiDataService MIDataservice { get; set; } = null!;
+ [Inject]
+ private NavigationManager NavManager { get; set; } = null!;
+
+ private int idOperatore { get; set; }
+ private string authKey { get; set; }
+
+ private List? elencoOperatori;
+
+ protected override async Task OnInitializedAsync()
+ {
+ //await FilterChanged.InvokeAsync(actFilter);
+ await Task.Delay(1);
+ elencoOperatori = MIDataservice.ElencoOperatori();
+ }
+
+ private void login()
+ {
+ var ok = MIDataservice.LoginOperatore(idOperatore, authKey);
+
+ if (ok)
+ {
+ NavManager.NavigateTo("/Starter", true);
+ }
+ else
+ {
+
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/MP.INVE/Program.cs b/MP.INVE/Program.cs
index 6a3dc552..ae34829e 100644
--- a/MP.INVE/Program.cs
+++ b/MP.INVE/Program.cs
@@ -36,7 +36,7 @@ builder.Services.AddAuthorization(options =>
builder.Services.AddRazorPages();
builder.Services.AddServerSideBlazor();
builder.Services.AddSingleton(redisMultiplexer);
-builder.Services.AddSingleton();
+builder.Services.AddSingleton();
builder.Services.AddScoped();
builder.Services.AddHttpClient();
diff --git a/MP.INVE/Resources/ChangeLog.html b/MP.INVE/Resources/ChangeLog.html
index 7cdbda82..84719f4a 100644
--- a/MP.INVE/Resources/ChangeLog.html
+++ b/MP.INVE/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo MAPOINVE
- Versione: 6.16.2211.1412
+ Versione: 6.16.2211.1417
Note di rilascio:
-
diff --git a/MP.INVE/Resources/VersNum.txt b/MP.INVE/Resources/VersNum.txt
index b7a3fd27..a8e43652 100644
--- a/MP.INVE/Resources/VersNum.txt
+++ b/MP.INVE/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2211.1412
+6.16.2211.1417
diff --git a/MP.INVE/Resources/manifest.xml b/MP.INVE/Resources/manifest.xml
index 13e2158d..268d80e6 100644
--- a/MP.INVE/Resources/manifest.xml
+++ b/MP.INVE/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 6.16.2211.1412
+ 6.16.2211.1417
https://nexus.steamware.net/repository/SWS/MP-INVE/stable/LAST/MP.INVE.zip
https://nexus.steamware.net/repository/SWS/MP-INVE/stable/LAST/ChangeLog.html
false
diff --git a/MP.INVE/Services/IOApiService.cs b/MP.INVE/Services/IOApiService.cs
index ba985879..06287fc5 100644
--- a/MP.INVE/Services/IOApiService.cs
+++ b/MP.INVE/Services/IOApiService.cs
@@ -15,7 +15,7 @@ namespace MP.INVE.Services
public class IOApiService
{
private readonly IHttpClientFactory _clientFactory;
- private static ILogger _logger = null!;
+ private static ILogger _logger = null!;
private static IConfiguration _configuration = null!;
@@ -24,7 +24,7 @@ namespace MP.INVE.Services
private static string MpIoBaseUrl = "";
- public IOApiService(IHttpClientFactory clientFactory, IConfiguration configuration, ILogger logger)
+ public IOApiService(IHttpClientFactory clientFactory, IConfiguration configuration, ILogger logger)
{
_logger = logger;
_logger.LogInformation("Starting IOApiService INIT");
diff --git a/MP.INVE/Shared/NavMenu.razor b/MP.INVE/Shared/NavMenu.razor
index a8a4e815..4a7f7eb4 100644
--- a/MP.INVE/Shared/NavMenu.razor
+++ b/MP.INVE/Shared/NavMenu.razor
@@ -1,6 +1,5 @@
@using MP.INVE.Components
@using MP.INVE.Data
-@*@inject MpDataService MDService*@
diff --git a/MP.INVE/appsettings.json b/MP.INVE/appsettings.json
index bf26110e..4ad938bd 100644
--- a/MP.INVE/appsettings.json
+++ b/MP.INVE/appsettings.json
@@ -9,6 +9,7 @@
"CodApp": "MP.INVE",
"ConnectionStrings": {
"Mp.Inve": "Server=SQL2016DEV;Database=MoonPro_MAG; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=MP.INVE;",
+ "Mp.Data": "Server=SQL2016DEV;Database=MoonPro; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=MP.INVE;",
"Redis": "localhost:6379,DefaultDatabase=1,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false",
"RedisAdmin": "localhost:6379,DefaultDatabase=1,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true"
},
diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj
index fc2a122e..1593b920 100644
--- a/MP.SPEC/MP.SPEC.csproj
+++ b/MP.SPEC/MP.SPEC.csproj
@@ -5,7 +5,7 @@
enable
enable
MP.SPEC
-
6.16.2211.917
+
6.16.2211.1416
diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html
index 9850f032..76cc2545 100644
--- a/MP.SPEC/Resources/ChangeLog.html
+++ b/MP.SPEC/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo MAPOSPEC
- Versione: 6.16.2211.917
+ Versione: 6.16.2211.1416
Note di rilascio:
-
diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt
index 458e2e65..c2ec0988 100644
--- a/MP.SPEC/Resources/VersNum.txt
+++ b/MP.SPEC/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2211.917
+6.16.2211.1416
diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml
index 9d8f2e3a..a3f145f3 100644
--- a/MP.SPEC/Resources/manifest.xml
+++ b/MP.SPEC/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 6.16.2211.917
+ 6.16.2211.1416
https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip
https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html
false