Egalware/mapo-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.steamware.net/steamware/mapo-core into develop

Browse Source
This commit is contained in:
Samuele Locatelli
2022-11-21 17:20:51 +01:00
parent 5d923a46f3 b8d5ab2d6c
commit b36f8fd6f0
14 changed files with 59 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.INVE/Components/InveSessionList.razor.cs
+3 -3
View File
@@ -89,7 +89,7 @@ namespace MP.INVE.Components
private DateTime dtStart { get; set; } = DateTime.Now.AddMonths(-1);
private DateTime dtEnd { get; set; } = DateTime.Now;
protected string BaseUrlTab { get => $"{Configuration["ServerConf:BaseUrl"]}"; }
protected string BaseUrlTab { get => $"{Configuration["ServerConf:BaseUrlJumper"]}"; }
protected string rawCode
@@ -135,7 +135,7 @@ namespace MP.INVE.Components
};
await MIDataservice.InsertNewSessione(newSess);
NavManager.NavigateTo("Session", true);
NavManager.NavigateTo(NavManager.Uri, true);
await reloadData();
}
else
@@ -155,7 +155,7 @@ namespace MP.INVE.Components
if (alert)
{
await MIDataservice.deleteSessione(session);
NavManager.NavigateTo("Session", true);
NavManager.NavigateTo(NavManager.Uri, true);
await reloadData();
}
}
MP.INVE/Components/MagList.razor.cs
+1 -1
View File
@@ -75,7 +75,7 @@ namespace MP.INVE.Components
Nascosto = false
};
await MIDataservice.InsertNewMag(newMag);
NavManager.NavigateTo("Elencomagazzini", true);
NavManager.NavigateTo(NavManager.Uri, true);
//await MIDataservice.FlushRedisCache();
await reloadData();
}
MP.INVE/MP.INVE.csproj
+1 -1
View File
@@ -5,7 +5,7 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP.INVE</RootNamespace>
<Version>6.16.2211.2115</Version>
<Version>6.16.2211.2116</Version>
</PropertyGroup>
<ItemGroup>
MP.INVE/Pages/Acquisizione.razor.cs
+5 -7
View File
@@ -17,6 +17,7 @@ using MP.INVE.Components;
using Blazored.LocalStorage;
using MP.Data.DTO;
using Microsoft.AspNetCore.WebUtilities;
using MP.INVE.Data;
namespace MP.INVE.Pages
{
@@ -26,18 +27,15 @@ namespace MP.INVE.Pages
protected ILocalStorageService localStorage { get; set; } = null!;
[Inject]
protected NavigationManager NavManager { get; set; } = null!;
[Inject]
protected MiDataService MIService { get; set; } = null!;
private bool logged { get;set; } = false;
protected string idOPeratore { get; set; } = null!;
protected string authKey { get; set; } = null!;
protected override async Task OnInitializedAsync()
{
await Task.Delay(1);
var uri = NavManager.ToAbsoluteUri(NavManager.Uri);
if (QueryHelpers.ParseQuery(uri.Query).TryGetValue("MatrOpr", out var _matrOpr) && QueryHelpers.ParseQuery(uri.Query).TryGetValue("UserAuthKey", out var _authKey))
{
idOPeratore = _matrOpr;
authKey = _authKey;
}
}
protected DateTime? lastScan { get; set; } = null;
}
MP.INVE/Pages/Index.razor.cs
-15
View File
@@ -34,21 +34,6 @@ namespace MP.INVE.Pages
//await getId();
await Task.Delay(1);
}
#if false
[Inject]
protected ILocalStorageService localStorage { get; set; } = null!;
[Inject]
protected NavigationManager NavManager { get; set; } = null!;
protected async Task getId()
{
OperatoreDTO local = new OperatoreDTO();
local = await localStorage.GetItemAsync<OperatoreDTO>("MatrOpr");
if ((local == null))
{
NavManager.NavigateTo("OperatoreLogin");
}
}
#endif
#endregion Protected Methods
#region Private Fields
MP.INVE/Pages/Jumper.razor
+1 -1
View File
@@ -1,5 +1,5 @@
@page "/Jumper"
<h3>Jumper</h3>
<h3>@logged</h3>
MP.INVE/Pages/Jumper.razor.cs
+38
View File
@@ -14,10 +14,48 @@ using Microsoft.JSInterop;
using MP.INVE;
using MP.INVE.Shared;
using MP.INVE.Components;
using Blazored.LocalStorage;
using Microsoft.AspNetCore.WebUtilities;
using MP.INVE.Data;
using MP.Data.DatabaseModels;
namespace MP.INVE.Pages
{
public partial class Jumper
{
[Inject]
protected ILocalStorageService localStorage { get; set; } = null!;
[Inject]
protected NavigationManager NavManager { get; set; } = null!;
[Inject]
protected MiDataService MIService { get; set; } = null!;
private string logged { get; set; } = "";
private List<AnagOperatoriModel> operatore = new List<AnagOperatoriModel>();
protected string idOPeratore { get; set; } = null!;
protected string authKey { get; set; } = null!;
protected override async Task OnInitializedAsync()
{
await Task.Delay(1);
var uri = NavManager.ToAbsoluteUri(NavManager.Uri);
if (QueryHelpers.ParseQuery(uri.Query).TryGetValue("MatrOpr", out var _matrOpr) && QueryHelpers.ParseQuery(uri.Query).TryGetValue("UserAuthKey", out var _authKey))
{
idOPeratore = _matrOpr;
authKey = _authKey;
}
operatore = MIService.ElencoOperatori(int.Parse(idOPeratore), MIService.DeriptData(authKey));
if(operatore.Count == 1)
{
logged = "success";
NavManager.NavigateTo("Acquisizione");
}
else
{
logged = "not success";
}
}
}
}
MP.INVE/Pages/OperatoreLogin.razor.cs
+1 -1
View File
@@ -66,7 +66,7 @@ namespace MP.INVE.Pages
if (elencoOperatori.Count == 1)
{
NavManager.NavigateTo("/Starter", true);
NavManager.NavigateTo("InveSession", true);
localStorage.SetItemAsync("MatrOpr", sessionOpr);
}
else
MP.INVE/Pages/Starter.razor.cs
+4 -2
View File
@@ -126,7 +126,7 @@ namespace MP.INVE.Pages
Nascosto = false
};
await MIDataservice.InsertNewMag(newMag);
NavManager.NavigateTo("Elencomagazzini", true);
NavManager.NavigateTo(NavManager.Uri, true);
//await MIDataservice.FlushRedisCache();
await reloadData();
}
@@ -135,6 +135,7 @@ namespace MP.INVE.Pages
closeNew();
}
}
#if false
private async Task deleteMag(AnagMagModel mag)
{
@@ -145,7 +146,8 @@ namespace MP.INVE.Pages
NavManager.NavigateTo("Elencomagazzini", true);
await reloadData();
}
}
}
#endif
protected void ForceReload(int newNum)
{
numRecord = newNum;
MP.INVE/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOINVE </i>
<h4>Versione: 6.16.2211.2115</h4>
<h4>Versione: 6.16.2211.2116</h4>
<br /> Note di rilascio:
<ul>
<li>
MP.INVE/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2211.2115
6.16.2211.2116
MP.INVE/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2211.2115</version>
<version>6.16.2211.2116</version>
<url>https://nexus.steamware.net/repository/SWS/MP-INVE/stable/LAST/MP.INVE.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-INVE/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.INVE/appsettings.json
+2 -2
View File
@@ -18,7 +18,7 @@
"cacheCheckArtUsato": "2",
"redisLongTimeCache": "15",
"MpIoBaseUrl": "http://localhost:20967/",
"BaseUrl": "https://localhost:7212/Acquisizione?",
"BaseUrlJumper": "https://iis02.egalware.com/MP/jumper?"
"BaseUrl": "https://iis01.egalware.com/mp/inve/Acquisizione?",
"BaseUrlJumper": "https://iis01.egalware.com/jumper?"
}
}