From 372318a290e9735ed5e892cb7e89abbcc4e41cfe Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Mon, 3 Oct 2022 12:56:31 +0200 Subject: [PATCH] Fix grafici --- .../Components/DisplayRecordComponent.razor | 6 ++-- .../DisplayRecordComponent.razor.cs | 18 +++++++++-- MP.MONO.UI/Components/ToolsOverview.razor | 2 +- MP.MONO.UI/Components/ToolsOverview.razor.cs | 10 +++--- MP.MONO.UI/Pages/Tools.razor | 32 ++++++++++--------- MP.MONO.UI/Pages/Tools.razor.cs | 29 +++++++---------- 6 files changed, 53 insertions(+), 44 deletions(-) diff --git a/MP.MONO.UI/Components/DisplayRecordComponent.razor b/MP.MONO.UI/Components/DisplayRecordComponent.razor index a96732a..719edef 100644 --- a/MP.MONO.UI/Components/DisplayRecordComponent.razor +++ b/MP.MONO.UI/Components/DisplayRecordComponent.razor @@ -10,17 +10,17 @@ @if (!string.IsNullOrEmpty(currRecord.CssIcon)) {
-
@currRecord.Title
+
@currRecord.Title
} else {
- @currRecord.Title + @currRecord.Title
-
@currRecord.Value
+
@currRecord.Value
diff --git a/MP.MONO.UI/Components/DisplayRecordComponent.razor.cs b/MP.MONO.UI/Components/DisplayRecordComponent.razor.cs index 81657db..a2dde52 100644 --- a/MP.MONO.UI/Components/DisplayRecordComponent.razor.cs +++ b/MP.MONO.UI/Components/DisplayRecordComponent.razor.cs @@ -9,8 +9,8 @@ namespace MP.MONO.UI.Components [Parameter] public DisplayDataDTO? currRecord { get; set; } = null; - - + [Parameter] + public List SelVal { get; set; } = new List(); #endregion Public Properties @@ -24,7 +24,19 @@ namespace MP.MONO.UI.Components answ = $"width: {ratio:P0};"; return answ; } - + protected string cssLast(string toolName) + { + string answ = SelVal.Contains(toolName) ? "bg-dark text-light" : ""; + // se è ultima testo giallo... + if (SelVal != null && SelVal.Count > 0) + { + if (SelVal.LastOrDefault().Equals(toolName)) + { + answ = "bg-dark text-warning"; + } + } + return answ; + } #endregion Protected Methods } diff --git a/MP.MONO.UI/Components/ToolsOverview.razor b/MP.MONO.UI/Components/ToolsOverview.razor index 7821ab9..8f01479 100644 --- a/MP.MONO.UI/Components/ToolsOverview.razor +++ b/MP.MONO.UI/Components/ToolsOverview.razor @@ -39,7 +39,7 @@ *@
  • - +
    • } diff --git a/MP.MONO.UI/Components/ToolsOverview.razor.cs b/MP.MONO.UI/Components/ToolsOverview.razor.cs index c10ce03..7a347f9 100644 --- a/MP.MONO.UI/Components/ToolsOverview.razor.cs +++ b/MP.MONO.UI/Components/ToolsOverview.razor.cs @@ -63,22 +63,22 @@ namespace MP.MONO.UI.Components .ToList(); } } - protected string cssLast(string ParamName) + protected string cssLast(string toolName) { - string answ = SelVal.Contains(ParamName) ? "bg-dark text-light" : ""; + string answ = SelVal.Contains(toolName) ? "bg-dark text-light" : ""; // se è ultima testo giallo... if (SelVal != null && SelVal.Count > 0) { - if (SelVal.LastOrDefault().Equals(ParamName)) + if (SelVal.LastOrDefault().Equals(toolName)) { answ = "bg-dark text-warning"; } } return answ; } - protected string cssActive(string ParamName) + protected string cssActive(string toolName) { - string answ = SelVal.Contains(ParamName) ? "bg-dark text-light" : ""; + string answ = SelVal.Contains(toolName) ? "bg-dark text-light" : ""; return answ; } protected void toggleSelect(string SelectedValue) diff --git a/MP.MONO.UI/Pages/Tools.razor b/MP.MONO.UI/Pages/Tools.razor index 0184e3e..68798cd 100644 --- a/MP.MONO.UI/Pages/Tools.razor +++ b/MP.MONO.UI/Pages/Tools.razor @@ -1,22 +1,24 @@ @page "/Tools"
    -
    -
    -
    -

    Tools

    -
    -
    - +
    +
    +

    Tools

    +
    +
    +
    +
    + +
    +
    + @foreach (var item in selTools) + { +
    + +
    + } +
    -
    - @foreach (var item in selParams) - { -
    - -
    - } -
    \ No newline at end of file diff --git a/MP.MONO.UI/Pages/Tools.razor.cs b/MP.MONO.UI/Pages/Tools.razor.cs index 743393b..6324a54 100644 --- a/MP.MONO.UI/Pages/Tools.razor.cs +++ b/MP.MONO.UI/Pages/Tools.razor.cs @@ -39,10 +39,10 @@ protected string btnResetCss { - get => selParams != null && selParams.Count > 0 ? "" : "disabled"; + get => selTools != null && selTools.Count > 0 ? "" : "disabled"; } - protected List selParams { get; set; } = new List(); + protected List selTools { get; set; } = new List(); #endregion Protected Properties @@ -53,7 +53,7 @@ get { string answ = "col-12"; - int numPar = selParams.Count; + int numPar = selTools.Count; if (numPar > 6) { answ = "col-4"; @@ -70,20 +70,15 @@ #region Private Methods - private void toggleParam() - { - showParam = !showParam; - } - #endregion Private Methods #region Protected Methods - protected void paramAdded(string toolName) + protected void toolAdded(string toolName) { - if (!selParams.Contains(toolName)) + if (!selTools.Contains(toolName)) { - selParams.Add(toolName); + selTools.Add(toolName); } } @@ -92,29 +87,29 @@ get { string answ = ""; - if (selParams.Count > 0) + if (selTools.Count > 0) { - answ = $"{selParams.LastOrDefault()}"; + answ = $"{selTools.LastOrDefault()}"; } return answ; } } - protected void paramRemoved(string toolName) + protected void toolRemoved(string toolName) { - if (selParams.Contains(toolName)) + if (selTools.Contains(toolName)) { // controllo se è ultimo rimuovo direttamente if (toolName == lastTool) { - selParams.Remove(toolName); + selTools.Remove(toolName); } } } protected void resetSel() { - selParams = new List(); + selTools = new List(); } protected void toggleRT()