From c494c08ca6423b7249baf61e32822130da8018b1 Mon Sep 17 00:00:00 2001
From: Garewal <Paul.Garewal@gov.bc.ca>
Date: Tue, 7 Nov 2023 15:40:55 -0800
Subject: [PATCH 01/18] 18369 agm evaluation component setup

---
 .../AgmExtension/AgmExtensionEvaluation.vue   | 15 ++++++--
 src/views/AgmExtension.vue                    |  4 +++
 tests/unit/AgmExtensionEvaluation.spec.ts     | 34 +++++++++++++++++--
 3 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/src/components/AgmExtension/AgmExtensionEvaluation.vue b/src/components/AgmExtension/AgmExtensionEvaluation.vue
index 2a94c04bc..25fb2b717 100644
--- a/src/components/AgmExtension/AgmExtensionEvaluation.vue
+++ b/src/components/AgmExtension/AgmExtensionEvaluation.vue
@@ -10,6 +10,7 @@
 
     <template #content>
       <v-card
+        v-if="!isEligible"
         outlined
         class="message-box rounded-0 mt-6 mx-6"
       >
@@ -33,7 +34,7 @@
           cols="12"
           sm="9"
         >
-          {{ data.agmYear || '' }}
+          {{ data.agmYear || agmYearText }}
         </v-col>
       </v-row>
 
@@ -51,7 +52,7 @@
           cols="12"
           sm="9"
         >
-          {{ data.extensionDuration || 'Unknown' }}
+          {{ data.extensionDuration || extensionDurationText }}
         </v-col>
       </v-row>
 
@@ -69,7 +70,7 @@
           cols="12"
           sm="9"
         >
-          {{ data.agmDueDate || 'Unknown' }}
+          {{ data.agmDueDate || dueDateText }}
         </v-col>
       </v-row>
     </template>
@@ -88,5 +89,13 @@ import { AgmExtEvalIF } from '@/interfaces'
 })
 export default class AgmExtensionEvaluation extends Vue {
   @Prop({ required: true }) readonly data!: AgmExtEvalIF
+
+  @Prop({ default: false }) readonly isEligible!: boolean
+
+  @Prop({ default: '' }) readonly agmYearText!: string
+
+  @Prop({ default: '' }) readonly extensionDurationText!: string
+
+  @Prop({ default: '' }) readonly dueDateText!: string
 }
 </script>
diff --git a/src/views/AgmExtension.vue b/src/views/AgmExtension.vue
index 6d17e66f1..08b66eaf0 100644
--- a/src/views/AgmExtension.vue
+++ b/src/views/AgmExtension.vue
@@ -63,6 +63,10 @@
             <AgmExtensionEvaluation
               class="mt-8"
               :data.sync="data"
+              :isEligible="false"
+              :agmYearText="''"
+              :extensionDurationText="''"
+              :dueDateText="''"
             />
 
             <!-- delete this debugging code -->
diff --git a/tests/unit/AgmExtensionEvaluation.spec.ts b/tests/unit/AgmExtensionEvaluation.spec.ts
index 09b88dcb9..f623683e3 100644
--- a/tests/unit/AgmExtensionEvaluation.spec.ts
+++ b/tests/unit/AgmExtensionEvaluation.spec.ts
@@ -11,7 +11,7 @@ const vuetify = new Vuetify({})
 setActivePinia(createPinia())
 const rootStore = useRootStore()
 
