Skip to content

new column machine #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ijeuffrard wants to merge 2 commits into
base: main
Choose a base branch
from
Open

new column machine #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a00f056
new column machine
ijeuffrard Jan 8, 2024
692f6e1
change name host/machine to client
ijeuffrard Jan 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion middlewares/host.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
{
Expand Down
4 changes: 4 additions & 0 deletions middlewares/job.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ async function getJobs(req, res, next) {
title: 'Nom du projet',
data: 'project_name',
},
{
title: 'Client',
data: 'session_host',
},
{
title: 'Action',
orderable: false,
Expand Down
4 changes: 4 additions & 0 deletions middlewares/project.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,10 @@ async function getJobsOfProject(req, res, next) {
title: 'Durée (s)',
data: 'duree',
},
{
title: 'Client',
data: 'session_host',
},
{
title: 'Action',
orderable: false,
Expand Down
2 changes: 1 addition & 1 deletion middlewares/session.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ async function getSessions(req, res, next) {
data: 'sessions_id',
},
{
title: 'Host',
title: 'Client',
data: 'sessions_host',
},
{
Expand Down
2 changes: 1 addition & 1 deletion views/pages/hosts.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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") %>
Expand Down
2 changes: 1 addition & 1 deletion views/partials/components/job_info.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion views/partials/menu/topbar.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion views/partials/tab/hosts_tab.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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">
Expand Down
2 changes: 1 addition & 1 deletion views/partials/tab/jobs_of_project_tab.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 1 addition & 2 deletions views/partials/tab/jobs_tab.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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);
Expand Down