From 394c3d84a394be1ec22d76808ed0846ed3c4a135 Mon Sep 17 00:00:00 2001 From: Iris Jeuffrard <114398946+ijeuffrard@users.noreply.github.com> Date: Fri, 5 Jan 2024 14:50:43 +0100 Subject: [PATCH 1/2] page setter on tabs --- views/partials/tab/hosts_tab.ejs | 23 ++++++- views/partials/tab/job_dependencies_tab.ejs | 4 +- views/partials/tab/jobs_of_project_tab.ejs | 60 ++++++++++++------- views/partials/tab/jobs_tab.ejs | 20 ++++++- .../partials/tab/project_dependencies_tab.ejs | 4 +- views/partials/tab/projects_tab.ejs | 20 ++++++- views/partials/tab/sessions_tab.ejs | 25 ++++++-- 7 files changed, 119 insertions(+), 37 deletions(-) diff --git a/views/partials/tab/hosts_tab.ejs b/views/partials/tab/hosts_tab.ejs index 6f08111..e284f11 100644 --- a/views/partials/tab/hosts_tab.ejs +++ b/views/partials/tab/hosts_tab.ejs @@ -18,7 +18,7 @@ var table = $('#dataTable').DataTable( { "language": { - "lengthMenu": "Afficher _MENU_ par page", + "lengthMenu": '
>t<"d-flex m-1"<"mr-auto"i>
>', + "dom": '<"d-flex m-1"<"mr-auto"f><"mr-2"l><"#pagination">><"d-flex m-1"<"mr-auto toolbar_tab">
>t<"d-flex m-1"<"mr-auto"i>
>', "data": data, "columns": columns, "autoWidth": false, @@ -112,6 +112,23 @@ var value = window.prompt(`Modifier le nombre de Threads actifs pour ${host}, ${row.data().active}`, 0); setNbActiveSessions(jsonHosts, value); - } ); + } ); + + //gestion du choix de la page + var group_page_setter = jQuery('
>t<"d-flex m-1"<"mr-auto"i>
>',
+ "dom": '<"d-flex m-1"<"mr-auto"f> >t<"d-flex m-1"<"mr-auto"i> >',
"data": data,
"columns": columns,
"rowCallback": function( row, data, index ) {
diff --git a/views/partials/tab/jobs_of_project_tab.ejs b/views/partials/tab/jobs_of_project_tab.ejs
index fa01582..8ef1600 100644
--- a/views/partials/tab/jobs_of_project_tab.ejs
+++ b/views/partials/tab/jobs_of_project_tab.ejs
@@ -17,7 +17,7 @@ $(document).ready(function() {
var table = $('#dataTableJobs').DataTable( {
"language": {
- "lengthMenu": "Afficher _MENU_ par page",
+ "lengthMenu": ' >t<"d-flex m-1"<"mr-auto"i> >',
+ "dom": '<"d-flex m-1"<"mr-auto"f><"mr-2"l><"#pagination">><"d-flex m-1"<"mr-auto toolbar_tab2"> >t<"d-flex m-1"<"mr-auto"i> >',
"data": data,
"columns": columns,
"autoWidth": false,
@@ -68,29 +68,45 @@ $(document).ready(function() {
}
}
}
-);
+ );
-// Add event listener for actions
-$('#dataTableJobs tbody').on('click', 'button.reinit_job', function () {
- var tr = $(this).closest('tr');
- var row = table.row( tr );
- if (row.data().job_status == 'failed')
- reinitJobs({"ids":[row.data().job_id]});
-} );
+ // Add event listener for actions
+ $('#dataTableJobs tbody').on('click', 'button.reinit_job', function () {
+ var tr = $(this).closest('tr');
+ var row = table.row( tr );
+ if (row.data().job_status == 'failed')
+ reinitJobs({"ids":[row.data().job_id]});
+ } );
-// Add btn Réinitialiser les jobs en échecs
-var i = jQuery('');
-i.addClass('fas fa-sync-alt fa-1x')
+ // Add btn Réinitialiser les jobs en échecs
+ var i = jQuery('');
+ i.addClass('fas fa-sync-alt fa-1x')
-var button = jQuery('');
-button.addClass('btn btn-warning');
-button.attr('type', 'button')
- .attr('data-toggle', "tooltip")
- .attr('title', 'Réinitialise tous les jobs en échecs visibles')
- .attr('onclick', 'reinitFilteredJobs($("#dataTableJobs").DataTable())')
- .append(i)
- .append(' Réinitialiser les jobs en échecs visibles');
-$("div.toolbar_tab2").append(button);
+ var button = jQuery('');
+ button.addClass('btn btn-warning');
+ button.attr('type', 'button')
+ .attr('data-toggle', "tooltip")
+ .attr('title', 'Réinitialise tous les jobs en échecs visibles')
+ .attr('onclick', 'reinitFilteredJobs($("#dataTableJobs").DataTable())')
+ .append(i)
+ .append(' Réinitialiser les jobs en échecs visibles');
+ $("div.toolbar_tab2").append(button);
+ //gestion du choix de la page
+ var group_page_setter = jQuery(' >t<"d-flex m-1"<"mr-auto"i> >',
+ "dom": '<"d-flex m-1"<"mr-auto"f><"mr-2"l><"#pagination">><"d-flex m-1"<"mr-auto toolbar_tab"> >t<"d-flex m-1"<"mr-auto"i> >',
"data": data,
"columns": columns,
"autoWidth": false,
@@ -116,6 +116,22 @@ $(document).ready(function() {
table.draw();
} );
+ //gestion du choix de la page
+ var group_page_setter = jQuery(' >t<"d-flex m-1"<"mr-auto"i>>',
+ "dom": '<"d-flex m-1"<"mr-auto"f> >t<"d-flex m-1"<"mr-auto"i> >',
"data": data,
"columns": columns,
"rowCallback": function( row, data, index ) {
diff --git a/views/partials/tab/projects_tab.ejs b/views/partials/tab/projects_tab.ejs
index 0cbd2d0..869008e 100644
--- a/views/partials/tab/projects_tab.ejs
+++ b/views/partials/tab/projects_tab.ejs
@@ -17,7 +17,7 @@
var table = $('#dataTable').DataTable( {
"language": {
- "lengthMenu": "Afficher _MENU_ par page",
+ "lengthMenu": ' >t<"d-flex m-1"<"mr-auto"i> >',
+ "dom": '<"d-flex m-1"<"mr-auto"f><"mr-2"l><"#pagination">><"d-flex m-1"<"mr-auto toolbar_tab"> >t<"d-flex m-1"<"mr-auto"i> >',
"data": data,
"columns": columns,
"autoWidth": false,
@@ -132,5 +132,21 @@
buttonPriorityFilteredProject.append(dropdownMenu)
$("div.toolbar_tab").append(buttonPriorityFilteredProject);
+ //gestion du choix de la page
+ var group_page_setter = jQuery(' >t<"d-flex m-1"<"mr-auto"i> >',
+ "dom": '<"d-flex m-1"<"mr-auto"f><"mr-2"l><"#pagination">><"d-flex m-1"<"mr-auto toolbar_tab"> >t<"d-flex m-1"<"mr-auto"i> >',
"data": data,
"columns": columns,
"autoWidth": false,
@@ -91,12 +91,29 @@
$('#host-select').change( function() {
table.draw();
} );
+
+ //gestion du choix de la page
+ var group_page_setter = jQuery(' >t<"d-flex m-1"<"mr-auto"i> >',
+ "dom": '<"d-flex m-1"<"mr-auto"f><"mr-2"l><"#pagination">><"d-flex m-1"<"mr-auto toolbar_tab"> >t<"d-flex m-1"<"mr-auto"i> >',
"data": data,
"columns": columns,
"rowCallback": function( row, data, index ) {
@@ -65,5 +65,23 @@
}
}
);
+
+ //gestion du choix de la page
+ var group_page_setter = jQuery(' >t<"d-flex m-1"<"mr-auto"i> >',
+ "dom": '<"d-flex m-1"<"mr-auto"f><"mr-2"l><"#pagination-deps">><"d-flex m-1"<"mr-auto toolbar_tab"> >t<"d-flex m-1"<"mr-auto"i> >',
"data": data,
"columns": columns,
"rowCallback": function( row, data, index ) {
@@ -61,5 +61,24 @@
}
}
});
+
+
+ //gestion du choix de la page
+ var group_page_setter = jQuery('
+
@@ -15,7 +15,7 @@
const data = JSON.parse('<%- data %>');
const columns = JSON.parse('<%- columns %>');
- var table = $('#dataTable').DataTable( {
+ var table = $('#dataTableDeps').DataTable( {
"language": {
"lengthMenu": '