From 298e9b0c38195e73e3b8404385fd26515fedb673 Mon Sep 17 00:00:00 2001
From: Manuel Aranda <maranda@qindel.com>
Date: Fri, 15 Nov 2024 13:30:38 +0100
Subject: [PATCH] Improvements after conflicts

---
 .../task-logs/task-logs.component.html        |  1 -
 .../advanced-search.component.css             | 60 +++++++++----------
 .../advanced-search.component.html            | 29 +++++----
 .../app/layout/header/header.component.html   |  2 +
 4 files changed, 47 insertions(+), 45 deletions(-)

diff --git a/ogWebconsole/src/app/components/commands/commands-task/task-logs/task-logs.component.html b/ogWebconsole/src/app/components/commands/commands-task/task-logs/task-logs.component.html
index 66010b4..22fd3fd 100644
--- a/ogWebconsole/src/app/components/commands/commands-task/task-logs/task-logs.component.html
+++ b/ogWebconsole/src/app/components/commands/commands-task/task-logs/task-logs.component.html
@@ -1,5 +1,4 @@
 <div class="header-container">
-  <h2 class="title" i18n="@@adminCommandsTitle">Trazas</h2>
   <button mat-icon-button color="primary" (click)="iniciarTour()">
     <mat-icon>help</mat-icon>
   </button>
diff --git a/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.css b/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.css
index 8cf70f5..9b0d832 100644
--- a/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.css
+++ b/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.css
@@ -190,10 +190,9 @@ mat-spinner {
 .result-card.small-card {
   width: 100%;
   max-width: 180px;
-  height: auto;
-  min-height: 130px;
+  height: 100%;
   padding: 10px;
-  margin: 5px;
+  margin: 5px 5px 10px;
   border-radius: 8px;
   box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
   display: flex;
@@ -201,6 +200,33 @@ mat-spinner {
   justify-content: space-between;
 }
 
+.result-card {
+  &.card-og-live {
+    background-color: #4caf50; /* Verde */
+    color: white;
+  }
+  &.card-busy {
+    background-color: #f44336; /* Naranja */
+    color: white;
+  }
+  &.card-windows {
+    background-color: #2196f3; /* Azul */
+    color: white;
+  }
+  &.card-linux {
+    background-color: #9c27b0; /* Púrpura */
+    color: white;
+  }
+  &.card-macos {
+    background-color: #ff9800; /* Rojo */
+    color: white;
+  }
+  &.card-off {
+    background-color: #9e9e9e; /* Gris */
+    color: white;
+  }
+}
+
 .result-title {
   font-size: 1rem;
   font-weight: 500;
@@ -298,31 +324,3 @@ mat-card {
 .result-list {
   height: auto;
 }
-
-.chip-busy {
-  background-color: red !important;
-  color: black;
-}
-
-.chip-og-live {
-  background-color: yellow !important;
-  color: black;
-}
-
-.chip-windows,
-.chip-windows-session,
-.chip-macos {
-  background-color: blue !important;
-  color: white;
-}
-
-.chip-linux,
-.chip-linux-session {
-  background-color: purple !important;
-  color: white;
-}
-
-.chip-off {
-  background-color: grey !important;
-  color: white;
-}
diff --git a/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.html b/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.html
index 2c0877a..4942774 100644
--- a/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.html
+++ b/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.html
@@ -65,25 +65,27 @@
         <ng-container *ngIf="viewMode === 'grid'">
           <mat-grid-list cols="8" rowHeight="1:1">
             <mat-grid-tile *ngFor="let result of filteredResults">
-              <mat-card class="result-card small-card">
-                <mat-checkbox [checked]="isSelected(result.name)" (change)="onCheckboxChange($event, result.name, result['@id'])" class="result-checkbox"></mat-checkbox>
+              <mat-card
+                class="result-card small-card"
+                [ngClass]="{
+                  'card-og-live': result.status === 'og-live',
+                  'card-busy': result.status === 'busy',
+                  'card-windows': result.status === 'windows' || result.status === 'windows-session',
+                  'card-linux': result.status === 'linux' || result.status === 'linux-session',
+                  'card-macos': result.status === 'macos',
+                  'card-off': result.status === 'off'
+                }">
+                <mat-checkbox
+                  [checked]="isSelected(result.name)"
+                  (change)="onCheckboxChange($event, result.name, result['@id'])"
+                  class="result-checkbox">
+                </mat-checkbox>
                 <mat-card-title class="result-title">{{ result.name }}</mat-card-title>
                 <mat-card-content class="result-content">
                   <p class="result-type">{{ result.type !== 'client' ? result.type : '' }}</p>
                   <p class="result-ip" *ngIf="result.type === 'client'">{{ result.ip }}</p>
                   <p class="result-mac" *ngIf="result.type === 'client'">{{ result.mac }}</p>
 
-                  <mat-chip *ngIf="result.type === 'client'" [ngClass]="{
-                    'chip-og-live': result.status === 'og-live',
-                    'chip-busy': result.status === 'busy',
-                    'chip-windows': result.status === 'windows' || result.status === 'windows-session',
-                    'chip-linux': result.status === 'linux' || result.status === 'linux-session',
-                    'chip-macos': result.status === 'macos',
-                    'chip-off': result.status === 'off'
-                  }">
-                    {{ result.status }}
-                  </mat-chip>
-
                   <p *ngIf="result.type !== 'client'" i18n="@@internalUnits" class="result-internal-units">Unidades internas: {{ result.children.length }}</p>
                   <p *ngIf="result.type !== 'client'" i18n="@@clients" class="result-clients">Clientes: {{ result.clients.length }}</p>
                 </mat-card-content>
@@ -92,6 +94,7 @@
           </mat-grid-list>
         </ng-container>
 
+
         <ng-container *ngIf="viewMode === 'list'">
           <div class="result-list" *ngFor="let result of filteredResults">
             <mat-card class="result-card-list">
diff --git a/ogWebconsole/src/app/layout/header/header.component.html b/ogWebconsole/src/app/layout/header/header.component.html
index 051b347..5ae3284 100644
--- a/ogWebconsole/src/app/layout/header/header.component.html
+++ b/ogWebconsole/src/app/layout/header/header.component.html
@@ -8,6 +8,8 @@
   </button>
 
   <div class="navbar-button-row">
+    <button class="trace-button" routerLink="/commands-logs" mat-button i18n="@@admin"><mat-icon>notifications</mat-icon></button>
+
     <button class="admin-button" *ngIf="isSuperAdmin" mat-button [matMenuTriggerFor]="menu" i18n="@@admin"
       matTooltip="Gestión de usuarios y roles de la aplicación" matTooltipShowDelay="1000">
       Administración