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

Completato editing dichiarazioni

Browse Source
This commit is contained in:
Samuele Locatelli
2023-10-16 19:03:58 +02:00
parent cd21f92538
commit 66bad58f8f
10 changed files with 184 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB-SERV/Components/DeclarEditor.razor
+1 -1
View File
@@ -39,7 +39,7 @@
</div>
</div>
<div class="col-12">
<button class="btn btn-success w-100" @onclick="DoSave"><i class="fa-solid fa-floppy-disk"></i> Salva</button>
<button class="@BtnCss w-100" @onclick="DoSave"><i class="fa-solid fa-floppy-disk"></i> @BtnText</button>
</div>
</div>
</div>
MP-TAB-SERV/Components/DeclarEditor.razor.cs
+65 -26
View File
@@ -12,6 +12,21 @@ namespace MP_TAB_SERV.Components
[Parameter]
public EventCallback<bool> E_Updated { get; set; }
[Parameter]
public RegistroDichiarazioniModel? EditRec
{
get => currRec;
set
{
if (currRec != value && value != null)
{
IsNewRec = false;
ShowDetail = true;
currRec = value;
}
}
}
[Parameter]
public MappaStatoExpl? RecMSE { get; set; } = null;
@@ -19,14 +34,24 @@ namespace MP_TAB_SERV.Components
#region Protected Properties
protected string BtnCss
{
get => IsNewRec ? "btn btn-success" : "btn btn-primary";
}
protected string BtnText
{
get => IsNewRec ? "Salva Nuova Dichiarazione" : "Aggiorna Dichiarazione";
}
protected DateTime DateSel
{
get => dateSel.Round(TimeSpan.FromSeconds(1));
get => currRec.DtRec.Round(TimeSpan.FromSeconds(1));
set
{
if (dateSel != value)
if (currRec.DtRec != value)
{
dateSel = value;
currRec.DtRec = value;
}
}
}
@@ -44,12 +69,12 @@ namespace MP_TAB_SERV.Components
protected string TagCodeSel
{
get => tagCode;
get => currRec.TagCode;
set
{
if (tagCode != value)
if (currRec.TagCode != value)
{
tagCode = value;
currRec.TagCode = value;
}
}
}
@@ -70,26 +95,33 @@ namespace MP_TAB_SERV.Components
protected async Task DoSave()
{
// registro scarto
RegistroDichiarazioniModel newRec = new RegistroDichiarazioniModel()
if (IsNewRec)
{
IdxMacchina = IdxMacc,
DtRec = DateSel,
TagCode = TagCodeSel,
MatrOpr = MatrOpr,
ValString = UserComment
};
// inserisco
await TabServ.RegDichiarInsert(newRec);
// inserisco
await TabServ.RegDichiarInsert(currRec);
}
else
{
// altrimetni update...
await TabServ.RegDichiarUpdate(currRec);
}
// reset
DoReset();
//ToggleCtrl();
ToggleCtrl();
await E_Updated.InvokeAsync(true);
}
protected override async Task OnInitializedAsync()
{
currRec = new RegistroDichiarazioniModel()
{
DtRec = DateTime.Now,
IdxMacchina = IdxMacc,
TagCode = TagCodeSel,
MatrOpr = MatrOpr,
ValString = UserComment
};
await ReloadData();
}
@@ -106,14 +138,22 @@ namespace MP_TAB_SERV.Components
protected void ToggleCtrl()
{
ShowDetail = !ShowDetail;
if (ShowDetail)
DateSel = DateTime.Now;
if (!ShowDetail)
{
DateSel = DateTime.Now;
IsNewRec = true;
UserComment = "";
}
}
#endregion Protected Methods
#region Private Fields
private bool IsNewRec = true;
#endregion Private Fields
#region Private Properties
private string CodArt
@@ -121,7 +161,7 @@ namespace MP_TAB_SERV.Components
get => RecMSE != null ? RecMSE.CodArticolo : "";
}
private DateTime dateSel { get; set; } = DateTime.Now;
private RegistroDichiarazioniModel currRec { get; set; } = new RegistroDichiarazioniModel();
private string IdxMacc
{
@@ -141,18 +181,16 @@ namespace MP_TAB_SERV.Components
get => MServ.MatrOpr;
}
private bool ShowDetail { get; set; } = true;
private string tagCode { get; set; } = "";
private string userComment { get; set; } = "";
private bool ShowDetail { get; set; } = false;
private string UserComment
{
get => userComment.Trim();
get => currRec.ValString.Trim();
set
{
if (userComment != value)
if (currRec.ValString != value)
{
userComment = value;
currRec.ValString = value;
}
}
}
@@ -166,6 +204,7 @@ namespace MP_TAB_SERV.Components
UserComment = "";
DateSel = DateTime.Now;
ShowDetail = true;
IsNewRec = true;
}
#endregion Private Methods
MP-TAB-SERV/Components/DeclarMan.razor
+3 -5
View File
@@ -1,6 +1,4 @@
<MachSel RecMSE="RecMSE" E_MachSel="SetMacc"></MachSel>
<MachSel RecMSE="RecMSE" E_MachSel="SetMacc"></MachSel>
<div class="row">
<div class="col-6">
<h2>Tipo Selezione</h2>
@@ -24,7 +22,7 @@ else
<ShowProcessing Message="Caricamento" IsProcessing="@isProcessing"></ShowProcessing>
<div class="card">
<div class="card-header bg-dark">
<DeclarEditor RecMSE="@RecMSE" E_Updated="doUpdate"></DeclarEditor>
<DeclarEditor RecMSE="@RecMSE" EditRec="CurrRec" E_Updated="doUpdate"></DeclarEditor>
</div>
<div class="card-body bg-secondary p-1">
<div class="row">
@@ -46,7 +44,7 @@ else
{
<tr>
<td>
<button class="btn btn-primary"><i class="fa-solid fa-pen"></i></button>
<button class="btn btn-primary" @onclick="()=>SetEdit(item)"><i class="fa-solid fa-pen"></i></button>
</td>
<td>
<i class="@item.CssClass" aria-hidden="true"></i>
MP-TAB-SERV/Components/DeclarMan.razor.cs
+8
View File
@@ -2,6 +2,7 @@ using global::Microsoft.AspNetCore.Components;
using MP.Data.DatabaseModels;
using MP.Data.Services;
using NLog;
using Org.BouncyCastle.Asn1.IsisMtt.X509;
using static EgwCoreLib.Utils.DtUtils;
namespace MP_TAB_SERV.Components
@@ -43,6 +44,11 @@ namespace MP_TAB_SERV.Components
protected List<RegistroDichiarazioniModel> ListComplete { get; set; } = new List<RegistroDichiarazioniModel>();
protected List<RegistroDichiarazioniModel> ListPaged { get; set; } = new List<RegistroDichiarazioniModel>();
protected void SetEdit(RegistroDichiarazioniModel selRec)
{
CurrRec = selRec;
}
[Inject]
protected MessageService MServ { get; set; } = null!;
@@ -121,6 +127,8 @@ namespace MP_TAB_SERV.Components
#region Private Fields
private RegistroDichiarazioniModel? CurrRec { get; set; } = null;
private static Logger Log = LogManager.GetCurrentClassLogger();
private bool isProcessing = false;
private int NumRecPage = 10;
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.2310.1618</Version>
<Version>6.16.2310.1619</Version>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP_TAB_SERV</RootNamespace>
</PropertyGroup>
MP-TAB-SERV/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2310.1618</h4>
<h4>Versione: 6.16.2310.1619</h4>
<br /> Note di rilascio:
<ul>
<li>
MP-TAB-SERV/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2310.1618
6.16.2310.1619
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.2310.1618</version>
<version>6.16.2310.1619</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/Controllers/MpTabController.cs
+80 -54
View File
@@ -774,6 +774,86 @@ namespace MP.Data.Controllers
return fatto;
}
/// <summary>
/// Aggiunta record RegistroScarti
/// </summary>
/// <param name="idxMacchina"></param>
/// <param name="tagCode"></param>
/// <param name="matrOpr"></param>
/// <param name="dataFrom"></param>
/// <param name="dataTo"></param>
/// <returns></returns>
public List<RegistroDichiarazioniModel> RegDichiarGetFilt(string idxMacchina, string tagCode, int matrOpr, int idxODL, DateTime dataFrom, DateTime dataTo)
{
List<RegistroDichiarazioniModel> dbResult = new List<RegistroDichiarazioniModel>();
using (var dbCtx = new MoonProContext(_configuration))
{
var TagCode = new SqlParameter("@TagCode", tagCode);
var IdxMacchina = new SqlParameter("@IdxMacchina", idxMacchina);
var MatrOpr = new SqlParameter("@MatrOpr", matrOpr);
var IdxODL = new SqlParameter("@IdxODL", idxODL);
var DtFrom = new SqlParameter("@DataFrom", dataFrom);
var DtTo = new SqlParameter("@DataTo", dataTo);
dbResult = dbCtx
.DbSetRegDich
.FromSqlRaw("EXEC stp_DD_getFilt @TagCode, @IdxMacchina, @MatrOpr, @IdxODL, @DataFrom, @DataTo", TagCode, IdxMacchina, MatrOpr, IdxODL, DtFrom, DtTo)
.AsNoTracking()
.ToList();
}
return dbResult;
}
/// <summary>
/// Aggiunta record Registro Dichiarazioni
/// </summary>
/// <param name="newRec"></param>
/// <returns></returns>
public async Task<bool> RegDichiarInsert(RegistroDichiarazioniModel newRec)
{
bool fatto = false;
using (var dbCtx = new MoonProContext(_configuration))
{
var TagCode = new SqlParameter("@TagCode", newRec.TagCode);
var IdxMacchina = new SqlParameter("@IdxMacchina", newRec.IdxMacchina);
var DtRec = new SqlParameter("@DtRec", newRec.DtRec);
var MatrOpr = new SqlParameter("@MatrOpr", newRec.MatrOpr);
var ValString = new SqlParameter("@ValString", newRec.ValString);
var result = await dbCtx
.Database
.ExecuteSqlRawAsync("exec dbo.stp_DD_insertQuery @TagCode, @IdxMacchina, @DtRec, @MatrOpr, @ValString", TagCode, IdxMacchina, DtRec, MatrOpr, ValString);
// indico eseguito!
fatto = result > 0;
}
return fatto;
}
/// <summary>
/// Update record Registro Dichiarazioni
/// </summary>
/// <param name="newRec"></param>
/// <returns></returns>
public async Task<bool> RegDichiarUpdate(RegistroDichiarazioniModel newRec)
{
bool fatto = false;
using (var dbCtx = new MoonProContext(_configuration))
{
var Original_IdxDich = new SqlParameter("@Original_IdxDich", newRec.IdxDich);
var DtRec = new SqlParameter("@DtRec", newRec.DtRec);
var TagCode = new SqlParameter("@TagCode", newRec.TagCode);
var ValString = new SqlParameter("@ValString", newRec.ValString);
var MatrOpr = new SqlParameter("@MatrOpr", newRec.MatrOpr);
var result = await dbCtx
.Database
.ExecuteSqlRawAsync("exec dbo.stp_DD_updateQuery @Original_IdxDich, @DtRec, @TagCode, @ValString, @MatrOpr", Original_IdxDich, DtRec, TagCode, ValString, MatrOpr);
// indico eseguito!
fatto = result > 0;
}
return fatto;
}
/// <summary>
/// Aggiunta record RegistroScarti
/// </summary>
@@ -829,60 +909,6 @@ namespace MP.Data.Controllers
return fatto;
}
/// <summary>
/// Aggiunta record Registro Dichiarazioni
/// </summary>
/// <param name="newRec"></param>
/// <returns></returns>
public async Task<bool> RegDichiarInsert(RegistroDichiarazioniModel newRec)
{
bool fatto = false;
using (var dbCtx = new MoonProContext(_configuration))
{
var TagCode = new SqlParameter("@TagCode", newRec.TagCode);
var IdxMacchina = new SqlParameter("@IdxMacchina", newRec.IdxMacchina);
var DtRec = new SqlParameter("@DtRec", newRec.DtRec);
var MatrOpr = new SqlParameter("@MatrOpr", newRec.MatrOpr);
var ValString = new SqlParameter("@ValString", newRec.ValString);
var result = await dbCtx
.Database
.ExecuteSqlRawAsync("exec dbo.stp_DD_insertQuery @TagCode, @IdxMacchina, @DtRec, @MatrOpr, @ValString", TagCode, IdxMacchina, DtRec, MatrOpr, ValString);
// indico eseguito!
fatto = result > 0;
}
return fatto;
}
/// <summary>
/// Aggiunta record RegistroScarti
/// </summary>
/// <param name="idxMacchina"></param>
/// <param name="tagCode"></param>
/// <param name="matrOpr"></param>
/// <param name="dataFrom"></param>
/// <param name="dataTo"></param>
/// <returns></returns>
public List<RegistroDichiarazioniModel> RegDichiarGetFilt(string idxMacchina, string tagCode, int matrOpr, int idxODL, DateTime dataFrom, DateTime dataTo)
{
List<RegistroDichiarazioniModel> dbResult = new List<RegistroDichiarazioniModel>();
using (var dbCtx = new MoonProContext(_configuration))
{
var TagCode = new SqlParameter("@TagCode", tagCode);
var IdxMacchina = new SqlParameter("@IdxMacchina", idxMacchina);
var MatrOpr = new SqlParameter("@MatrOpr", matrOpr);
var IdxODL = new SqlParameter("@IdxODL", idxODL);
var DtFrom = new SqlParameter("@DataFrom", dataFrom);
var DtTo = new SqlParameter("@DataTo", dataTo);
dbResult = dbCtx
.DbSetRegDich
.FromSqlRaw("EXEC stp_DD_getFilt @TagCode, @IdxMacchina, @MatrOpr, @IdxODL, @DataFrom, @DataTo", TagCode, IdxMacchina, MatrOpr, IdxODL, DtFrom, DtTo)
.AsNoTracking()
.ToList();
}
return dbResult;
}
/// <summary>
/// Effettua ricalcolo MSE x macchina indicata
/// </summary>
MP.Data/Services/TabDataService.cs
+23
View File
@@ -794,6 +794,29 @@ namespace MP.Data.Services
return answ;
}
/// <summary>
/// Aggiunta record Registro Dichiarazioni
/// </summary>
/// <param name="newRec"></param>
/// <returns></returns>
public async Task<bool> RegDichiarUpdate(RegistroDichiarazioniModel newRec)
{
bool answ = false;
try
{
// inserisco evento
answ = await dbTabController.RegDichiarUpdate(newRec);
// reset cache eventi/commenti
await FlushCache("RegDichiar");
}
catch (Exception exc)
{
string logMsg = $"Eccezione in RegDichiarUpdate | macchina: {newRec.IdxMacchina} | DtRec: {newRec.DtRec} | TagCode: {newRec.TagCode} | MatrOpr: {newRec.MatrOpr} | ValString {newRec.ValString}{Environment.NewLine}{exc}";
Log.Error(logMsg);
}
return answ;
}
/// <summary>
/// Restituisce elenco RS filtrato
/// </summary>