diff --git a/atdb/docs/ATDB-LDV Data Model.png b/atdb/docs/ATDB-LDV Data Model.png index dddbea009638fce87eaf9742381bcf4d237b7507..ed9355872856acd73a88bd7f901c586cafd828d0 100644 Binary files a/atdb/docs/ATDB-LDV Data Model.png and b/atdb/docs/ATDB-LDV Data Model.png differ diff --git a/atdb/taskdatabase/services/algorithms.py b/atdb/taskdatabase/services/algorithms.py index bc00e0def6a0441446a9088f2b23cf19734f8560..90a1308f2524362dda975051e1fbd9596cbb0f72 100644 --- a/atdb/taskdatabase/services/algorithms.py +++ b/atdb/taskdatabase/services/algorithms.py @@ -39,27 +39,30 @@ def get_size(status_list): def convert_logentries_to_html(log_entries): results = "" - results += "<th>service</th><th>status</th><th>timestamp</th><th>cpu_cycles</th><th>wall_clock_time</th><th>logfile</th>" - results += "<tbody>" - for log in log_entries: - line = "<tr><td><b>" + log.step_name + '</b></td>' - line +='<td class="' + log.status + '" >' + log.status + "</td>" - try: - line += "<td>" + str(log.timestamp.strftime("%m-%d-%Y, %H:%M:%S")) + "</td>" - except: - line += "<td>no timetamp</td>" - - line += "<td>" + str(log.cpu_cycles) + "</td>" - line += "<td>" + str(log.wall_clock_time) + "</td>" - if log.url_to_log_file!=None: - link = "<a href=" + '"' + str(log.url_to_log_file) + '" target="_blank">' + "logfile" + "</a>" - else: - link = "-" - line += "<td>" + link + "</td>" - results += line - - results += "</tbody>" - + try: + results += "<th>service</th><th>status</th><th>timestamp</th><th>cpu_cycles</th><th>wall_clock_time</th><th>logfile</th>" + results += "<tbody>" + for log in log_entries: + line = "<tr><td><b>" + log.step_name + '</b></td>' + line +='<td class="' + log.status + '" >' + log.status + "</td>" + try: + line += "<td>" + str(log.timestamp.strftime("%m-%d-%Y, %H:%M:%S")) + "</td>" + except: + line += "<td>no timetamp</td>" + + line += "<td>" + str(log.cpu_cycles) + "</td>" + line += "<td>" + str(log.wall_clock_time) + "</td>" + if log.url_to_log_file!=None: + link = "<a href=" + '"' + str(log.url_to_log_file) + '" target="_blank">' + "logfile" + "</a>" + else: + link = "-" + line += "<td>" + link + "</td>" + results += line + + results += "</tbody>" + except Exception as err: + results = "<tr><td>"+str(err)+"</td></tr>" + #results = "<tr><td>no data</td></tr>" return results diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html index 8b60b62b7f1537501d4af19ad0eab9b9f2dc942c..cbc2e5bec97019bf074aa464d53250d36d7ec8e2 100644 --- a/atdb/taskdatabase/templates/taskdatabase/index.html +++ b/atdb/taskdatabase/templates/taskdatabase/index.html @@ -80,7 +80,7 @@ {% include 'taskdatabase/pagination.html' %} </div> </div> - <p class="footer"> Version 1.0.0 (18 mar 2021 - 12:00) + <p class="footer"> Version 1.0.0 (18 mar 2021 - 14:00) </div>