Merge pull request #244 from preranaandure/master

Fix issue with User details page Licence, Returns etc dashboards and issue with PDF original issue date.
dbca-wa · Mar 18, 2024 · ac4c923 · ac4c923
2 parents e2be8c8 + bb310c8
commit ac4c923
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/wildlifecompliance/components/licences/pdf.py b/wildlifecompliance/components/licences/pdf.py
@@ -359,7 +359,7 @@ def _create_licence_purpose(
             date_values.insert(
                 0,
                 Paragraph(
-                    issued_purpose.original_issue_date,
+                    issued_purpose.original_issue_date.strftime('%d/%m/%Y'),
                     styles['Left']))
 
         delegation.append(

diff --git a/wildlifecompliance/frontend/wildlifecompliance/src/components/internal/users/manage.vue b/wildlifecompliance/frontend/wildlifecompliance/src/components/internal/users/manage.vue
@@ -323,9 +323,9 @@ export default {
             activate_tables: false,
             comms_url: helpers.add_endpoint_json(api_endpoints.users,vm.$route.params.user_id+'/comms_log'),
             logs_url: helpers.add_endpoint_json(api_endpoints.users,vm.$route.params.user_id+'/action_log'),
-            applications_url: api_endpoints.applications_paginated+'internal_datatable_list?user_id='+vm.$route.params.user_id,
-            licences_url: api_endpoints.licences_paginated+'internal_datatable_list?user_id='+vm.$route.params.user_id,
-            returns_url: api_endpoints.returns_paginated+'user_datatable_list?user_id='+vm.$route.params.user_id,
+            applications_url: api_endpoints.applications_paginated+'internal_datatable_list?format=datatables&user_id='+vm.$route.params.user_id,
+            licences_url: api_endpoints.licences_paginated+'internal_datatable_list?format=datatables&user_id='+vm.$route.params.user_id,
+            returns_url: api_endpoints.returns_paginated+'user_datatable_list?format=datatables&user_id='+vm.$route.params.user_id,
             orgRequest_pending: [],
             datepickerOptions:{
                 format: 'DD/MM/YYYY',