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
2023-11-06 15:49:33 +01:00
parent 6a8c854c87 4ea1afdd35
commit 7d4e9afa0a
5 changed files with 36 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB-SERV/Components/LongStopList.razor
+3 -36
View File
@@ -2,6 +2,7 @@
{
<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;">
@@ -52,49 +53,15 @@
</div>
}
</div>
<div>
@if (currNotes.Count > 0)
{
@*<div class="accordion" id="@($"{currFnq.IdxMacchina}_{currFnq.InizioStato.ToString("dd_mm_yy")}")">
<div class="accordion-item">
<h2 class="accordion-header" id="@($"{currFnq.IdxMacchina}_{currFnq.InizioStato.ToString("dd_mm_yy")}One")">
<button class="accordion-button collapsed borderStd p-1 " type="button" data-bs-toggle="collapse" data-bs-target="#@($"collapse_{currFnq.IdxMacchina}_{currFnq.InizioStato.ToString("dd_mm_yy")}")" aria-expanded="false" aria-controls="@($"collapse_{currFnq.IdxMacchina}_{currFnq.InizioStato.ToString("dd_mm_yy")}")">
@($"{currNotes.Count} commenti")
</button>
</h2>
<div id="@($"collapse_{currFnq.IdxMacchina}_{currFnq.InizioStato.ToString("dd_mm_yy")}")" class="accordion-collapse collapse" aria-labelledby="headingOne" data-bs-parent="@($"#{currFnq.IdxMacchina}_{currFnq.InizioStato.ToString("dd_mm_yy")}")">
<div class="accordion-body p-1">
@foreach (var note in currNotes)
{
<div class="d-flex justify-content-between mb-1">
<button class="btn btn-sm btn-info">C</button>
<span class="p-1">@note.Value</span>
<button class="btn btn-sm btn-danger">D</button>
</div>
}
</div>
</div>
</div>
</div>*@
}
else
{
@*<div>
<div class="borderStd p-1" style="background-color: #6C757D;">
@($"{currNotes.Count} commenti")
</div>
</div>*@
}
</div>
</div>
<div>
<div class="w-100">
@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>
<button class="btn btn-sm btn-info h-50" @onclick="()=>doSet2Edit(note)"><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>
MP-TAB-SERV/Components/LongStopList.razor.cs
+6
View File
@@ -17,6 +17,8 @@ namespace MP_TAB_SERV.Components
public List<CommentiModel> currNotes { get; set; } = new List<CommentiModel>();
[Parameter]
public EventCallback<bool> E_relData { get; set; }
[Parameter]
public EventCallback<CommentiModel> E_setComm { get; set; }
#endregion Public Properties
@@ -120,6 +122,10 @@ namespace MP_TAB_SERV.Components
}
}
protected async Task doSet2Edit(CommentiModel currNote)
{
await E_setComm.InvokeAsync(currNote);
}
#endregion Private Methods
}
MP-TAB-SERV/Components/NotesEditor.razor.cs
+13
View File
@@ -29,6 +29,19 @@ namespace MP_TAB_SERV.Components
[Parameter]
public bool CanSave { get; set; } = false;
[Parameter]
public CommentiModel? CurrComm
{
set
{
if (value != null)
{
DateSel = value.InizioStato;
UserComment = value.Value;
ShowBtn = false;
}
}
}
[Parameter]
public EventCallback<string> E_CommRec { get; set; }
MP-TAB-SERV/Components/NotesMan.razor
+2 -2
View File
@@ -1,5 +1,5 @@
<NotesEditor CanSave="true" Title="Nuovo Commento" RecMSE="@RecMSE" E_Updated="DoUpdate" CurrRecord="@currEv"></NotesEditor>
<NotesEditor CanSave="true" Title="Nuovo Commento" RecMSE="@RecMSE" E_Updated="DoUpdate" CurrRecord="@currEv" CurrComm="currComm"></NotesEditor>
<div class="row mt-1">
<div class="col-12 pr-1">
@@ -45,7 +45,7 @@
<div class="row flex-wrap">
@foreach (var item in RecordListFull)
{
<LongStopList currFnq="@item.Fermata" currNotes="@item.CommentiFermata" E_relData="reloadAfterDelOrUpd"></LongStopList>
<LongStopList currFnq="@item.Fermata" currNotes="@item.CommentiFermata" E_relData="reloadAfterDelOrUpd" E_setComm="setCurrComm"></LongStopList>
}
</div>
MP-TAB-SERV/Components/NotesMan.razor.cs
+12
View File
@@ -3,6 +3,7 @@ using Microsoft.JSInterop;
using MP.Data.DatabaseModels;
using MP.Data.DTO;
using MP.Data.Services;
using NLog.LayoutRenderers.Wrappers;
namespace MP_TAB_SERV.Components
{
@@ -94,6 +95,17 @@ namespace MP_TAB_SERV.Components
}
}
protected CommentiModel? currComm { get; set; } = null;
protected async Task setCurrComm(CommentiModel _CurrComm)
{
await Task.Delay(1);
if(_CurrComm != null)
{
currComm = _CurrComm;
}
}
protected async Task EditRec(CommentiModel currRec)
{
await Task.Delay(1);