From a00f05688fcb6b3e6bba77d69e7588312af1a399 Mon Sep 17 00:00:00 2001
From: Iris Jeuffrard <114398946+ijeuffrard@users.noreply.github.com>
Date: Mon, 8 Jan 2024 16:52:55 +0100
Subject: [PATCH 1/2] new column machine

---
 middlewares/job.js                         | 4 ++++
 middlewares/project.js                     | 4 ++++
 views/partials/tab/jobs_of_project_tab.ejs | 2 +-
 views/partials/tab/jobs_tab.ejs            | 3 +--
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/middlewares/job.js b/middlewares/job.js
index 4df8f57..645d8bd 100644
--- a/middlewares/job.js
+++ b/middlewares/job.js
@@ -42,6 +42,10 @@ async function getJobs(req, res, next) {
       title: 'Nom du projet',
       data: 'project_name',
     },
+    {
+      title: 'Machine',
+      data: 'session_host',
+    },
     {
       title: 'Action',
       orderable: false,
diff --git a/middlewares/project.js b/middlewares/project.js
index 090b711..0b3248a 100644
--- a/middlewares/project.js
+++ b/middlewares/project.js
@@ -114,6 +114,10 @@ async function getJobsOfProject(req, res, next) {
       title: 'Durée (s)',
       data: 'duree',
     },
+    {
+      title: 'Machine',
+      data: 'session_host',
+    },
     {
       title: 'Action',
       orderable: false,
diff --git a/views/partials/tab/jobs_of_project_tab.ejs b/views/partials/tab/jobs_of_project_tab.ejs
index fa01582..d046712 100644
--- a/views/partials/tab/jobs_of_project_tab.ejs
+++ b/views/partials/tab/jobs_of_project_tab.ejs
@@ -39,7 +39,7 @@ $(document).ready(function() {
       "autoWidth": false,
       "createdRow": function( row, data, dataIndex, cells ) {
           if (data.job_status !== 'failed')
-              $('button', cells[7])[0].style.visibility = "hidden";
+              $('button', cells[8])[0].style.visibility = "hidden";
       },
       "rowCallback": function( row, data, index ) {
           var job_id = $('td:eq(0)', row);
diff --git a/views/partials/tab/jobs_tab.ejs b/views/partials/tab/jobs_tab.ejs
index 78a58db..c902733 100644
--- a/views/partials/tab/jobs_tab.ejs
+++ b/views/partials/tab/jobs_tab.ejs
@@ -29,7 +29,6 @@
 $(document).ready(function() {
     const data = <%- data %>;
     const columns = JSON.parse('<%- columns %>');
-
     var table = $('#dataTable').DataTable( {
         "language": {
             "lengthMenu": "Afficher _MENU_ par page",
@@ -54,7 +53,7 @@ $(document).ready(function() {
         "autoWidth": false,
         "createdRow": function( row, data, dataIndex, cells ) {
             if (data.job_status !== 'failed')
-                $('button', cells[9])[0].style.visibility = "hidden";
+                $('button', cells[10])[0].style.visibility = "hidden";
         },
         "rowCallback": function( row, data, index ) {
             var job_id = $('td:eq(0)', row);

From 692f6e1ba6ec7d04379e1294157dc6a6605c1d5d Mon Sep 17 00:00:00 2001
From: Iris Jeuffrard <114398946+ijeuffrard@users.noreply.github.com>
Date: Fri, 19 Jan 2024 16:21:47 +0100
Subject: [PATCH 2/2] change name host/machine to client

---
 middlewares/host.js                    | 2 +-
 middlewares/job.js                     | 2 +-
 middlewares/project.js                 | 2 +-
 middlewares/session.js                 | 2 +-
 views/pages/hosts.ejs                  | 2 +-
 views/partials/components/job_info.ejs | 2 +-
 views/partials/menu/topbar.ejs         | 2 +-
 views/partials/tab/hosts_tab.ejs       | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/middlewares/host.js b/middlewares/host.js
index 072ec14..5698d6f 100644
--- a/middlewares/host.js
+++ b/middlewares/host.js
@@ -12,7 +12,7 @@ async function getHosts(req, res, next) {
   req.hosts_data = JSON.stringify(arr);
   req.hosts_columns = JSON.stringify([
     {
-      title: 'Host',
+      title: 'Client',
       data: 'host',
     },
     {
diff --git a/middlewares/job.js b/middlewares/job.js
index 645d8bd..0d3b552 100644
--- a/middlewares/job.js
+++ b/middlewares/job.js
@@ -43,7 +43,7 @@ async function getJobs(req, res, next) {
       data: 'project_name',
     },
     {
-      title: 'Machine',
+      title: 'Client',
       data: 'session_host',
     },
     {
diff --git a/middlewares/project.js b/middlewares/project.js
index 0b3248a..866c25a 100644
--- a/middlewares/project.js
+++ b/middlewares/project.js
@@ -115,7 +115,7 @@ async function getJobsOfProject(req, res, next) {
       data: 'duree',
     },
     {
-      title: 'Machine',
+      title: 'Client',
       data: 'session_host',
     },
     {
diff --git a/middlewares/session.js b/middlewares/session.js
index a79982f..60092fc 100644
--- a/middlewares/session.js
+++ b/middlewares/session.js
@@ -9,7 +9,7 @@ async function getSessions(req, res, next) {
       data: 'sessions_id',
     },
     {
-      title: 'Host',
+      title: 'Client',
       data: 'sessions_host',
     },
     {
diff --git a/views/pages/hosts.ejs b/views/pages/hosts.ejs
index 64671f2..072f866 100644
--- a/views/pages/hosts.ejs
+++ b/views/pages/hosts.ejs
@@ -27,7 +27,7 @@
 
           <!-- Page Heading -->
           <div class="d-sm-flex align-items-center justify-content-between mb-4">
-            <h1 class="h3 mb-0 text-gray-800">Visualisation des machines</h1>
+            <h1 class="h3 mb-0 text-gray-800">Visualisation des clients</h1>
           </div>
 
           <%- include ("../partials/menu/topbar") %>
diff --git a/views/partials/components/job_info.ejs b/views/partials/components/job_info.ejs
index 3788643..ffd2445 100644
--- a/views/partials/components/job_info.ejs
+++ b/views/partials/components/job_info.ejs
@@ -46,7 +46,7 @@
             </div>
           </li>
           <li class="list-group-item">Id Session : <%= job.session_id %></li>
-          <li class="list-group-item">Machine : <%= job.session_host %></li>
+          <li class="list-group-item">Client : <%= job.session_host %></li>
       </ul>        
   </div>
 </div>
diff --git a/views/partials/menu/topbar.ejs b/views/partials/menu/topbar.ejs
index 3f70b23..5137d19 100644
--- a/views/partials/menu/topbar.ejs
+++ b/views/partials/menu/topbar.ejs
@@ -69,7 +69,7 @@
         <div class="card-body">
           <div class="row no-gutters align-items-center">
             <div class="col mr-2">
-              <div class="text-xs font-weight-bold text-info text-uppercase mb-1">Hosts</div>
+              <div class="text-xs font-weight-bold text-info text-uppercase mb-1">Clients</div>
               <div class="row no-gutters align-items-center">
                 <div class="col-auto">
                   <div id="topbar_hosts_value" class="h5 mb-0 mr-3 font-weight-bold text-gray-800">0</div>
diff --git a/views/partials/tab/hosts_tab.ejs b/views/partials/tab/hosts_tab.ejs
index 6f08111..71f1603 100644
--- a/views/partials/tab/hosts_tab.ejs
+++ b/views/partials/tab/hosts_tab.ejs
@@ -1,6 +1,6 @@
 <div class="card shadow mb-4 border-left-info h-100 py-2">
     <div class="card-header py-3">
-      <h6 class="m-0 font-weight-bold text-info">Machines <span class="far fa-question-circle collapse-item text-dark" data-toggle="modal" data-target="#hostStatusInfo"></span></h6>
+      <h6 class="m-0 font-weight-bold text-info">Clients <span class="far fa-question-circle collapse-item text-dark" data-toggle="modal" data-target="#hostStatusInfo"></span></h6>
     </div>
     <div class="card-body">
       <div class="table-responsive">