From: Michael Tremer Date: Tue, 31 May 2022 14:37:43 +0000 (+0000) Subject: templates: Tried to refactor job list X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9060b61362272fa818a913a415e7c33080cfc3fb;p=pbs.git templates: Tried to refactor job list Signed-off-by: Michael Tremer --- diff --git a/src/buildservice/builders.py b/src/buildservice/builders.py index 208fc4ae..070a92cd 100644 --- a/src/buildservice/builders.py +++ b/src/buildservice/builders.py @@ -128,6 +128,9 @@ class Builder(base.DataObject): return NotImplemented + def __str__(self): + return self.hostname + def log(self, action, user=None): user_id = None if user: diff --git a/src/buildservice/jobs.py b/src/buildservice/jobs.py index 462fc9d3..59d2789f 100644 --- a/src/buildservice/jobs.py +++ b/src/buildservice/jobs.py @@ -243,6 +243,21 @@ class Job(base.DataObject): return job + def is_active(self): + """ + Returns True if this job is active + """ + return self.time_started and not self.time_finished + + def has_finished(self): + if self.time_finished: + return True + + return False + + def has_failed(self): + return self.state == "failed" + def delete(self): """ Deletes a job from the database diff --git a/src/templates/index.html b/src/templates/index.html index a05ce2b4..d92be776 100644 --- a/src/templates/index.html +++ b/src/templates/index.html @@ -7,11 +7,9 @@

{{ _("Development Powered By Community") }}

{% if jobs %} -
-
{{ _("Current Jobs") }}
+
{{ _("Current Jobs") }}
- {% module JobsList(jobs) %} -
+ {% module JobsList(jobs) %} {% end %} diff --git a/src/templates/modules/jobs/list.html b/src/templates/modules/jobs/list.html index 0ed26300..b812dd5b 100644 --- a/src/templates/modules/jobs/list.html +++ b/src/templates/modules/jobs/list.html @@ -1,60 +1,42 @@ - -
- - - - - - - - - +{% for job in jobs %} +
+
+
+
+ + {{ job }} + +
+
-
- {% for job in jobs %} - {% if job.state in ("running",) %} - - {% elif job.state in ("dispatching", "uploading") %} - - {% elif job.state in ("aborted", "failed") %} - - {% else %} - - {% end %} +
+
+ {% if job.is_active() %} +
  • + {{ format_time(job.duration, shorter=True) }} +
    • + {% elif job.has_finished() %} +
  • + {{ _("Finished %s") % \ + locale.format_date(job.time_finished, shorter=True) }} +
    • + {% end %} -
    + {% if job.build.owner %} +
  • + {{ _("by %s") % job.build.owner }} +
    • + {% end %} - - - - - - - {% end %} - -
    {{ _("Build job") }}{{ _("Builder") }}{{ _("Runtime") }}
    - {% module JobState(job, show_icon=True) %} - - - {{ job.build.name }}.{{ job.arch }} - - {% if job.build.type == "scratch" %} - S - {% elif job.test %} - T - {% end %} - - {% if job.builder %} - - {{ job.builder.name }} + {% if job.builder %} +
  • + + {{ _("on %s") % job.builder }} - {% else %} - {{ _("N/A") }} - {% end %} -
    		• - {{ format_time(job.duration, shorter=True) }} -
    -
     + + {% end %} + + + + +{% end %}