-describe('ExtensionRequest', () => {
+describe('ExtensionEvaluation', () => {
   it('displays normally', () => {
     // init store
     rootStore.keycloakRoles = ['']
@@ -36,10 +36,38 @@ describe('ExtensionRequest', () => {
     expect(rows.at(0).find('.col-sm-9').text()).toBe('2023')
 
     expect(rows.at(1).find('.col-sm-3').text()).toBe('Duration of Extension')
-    expect(rows.at(1).find('.col-sm-9').text()).toBe('Unknown')
+    expect(rows.at(1).find('.col-sm-9').text()).toBe('')
 
     expect(rows.at(2).find('.col-sm-3').text()).toBe('Due date for this AGM')
-    expect(rows.at(2).find('.col-sm-9').text()).toBe('Unknown')
+    expect(rows.at(2).find('.col-sm-9').text()).toBe('')
+
+    wrapper.destroy()
+  })
+
+  it('is eligible', () => {
+    // init store
+    rootStore.keycloakRoles = ['']
+
+    const wrapper = mount(AgmExtensionEvaluation, {
+      propsData: {
+        data: {
+          agmYear: 2023,
+          isEligible: true,
+          agmYearText: '2022',
+          extensionDurationText: '6 months',
+          dueDateText: 'December 2, 2023'
+        }
+      },
+      vuetify
+    })
+
+    const rows = wrapper.findAll('.content .row')
+
+    expect(rows.at(0).find('.col-sm-9').text()).toBe('2023')
+
+    // expect(rows.at(1).find('.col-sm-9').text()).toBe('6 months')
+
+    expect(rows.at(2).find('.col-sm-9').text()).toBe('')
 
     wrapper.destroy()
   })

From 11b939d9440ee3af52e1c3eef77d324a5eda639d Mon Sep 17 00:00:00 2001
From: Garewal <Paul.Garewal@gov.bc.ca>
Date: Tue, 7 Nov 2023 15:40:55 -0800
Subject: [PATCH 02/18] 18369 agm evaluation component setup

---
 .../AgmExtension/AgmExtensionEvaluation.vue   | 15 ++++++--
 src/views/AgmExtension.vue                    |  4 +++
 tests/unit/AgmExtensionEvaluation.spec.ts     | 34 +++++++++++++++++--
 3 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/src/components/AgmExtension/AgmExtensionEvaluation.vue b/src/components/AgmExtension/AgmExtensionEvaluation.vue
index 2a94c04bc..25fb2b717 100644
--- a/src/components/AgmExtension/AgmExtensionEvaluation.vue
+++ b/src/components/AgmExtension/AgmExtensionEvaluation.vue
@@ -10,6 +10,7 @@
 
     <template #content>
       <v-card
+        v-if="!isEligible"
         outlined
         class="message-box rounded-0 mt-6 mx-6"
       >
@@ -33,7 +34,7 @@
           cols="12"
           sm="9"
         >
-          {{ data.agmYear || '' }}
+          {{ data.agmYear || agmYearText }}
         </v-col>
       </v-row>
 
@@ -51,7 +52,7 @@
           cols="12"
           sm="9"
         >
-          {{ data.extensionDuration || 'Unknown' }}
+          {{ data.extensionDuration || extensionDurationText }}
         </v-col>
       </v-row>
 
@@ -69,7 +70,7 @@
           cols="12"
           sm="9"
         >
-          {{ data.agmDueDate || 'Unknown' }}
+          {{ data.agmDueDate || dueDateText }}
         </v-col>
       </v-row>
     </template>
@@ -88,5 +89,13 @@ import { AgmExtEvalIF } from '@/interfaces'
 })
 export default class AgmExtensionEvaluation extends Vue {
   @Prop({ required: true }) readonly data!: AgmExtEvalIF
+
+  @Prop({ default: false }) readonly isEligible!: boolean
+
+  @Prop({ default: '' }) readonly agmYearText!: string
+
+  @Prop({ default: '' }) readonly extensionDurationText!: string
+
+  @Prop({ default: '' }) readonly dueDateText!: string
 }
 </script>
diff --git a/src/views/AgmExtension.vue b/src/views/AgmExtension.vue
index 6d17e66f1..08b66eaf0 100644
--- a/src/views/AgmExtension.vue
+++ b/src/views/AgmExtension.vue
@@ -63,6 +63,10 @@
             <AgmExtensionEvaluation
               class="mt-8"
               :data.sync="data"
+              :isEligible="false"
+              :agmYearText="''"
+              :extensionDurationText="''"
+              :dueDateText="''"
             />
 
             <!-- delete this debugging code -->
diff --git a/tests/unit/AgmExtensionEvaluation.spec.ts b/tests/unit/AgmExtensionEvaluation.spec.ts
index 09b88dcb9..f623683e3 100644
--- a/tests/unit/AgmExtensionEvaluation.spec.ts
+++ b/tests/unit/AgmExtensionEvaluation.spec.ts
@@ -11,7 +11,7 @@ const vuetify = new Vuetify({})
 setActivePinia(createPinia())
 const rootStore = useRootStore()
 
-describe('ExtensionRequest', () => {
+describe('ExtensionEvaluation', () => {
   it('displays normally', () => {
     // init store
     rootStore.keycloakRoles = ['']
@@ -36,10 +36,38 @@ describe('ExtensionRequest', () => {
     expect(rows.at(0).find('.col-sm-9').text()).toBe('2023')
 
     expect(rows.at(1).find('.col-sm-3').text()).toBe('Duration of Extension')
-    expect(rows.at(1).find('.col-sm-9').text()).toBe('Unknown')
+    expect(rows.at(1).find('.col-sm-9').text()).toBe('')
 
     expect(rows.at(2).find('.col-sm-3').text()).toBe('Due date for this AGM')
-    expect(rows.at(2).find('.col-sm-9').text()).toBe('Unknown')
+    expect(rows.at(2).find('.col-sm-9').text()).toBe('')
+
+    wrapper.destroy()
+  })
+
+  it('is eligible', () => {
+    // init store
+    rootStore.keycloakRoles = ['']
+
+    const wrapper = mount(AgmExtensionEvaluation, {
+      propsData: {
+        data: {
+          agmYear: 2023,
+          isEligible: true,
+          agmYearText: '2022',
+          extensionDurationText: '6 months',
+          dueDateText: 'December 2, 2023'
+        }
+      },
+      vuetify
+    })
+
+    const rows = wrapper.findAll('.content .row')
+
+    expect(rows.at(0).find('.col-sm-9').text()).toBe('2023')
+
+    // expect(rows.at(1).find('.col-sm-9').text()).toBe('6 months')
+
+    expect(rows.at(2).find('.col-sm-9').text()).toBe('')
 
     wrapper.destroy()
   })

From dbc7fd0281ea810c76600597d3810b421d0d9c29 Mon Sep 17 00:00:00 2001
From: Garewal <Paul.Garewal@gov.bc.ca>
Date: Wed, 8 Nov 2023 15:05:45 -0800
Subject: [PATCH 03/18] 18369 added logic to agm extension evaluation component
 and unit testing

---
 package-lock.json                             |  4 +-
 package.json                                  |  2 +-
 .../AgmExtension/AgmExtensionEvaluation.vue   | 33 ++++++---
 src/interfaces/agm-ext-eval-interface.ts      |  4 +-
 tests/unit/AgmExtensionEvaluation.spec.ts     | 67 +++++++++++++++++--
 5 files changed, 92 insertions(+), 18 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bd1254d01..0222927b2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "business-filings-ui",
-  "version": "7.0.5",
+  "version": "7.0.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "business-filings-ui",
-      "version": "7.0.5",
+      "version": "7.0.6",
       "dependencies": {
         "@babel/compat-data": "^7.21.5",
         "@bcrs-shared-components/base-address": "2.0.9",
diff --git a/package.json b/package.json
index 8a8a5810d..327a88e33 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "business-filings-ui",
-  "version": "7.0.5",
+  "version": "7.0.6",
   "private": true,
   "appName": "Filings UI",
   "sbcName": "SBC Common Components",
diff --git a/src/components/AgmExtension/AgmExtensionEvaluation.vue b/src/components/AgmExtension/AgmExtensionEvaluation.vue
index 25fb2b717..aa2d9eff3 100644
--- a/src/components/AgmExtension/AgmExtensionEvaluation.vue
+++ b/src/components/AgmExtension/AgmExtensionEvaluation.vue
@@ -10,7 +10,7 @@
 
     <template #content>
       <v-card
-        v-if="!isEligible"
+        v-if="!data.isEligible"
         outlined
         class="message-box rounded-0 mt-6 mx-6"
       >
@@ -34,7 +34,7 @@
           cols="12"
           sm="9"
         >
-          {{ data.agmYear || agmYearText }}
+          {{ data.agmYear }}
         </v-col>
       </v-row>
 
@@ -49,10 +49,18 @@
           <strong>Duration of Extension</strong>
         </v-col>
         <v-col
+          v-if="!data.isEligible"
           cols="12"
           sm="9"
         >
-          {{ data.extensionDuration || extensionDurationText }}
+          {{ extensionDurationText }}
+        </v-col>
+        <v-col
+          v-else
+          cols="12"
+          sm="9"
+        >
+          {{ data.extensionDuration }} months
         </v-col>
       </v-row>
 
@@ -67,10 +75,18 @@
           <strong>Due date for this AGM</strong>
         </v-col>
         <v-col
+          v-if="!data.isEligible"
+          cols="12"
+          sm="9"
+        >
+          {{ dueDateText }}
+        </v-col>
+        <v-col
+          v-else
           cols="12"
           sm="9"
         >
-          {{ data.agmDueDate || dueDateText }}
+          {{ dueDateString }}
         </v-col>
       </v-row>
     </template>
@@ -81,6 +97,7 @@
 import { Component, Prop, Vue } from 'vue-property-decorator'
 import { VcardTemplate } from '@/components/common'
 import { AgmExtEvalIF } from '@/interfaces'
+import { DateUtilities } from '@/services'
 
 @Component({
   components: {
@@ -90,12 +107,12 @@ import { AgmExtEvalIF } from '@/interfaces'
 export default class AgmExtensionEvaluation extends Vue {
   @Prop({ required: true }) readonly data!: AgmExtEvalIF
 
-  @Prop({ default: false }) readonly isEligible!: boolean
-
-  @Prop({ default: '' }) readonly agmYearText!: string
-
   @Prop({ default: '' }) readonly extensionDurationText!: string
 
   @Prop({ default: '' }) readonly dueDateText!: string
+
+  get dueDateString (): string {
+    return (DateUtilities.formatYyyyMmDd(this.data.agmDueDate))
+  }
 }
 </script>
diff --git a/src/interfaces/agm-ext-eval-interface.ts b/src/interfaces/agm-ext-eval-interface.ts
index 88d989eea..164140706 100644
--- a/src/interfaces/agm-ext-eval-interface.ts
+++ b/src/interfaces/agm-ext-eval-interface.ts
@@ -1,5 +1,6 @@
 /** Object that stores AGM Extension evaluation fields. */
 export interface AgmExtEvalIF {
+  isEligible: boolean
   isGoodStanding: boolean
   incorporationDate: Date
   isFirstAgm: boolean
@@ -14,10 +15,11 @@ export interface AgmExtEvalIF {
 
 /** An empty AGM Extension Evaluation object. Note: don't assign this - make a copy instead. */
 export const EmptyAgmExtEval: AgmExtEvalIF = {
+  isEligible: null,
   isGoodStanding: null,
   incorporationDate: null,
   isFirstAgm: null,
   agmYear: null,
-  extensionDuration: NaN,
+  extensionDuration: null,
   agmDueDate: null
 }
diff --git a/tests/unit/AgmExtensionEvaluation.spec.ts b/tests/unit/AgmExtensionEvaluation.spec.ts
index f623683e3..0b2fc65c1 100644
--- a/tests/unit/AgmExtensionEvaluation.spec.ts
+++ b/tests/unit/AgmExtensionEvaluation.spec.ts
@@ -52,11 +52,37 @@ describe('ExtensionEvaluation', () => {
       propsData: {
         data: {
           agmYear: 2023,
-          isEligible: true,
-          agmYearText: '2022',
-          extensionDurationText: '6 months',
-          dueDateText: 'December 2, 2023'
-        }
+          isEligible: true
+        },
+        extensionDurationText: '',
+        dueDateText: ''
+      },
+      vuetify
+    })
+
+    const rows = wrapper.findAll('.content .row')
+
+    expect(rows.at(0).find('.col-sm-9').text()).toBe('2023')
+
+    expect(rows.at(1).find('.col-sm-9').text()).toBe('months')
+
+    expect(rows.at(2).find('.col-sm-9').text()).toBe('')
+
+    wrapper.destroy()
+  })
+
+  it('is eligible, setting the extensionDurationText and dueDateText', () => {
+    // init store
+    rootStore.keycloakRoles = ['']
+
+    const wrapper = mount(AgmExtensionEvaluation, {
+      propsData: {
+        data: {
+          agmYear: 2023,
+          isEligible: true
+        },
+        extensionDurationText: '6 months',
+        dueDateText: 'December 2, 2023'
       },
       vuetify
     })
@@ -65,10 +91,39 @@ describe('ExtensionEvaluation', () => {
 
     expect(rows.at(0).find('.col-sm-9').text()).toBe('2023')
 
-    // expect(rows.at(1).find('.col-sm-9').text()).toBe('6 months')
+    expect(rows.at(1).find('.col-sm-9').text()).toBe('months')
 
     expect(rows.at(2).find('.col-sm-9').text()).toBe('')
 
     wrapper.destroy()
   })
+
+  it('is not eligible', () => {
+    // init store
+    rootStore.keycloakRoles = ['']
+
+    const wrapper = mount(AgmExtensionEvaluation, {
+      propsData: {
+        data: {
+          agmYear: 2023,
+          isEligible: false
+        },
+        extensionDurationText: 'The business has reached maximum possible extension for this AGM.',
+        dueDateText: 'The business is overdue for this AGM and extension cannot be requested.'
+      },
+      vuetify
+    })
+
+    const rows = wrapper.findAll('.content .row')
+
+    expect(rows.at(0).find('.col-sm-9').text()).toBe('2023')
+
+    expect(rows.at(1).find('.col-sm-9').text()).toBe(
+      'The business has reached maximum possible extension for this AGM.')
+
+    expect(rows.at(2).find('.col-sm-9').text()).toBe(
+      'The business is overdue for this AGM and extension cannot be requested.')
+
+    wrapper.destroy()
+  })
 })

From 045dfe441c550692b93c6bead69ac197c20a01da Mon Sep 17 00:00:00 2001
From: Garewal <Paul.Garewal@gov.bc.ca>
Date: Wed, 8 Nov 2023 15:46:45 -0800
Subject: [PATCH 04/18] removed unnecessary data from agmExtensionEvaluation

---
 src/views/AgmExtension.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/views/AgmExtension.vue b/src/views/AgmExtension.vue
index 08b66eaf0..785dbae27 100644
--- a/src/views/AgmExtension.vue
+++ b/src/views/AgmExtension.vue
@@ -63,8 +63,6 @@
             <AgmExtensionEvaluation
               class="mt-8"
               :data.sync="data"
-              :isEligible="false"
-              :agmYearText="''"
               :extensionDurationText="''"
               :dueDateText="''"
             />

From e48980974d829e21b415dc6304a178ac31a61e82 Mon Sep 17 00:00:00 2001
From: Garewal <Paul.Garewal@gov.bc.ca>
Date: Wed, 8 Nov 2023 15:56:02 -0800
Subject: [PATCH 05/18] removed rootStore values since unused

---
 tests/unit/AgmExtensionEvaluation.spec.ts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tests/unit/AgmExtensionEvaluation.spec.ts b/tests/unit/AgmExtensionEvaluation.spec.ts
index 0b2fc65c1..13710f380 100644
--- a/tests/unit/AgmExtensionEvaluation.spec.ts
+++ b/tests/unit/AgmExtensionEvaluation.spec.ts
@@ -9,12 +9,10 @@ Vue.use(Vuetify)
 
 const vuetify = new Vuetify({})
 setActivePinia(createPinia())
-const rootStore = useRootStore()
 
 describe('ExtensionEvaluation', () => {
   it('displays normally', () => {
     // init store
-    rootStore.keycloakRoles = ['']
 
     const wrapper = mount(AgmExtensionEvaluation, {
       propsData: {
@@ -46,7 +44,6 @@ describe('ExtensionEvaluation', () => {
 
   it('is eligible', () => {
     // init store
-    rootStore.keycloakRoles = ['']
 
     const wrapper = mount(AgmExtensionEvaluation, {
       propsData: {
@@ -73,7 +70,6 @@ describe('ExtensionEvaluation', () => {
 
   it('is eligible, setting the extensionDurationText and dueDateText', () => {
     // init store
-    rootStore.keycloakRoles = ['']
 
     const wrapper = mount(AgmExtensionEvaluation, {
       propsData: {
@@ -100,7 +96,6 @@ describe('ExtensionEvaluation', () => {
 
   it('is not eligible', () => {
     // init store
-    rootStore.keycloakRoles = ['']
 
     const wrapper = mount(AgmExtensionEvaluation, {
       propsData: {

From b0654c1cfadca25aba5aaa36d0c9f2030eda85fb Mon Sep 17 00:00:00 2001
From: Garewal <Paul.Garewal@gov.bc.ca>
Date: Wed, 8 Nov 2023 15:59:37 -0800
Subject: [PATCH 06/18] removed unused pinia

---
 tests/unit/AgmExtensionEvaluation.spec.ts | 31 ++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/tests/unit/AgmExtensionEvaluation.spec.ts b/tests/unit/AgmExtensionEvaluation.spec.ts
index 13710f380..906d56d43 100644
--- a/tests/unit/AgmExtensionEvaluation.spec.ts
+++ b/tests/unit/AgmExtensionEvaluation.spec.ts
@@ -1,14 +1,11 @@
 import Vue from 'vue'
 import Vuetify from 'vuetify'
 import { mount } from '@vue/test-utils'
-import { createPinia, setActivePinia } from 'pinia'
-import { useRootStore } from '@/stores'
 import AgmExtensionEvaluation from '@/components/AgmExtension/AgmExtensionEvaluation.vue'
 
 Vue.use(Vuetify)
 
 const vuetify = new Vuetify({})
-setActivePinia(createPinia())
 
 describe('ExtensionEvaluation', () => {
   it('displays normally', () => {
@@ -121,4 +118,32 @@ describe('ExtensionEvaluation', () => {
 
     wrapper.destroy()
   })
+
+  it('is not eligible yellow-box verification', () => {
+    // init store
+
+    const wrapper = mount(AgmExtensionEvaluation, {
+      propsData: {
+        data: {
+          agmYear: 2023,
+          isEligible: false
+        },
+        extensionDurationText: 'The business has reached maximum possible extension for this AGM.',
+        dueDateText: 'The business is overdue for this AGM and extension cannot be requested.'
+      },
+      vuetify
+    })
+
+    const rows = wrapper.findAll('.content .row')
+
+    expect(rows.at(0).find('.col-sm-9').text()).toBe('2023')
+
+    expect(rows.at(1).find('.col-sm-9').text()).toBe(
+      'The business has reached maximum possible extension for this AGM.')
+
+    expect(rows.at(2).find('.col-sm-9').text()).toBe(
+      'The business is overdue for this AGM and extension cannot be requested.')
+
+    wrapper.destroy()
+  })
 })

From cea7dbf46d547c094337d4fb4d4eb40baac0de0d Mon Sep 17 00:00:00 2001
From: Garewal <Paul.Garewal@gov.bc.ca>
Date: Wed, 8 Nov 2023 16:00:09 -0800
Subject: [PATCH 07/18] misc edit

---
 tests/unit/AgmExtensionEvaluation.spec.ts | 28 -----------------------
 1 file changed, 28 deletions(-)

diff --git a/tests/unit/AgmExtensionEvaluation.spec.ts b/tests/unit/AgmExtensionEvaluation.spec.ts
index 906d56d43..519dcca69 100644
--- a/tests/unit/AgmExtensionEvaluation.spec.ts
+++ b/tests/unit/AgmExtensionEvaluation.spec.ts
@@ -118,32 +118,4 @@ describe('ExtensionEvaluation', () => {
 
     wrapper.destroy()
   })
-
-  it('is not eligible yellow-box verification', () => {
-    // init store
-
-    const wrapper = mount(AgmExtensionEvaluation, {
-      propsData: {
-        data: {
-          agmYear: 2023,
-          isEligible: false
-        },
-        extensionDurationText: 'The business has reached maximum possible extension for this AGM.',
-        dueDateText: 'The business is overdue for this AGM and extension cannot be requested.'
-      },
-      vuetify
-    })
-
-    const rows = wrapper.findAll('.content .row')
-
-    expect(rows.at(0).find('.col-sm-9').text()).toBe('2023')
-
-    expect(rows.at(1).find('.col-sm-9').text()).toBe(
-      'The business has reached maximum possible extension for this AGM.')
-
-    expect(rows.at(2).find('.col-sm-9').text()).toBe(
-      'The business is overdue for this AGM and extension cannot be requested.')
-
-    wrapper.destroy()
-  })
 })

From 3e7020c84f2b3544d567007797ee104df1a60cd1 Mon Sep 17 00:00:00 2001
From: Garewal <Paul.Garewal@gov.bc.ca>
Date: Wed, 8 Nov 2023 16:20:13 -0800
Subject: [PATCH 08/18] added yellow evaluation box unit test

---
 tests/unit/AgmExtensionEvaluation.spec.ts | 33 +++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/tests/unit/AgmExtensionEvaluation.spec.ts b/tests/unit/AgmExtensionEvaluation.spec.ts
index 519dcca69..6e211f136 100644
--- a/tests/unit/AgmExtensionEvaluation.spec.ts
+++ b/tests/unit/AgmExtensionEvaluation.spec.ts
@@ -118,4 +118,37 @@ describe('ExtensionEvaluation', () => {
 
     wrapper.destroy()
   })
+
+  it('is not eligible yellow-box verification', () => {
+    // init store
+
+    const wrapper = mount(AgmExtensionEvaluation, {
+      propsData: {
+        data: {
+          agmYear: 2023,
+          isEligible: false
+        },
+        extensionDurationText: 'The business has reached maximum possible extension for this AGM.',
+        dueDateText: 'The business is overdue for this AGM and extension cannot be requested.'
+      },
+      vuetify
+    })
+
+    const rows = wrapper.findAll('.content .row')
+
+    const yellowEvalBox = wrapper.find('.message-box')
+
+    expect(yellowEvalBox.exists()).toBe(true)
+    expect(yellowEvalBox.isVisible())
+
+    expect(rows.at(0).find('.col-sm-9').text()).toBe('2023')
+
+    expect(rows.at(1).find('.col-sm-9').text()).toBe(
+      'The business has reached maximum possible extension for this AGM.')
+
+    expect(rows.at(2).find('.col-sm-9').text()).toBe(
+      'The business is overdue for this AGM and extension cannot be requested.')
+
+    wrapper.destroy()
+  })
 })

From 6b37760138e28b0bdc5d2a6c104013d06e792328 Mon Sep 17 00:00:00 2001
From: Garewal <Paul.Garewal@gov.bc.ca>
Date: Wed, 8 Nov 2023 16:23:37 -0800
Subject: [PATCH 09/18] fixed expected value

---
 tests/unit/AgmExtensionEvaluation.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/AgmExtensionEvaluation.spec.ts b/tests/unit/AgmExtensionEvaluation.spec.ts
index 6e211f136..0fe055ba2 100644
--- a/tests/unit/AgmExtensionEvaluation.spec.ts
+++ b/tests/unit/AgmExtensionEvaluation.spec.ts
@@ -139,7 +139,7 @@ describe('ExtensionEvaluation', () => {
     const yellowEvalBox = wrapper.find('.message-box')
 
     expect(yellowEvalBox.exists()).toBe(true)
-    expect(yellowEvalBox.isVisible())
+    expect(yellowEvalBox.isVisible()).toBe(true)
 
     expect(rows.at(0).find('.col-sm-9').text()).toBe('2023')
 

From 831f5fb72f277d0d4b3bdb87f2e6c167ccb49a1f Mon Sep 17 00:00:00 2001
From: Garewal <Paul.Garewal@gov.bc.ca>
Date: Wed, 8 Nov 2023 16:30:32 -0800
Subject: [PATCH 10/18] removed redundant testing in yellow-box verification

---
 tests/unit/AgmExtensionEvaluation.spec.ts | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/tests/unit/AgmExtensionEvaluation.spec.ts b/tests/unit/AgmExtensionEvaluation.spec.ts
index 0fe055ba2..6d5958c9b 100644
--- a/tests/unit/AgmExtensionEvaluation.spec.ts
+++ b/tests/unit/AgmExtensionEvaluation.spec.ts
@@ -134,20 +134,9 @@ describe('ExtensionEvaluation', () => {
       vuetify
     })
 
-    const rows = wrapper.findAll('.content .row')
-
     const yellowEvalBox = wrapper.find('.message-box')
 
     expect(yellowEvalBox.exists()).toBe(true)
-    expect(yellowEvalBox.isVisible()).toBe(true)
-
-    expect(rows.at(0).find('.col-sm-9').text()).toBe('2023')
-
-    expect(rows.at(1).find('.col-sm-9').text()).toBe(
-      'The business has reached maximum possible extension for this AGM.')
-
-    expect(rows.at(2).find('.col-sm-9').text()).toBe(
-      'The business is overdue for this AGM and extension cannot be requested.')
 
     wrapper.destroy()
   })

From 7c9e37b6493956c96528401030177aa1cc8e1c1d Mon Sep 17 00:00:00 2001
From: Garewal <Paul.Garewal@gov.bc.ca>
Date: Thu, 9 Nov 2023 15:05:27 -0800
Subject: [PATCH 11/18] added idea for template conditionals in the component

---
 .../AgmExtension/AgmExtensionEvaluation.vue   | 47 ++++++++++++-------
 src/interfaces/agm-ext-eval-interface.ts      |  4 ++
 2 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/src/components/AgmExtension/AgmExtensionEvaluation.vue b/src/components/AgmExtension/AgmExtensionEvaluation.vue
index aa2d9eff3..f84b681ec 100644
--- a/src/components/AgmExtension/AgmExtensionEvaluation.vue
+++ b/src/components/AgmExtension/AgmExtensionEvaluation.vue
@@ -49,18 +49,25 @@
           <strong>Duration of Extension</strong>
         </v-col>
         <v-col
-          v-if="!data.isEligible"
           cols="12"
           sm="9"
         >
-          {{ extensionDurationText }}
+          <template v-if="!data.isEligible">
+            <template v-if="data.alreadyExtended && !data.requestExpired">
+              The business has reached maximum possible extension for this AGM.
+            </template>
+            <template v-else-if="data.requestExpired && !data.alreadyExtended">
+              The period to request an extension has expired.
+            </template>
+            <template v-else-if="data.requestExpired && data.alreadyExtended">
+              The business has reached maximum possible extension for this AGM.
+              The period to request an extension has expired.
+            </template>
+          </template>
+          <template v-else>
+            {{ data.extensionDuration }} months
+          </template>
         </v-col>
-        <v-col
-          v-else
-          cols="12"
-          sm="9"
-        >
-          {{ data.extensionDuration }} months
         </v-col>
       </v-row>
 
@@ -75,18 +82,24 @@
           <strong>Due date for this AGM</strong>
         </v-col>
         <v-col
-          v-if="!data.isEligible"
-          cols="12"
-          sm="9"
-        >
-          {{ dueDateText }}
-        </v-col>
-        <v-col
-          v-else
           cols="12"
           sm="9"
         >
-          {{ dueDateString }}
+          <template v-if="!data.isEligible">
+            <template v-if="data.alreadyExtended && !data.requestExpired">
+              The due date for this AGM cannot be set since extension has already been requested.
+            </template>
+            <template v-else-if="data.requestExpired && !data.alreadyExtended">
+              The due date for this AGM cannot be set since the request for extension has expired.
+            </template>
+            <template v-else-if="data.requestExpired && data.alreadyExtended">
+              The due date for this AGM cannot be set since extension has already been requested and the request
+              for extension has expired.
+            </template>
+          </template>
+          <template v-else>
+            {{ dueDateString }}
+          </template>
         </v-col>
       </v-row>
     </template>
diff --git a/src/interfaces/agm-ext-eval-interface.ts b/src/interfaces/agm-ext-eval-interface.ts
index 164140706..44175daaa 100644
--- a/src/interfaces/agm-ext-eval-interface.ts
+++ b/src/interfaces/agm-ext-eval-interface.ts
@@ -1,6 +1,8 @@
 /** Object that stores AGM Extension evaluation fields. */
 export interface AgmExtEvalIF {
   isEligible: boolean
+  alreadyExtended: boolean
+  requestExpired: boolean
   isGoodStanding: boolean
   incorporationDate: Date
   isFirstAgm: boolean
@@ -16,6 +18,8 @@ export interface AgmExtEvalIF {
 /** An empty AGM Extension Evaluation object. Note: don't assign this - make a copy instead. */
 export const EmptyAgmExtEval: AgmExtEvalIF = {
   isEligible: null,
+  alreadyExtended: null,
+  requestExpired: null,
   isGoodStanding: null,
   incorporationDate: null,
   isFirstAgm: null,

From 1cad6e768a5cd0b9fa3ec08db6b83f152bb9dcfa Mon Sep 17 00:00:00 2001
From: Garewal <Paul.Garewal@gov.bc.ca>
Date: Thu, 9 Nov 2023 15:22:46 -0800
Subject: [PATCH 12/18] rearranged data variables in the conditionals

---
 src/components/AgmExtension/AgmExtensionEvaluation.vue | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/components/AgmExtension/AgmExtensionEvaluation.vue b/src/components/AgmExtension/AgmExtensionEvaluation.vue
index f84b681ec..88b0736e5 100644
--- a/src/components/AgmExtension/AgmExtensionEvaluation.vue
+++ b/src/components/AgmExtension/AgmExtensionEvaluation.vue
@@ -56,10 +56,10 @@
             <template v-if="data.alreadyExtended && !data.requestExpired">
               The business has reached maximum possible extension for this AGM.
             </template>
-            <template v-else-if="data.requestExpired && !data.alreadyExtended">
+            <template v-else-if="!data.alreadyExtended && data.requestExpired">
               The period to request an extension has expired.
             </template>
-            <template v-else-if="data.requestExpired && data.alreadyExtended">
+            <template v-else-if="data.alreadyExtended && data.requestExpired">
               The business has reached maximum possible extension for this AGM.
               The period to request an extension has expired.
             </template>
@@ -68,7 +68,6 @@
             {{ data.extensionDuration }} months
           </template>
         </v-col>
-        </v-col>
       </v-row>
 
       <v-row
@@ -89,10 +88,10 @@
             <template v-if="data.alreadyExtended && !data.requestExpired">
               The due date for this AGM cannot be set since extension has already been requested.
             </template>
-            <template v-else-if="data.requestExpired && !data.alreadyExtended">
+            <template v-else-if="!data.alreadyExtended && data.requestExpired">
               The due date for this AGM cannot be set since the request for extension has expired.
             </template>
-            <template v-else-if="data.requestExpired && data.alreadyExtended">
+            <template v-else-if="data.alreadyExtended && data.requestExpired">
               The due date for this AGM cannot be set since extension has already been requested and the request
               for extension has expired.
             </template>

From 7d455eae6204b31aaeba88d6f03ab922f98f22a7 Mon Sep 17 00:00:00 2001
From: Garewal <Paul.Garewal@gov.bc.ca>
Date: Thu, 9 Nov 2023 15:23:39 -0800
Subject: [PATCH 13/18] removed now unused props

---
 src/components/AgmExtension/AgmExtensionEvaluation.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/components/AgmExtension/AgmExtensionEvaluation.vue b/src/components/AgmExtension/AgmExtensionEvaluation.vue
index 88b0736e5..c5856333a 100644
--- a/src/components/AgmExtension/AgmExtensionEvaluation.vue
+++ b/src/components/AgmExtension/AgmExtensionEvaluation.vue
@@ -119,10 +119,6 @@ import { DateUtilities } from '@/services'
 export default class AgmExtensionEvaluation extends Vue {
   @Prop({ required: true }) readonly data!: AgmExtEvalIF
 
-  @Prop({ default: '' }) readonly extensionDurationText!: string
-
-  @Prop({ default: '' }) readonly dueDateText!: string
-
   get dueDateString (): string {
     return (DateUtilities.formatYyyyMmDd(this.data.agmDueDate))
   }

From c01d7805728576150f018e3f526697428de6b1c8 Mon Sep 17 00:00:00 2001
From: Garewal <Paul.Garewal@gov.bc.ca>
Date: Thu, 9 Nov 2023 15:45:00 -0800
Subject: [PATCH 14/18] misc fix

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1e17041fc..3e30f86c2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "business-filings-ui",
-  "version": "7.0.7",
+  "version": "7.0.8",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "business-filings-ui",
-      "version": "7.0.7",
+      "version": "7.0.8",
       "dependencies": {
         "@babel/compat-data": "^7.21.5",
         "@bcrs-shared-components/base-address": "2.0.9",
diff --git a/package.json b/package.json
index b33c843d0..c3f772e3c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "business-filings-ui",
-  "version": "7.0.7",
+  "version": "7.0.8",
   "private": true,
   "appName": "Filings UI",
   "sbcName": "SBC Common Components",

From 6c05a98bcdd2b716879da0224725a106b4e3cf6e Mon Sep 17 00:00:00 2001
From: Garewal <Paul.Garewal@gov.bc.ca>
Date: Thu, 9 Nov 2023 15:59:49 -0800
Subject: [PATCH 15/18] added new testing for agm extension evaluation

---
 .../AgmExtension/AgmExtensionEvaluation.vue   |   2 +-
 tests/unit/AgmExtensionEvaluation.spec.ts     | 148 +++++++++++++++---
 2 files changed, 130 insertions(+), 20 deletions(-)

diff --git a/src/components/AgmExtension/AgmExtensionEvaluation.vue b/src/components/AgmExtension/AgmExtensionEvaluation.vue
index c5856333a..503da6c8c 100644
--- a/src/components/AgmExtension/AgmExtensionEvaluation.vue
+++ b/src/components/AgmExtension/AgmExtensionEvaluation.vue
@@ -57,7 +57,7 @@
               The business has reached maximum possible extension for this AGM.
             </template>
             <template v-else-if="!data.alreadyExtended && data.requestExpired">
-              The period to request an extension has expired.
+              The period to request an extension for this AGM has expired.
             </template>
             <template v-else-if="data.alreadyExtended && data.requestExpired">
               The business has reached maximum possible extension for this AGM.
diff --git a/tests/unit/AgmExtensionEvaluation.spec.ts b/tests/unit/AgmExtensionEvaluation.spec.ts
index 6d5958c9b..dc907c3f0 100644
--- a/tests/unit/AgmExtensionEvaluation.spec.ts
+++ b/tests/unit/AgmExtensionEvaluation.spec.ts
@@ -46,10 +46,36 @@ describe('ExtensionEvaluation', () => {
       propsData: {
         data: {
           agmYear: 2023,
-          isEligible: true
-        },
-        extensionDurationText: '',
-        dueDateText: ''
+          isEligible: true,
+          alreadyExtended: false,
+          requestExpired: false
+        }
+      },
+      vuetify
+    })
+
+    const rows = wrapper.findAll('.content .row')
+
+    expect(rows.at(0).find('.col-sm-9').text()).toBe('2023')
+
+    expect(rows.at(1).find('.col-sm-9').text()).toBe('months')
+
+    expect(rows.at(2).find('.col-sm-9').text()).toBe('')
+
+    wrapper.destroy()
+  })
+
+  it('is eligible, setting the already extended and request expired to true', () => {
+    // init store
+
+    const wrapper = mount(AgmExtensionEvaluation, {
+      propsData: {
+        data: {
+          agmYear: 2023,
+          isEligible: true,
+          alreadyExtended: true,
+          requestExpired: true
+        }
       },
       vuetify
     })
@@ -65,17 +91,43 @@ describe('ExtensionEvaluation', () => {
     wrapper.destroy()
   })
 
-  it('is eligible, setting the extensionDurationText and dueDateText', () => {
+  it('is eligible, setting the already extended to false request expired to true', () => {
     // init store
 
     const wrapper = mount(AgmExtensionEvaluation, {
       propsData: {
         data: {
           agmYear: 2023,
-          isEligible: true
-        },
-        extensionDurationText: '6 months',
-        dueDateText: 'December 2, 2023'
+          isEligible: true,
+          alreadyExtended: false,
+          requestExpired: true
+        }
+      },
+      vuetify
+    })
+
+    const rows = wrapper.findAll('.content .row')
+
+    expect(rows.at(0).find('.col-sm-9').text()).toBe('2023')
+
+    expect(rows.at(1).find('.col-sm-9').text()).toBe('months')
+
+    expect(rows.at(2).find('.col-sm-9').text()).toBe('')
+
+    wrapper.destroy()
+  })
+
+  it('is eligible, setting the already extended to true and request expired to false', () => {
+    // init store
+
+    const wrapper = mount(AgmExtensionEvaluation, {
+      propsData: {
+        data: {
+          agmYear: 2023,
+          isEligible: true,
+          alreadyExtended: true,
+          requestExpired: false
+        }
       },
       vuetify
     })
@@ -91,17 +143,17 @@ describe('ExtensionEvaluation', () => {
     wrapper.destroy()
   })
 
-  it('is not eligible', () => {
+  it('is not eligible - already extended', () => {
     // init store
 
     const wrapper = mount(AgmExtensionEvaluation, {
       propsData: {
         data: {
           agmYear: 2023,
-          isEligible: false
-        },
-        extensionDurationText: 'The business has reached maximum possible extension for this AGM.',
-        dueDateText: 'The business is overdue for this AGM and extension cannot be requested.'
+          isEligible: false,
+          alreadyExtended: true,
+          requestExpired: false
+        }
       },
       vuetify
     })
@@ -114,7 +166,65 @@ describe('ExtensionEvaluation', () => {
       'The business has reached maximum possible extension for this AGM.')
 
     expect(rows.at(2).find('.col-sm-9').text()).toBe(
-      'The business is overdue for this AGM and extension cannot be requested.')
+      'The due date for this AGM cannot be set since extension has already been requested.')
+
+    wrapper.destroy()
+  })
+
+  it('is not eligible - request expired', () => {
+    // init store
+
+    const wrapper = mount(AgmExtensionEvaluation, {
+      propsData: {
+        data: {
+          agmYear: 2023,
+          isEligible: false,
+          alreadyExtended: false,
+          requestExpired: true
+        }
+      },
+      vuetify
+    })
+
+    const rows = wrapper.findAll('.content .row')
+
+    expect(rows.at(0).find('.col-sm-9').text()).toBe('2023')
+
+    expect(rows.at(1).find('.col-sm-9').text()).toBe(
+      'The period to request an extension for this AGM has expired.')
+
+    expect(rows.at(2).find('.col-sm-9').text()).toBe(
+      'The due date for this AGM cannot be set since the request for extension has expired.')
+
+    wrapper.destroy()
+  })
+
+  it('is not eligible - already extended + request expired', () => {
+    // init store
+
+    const wrapper = mount(AgmExtensionEvaluation, {
+      propsData: {
+        data: {
+          agmYear: 2023,
+          isEligible: false,
+          alreadyExtended: true,
+          requestExpired: true
+        }
+      },
+      vuetify
+    })
+
+    const rows = wrapper.findAll('.content .row')
+
+    expect(rows.at(0).find('.col-sm-9').text()).toBe('2023')
+
+    expect(rows.at(1).find('.col-sm-9').text()).toBe(
+      'The business has reached maximum possible extension for this AGM. ' +
+      'The period to request an extension has expired.')
+
+    expect(rows.at(2).find('.col-sm-9').text()).toBe(
+      'The due date for this AGM cannot be set since extension has already been requested ' +
+      'and the request for extension has expired.')
 
     wrapper.destroy()
   })
@@ -126,10 +236,10 @@ describe('ExtensionEvaluation', () => {
       propsData: {
         data: {
           agmYear: 2023,
-          isEligible: false
-        },
-        extensionDurationText: 'The business has reached maximum possible extension for this AGM.',
-        dueDateText: 'The business is overdue for this AGM and extension cannot be requested.'
+          isEligible: false,
+          alreadyExtended: true,
+          requestExpired: true
+        }
       },
       vuetify
     })

From 3d5e7d9000d824317b02fb37d84e7a746f475fb0 Mon Sep 17 00:00:00 2001
From: Garewal <Paul.Garewal@gov.bc.ca>
Date: Thu, 9 Nov 2023 16:11:40 -0800
Subject: [PATCH 16/18] removed Text string variables from AgmExtension.vue

---
 src/views/AgmExtension.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/views/AgmExtension.vue b/src/views/AgmExtension.vue
index 01e22bc45..d4f074288 100644
--- a/src/views/AgmExtension.vue
+++ b/src/views/AgmExtension.vue
@@ -62,8 +62,6 @@
             <AgmExtensionEvaluation
               class="mt-8"
               :data.sync="data"
-              :extensionDurationText="''"
-              :dueDateText="''"
             />
 
             <!-- delete this debugging code -->

From 965f6b0860a3f6cdb1fdae7fe1a0480d9ebedcd3 Mon Sep 17 00:00:00 2001
From: Garewal <Paul.Garewal@gov.bc.ca>
Date: Thu, 9 Nov 2023 16:33:25 -0800
Subject: [PATCH 17/18] fized testing error

---
 tests/unit/AgmExtension.spec.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/unit/AgmExtension.spec.ts b/tests/unit/AgmExtension.spec.ts
index 6a909e0e2..45252e5b6 100644
--- a/tests/unit/AgmExtension.spec.ts
+++ b/tests/unit/AgmExtension.spec.ts
@@ -200,7 +200,9 @@ describe('AGM Extension view', () => {
         incorporationDate: new Date('2000-01-01T08:00:00.000Z'),
         isEligible: true,
         isFirstAgm: null,
-        isGoodStanding: true
+        isGoodStanding: true,
+        alreadyExists: null,
+        requestExpired: null
       },
       business: {
         foundingDate: '2000-01-01T08:00:00.000+00:00',

From 55cfad374ae2286f7a9ca94b496c30df9d527ff5 Mon Sep 17 00:00:00 2001
From: Garewal <Paul.Garewal@gov.bc.ca>
Date: Thu, 9 Nov 2023 16:39:25 -0800
Subject: [PATCH 18/18] fixed silly typo

---
 tests/unit/AgmExtension.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/AgmExtension.spec.ts b/tests/unit/AgmExtension.spec.ts
index 45252e5b6..1902287fb 100644
--- a/tests/unit/AgmExtension.spec.ts
+++ b/tests/unit/AgmExtension.spec.ts
@@ -201,7 +201,7 @@ describe('AGM Extension view', () => {
         isEligible: true,
         isFirstAgm: null,
         isGoodStanding: true,
-        alreadyExists: null,
+        alreadyExtended: null,
         requestExpired: null
       },
       business: {