From 37eb2ab1cf93fbf6b4445f802be9110a755c5e6b Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Tue, 5 Sep 2023 12:20:16 +0200
Subject: [PATCH] fix grafici pagina confronto compo

---
 Resources/ChangeLog.html                      |  2 +-
 Resources/VersNum.txt                         |  2 +-
 Resources/manifest.xml                        |  2 +-
 .../Components/FilesMan/CompoCompare.razor    | 69 +++++++++----------
 .../Components/FilesMan/CompoCompare.razor.cs |  2 +-
 .../FilesMan/CompoCompare.razor.css           |  3 +
 .../FilesMan/CompoCompare.razor.less          |  3 +
 .../FilesMan/CompoCompare.razor.min.css       |  1 +
 WebDoorCreator.UI/Pages/SuperAdmin.razor      |  2 +-
 WebDoorCreator.UI/WebDoorCreator.UI.csproj    |  2 +-
 WebDoorCreator.UI/compilerconfig.json         |  4 ++
 11 files changed, 50 insertions(+), 42 deletions(-)
 create mode 100644 WebDoorCreator.UI/Components/FilesMan/CompoCompare.razor.css
 create mode 100644 WebDoorCreator.UI/Components/FilesMan/CompoCompare.razor.less
 create mode 100644 WebDoorCreator.UI/Components/FilesMan/CompoCompare.razor.min.css
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index 65e3bee..d9255ea 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>WebDoorCreator - Egalware</i>
-    <h4>Version: 0.9.2309.0510</h4>
+    <h4>Version: 0.9.2309.0512</h4>
     <br /> Release note:
     <ul>
         <li>
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index f2eb016..05ee08f 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-0.9.2309.0510
+0.9.2309.0512
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index d7c41df..21aa05c 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>0.9.2309.0510</version>
+  <version>0.9.2309.0512</version>
   <url>http://nexus.steamware.net/repository/SWS/WDC/stable/WDC.UI.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/WDC/stable/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/WebDoorCreator.UI/Components/FilesMan/CompoCompare.razor b/WebDoorCreator.UI/Components/FilesMan/CompoCompare.razor
index 0f88143..f055c95 100644
--- a/WebDoorCreator.UI/Components/FilesMan/CompoCompare.razor
+++ b/WebDoorCreator.UI/Components/FilesMan/CompoCompare.razor
@@ -1,10 +1,4 @@
-﻿@if (files2Chk != null && files2Chk.Count() > 0)
-{
-    <div class="w-100 text-end">
-        <button @onclick="()=>doSave()" class="btn btn-success">Save</button>
-    </div>
-}
-
+﻿
 <div class="d-flex justify-content-between my-2">
     <div class="col-5 text-center fw-bold border-bottom border-secondary" style="font-size: 1.5rem;">
         New Data
@@ -23,84 +17,87 @@ else if (files2Chk != null && files2Chk.Count() > 0)
     <table class="table table-striped">
         <thead>
             <tr class="row">
-                <th class="col-1"></th>
+                @*<th class="col-1"></th>*@
                 <th class="col-1">Type</th>
                 <th class="col-1">Folder</th>
-                <th class="col-1">Sile</th>
+                <th class="col-1">File</th>
                 <th class="col-1">Size</th>
-                <th class="col-2 text-center">
-                    <input class="form-check-input mt-0" type="checkbox" value="" aria-label="Select or Unselect all" @bind="@selUns">
+                <th class="col-4 text-center">
+                    <input class="form-check-input mt-0" type="checkbox" value="" id="selUns" aria-label="Select or Unselect all" @bind="@selUns">
+                    <label for="#selUns">Select/Unselect all</label>
                 </th>
                 <th class="col-1">Type</th>
                 <th class="col-1">Folder</th>
                 <th class="col-1">File</th>
                 <th class="col-1">Size</th>
