Merge branch 'master' into 'dev-nico'

Master

See merge request !120

atdb/taskdatabase/templates/taskdatabase/details/inputs.html

@@ -7,11 +7,37 @@
  <div class="card-body">
      <h3>Inputs </h3>
        <table class="table table-striped">
-           <tbody>
-            {{ results | safe }}
+           <tbody  id="inputs_table">
            </tbody>
        </table>
  </div>
 </div>
+<script>
+    var inputs_values = {{ resultsjson | safe }}
 
+    function generate_tree(tree, div) {
+        if (Array.isArray(tree)) {
+            var array = $("<tbody></tbody>")
+            div.append(array)
+            for (let row_index in tree) {
+                var row = $('<tr></tr>')
+                generate_tree(tree[row_index], row)
+                array.append(row)
+            }
+
+        } else if (typeof (tree) === 'object' && tree !== null) {
+            for (var att_name in tree) {
+                var row = $(`<tr><td><b>${att_name}</b></td></tr>`)
+                generate_tree(tree[att_name], row);
+                div.append(
+                    row
+                )
+            }
+        } else {
+            div.append(`<td>${tree}</td>`)
+        }
+    }
+
+    generate_tree(inputs_values, $('#inputs_table'))
+</script>
 {% endblock %}
\ No newline at end of file

atdb/taskdatabase/templates/taskdatabase/details/outputs.html

-
 {% load static %}
 {% block myBlock %}
 
@@ -7,11 +6,39 @@
     <div class="card-body">
         <h3>Outputs </h3>
         <table class="table table-striped">
-           <tbody>
-              {{ results | safe }}
+            <tbody id="output_values">
+
             </tbody>
         </table>
     </div>
 </div>
 
+
+<script>
+    var output_values = {{ resultsjson | safe }}
+
+    function generate_tree(tree, div) {
+        if (Array.isArray(tree)) {
+            var array = $("<tbody></tbody>")
+            div.append(array)
+            for (let row_index in tree) {
+                var row = $('<tr></tr>')
+                generate_tree(tree[row_index], row)
+                array.append(row)
+            }
+        } else if (typeof (tree) === 'object' && tree !== null) {
+            for (var att_name in tree) {
+                var row = $(`<tr><td><b>${att_name}</b></td></tr>`)
+                generate_tree(tree[att_name], row);
+                div.append(
+                    row
+                )
+            }
+        } else {
+            div.append(`<td>${tree}</td>`)
+        }
+    }
+
+    generate_tree(output_values, $('#output_values'))
+</script>
 {% endblock %}
\ No newline at end of file

atdb/taskdatabase/views.py

@@ -267,7 +267,7 @@ def ShowInputs(request, id):
 
     # convert the json to a presentable piece of html for the output template
     results = algorithms.convert_list_of_dicts_to_html(task.inputs)
-    return render(request, "taskdatabase/details/inputs.html", {'results': results})
+    return render(request, "taskdatabase/details/inputs.html", {'results': results, 'resultsjson': task.inputs})
 
 
 def ShowOutputs(request, id):
@@ -275,7 +275,7 @@ def ShowOutputs(request, id):
 
     # convert the json to a presentable piece of html for the output template
     results = algorithms.convert_list_of_dicts_to_html(task.outputs)
-    return render(request, "taskdatabase/details/outputs.html", {'results': results})
+    return render(request, "taskdatabase/details/outputs.html", {'results': results, 'resultsjson': task.outputs})
 
 
 def ShowMetrics(request, id):