Skip to content
Snippets Groups Projects

pull in the newest changes in master

Merged Nico Vermaas requested to merge master into SDC-935-better-plots
4 files
+ 14
2
Compare changes
  • Side-by-side
  • Inline

Files

@@ -724,6 +724,11 @@ def construct_inspectionplots(task,source='task_id'):
@@ -724,6 +724,11 @@ def construct_inspectionplots(task,source='task_id'):
tasks = Task.objects.filter(sas_id=sas_id)
tasks = Task.objects.filter(sas_id=sas_id)
for task in tasks:
for task in tasks:
 
 
# skip 'suspended' and 'discarded' tasks
 
if task.status in ['suspended','discarded']:
 
continue
 
try:
try:
results += '<tr style="background-color:#7EB1C4"><td colspan="3"><b>Task ' + str(task.id) + '</b></td></tr>'
results += '<tr style="background-color:#7EB1C4"><td colspan="3"><b>Task ' + str(task.id) + '</b></td></tr>'
plots = task.quality_json["plots"]
plots = task.quality_json["plots"]
@@ -765,6 +770,11 @@ def construct_summary(task):
@@ -765,6 +770,11 @@ def construct_summary(task):
tasks = Task.objects.filter(sas_id=sas_id)
tasks = Task.objects.filter(sas_id=sas_id)
for task in tasks:
for task in tasks:
 
 
# skip 'suspended' and 'discarded' tasks
 
if task.status in ['suspended', 'discarded']:
 
continue
 
results += '<tr style="background-color:#7EB1C4"><td colspan="3"><b>Task ' + str(task.id) + '</b></td></tr>'
results += '<tr style="background-color:#7EB1C4"><td colspan="3"><b>Task ' + str(task.id) + '</b></td></tr>'
# find the plots in the quality json structure
# find the plots in the quality json structure
Loading