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

OK test riattrezzaggio

Browse Source
This commit is contained in:
Samuele Locatelli
2023-11-15 20:05:50 +01:00
parent a14256a462
commit 3890c6a100
10 changed files with 160 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB-SERV/Components/OdlMan.razor
+20 -2
View File
@@ -13,7 +13,7 @@
@if (isSlave)
{
<div class="col-12 my-2">
<div class="btn btn-warning w-100">
<div class="btn btn-danger text-warning w-100">
<div class="fs-1">@(Traduci("lblWarnHeadSlave"))</div>
<div class="fs-4">@(Traduci("lblWarnBodySlave"))</div>
</div>
@@ -23,6 +23,25 @@
{
@if (needConfProd)
{
@if (showSplitOdlOnTavVal || showReopOdlTav)
{
<div class="col-12 py-3">
<div class="row bg-danger">
<div class="col-12 col-md-6">
@if (showSplitOdlOnTavVal)
{
<button class="btn btn-lg btn-warning w-100" @onclick="OdlSetSameAsOtherTav"><i class="fa fa-check"></i> Attrezza stesso ODL da altra tavola <i class="fa fa-check"></i></button>
}
</div>
<div class="col-12 col-md-6">
@if (showReopOdlTav)
{
<button class="btn btn-lg btn-info w-100" @onclick="OdlReopenTav"><i class="fa fa-exclamation-triangle"></i> Riprendi ODL chiuso su tavola <i class="fa-solid fa-check me-1"></i></button>
}
</div>
</div>
</div>
}
<div class="col-12 my-2">
<div class="btn btn-danger w-100">
<div class="fs-1">@lblWarnHead</div>
@@ -69,7 +88,6 @@
{
<div class="col-12 col-md-6 p-2">
<button class="btn btn-lg btn-danger w-100" @onclick="OdlAnnullaSetup">Annulla Setup ODL <i class="fa-solid fa-ban me-1"></i></button>
<button class="btn btn-lg btn-danger w-100" @onclick="OdlAnnullaSetup">Annulla Setup ODL <i class="fa-solid fa-ban me-1"></i></button>
</div>
}
MP-TAB-SERV/Components/OdlMan.razor.cs
+1 -1
View File
@@ -875,7 +875,7 @@ namespace MP_TAB_SERV.Components
RecMSE = TabDServ.MseGetSub(IdxMaccParent, selIdxMacc, true);
await ReloadData(true);
await DoUpdate();
if (showOdlDetail)
if (showOdlDetail || inAttr)
{
await ReloadXDL(true);
}
MP-TAB-SERV/MP-TAB-SERV.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<Version>6.16.2311.1417</Version>
<Version>6.16.2311.1519</Version>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP_TAB_SERV</RootNamespace>
</PropertyGroup>
MP-TAB-SERV/Pages/RegNewDevice.razor
-1
View File
@@ -23,7 +23,6 @@
</BarcodeReader>
<div @ref="barcodeReaderCustom.Element" class="d-flex justify-content-center">
@* <div style="width: 480px; max-width: 100%"> *@
<div class="col-12 col-md-8 col-lg-6">
<button class="btn btn-outline-success p-2 m-1 w-25" data-action="startButton">Scan</button>
<button class="btn btn-outline-success p-2 m-1 w-25" data-action="resetButton">Reset</button>
MP-TAB-SERV/Pages/StatusMap.razor.cs
+43 -65
View File
@@ -10,6 +10,20 @@ namespace MP_TAB_SERV.Pages
{
public partial class StatusMap
{
#region Public Classes
public class WindowDimension
{
#region Public Properties
public int Height { get; set; }
public int Width { get; set; }
#endregion Public Properties
}
#endregion Public Classes
#region Protected Fields
protected bool _showCard = false;
@@ -25,13 +39,18 @@ namespace MP_TAB_SERV.Pages
[Inject]
protected IConfiguration config { get; set; } = null!;
protected int Height { get; set; } = 0;
protected bool isCalcSize { get; set; } = false;
[Inject]
protected IJSRuntime JSRuntime { get; set; } = null!;
[Inject]
protected StatusData MDataService { get; set; } = null!;
[Inject]
protected MessageService MServ { get; set; } = null!;
[Inject]
protected IJSRuntime JSRuntime{ get; set; } = null!;
protected MessageService MsgServ { get; set; } = null!;
protected bool ShowCard
{
@@ -46,50 +65,19 @@ namespace MP_TAB_SERV.Pages
[Inject]
protected TabDataService TabDServ { get; set; } = null!;
protected int Width { get; set; } = 0;
#endregion Protected Properties
#region Protected Methods
/// <summary>
/// Recupera da conf eventuale setup tag dell'IOB indicato
/// </summary>
/// <param name="codIob"></param>
/// <returns></returns>
protected List<TagData>? getIobTag(string codIob)
protected async Task getWDim()
{
List<TagData>? answ = null;
if (MDataService.currTagConf != null)
{
// cerco x chiave IOB...
if (MDataService.currTagConf.ContainsKey(codIob))
{
answ = MDataService.currTagConf[codIob];
}
}
return answ;
var dimension = await JSRuntime.InvokeAsync<WindowDimension>("getWindowDimensions");
Height = dimension.Height;
Width = dimension.Width;
}
/// <summary>
/// Recupera da redis (in una chiamata soltanto) tutti i valori richiesti e compone un
/// dizionario x ottimizzare visualizzazione
/// </summary>
/// <param name="codIob"></param>
/// <returns></returns>
protected Dictionary<string, string> getTagVal(string codIob)
{
Dictionary<string, string> answ = new Dictionary<string, string>();
// recupero conf tags...
var currTags = getIobTag(codIob);
if (currTags != null && currTags.Count > 0)
{
// FIXME TODO !!!! FARE !!!! - da verificare
answ = currTags.ToDictionary(x => x.TagLocation, x => MDataService.getTagConf(x.TagLocation));
}
return answ;
}
protected bool isCalcSize { get; set; } = false;
protected override async Task OnAfterRenderAsync(bool firstRender)
{
if (firstRender)
@@ -102,24 +90,20 @@ namespace MP_TAB_SERV.Pages
if (ListMSE != null)
{
// salvo in LocalStorage...
await MServ.SaveMse(ListMSE);
await MsgServ.SaveMse(ListMSE);
}
}
protected override void OnInitialized()
{
var df = MServ.UserPrefGet("DefCardMode");
ShowCard = df == "shrink" ? false : true;
isCalcSize = true;
setDefaults();
ListMSE = null;
SetupConf();
}
protected void SaveData(List<MappaStatoExpl> newList)
{
//await Task.Delay(1);
ListMSE = newList;
//await InvokeAsync(StateHasChanged);
}
#endregion Protected Methods
@@ -140,6 +124,19 @@ namespace MP_TAB_SERV.Pages
#region Private Methods
private void setDefaults()
{
string df = MsgServ.UserPrefSetup("DefCardMode", "full");
baseLang = MsgServ.UserPrefSetup("Lang", "IT");
tcMode = MsgServ.UserPrefSetup("TcMode", "ms");
ShowCard = df == "shrink" ? false : true;
isCalcSize = true;
}
private string baseLang { get; set; } = "";
private string tcMode { get; set; } = "";
private void SetupConf()
{
// sistemo i parametri opzionali...
@@ -149,24 +146,5 @@ namespace MP_TAB_SERV.Pages
}
#endregion Private Methods
protected int Width { get; set; } = 0;
protected int Height { get; set; } = 0;
public class WindowDimension
{
#region Public Properties
public int Height { get; set; }
public int Width { get; set; }
#endregion Public Properties
}
protected async Task getWDim()
{
var dimension = await JSRuntime.InvokeAsync<WindowDimension>("getWindowDimensions");
Height = dimension.Height;
Width = dimension.Width;
}
}
}
MP-TAB-SERV/Pages/User.razor
+4 -16
View File
@@ -196,7 +196,7 @@
}
}
protected string _langIns { get; set; } = "";
protected string _langIns { get; set; } = "EN";
protected string langIns
{
@@ -246,21 +246,9 @@
}
protected async override Task OnInitializedAsync()
{
var tcPrefItem = MsgServ.UserPrefGet("TcMode");
if (tcPrefItem != null)
{
tcModIns = tcPrefItem;
}
var langPrefItem = MsgServ.UserPrefGet("Lang");
if (langPrefItem != null)
{
langIns = langPrefItem;
}
var defCardPrefItem = MsgServ.UserPrefGet("DefCardMode");
if (defCardPrefItem != null)
{
defCardModeIns = defCardPrefItem;
}
tcModIns = MsgServ.UserPrefSetup("TcMode", "ms");
langIns = MsgServ.UserPrefSetup("Lang", "IT");
defCardModeIns = MsgServ.UserPrefSetup("DefCardMode", "full");
await Task.Delay(1);
if (string.IsNullOrEmpty(currIpv4))
{
MP-TAB-SERV/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2311.1417</h4>
<h4>Versione: 6.16.2311.1519</h4>
<br /> Note di rilascio:
<ul>
<li>
MP-TAB-SERV/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2311.1417
6.16.2311.1519
MP-TAB-SERV/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2311.1417</version>
<version>6.16.2311.1519</version>
<url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.Data/Services/MessageService.cs
+88 -71
View File
@@ -212,6 +212,32 @@ namespace MP.Data.Services
await sessionStore.SetItemAsync(KeyCommText, Valore);
}
public string DecryptData(string encData)
{
return SteamCrypto.DecryptString(encData, Constants.passPhrase);
}
public string EncryptData(string rawData)
{
return SteamCrypto.EncryptString(rawData, Constants.passPhrase);
}
/// <summary>
/// Restituisce il record OperatoreDTO da localstorage
/// </summary>
/// <returns></returns>
public async Task<string> GetCurrOperDtoAsync()
{
string answ = "";
var result = await localStorage.GetItemAsync<string>("currTkn");
if (result != null)
{
//var data = JsonConvert.DeserializeObject<userTknDTO>(result);
answ = result;
}
return answ;
}
/// <summary>
/// Restituisce il valore Ipv4 del Device da localstorage
/// </summary>
@@ -242,6 +268,21 @@ namespace MP.Data.Services
return answ;
}
/// <summary>
/// Restituisce ultima matrOpr registrata da localstorage
/// </summary>
/// <returns></returns>
public async Task<int> GetLastMatrOprAsync()
{
int answ = -1;
var result = await localStorage.GetItemAsync<string>("lastMatrOpr");
if (!string.IsNullOrEmpty(result))
{
answ = int.Parse(result);
}
return answ;
}
/// <summary>
/// Recupero dati MSE x macchina
/// </summary>
@@ -300,6 +341,18 @@ namespace MP.Data.Services
return hasKey;
}
/// <summary>
/// scrive il record OperatoreDTO nel localstorage
/// </summary>
/// <returns></returns>
public async Task<bool> SetCurrOperDtoAsync(string currTkn)
{
bool answ = false;
await localStorage.SetItemAsync("currTkn", currTkn);
answ = true;
return answ;
}
/// <summary>
/// Scrive il valore di IPV4 del device nel localstoragee
/// </summary>
@@ -340,6 +393,17 @@ namespace MP.Data.Services
return answ;
}
/// <summary>
/// Salva matrOpr nel localstorage
/// </summary>
/// <returns></returns>
public async Task<bool> SetLastMatrOprAsync(int matrOpr)
{
bool answ = false;
await localStorage.SetItemAsync("lastMatrOpr", matrOpr);
answ = true;
return answ;
}
/// <summary>
/// Recupero singola preferenza utente
@@ -379,6 +443,30 @@ namespace MP.Data.Services
return done;
}
/// <summary>
/// Recupero singola preferenza utente se presente, oppure imposto quella di default
/// indicata e la rendo
/// </summary>
/// <param name="chiave"></param>
/// <returns></returns>
public string UserPrefSetup(string chiave, string defValue)
{
string answ = defValue;
var currDict = UsersPrefDict;
if (currDict.ContainsKey(chiave))
{
answ = currDict[chiave];
}
else
{
if (MatrOpr > 0)
{
UserPrefSave(chiave, defValue);
}
}
return answ;
}
#endregion Public Methods
#region Protected Fields
@@ -410,18 +498,7 @@ namespace MP.Data.Services
#region Private Fields
public string DecryptData(string encData)
{
return SteamCrypto.DecryptString(encData, Constants.passPhrase);
}
private AnagOperatoriModel? _rigaOper;
public string EncryptData(string rawData)
{
return SteamCrypto.EncryptString(rawData, Constants.passPhrase);
}
/// <summary>
/// Durata cache lunga IN SECONDI
@@ -495,66 +572,6 @@ namespace MP.Data.Services
return fatto;
}
/// <summary>
/// Restituisce il record OperatoreDTO da localstorage
/// </summary>
/// <returns></returns>
public async Task<string> GetCurrOperDtoAsync()
{
string answ = "";
var result = await localStorage.GetItemAsync<string>("currTkn");
if (result != null)
{
//var data = JsonConvert.DeserializeObject<userTknDTO>(result);
answ = result;
}
return answ;
}
/// <summary>
/// Restituisce ultima matrOpr registrata da localstorage
/// </summary>
/// <returns></returns>
public async Task<int> GetLastMatrOprAsync()
{
int answ = -1;
var result = await localStorage.GetItemAsync<string>("lastMatrOpr");
if (!string.IsNullOrEmpty(result))
{
answ = int.Parse(result);
}
return answ;
}
/// <summary>
/// Salva matrOpr nel localstorage
/// </summary>
/// <returns></returns>
public async Task<bool> SetLastMatrOprAsync(int matrOpr)
{
bool answ = false;
await localStorage.SetItemAsync("lastMatrOpr", matrOpr);
answ = true;
return answ;
}
/// <summary>
/// scrive il record OperatoreDTO nel localstorage
/// </summary>
/// <returns></returns>
public async Task<bool> SetCurrOperDtoAsync(string currTkn)
{
bool answ = false;
await localStorage.SetItemAsync("currTkn", currTkn);
answ = true;
return answ;
}
#endregion Private Methods
}
}