From 0ef6ae5815a2f84d106bf86c7b0527261ac06f2c Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Mon, 6 Nov 2023 08:58:18 +0100 Subject: [PATCH 1/2] fix grafico --- MP-TAB-SERV/Components/LongStopList.razor | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MP-TAB-SERV/Components/LongStopList.razor b/MP-TAB-SERV/Components/LongStopList.razor index c4214cf9..bc9ae031 100644 --- a/MP-TAB-SERV/Components/LongStopList.razor +++ b/MP-TAB-SERV/Components/LongStopList.razor @@ -2,6 +2,7 @@ {
+
@@ -87,7 +88,7 @@ }
-
+
@if (showComments) {
From 4ea1afdd35b5e57a7a51ac9f0ff7154aa72c3100 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Mon, 6 Nov 2023 09:49:59 +0100 Subject: [PATCH 2/2] ok modifica commenti --- MP-TAB-SERV/Components/LongStopList.razor | 36 +------------------- MP-TAB-SERV/Components/LongStopList.razor.cs | 6 ++++ MP-TAB-SERV/Components/NotesEditor.razor.cs | 13 +++++++ MP-TAB-SERV/Components/NotesMan.razor | 4 +-- MP-TAB-SERV/Components/NotesMan.razor.cs | 12 +++++++ MP-TAB-SERV/MP-TAB-SERV.csproj | 2 +- MP-TAB-SERV/Resources/ChangeLog.html | 2 +- MP-TAB-SERV/Resources/VersNum.txt | 2 +- MP-TAB-SERV/Resources/manifest.xml | 2 +- 9 files changed, 38 insertions(+), 41 deletions(-) diff --git a/MP-TAB-SERV/Components/LongStopList.razor b/MP-TAB-SERV/Components/LongStopList.razor index bc9ae031..c1566122 100644 --- a/MP-TAB-SERV/Components/LongStopList.razor +++ b/MP-TAB-SERV/Components/LongStopList.razor @@ -53,40 +53,6 @@
}
-
- @if (currNotes.Count > 0) - { - @*
-
-

- -

-
-
- @foreach (var note in currNotes) - { -
- - @note.Value - -
- } -
-
-
-
*@ - } - else - { - @*
-
- @($"{currNotes.Count} commenti") -
-
*@ - } -
@if (showComments) @@ -95,7 +61,7 @@ @foreach (var note in currNotes) {
- + @note.Value
diff --git a/MP-TAB-SERV/Components/LongStopList.razor.cs b/MP-TAB-SERV/Components/LongStopList.razor.cs index b26b7eaa..589f6d9b 100644 --- a/MP-TAB-SERV/Components/LongStopList.razor.cs +++ b/MP-TAB-SERV/Components/LongStopList.razor.cs @@ -17,6 +17,8 @@ namespace MP_TAB_SERV.Components public List currNotes { get; set; } = new List(); [Parameter] public EventCallback E_relData { get; set; } + [Parameter] + public EventCallback 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 } diff --git a/MP-TAB-SERV/Components/NotesEditor.razor.cs b/MP-TAB-SERV/Components/NotesEditor.razor.cs index 30135b33..1b6771e1 100644 --- a/MP-TAB-SERV/Components/NotesEditor.razor.cs +++ b/MP-TAB-SERV/Components/NotesEditor.razor.cs @@ -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 E_CommRec { get; set; } diff --git a/MP-TAB-SERV/Components/NotesMan.razor b/MP-TAB-SERV/Components/NotesMan.razor index fd43198b..8d43a10c 100644 --- a/MP-TAB-SERV/Components/NotesMan.razor +++ b/MP-TAB-SERV/Components/NotesMan.razor @@ -1,5 +1,5 @@  - +
@@ -45,7 +45,7 @@
@foreach (var item in RecordListFull) { - + }
diff --git a/MP-TAB-SERV/Components/NotesMan.razor.cs b/MP-TAB-SERV/Components/NotesMan.razor.cs index 891ee70c..da0df09a 100644 --- a/MP-TAB-SERV/Components/NotesMan.razor.cs +++ b/MP-TAB-SERV/Components/NotesMan.razor.cs @@ -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); diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj index f4f6b3fc..a2fda2a2 100644 --- a/MP-TAB-SERV/MP-TAB-SERV.csproj +++ b/MP-TAB-SERV/MP-TAB-SERV.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2310.3117 + 6.16.2311.609 enable MP_TAB_SERV diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html index dcc264dc..b96c808a 100644 --- a/MP-TAB-SERV/Resources/ChangeLog.html +++ b/MP-TAB-SERV/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2310.3117

+

Versione: 6.16.2311.609


Note di rilascio:
  • diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt index a52150d6..68df9744 100644 --- a/MP-TAB-SERV/Resources/VersNum.txt +++ b/MP-TAB-SERV/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2310.3117 +6.16.2311.609 diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml index 51e111c4..cd97a6ec 100644 --- a/MP-TAB-SERV/Resources/manifest.xml +++ b/MP-TAB-SERV/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2310.3117 + 6.16.2311.609 https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html false