-                <th class="col-1"></th>
+                @*<th class="col-1"></th>*@
             </tr>
         </thead>
         <tbody>
             @foreach (var item in files2Chk)
             {
-                <tr class="row">
-                    <td class="col-1">
+                <tr class="row"  style="cursor: pointer;">
+                    @*<td class="col-1">
                         <button class="btn btn-sm btn-info" data-bs-toggle="modal" data-bs-target="#fileDiffModal" @onclick="()=>showDiff(item, item.Value.status)"><i class="fa-solid fa-magnifying-glass"></i></button>
-                        @* @if (item.Value.status == Core.Enum.fileStatus.mod || true)
-                {
-                <button class="btn btn-sm btn-info" data-bs-toggle="modal" data-bs-target="#fileDiffModal" @onclick="()=>showDiff(item)"><i class="fa-solid fa-magnifying-glass"></i></button>
-                }
-                else
-                {
-                <button class="btn btn-sm btn-secondary" disabled><i class="fa-solid fa-magnifying-glass"></i></button>
-                } *@
-                    </td>
+                    </td>*@
                     @if (item.Value.status == Core.Enum.fileStatus.add || item.Value.status == Core.Enum.fileStatus.mod)
                     {
-                        <td class="col-1">
+                        <td class="col-1" data-bs-toggle="modal" data-bs-target="#fileDiffModal" @onclick="()=>showDiff(item, item.Value.status)">
                             @item.Key.Split("\\")[0]
                         </td>
-                        <td class="col-1">
+                        <td class="col-1" data-bs-toggle="modal" data-bs-target="#fileDiffModal" @onclick="()=>showDiff(item, item.Value.status)">
                             @item.Key.Split("\\")[1]
                         </td>
-                        <td class="col-1">
+                        <td class="col-1" data-bs-toggle="modal" data-bs-target="#fileDiffModal" @onclick="()=>showDiff(item, item.Value.status)">
                             @item.Key.Split("\\")[2]
                         </td>
-                        <td class="col-1">
+                        <td class="col-1" data-bs-toggle="modal" data-bs-target="#fileDiffModal" @onclick="()=>showDiff(item, item.Value.status)">
                             @($"{item.Value.FileDim / 1024} kb")
                         </td>
                     }
                     else
                     {
-                        <td class="col-4" colspan="4"></td>
+                        <td class="col-4" colspan="4" data-bs-toggle="modal" data-bs-target="#fileDiffModal" @onclick="()=>showDiff(item, item.Value.status)"></td>
                     }
-                    <td class="col-2 text-center">
+                    <td class="col-4 text-center">
                         <button class="btn @btnCssClass(item.Value.status, item.Value.action)" @onclick="()=>changeDoAct(item)">@btnTxt(item.Value.status) &nbsp; <i class="@btnIcon(item.Value.status)"></i></button>
                     </td>
                     @if (item.Value.status == Core.Enum.fileStatus.rem || item.Value.status == Core.Enum.fileStatus.mod)
                     {
-                        <td class="col-1">
+                        <td class="col-1" data-bs-toggle="modal" data-bs-target="#fileDiffModal" @onclick="()=>showDiff(item, item.Value.status)">
                             @item.Key.Split("\\")[0]
                         </td>
-                        <td class="col-1">
+                        <td class="col-1" data-bs-toggle="modal" data-bs-target="#fileDiffModal" @onclick="()=>showDiff(item, item.Value.status)">
                             @item.Key.Split("\\")[1]
                         </td>
-                        <td class="col-1">
+                        <td class="col-1" data-bs-toggle="modal" data-bs-target="#fileDiffModal" @onclick="()=>showDiff(item, item.Value.status)">
                             @item.Key.Split("\\")[2]
                         </td>
-                        <td class="col-1">
+                        <td class="col-1" data-bs-toggle="modal" data-bs-target="#fileDiffModal" @onclick="()=>showDiff(item, item.Value.status)">
                             @($"{item.Value.FileDim / 1024} kb")
                         </td>
                     }
                     else
                     {
-                        <td class="col-4" colspan="4"></td>
+                        <td class="col-4" colspan="4" data-bs-toggle="modal" data-bs-target="#fileDiffModal" @onclick="()=>showDiff(item, item.Value.status)"></td>
                     }
-                    <td class="col-1 text-end">
+                    @*<td class="col-1 text-end">
                         <button class="btn btn-sm btn-info" data-bs-toggle="modal" data-bs-target="#fileDiffModal" @onclick="()=>showDiff(item, item.Value.status)"><i class="fa-solid fa-magnifying-glass"></i></button>
-                    </td>
+                    </td>*@
                 </tr>
             }
         </tbody>
     </table>
