Merge pull request #291 from Sherwin-14/display

Added Sort Functionality to assessments and object library

CHANGELOG.md

@@ -1,5 +1,6 @@
 ## v2.3.0 (2024-10-02)
 
+* Add sort functionality to assessments and object library pages
 * Allow null performance and criticality ratings on links (db migration ea1181510e10)
     * Null performance is displayed as gray
     * Null criticality is displayed as a thin line

usaon_benefit_tool/templates/assessments.html

@@ -44,7 +44,7 @@ <h5>
   {% endif %}
 
 
-  <table class='table'>
+  <table class='table' id="assessment">
 
     <thead>
       <tr>
@@ -87,5 +87,11 @@ <h5>
     </tbody>
 
   </table>
+{% endblock %}
+
+{% block scripts %}
+  {{ super() }}
 
+  {% import 'macros/datatables.j2' as macros %}
+  {{ macros.datatable_script() }}
 {% endblock %}

usaon_benefit_tool/templates/base.html

@@ -94,6 +94,8 @@
         return new bootstrap.Tooltip(tooltipTriggerEl)
       })
     </script>
+  <link href="https://cdn.jsdelivr.net/npm/simple-datatables@latest/dist/style.css" rel="stylesheet" type="text/css">
+  <script src="https://cdn.jsdelivr.net/npm/simple-datatables@latest" type="text/javascript"></script>
   {% endblock %}
 
 </body>

usaon_benefit_tool/templates/macros/buttons.j2

@@ -9,7 +9,7 @@
     class="btn btn-danger text-nowrap"
     role="button"
   >
-    {{render_icon('trash3-fill')}} {{text}}
+    {{text}}
   </button>
 {%- endmacro -%}
 

usaon_benefit_tool/templates/macros/datatables.j2

@@ -0,0 +1,9 @@
+{% macro datatable_script() %}
+  <script>
+    const dataTable = new simpleDatatables.DataTable("table", {
+      searchable: true,
+      fixedHeight: true,
+      paging: false,
+    })
+  </script>
+{% endmacro %}

usaon_benefit_tool/templates/nodes.html

@@ -57,6 +57,7 @@ <h2>{% block title %}Object library{% endblock %}</h1>
         <th>Created by</th>
         <th>Created time</th>
         <th>Updated time</th>
+        <th></th>
         {% endif %}
 
       </tr>
@@ -92,5 +93,10 @@ <h2>{% block title %}Object library{% endblock %}</h1>
     </tbody>
 
   </table>
+{% endblock %}
 
+{% block scripts %}
+  {{ super() }}
+  {% import 'macros/datatables.j2' as macros %}
+  {{ macros.datatable_script() }}
 {% endblock %}

usaon_benefit_tool/templates/users.html

@@ -9,4 +9,5 @@ <h2>{% block title %}Users{% endblock %}</h1>
     show_actions=True,
     edit_url=('user.get', [('user_id',':id')]),
   ) }}
+
 {% endblock %}