Skip to content

Commit 279bd06

Browse files
keshav-spacekeshav-space
committed
Handle the stats for queued pipeline
Signed-off-by: Keshav Priyadarshi <git@keshav.space>
1 parent a96f775 commit 279bd06

File tree

3 files changed

+58
-49
lines changed

3 files changed

+58
-49
lines changed

‎vulnerabilities/templates/pipeline_run_details.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@ <h1 class="title">{{ pipeline_name }} Run Log</h1>
5959
<p class="is-size-7 has-text-weight-semibold">Status</p>
6060
<p class="has-text-grey is-size-7">
6161
{% if run.status == "running" %}
62-
<i class="fa fa-spinner fa-spin has-text-info mr-1"></i>Running
62+
<i class="fa fa-spinner fa-spin has-text-info mr-1"></i>Running
6363
{% elif run.status == "success" %}
64-
<i class="fa fa-check-circle has-text-success mr-1"></i>Success
64+
<i class="fa fa-check-circle has-text-success mr-1"></i>Success
6565
{% elif run.status == "failure" %}
66-
<i class="fa fa-times-circle has-text-danger mr-1"></i>Failure
67-
{% elif run.status == "scheduled" %}
68-
<i class="fa fa-clock-o has-text-success mr-1"></i>Scheduled
66+
<i class="fa fa-times-circle has-text-danger mr-1"></i>Failure
67+
{% elif run.status == "queued" %}
68+
<i class="fa fa-clock-o has-text-grey mr-1"></i>Queued
6969
{% else %}
70-
<i class="fa fa-question-circle has-text-warning mr-1"></i>Unknown
70+
<i class="fa fa-question-circle has-text-warning mr-1"></i>Unknown
7171
{% endif %}
7272
</p>
7373
</div>
@@ -81,7 +81,7 @@ <h1 class="title">{{ pipeline_name }} Run Log</h1>
8181
</div>
8282
<div class="column is-one-fifth-desktop is-one-quarter-tablet is-half-mobile">
8383
<p class="is-size-7 has-text-weight-semibold">Start</p>
84-
<p class="has-text-grey is-size-7">{{ run.run_start_date }}</p>
84+
<p class="has-text-grey is-size-7">{{ run.run_start_date|default:"N/A" }}</p>
8585
</div>
8686
<div class="column is-one-fifth-desktop is-one-quarter-tablet is-half-mobile ">
8787
<p class="is-size-7 has-text-weight-semibold">End</p>

‎vulnerabilities/templates/pipeline_run_list.html‎

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
{% block extrahead %}
88
<style>
9-
109
thead th {
1110
border-bottom: none !important;
1211
}
@@ -65,31 +64,38 @@ <h1>{{ pipeline_name }} Runs</h1>
6564
<div class="column is-one-eighth">
6665
<span class="is-flex is-align-items-center">
6766
{% if run.status == "running" %}
68-
<span class="icon has-text-info mr-1"><i class="fa fa-spinner fa-spin"></i></span>
69-
<span>Running</span>
67+
<span class="icon has-text-info mr-1"><i class="fa fa-spinner fa-spin"></i></span>
68+
<span>Running</span>
7069
{% elif run.status == "success" %}
71-
<span class="icon has-text-success mr-1"><i class="fa fa-check-circle"></i></span>
72-
<span>Success</span>
70+
<span class="icon has-text-success mr-1"><i class="fa fa-check-circle"></i></span>
71+
<span>Success</span>
7372
{% elif run.status == "failure" %}
74-
<span class="icon has-text-danger mr-1"><i class="fa fa-times-circle"></i></span>
75-
<span>Failure</span>
76-
{% elif run.status == "scheduled" %}
77-
<span class="icon has-text-grey mr-1"><i class="fa fa-clock-o"></i></span>
78-
<span>Scheduled</span>
73+
<span class="icon has-text-danger mr-1"><i class="fa fa-times-circle"></i></span>
74+
<span>Failure</span>
75+
{% elif run.status == "queued" %}
76+
<span class="icon has-text-grey mr-1"><i class="fa fa-clock-o"></i></span>
77+
<span>Queued</span>
7978
{% else %}
80-
<span class="icon mr-1"><i class="fa fa-question-circle"></i></span>
81-
<span>Unknown</span>
79+
<span class="icon mr-1"><i class="fa fa-question-circle"></i></span>
80+
<span>Unknown</span>
8281
{% endif %}
8382
</span>
8483
</div>
85-
<div class="column is-one-eighth">{{ run.execution_time }}</div>
86-
<div class="column is-one-fifth has-text-grey-light" title="{{ run.latest_run_date }}">
87-
{{ run.run_start_date|date:"Y-m-d H:i" }}
88-
</div>
89-
<div class="column is-one-fifth has-text-grey-light" title="{{ run.next_run_date }}">
90-
{{ run.run_end_date|date:"Y-m-d H:i" }}
91-
</div>
92-
84+
<div class="column is-one-eighth has-text-grey">{{ run.execution_time|default_if_none:"N/A" }}</div>
85+
<div class="column is-one-fifth has-text-grey">
86+
{% if run.run_start_date %}
87+
{{ run.run_start_date|date:"Y-m-d H:i" }}
88+
{% else %}
89+
N/A
90+
{% endif %}
91+
</div>
92+
<div class="column is-one-fifth has-text-grey">
93+
{% if run.run_end_date %}
94+
{{ run.run_end_date|date:"Y-m-d H:i" }}
95+
{% else %}
96+
N/A
97+
{% endif %}
98+
</div>
9399
</div>
94100
</a>
95101
</td>

