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

ok button delete commenti

Browse Source
This commit is contained in:
zaccaria.majid
2023-11-03 15:30:24 +01:00
parent 0c5c6ff529
commit c641d2e381
12 changed files with 94 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB-SERV/Components/LongStopList.razor
+23 -19
View File
@@ -1,15 +1,15 @@
@if (currFnq != null)
{
<div class="@cardCss my-1 p-2">
<div class="cardObj">
<div class="@setSemaforo(currFnq.Semaforo)" style="border-radius: 0.375rem 0.375rem 0 0;">
<div class="@divCss my-1 p-2 d-flex justify-content-between">
<div class="@cardBorder @cardCss">
<div class="@setSemaforo(currFnq.Semaforo)" style="border-radius: 0.375rem 0 0 0;">
<div @onclick="SelectFermo">
<div class="text-start fw-bold text-center" style="font-size: 1.3rem;">
@currFnq.Stato
</div>
</div>
</div>
<div class="d-flex justify-content-between @cardContentCss">
<div class="d-flex justify-content-between">
<div class="d-flex justify-content-between text-light p-2 col-10" @onclick="SelectFermo">
<div class="col-6">
<div class="d-flex justify-content-between">
@@ -46,22 +46,11 @@
@if (currNotes.Count > 0)
{
<div class="col-2 d-flex align-items-center" @onclick="()=>setComments()">
<i class="fa-solid @chevronDir"></i>
<button class="btn btn-sm btn-light text-dark">
<i class="fa-solid @chevronDir"></i>
</button>
</div>
}
@if (showComments)
{
<div class="col-12 overflow-auto p-1 longStopListNotes">
@foreach (var note in currNotes)
{
<div class="d-flex justify-content-between align-items-center mb-1 col-12">
<button class="btn btn-sm btn-info h-50"><i class="fa-solid fa-pen-to-square"></i></button>
<span class="p-1">@note.Value</span>
<button class="btn btn-sm btn-danger h-50"><i class="fa-solid fa-trash-can"></i></button>
</div>
}
</div>
}
}
</div>
<div>
@if (currNotes.Count > 0)
@@ -98,6 +87,21 @@
}
</div>
</div>
<div>
@if (showComments)
{
<div class="col-12 overflow-auto p-1 longStopListNotes border-end border-top border-bottom border-2 @borderColor p-2 rounded-end">
@foreach (var note in currNotes)
{
<div class="d-flex justify-content-between align-items-center mb-1 col-12">
<button class="btn btn-sm btn-info h-50"><i class="fa-solid fa-pen-to-square"></i></button>
<span class="p-1">@note.Value</span>
<button class="btn btn-sm btn-danger h-50" @onclick="()=>doDelete(note)"><i class="fa-solid fa-trash-can"></i></button>
</div>
}
</div>
}
</div>
</div>
}
MP-TAB-SERV/Components/LongStopList.razor.cs
+39 -1
View File
@@ -1,6 +1,8 @@
using global::Microsoft.AspNetCore.Components;
using Microsoft.JSInterop;
using MP.Data.DatabaseModels;
using MP.Data.Services;
using System.Data;
using System.Reflection.Metadata;
namespace MP_TAB_SERV.Components
@@ -13,6 +15,8 @@ namespace MP_TAB_SERV.Components
public FermiNonQualModel currFnq { get; set; } = new FermiNonQualModel();
[Parameter]
public List<CommentiModel> currNotes { get; set; } = new List<CommentiModel>();
[Parameter]
public EventCallback<bool> E_relData { get; set; }
#endregion Public Properties
@@ -24,6 +28,9 @@ namespace MP_TAB_SERV.Components
[Inject]
protected NavigationManager NavMan { get; set; } = null!;
[Inject]
protected IJSRuntime JSRuntime { get; set; } = null!;
#endregion Protected Properties
#region Protected Methods
@@ -46,10 +53,16 @@ namespace MP_TAB_SERV.Components
protected bool showComments { get; set; } = false;
protected string cardCss
protected string divCss
{
get => showComments ? "col-12" : "col-6 col-sm-6 col-lg-2";
}
protected string cardCss
{
get => showComments ? "col-6 col-sm-6 col-lg-2" : "col-12";
}
protected string cardContentCss
{
get => showComments ? "col-6" : "col-12";
@@ -65,23 +78,48 @@ namespace MP_TAB_SERV.Components
showComments = !showComments;
}
protected string cardBorder
{
get => showComments ? "cardObjNoBL" : "cardObj";
}
protected string borderColor { get; set; } = "";
private string setSemaforo(string sem)
{
string answ = "";
if (sem == "sBl")
{
answ = "bg-primary text-warning";
borderColor = "border-primary";
}
else if (sem == "sGr")
{
answ = "bg-secondary text-dark";
borderColor = "border-secondary";
}
else if (sem == "sGi")
{
answ = "bg-warning text-dark";
borderColor = "border-warning";
}
return answ;
}
[Inject]
protected TabDataService TabServ { get; set; } = null!;
protected async Task doDelete(CommentiModel currNote)
{
if (!await JSRuntime.InvokeAsync<bool>("confirm", $"Sicuro di voler eliminare il seguente commento?{Environment.NewLine}[{currNote.Value}]"))
return;
var done = await TabServ.EvListDelete(currNote.IdxMacchina, currNote.InizioStato, currNote.IdxTipo);
if (done)
{
await E_relData.InvokeAsync(true);
}
}
#endregion Private Methods
}
MP-TAB-SERV/Components/NotesMan.razor
+1 -1
View File
@@ -45,7 +45,7 @@
<div class="row flex-wrap">
@foreach (var item in RecordListFull)
{
<LongStopList currFnq="@item.Fermata" currNotes="@item.CommentiFermata"></LongStopList>
<LongStopList currFnq="@item.Fermata" currNotes="@item.CommentiFermata" E_relData="reloadAfterDelOrUpd"></LongStopList>
}
</div>
MP-TAB-SERV/Components/NotesMan.razor.cs
+9
View File
@@ -85,6 +85,15 @@ namespace MP_TAB_SERV.Components
await ReloadData();
}
protected async Task reloadAfterDelOrUpd(bool rel)
{
if (rel)
{
await ReloadComments();
await InvokeAsync(StateHasChanged);
}
}
protected async Task EditRec(CommentiModel currRec)
{
await Task.Delay(1);
MP-TAB-SERV/Components/ProdConfirm.razor
+1 -1
View File
@@ -13,7 +13,7 @@
{
<div class="px-1 col-8">
<button class="btn btn-sm @ConfBg py-2 px-4" style="width: 100%" @onclick="ToggleConfProd">
<span>@ConfTitle</span>
<i class="fa-solid fa-check pe-1"></i><span>@ConfTitle</span>
</button>
</div>
}
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.311</Version>
<Version>6.16.2311.315</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.2311.311</h4>
<h4>Versione: 6.16.2311.315</h4>
<br /> Note di rilascio:
<ul>
<li>
MP-TAB-SERV/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2311.311
6.16.2311.315
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.311</version>
<version>6.16.2311.315</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-TAB-SERV/wwwroot/css/site.css
+8 -1
View File
@@ -14,6 +14,13 @@ body {
/*height: 100%;*/
flex-shrink: 0;
}
.cardObjNoBL {
border-radius: 0.375rem 0 0 0.375rem;
background: linear-gradient(121deg, rgba(255, 255, 255, 0.2) -0.71%, rgba(255, 255, 255, 0.05) 97.66%);
box-shadow: 0px 4px 24px -1px rgba(0, 0, 0, 0.25);
/*height: 100%;*/
flex-shrink: 0;
}
.cardFullHeight {
border-radius: 0.375rem;
background: linear-gradient(121deg, rgba(255, 255, 255, 0.2) -0.71%, rgba(255, 255, 255, 0.05) 97.66%);
@@ -27,7 +34,7 @@ body {
}
@media (max-width: 640.98px) {
.longStopListNotes {
max-height: 88px;
max-height: 120px;
}
}
.borderStd {
MP-TAB-SERV/wwwroot/css/site.less
+8 -1
View File
@@ -15,6 +15,13 @@ html, body {
/*height: 100%;*/
flex-shrink: 0;
}
.cardObjNoBL {
border-radius: 0.375rem 0 0 0.375rem;
background: linear-gradient(121deg, rgba(255, 255, 255, 0.20) -0.71%, rgba(255, 255, 255, 0.05) 97.66%);
box-shadow: 0px 4px 24px -1px rgba(0, 0, 0, 0.25);
/*height: 100%;*/
flex-shrink: 0;
}
.cardFullHeight{
.cardObj;
@@ -27,7 +34,7 @@ html, body {
@media (max-width: 640.98px) {
.longStopListNotes{
max-height: 88px;
max-height: 120px;
}
}
MP-TAB-SERV/wwwroot/css/site.min.css
Vendored
+1 -1
View File
@@ -1 +1 @@
@import url('open-iconic/font/css/open-iconic-bootstrap.min.css');html,body{font-family:'Open Sans Condensed',sans-serif;background-color:#151321;color:#ededed;}.cardObj{border-radius:.375rem;background:linear-gradient(121deg,rgba(255,255,255,.2) -.71%,rgba(255,255,255,.05) 97.66%);box-shadow:0 4px 24px -1px rgba(0,0,0,.25);flex-shrink:0;}.cardFullHeight{border-radius:.375rem;background:linear-gradient(121deg,rgba(255,255,255,.2) -.71%,rgba(255,255,255,.05) 97.66%);box-shadow:0 4px 24px -1px rgba(0,0,0,.25);flex-shrink:0;height:100%;}.longStopListNotes{height:100%;}@media(max-width:640.98px){.longStopListNotes{max-height:88px;}}.borderStd{border-radius:.375rem;}.table-dark{--bs-table-color:#fff;--bs-table-bg:transparent;--bs-table-border-color:#4d5154;--bs-table-striped-bg:#2c3034;--bs-table-striped-color:#fff;--bs-table-active-bg:#373b3e;--bs-table-active-color:#fff;--bs-table-hover-bg:#323539;--bs-table-hover-color:#fff;color:var(--bs-table-color);border-color:var(--bs-table-border-color);}h1:focus{outline:0;}a,.btn-link{color:#0071c1;}.btn-primary{color:#fff;background-color:#1b6ec2;border-color:#1861ac;}.content{padding-top:1.1rem;}.valid.modified:not([type=checkbox]){outline:1px solid #26b050;}.invalid{outline:1px solid #f00;}.validation-message{color:#f00;}#blazor-error-ui{background:#ffffe0;bottom:0;box-shadow:0 -1px 2px rgba(0,0,0,.2);display:none;left:0;padding:.6rem 1.25rem .7rem 1.25rem;position:fixed;width:100%;z-index:1000;}#blazor-error-ui .dismiss{cursor:pointer;position:absolute;right:.75rem;top:.5rem;}.blazor-error-boundary{background:url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem,#b32121;padding:1rem 1rem 1rem 3.7rem;color:#fff;}.blazor-error-boundary::after{content:"An error has occurred.";}
@import url('open-iconic/font/css/open-iconic-bootstrap.min.css');html,body{font-family:'Open Sans Condensed',sans-serif;background-color:#151321;color:#ededed;}.cardObj{border-radius:.375rem;background:linear-gradient(121deg,rgba(255,255,255,.2) -.71%,rgba(255,255,255,.05) 97.66%);box-shadow:0 4px 24px -1px rgba(0,0,0,.25);flex-shrink:0;}.cardObjNoBL{border-radius:.375rem 0 0 .375rem;background:linear-gradient(121deg,rgba(255,255,255,.2) -.71%,rgba(255,255,255,.05) 97.66%);box-shadow:0 4px 24px -1px rgba(0,0,0,.25);flex-shrink:0;}.cardFullHeight{border-radius:.375rem;background:linear-gradient(121deg,rgba(255,255,255,.2) -.71%,rgba(255,255,255,.05) 97.66%);box-shadow:0 4px 24px -1px rgba(0,0,0,.25);flex-shrink:0;height:100%;}.longStopListNotes{height:100%;}@media(max-width:640.98px){.longStopListNotes{max-height:120px;}}.borderStd{border-radius:.375rem;}.table-dark{--bs-table-color:#fff;--bs-table-bg:transparent;--bs-table-border-color:#4d5154;--bs-table-striped-bg:#2c3034;--bs-table-striped-color:#fff;--bs-table-active-bg:#373b3e;--bs-table-active-color:#fff;--bs-table-hover-bg:#323539;--bs-table-hover-color:#fff;color:var(--bs-table-color);border-color:var(--bs-table-border-color);}h1:focus{outline:0;}a,.btn-link{color:#0071c1;}.btn-primary{color:#fff;background-color:#1b6ec2;border-color:#1861ac;}.content{padding-top:1.1rem;}.valid.modified:not([type=checkbox]){outline:1px solid #26b050;}.invalid{outline:1px solid #f00;}.validation-message{color:#f00;}#blazor-error-ui{background:#ffffe0;bottom:0;box-shadow:0 -1px 2px rgba(0,0,0,.2);display:none;left:0;padding:.6rem 1.25rem .7rem 1.25rem;position:fixed;width:100%;z-index:1000;}#blazor-error-ui .dismiss{cursor:pointer;position:absolute;right:.75rem;top:.5rem;}.blazor-error-boundary{background:url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem,#b32121;padding:1rem 1rem 1rem 3.7rem;color:#fff;}.blazor-error-boundary::after{content:"An error has occurred.";}