From 9d8d2a68d06db7406bda1acbe627046205c3925b Mon Sep 17 00:00:00 2001 From: Qin Date: Wed, 3 Jul 2024 22:38:29 -0700 Subject: [PATCH 1/7] implemented the basic review contIn table Signed-off-by: Qin --- .../StaffContinuationInReview.vue | 26 ++ .../StaffContinuationInTable.vue | 309 ++++++++++++++++++ auth-web/src/services/business.services.ts | 33 ++ .../views/auth/staff/StaffDashboardView.vue | 10 + 4 files changed, 378 insertions(+) create mode 100644 auth-web/src/components/auth/staff/continuation-in/StaffContinuationInReview.vue create mode 100644 auth-web/src/components/auth/staff/continuation-in/StaffContinuationInTable.vue diff --git a/auth-web/src/components/auth/staff/continuation-in/StaffContinuationInReview.vue b/auth-web/src/components/auth/staff/continuation-in/StaffContinuationInReview.vue new file mode 100644 index 0000000000..1a4fd4709d --- /dev/null +++ b/auth-web/src/components/auth/staff/continuation-in/StaffContinuationInReview.vue @@ -0,0 +1,26 @@ + + + diff --git a/auth-web/src/components/auth/staff/continuation-in/StaffContinuationInTable.vue b/auth-web/src/components/auth/staff/continuation-in/StaffContinuationInTable.vue new file mode 100644 index 0000000000..7ca5e233be --- /dev/null +++ b/auth-web/src/components/auth/staff/continuation-in/StaffContinuationInTable.vue @@ -0,0 +1,309 @@ + + + + + diff --git a/auth-web/src/services/business.services.ts b/auth-web/src/services/business.services.ts index 9b814c984b..0f9e58c5a3 100644 --- a/auth-web/src/services/business.services.ts +++ b/auth-web/src/services/business.services.ts @@ -201,4 +201,37 @@ export default class BusinessService { return response }) } + + static async fetchContinuationBusinesses (): Promise { + // Mock data simulating the expected response structure from the API + return new Promise(resolve => resolve({ + data: [ + { + date: 'July 3, 2024', + nrNumber: 'NR 0001234', + businessIdentifier: 'LN958001', + completingParty: 'John Doe', + status: 'Awaiting Review' + }, + { + date: 'April 4, 2024', + nrNumber: 'NR 0001235', + businessIdentifier: 'LN786002', + completingParty: 'Jane Smith', + status: 'Change Requested' + }, + { + date: 'June 15, 2024', + nrNumber: 'NR 0001239', + businessIdentifier: 'LN965002', + completingParty: 'Test Mark', + status: 'Rejected' + } + ] + } as any)) + + // const url = `${ConfigHelper.getLegalAPIV2Url()}/businesses/continuation-in` + // const response = await axios.get(url) + // return response.data + } } diff --git a/auth-web/src/views/auth/staff/StaffDashboardView.vue b/auth-web/src/views/auth/staff/StaffDashboardView.vue index 85d994369c..7c2637cea4 100644 --- a/auth-web/src/views/auth/staff/StaffDashboardView.vue +++ b/auth-web/src/views/auth/staff/StaffDashboardView.vue @@ -142,6 +142,14 @@ + + + + + Date: Thu, 4 Jul 2024 10:33:35 -0700 Subject: [PATCH 2/7] updated version number Signed-off-by: Qin --- auth-web/package-lock.json | 8 ++++++++ .../staff/continuation-in/StaffContinuationInTable.vue | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/auth-web/package-lock.json b/auth-web/package-lock.json index 6383207580..01fd569081 100644 --- a/auth-web/package-lock.json +++ b/auth-web/package-lock.json @@ -1,12 +1,20 @@ { "name": "auth-web", +<<<<<<< HEAD "version": "2.6.41", +======= + "version": "2.6.40", +>>>>>>> 41bdf7f5 (updated version number) "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "auth-web", +<<<<<<< HEAD "version": "2.6.41", +======= + "version": "2.6.40", +>>>>>>> 41bdf7f5 (updated version number) "dependencies": { "@bcrs-shared-components/base-address": "2.0.3", "@bcrs-shared-components/bread-crumb": "1.0.8", diff --git a/auth-web/src/components/auth/staff/continuation-in/StaffContinuationInTable.vue b/auth-web/src/components/auth/staff/continuation-in/StaffContinuationInTable.vue index 7ca5e233be..9b0f07fb3e 100644 --- a/auth-web/src/components/auth/staff/continuation-in/StaffContinuationInTable.vue +++ b/auth-web/src/components/auth/staff/continuation-in/StaffContinuationInTable.vue @@ -59,6 +59,7 @@ :scope="getIndexedTag('find-header-col2', i)" > {{ getButtonLabel(item.status) }} @@ -123,7 +124,7 @@ export default defineComponent({ return reviewStates.includes(status) ? 'Review' : 'View' } - function view (item) { + function view () { // To be updated: route to Continuation Authorization Review page // root.$router.push() } From 716976a2630329cd46287c67d218ece977726e21 Mon Sep 17 00:00:00 2001 From: Qin Date: Thu, 4 Jul 2024 14:27:15 -0700 Subject: [PATCH 3/7] Fixed naming, formatting Signed-off-by: Qin --- .../ExtraprovincialRegistrationBc.vue | 0 .../HomeJurisdictionInformation.vue | 0 .../StaffContinuationApplicationReview.vue} | 9 ++-- .../StaffContinuationApplicationTable.vue} | 46 +++++++++++-------- auth-web/src/services/business.services.ts | 7 +++ .../views/auth/staff/StaffDashboardView.vue | 8 ++-- 6 files changed, 41 insertions(+), 29 deletions(-) rename auth-web/src/components/auth/staff/{continuation-in => continuation-application}/ExtraprovincialRegistrationBc.vue (100%) rename auth-web/src/components/auth/staff/{continuation-in => continuation-application}/HomeJurisdictionInformation.vue (100%) rename auth-web/src/components/auth/staff/{continuation-in/StaffContinuationInReview.vue => continuation-application/StaffContinuationApplicationReview.vue} (62%) rename auth-web/src/components/auth/staff/{continuation-in/StaffContinuationInTable.vue => continuation-application/StaffContinuationApplicationTable.vue} (87%) diff --git a/auth-web/src/components/auth/staff/continuation-in/ExtraprovincialRegistrationBc.vue b/auth-web/src/components/auth/staff/continuation-application/ExtraprovincialRegistrationBc.vue similarity index 100% rename from auth-web/src/components/auth/staff/continuation-in/ExtraprovincialRegistrationBc.vue rename to auth-web/src/components/auth/staff/continuation-application/ExtraprovincialRegistrationBc.vue diff --git a/auth-web/src/components/auth/staff/continuation-in/HomeJurisdictionInformation.vue b/auth-web/src/components/auth/staff/continuation-application/HomeJurisdictionInformation.vue similarity index 100% rename from auth-web/src/components/auth/staff/continuation-in/HomeJurisdictionInformation.vue rename to auth-web/src/components/auth/staff/continuation-application/HomeJurisdictionInformation.vue diff --git a/auth-web/src/components/auth/staff/continuation-in/StaffContinuationInReview.vue b/auth-web/src/components/auth/staff/continuation-application/StaffContinuationApplicationReview.vue similarity index 62% rename from auth-web/src/components/auth/staff/continuation-in/StaffContinuationInReview.vue rename to auth-web/src/components/auth/staff/continuation-application/StaffContinuationApplicationReview.vue index 1a4fd4709d..abea90f252 100644 --- a/auth-web/src/components/auth/staff/continuation-in/StaffContinuationInReview.vue +++ b/auth-web/src/components/auth/staff/continuation-application/StaffContinuationApplicationReview.vue @@ -7,20 +7,19 @@ - + diff --git a/auth-web/src/components/auth/staff/continuation-in/StaffContinuationInTable.vue b/auth-web/src/components/auth/staff/continuation-application/StaffContinuationApplicationTable.vue similarity index 87% rename from auth-web/src/components/auth/staff/continuation-in/StaffContinuationInTable.vue rename to auth-web/src/components/auth/staff/continuation-application/StaffContinuationApplicationTable.vue index 9b0f07fb3e..d9576595eb 100644 --- a/auth-web/src/components/auth/staff/continuation-in/StaffContinuationInTable.vue +++ b/auth-web/src/components/auth/staff/continuation-application/StaffContinuationApplicationTable.vue @@ -1,6 +1,6 @@