From 413daeba01a6c8ae74bbe155272df184ec888a60 Mon Sep 17 00:00:00 2001 From: preranaandure Date: Thu, 14 Mar 2024 12:17:10 +0800 Subject: [PATCH 1/2] Fix issue with User details page Applications, Licence, Return datatables url format --- package-lock.json | 3 +++ .../src/components/internal/users/manage.vue | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 package-lock.json diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 000000000..48e341a09 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,3 @@ +{ + "lockfileVersion": 1 +} diff --git a/wildlifecompliance/frontend/wildlifecompliance/src/components/internal/users/manage.vue b/wildlifecompliance/frontend/wildlifecompliance/src/components/internal/users/manage.vue index ecb8b56da..23bf23f59 100644 --- 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', From bb310c87ef1f41390fa380711e298c35fecdf730 Mon Sep 17 00:00:00 2001 From: preranaandure Date: Mon, 18 Mar 2024 15:52:15 +0800 Subject: [PATCH 2/2] Fix issue with PDF original Issue date --- wildlifecompliance/components/licences/pdf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wildlifecompliance/components/licences/pdf.py b/wildlifecompliance/components/licences/pdf.py index cda9969f8..a942ed04a 100644 --- 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(