Merge branch 'develop' of ssh://ognproject.evlt.uma.es:21987/opengnsys/oggui into develop

ogWebconsole/src/app/components/global-status/status-tab/status-tab.component.css

@@ -3,7 +3,8 @@
   flex-direction: column;
 }
 
-.disk-usage-container {
+.disk-usage-container,
+.ram-usage-container {
   display: flex;
   flex-direction: column;
 }

ogWebconsole/src/app/components/global-status/status-tab/status-tab.component.html

@@ -21,7 +21,7 @@
 
   <!-- RAM Usage Section -->
   <div class="ram-usage-container" *ngIf="isRepository">
-    <h3 class="ram-title">Uso de RAM</h3>
+    <h3 class="ram-title">{{ 'RamUsage' | translate }}</h3>
     <div class="ram-usage">
       <ngx-charts-pie-chart [view]="view" [scheme]="colorScheme" [results]="ramUsageChartData" [doughnut]="isDoughnut"
         [labels]="showLabels">
@@ -37,7 +37,7 @@
 
   <!-- CPU Usage Section -->
   <div class="cpu-usage-container" *ngIf="isRepository">
-    <h3 class="cpu-title">Uso de CPU</h3>
+    <h3 class="cpu-title">{{ 'CpuUsage' | translate }}</h3>
     <div class="cpu-usage">
       <p>Usado: <strong>{{ cpuUsage.used_percentage }}</strong></p>
     </div>
@@ -57,7 +57,7 @@
 
   <!-- Processes Status Section -->
   <div class="processes-status" *ngIf="isRepository">
-    <h3 class="process-title">Procesos</h3>
+    <h3 class="process-title">{{ 'processes' | translate }}</h3>
     <ul class="process-list">
       <li *ngFor="let process of getProcesses()">
         <span class="status-led"
@@ -68,31 +68,47 @@
   </div>
 
   <!-- Installed OgLives / Subnets Section -->
-  <div>
-    <h3>{{ isDhcp ? ('subnets' | translate) : ('InstalledOglivesTitle' | translate)}}</h3>
+  <div *ngIf="!isRepository && !isDhcp">
+    <h3>{{ 'InstalledOglivesTitle' | translate }}</h3>
     <table>
       <thead>
         <tr>
           <th>{{ 'idLabel' | translate }}</th>
-          <th *ngIf="!isDhcp">{{ 'kernelLabel' | translate }}</th>
-          <th *ngIf="!isDhcp">{{ 'architectureLabel' | translate }}</th>
-          <th *ngIf="!isDhcp">{{ 'revisionLabel' | translate }}</th>
-          <th *ngIf="isDhcp">{{ 'bootFileNameLabel' | translate }}</th>
-          <th *ngIf="isDhcp">{{ 'nextServerLabel' | translate }}</th>
-          <th *ngIf="isDhcp">{{ 'ipLabel' | translate }}</th>
-          <th *ngIf="isDhcp">{{ 'clientsLabel' | translate }}</th>
+          <th>{{ 'kernelLabel' | translate }}</th>
+          <th>{{ 'architectureLabel' | translate }}</th>
+          <th>{{ 'revisionLabel' | translate }}</th>
         </tr>
       </thead>
       <tbody>
-        <tr *ngFor="let item of isDhcp ? subnets : installedOgLives">
+        <tr *ngFor="let item of installedOgLives">
           <td>{{ item.id }}</td>
-          <td *ngIf="!isDhcp">{{ item.kernel }}</td>
-          <td *ngIf="!isDhcp">{{ item.architecture }}</td>
-          <td *ngIf="!isDhcp">{{ item.revision }}</td>
-          <td *ngIf="isDhcp">{{ item['boot-file-name'] }}</td>
-          <td *ngIf="isDhcp">{{ item['next-server'] }}</td>
-          <td *ngIf="isDhcp">{{ item.subnet }}</td>
-          <td *ngIf="isDhcp">{{ item.reservations.length }}</td>
+          <td>{{ item.kernel }}</td>
+          <td>{{ item.architecture }}</td>
+          <td>{{ item.revision }}</td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+
+  <div *ngIf="isDhcp">
+    <h3>{{ 'subnets' | translate }}</h3>
+    <table>
+      <thead>
+        <tr>
+          <th>{{ 'idLabel' | translate }}</th>
+          <th>{{ 'bootFileNameLabel' | translate }}</th>
+          <th>{{ 'nextServerLabel' | translate }}</th>
+          <th>{{ 'ipLabel' | translate }}</th>
+          <th>{{ 'clientsLabel' | translate }}</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr *ngFor="let item of subnets">
+          <td>{{ item.id }}</td>
+          <td>{{ item['boot-file-name'] }}</td>
+          <td>{{ item['next-server'] }}</td>
+          <td>{{ item.subnet }}</td>
+          <td>{{ item.reservations.length }}</td>
         </tr>
       </tbody>
     </table>

ogWebconsole/src/locale/en.json

@@ -469,5 +469,8 @@
   "organizationalUnitsStepText": "List of Organizational Units. Click on one to view details.",
   "defaultMenuLabel": "Main menu",
   "noClients": "No clients",
-  "GlobalStatus": "Global Status"
+  "GlobalStatus": "Global Status",
+  "RamUsage": "RAM Usage",
+  "CpuUsage": "CPU Usage",
+  "processes": "Processes"
 }

ogWebconsole/src/locale/es.json

@@ -470,5 +470,8 @@
   "organizationalUnitsStepText": "Lista de Unidades Organizacionales. Haz clic en una para ver detalles.",
   "defaultMenuLabel": "Menú por defecto",
   "noClients": "No hay clientes",
-  "GlobalStatus": "Estado Global"
+  "GlobalStatus": "Estado Global",
+  "RamUsage": "Uso de RAM",
+  "CpuUsage": "Uso de CPU",
+  "processes": "Procesos"
 }