‎vulnerabilities/templates/pipeline_schedule_list.html‎

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -71,42 +71,45 @@ <h1>Pipeline Schedule</h1>
7171
<a href="{% url 'runs-list' pipeline_id=schedule.pipeline_id %}" class="has-text-info">
7272
<div class="columns px-1 is-mobile is-vcentered">
7373
<div class="column is-one-quarter">{{ schedule.pipeline_id }}</div>
74-
<div class="column is-one-eighth">{{ schedule.is_active|yesno:"Yes,No" }}</div>
75-
<div class="column is-one-eighth">{{ schedule.run_interval }}day</div>
74+
<div class="column is-one-eighth has-text-grey">{{ schedule.is_active|yesno:"Yes,No" }}</div>
75+
<div class="column is-one-eighth has-text-grey">{{ schedule.run_interval }}day</div>
7676
<div class="column is-one-eighth">
7777
<span class="is-flex is-align-items-center">
7878
{% if schedule.status == "running" %}
79-
<span class="icon has-text-info mr-1"><i
80-
class="fa fa-spinner fa-spin"></i></span>
81-
<span>Running</span>
79+
<span class="icon has-text-info mr-1"><i
80+
class="fa fa-spinner fa-spin"></i></span>
81+
<span>Running</span>
8282
{% elif schedule.status == "success" %}
83-
<span class="icon has-text-success mr-1"><i
84-
class="fa fa-check-circle"></i></span>
85-
<span>Success</span>
83+
<span class="icon has-text-success mr-1"><i
84+
class="fa fa-check-circle"></i></span>
85+
<span>Success</span>
8686
{% elif schedule.status == "failure" %}
87-
<span class="icon has-text-danger mr-1"><i
88-
class="fa fa-times-circle"></i></span>
89-
<span>Failure</span>
90-
{% elif schedule.status == "scheduled" %}
91-
<span class="icon has-text-success mr-1"><i
92-
class="fa fa-clock-o"></i></span>
93-
<span>Scheduled</span>
87+
<span class="icon has-text-danger mr-1"><i
88+
class="fa fa-times-circle"></i></span>
89+
<span>Failure</span>
90+
{% elif schedule.status == "queued" %}
91+
<span class="icon has-text-grey mr-1"><i
92+
class="fa fa-clock-o"></i></span>
93+
<span>Queued</span>
9494
{% else %}
95-
<span class="icon has-text-warning mr-1"><i class="fa fa-question-circle"></i></span>
96-
<span>Unknown</span>
95+
<span class="icon has-text-warning mr-1"><i
96+
class="fa fa-question-circle"></i></span>
97+
<span>Unknown</span>
9798
{% endif %}
9899
</span>
99100
</div>
100-
101-
<div class="column is-one-fifth has-text-grey-light"
101+
<div class="column is-one-fifth has-text-grey"
102102
title="{{ schedule.latest_run_date }}">
103-
{{ schedule.latest_run_date|date:"Y-m-d H:i" }}
103+
{% if schedule.latest_run_date %}
104+
{{ schedule.latest_run_date|date:"Y-m-d H:i" }}
105+
{% else %}
106+
N/A
107+
{% endif %}
104108
</div>
105-
<div class="column is-one-fifth has-text-grey-light"
109+
<div class="column is-one-fifth has-text-grey"
106110
title="{{ schedule.next_run_date }}">
107111
{{ schedule.next_run_date|date:"Y-m-d" }}
108112
</div>
109-
110113
</div>
111114
</a>
112115
</td>

0 commit comments

Comments
 (0)