From 7930ce273f6340ea7939aea0f89deeae0ec6b498 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Sat, 11 Jun 2022 18:32:28 +0200 Subject: [PATCH] - fix display dettagli solo se presenti - fix col spacing - aggiunta warng signal --- MP.MONO.Data/Controllers/MpDbController.cs | 2 +- MP.MONO.UI/Components/MaintOverview.razor | 2 -- MP.MONO.UI/Components/PrevMaintTask.razor | 14 +++++++++++--- MP.MONO.UI/Components/PrevMaintTask.razor.cs | 9 ++++++++- MP.MONO.UI/Components/ProgBar.razor | 2 +- MP.MONO.UI/Components/ProgBar.razor.cs | 14 ++++++++++---- .../Components/SchedMaintTaskHist.razor | 19 ++++++------------- MP.MONO.UI/Pages/Maintenance.razor | 2 +- 8 files changed, 38 insertions(+), 26 deletions(-) diff --git a/MP.MONO.Data/Controllers/MpDbController.cs b/MP.MONO.Data/Controllers/MpDbController.cs index 0d6373d..819cdba 100644 --- a/MP.MONO.Data/Controllers/MpDbController.cs +++ b/MP.MONO.Data/Controllers/MpDbController.cs @@ -461,7 +461,7 @@ namespace MP.MONO.Data.Controllers dbResult = localDbCtx .DbSetSMTask .Include(i => i.CounterNav) - .Where(x => x.PMTaskeNav.MachineId == MachineId && x.PMTaskId == PMTaskId) + .Where(x => x.PMTaskeNav.MachineId == MachineId && x.PMTaskId == PMTaskId && x.DtExecution > DateTime.MinValue) .Include(m => m.PMTaskeNav.MachGroupNav) .Include(m => m.CounterNav) .Include(m => m.PMTaskeNav.MachineNav) diff --git a/MP.MONO.UI/Components/MaintOverview.razor b/MP.MONO.UI/Components/MaintOverview.razor index 30d8576..5f200cc 100644 --- a/MP.MONO.UI/Components/MaintOverview.razor +++ b/MP.MONO.UI/Components/MaintOverview.razor @@ -6,7 +6,6 @@
-

...deve mostrare quelli in scadenza nel periodo richiesto, es 10/15 gg...

@if (@ListRecords != null && ListRecords.Count > 0) {
    @@ -21,7 +20,6 @@
} -
  • ...Calendar???
    • } else diff --git a/MP.MONO.UI/Components/PrevMaintTask.razor b/MP.MONO.UI/Components/PrevMaintTask.razor index 40bd612..3af7eda 100644 --- a/MP.MONO.UI/Components/PrevMaintTask.razor +++ b/MP.MONO.UI/Components/PrevMaintTask.razor @@ -33,13 +33,14 @@ Team in Charge Counter Var Job Description + # Exec @foreach (var record in ListRecords) { - + @record.ExtIdx @@ -49,8 +50,15 @@ @record.UserTeamNav.Description @record.CounterNav.Description @record.JobDescription + @if (currPMTaskId == 0) + { + @record.NumTaskDone + } - + @if (record.NumTaskDone > 0) + { + + } } @@ -59,7 +67,7 @@
    @if (currPMTaskId > 0) { -
    +
    } diff --git a/MP.MONO.UI/Components/PrevMaintTask.razor.cs b/MP.MONO.UI/Components/PrevMaintTask.razor.cs index 07c037a..202c64b 100644 --- a/MP.MONO.UI/Components/PrevMaintTask.razor.cs +++ b/MP.MONO.UI/Components/PrevMaintTask.razor.cs @@ -32,6 +32,7 @@ namespace MP.MONO.UI.Components { if (_currPage != value) { + currPMTaskId = 0; _currPage = value; var pUpd = Task.Run(async () => await ReloadData()); pUpd.Wait(); @@ -45,7 +46,7 @@ namespace MP.MONO.UI.Components private string mainCssClass { - get => currPMTaskId == 0 ? "col-12" : "col-9"; + get => currPMTaskId == 0 ? "col-12" : "col-8"; } private int MaxRecord @@ -72,6 +73,7 @@ namespace MP.MONO.UI.Components { if (_numRecord != value) { + currPMTaskId = 0; _numRecord = value; var pUpd = Task.Run(async () => await ReloadData()); pUpd.Wait(); @@ -105,6 +107,11 @@ namespace MP.MONO.UI.Components #region Private Methods + private string checkSel(int PMTaskId) + { + return PMTaskId == currPMTaskId ? "table-primary" : ""; + } + private void ForceReload(int newNum) { numRecord = newNum; diff --git a/MP.MONO.UI/Components/ProgBar.razor b/MP.MONO.UI/Components/ProgBar.razor index 8060038..d11bd40 100644 --- a/MP.MONO.UI/Components/ProgBar.razor +++ b/MP.MONO.UI/Components/ProgBar.razor @@ -1,5 +1,5 @@ 
    - @currVal.ToString("N0") + @currVal.ToString("N0")
    @(percWidth)%
    diff --git a/MP.MONO.UI/Components/ProgBar.razor.cs b/MP.MONO.UI/Components/ProgBar.razor.cs index ee0296b..6e8b168 100644 --- a/MP.MONO.UI/Components/ProgBar.razor.cs +++ b/MP.MONO.UI/Components/ProgBar.razor.cs @@ -26,10 +26,6 @@ namespace MP.MONO.UI.Components { get => $"bg-{currStyle}"; } - private string textStyle - { - get => $"text-{currStyle}"; - } private string currStyle { @@ -55,6 +51,16 @@ namespace MP.MONO.UI.Components private int percWidth { get => (int)(100 * currVal / maxVal); } + private string textStyle + { + get => $"text-{currStyle}"; + } + + private string warnClass + { + get => currVal > 0 ? "d-none" : "text-danger"; + } + #endregion Private Properties } } \ No newline at end of file diff --git a/MP.MONO.UI/Components/SchedMaintTaskHist.razor b/MP.MONO.UI/Components/SchedMaintTaskHist.razor index a2555df..6559078 100644 --- a/MP.MONO.UI/Components/SchedMaintTaskHist.razor +++ b/MP.MONO.UI/Components/SchedMaintTaskHist.razor @@ -7,12 +7,12 @@
    -
    +
    -
    +
    Task history
    -
    +
    @@ -33,26 +33,19 @@ Operator Execution - H + Hours @foreach (var record in ListRecords) { - @*@record.DtCreation.ToString("yyyy-MM-dd HH:mm:ss")*@ @record.UserCode - @if (@record.DtExecution > DateTime.MinValue) - { - @record.DtExecution.ToString("yyyy-MM-dd HH:mm") - } + @record.DtExecution.ToString("yyyy-MM-dd HH:mm:ss") - @if (@record.DtExecution > DateTime.MinValue) - { -
    @record.ElapsedVal.ToString("N0")/@record.ExpiryVal
    - } +
    @record.ElapsedVal.ToString("N0")/@record.ExpiryVal
    } diff --git a/MP.MONO.UI/Pages/Maintenance.razor b/MP.MONO.UI/Pages/Maintenance.razor index 4892fc1..0e7a522 100644 --- a/MP.MONO.UI/Pages/Maintenance.razor +++ b/MP.MONO.UI/Pages/Maintenance.razor @@ -11,7 +11,7 @@
    - +