From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 1 Aug 2023 15:50:06 +0000 (+0000)
Subject: jobs: Group by date
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad480de045d90b69a2f74cc9832fb40b1fb99670;p=pbs.git

jobs: Group by date

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/templates/jobs/index.html b/src/templates/jobs/index.html
index 4c896b75..c9fd8d0e 100644
--- a/src/templates/jobs/index.html
+++ b/src/templates/jobs/index.html
@@ -23,9 +23,14 @@
 
 	<section class="section">
 		<div class="container">
-			<div class="block">
-				{% module JobsQueue(jobs) %}
-			</div>
+			{# Render all jobs #}
+			{% for date in jobs %}
+				<div class="block">
+					<h4 class="title is-4">{{ locale.format_day(date) }}</h4>
+
+					{% module JobsQueue(jobs[date]) %}
+				</div>
+			{% end %}
 
 			<div class="block">
 				<nav class="pagination is-centered" role="navigation" aria-label="pagination">
diff --git a/src/web/jobs.py b/src/web/jobs.py
index 303a42fa..9e214db8 100644
--- a/src/web/jobs.py
+++ b/src/web/jobs.py
@@ -4,6 +4,7 @@ import logging
 import tornado.web
 import tornado.websocket
 
+from .. import misc
 from . import base
 from . import ui_modules
 
@@ -148,6 +149,9 @@ class IndexHandler(base.BaseHandler):
 		with self.db.transaction():
 			jobs = self.backend.jobs.get_finished(limit=limit, offset=offset)
 
+			# Group jobs by date
+			jobs = misc.group(jobs, lambda job: job.finished_at.date())
+
 		self.render("jobs/index.html", jobs=jobs, limit=limit, offset=offset)