+    @if (files2Chk != null && files2Chk.Count() > 0)
+    {
+        @if (files2Chk.Where(x => x.Value.action).ToList().Count > 0)
+        {
+            <div class="w-100 text-center">
+                <button @onclick="()=>doSave()" class="btn btn-success">Save</button>
+            </div>
+        }
+    }
+
 }
 else if (files2Chk == null || files2Chk.Count() == 0)
 {
diff --git a/WebDoorCreator.UI/Components/FilesMan/CompoCompare.razor.cs b/WebDoorCreator.UI/Components/FilesMan/CompoCompare.razor.cs
index ed131c6..38c4cb3 100644
--- a/WebDoorCreator.UI/Components/FilesMan/CompoCompare.razor.cs
+++ b/WebDoorCreator.UI/Components/FilesMan/CompoCompare.razor.cs
@@ -107,7 +107,7 @@ namespace WebDoorCreator.UI.Components.FilesMan
             string answ = "";
             if (fStat == Core.Enum.fileStatus.add && doAct)
             {
-                answ = "btn-success";
+                answ = "btn-primary";
             }
             else if (fStat == Core.Enum.fileStatus.mod && doAct)
             {
diff --git a/WebDoorCreator.UI/Components/FilesMan/CompoCompare.razor.css b/WebDoorCreator.UI/Components/FilesMan/CompoCompare.razor.css
new file mode 100644
index 0000000..65ee638
--- /dev/null
+++ b/WebDoorCreator.UI/Components/FilesMan/CompoCompare.razor.css
@@ -0,0 +1,3 @@
+﻿tbody > tr:hover {
+  background-color: rgba(0, 148, 255, 0.3);
+}
\ No newline at end of file
diff --git a/WebDoorCreator.UI/Components/FilesMan/CompoCompare.razor.less b/WebDoorCreator.UI/Components/FilesMan/CompoCompare.razor.less
new file mode 100644
index 0000000..dcbbfbf
--- /dev/null
+++ b/WebDoorCreator.UI/Components/FilesMan/CompoCompare.razor.less
@@ -0,0 +1,3 @@
+﻿tbody > tr:hover{
+    background-color: rgba(0, 148, 255, .3)
+}
\ No newline at end of file
diff --git a/WebDoorCreator.UI/Components/FilesMan/CompoCompare.razor.min.css b/WebDoorCreator.UI/Components/FilesMan/CompoCompare.razor.min.css
new file mode 100644
index 0000000..c28fa6c
--- /dev/null
+++ b/WebDoorCreator.UI/Components/FilesMan/CompoCompare.razor.min.css
@@ -0,0 +1 @@
+﻿tbody>tr:hover{background-color:rgba(0,148,255,.3);}
\ No newline at end of file
diff --git a/WebDoorCreator.UI/Pages/SuperAdmin.razor b/WebDoorCreator.UI/Pages/SuperAdmin.razor
index 3e9231c..d5fa951 100644
--- a/WebDoorCreator.UI/Pages/SuperAdmin.razor
+++ b/WebDoorCreator.UI/Pages/SuperAdmin.razor
@@ -11,7 +11,7 @@
             </div>
         </div>
 
-        <div class="cardShadow mt-2">
+        <div class="cardShadow mt-2 p-2">
 
             @if (CurrMode == AdminMode.Company)
             {
diff --git a/WebDoorCreator.UI/WebDoorCreator.UI.csproj b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
index 55aae8c..af54c58 100644
--- a/WebDoorCreator.UI/WebDoorCreator.UI.csproj
+++ b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-        <Version>0.9.2309.0510</Version>
+        <Version>0.9.2309.0512</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>aspnet-WebDoorCreator.UI-dfe95fed-1398-4144-bd43-8b3a765d6608</UserSecretsId>
   </PropertyGroup>
diff --git a/WebDoorCreator.UI/compilerconfig.json b/WebDoorCreator.UI/compilerconfig.json
index 6f3e6b9..4447134 100644
--- a/WebDoorCreator.UI/compilerconfig.json
+++ b/WebDoorCreator.UI/compilerconfig.json
@@ -126,5 +126,9 @@
   {
     "outputFile": "Components/Gen/OrdersDoorsDoorDef.razor.css",
     "inputFile": "Components/Gen/OrdersDoorsDoorDef.razor.less"
+  },
+  {
+    "outputFile": "Components/FilesMan/CompoCompare.razor.css",
+    "inputFile": "Components/FilesMan/CompoCompare.razor.less"
   }
 ]
\ No newline at end of file

		Type	Folder	Sile	File	Size	- +	+ + Select/Unselect all	Type	Folder	File	Size
+
- @* @if (item.Value.status == Core.Enum.fileStatus.mod \|\| true) - { - - } - else - { - - } *@ -	+	@item.Key.Split("\\")[0]	+	@item.Key.Split("\\")[1]	+	@item.Key.Split("\\")[2]	+	@($"{item.Value.FileDim / 1024} kb")									+		+	@item.Key.Split("\\")[0]	+	@item.Key.Split("\\")[1]	+	@item.Key.Split("\\")[2]	+	@($"{item.Value.FileDim / 1024} kb")									+ @*	-