Skip to content

fix jobs page: change behavior of the page, show only jobs of a specific project #119

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

Merged
gliegard merged 2 commits into from
Apr 23, 2026
Merged

fix jobs page: change behavior of the page, show only jobs of a specific project #119

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
3939340
fix job page: change behavior of the page, show only jobs of a specif…
gliegard Apr 23, 2026
0437ee9
fix lint
gliegard Apr 23, 2026
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
35 changes: 30 additions & 5 deletions routes/pages/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,21 +67,46 @@ router.get('/project/:id', async (req, res, next) => {
});
});

// jobs page
router.get('/jobs', topBar.getInfo, jobs.getJobs, projects.getProjects, (req, res) => {
// jobs page with id of a project
router.get('/jobs/:id', topBar.getInfo, projects.getProjects, projects.getJobsOfProject, (req, res) => {
res.render('pages/jobs', {
id: req.params.id,
topBar: req.topBar,
filter: req.query.filter,
filter: req.params.id,
projects: req.projects,
data: req.jobs_data,
columns: req.jobs_columns,
data: req.jobs_of_project_data,
columns: req.jobs_of_project_columns,
jobs: req.jobs,
base: req.app.get('baseUrl'),
api: req.app.get('apiUrl'),
version: req.app.get('version'),
});
});

// jobs page
router.get('/jobs', topBar.getInfo, projects.getProjects, (req, res) => {
res.render('pages/jobs', {
id: null,
topBar: req.topBar,
filter: null,
projects: req.projects,
data: '[]',
columns: JSON.stringify([
{ title: 'Id', data: 'job_id' },
{ title: 'Nom', data: 'job_name' },
{ title: 'Statut', data: 'job_status' },
{ title: 'Code retour', data: 'job_return_code' },
{ title: 'Date début', data: 'date' },
{ title: 'Heure début (UTC)', data: 'hms' },
{ title: 'Durée (s)', data: 'duree' },
]),
jobs: [],
base: req.app.get('baseUrl'),
api: req.app.get('apiUrl'),
version: req.app.get('version'),
});
});

// projects page
router.get('/projects', topBar.getInfo, projects.getProjects, (req, res) => {
res.render('pages/projects', {
Expand Down
25 changes: 8 additions & 17 deletions views/partials/tab/jobs_tab.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
<div class="btn-toolbar ml-1 mb-3">
<div class="input-group input-group-sm">
<div class="input-group-prepend">
<label class="input-group-text">Filtrer par projets</label>
<label class="input-group-text">Selectionner un projet</label>
</div>
<select class="custom-select" name="projects" id="project-select">
<option value="-1">-- Tous les projets --</option>
<option value="-1">-- --</option>
<% projects.forEach(function( project ){ %>
<option value="<%= project.project_id %>" <%if (filter && filter==project.project_id) {%> selected <%}%> >
<%= project.project_id %> - <%= project.project_name %>
Expand Down Expand Up @@ -112,22 +112,13 @@ $(document).ready(function() {
$("div.toolbar_tab").append(button);

var table = $('#dataTable').DataTable();
$('#project-select').change( function() {
table.draw();
} );
$('#project-select').change(function() {
var projectId = $(this).val();
if (projectId !== "-1") {
window.location.href = "<%= base %>/jobs/" + projectId;
}
});

} );

$.fn.dataTable.ext.search.push(
function( settings, data, dataIndex ) {
var project_id = $('#project-select').val()
if(project_id == -1){
return true;
}else if(data[7] === project_id){
return true
}else{
return false
}
}
);
</script>
Loading