diff --git a/atdb/taskdatabase/models.py b/atdb/taskdatabase/models.py index 108cdb5df934d65d66c77bf7b89b657851bd603e..c5e7c139b5be70cd2e1bd73e31259f696e088fc5 100644 --- a/atdb/taskdatabase/models.py +++ b/atdb/taskdatabase/models.py @@ -52,12 +52,18 @@ def convert_quality_to_list_for_template(task): try: list.append(str(task.quality_json['uv-coverage'])) + except: + list.append("-") + + try: list.append(str(task.quality_json['sensitivity'])) - list.append(str(task.quality_json['observing-conditions'])) - #list.append("-") + except: + list.append("-") - except Exception as err: - pass + try: + list.append(str(task.quality_json['observing-conditions'])) + except: + list.append("-") return list diff --git a/atdb/taskdatabase/services/algorithms.py b/atdb/taskdatabase/services/algorithms.py index f93a5e05aef7b4cdfb18f0817c0c988298460653..f9a331d1525f182fb636c4725926bbefee57a8b1 100644 --- a/atdb/taskdatabase/services/algorithms.py +++ b/atdb/taskdatabase/services/algorithms.py @@ -120,9 +120,13 @@ def convert_quality_to_html(task): results += "<tr><td><b>Project</b></td><td>" + str(task.project) + "</td></tr>" results += "<tr><td><b>ATDB Filter</b></td><td>" + str(task.filter) + "</td></tr>" results += "<tr><td><b>Quality</b></td><td>" + str(task.quality) + "</td></tr>" - results += "<tr><td><b>QA uv-coverage</b></td><td>" + str(task.quality_json['uv-coverage']) + "</td></tr>" - results += "<tr><td><b>QA sensitivity</b></td><td>" + str(task.quality_json['sensitivity']) + "</td></tr>" - results += "<tr><td><b>QA observing-conditions</b></td><td>" + str(task.quality_json['observing-conditions']) + "</td></tr>" + try: + results += "<tr><td><b>QA uv-coverage</b></td><td>" + str(task.quality_json['uv-coverage']) + "</td></tr>" + results += "<tr><td><b>QA sensitivity</b></td><td>" + str(task.quality_json['sensitivity']) + "</td></tr>" + results += "<tr><td><b>QA observing-conditions</b></td><td>" + str(task.quality_json['observing-conditions']) + "</td></tr>" + except: + # not all tasks have this QA information, if missing, continue (the show must go on) + pass try: results += "<tr><td><b>high_flagging</b></td><td>" + str(task.quality_json['details']['high_flagging']) + "</td></tr>"