From e2f48f995f8e350aebb8dfd2b0e064f10ab7bb75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sun, 13 Feb 2022 15:28:59 +0100 Subject: [PATCH] jobsets: Show status of next evaluation as emoji This also cleans up the tt code because it was quite horrible to look at imo --- src/root/common.tt | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/root/common.tt b/src/root/common.tt index 6b4e406ee..a42c5e2ab 100644 --- a/src/root/common.tt +++ b/src/root/common.tt @@ -596,11 +596,18 @@ BLOCK renderJobsetOverview %] [% IF showProject; INCLUDE renderFullJobsetName project=j.get_column('project') jobset=j.name inRow=1; ELSE; INCLUDE renderJobsetName project=j.get_column('project') jobset=j.name inRow=1; END %] [% HTML.escape(j.description) %] - [% IF j.lastcheckedtime; - INCLUDE renderDateTime timestamp = j.lastcheckedtime; - IF j.errormsg || j.fetcherrormsg; %] Error[% END; - ELSE; "-"; - END %] + [% IF j.lastcheckedtime %] + [% INCLUDE renderDateTime timestamp = j.lastcheckedtime %]  + [% IF j.starttime %]New evaluation running + [% ELSIF j.triggertime %] + [% ELSIF j.fetcherrormsg %]Fetching failed + [% ELSIF j.errormsg %]Last evaluation failed + [% ELSE %]Succeeded + [% END %] + [% ELSE %] + - + [% END %] + [% IF j.get_column('nrtotal') > 0 %] [% successrate = ( j.get_column('nrsucceeded') / j.get_column('nrtotal') )*100 %] [% IF j.get_column('nrscheduled') > 0 %]