From 8570299d2291e215005f902c1e2ddb7a3ab1517b Mon Sep 17 00:00:00 2001
From: marzmehr <mars.mehr@gmail.com>
Date: Sun, 5 Nov 2023 09:14:42 -0800
Subject: [PATCH 01/10] PFCF-420: Adding initial pathway module components

---
 .../guardianshipAffidavit/AboutAffiantGa.vue  | 104 +++++
 .../BackgroundCivilCourtProceedings.vue       | 109 +++++
 .../BackgroundCriminalHistory.vue             | 109 +++++
 .../BackgroundFamilyViolence.vue              | 109 +++++
 .../ElectronicFilingStatementGa.vue           | 161 ++++++++
 .../steps/guardianshipAffidavit/Exhibits.vue  | 117 ++++++
 .../steps/guardianshipAffidavit/FilingGA.vue  | 142 +++++++
 .../GuardianshipAffidavit.vue                 | 117 ++++++
 .../GuardianshipAffidavitStep.vue             |  50 +++
 .../caringForchildGa/CaringForChildGa.vue     | 324 +++++++++++++++
 .../caringForchildGa/ChildrenSurvey.vue       | 136 +++++++
 .../forms/survey-childInfo.json               |  53 +++
 .../childrenDetailsGa/ChildrenDetailsGa.vue   | 324 +++++++++++++++
 .../childrenDetailsGa/ChildrenSurvey.vue      | 136 +++++++
 .../forms/survey-childInfo.json               |  53 +++
 .../forms/about-affiant-ga.json               |  56 +++
 .../background-civil-court-proceedings.json   |  62 +++
 .../forms/background-criminal-history.json    |  62 +++
 .../forms/background-family-violence.json     |  62 +++
 .../forms/electronic-filing-statement-ga.json | 119 ++++++
 .../forms/filling-ga.json                     |  42 ++
 .../forms/guardianship-affidavit.json         |  67 +++
 .../reviewAFF/PreviewFormsAFF.vue             |  83 ++++
 .../reviewAFF/ReviewYourAnswersAFF.vue        |  93 +++++
 .../reviewAFF/pdf/Form45.vue                  | 107 +++++
 .../reviewAFF/pdf/Form45Layout.vue            | 382 ++++++++++++++++++
 web/src/filters/index.ts                      |   5 +
 web/src/store/modules/application.ts          |   2 +-
 .../types/Application/StepsAndPages/index.ts  |  18 +
 web/src/types/Application/index.ts            |  13 +
 30 files changed, 3216 insertions(+), 1 deletion(-)
 create mode 100644 web/src/components/steps/guardianshipAffidavit/AboutAffiantGa.vue
 create mode 100644 web/src/components/steps/guardianshipAffidavit/BackgroundCivilCourtProceedings.vue
 create mode 100644 web/src/components/steps/guardianshipAffidavit/BackgroundCriminalHistory.vue
 create mode 100644 web/src/components/steps/guardianshipAffidavit/BackgroundFamilyViolence.vue
 create mode 100644 web/src/components/steps/guardianshipAffidavit/ElectronicFilingStatementGa.vue
 create mode 100644 web/src/components/steps/guardianshipAffidavit/Exhibits.vue
 create mode 100644 web/src/components/steps/guardianshipAffidavit/FilingGA.vue
 create mode 100644 web/src/components/steps/guardianshipAffidavit/GuardianshipAffidavit.vue
 create mode 100644 web/src/components/steps/guardianshipAffidavit/GuardianshipAffidavitStep.vue
 create mode 100644 web/src/components/steps/guardianshipAffidavit/caringForchildGa/CaringForChildGa.vue
 create mode 100644 web/src/components/steps/guardianshipAffidavit/caringForchildGa/ChildrenSurvey.vue
 create mode 100644 web/src/components/steps/guardianshipAffidavit/caringForchildGa/forms/survey-childInfo.json
 create mode 100644 web/src/components/steps/guardianshipAffidavit/childrenDetailsGa/ChildrenDetailsGa.vue
 create mode 100644 web/src/components/steps/guardianshipAffidavit/childrenDetailsGa/ChildrenSurvey.vue
 create mode 100644 web/src/components/steps/guardianshipAffidavit/childrenDetailsGa/forms/survey-childInfo.json
 create mode 100644 web/src/components/steps/guardianshipAffidavit/forms/about-affiant-ga.json
 create mode 100644 web/src/components/steps/guardianshipAffidavit/forms/background-civil-court-proceedings.json
 create mode 100644 web/src/components/steps/guardianshipAffidavit/forms/background-criminal-history.json
 create mode 100644 web/src/components/steps/guardianshipAffidavit/forms/background-family-violence.json
 create mode 100644 web/src/components/steps/guardianshipAffidavit/forms/electronic-filing-statement-ga.json
 create mode 100644 web/src/components/steps/guardianshipAffidavit/forms/filling-ga.json
 create mode 100644 web/src/components/steps/guardianshipAffidavit/forms/guardianship-affidavit.json
 create mode 100644 web/src/components/steps/guardianshipAffidavit/reviewAFF/PreviewFormsAFF.vue
 create mode 100644 web/src/components/steps/guardianshipAffidavit/reviewAFF/ReviewYourAnswersAFF.vue
 create mode 100644 web/src/components/steps/guardianshipAffidavit/reviewAFF/pdf/Form45.vue
 create mode 100644 web/src/components/steps/guardianshipAffidavit/reviewAFF/pdf/Form45Layout.vue

diff --git a/web/src/components/steps/guardianshipAffidavit/AboutAffiantGa.vue b/web/src/components/steps/guardianshipAffidavit/AboutAffiantGa.vue
new file mode 100644
index 000000000..4fae8b231
--- /dev/null
+++ b/web/src/components/steps/guardianshipAffidavit/AboutAffiantGa.vue
@@ -0,0 +1,104 @@
+<template>
+    <page-base :disableNext="disableNextButton" v-on:onPrev="onPrev()" v-on:onNext="onNext()" >        
+        <survey v-bind:survey="survey"></survey>        
+    </page-base>
+</template>
+
+<script lang="ts">
+import { Component, Vue, Prop} from 'vue-property-decorator';   
+import { namespace } from "vuex-class";  
+import * as _ from 'underscore';  
+
+import * as SurveyVue from "survey-vue";
+import surveyJson from "./forms/about-affiant.json";
+import * as surveyEnv from "@/components/survey/survey-glossary";
+
+import PageBase from "../PageBase.vue";
+import { stepInfoType, stepResultInfoType } from "@/types/Application";
+
+import "@/store/modules/application";
+import { stepsAndPagesNumberInfoType } from '@/types/Application/StepsAndPages';
+const applicationState = namespace("Application");
+
+@Component({
+    components:{
+        PageBase
+    }
+})
+export default class AboutAffiant extends Vue {
+        
+    @Prop({required: true})
+    step!: stepInfoType;
+
+    @applicationState.State
+    public stPgNo!: stepsAndPagesNumberInfoType;    
+
+    @applicationState.Action
+    public UpdateStepResultData!: (newStepResultData: stepResultInfoType) => void
+
+    @applicationState.Action
+    public UpdatePathwayCompleted!: (changedpathway) => void
+
+    survey = new SurveyVue.Model(surveyJson);
+    disableNextButton = false;
+    currentStep =0;
+    currentPage =0;   
+
+    beforeCreate() {
+        const Survey = SurveyVue;
+        surveyEnv.setCss(Survey);
+    }
+
+    created() {
+        this.disableNextButton = false;       
+    }
+
+    mounted(){
+        this.initializeSurvey();
+        this.addSurveyListener();
+        this.reloadPageInformation();
+    }
+
+    public initializeSurvey(){
+        this.survey = new SurveyVue.Model(surveyJson);
+        this.survey.commentPrefix = "Comment";
+        this.survey.showQuestionNumbers = "off";
+        this.survey.showNavigationButtons = false;
+        surveyEnv.setGlossaryMarkdown(this.survey);
+    }    
+    
+    public addSurveyListener(){
+        this.survey.onValueChanged.add((sender, options) => {
+                              
+        })   
+    }
+
+    public reloadPageInformation() {
+        
+        this.currentStep = this.$store.state.Application.currentStep;
+        this.currentPage = this.$store.state.Application.steps[this.currentStep].currentPage;        
+
+        if (this.step.result?.aboutAffiantSurvey){
+            this.survey.data = this.step.result.aboutAffiantSurvey.data; 
+            Vue.filter('scrollToLocation')(this.$store.state.Application.scrollToLocationName);              
+        }
+        
+        Vue.filter('setSurveyProgress')(this.survey, this.currentStep, this.currentPage, 50, false);     
+    }
+
+    public onPrev() {
+        Vue.prototype.$UpdateGotoPrevStepPage()
+    }
+
+    public onNext() {
+        if(!this.survey.isCurrentPageHasErrors) {
+            Vue.prototype.$UpdateGotoNextStepPage()
+        }
+    }
+
+    beforeDestroy() {
+        Vue.filter('setSurveyProgress')(this.survey, this.currentStep, this.currentPage, 50, true);       
+        this.UpdateStepResultData({step:this.step, data: {aboutAffiantSurvey: Vue.filter('getSurveyResults')(this.survey, this.currentStep, this.currentPage)}})
+    }
+}
+</script>
\ No newline at end of file
diff --git a/web/src/components/steps/guardianshipAffidavit/BackgroundCivilCourtProceedings.vue b/web/src/components/steps/guardianshipAffidavit/BackgroundCivilCourtProceedings.vue
new file mode 100644
index 000000000..a36f6fb96
--- /dev/null
+++ b/web/src/components/steps/guardianshipAffidavit/BackgroundCivilCourtProceedings.vue
@@ -0,0 +1,109 @@
+<template>
+    <page-base :disableNext="disableNextButton" v-on:onPrev="onPrev()" v-on:onNext="onNext()" >   
+        <survey v-bind:survey="survey"></survey>       
+
+    </page-base>
+</template>
+
+<script lang="ts">
+import { Component, Vue, Prop} from 'vue-property-decorator';
+
+import * as SurveyVue from "survey-vue";
+import * as surveyEnv from "@/components/survey/survey-glossary";
+import surveyJson from "./forms/your-story-aff.json";
+
+import PageBase from "../PageBase.vue";
+import { stepInfoType, stepResultInfoType } from "@/types/Application";
+
+import { namespace } from "vuex-class";   
+import "@/store/modules/application";
+const applicationState = namespace("Application");
+
+@Component({
+    components:{
+        PageBase
+    }
+})
+export default class YourStoryAff extends Vue {
+    
+    @Prop({required: true})
+    step!: stepInfoType;
+
+    @applicationState.Action
+    public UpdateStepResultData!: (newStepResultData: stepResultInfoType) => void
+
+    @applicationState.Action
+    public UpdateCommonStepResults!: (newCommonStepResults) => void
+
+    survey = new SurveyVue.Model(surveyJson);
+
+    currentStep = 0;
+    currentPage = 0;
+    disableNextButton = false;
+
+    beforeCreate() {
+        const Survey = SurveyVue;
+        surveyEnv.setCss(Survey);
+    }
+
+    created() {
+        this.disableNextButton = false;       
+    }
+
+    mounted(){
+        
+        this.initializeSurvey();
+        this.addSurveyListener();
+        this.reloadPageInformation();
+    }
+
+    public initializeSurvey(){        
+        this.survey = new SurveyVue.Model(surveyJson);
+        this.survey.commentPrefix = "Comment";
+        this.survey.showQuestionNumbers = "off";
+        this.survey.showNavigationButtons = false;
+        surveyEnv.setGlossaryMarkdown(this.survey);
+    }
+    
+    public addSurveyListener(){
+        this.survey.onValueChanged.add((sender, options) => {  
+            
+        })
+    }
+    
+    public reloadPageInformation() {
+    
+        this.currentStep = this.$store.state.Application.currentStep;
+        this.currentPage = this.$store.state.Application.steps[this.currentStep].currentPage;        
+
+        
+        if (this.step.result?.yourStoryAffSurvey) {
+            this.survey.data = this.step.result.yourStoryAffSurvey.data;
+            Vue.filter('scrollToLocation')(this.$store.state.Application.scrollToLocationName);    
+              
+        } else {
+            this.survey.setValue('storyAff',[]);
+        }
+        
+        Vue.filter('setSurveyProgress')(this.survey, this.currentStep, this.currentPage, 50, false);       
+    }
+
+   
+    public onPrev() {
+        Vue.prototype.$UpdateGotoPrevStepPage()
+    }
+
+    public onNext() {
+        if(!this.survey.isCurrentPageHasErrors) {
+            Vue.prototype.$UpdateGotoNextStepPage()
+        }
+    }  
+    
+    beforeDestroy() {
+        
+        Vue.filter('setSurveyProgress')(this.survey, this.currentStep, this.currentPage, 50, true);
+        
+        this.UpdateStepResultData({step:this.step, data: {yourStoryAffSurvey: Vue.filter('getSurveyResults')(this.survey, this.currentStep, this.currentPage)}})
+    }
+}
+</script>
diff --git a/web/src/components/steps/guardianshipAffidavit/BackgroundCriminalHistory.vue b/web/src/components/steps/guardianshipAffidavit/BackgroundCriminalHistory.vue
new file mode 100644
index 000000000..a36f6fb96
--- /dev/null
+++ b/web/src/components/steps/guardianshipAffidavit/BackgroundCriminalHistory.vue
@@ -0,0 +1,109 @@
+<template>
+    <page-base :disableNext="disableNextButton" v-on:onPrev="onPrev()" v-on:onNext="onNext()" >   
+        <survey v-bind:survey="survey"></survey>       
+
+    </page-base>
+</template>
+
+<script lang="ts">
+import { Component, Vue, Prop} from 'vue-property-decorator';
+
+import * as SurveyVue from "survey-vue";
+import * as surveyEnv from "@/components/survey/survey-glossary";
+import surveyJson from "./forms/your-story-aff.json";
+
+import PageBase from "../PageBase.vue";
+import { stepInfoType, stepResultInfoType } from "@/types/Application";
+
+import { namespace } from "vuex-class";   
+import "@/store/modules/application";
+const applicationState = namespace("Application");
+
+@Component({
+    components:{
+        PageBase
+    }
+})
+export default class YourStoryAff extends Vue {
+    
+    @Prop({required: true})
+    step!: stepInfoType;
+
+    @applicationState.Action
+    public UpdateStepResultData!: (newStepResultData: stepResultInfoType) => void
+
+    @applicationState.Action
+    public UpdateCommonStepResults!: (newCommonStepResults) => void
+
+    survey = new SurveyVue.Model(surveyJson);
+
+    currentStep = 0;
+    currentPage = 0;
+    disableNextButton = false;
+
+    beforeCreate() {
+        const Survey = SurveyVue;
+        surveyEnv.setCss(Survey);
+    }
+
+    created() {
+        this.disableNextButton = false;       
+    }
+
+    mounted(){
+        
+        this.initializeSurvey();
+        this.addSurveyListener();
+        this.reloadPageInformation();
+    }
+
+    public initializeSurvey(){        
+        this.survey = new SurveyVue.Model(surveyJson);
+        this.survey.commentPrefix = "Comment";
+        this.survey.showQuestionNumbers = "off";
+        this.survey.showNavigationButtons = false;
+        surveyEnv.setGlossaryMarkdown(this.survey);
+    }
+    
+    public addSurveyListener(){
+        this.survey.onValueChanged.add((sender, options) => {  
+            
+        })
+    }
+    
+    public reloadPageInformation() {
+    
+        this.currentStep = this.$store.state.Application.currentStep;
+        this.currentPage = this.$store.state.Application.steps[this.currentStep].currentPage;        
+
+        
+        if (this.step.result?.yourStoryAffSurvey) {
+            this.survey.data = this.step.result.yourStoryAffSurvey.data;
+            Vue.filter('scrollToLocation')(this.$store.state.Application.scrollToLocationName);    
+              
+        } else {
+            this.survey.setValue('storyAff',[]);
+        }
+        
+        Vue.filter('setSurveyProgress')(this.survey, this.currentStep, this.currentPage, 50, false);       
+    }
+
+   
+    public onPrev() {
+        Vue.prototype.$UpdateGotoPrevStepPage()
+    }
+
+    public onNext() {
+        if(!this.survey.isCurrentPageHasErrors) {
+            Vue.prototype.$UpdateGotoNextStepPage()
+        }
+    }  
+    
+    beforeDestroy() {
+        
+        Vue.filter('setSurveyProgress')(this.survey, this.currentStep, this.currentPage, 50, true);
+        
+        this.UpdateStepResultData({step:this.step, data: {yourStoryAffSurvey: Vue.filter('getSurveyResults')(this.survey, this.currentStep, this.currentPage)}})
+    }
+}
+</script>
diff --git a/web/src/components/steps/guardianshipAffidavit/BackgroundFamilyViolence.vue b/web/src/components/steps/guardianshipAffidavit/BackgroundFamilyViolence.vue
new file mode 100644
index 000000000..a36f6fb96
--- /dev/null
+++ b/web/src/components/steps/guardianshipAffidavit/BackgroundFamilyViolence.vue
@@ -0,0 +1,109 @@
+<template>
+    <page-base :disableNext="disableNextButton" v-on:onPrev="onPrev()" v-on:onNext="onNext()" >   
+        <survey v-bind:survey="survey"></survey>       
+
+    </page-base>
+</template>
+
+<script lang="ts">
+import { Component, Vue, Prop} from 'vue-property-decorator';
+
+import * as SurveyVue from "survey-vue";
+import * as surveyEnv from "@/components/survey/survey-glossary";
+import surveyJson from "./forms/your-story-aff.json";
+
+import PageBase from "../PageBase.vue";
+import { stepInfoType, stepResultInfoType } from "@/types/Application";
+
+import { namespace } from "vuex-class";   
+import "@/store/modules/application";
+const applicationState = namespace("Application");
+
+@Component({
+    components:{
+        PageBase
+    }
+})
+export default class YourStoryAff extends Vue {
+    
+    @Prop({required: true})
+    step!: stepInfoType;
+
+    @applicationState.Action
+    public UpdateStepResultData!: (newStepResultData: stepResultInfoType) => void
+
+    @applicationState.Action
+    public UpdateCommonStepResults!: (newCommonStepResults) => void
+
+    survey = new SurveyVue.Model(surveyJson);
+
+    currentStep = 0;
+    currentPage = 0;
+    disableNextButton = false;
+
+    beforeCreate() {
+        const Survey = SurveyVue;
+        surveyEnv.setCss(Survey);
+    }
+
+    created() {
+        this.disableNextButton = false;       
+    }
+
+    mounted(){
+        
+        this.initializeSurvey();
+        this.addSurveyListener();
+        this.reloadPageInformation();
+    }
+
+    public initializeSurvey(){        
+        this.survey = new SurveyVue.Model(surveyJson);
+        this.survey.commentPrefix = "Comment";
+        this.survey.showQuestionNumbers = "off";
+        this.survey.showNavigationButtons = false;
+        surveyEnv.setGlossaryMarkdown(this.survey);
+    }
+    
+    public addSurveyListener(){
+        this.survey.onValueChanged.add((sender, options) => {  
+            
+        })
+    }
+    
+    public reloadPageInformation() {
+    
+        this.currentStep = this.$store.state.Application.currentStep;
+        this.currentPage = this.$store.state.Application.steps[this.currentStep].currentPage;        
+
+        
+        if (this.step.result?.yourStoryAffSurvey) {
+            this.survey.data = this.step.result.yourStoryAffSurvey.data;
+            Vue.filter('scrollToLocation')(this.$store.state.Application.scrollToLocationName);    
+              
+        } else {
+            this.survey.setValue('storyAff',[]);
+        }
+        
+        Vue.filter('setSurveyProgress')(this.survey, this.currentStep, this.currentPage, 50, false);       
+    }
+
+   
+    public onPrev() {
+        Vue.prototype.$UpdateGotoPrevStepPage()
+    }
+
+    public onNext() {
+        if(!this.survey.isCurrentPageHasErrors) {
+            Vue.prototype.$UpdateGotoNextStepPage()
+        }
+    }  
+    
+    beforeDestroy() {
+        
+        Vue.filter('setSurveyProgress')(this.survey, this.currentStep, this.currentPage, 50, true);
+        
+        this.UpdateStepResultData({step:this.step, data: {yourStoryAffSurvey: Vue.filter('getSurveyResults')(this.survey, this.currentStep, this.currentPage)}})
+    }
+}
+</script>
diff --git a/web/src/components/steps/guardianshipAffidavit/ElectronicFilingStatementGa.vue b/web/src/components/steps/guardianshipAffidavit/ElectronicFilingStatementGa.vue
new file mode 100644
index 000000000..87e9a51e7
--- /dev/null
+++ b/web/src/components/steps/guardianshipAffidavit/ElectronicFilingStatementGa.vue
@@ -0,0 +1,161 @@
+<template>
+    <page-base :disableNext="disableNextButton" v-on:onPrev="onPrev()" v-on:onNext="onNext()" >   
+        <survey v-bind:survey="survey"></survey>
+    </page-base>
+</template>
+
+<script lang="ts">
+import { Component, Vue, Prop} from 'vue-property-decorator';
+import * as SurveyVue from "survey-vue";
+
+import { namespace } from "vuex-class";   
+import "@/store/modules/application";
+const applicationState = namespace("Application");
+
+import * as surveyEnv from "@/components/survey/survey-glossary";
+import surveyJson from "./forms/electronic-filing-statement-ga.json";
+import PageBase from "../PageBase.vue";
+
+import { stepInfoType, stepResultInfoType } from "@/types/Application";
+import { stepsAndPagesNumberInfoType } from '@/types/Application/StepsAndPages';
+
+@Component({
+    components:{
+        PageBase
+    }
+})
+export default class ElectronicFilingStatementGa extends Vue {
+    
+    @Prop({required: true})
+    step!: stepInfoType;
+
+    @applicationState.State
+    public stPgNo!: stepsAndPagesNumberInfoType;
+
+    @applicationState.Action
+    public UpdateStepResultData!: (newStepResultData: stepResultInfoType) => void
+
+    @applicationState.Action
+    public UpdateCommonStepResults!: (newCommonStepResults) => void
+
+    survey = new SurveyVue.Model(surveyJson);
+    currentStep =0;
+    currentPage =0;    
+    disableNextButton = false;
+
+    beforeCreate() {
+        const Survey = SurveyVue;
+        surveyEnv.setCss(Survey);
+    }
+
+    created() {
+        this.disableNextButton = false;       
+    }
+
+    mounted(){
+        this.initializeSurvey();
+        this.addSurveyListener();
+        this.reloadPageInformation();
+    }
+
+    public initializeSurvey(){        
+        this.survey = new SurveyVue.Model(surveyJson);
+        this.survey.commentPrefix = "Comment";
+        this.survey.showQuestionNumbers = "off";
+        this.survey.showNavigationButtons = false;
+        surveyEnv.setGlossaryMarkdown(this.survey);
+    }
+    
+    public addSurveyListener(){
+        this.survey.onValueChanged.add((sender, options) => {
+
+            if(options.name == "ApplicantName") {
+                this.$store.commit("Application/setApplicantName", this.survey.data["ApplicantName"]);
+                this.UpdateCommonStepResults({data:{'applicantName':this.survey.data["ApplicantName"]}})
+            }
+        })
+    }
+    
+    public reloadPageInformation() {
+    
+        this.currentStep = this.$store.state.Application.currentStep;
+        this.currentPage = this.$store.state.Application.steps[this.currentStep].currentPage;            
+
+        if (this.step.result?.electronicFilingStatementSurvey) {            
+            this.survey.data = this.step.result.electronicFilingStatementSurvey.data;   
+                     
+            Vue.filter('scrollToLocation')(this.$store.state.Application.scrollToLocationName);            
+        } else {
+            this.survey.setValue('OtherPartyInfoEfsp',[]); 
+            this.survey.setValue('PartyInfoEfsp',[]); 
+        }
+        
+        Vue.filter('setSurveyProgress')(this.survey, this.currentStep, this.currentPage, 50, false);       
+    }    
+
+    public mergeRespondants(){
+
+        const respondentNames = [];
+
+        if(this.$store.state.Application.steps[0].result && this.$store.state.Application.steps[0].result.respondents){
+            const respondents = this.$store.state.Application.steps[0].result.respondents        
+            respondentNames.push(...respondents)
+        }
+
+        if(this.survey.data?.Lawyer){
+
+            const applicantIsLawyer = this.survey.data.Lawyer == 'y';
+
+            if (applicantIsLawyer){
+
+                if(this.survey.data?.PartyInfoEfsp && this.survey.data?.PartyInfoEfsp.length>0){
+                    const respondentNamesEfsp = this.survey.data.PartyInfoEfsp.map(party=>party.name)
+                    respondentNames.push(...respondentNamesEfsp)
+                } 
+
+            } else {
+                if(this.survey.data?.OtherPartyInfoEfsp && this.survey.data?.OtherPartyInfoEfsp.length>0){
+                    const respondentNamesEfsp = this.survey.data.OtherPartyInfoEfsp.map(otherParty=>otherParty.name)
+                    respondentNames.push(...respondentNamesEfsp)
+                } 
+            }
+        }        
+        
+        const fullNamesArray =[];
+        for(const name of respondentNames ){
+            fullNamesArray.push(Vue.filter('getFullName')(name))
+        }
+
+        const uniqueArray = respondentNames.filter(function(item, index) {
+            const fullName = Vue.filter('getFullName')(item)
+            return fullNamesArray.indexOf(fullName) == index;
+        })
+        
+        this.UpdateCommonStepResults({data:{'respondents':uniqueArray}})
+    }
+   
+    public onPrev() {
+        Vue.prototype.$UpdateGotoPrevStepPage()
+    }
+
+    public onNext() {
+        if(!this.survey.isCurrentPageHasErrors) {
+            Vue.prototype.$UpdateGotoNextStepPage()
+        }
+    }  
+    
+    beforeDestroy() {
+
+        this.mergeRespondants();
+
+        if(this.survey.data?.["ApplicantName"]) {
+            this.$store.commit("Application/setApplicantName", this.survey.data["ApplicantName"]);
+            this.UpdateCommonStepResults({data:{'applicantName':this.survey.data["ApplicantName"]}})
+        }
+        
+        Vue.filter('setSurveyProgress')(this.survey, this.currentStep, this.currentPage, 50, true);
+        
+        this.UpdateStepResultData({step:this.step, data: {electronicFilingStatementSurvey: Vue.filter('getSurveyResults')(this.survey, this.currentStep, this.currentPage)}})
+    }
+}
+</script>
diff --git a/web/src/components/steps/guardianshipAffidavit/Exhibits.vue b/web/src/components/steps/guardianshipAffidavit/Exhibits.vue
new file mode 100644
index 000000000..9a92dd648
--- /dev/null
+++ b/web/src/components/steps/guardianshipAffidavit/Exhibits.vue
@@ -0,0 +1,117 @@
+<template>
+    <page-base :disableNext="disableNextButton" v-on:onPrev="onPrev()" v-on:onNext="onNext()" >   
+        <survey v-bind:survey="survey"></survey>
+    </page-base>
+</template>
+
+<script lang="ts">
+import { Component, Vue, Prop} from 'vue-property-decorator';
+
+import * as SurveyVue from "survey-vue";
+import * as surveyEnv from "@/components/survey/survey-glossary";
+import surveyJson from "./forms/affidavit.json";
+
+import PageBase from "../PageBase.vue";
+import { stepInfoType, stepResultInfoType } from "@/types/Application";
+
+import { namespace } from "vuex-class";   
+import "@/store/modules/application";
+import { stepsAndPagesNumberInfoType } from '@/types/Application/StepsAndPages';
+const applicationState = namespace("Application");
+
+@Component({
+    components:{
+        PageBase
+    }
+})
+export default class Affidavit extends Vue {
+    
+    @Prop({required: true})
+    step!: stepInfoType;
+
+    @applicationState.State
+    public stPgNo!: stepsAndPagesNumberInfoType;
+
+    @applicationState.Action
+    public UpdateStepResultData!: (newStepResultData: stepResultInfoType) => void
+
+    @applicationState.Action
+    public UpdateCommonStepResults!: (newCommonStepResults) => void
+
+    survey = new SurveyVue.Model(surveyJson);
+    currentStep =0;
+    currentPage =0;    
+    disableNextButton = false;
+
+    beforeCreate() {
+        const Survey = SurveyVue;
+        surveyEnv.setCss(Survey);
+    }
+
+    created() {
+        this.disableNextButton = false;       
+    }
+
+    mounted(){
+        this.initializeSurvey();
+        this.addSurveyListener();
+        this.reloadPageInformation();
+    }
+
+    public initializeSurvey(){        
+        this.survey = new SurveyVue.Model(surveyJson);
+        this.survey.commentPrefix = "Comment";
+        this.survey.showQuestionNumbers = "off";
+        this.survey.showNavigationButtons = false;
+        surveyEnv.setGlossaryMarkdown(this.survey);
+    }
+    
+    public addSurveyListener(){
+        this.survey.onValueChanged.add((sender, options) => {            
+
+            if(options.name == "ApplicantName") {
+                this.$store.commit("Application/setApplicantName", this.survey.data["ApplicantName"]);
+                this.UpdateCommonStepResults({data:{'applicantName':this.survey.data["ApplicantName"]}})
+            }
+        })
+    }
+    
+    public reloadPageInformation() {
+    
+        this.currentStep = this.$store.state.Application.currentStep;
+        this.currentPage = this.$store.state.Application.steps[this.currentStep].currentPage;            
+
+        if (this.step.result?.affidavitSurvey) {            
+            this.survey.data = this.step.result.affidavitSurvey.data;
+            Vue.filter('scrollToLocation')(this.$store.state.Application.scrollToLocationName);            
+        } 
+        
+        Vue.filter('setSurveyProgress')(this.survey, this.currentStep, this.currentPage, 50, false);       
+    }
+   
+    public onPrev() {
+        Vue.prototype.$UpdateGotoPrevStepPage()
+    }
+
+    public onNext() {
+        if(!this.survey.isCurrentPageHasErrors) {
+            Vue.prototype.$UpdateGotoNextStepPage()
+        }
+    }  
+    
+    beforeDestroy() {     
+        
+        if(this.survey.data?.["ApplicantName"]) {
+            this.$store.commit("Application/setApplicantName", this.survey.data["ApplicantName"]);
+            const commonData = {
+                'applicantName':this.survey.data["ApplicantName"],
+                'respondents':[{first:"firstRespondent", middle:"", last:"lastRespondent"}]
+            };
+            this.UpdateCommonStepResults({data:commonData});
+        }
+        
+        Vue.filter('setSurveyProgress')(this.survey, this.currentStep, this.currentPage, 50, true);
+        this.UpdateStepResultData({step:this.step, data: {affidavitSurvey: Vue.filter('getSurveyResults')(this.survey, this.currentStep, this.currentPage)}})
+    }
+}
+</script>
diff --git a/web/src/components/steps/guardianshipAffidavit/FilingGA.vue b/web/src/components/steps/guardianshipAffidavit/FilingGA.vue
new file mode 100644
index 000000000..d72252db4
--- /dev/null
+++ b/web/src/components/steps/guardianshipAffidavit/FilingGA.vue
@@ -0,0 +1,142 @@
+<template>
+    <page-base :disableNext="disableNextButton" v-on:onPrev="onPrev()" v-on:onNext="onNext()" >   
+        <survey v-bind:survey="survey"></survey>
+    </page-base>
+</template>
+
+<script lang="ts">
+import { Component, Vue, Prop} from 'vue-property-decorator';
+
+import * as SurveyVue from "survey-vue";
+import * as surveyEnv from "@/components/survey/survey-glossary";
+import surveyJson from "./forms/filling-affidavit.json";
+
+import PageBase from "../PageBase.vue";
+import { electronicFilingDocumentInfoType, stepInfoType, stepResultInfoType } from "@/types/Application";
+
+import { namespace } from "vuex-class";   
+import "@/store/modules/application";
+import { stepsAndPagesNumberInfoType } from '@/types/Application/StepsAndPages';
+import { toggleStep } from '@/components/utils/TogglePages';
+const applicationState = namespace("Application");
+
+@Component({
+    components:{
+        PageBase
+    }
+})
+export default class FilingAff extends Vue {
+    
+    @Prop({required: true})
+    step!: stepInfoType;
+
+    @applicationState.State
+    public stPgNo!: stepsAndPagesNumberInfoType;
+
+    @applicationState.State
+    public steps!: stepInfoType[];
+
+    @applicationState.Action
+    public UpdateStepResultData!: (newStepResultData: stepResultInfoType) => void
+
+    @applicationState.Action
+    public UpdateCommonStepResults!: (newCommonStepResults) => void
+
+    survey = new SurveyVue.Model(surveyJson);
+    currentStep =0;
+    currentPage =0;    
+    disableNextButton = false;
+
+    beforeCreate() {
+        const Survey = SurveyVue;
+        surveyEnv.setCss(Survey);
+    }
+
+    created() {
+        this.disableNextButton = false;       
+    }
+
+    mounted(){
+        this.initializeSurvey();
+        this.addSurveyListener();
+        this.reloadPageInformation();
+    }
+
+    public initializeSurvey(){        
+        this.survey = new SurveyVue.Model(surveyJson);
+        this.survey.commentPrefix = "Comment";
+        this.survey.showQuestionNumbers = "off";
+        this.survey.showNavigationButtons = false;
+        surveyEnv.setGlossaryMarkdown(this.survey);
+    }
+    
+    public addSurveyListener(){
+        this.survey.onValueChanged.add((sender, options) => {
+
+            this.determineSteps();            
+            
+            
+        })
+    }
+
+    public determineSteps(){
+
+        if (this.survey.data?.sworn && this.steps[this.stPgNo.OTHER._StepNo].result?.otherFormsSurvey?.data?.filingMethod){
+            const eFiling = this.steps[this.stPgNo.OTHER._StepNo].result.otherFormsSurvey.data.filingMethod == 'eFile';
+            toggleStep(this.stPgNo.EFSP._StepNo, this.survey.data.sworn == 'y' && eFiling);
+        }
+            
+    }
+    
+    public reloadPageInformation() {
+    
+        this.currentStep = this.$store.state.Application.currentStep;
+        this.currentPage = this.$store.state.Application.steps[this.currentStep].currentPage;            
+
+        if (this.step.result?.filingAffSurvey) {            
+            this.survey.data = this.step.result.filingAffSurvey.data;
+            Vue.filter('scrollToLocation')(this.$store.state.Application.scrollToLocationName);
+                       
+        } 
+
+        if (this.steps[this.stPgNo.OTHER._StepNo].result?.otherFormsSurvey?.data?.filingMethod) {
+            const eFiling = this.steps[this.stPgNo.OTHER._StepNo].result.otherFormsSurvey.data.filingMethod == 'eFile';           
+            this.survey.setVariable('eFiling', eFiling)
+        } 
+        this.determineSteps(); 
+        
+        Vue.filter('setSurveyProgress')(this.survey, this.currentStep, this.currentPage, 50, false);       
+    }
+   
+    public onPrev() {
+        Vue.prototype.$UpdateGotoPrevStepPage()
+    }
+
+    public onNext() {
+        if(!this.survey.isCurrentPageHasErrors) {
+            Vue.prototype.$UpdateGotoNextStepPage()
+        }
+    }  
+
+    public setEfsDocumentList(){
+       
+        const efsDocumentList: electronicFilingDocumentInfoType[] = this.steps[this.stPgNo.GETSTART._StepNo].result?.efsDocuments?.length>0?this.steps[this.stPgNo.GETSTART._StepNo].result.efsDocuments:[];
+      
+        if (this.step.result.aboutAffiantSurvey?.data?.ApplicantName){
+            const applicantName = this.step.result.aboutAffiantSurvey.data.ApplicantName
+            efsDocumentList.push({documentName: 'Affidavit', efsApplicantName: applicantName});
+        }
+              
+       this.UpdateCommonStepResults({data:{'efsDocuments':efsDocumentList}});
+    }
+    
+    beforeDestroy() {   
+        
+        this.setEfsDocumentList();
+        
+        Vue.filter('setSurveyProgress')(this.survey, this.currentStep, this.currentPage, 50, true);
+        
+        this.UpdateStepResultData({step:this.step, data: {filingAffSurvey: Vue.filter('getSurveyResults')(this.survey, this.currentStep, this.currentPage)}})
+    }
+}
+</script>
diff --git a/web/src/components/steps/guardianshipAffidavit/GuardianshipAffidavit.vue b/web/src/components/steps/guardianshipAffidavit/GuardianshipAffidavit.vue
new file mode 100644
index 000000000..9a92dd648
--- /dev/null
+++ b/web/src/components/steps/guardianshipAffidavit/GuardianshipAffidavit.vue
@@ -0,0 +1,117 @@
+<template>
+    <page-base :disableNext="disableNextButton" v-on:onPrev="onPrev()" v-on:onNext="onNext()" >   
+        <survey v-bind:survey="survey"></survey>
+    </page-base>
+</template>
+
+<script lang="ts">
+import { Component, Vue, Prop} from 'vue-property-decorator';
+
+import * as SurveyVue from "survey-vue";
+import * as surveyEnv from "@/components/survey/survey-glossary";
+import surveyJson from "./forms/affidavit.json";
+
+import PageBase from "../PageBase.vue";
+import { stepInfoType, stepResultInfoType } from "@/types/Application";
+
+import { namespace } from "vuex-class";   
+import "@/store/modules/application";
+import { stepsAndPagesNumberInfoType } from '@/types/Application/StepsAndPages';
+const applicationState = namespace("Application");
+
+@Component({
+    components:{
+        PageBase
+    }
+})
+export default class Affidavit extends Vue {
+    
+    @Prop({required: true})
+    step!: stepInfoType;
+
+    @applicationState.State
+    public stPgNo!: stepsAndPagesNumberInfoType;
+
+    @applicationState.Action
+    public UpdateStepResultData!: (newStepResultData: stepResultInfoType) => void
+
+    @applicationState.Action
+    public UpdateCommonStepResults!: (newCommonStepResults) => void
+
+    survey = new SurveyVue.Model(surveyJson);
+    currentStep =0;
+    currentPage =0;    
+    disableNextButton = false;
+
+    beforeCreate() {
+        const Survey = SurveyVue;
+        surveyEnv.setCss(Survey);
+    }
+
+    created() {
+        this.disableNextButton = false;       
+    }
+
+    mounted(){
+        this.initializeSurvey();
+        this.addSurveyListener();
+        this.reloadPageInformation();
+    }
+
+    public initializeSurvey(){        
+        this.survey = new SurveyVue.Model(surveyJson);
+        this.survey.commentPrefix = "Comment";
+        this.survey.showQuestionNumbers = "off";
+        this.survey.showNavigationButtons = false;
+        surveyEnv.setGlossaryMarkdown(this.survey);
+    }
+    
+    public addSurveyListener(){
+        this.survey.onValueChanged.add((sender, options) => {            
+
+            if(options.name == "ApplicantName") {
+                this.$store.commit("Application/setApplicantName", this.survey.data["ApplicantName"]);
+                this.UpdateCommonStepResults({data:{'applicantName':this.survey.data["ApplicantName"]}})
+            }
+        })
+    }
+    
+    public reloadPageInformation() {
+    
+        this.currentStep = this.$store.state.Application.currentStep;
+        this.currentPage = this.$store.state.Application.steps[this.currentStep].currentPage;            
+
+        if (this.step.result?.affidavitSurvey) {            
+            this.survey.data = this.step.result.affidavitSurvey.data;
+            Vue.filter('scrollToLocation')(this.$store.state.Application.scrollToLocationName);            
+        } 
+        
+        Vue.filter('setSurveyProgress')(this.survey, this.currentStep, this.currentPage, 50, false);       
+    }
+   
+    public onPrev() {
+        Vue.prototype.$UpdateGotoPrevStepPage()
+    }
+
+    public onNext() {
+        if(!this.survey.isCurrentPageHasErrors) {
+            Vue.prototype.$UpdateGotoNextStepPage()
+        }
+    }  
+    
+    beforeDestroy() {     
+        
+        if(this.survey.data?.["ApplicantName"]) {
+            this.$store.commit("Application/setApplicantName", this.survey.data["ApplicantName"]);
+            const commonData = {
+                'applicantName':this.survey.data["ApplicantName"],
+                'respondents':[{first:"firstRespondent", middle:"", last:"lastRespondent"}]
+            };
+            this.UpdateCommonStepResults({data:commonData});
+        }
+        
+        Vue.filter('setSurveyProgress')(this.survey, this.currentStep, this.currentPage, 50, true);
+        this.UpdateStepResultData({step:this.step, data: {affidavitSurvey: Vue.filter('getSurveyResults')(this.survey, this.currentStep, this.currentPage)}})
+    }
+}
+</script>
diff --git a/web/src/components/steps/guardianshipAffidavit/GuardianshipAffidavitStep.vue b/web/src/components/steps/guardianshipAffidavit/GuardianshipAffidavitStep.vue
new file mode 100644
index 000000000..504c8c004
--- /dev/null
+++ b/web/src/components/steps/guardianshipAffidavit/GuardianshipAffidavitStep.vue
@@ -0,0 +1,50 @@
+<template>
+    <step-base v-bind:step="step">    
+        <affidavit                v-bind:step="step"     v-if="step.currentPage == stPgNo.AFF.Affidavit" />
+        <about-affiant            v-bind:step="step"     v-if="step.currentPage == stPgNo.AFF.AboutAffiant" />
+        <your-story-aff           v-bind:step="step"     v-if="step.currentPage == stPgNo.AFF.YourStoryAFF" />
+        <filing-aff               v-bind:step="step"     v-if="step.currentPage == stPgNo.AFF.FilingAFF" />
+        <review-your-answers-aff  v-bind:step="step"     v-if="step.currentPage == stPgNo.AFF.ReviewYourAnswersAFF"/>
+        <preview-forms-aff        v-bind:step="step"     v-if="step.currentPage == stPgNo.AFF.PreviewFormsAFF"/> 
+    </step-base>
+</template>
+
+<script lang="ts">
+import { Component, Vue, Prop} from 'vue-property-decorator';
+import { namespace } from "vuex-class";   
+
+import "@/store/modules/application";
+const applicationState = namespace("Application");
+
+import StepBase from "../StepBase.vue";
+import Affidavit from "./Affidavit.vue";
+import AboutAffiant from "./AboutAffiant.vue";
+import YourStoryAff from "./YourStoryAFF.vue";
+import FilingAff from "./FilingAFF.vue";
+import ReviewYourAnswersAff from "./reviewAFF/ReviewYourAnswersAFF.vue";
+import PreviewFormsAff from "./reviewAFF/PreviewFormsAFF.vue";
+
+import { stepInfoType } from "@/types/Application";
+import {stepsAndPagesNumberInfoType} from "@/types/Application/StepsAndPages";
+
+@Component({
+    components:{
+        StepBase,        
+        Affidavit,        
+        AboutAffiant,
+        YourStoryAff,
+        FilingAff,
+        ReviewYourAnswersAff,
+        PreviewFormsAff
+    }
+})
+export default class AffidavitStep extends Vue {
+  
+    @Prop({required: true})
+    step!: stepInfoType
+
+    @applicationState.State
+    public stPgNo!: stepsAndPagesNumberInfoType;
+
+}
+</script>
diff --git a/web/src/components/steps/guardianshipAffidavit/caringForchildGa/CaringForChildGa.vue b/web/src/components/steps/guardianshipAffidavit/caringForchildGa/CaringForChildGa.vue
new file mode 100644
index 000000000..612e01d13
--- /dev/null
+++ b/web/src/components/steps/guardianshipAffidavit/caringForchildGa/CaringForChildGa.vue
@@ -0,0 +1,324 @@
+<template>
+    <page-base v-bind:hideNavButtons="!showTable" v-bind:disableNext="isDisableNext()" v-on:onPrev="onPrev()" v-on:onNext="onNext()" >
+        <div class="home-content">
+            <div class="row">
+                <div class="col-md-12">
+                    <h1>Children Details</h1>
+                    <p>You have indicated you are asking for orders about a child.</p>
+                    <p>Please enter the details of the child in the fields below.  
+                        Add each child who is the subject of your family law matter application.  
+                        To add a child, click the "Add Child" button.  If you are done entering 
+                        all the children, click the "Next" button.
+                    </p>
+                    <div class="childSection" v-if="showTable">
+                        <div class="childAlign">
+                            <table class="table table-hover">
+                                <thead>
+                                    <tr>
+                                    <th scope="col">Child's name</th>
+                                    <th scope="col">Child's date of birth</th>
+                                    <th v-if="!formOneRequired" scope="col">Your relationship to the child</th>
+                                    <th v-if="!formOneRequired" scope="col">Other party's relationship to the child</th>
+                                    <th v-if="!formOneRequired" scope="col">Child is currently living with</th>
+                                    <th scope="col"></th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <div></div>
+                                    <tr v-for="child in childData" :key="child.id">
+                                    <td>{{child.name.first}} {{child.name.middle}} {{child.name.last}}</td>
+                                    <td>{{child.dob | beautify-date}}</td>
+                                    <td v-if="!formOneRequired">{{child.relation}}</td>
+                                    <td v-if="!formOneRequired">{{child.opRelation}}</td>
+                                    <td v-if="!formOneRequired && child.currentLiving != 'other'">{{child.currentLiving}}</td>
+                                    <td v-else-if="!formOneRequired && child.currentLiving == 'other'">{{child.currentLivingComment}}</td>
+                                    <td><a class="btn btn-light" v-b-tooltip.hover.noninteractive title="Delete" @click="deleteRow(child.id)"><i class="fa fa-trash"></i></a> &nbsp;&nbsp; 
+                                    <a class="btn btn-light" v-b-tooltip.hover.noninteractive title="Edit" @click="openForm(child)"><i class="fa fa-edit"></i></a></td>
+                                    </tr>
+                                    <tr class="clickableRow" @click="openForm()">
+                                    <td colspan = "7">
+                                        <a :class="isDisableNext()?'text-danger h4 my-2':'h4 my-2'" style="cursor: pointer;"
+                                        >+Add Child</a>
+                                    </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="col-md-12" v-if="!showTable" id="child-info-survey">
+                    <children-survey v-on:showTable="childComponentData" v-on:surveyData="populateSurveyData" v-on:editedData="editRow" :editRowProp="anyRowToBeEdited" :formOneRequired="formOneRequired" />
+                </div>
+               
+            </div>
+        </div>
+        <b-card v-if="showTable && childData && childData.length > 0" class="mb-5" style="max-width: 950px; border-radius: 20px; border:2px solid #ccc;">
+            <p>
+                The <a href="https://www2.gov.bc.ca/gov/content/life-events/divorce/family-justice/family-law/parenting-apart/best-interests" target="_blank"
+            >best interests of the child</a> is a test that the court uses to make decisions about children.  
+                Before making a decision, both parents and courts must consider the child's physical, psychological 
+                and emotional safety, security and well-being.  You must always think about the best interests of 
+                the child when you are asking the court for decisions about them.
+            </p>
+            
+            <b-form-checkbox 
+                size="lg" 
+                v-model="childBestInterestUnderstanding" 
+                style="display:inline-block;color:#556077; font-size:1.40em; font-weight:bold; transform:translate(0px,3px);">
+            </b-form-checkbox>
+            <div style="display:inline;color:#556077; font-size:1.5em; font-weight:bold;">
+                I understand that I must consider the child(ren)'s best interests with respect to each order about the child I am asking the court to make.
+            </div>
+            
+        </b-card>
+        <b-card v-if="incompleteError && showTable" name="incomplete-error" class="alert-danger p-3 my-4 " no-body>
+            <div>Required Child information is missing. Click the "Edit button <div class="d-inline fa fa-edit"></div> " to fix it. </div>
+        </b-card>   
+    </page-base>
+</template>
+
+<script lang="ts">
+import { Component, Vue, Prop} from 'vue-property-decorator';
+import ChildrenSurvey from "./ChildrenSurvey.vue";
+import { stepInfoType, stepResultInfoType } from "@/types/Application";
+import PageBase from "../../PageBase.vue";
+
+import {SearchForChildrenData} from "@/components/utils/ChildrenData/SearchForChildrenData"
+
+import { namespace } from "vuex-class";   
+import "@/store/modules/application";
+import { stepsAndPagesNumberInfoType } from '@/types/Application/StepsAndPages';
+const applicationState = namespace("Application");
+
+@Component({
+    components:{
+      ChildrenSurvey,
+      PageBase
+    }
+})
+export default class ChildrenInfo extends Vue {
+
+    @Prop({required: true})
+    step!: stepInfoType
+
+    @applicationState.State
+    public stPgNo!: stepsAndPagesNumberInfoType;
+
+    @applicationState.State
+    public steps!: stepInfoType[];    
+
+    @applicationState.Action
+    public UpdateStepResultData!: (newStepResultData: stepResultInfoType) => void
+
+    currentStep =0;
+    currentPage =0;
+    showTable = true;
+    childBestInterestUnderstanding = false;
+    childData = [];
+    anyRowToBeEdited = null;
+    editId = null; 
+    incompleteError =  false;  
+    formOneRequired = false;     
+    
+    public openForm(anyRowToBeEdited?) {
+        this.showTable = false;
+         Vue.nextTick(()=>{
+            const el = document.getElementById('child-info-survey')
+            if(el) el.scrollIntoView();
+        })
+        if(anyRowToBeEdited) {
+            this.editId = anyRowToBeEdited.id;
+            this.anyRowToBeEdited = anyRowToBeEdited;
+        } else {
+            this.anyRowToBeEdited = null;
+        }
+    }
+
+    public childComponentData(value) {       
+        this.showTable = value;
+    }
+
+    public populateSurveyData(childValue) {
+
+        const currentIndexValue = this.childData?.length > 0 ? this.childData[this.childData.length - 1].id : 0;
+        const id = currentIndexValue + 1;
+        const newChild = { ...childValue, id };
+        this.childData = [...this.childData, newChild];
+
+        this.showTable = true; 
+        this.resetChildrenRelatedPages(this.childData);
+    }
+
+    public deleteRow(rowToBeDeleted) {
+       
+        this.childData = this.childData.filter(data => {
+            return data.id !== rowToBeDeleted;
+        }); 
+        this.resetChildrenRelatedPages(this.childData);
+        this.surveyHasError();
+    }
+
+    public editRow(editedRow) {
+        this.childData = this.childData.map(data => {
+            return data.id === this.editId ? editedRow : data;
+        });
+        this.showTable = true;
+        this.surveyHasError();
+        this.resetChildrenRelatedPages(this.childData);
+    }
+
+    public onPrev() {
+       Vue.prototype.$UpdateGotoPrevStepPage();
+    }
+
+    public onNext() {
+        Vue.prototype.$UpdateGotoNextStepPage();
+    }
+
+    created() {
+
+        if (this.step.result?.childrenInfoSurvey) {
+            this.childData = this.step.result.childrenInfoSurvey.data;
+        }
+        if (this.step.result?.childBestInterestAcknowledgement) {
+            this.childBestInterestUnderstanding = this.step.result.childBestInterestAcknowledgement;
+        }
+
+        if(this.childData?.length == 0){
+            this.childData= SearchForChildrenData('FLM');            
+        }
+
+        this.formOneRequired = false;
+
+        const stepCOM = this.$store.state.Application.steps[this.stPgNo.COMMON._StepNo]
+
+        if( stepCOM.result?.filingLocationSurvey?.data){
+            const filingLocationData = stepCOM.result.filingLocationSurvey.data;
+            this.formOneRequired = this.determineRequiredForm(filingLocationData);            
+        }
+    }
+
+    mounted(){
+        Vue.nextTick(()=>this.surveyHasError());
+        this.currentStep = this.$store.state.Application.currentStep;
+        this.currentPage = this.$store.state.Application.steps[this.currentStep].currentPage;        
+    }
+
+    public determineRequiredForm(filingLocationData){
+        
+        let location = ''
+        location = filingLocationData?.ExistingCourt;                
+        
+        if(Vue.filter('includedInRegistries')(location, 'early-resolutions') && filingLocationData?.MetEarlyResolutionRequirements == 'n'){
+            return true;
+        } else {
+            return false;
+        }
+    }   
+
+    public surveyHasError(){
+        let progress = this.childData.length==0? 50 : 100;
+        this.incompleteError =  false;        
+        for(const child of this.childData){
+            if ((this.formOneRequired && !child.dob) || 
+                (!this.formOneRequired && (!child.dob || !child.relation || !child.opRelation || !child.currentLiving))){            
+                this.incompleteError = true;  
+                progress = 50;    
+                break
+            }
+        }        
+        Vue.filter('setSurveyProgress')(null, this.currentStep, this.currentPage, progress, false);
+    }
+
+    public isDisableNext() {
+        return (this.childData?.length <= 0 || !this.childBestInterestUnderstanding);
+    }
+
+    beforeDestroy() {
+        this.surveyHasError();        
+        this.UpdateStepResultData({step:this.step, data: {childrenInfoSurvey: this.getChildrenResults(), childBestInterestAcknowledgement:this.childBestInterestUnderstanding}})       
+    }
+
+    public getChildrenResults(){
+        const questionResults: {name:string; value: any; title:string; inputType:string}[] =[];
+        for(const child of this.childData)
+        {
+            questionResults.push({name:'childInfoSurvey', value: this.getChildInfo(child), title:'Child '+child.id +' Information', inputType:''})
+        }
+        
+        return {data: this.childData, questions:questionResults, pageName:'Children Information', currentStep: this.currentStep, currentPage:this.currentPage}
+    }
+
+    public getChildInfo(child){
+        const resultString = [];
+
+        resultString.push(Vue.filter('styleTitle')("Name: ")+Vue.filter('getFullName')(child.name));
+        resultString.push(Vue.filter('styleTitle')("Birthdate: ")+Vue.filter('beautify-date')(child.dob))
+        if (!this.formOneRequired){
+            resultString.push(Vue.filter('styleTitle')("Your relationship: ")+child.relation)
+            resultString.push(Vue.filter('styleTitle')("Other party’s relationship: ")+child.opRelation)
+            if (child.currentLiving == 'other'){
+                resultString.push(Vue.filter('styleTitle')("Living with: ")+child.currentLivingComment)
+            } else {
+                resultString.push(Vue.filter('styleTitle')("Living with: ")+child.currentLiving)
+            }
+        }        
+        
+        return resultString
+    }
+
+    public resetChildrenRelatedPages(childData?) {
+    
+        const stPgNo: stepsAndPagesNumberInfoType = this.$store.state.Application.stPgNo;   
+        const p = stPgNo.FLM;
+
+        const pages = [
+            p.ParentingArrangements,
+            p.ParentalResponsibilities,
+            p.ParentingTime,
+            p.ParentingOrderAgreement,
+            p.BestInterestsOfChild,
+            p.ChildSupportCurrentArrangements,
+            p.AboutChildSupportOrder,
+            p.SpecialAndExtraordinaryExpenses,
+            p.ContactWithChild,
+            p.ContactWithChildOrder,
+            p.AboutContactWithChildOrder,
+            p.ContactWithChildBestInterestsOfChild,
+            p.GuardianOfChild,
+            p.ReviewYourAnswersFLM
+        ]
+        Vue.filter('setProgressForPages')(p._StepNo, pages,50);    
+
+    }
+}
+</script>
+
+<style scoped lang="scss">
+@import "src/styles/common";
+.home-content {
+    padding-bottom: 20px;
+    padding-top: 2rem;
+    max-width: 950px;
+    color: black;
+}
+.childSection {
+    border: 2px solid rgba($gov-pale-grey, 0.7);
+    border-radius: 18px;
+    width: 100%
+}
+.childAlign {
+    padding: 20px;
+}
+.table, td, th{
+    border: 1px solid rgba($gov-pale-grey, 0.9);
+  
+}
+.clickableRow {
+    background-color: rgba($gov-pale-grey, 0.5);
+    td a {
+        display: block;
+    }
+}
+</style>
diff --git a/web/src/components/steps/guardianshipAffidavit/caringForchildGa/ChildrenSurvey.vue b/web/src/components/steps/guardianshipAffidavit/caringForchildGa/ChildrenSurvey.vue
new file mode 100644
index 000000000..3fd685f22
--- /dev/null
+++ b/web/src/components/steps/guardianshipAffidavit/caringForchildGa/ChildrenSurvey.vue
@@ -0,0 +1,136 @@
+<template>
+    <div>
+        <survey v-bind:survey="survey"></survey>
+        <div class="row">
+            <div class="col-6">
+                <button type="button" class="btn btn-secondary" @click="goBack()">Cancel</button>
+            </div>
+            <div class="col-6">
+                <button type="button" class="btn btn-success" @click="saveChild()">Save</button>
+            </div>
+        </div>
+        <br />
+    </div>
+</template>
+
+<script lang="ts">
+import { Component, Vue, Prop} from 'vue-property-decorator';
+import { childInfoType } from '@/types/Application/CommonInformation';
+import * as SurveyVue from "survey-vue";
+import surveyJson from "./forms/survey-childInfo.json";
+import * as surveyEnv from "@/components/survey/survey-glossary";
+
+import { namespace } from "vuex-class";   
+import "@/store/modules/application";
+const applicationState = namespace("Application");
+
+import {stepsAndPagesNumberInfoType} from "@/types/Application/StepsAndPages"
+
+@Component
+export default class ChildrenSurvey extends Vue {
+    
+    @Prop({required: true})
+    editRowProp!: Object;
+
+    @Prop({required: true})
+    formOneRequired!: boolean;
+
+    @applicationState.State
+    public stPgNo!: stepsAndPagesNumberInfoType;
+    
+    child = {} as childInfoType;
+
+    survey = new SurveyVue.Model(surveyJson);
+    currentStep =0;
+    currentPage =0;
+
+    beforeCreate() {
+        const Survey = SurveyVue;
+        surveyEnv.setCss(Survey);       
+    }
+
+    mounted(){
+        this.initializeSurvey();
+        this.addSurveyListener();
+        this.reloadPageInformation();
+    }
+
+    public initializeSurvey(){
+        this.survey = new SurveyVue.Model(surveyJson);
+        this.survey.commentPrefix = "Comment";
+        this.survey.showQuestionNumbers = "off";
+        this.survey.showNavigationButtons = false;
+        surveyEnv.setGlossaryMarkdown(this.survey);
+    }
+    
+    public addSurveyListener(){
+        Vue.filter('surveyChanged')('familyLawMatter')        
+        this.survey.onComplete.add((sender, options) => {
+            this.populateChildModel(sender.data);
+            let id = sender.getVariable("id");
+            if (id === null || id === undefined) {
+                this.$emit("surveyData", this.child);
+            } else {
+                this.$emit("editedData", { ...this.child, id });
+                id = null;
+            }
+        });
+    }
+    
+    public reloadPageInformation() {
+        if (this.editRowProp != null) {
+            this.populateFormWithPreExistingValues(this.editRowProp, this.survey);
+        }
+        
+        let progress = 50;
+        if(Object.keys(this.survey.data).length)
+            progress = this.survey.isCurrentPageHasErrors? 50 : 100;
+            
+        this.currentStep = this.$store.state.Application.currentStep;
+        this.currentPage = this.$store.state.Application.steps[this.currentStep].currentPage;
+        this.$store.commit("Application/setPageProgress", { currentStep: this.currentStep, currentPage:this.currentPage, progress:progress })   
+        this.survey.setVariable("formOneRequired", this.formOneRequired);    
+    }
+  
+    public goBack() {
+        this.$emit("showTable", true);
+    }
+    
+    public saveChild() {
+        
+        this.survey.completeLastPage();
+    }
+
+    public populateChildModel(childData) {
+        if(childData){
+            this.child.name = childData.childName;       
+            this.child.dob = childData.childDateOfBirth;
+            this.child.relation = childData.relationToChild;
+            this.child.opRelation = childData.childRelationToOtherParty;
+            this.child.currentLiving = childData.childCurrentlyLivingWith;
+            this.child.ack = childData.childInfoAckknowledge;
+            this.child.additionalInfo = childData.childAdditionalInfo;
+            this.child.additionalInfoDetails = childData.additionInfoDetails;
+        }
+    }
+
+    public populateFormWithPreExistingValues(editRowProp, survey) {
+        survey.data = {
+            childName: { first: editRowProp.name.first, middle: editRowProp.name.middle, last: editRowProp.name.last }
+        };
+        survey.setValue("childDateOfBirth", editRowProp.dob);
+        survey.setValue("relationToChild", editRowProp.relation);
+        survey.setValue("childRelationToOtherParty", editRowProp.opRelation);
+        survey.setValue("childCurrentlyLivingWith", editRowProp.currentLiving);
+        survey.setValue("childInfoAckknowledge", editRowProp.ack);
+        survey.setValue("childAdditionalInfo", editRowProp.additionalInfo);
+        survey.setValue("additionInfoDetails", editRowProp.additionalInfoDetails);
+        survey.setVariable("id", editRowProp.id);
+    }
+
+    beforeDestroy() {
+        const progress = this.survey.isCurrentPageHasErrors? 50 : 100;
+        this.$store.commit("Application/setPageProgress", { currentStep: this.currentStep, currentPage:this.currentPage, progress:progress })
+    }
+}
+</script>
diff --git a/web/src/components/steps/guardianshipAffidavit/caringForchildGa/forms/survey-childInfo.json b/web/src/components/steps/guardianshipAffidavit/caringForchildGa/forms/survey-childInfo.json
new file mode 100644
index 000000000..0cc945d80
--- /dev/null
+++ b/web/src/components/steps/guardianshipAffidavit/caringForchildGa/forms/survey-childInfo.json
@@ -0,0 +1,53 @@
+{
+    "title": "Child(ren) Information",
+    "pages": [
+        {
+            "name": "Child(ren) Information",
+            "elements": [
+                {
+                    "type": "personname",
+                    "name": "childName",
+                    "title": "What is the name of the child?",
+                    "isRequired": true,
+                    "defaultSubstitution": "{ChildName}"
+                },
+                {
+                    "type": "text",
+                    "name": "childDateOfBirth",
+                    "title": "What is the child's date of birth?",
+                    "isRequired": true,
+                    "inputType": "date"
+                },
+                {
+                    "type": "comment",
+                    "name": "relationToChild",
+                    "title": "What is your relationship to the child?",
+                    "description": "Use whatever wording best describes it, for example, father, step-mother, grandparent, etc.",
+                    "isRequired": true,
+                    "visible": false,
+                    "visibleIf": "!{formOneRequired}"
+                },
+                {
+                    "type": "comment",
+                    "name": "childRelationToOtherParty",
+                    "title": "What is the other party's relationship to the child?",
+                    "description": "Use whatever wording best describes it, for example, father, step-mother, grandparent, etc.",
+                    "isRequired": true,
+                    "visible": false,
+                    "visibleIf": "!{formOneRequired}"
+                },
+                {
+                    "type": "text",
+                    "name": "childCurrentlyLivingWith",
+                    "title": "Who is the child currently living with?",
+                    "description": "You can use the name of the person or their relationship to the child.",
+                    "isRequired": true,
+                    "visible": false,
+                     "visibleIf": "!{formOneRequired}"
+                }
+            ]
+        }
+    ],
+    "showQuestionNumbers": "off",
+    "requiredText": ""
+}
\ No newline at end of file
diff --git a/web/src/components/steps/guardianshipAffidavit/childrenDetailsGa/ChildrenDetailsGa.vue b/web/src/components/steps/guardianshipAffidavit/childrenDetailsGa/ChildrenDetailsGa.vue
new file mode 100644
index 000000000..612e01d13
--- /dev/null
+++ b/web/src/components/steps/guardianshipAffidavit/childrenDetailsGa/ChildrenDetailsGa.vue
@@ -0,0 +1,324 @@
+<template>
+    <page-base v-bind:hideNavButtons="!showTable" v-bind:disableNext="isDisableNext()" v-on:onPrev="onPrev()" v-on:onNext="onNext()" >
+        <div class="home-content">
+            <div class="row">
+                <div class="col-md-12">
+                    <h1>Children Details</h1>
+                    <p>You have indicated you are asking for orders about a child.</p>
+                    <p>Please enter the details of the child in the fields below.  
+                        Add each child who is the subject of your family law matter application.  
+                        To add a child, click the "Add Child" button.  If you are done entering 
+                        all the children, click the "Next" button.
+                    </p>
+                    <div class="childSection" v-if="showTable">
+                        <div class="childAlign">
+                            <table class="table table-hover">
+                                <thead>
+                                    <tr>
+                                    <th scope="col">Child's name</th>
+                                    <th scope="col">Child's date of birth</th>
+                                    <th v-if="!formOneRequired" scope="col">Your relationship to the child</th>
+                                    <th v-if="!formOneRequired" scope="col">Other party's relationship to the child</th>
+                                    <th v-if="!formOneRequired" scope="col">Child is currently living with</th>
+                                    <th scope="col"></th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <div></div>
+                                    <tr v-for="child in childData" :key="child.id">
+                                    <td>{{child.name.first}} {{child.name.middle}} {{child.name.last}}</td>
+                                    <td>{{child.dob | beautify-date}}</td>
+                                    <td v-if="!formOneRequired">{{child.relation}}</td>
+                                    <td v-if="!formOneRequired">{{child.opRelation}}</td>
+                                    <td v-if="!formOneRequired && child.currentLiving != 'other'">{{child.currentLiving}}</td>
+                                    <td v-else-if="!formOneRequired && child.currentLiving == 'other'">{{child.currentLivingComment}}</td>
+                                    <td><a class="btn btn-light" v-b-tooltip.hover.noninteractive title="Delete" @click="deleteRow(child.id)"><i class="fa fa-trash"></i></a> &nbsp;&nbsp; 
+                                    <a class="btn btn-light" v-b-tooltip.hover.noninteractive title="Edit" @click="openForm(child)"><i class="fa fa-edit"></i></a></td>
+                                    </tr>
+                                    <tr class="clickableRow" @click="openForm()">
+                                    <td colspan = "7">
+                                        <a :class="isDisableNext()?'text-danger h4 my-2':'h4 my-2'" style="cursor: pointer;"
+                                        >+Add Child</a>
+                                    </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="col-md-12" v-if="!showTable" id="child-info-survey">
+                    <children-survey v-on:showTable="childComponentData" v-on:surveyData="populateSurveyData" v-on:editedData="editRow" :editRowProp="anyRowToBeEdited" :formOneRequired="formOneRequired" />
+                </div>
+               
+            </div>
+        </div>
+        <b-card v-if="showTable && childData && childData.length > 0" class="mb-5" style="max-width: 950px; border-radius: 20px; border:2px solid #ccc;">
+            <p>
+                The <a href="https://www2.gov.bc.ca/gov/content/life-events/divorce/family-justice/family-law/parenting-apart/best-interests" target="_blank"
+            >best interests of the child</a> is a test that the court uses to make decisions about children.  
+                Before making a decision, both parents and courts must consider the child's physical, psychological 
+                and emotional safety, security and well-being.  You must always think about the best interests of 
+                the child when you are asking the court for decisions about them.
+            </p>
+            
+            <b-form-checkbox 
+                size="lg" 
+                v-model="childBestInterestUnderstanding" 
+                style="display:inline-block;color:#556077; font-size:1.40em; font-weight:bold; transform:translate(0px,3px);">
+            </b-form-checkbox>
+            <div style="display:inline;color:#556077; font-size:1.5em; font-weight:bold;">
+                I understand that I must consider the child(ren)'s best interests with respect to each order about the child I am asking the court to make.
+            </div>
+            
+        </b-card>
+        <b-card v-if="incompleteError && showTable" name="incomplete-error" class="alert-danger p-3 my-4 " no-body>
+            <div>Required Child information is missing. Click the "Edit button <div class="d-inline fa fa-edit"></div> " to fix it. </div>
+        </b-card>   
+    </page-base>
+</template>
+
+<script lang="ts">
+import { Component, Vue, Prop} from 'vue-property-decorator';
+import ChildrenSurvey from "./ChildrenSurvey.vue";
+import { stepInfoType, stepResultInfoType } from "@/types/Application";
+import PageBase from "../../PageBase.vue";
+
+import {SearchForChildrenData} from "@/components/utils/ChildrenData/SearchForChildrenData"
+
+import { namespace } from "vuex-class";   
+import "@/store/modules/application";
+import { stepsAndPagesNumberInfoType } from '@/types/Application/StepsAndPages';
+const applicationState = namespace("Application");
+
+@Component({
+    components:{
+      ChildrenSurvey,
+      PageBase
+    }
+})
+export default class ChildrenInfo extends Vue {
+
+    @Prop({required: true})
+    step!: stepInfoType
+
+    @applicationState.State
+    public stPgNo!: stepsAndPagesNumberInfoType;
+
+    @applicationState.State
+    public steps!: stepInfoType[];    
+
+    @applicationState.Action
+    public UpdateStepResultData!: (newStepResultData: stepResultInfoType) => void
+
+    currentStep =0;
+    currentPage =0;
+    showTable = true;
+    childBestInterestUnderstanding = false;
+    childData = [];
+    anyRowToBeEdited = null;
+    editId = null; 
+    incompleteError =  false;  
+    formOneRequired = false;     
+    
+    public openForm(anyRowToBeEdited?) {
+        this.showTable = false;
+         Vue.nextTick(()=>{
+            const el = document.getElementById('child-info-survey')
+            if(el) el.scrollIntoView();
+        })
+        if(anyRowToBeEdited) {
+            this.editId = anyRowToBeEdited.id;
+            this.anyRowToBeEdited = anyRowToBeEdited;
+        } else {
+            this.anyRowToBeEdited = null;
+        }
+    }
+
+    public childComponentData(value) {       
+        this.showTable = value;
+    }
+
+    public populateSurveyData(childValue) {
+
+        const currentIndexValue = this.childData?.length > 0 ? this.childData[this.childData.length - 1].id : 0;
+        const id = currentIndexValue + 1;
+        const newChild = { ...childValue, id };
+        this.childData = [...this.childData, newChild];
+
+        this.showTable = true; 
+        this.resetChildrenRelatedPages(this.childData);
+    }
+
+    public deleteRow(rowToBeDeleted) {
+       
+        this.childData = this.childData.filter(data => {
+            return data.id !== rowToBeDeleted;
+        }); 
+        this.resetChildrenRelatedPages(this.childData);
+        this.surveyHasError();
+    }
+
+    public editRow(editedRow) {
+        this.childData = this.childData.map(data => {
+            return data.id === this.editId ? editedRow : data;
+        });
+        this.showTable = true;
+        this.surveyHasError();
+        this.resetChildrenRelatedPages(this.childData);
+    }
+
+    public onPrev() {
+       Vue.prototype.$UpdateGotoPrevStepPage();
+    }
+
+    public onNext() {
+        Vue.prototype.$UpdateGotoNextStepPage();
+    }
+
+    created() {
+
+        if (this.step.result?.childrenInfoSurvey) {
+            this.childData = this.step.result.childrenInfoSurvey.data;
+        }
+        if (this.step.result?.childBestInterestAcknowledgement) {
+            this.childBestInterestUnderstanding = this.step.result.childBestInterestAcknowledgement;
+        }
+
+        if(this.childData?.length == 0){
+            this.childData= SearchForChildrenData('FLM');            
+        }
+
+        this.formOneRequired = false;
+
+        const stepCOM = this.$store.state.Application.steps[this.stPgNo.COMMON._StepNo]
+
+        if( stepCOM.result?.filingLocationSurvey?.data){
+            const filingLocationData = stepCOM.result.filingLocationSurvey.data;
+            this.formOneRequired = this.determineRequiredForm(filingLocationData);            
+        }
+    }
+
+    mounted(){
+        Vue.nextTick(()=>this.surveyHasError());
+        this.currentStep = this.$store.state.Application.currentStep;
+        this.currentPage = this.$store.state.Application.steps[this.currentStep].currentPage;        
+    }
+
+    public determineRequiredForm(filingLocationData){
+        
+        let location = ''
+        location = filingLocationData?.ExistingCourt;                
+        
+        if(Vue.filter('includedInRegistries')(location, 'early-resolutions') && filingLocationData?.MetEarlyResolutionRequirements == 'n'){
+            return true;
+        } else {
+            return false;
+        }
+    }   
+
+    public surveyHasError(){
+        let progress = this.childData.length==0? 50 : 100;
+        this.incompleteError =  false;        
+        for(const child of this.childData){
+            if ((this.formOneRequired && !child.dob) || 
+                (!this.formOneRequired && (!child.dob || !child.relation || !child.opRelation || !child.currentLiving))){            
+                this.incompleteError = true;  
+                progress = 50;    
+                break
+            }
+        }        
+        Vue.filter('setSurveyProgress')(null, this.currentStep, this.currentPage, progress, false);
+    }
+
+    public isDisableNext() {
+        return (this.childData?.length <= 0 || !this.childBestInterestUnderstanding);
+    }
+
+    beforeDestroy() {
+        this.surveyHasError();        
+        this.UpdateStepResultData({step:this.step, data: {childrenInfoSurvey: this.getChildrenResults(), childBestInterestAcknowledgement:this.childBestInterestUnderstanding}})       
+    }
+
+    public getChildrenResults(){
+        const questionResults: {name:string; value: any; title:string; inputType:string}[] =[];
+        for(const child of this.childData)
+        {
+            questionResults.push({name:'childInfoSurvey', value: this.getChildInfo(child), title:'Child '+child.id +' Information', inputType:''})
+        }
+        
+        return {data: this.childData, questions:questionResults, pageName:'Children Information', currentStep: this.currentStep, currentPage:this.currentPage}
+    }
+
+    public getChildInfo(child){
+        const resultString = [];
+
+        resultString.push(Vue.filter('styleTitle')("Name: ")+Vue.filter('getFullName')(child.name));
+        resultString.push(Vue.filter('styleTitle')("Birthdate: ")+Vue.filter('beautify-date')(child.dob))
+        if (!this.formOneRequired){
+            resultString.push(Vue.filter('styleTitle')("Your relationship: ")+child.relation)
+            resultString.push(Vue.filter('styleTitle')("Other party’s relationship: ")+child.opRelation)
+            if (child.currentLiving == 'other'){
+                resultString.push(Vue.filter('styleTitle')("Living with: ")+child.currentLivingComment)
+            } else {
+                resultString.push(Vue.filter('styleTitle')("Living with: ")+child.currentLiving)
+            }
+        }        
+        
+        return resultString
+    }
+
+    public resetChildrenRelatedPages(childData?) {
+    
+        const stPgNo: stepsAndPagesNumberInfoType = this.$store.state.Application.stPgNo;   
+        const p = stPgNo.FLM;
+
+        const pages = [
+            p.ParentingArrangements,
+            p.ParentalResponsibilities,
+            p.ParentingTime,
+            p.ParentingOrderAgreement,
+            p.BestInterestsOfChild,
+            p.ChildSupportCurrentArrangements,
+            p.AboutChildSupportOrder,
+            p.SpecialAndExtraordinaryExpenses,
+            p.ContactWithChild,
+            p.ContactWithChildOrder,
+            p.AboutContactWithChildOrder,
+            p.ContactWithChildBestInterestsOfChild,
+            p.GuardianOfChild,
+            p.ReviewYourAnswersFLM
+        ]
+        Vue.filter('setProgressForPages')(p._StepNo, pages,50);    
+
+    }
+}
+</script>
+
+<style scoped lang="scss">
+@import "src/styles/common";
+.home-content {
+    padding-bottom: 20px;
+    padding-top: 2rem;
+    max-width: 950px;
+    color: black;
+}
+.childSection {
+    border: 2px solid rgba($gov-pale-grey, 0.7);
+    border-radius: 18px;
+    width: 100%
+}
+.childAlign {
+    padding: 20px;
+}
+.table, td, th{
+    border: 1px solid rgba($gov-pale-grey, 0.9);
+  
+}
+.clickableRow {
+    background-color: rgba($gov-pale-grey, 0.5);
+    td a {
+        display: block;
+    }
+}
+</style>
diff --git a/web/src/components/steps/guardianshipAffidavit/childrenDetailsGa/ChildrenSurvey.vue b/web/src/components/steps/guardianshipAffidavit/childrenDetailsGa/ChildrenSurvey.vue
new file mode 100644
index 000000000..3fd685f22
--- /dev/null
+++ b/web/src/components/steps/guardianshipAffidavit/childrenDetailsGa/ChildrenSurvey.vue
@@ -0,0 +1,136 @@
+<template>
+    <div>
+        <survey v-bind:survey="survey"></survey>
+        <div class="row">
+            <div class="col-6">
+                <button type="button" class="btn btn-secondary" @click="goBack()">Cancel</button>
+            </div>
+            <div class="col-6">
+                <button type="button" class="btn btn-success" @click="saveChild()">Save</button>
+            </div>
+        </div>
+        <br />
+    </div>
+</template>
+
+<script lang="ts">
+import { Component, Vue, Prop} from 'vue-property-decorator';
+import { childInfoType } from '@/types/Application/CommonInformation';
+import * as SurveyVue from "survey-vue";
+import surveyJson from "./forms/survey-childInfo.json";
+import * as surveyEnv from "@/components/survey/survey-glossary";
+
+import { namespace } from "vuex-class";   
+import "@/store/modules/application";
+const applicationState = namespace("Application");
+
+import {stepsAndPagesNumberInfoType} from "@/types/Application/StepsAndPages"
+
+@Component
+export default class ChildrenSurvey extends Vue {
+    
+    @Prop({required: true})
+    editRowProp!: Object;
+
+    @Prop({required: true})
+    formOneRequired!: boolean;
+
+    @applicationState.State
+    public stPgNo!: stepsAndPagesNumberInfoType;
+    
+    child = {} as childInfoType;
+
+    survey = new SurveyVue.Model(surveyJson);
+    currentStep =0;
+    currentPage =0;
+
+    beforeCreate() {
+        const Survey = SurveyVue;
+        surveyEnv.setCss(Survey);       
+    }
+
+    mounted(){
+        this.initializeSurvey();
+        this.addSurveyListener();
+        this.reloadPageInformation();
+    }
+
+    public initializeSurvey(){
+        this.survey = new SurveyVue.Model(surveyJson);
+        this.survey.commentPrefix = "Comment";
+        this.survey.showQuestionNumbers = "off";
+        this.survey.showNavigationButtons = false;
+        surveyEnv.setGlossaryMarkdown(this.survey);
+    }
+    
+    public addSurveyListener(){
+        Vue.filter('surveyChanged')('familyLawMatter')        
+        this.survey.onComplete.add((sender, options) => {
+            this.populateChildModel(sender.data);
+            let id = sender.getVariable("id");
+            if (id === null || id === undefined) {
+                this.$emit("surveyData", this.child);
+            } else {
+                this.$emit("editedData", { ...this.child, id });
+                id = null;
+            }
+        });
+    }
+    
+    public reloadPageInformation() {
+        if (this.editRowProp != null) {
+            this.populateFormWithPreExistingValues(this.editRowProp, this.survey);
+        }
+        
+        let progress = 50;
+        if(Object.keys(this.survey.data).length)
+            progress = this.survey.isCurrentPageHasErrors? 50 : 100;
+            
+        this.currentStep = this.$store.state.Application.currentStep;
+        this.currentPage = this.$store.state.Application.steps[this.currentStep].currentPage;
+        this.$store.commit("Application/setPageProgress", { currentStep: this.currentStep, currentPage:this.currentPage, progress:progress })   
+        this.survey.setVariable("formOneRequired", this.formOneRequired);    
+    }
+  
+    public goBack() {
+        this.$emit("showTable", true);
+    }
+    
+    public saveChild() {
+        
+        this.survey.completeLastPage();
+    }
+
+    public populateChildModel(childData) {
+        if(childData){
+            this.child.name = childData.childName;       
+            this.child.dob = childData.childDateOfBirth;
+            this.child.relation = childData.relationToChild;
+            this.child.opRelation = childData.childRelationToOtherParty;
+            this.child.currentLiving = childData.childCurrentlyLivingWith;
+            this.child.ack = childData.childInfoAckknowledge;
+            this.child.additionalInfo = childData.childAdditionalInfo;
+            this.child.additionalInfoDetails = childData.additionInfoDetails;
+        }
+    }
+
+    public populateFormWithPreExistingValues(editRowProp, survey) {
+        survey.data = {
+            childName: { first: editRowProp.name.first, middle: editRowProp.name.middle, last: editRowProp.name.last }
+        };
+        survey.setValue("childDateOfBirth", editRowProp.dob);
+        survey.setValue("relationToChild", editRowProp.relation);
+        survey.setValue("childRelationToOtherParty", editRowProp.opRelation);
+        survey.setValue("childCurrentlyLivingWith", editRowProp.currentLiving);
+        survey.setValue("childInfoAckknowledge", editRowProp.ack);
+        survey.setValue("childAdditionalInfo", editRowProp.additionalInfo);
+        survey.setValue("additionInfoDetails", editRowProp.additionalInfoDetails);
+        survey.setVariable("id", editRowProp.id);
+    }
+
+    beforeDestroy() {
+        const progress = this.survey.isCurrentPageHasErrors? 50 : 100;
+        this.$store.commit("Application/setPageProgress", { currentStep: this.currentStep, currentPage:this.currentPage, progress:progress })
+    }
+}
+</script>
diff --git a/web/src/components/steps/guardianshipAffidavit/childrenDetailsGa/forms/survey-childInfo.json b/web/src/components/steps/guardianshipAffidavit/childrenDetailsGa/forms/survey-childInfo.json
new file mode 100644
index 000000000..0cc945d80
--- /dev/null
+++ b/web/src/components/steps/guardianshipAffidavit/childrenDetailsGa/forms/survey-childInfo.json
@@ -0,0 +1,53 @@
+{
+    "title": "Child(ren) Information",
+    "pages": [
+        {
+            "name": "Child(ren) Information",
+            "elements": [
+                {
+                    "type": "personname",
+                    "name": "childName",
+                    "title": "What is the name of the child?",
+                    "isRequired": true,
+                    "defaultSubstitution": "{ChildName}"
+                },
+                {
+                    "type": "text",
+                    "name": "childDateOfBirth",
+                    "title": "What is the child's date of birth?",
+                    "isRequired": true,
+                    "inputType": "date"
+                },
+                {
+                    "type": "comment",
+                    "name": "relationToChild",
+                    "title": "What is your relationship to the child?",
+                    "description": "Use whatever wording best describes it, for example, father, step-mother, grandparent, etc.",
+                    "isRequired": true,
+                    "visible": false,
+                    "visibleIf": "!{formOneRequired}"
+                },
+                {
+                    "type": "comment",
+                    "name": "childRelationToOtherParty",
+                    "title": "What is the other party's relationship to the child?",
+                    "description": "Use whatever wording best describes it, for example, father, step-mother, grandparent, etc.",
+                    "isRequired": true,
+                    "visible": false,
+                    "visibleIf": "!{formOneRequired}"
+                },
+                {
+                    "type": "text",
+                    "name": "childCurrentlyLivingWith",
+                    "title": "Who is the child currently living with?",
+                    "description": "You can use the name of the person or their relationship to the child.",
+                    "isRequired": true,
+                    "visible": false,
+                     "visibleIf": "!{formOneRequired}"
+                }
+            ]
+        }
+    ],
+    "showQuestionNumbers": "off",
+    "requiredText": ""
+}
\ No newline at end of file
diff --git a/web/src/components/steps/guardianshipAffidavit/forms/about-affiant-ga.json b/web/src/components/steps/guardianshipAffidavit/forms/about-affiant-ga.json
new file mode 100644
index 000000000..d89ed4c35
--- /dev/null
+++ b/web/src/components/steps/guardianshipAffidavit/forms/about-affiant-ga.json
@@ -0,0 +1,56 @@
+{
+   "pages": [
+      {
+         "name": "About the Affiant",
+         "description": "An affiant is a person who makes an `affidavit`. An affidavit must be written from the writer’s point of view, using 'I' statements.<br><br>An affidavit starts with an opening paragraph that states the person’s name, their occupation and address.",
+         "elements": [
+            {
+                "type": "personname",
+                "name": "ApplicantName",
+                "title": "What is your full name?",
+                "description": "This is the name of the person whose affidavit it is. If you are helping someone use this service, use their name.",                  
+                "isRequired": true,              
+                "defaultSubstitution": "(Applicant Name)",
+                "descFirstName": "First Name is also known as Given Name",
+                "descMiddleName": "If you have more than one Middle Name, write them all in this box with spaces separating your Middle Names",
+                "descLastName": "Last Name is also known as Family Name or Surname"
+            },
+            {
+                "type": "text",
+                "name": "ApplicantOccupation",
+                "isRequired": true,                
+                "title": "What is your job or profession?",
+                "description": "For example: Nurse, Homemaker, Carpenter, Accountant, etc.\t"
+            },
+            {
+                "type": "checkbox",
+                "name": "inCareOf",
+                "title": "What is your address?",
+                "description": "The address you include here will be available to the parties and the court. You do not need to use the address where you live,  especially if you have any safety concerns about someone knowing your address, but you need to be clear if it is not.<br><br>If you are a party to the case, you can include your address for service. If you are not a party, you may want to use your work address. For example, if you are a child’s teacher making the affidavit, you may choose to use the school address instead of your home address.<br><br>If you do not live at the address for service, check the box for “care of”.",
+                "choices": [
+                    "Care of"                 
+                ]
+            },
+            {
+                "type": "address",
+                "name": "ApplicantAddress",                
+                "title": "",
+                "titleLocation": "hidden",
+                "isRequired": true,
+                "referLabel": "Applicant's Address",
+                "validators": [
+                    {
+                        "type": "expression",
+                        "text": "Please Fill in all Required Fields.",
+                        "expression": "{ApplicantAddress.street} notempty and {ApplicantAddress.postcode} notempty and {ApplicantAddress.city} notempty"
+                    }
+                ]
+              }
+           
+         ],
+         "title": "About the Affiant"
+      }
+   ],
+   "showQuestionNumbers": "off",
+   "requiredText": ""
+}
\ No newline at end of file
diff --git a/web/src/components/steps/guardianshipAffidavit/forms/background-civil-court-proceedings.json b/web/src/components/steps/guardianshipAffidavit/forms/background-civil-court-proceedings.json
new file mode 100644
index 000000000..35fe29477
--- /dev/null
+++ b/web/src/components/steps/guardianshipAffidavit/forms/background-civil-court-proceedings.json
@@ -0,0 +1,62 @@
+{
+  "title": "Your story",
+  "pages": [
+    {
+      "name": "Your story",
+      "description": "An affidavit is written in the <b>first person</b> (from the writer’s point of view, using “I”) and must include <b>facts</b> – what you saw, heard, did and said – and events that are relevant to the application. It is your story.<br>If certain facts are <b>not within your personal knowledge</b>, you can still include them, but you must identify the source of your information.",
+      "elements": [
+        {
+            "type": "helptext",
+            "name": "FAQLegalAdvice1",
+            "title": "How do I identify the source of my information?",
+            "titleLocation": "hidden",              
+            "body": "If certain facts are not within your personal knowledge, you must identify the source of your information and that you believe the information is true. For example, “On November 29th, 2019, Mrs. Johnson told me Jack was not at school and I believe this to be true.”"
+        },
+        {
+            "type": "html",
+            "name": "storyHeading",            
+            "html": "<div style='margin-bottom:-0.75rem'>If you refer to <b>documents</b>, for example a report card, a letter or email, or a photograph, you must talk about it in your story and state that it is <b>attached as an exhibit</b>. When you bring your affidavit to be sworn or affirmed, you must also bring all your exhibits. Each exhibit will be marked by the commissioner for taking affidavits using a certificate (usually a stamp) with wording like this: “This is Exhibit [A, B, C…] referred to in the affidavit of [name] sworn (or affirmed) before me on [date] at [location]” and is signed by the commissioner for taking affidavits.<br><br>Exhibits must not include an intimate image of any person. Instead a written description of the intimate image may be included. A judge will determine whether to allow the image itself to be introduced. For more information about what an intimate image may include, please see the Provincial Court’s <a href='https://www.provincialcourt.bc.ca/downloads/Practice%20Directions/FAM%2013%20Affidavits%20and%20Exhibits%20for%20use%20in%20Family%20Proceedings.pdf' target='_blank'>FAM13 Practice Direction | Affidavits and Exhibits for use in Family Proceedings</a>.<br><br>Exhibits must be in a printed document format. Exhibits may not be provided on a USB stick or other electronic data storage device including a video or audio file.</div>"
+        },
+        {
+            "type": "helptext",
+            "name": "FAQLegalAdvice2",
+            "title": "How do I reference and attach an exhibit?",
+            "titleLocation": "hidden",              
+            "body": "Exhibits are documents that you attach to your affidavit, usually to support a fact you talk about in the affidavit. For example, if you say that you received an email from your child’s teacher, you might want to attach a copy of the email to show that you did receive it.<br><br>When you attach an exhibit, you must introduce it in your affidavit. To introduce it, you must explain what the document is, reference the document, and say that you are attaching it as an exhibit.<br><br>Each exhibit is identified with a letter, Exhibit “A”, “B”, “C” and so on. For example:<br>8. On December 2nd, 2022, I received an email from Jack’s teacher, Mrs. Johnson, about his behaviour in class. The email is attached to this affidavit as Exhibit A."
+        },
+        {
+            "type": "helptext",
+            "name": "FAQLegalAdvice3",
+            "title": "Where can I get more information about how to write an affidavit, including what information to put in my affidavit?",
+            "titleLocation": "hidden",              
+            "body": "For more information about how to write an affidavit, or what information should be included in an affidavit, refer to the following resources or talk to a lawyer:<ul><li><a target='_blank' href='https://family.legalaid.bc.ca/bc-legal-system/legal-forms-documents/affidavits/how-do-you-write-affidavit'>Legal Aid BC – How do you write an affidavit?</a></li><li><a target='_blank' href='https://wiki.clicklaw.bc.ca/index.php?title=How_Do_I_Prepare_an_Affidavit%3F'>Clicklaw Wikibooks – How do I prepare an affidavit?</a></li><li><a target='_blank' href='http://www.provincialcourt.bc.ca/downloads/pdf/Guide%20to%20preparing%20for%20a%20family%20court%20trial%20in%20Provincial%20Court.pdf'>Provincial Court of BC – Family Resources – Preparing for a family court trial</a></li>"
+        },
+        {
+            "type": "panel",
+            "name": "YourStoryPanel",             
+            "elements": [
+              {
+                "isRequired": true,  
+                "type": "paneldynamic",
+                "name": "storyAff",
+                "title": "<div style = 'color: #556077; font-size: 1.5em; line-height: 1.2;'>I `swear or affirm` that I know or believe the following facts to be true. If these facts are based on information from others, I believe that information to be true.</b>",
+                "description": "List the facts that you wish to present to the court.<ul><li>Include only facts that are relevant (related) to your case. This is information that can be used to prove or disprove an important fact or issue in your case.</li><li>If certain facts are not within your personal knowledge, identify the source of your information.</li><li>If you refer to documents, attach them to this affidavit and mark them as exhibits.</li></ul>You do not need to use any special wording except when you are referencing an exhibit. The key is to be clear and direct so that the judge can understand. Your affidavit including exhibits cannot be longer than 25 pages.<br><br>Use short sentences and organize your affidavit into paragraphs. Each fact or piece of information should be its own paragraph. Click on 'Add new' to move to start a new paragraph. This service will help to number each paragraph and each page as this is a requirement for affidavits. You must add page numbers to your exhibits.",                            
+                "templateElements": [                  
+                  {
+                    "type": "comment",
+                    "name": "storyDescription",
+                    "isRequired": true,
+                    "title": " ",
+                    "titleLocation": "hidden"
+                    }
+                ]
+              }
+            ]
+        }
+      ],
+      "title": "Your story"
+    }
+  ],
+  "showQuestionNumbers": "off",
+  "requiredText": ""
+}
\ No newline at end of file
diff --git a/web/src/components/steps/guardianshipAffidavit/forms/background-criminal-history.json b/web/src/components/steps/guardianshipAffidavit/forms/background-criminal-history.json
new file mode 100644
index 000000000..35fe29477
--- /dev/null
+++ b/web/src/components/steps/guardianshipAffidavit/forms/background-criminal-history.json
@@ -0,0 +1,62 @@
+{
+  "title": "Your story",
+  "pages": [
+    {
+      "name": "Your story",
+      "description": "An affidavit is written in the <b>first person</b> (from the writer’s point of view, using “I”) and must include <b>facts</b> – what you saw, heard, did and said – and events that are relevant to the application. It is your story.<br>If certain facts are <b>not within your personal knowledge</b>, you can still include them, but you must identify the source of your information.",
+      "elements": [
+        {
+            "type": "helptext",
+            "name": "FAQLegalAdvice1",
+            "title": "How do I identify the source of my information?",
+            "titleLocation": "hidden",              
+            "body": "If certain facts are not within your personal knowledge, you must identify the source of your information and that you believe the information is true. For example, “On November 29th, 2019, Mrs. Johnson told me Jack was not at school and I believe this to be true.”"
+        },
+        {
+            "type": "html",
+            "name": "storyHeading",            
+            "html": "<div style='margin-bottom:-0.75rem'>If you refer to <b>documents</b>, for example a report card, a letter or email, or a photograph, you must talk about it in your story and state that it is <b>attached as an exhibit</b>. When you bring your affidavit to be sworn or affirmed, you must also bring all your exhibits. Each exhibit will be marked by the commissioner for taking affidavits using a certificate (usually a stamp) with wording like this: “This is Exhibit [A, B, C…] referred to in the affidavit of [name] sworn (or affirmed) before me on [date] at [location]” and is signed by the commissioner for taking affidavits.<br><br>Exhibits must not include an intimate image of any person. Instead a written description of the intimate image may be included. A judge will determine whether to allow the image itself to be introduced. For more information about what an intimate image may include, please see the Provincial Court’s <a href='https://www.provincialcourt.bc.ca/downloads/Practice%20Directions/FAM%2013%20Affidavits%20and%20Exhibits%20for%20use%20in%20Family%20Proceedings.pdf' target='_blank'>FAM13 Practice Direction | Affidavits and Exhibits for use in Family Proceedings</a>.<br><br>Exhibits must be in a printed document format. Exhibits may not be provided on a USB stick or other electronic data storage device including a video or audio file.</div>"
+        },
+        {
+            "type": "helptext",
+            "name": "FAQLegalAdvice2",
+            "title": "How do I reference and attach an exhibit?",
+            "titleLocation": "hidden",              
+            "body": "Exhibits are documents that you attach to your affidavit, usually to support a fact you talk about in the affidavit. For example, if you say that you received an email from your child’s teacher, you might want to attach a copy of the email to show that you did receive it.<br><br>When you attach an exhibit, you must introduce it in your affidavit. To introduce it, you must explain what the document is, reference the document, and say that you are attaching it as an exhibit.<br><br>Each exhibit is identified with a letter, Exhibit “A”, “B”, “C” and so on. For example:<br>8. On December 2nd, 2022, I received an email from Jack’s teacher, Mrs. Johnson, about his behaviour in class. The email is attached to this affidavit as Exhibit A."
+        },
+        {
+            "type": "helptext",
+            "name": "FAQLegalAdvice3",
+            "title": "Where can I get more information about how to write an affidavit, including what information to put in my affidavit?",
+            "titleLocation": "hidden",              
+            "body": "For more information about how to write an affidavit, or what information should be included in an affidavit, refer to the following resources or talk to a lawyer:<ul><li><a target='_blank' href='https://family.legalaid.bc.ca/bc-legal-system/legal-forms-documents/affidavits/how-do-you-write-affidavit'>Legal Aid BC – How do you write an affidavit?</a></li><li><a target='_blank' href='https://wiki.clicklaw.bc.ca/index.php?title=How_Do_I_Prepare_an_Affidavit%3F'>Clicklaw Wikibooks – How do I prepare an affidavit?</a></li><li><a target='_blank' href='http://www.provincialcourt.bc.ca/downloads/pdf/Guide%20to%20preparing%20for%20a%20family%20court%20trial%20in%20Provincial%20Court.pdf'>Provincial Court of BC – Family Resources – Preparing for a family court trial</a></li>"
+        },
+        {
+            "type": "panel",
+            "name": "YourStoryPanel",             
+            "elements": [
+              {
+                "isRequired": true,  
+                "type": "paneldynamic",
+                "name": "storyAff",
+                "title": "<div style = 'color: #556077; font-size: 1.5em; line-height: 1.2;'>I `swear or affirm` that I know or believe the following facts to be true. If these facts are based on information from others, I believe that information to be true.</b>",
+                "description": "List the facts that you wish to present to the court.<ul><li>Include only facts that are relevant (related) to your case. This is information that can be used to prove or disprove an important fact or issue in your case.</li><li>If certain facts are not within your personal knowledge, identify the source of your information.</li><li>If you refer to documents, attach them to this affidavit and mark them as exhibits.</li></ul>You do not need to use any special wording except when you are referencing an exhibit. The key is to be clear and direct so that the judge can understand. Your affidavit including exhibits cannot be longer than 25 pages.<br><br>Use short sentences and organize your affidavit into paragraphs. Each fact or piece of information should be its own paragraph. Click on 'Add new' to move to start a new paragraph. This service will help to number each paragraph and each page as this is a requirement for affidavits. You must add page numbers to your exhibits.",                            
+                "templateElements": [                  
+                  {
+                    "type": "comment",
+                    "name": "storyDescription",
+                    "isRequired": true,
+                    "title": " ",
+                    "titleLocation": "hidden"
+                    }
+                ]
+              }
+            ]
+        }
+      ],
+      "title": "Your story"
+    }
+  ],
+  "showQuestionNumbers": "off",
+  "requiredText": ""
+}
\ No newline at end of file
diff --git a/web/src/components/steps/guardianshipAffidavit/forms/background-family-violence.json b/web/src/components/steps/guardianshipAffidavit/forms/background-family-violence.json
new file mode 100644
index 000000000..35fe29477
--- /dev/null
+++ b/web/src/components/steps/guardianshipAffidavit/forms/background-family-violence.json
@@ -0,0 +1,62 @@
+{
+  "title": "Your story",
+  "pages": [
+    {
+      "name": "Your story",
+      "description": "An affidavit is written in the <b>first person</b> (from the writer’s point of view, using “I”) and must include <b>facts</b> – what you saw, heard, did and said – and events that are relevant to the application. It is your story.<br>If certain facts are <b>not within your personal knowledge</b>, you can still include them, but you must identify the source of your information.",
+      "elements": [
+        {
+            "type": "helptext",
+            "name": "FAQLegalAdvice1",
+            "title": "How do I identify the source of my information?",
+            "titleLocation": "hidden",              
+            "body": "If certain facts are not within your personal knowledge, you must identify the source of your information and that you believe the information is true. For example, “On November 29th, 2019, Mrs. Johnson told me Jack was not at school and I believe this to be true.”"
+        },
+        {
+            "type": "html",
+            "name": "storyHeading",            
+            "html": "<div style='margin-bottom:-0.75rem'>If you refer to <b>documents</b>, for example a report card, a letter or email, or a photograph, you must talk about it in your story and state that it is <b>attached as an exhibit</b>. When you bring your affidavit to be sworn or affirmed, you must also bring all your exhibits. Each exhibit will be marked by the commissioner for taking affidavits using a certificate (usually a stamp) with wording like this: “This is Exhibit [A, B, C…] referred to in the affidavit of [name] sworn (or affirmed) before me on [date] at [location]” and is signed by the commissioner for taking affidavits.<br><br>Exhibits must not include an intimate image of any person. Instead a written description of the intimate image may be included. A judge will determine whether to allow the image itself to be introduced. For more information about what an intimate image may include, please see the Provincial Court’s <a href='https://www.provincialcourt.bc.ca/downloads/Practice%20Directions/FAM%2013%20Affidavits%20and%20Exhibits%20for%20use%20in%20Family%20Proceedings.pdf' target='_blank'>FAM13 Practice Direction | Affidavits and Exhibits for use in Family Proceedings</a>.<br><br>Exhibits must be in a printed document format. Exhibits may not be provided on a USB stick or other electronic data storage device including a video or audio file.</div>"
+        },
+        {
+            "type": "helptext",
+            "name": "FAQLegalAdvice2",
+            "title": "How do I reference and attach an exhibit?",
+            "titleLocation": "hidden",              
+            "body": "Exhibits are documents that you attach to your affidavit, usually to support a fact you talk about in the affidavit. For example, if you say that you received an email from your child’s teacher, you might want to attach a copy of the email to show that you did receive it.<br><br>When you attach an exhibit, you must introduce it in your affidavit. To introduce it, you must explain what the document is, reference the document, and say that you are attaching it as an exhibit.<br><br>Each exhibit is identified with a letter, Exhibit “A”, “B”, “C” and so on. For example:<br>8. On December 2nd, 2022, I received an email from Jack’s teacher, Mrs. Johnson, about his behaviour in class. The email is attached to this affidavit as Exhibit A."
+        },
+        {
+            "type": "helptext",
+            "name": "FAQLegalAdvice3",
+            "title": "Where can I get more information about how to write an affidavit, including what information to put in my affidavit?",
+            "titleLocation": "hidden",              
+            "body": "For more information about how to write an affidavit, or what information should be included in an affidavit, refer to the following resources or talk to a lawyer:<ul><li><a target='_blank' href='https://family.legalaid.bc.ca/bc-legal-system/legal-forms-documents/affidavits/how-do-you-write-affidavit'>Legal Aid BC – How do you write an affidavit?</a></li><li><a target='_blank' href='https://wiki.clicklaw.bc.ca/index.php?title=How_Do_I_Prepare_an_Affidavit%3F'>Clicklaw Wikibooks – How do I prepare an affidavit?</a></li><li><a target='_blank' href='http://www.provincialcourt.bc.ca/downloads/pdf/Guide%20to%20preparing%20for%20a%20family%20court%20trial%20in%20Provincial%20Court.pdf'>Provincial Court of BC – Family Resources – Preparing for a family court trial</a></li>"
+        },
+        {
+            "type": "panel",
+            "name": "YourStoryPanel",             
+            "elements": [
+              {
+                "isRequired": true,  
+                "type": "paneldynamic",
+                "name": "storyAff",
+                "title": "<div style = 'color: #556077; font-size: 1.5em; line-height: 1.2;'>I `swear or affirm` that I know or believe the following facts to be true. If these facts are based on information from others, I believe that information to be true.</b>",
+                "description": "List the facts that you wish to present to the court.<ul><li>Include only facts that are relevant (related) to your case. This is information that can be used to prove or disprove an important fact or issue in your case.</li><li>If certain facts are not within your personal knowledge, identify the source of your information.</li><li>If you refer to documents, attach them to this affidavit and mark them as exhibits.</li></ul>You do not need to use any special wording except when you are referencing an exhibit. The key is to be clear and direct so that the judge can understand. Your affidavit including exhibits cannot be longer than 25 pages.<br><br>Use short sentences and organize your affidavit into paragraphs. Each fact or piece of information should be its own paragraph. Click on 'Add new' to move to start a new paragraph. This service will help to number each paragraph and each page as this is a requirement for affidavits. You must add page numbers to your exhibits.",                            
+                "templateElements": [                  
+                  {
+                    "type": "comment",
+                    "name": "storyDescription",
+                    "isRequired": true,
+                    "title": " ",
+                    "titleLocation": "hidden"
+                    }
+                ]
+              }
+            ]
+        }
+      ],
+      "title": "Your story"
+    }
+  ],
+  "showQuestionNumbers": "off",
+  "requiredText": ""
+}
\ No newline at end of file
diff --git a/web/src/components/steps/guardianshipAffidavit/forms/electronic-filing-statement-ga.json b/web/src/components/steps/guardianshipAffidavit/forms/electronic-filing-statement-ga.json
new file mode 100644
index 000000000..c4774166e
--- /dev/null
+++ b/web/src/components/steps/guardianshipAffidavit/forms/electronic-filing-statement-ga.json
@@ -0,0 +1,119 @@
+{
+  "title": "Electronic Filing Statement",
+  "pages": [
+    {
+        "name": "Electronic Filing Statement",
+        "description": "<a target='_blank' href='https://www.bclaws.gov.bc.ca/civix/document/id/complete/statreg/120_2020#section193'>Rule 193</a> states that an affidavit or other signed document that is being filed for evidentiary purposes must be accompanied by an <a target='_blank' href='https://www2.gov.bc.ca/assets/gov/law-crime-and-justice/courthouse-services/court-files-records/court-forms/family/pfa768.pdf?forcedownload=true'>Electronic Filing Statement in Form 51</a>. This pathway will help you complete it.<br><br>The Electronic Filing Statement is used to advise the court that the document you are filing electronically shows an original signature of the person identified and that the electronic version appears to be a true copy of the original paper version.<br><br>You must keep the original paper version of the document until the earliest of<ol style='list-style-type: lower-roman'><li>the date the proceeding, including any appeals, is completed</li><li>the date the appeal period has expired, if no appeal is filed</li><li>the date on which a judge orders the paper version be filed</li></ol>Note: If you are swearing or affirming the affidavit over video, please refer to <a href='http://www.provincialcourt.bc.ca/downloads/Practice%20Directions/NP%2020%20Affidavits%20for%20use%20in%20Court%20Proceedings.pdf' target='_blank'>NP21 Affidavits for use in Court Proceedings</a> to make sure you meet the necessary requirements of the Provincial Court.",
+        "elements": [
+            {
+                "type": "yesno",
+                "name": "Lawyer",
+                "title": "Are you a lawyer filing the affidavit on behalf of a party?",
+                "isRequired": true
+            },
+            {
+                "type": "panel",
+                "name": "ApplicantLawyerContactPanel",
+                "visible": false,
+                "visibleIf": "{Lawyer} = 'y'",
+                "elements": [
+                    {
+                        "type": "personname",
+                        "name": "ApplicantName",
+                        "title": "What is your full name?",
+                        "description": "This is the name of the lawyer. If you are filing out this form for the lawyer, fill in their name.",                  
+                        "isRequired": true,    
+                        "visible": false,
+                        "visibleIf": "{Lawyer} = 'y'",          
+                        "defaultSubstitution": "(Applicant Name)",
+                        "descFirstName": "First Name is also known as Given Name",
+                        "descMiddleName": "If you have more than one Middle Name, write them all in this box with spaces separating your Middle Names",
+                        "descLastName": "Last Name is also known as Family Name or Surname"
+                    },
+                    {
+                        "type": "panel",
+                        "name": "PartyPanelEfsp",             
+                        "elements": [
+                            {
+                                "isRequired": true,  
+                                "visible": false,
+                                "visibleIf": "{Lawyer} = 'y'",
+                                "type": "paneldynamic",
+                                "name": "PartyInfoEfsp",
+                                "title": "<div style = 'color: #556077; font-size: 1.25em; line-height: 1.2;'>What is the name of the party you are representing?</b>",
+                                "description": "Copy the name from a filed document.",                            
+                                "templateElements": [
+                                {
+                                    "type": "personname",
+                                    "name": "name",
+                                    "title": " ",
+                                    "titleLocation": "hidden"
+                                }
+                                ]
+                            }
+                        ]
+                    }
+                ]
+            },
+            {
+                "type": "panel",
+                "name": "ApplicantPartyContactPanel",
+                "visible": false,
+                "visibleIf": "{Lawyer} = 'n'",
+                "elements": [
+                    {
+                        "type": "personname",
+                        "name": "ApplicantName",
+                        "title": "What is your full name?",
+                        "description": "This is the name of the party who is filing the affidavit. If you are filing out this form for the party, fill in their name.<br>Copy the name from any filed document.",                  
+                        "isRequired": true,        
+                        "visible": false,
+                        "visibleIf": "{Lawyer} = 'n'",      
+                        "defaultSubstitution": "(Applicant Name)",
+                        "descFirstName": "First Name is also known as Given Name",
+                        "descMiddleName": "If you have more than one Middle Name, write them all in this box with spaces separating your Middle Names",
+                        "descLastName": "Last Name is also known as Family Name or Surname"
+                    }                
+                ]
+            },
+            {
+                "type": "panel",
+                "name": "ContactInformationOtherPartyPanel",             
+                "elements": [
+                    {
+                        "isRequired": true,  
+                        "type": "paneldynamic",
+                        "name": "OtherPartyInfoEfsp",                        
+                        "title": "<div style = 'color: #556077; font-size: 1.25em; line-height: 1.2;'>What is the full name of the other party?</b>",
+                        "description": "Copy the name from any filed document.",                            
+                        "templateElements": [
+                            {
+                                "type": "personname",
+                                "name": "name",
+                                "title": " ",
+                                "titleLocation": "hidden"
+                            }
+                        ]
+                    }
+                ]
+            },
+            {
+                "type": "checkbox",
+                "name": "StatementConfirmation",
+                "title": "Please confirm the following statement, if true:",
+                "description": "The original paper version of the document being submitted for filing electronically appears to have the original signature of the person identified as signing it and I have no reason to believe that the signature on the document is not their signature.<br><br>The version of the document that is being submitted for filing electronically appears to be a true copy of the original paper version of the document and I have no reason to believe that it is not a true copy of the original paper version.",
+                "choices": [
+                    {
+                        "value": "confirm",
+                        "text": "I confirm"
+                    }
+                ],
+                "isRequired": true
+            } 
+        ],
+      "title": "Electronic Filing Statement"
+    }
+  ],
+  "showQuestionNumbers": "off",
+  "requiredText": ""
+}
\ No newline at end of file
diff --git a/web/src/components/steps/guardianshipAffidavit/forms/filling-ga.json b/web/src/components/steps/guardianshipAffidavit/forms/filling-ga.json
new file mode 100644
index 000000000..570bfe5b0
--- /dev/null
+++ b/web/src/components/steps/guardianshipAffidavit/forms/filling-ga.json
@@ -0,0 +1,42 @@
+{
+  "title": "Filing an Affidavit",
+  "pages": [
+    {
+      "name": "Filing an Affidavit",
+      "description": "An affidavit is not made until the affidavit is `sworn or affirmed`. This is usually done with a commissioner for taking oaths before it is filed with the court or in person at the courthouse when it is being filed.",
+      "elements": [
+        {
+            "type": "helptext",
+            "name": "FAQLegalAdvice",
+            "title": "How do I swear or affirm an affidavit?",
+            "titleLocation": "hidden",              
+            "body": "To swear or affirm an affidavit, you must meet with a commissioner for taking oaths. The commissioner will check your photo ID to make sure you are who you say you are, ask you if you understand the contents of your affidavit, then ask you to swear or affirm that the contents are true. The commissioner will then watch you sign the document before signing it themselves.<br><br>Lawyers, notary publics and many court registry staff are commissioners for taking oaths. You can go to any <a href='https://www2.gov.bc.ca/gov/content?id=5AD9441AEBD9428FA6EF86D6B1E39E96' target='_blank'>Provincial Court Registry</a> or <a href='https://www2.gov.bc.ca/gov/content?id=FD6DB5BA2A5248038EEF54D9F9F37C4D' target='_blank'>Service BC location</a> to swear or affirm the affidavit. If you have the document sworn or affirmed at a different court registry, you will still need to file it at the court registry where the existing case is filed.<br><br>If you cannot get the document sworn or affirmed before the document is filed, the unsworn document can be filed if you will be avail­able to swear or affirm that the contents of the document are true during your court appearance."
+        },
+        {
+            "type": "html",
+            "name": "swornHeading",            
+            "html": "<div style='margin-bottom:-0.75rem'><a href='https://www.bclaws.gov.bc.ca/civix/document/id/complete/statreg/120_2020#section172' target='_blank'>Rule 172</a> allows you to file an unsworn affidavit if you can’t get a lawyer, notary or someone at the courthouse to sign it before you file it. To file an unsworn affidavit, the person who made the document must sign it and must be available to swear or affirm that the contents of the affidavit are true at a future court appearance. The court usually will not consider it as evidence until this has been done.</div>"
+        },   
+        {
+            "type": "yesno",
+            "name": "sworn",
+            "title": "Will your affidavit be sworn or affirmed before it is filed electronically?",
+            "visible": false,
+            "visibleIf": "({eFiling})",
+            "isRequired": true
+        },   
+        {
+            "type": "yesno",
+            "name": "sworn",
+            "title": "Will your affidavit be sworn or affirmed before it is filed?",
+            "visible": false,
+            "visibleIf": "!({eFiling})",
+            "isRequired": true
+        }  
+      ],
+      "title": "Filing an Affidavit"
+    }
+  ],
+  "showQuestionNumbers": "off",
+  "requiredText": ""
+}
\ No newline at end of file
diff --git a/web/src/components/steps/guardianshipAffidavit/forms/guardianship-affidavit.json b/web/src/components/steps/guardianshipAffidavit/forms/guardianship-affidavit.json
new file mode 100644
index 000000000..6e42d3577
--- /dev/null
+++ b/web/src/components/steps/guardianshipAffidavit/forms/guardianship-affidavit.json
@@ -0,0 +1,67 @@
+{
+  "title": "Affidavit - General",
+  "pages": [
+    {
+      "name": "Affidavit - General",
+      "description": "An affidavit is used to present evidence to the court. It is a written document that contains facts that you must swear under oath (usually on a Bible or other religious book) or affirm (non-religious promise) to be true. After you swear or affirm the affidavit, it is evidence of the facts and events it sets out, just as if you took the stand in a courtroom to provide those facts.<br>An affidavit:<ul><li>must be in the first person (from the writer’s point of view, using “I”)</li><li>must include facts (what you saw, heard, did or said)</li><li>must identify the source of your information if certain facts are not within your personal knowledge</li><li>must include information that is relevant to the application the court needs to decide (and should not include information that is not), and</li><li>can have important documents or photographs referenced and attached to it - these are called exhibits.</li></ul>If the person writing the affidavit needs help with English, click on the Language Resources link on the bottom toolbar for more information about interpreters and other resources to help with preparing court forms.",
+      "elements": [
+        {
+            "type": "helptext",
+            "name": "FAQLegalAdvice",
+            "title": "How do I swear or affirm an affidavit?",
+            "titleLocation": "hidden",              
+            "body": "To swear or affirm an affidavit, you must meet with a commissioner for taking oaths. The commissioner will check your photo ID to make sure you are who you say you are, ask you if you understand the contents of your affidavit, then ask you to swear or affirm that the contents are true. The commissioner will then watch you sign the document before signing it themselves.<br><br>If you do not speak or read English, you can bring an interpreter with you when you meet with the commissioner. For information about interpreters and language help, click on the Language Resources link on the bottom toolbar.<br><br>Lawyers, notary publics and many court registry staff are commissioners for taking oaths. You can go to any <a target='_blank' href='https://www2.gov.bc.ca/gov/content?id=5AD9441AEBD9428FA6EF86D6B1E39E96'>Provincial Court Registry</a> or <a target='_blank' href='https://www2.gov.bc.ca/gov/content?id=FD6DB5BA2A5248038EEF54D9F9F37C4D'>Service BC location</a> to swear or affirm the affidavit. If you have the document sworn or affirmed at a different court registry, you will still need to file it at the court registry where the existing case is filed."
+        },
+        {
+            "type": "html",
+            "name": "affidavitHeading",            
+            "html": "<div style='margin-bottom:-0.75rem'><div style='font-weight: bold;'>Do not sign the affidavit until you are with a commissioner for taking affidavits and they tell you to sign it. Make sure that you bring any documents you are attaching to your affidavit as exhibits with you. The commissioner will also need to date and sign the exhibits.</div><br>If you cannot get the document sworn or affirmed before the document is filed, the unsworn document can be filed if you will be avail­able to swear or affirm that the contents of the document are true during your court appearance.</div>"
+        },
+        {
+          "type": "panel",
+          "name": "AffidavitPanel",
+          "elements": [  
+            {
+                "type": "radiogroup",
+                "name": "affidavitReason",
+                "isRequired": true,
+                "title": "Why are you filing an affidavit?",
+                "description": "An affidavit should only be filed when there is an application before the court that the affidavit is about.<br><br>You can file an affidavit in support of an application or to respond to someone else’s application.",
+                "choices": [
+                    {
+                        "value": "application",
+                        "text": "<b>In support of an application</b><div style='margin-left: 2rem;'>Giving assistance to or showing approval of an application"
+                    },
+                    {
+                        "value": "response",
+                        "text": "<b>In response to an application</b><div style='margin-left: 2rem;'>To answer or reply to someone else’s application"
+                    }
+                ]
+            },                     
+            {
+                "type": "checkbox",
+                "name": "applicationType",
+                "title": "What is the application about?",
+                "description": "Look at the application this affidavit is being filed for. The name of the application will tell you what the application is about. If someone has asked you to write an affidavit in support of their application, ask them what the application is about.<br>If your affidavit is in support or response to more than one application, select each option that applies",
+                "otherText":"Other (please specify):",
+                "hasOther": true,
+                "choices": [
+                    "A `family law matter`",
+                    "Case management", 
+                    "Protection",  
+                    "A priority parenting matter",
+                    "Relocation of a child or guardian",
+                    "Enforcement"                   
+                ],
+                "isRequired": true
+             }
+
+          ]
+        }
+      ],
+      "title": "Affidavit - General"
+    }
+  ],
+  "showQuestionNumbers": "off",
+  "requiredText": ""
+}
\ No newline at end of file
diff --git a/web/src/components/steps/guardianshipAffidavit/reviewAFF/PreviewFormsAFF.vue b/web/src/components/steps/guardianshipAffidavit/reviewAFF/PreviewFormsAFF.vue
new file mode 100644
index 000000000..8353fa068
--- /dev/null
+++ b/web/src/components/steps/guardianshipAffidavit/reviewAFF/PreviewFormsAFF.vue
@@ -0,0 +1,83 @@
+<template>
+    <div v-if="dataReady" >
+        <page-base :disableNext="disableNext" v-on:onPrev="onPrev()" v-on:onNext="onNext()">           
+            <form45 @enableNext="EnableNext"/>
+        </page-base>
+    </div>
+</template>
+
+<script lang="ts">
+import { Component, Vue} from 'vue-property-decorator';
+
+import { namespace } from "vuex-class";   
+import "@/store/modules/application";
+const applicationState = namespace("Application");
+
+import Form45 from  "./pdf/Form45.vue"
+import PageBase from "@/components/steps/PageBase.vue";
+
+import {stepsAndPagesNumberInfoType} from "@/types/Application/StepsAndPages";
+
+@Component({
+    components:{       
+        Form45,
+        PageBase
+    }
+})
+export default class PreviewFormsAff extends Vue {
+
+    @applicationState.State
+    public stPgNo!: stepsAndPagesNumberInfoType;    
+
+    currentStep = 0;
+    currentPage = 0;
+    disableNext = true;
+    dataReady = false;    
+
+    mounted(){
+        this.dataReady = false;
+        this.disableNext = true;        
+        this.currentStep = this.$store.state.Application.currentStep;
+        this.currentPage = this.$store.state.Application.steps[this.currentStep].currentPage;
+        Vue.filter('setSurveyProgress')(null, this.currentStep, this.currentPage, 50, false);       
+        if(this.checkErrorOnPages([this.stPgNo.OTHER._StepNo, this.stPgNo.AFF._StepNo])) this.dataReady = true;
+        window.scrollTo(0, 0);
+    }   
+
+    public EnableNext(){
+        Vue.filter('setSurveyProgress')(null, this.currentStep, this.currentPage, 100, false);
+        this.disableNext=false;        
+    }
+
+    public onPrev() {
+        Vue.prototype.$UpdateGotoPrevStepPage()
+    }
+
+    public onNext() {
+        Vue.prototype.$UpdateGotoNextStepPage()
+    }
+
+    public checkErrorOnPages(steps){
+
+        const optionalLabels = ["Next Steps", "Review and Print", "Review and Save", "Review and Submit","Preview Forms", "File"]
+        for(const stepIndex of steps){
+            const step = this.$store.state.Application.steps[stepIndex]
+            if(step.active){
+                for(const page of step.pages){
+                    if(page.active && page.progress!=100 && optionalLabels.indexOf(page.label) == -1){
+                        this.$store.commit("Application/setCurrentStep", step.id);
+                        this.$store.commit("Application/setCurrentStepPage", {currentStep: step.id, currentPage: page.key });                        
+                        return false;
+                    }
+                }
+            }            
+        }
+        return true;        
+    }
+
+    beforeDestroy() {
+        const progress = this.dataReady && !this.disableNext? 100: 50
+        Vue.filter('setSurveyProgress')(null, this.currentStep, this.currentPage, progress, true);
+    }
+}
+</script>
\ No newline at end of file
diff --git a/web/src/components/steps/guardianshipAffidavit/reviewAFF/ReviewYourAnswersAFF.vue b/web/src/components/steps/guardianshipAffidavit/reviewAFF/ReviewYourAnswersAFF.vue
new file mode 100644
index 000000000..d29fac35d
--- /dev/null
+++ b/web/src/components/steps/guardianshipAffidavit/reviewAFF/ReviewYourAnswersAFF.vue
@@ -0,0 +1,93 @@
+<template>
+    <page-base v-on:onPrev="onPrev()" v-on:onNext="onNext()">
+        <review-your-answers-page :questionResults="questionResults" :step="step" @pageHasError="handlePageHasError" />
+    </page-base>
+</template>
+
+<script lang="ts">
+import { Component, Vue, Prop, Watch } from 'vue-property-decorator';
+
+import { stepInfoType } from "@/types/Application";
+import PageBase from "@/components/steps/PageBase.vue";
+
+import ReviewYourAnswersPage from "@/components/utils/ReviewYourAnswers/ReviewYourAnswersPage.vue"
+import {getQuestionResults} from "@/components/utils/ReviewYourAnswers/ReviewYourAnswersQuestions"
+import { togglePages } from '@/components/utils/TogglePages';
+
+import { namespace } from "vuex-class";   
+import "@/store/modules/application";
+const applicationState = namespace("Application");
+
+import {stepsAndPagesNumberInfoType} from "@/types/Application/StepsAndPages"
+
+@Component({
+    components:{
+        PageBase,
+        ReviewYourAnswersPage
+    }
+})
+
+export default class ReviewYourAnswersAff extends Vue {
+    
+    @Prop({required: true})
+    step!: stepInfoType;
+
+    @applicationState.State
+    public stPgNo!: stepsAndPagesNumberInfoType;    
+
+    @applicationState.Action
+    public UpdatePathwayCompleted!: (changedpathway) => void
+
+    questionResults = [];
+    currentStep =0;
+    currentPage =0;
+    pageHasError = false;
+
+
+    @Watch('pageHasError')
+    nextPageChange(newVal) 
+    {
+        togglePages([this.stPgNo.AFF.PreviewFormsAFF], !this.pageHasError, this.currentStep);
+        if(this.pageHasError) this.UpdatePathwayCompleted({pathway:"affidavit", isCompleted:false})
+        Vue.filter('setSurveyProgress')(null, this.currentStep, this.stPgNo.AFF.PreviewFormsAFF,  50, false);
+        Vue.filter('setSurveyProgress')(null, this.currentStep, this.currentPage, this.pageHasError? 50: 100, false);
+    }
+
+    mounted(){
+        this.pageHasError = false;
+        this.reloadPageInformation();
+    }
+
+    public handlePageHasError(event){
+        this.pageHasError = event
+    }    
+
+    public reloadPageInformation() {
+        
+        this.currentStep = this.$store.state.Application.currentStep;
+        this.currentPage = this.$store.state.Application.steps[this.currentStep].currentPage;
+        
+        if(this.$store.state.Application.steps[this.currentStep].pages[this.currentPage].progress<100){            
+           Vue.filter('setSurveyProgress')(null, this.currentStep, this.stPgNo.AFF.PreviewFormsAFF,  50, false);
+        }
+
+        this.questionResults = getQuestionResults([this.stPgNo.OTHER._StepNo, this.stPgNo.AFF._StepNo], this.currentStep)
+           
+        Vue.filter('setSurveyProgress')(null, this.currentStep, this.currentPage, this.pageHasError? 50: 100, false);
+        togglePages([this.stPgNo.AFF.PreviewFormsAFF], !this.pageHasError, this.currentStep); 
+        
+    }
+    
+    public onPrev() {
+        Vue.prototype.$UpdateGotoPrevStepPage()
+    }
+
+    public onNext() {
+        Vue.prototype.$UpdateGotoNextStepPage()       
+    }
+
+    beforeDestroy() {
+        Vue.filter('setSurveyProgress')(null, this.currentStep, this.currentPage, this.pageHasError? 50: 100, true);       
+    }
+}
+</script>
\ No newline at end of file
diff --git a/web/src/components/steps/guardianshipAffidavit/reviewAFF/pdf/Form45.vue b/web/src/components/steps/guardianshipAffidavit/reviewAFF/pdf/Form45.vue
new file mode 100644
index 000000000..39002d412
--- /dev/null
+++ b/web/src/components/steps/guardianshipAffidavit/reviewAFF/pdf/Form45.vue
@@ -0,0 +1,107 @@
+<template>
+    <div v-if="dataReady">
+        <b-card id="print" style="border:1px solid; border-radius:5px;" bg-variant="white" class="mt-4 mb-4 container" no-body>
+            <form-45-layout v-bind:result="result"/>
+        </b-card>
+    </div>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from 'vue-property-decorator';
+
+import { namespace } from "vuex-class";   
+import "@/store/modules/application";
+const applicationState = namespace("Application");
+
+import Form45Layout from "./Form45Layout.vue"
+import {stepsAndPagesNumberInfoType} from "@/types/Application/StepsAndPages"
+
+import moment from 'moment';
+
+@Component({
+    components:{        
+        Form45Layout
+    }
+})
+export default class Form45 extends Vue {
+
+    @applicationState.State
+    public stPgNo!: stepsAndPagesNumberInfoType;
+    
+    @applicationState.Action
+    public UpdatePathwayCompleted!: (changedpathway) => void
+
+    result;
+    dataReady = false;     
+   
+    mounted(){
+        this.dataReady = false;
+        this.result = this.getAFFResultData();       
+        this.dataReady = true;
+        Vue.nextTick(()=> this.onPrint())
+    }   
+           
+    public onPrint() { 
+
+        const pdf_type = Vue.filter('getPathwayPdfType')("affidavit")
+        const pdf_name = "affidavit";       
+        const el= document.getElementById("print");
+
+        const applicationId = this.$store.state.Application.id;
+        const bottomLeftText = `"PFA762    `+moment().format("MMMM D, YYYY")+` \\a           Form 45";`;
+        const bottomRightText = `" "`
+        const url = '/survey-print/'+applicationId+'/?name=' + pdf_name + '&pdf_type='+pdf_type+'&version=1.0&noDownload=true'
+        const pdfhtml = Vue.filter('printPdf')(el.innerHTML, bottomLeftText, bottomRightText );
+
+        const body = {
+            'html':pdfhtml,
+            'json_data':this.result
+        }       
+        
+        const options = {
+            responseType: "blob",
+            headers: {
+            "Content-Type": "application/json",
+            }
+        }  
+
+        this.$http.post(url,body, options)
+        .then(res => {
+            const currentDate = moment().format();
+            this.$store.commit("Application/setLastPrinted", currentDate); 
+            this.UpdatePathwayCompleted({pathway:"affidavit", isCompleted:true});
+
+            this.$emit('enableNext',true)                   
+        },err => {
+            console.error(err);        
+        });
+    }
+ 
+    public getAFFResultData() {         
+        
+        const result = Object.assign({},this.$store.state.Application.steps[0].result); 
+        for(const stepIndex of [this.stPgNo.OTHER._StepNo, this.stPgNo.AFF._StepNo]){
+            const stepResults = this.$store.state.Application.steps[stepIndex].result
+            for(const stepResultInx in stepResults){
+                if(stepResults[stepResultInx])
+                    result[stepResultInx]=stepResults[stepResultInx].data; 
+            }
+        }        
+        
+        const applicationLocation = this.$store.state.Application.applicationLocation;
+        const userLocation = this.$store.state.Common.userLocation;
+       
+        if(applicationLocation)
+            Object.assign(result, result,{applicationLocation: applicationLocation}); 
+        else
+            Object.assign(result, result,{applicationLocation: userLocation});
+
+        
+        return result;
+    } 
+
+}
+</script>
+<style scoped lang="scss" src="@/styles/_pdf.scss">
+
+</style>
\ No newline at end of file
diff --git a/web/src/components/steps/guardianshipAffidavit/reviewAFF/pdf/Form45Layout.vue b/web/src/components/steps/guardianshipAffidavit/reviewAFF/pdf/Form45Layout.vue
new file mode 100644
index 000000000..e9f4f851a
--- /dev/null
+++ b/web/src/components/steps/guardianshipAffidavit/reviewAFF/pdf/Form45Layout.vue
@@ -0,0 +1,382 @@
+<template>
+    <div v-if="dataReady">
+
+<!-- <Page 1> -->
+<!-- <HEADER> -->
+        <div  class="form-header-reloc">
+            <b style="color:#FFF; font-size:1px; width:0.1rem; height:0.1rem; margin:0; padding:0;">i</b>
+            <div style="float:left; display: inline-block;">
+                <div style="font-size:13pt;"><b>Affidavit – General</b></div>               
+                <div style="font-size:10pt;"><b>FORM 45</b></div>
+                <div>Provincial Court Family Rules</div>
+                <div>Rules 171 and 172</div>
+            </div>
+            <div style="float:right;">
+                <b-table
+                    :items="[{name:'REGISTRY LOCATION:', value:result.applicationLocation},{name:'COURT FILE NUMBER:', value: existingFileNumber}]"
+                    :fields="[{key:'name',tdClass:'border-dark text-center align-middle'},{key:'value',tdClass:'border-dark text-center align-middle'}]"
+                    small
+                    bordered
+                    thead-class="d-none">
+                        <template v-slot:cell(name)="data">
+                            <div style="font-size:6pt; margin:.1rem 0;">{{data.value}}</div>                                           
+                        </template>
+                        <template v-slot:cell(value)="data">
+                            <div style="font-size:7pt !important; color:#000;">{{data.value}}</div>                                           
+                        </template>
+                </b-table>                
+            </div>
+        </div> 
+        
+
+        <underline-form 
+            style="text-indent:2px;display:inline-block; font-size: 9pt;" 
+            textwidth="22rem" 
+            beforetext="I" 
+            hint="(full name)" 
+            :italicHint="false" :text="yourInfo.name | getFullName"/>
+
+        <underline-form 
+            style="text-indent:2px;display:inline-block; font-size: 9pt;" 
+            textwidth="15rem" 
+            beforetext="," 
+            hint="(occupation)" 
+            :italicHint="false" :text="yourInfo.occupation"/>
+
+        <div style="text-indent:5px;display:inline; font-size: 9pt;"> 
+            of
+        </div>
+
+        <div style="margin-top: 1rem;">  
+
+            <underline-form 
+                style="text-indent:2px;font-size: 9pt;" 
+                textwidth="30rem" 
+                beforetext="" 
+                hint="(address of party, city, province)" 
+                :italicHint="false" :text="address"/>
+            <div style="text-indent:5px;display:inline; font-size: 9pt;"> 
+                ,
+            </div>
+
+        </div>
+
+        
+        
+        
+        <div style="text-indent:5px;display:block; font-size: 9pt; margin-top: 2rem; font-weight: 700;"> 
+            Swear or affirm that:
+        </div> 
+        <div style="display:block; font-size: 9pt; margin: 1rem 0 0 5px; font-weight: 700;"> 
+            I know or believe the following facts to be true. If these facts are based on information 
+            from others, I believe that information to be true.
+        </div>
+           
+        <div style="margin-top: 1rem;"></div>  
+
+    <!-- <1> -->
+        <section>
+            <div style="text-indent:5px;display:inline; font-size: 9pt;"> 
+                I am making this affidavit
+            </div>
+           
+            <check-box 
+                checkbox="" 
+                inline="inline" 
+                boxMargin="0" 
+                style="display:inline; margin-left: 1rem;" 
+                :check="supportApplication?'yes':''" 
+                text="in support of an application"/>
+            <underline-form 
+                style="text-indent:1px;display:inline-block;" 
+                textwidth="17.5rem" 
+                beforetext="" 
+                hint="(briefly describe the type of application)" 
+                :text="supportApplication?appType:''"/>
+            <div v-if="supportApplication" style="margin:0.5rem 0 0 9rem;">
+
+                <div  v-for="app, inx in additionalAppType" :key="inx" style="margin:0.5rem 0 0 1rem;"> 
+                    
+                    <underline-form
+                        style="text-indent:0;margin-left:1rem;display:inline;" 
+                        textwidth="30rem"
+                        beforetext=""
+                        hint="" 
+                        :text="app | truncate(65)"/>                    
+                </div>
+
+                <div v-if="otherType.length>0" style="margin:0.5rem 0 0 1rem;"> 
+                    
+                    <underline-form
+                        style="text-indent:0;margin-left:1rem;display:inline;" 
+                        textwidth="30rem"
+                        beforetext=""
+                        hint="" 
+                        :text="otherType | truncate(65)"/>                    
+                </div>
+            </div>            
+            
+            <div style="margin:0.5rem 0 0 11rem;">
+                <check-box
+                    checkbox="" 
+                    inline="inline" 
+                    boxMargin="0" 
+                    style="display:inline;" 
+                    :check="!supportApplication?'yes':''" 
+                    text="in response to an application"/>
+                <underline-form 
+                    style="text-indent:1px;display:inline-block;" 
+                    textwidth="17rem" 
+                    beforetext="" 
+                    hint="(briefly describe the type of application)" 
+                    :text="!supportApplication?appType:''"/>            
+            </div>
+            <div v-if="!supportApplication" style="margin:0.5rem 0 0 9rem;">
+
+                <div  v-for="app, inx in additionalAppType" :key="inx" style="margin:0.5rem 0 0 1rem;"> 
+                    
+                    <underline-form
+                        style="text-indent:0;margin-left:1rem;display:inline;" 
+                        textwidth="30rem"
+                        beforetext=""
+                        hint="" 
+                        :text="app | truncate(65)"/>                    
+                </div>
+                
+                <div v-if="otherType.length>0" style="margin:0.5rem 0 0 1rem;"> 
+                    
+                    <underline-form
+                        style="text-indent:0;margin-left:1rem;display:inline;" 
+                        textwidth="30rem"
+                        beforetext=""
+                        hint="" 
+                        :text="otherType | truncate(65)"/>                    
+                </div>
+            </div>
+        </section>
+            
+        <div style="margin-top: 1rem;">
+            <i>
+                List the facts that you wish to present to the court. If certain facts are not within 
+                your personal knowledge, identify the source of your information. If you refer to 
+                documents, attach them to this affidavit and mark them as exhibits.
+            </i>
+        </div>
+        <!-- <2> -->        
+
+        <div v-for="story in stories" :key="story.index"
+            style="display:block; font-size: 9pt; margin-top: 1rem;"> 
+            <b>{{ story.index }}.</b> {{ story.content }}
+        </div> 
+
+        <div class="print-block">
+
+            <div style="display:block; font-size: 9pt; margin-top: 1rem;"> 
+                <b>{{ lastStory.index }}.</b> {{ lastStory.content }}
+            </div>
+
+        <!-- <SWEAR > -->        
+
+            <div style="margin:1rem 0 0 0">
+                <underline-form marginTop="-22px" style="margin-top:0.2rem; text-indent:3px;display:inline;" textwidth="12rem" beforetext="Sworn or affirmed before me at" hint="(city)" text="" />
+            </div>
+            <div style="margin:.5rem 0 0 0">
+                <underline-form marginTop="-22px" style="margin-top:0.2rem; text-indent:3px;display:inline;" textwidth="11.75rem" beforetext="British Columbia on" hint="(date)" text="" />
+            </div>
+
+            <div style="margin:2rem 0 0 0">
+                <div style="height:3rem; width:20rem;border:1px solid #313132; display:inline-block;"></div>
+                <div style="height:3rem; width:20rem;border:1px solid #313132; display:inline-block; margin-left:2rem;"></div>
+            </div>
+            <div>
+                <div style="width:20rem; display:inline-block; font-size:9pt" >A Commissioner for taking Affidavits in British Columbia</div>
+                <div style="width:20rem; display:inline-block; font-size:9pt; margin-left: 2rem;">Signature</div>
+            </div>
+            <div style="margin:.5rem 0 0 0">
+                <underline-form marginTop="-22px" style="margin-top:0.2rem; text-indent:3px;display:inline;" textwidth="11.75rem" beforetext="" hint="[print name or affix stamp of commissioner]" text="" />
+            </div>
+        </div>
+
+    </div>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue } from 'vue-property-decorator';
+
+import { namespace } from "vuex-class";   
+import "@/store/modules/application";
+const applicationState = namespace("Application");
+
+import UnderlineForm from "@/components/utils/PopulateForms/components/UnderlineForm.vue";
+import CheckBox from "@/components/utils/PopulateForms/components/CheckBox.vue";
+import { nameInfoType } from "@/types/Application/CommonInformation";
+import { yourInformationInfoDataInfoType } from '@/types/Application/CommonInformation/Pdf';
+import { getLocationInfo, getYourInformationResults } from '@/components/utils/PopulateForms/PopulateCommonInformation';
+import { aboutAffiantDataInfoType, affidavitDataInfoType, storyDataInfoType } from '@/types/Application/Affidavit';
+
+@Component({
+    components:{
+        UnderlineForm,
+        CheckBox       
+    }
+})
+
+export default class Form40Layout extends Vue {
+
+    @Prop({required:true})
+    result!: any;    
+    
+    @applicationState.State
+    public applicantName!: nameInfoType;    
+
+    dataReady = false; 
+    existingFileNumber = '';  
+   
+    yourInfo = {} as yourInformationInfoDataInfoType; 
+    address = '';
+    supportApplication = false;
+    appType = '';   
+    otherType = '';
+    additionalAppType = []; 
+    stories: storyDataInfoType[] = [];
+    lastStory = {} as storyDataInfoType; 
+    storyCount = 0;
+   
+    mounted(){
+        this.dataReady = false;
+        console.log(this.result)
+        this.extractInfo();       
+        this.dataReady = true;        
+    }
+   
+    public extractInfo(){        
+        this.getAffidavitInfo();  
+        this.getAffiantInfo();  
+        this.getStoryInfo();
+        this.existingFileNumber = getLocationInfo(this.result.otherFormsFilingLocationSurvey);
+        
+    } 
+
+    public getAffidavitInfo(){    
+        
+        this.supportApplication = false;
+        this.appType = ''
+        this.additionalAppType = [];
+        this.otherType = '';
+
+        if(this.result?.affidavitSurvey){
+
+            let aff = {} as affidavitDataInfoType;
+            aff = this.result.affidavitSurvey;
+
+            this.supportApplication = aff.affidavitReason != 'response';            
+
+            const appTypeInfo = aff.applicationType?aff.applicationType:[];
+
+            const appList = [];
+            let otherTypeInfo = '';
+
+            for (const app of appTypeInfo){
+                if (app == 'other'){
+                    otherTypeInfo = aff.applicationTypeComment;
+                } else {
+                    appList.push('about ' + app.replace(/`/g, ''))
+                }
+            }
+
+            if (appList.length == 0){
+
+                this.appType = Vue.filter('truncate')(otherTypeInfo, 42);
+                this.otherType = '';
+                this.additionalAppType = [];
+
+            } else if (appList.length == 1){
+
+                this.appType = Vue.filter('truncate')(appList[0], 42);
+                this.otherType = otherTypeInfo;
+                this.additionalAppType = [];
+
+            } else if (appList.length > 1){
+
+                this.appType = Vue.filter('truncate')(appList[0], 42);
+                this.otherType = otherTypeInfo;
+                const additionalList = appList.slice(1)           
+
+                for (let index = 0; index < additionalList.length; index+=2){
+                    
+                    this.additionalAppType.push(additionalList[index] + (additionalList[index + 1]?(', ' + additionalList[index + 1]):''))
+                
+                }
+            }
+
+        }
+    }
+
+    public getAffiantInfo(){ 
+
+        this.yourInfo = {} as yourInformationInfoDataInfoType; 
+        this.address = '';
+        
+        if(this.result?.aboutAffiantSurvey){
+
+            let aboutAffiant = {} as aboutAffiantDataInfoType;
+            aboutAffiant = this.result.aboutAffiantSurvey;
+
+            this.yourInfo = getYourInformationResults(aboutAffiant);            
+            const addressInfo = aboutAffiant.ApplicantAddress;
+
+            const addressText = addressInfo.street + ', ' 
+                                + addressInfo.city + ', ' 
+                                + addressInfo.state + ', ' 
+                                + addressInfo.country + ', ' 
+                                + addressInfo.postcode;
+
+            this.address = aboutAffiant.inCareOf?.length>0?('Care of '+ addressText ):addressText;
+        }
+            
+    }
+
+    public getStoryInfo(){  
+        
+        this.stories = [];
+        this.storyCount = 0;
+        this.lastStory = {};
+
+        const storyList: storyDataInfoType[] = [];
+       
+        if(this.result?.yourStoryAffSurvey?.storyAff){
+
+            const storyInfo = this.result.yourStoryAffSurvey.storyAff;
+            for (const story in storyInfo){
+               storyList.push({index: Number(story) + 2, content:storyInfo[story].storyDescription})
+            }
+
+            this.storyCount = storyList.length;
+
+            if (this.storyCount == 0){
+
+                this.stories = []
+                this.lastStory = {};
+
+            } else if (this.storyCount == 1){
+
+                this.lastStory = storyList[0];                
+                this.stories = [];
+
+            } else if (this.storyCount > 1){
+
+                this.stories = storyList.slice(0, this.storyCount - 1);
+                this.lastStory = storyList.slice(this.storyCount-1)[0];               
+            } 
+
+
+        }
+            
+    }  
+ 
+}
+</script>
+<style scoped lang="scss" src="@/styles/_pdf.scss">
+
+   
+</style>
diff --git a/web/src/filters/index.ts b/web/src/filters/index.ts
index cbf8d0615..0e129a379 100644
--- a/web/src/filters/index.ts
+++ b/web/src/filters/index.ts
@@ -770,6 +770,7 @@ Vue.filter('surveyChanged', function(type: string) {
         const stepNLPR = store.state.Application.stPgNo.NLPR;
         const stepAFF = store.state.Application.stPgNo.AFF;
         const stepEFSP = store.state.Application.stPgNo.EFSP;
+        const stepGA = store.state.Application.stPgNo.GA;
 		
 		let step = stepPO._StepNo; 
 		let reviewPage = stepPO.ReviewYourAnswers; 
@@ -851,6 +852,10 @@ Vue.filter('surveyChanged', function(type: string) {
 			step = stepEFSP._StepNo; 
 			reviewPage = stepEFSP.ReviewYourAnswersEFSP; 
 			previewPages = [stepEFSP.PreviewFormsEFSP];
+		} else if(typeName == 'guardianshipAffidavit'){
+			step = stepGA._StepNo; 
+			reviewPage = stepGA.ReviewYourAnswersGA; 
+			previewPages = [stepGA.PreviewFormsGA];
 		}
 
 		return({step:step, reviewPage:reviewPage, previewPages:previewPages})
diff --git a/web/src/store/modules/application.ts b/web/src/store/modules/application.ts
index facf7af3b..09d2d6151 100644
--- a/web/src/store/modules/application.ts
+++ b/web/src/store/modules/application.ts
@@ -2968,7 +2968,7 @@ class Application extends VuexModule {
     }
     @Action
     public UpdateStPgNo(newStPgNo) {
-        const stepsAndPagesNumber = {GETSTART: {}, PO: {}, COMMON: {}, RFLM:{}, WR:{}, CA:{}, FLM: {}, CM: {}, PPM: {}, RELOC: {}, ENFRC: {}, CONNECT:{}, OTHER:{}, NCD:{}, NDT:{}, NPR: {}, RQS: {}, TRIS: {}, NLC: {}, NLCR: {}, NLP:{}, NLPR: {}, AFF: {}, EFSP: {}, SUBMIT: {}} as stepsAndPagesNumberInfoType
+        const stepsAndPagesNumber = {GETSTART: {}, PO: {}, COMMON: {}, RFLM:{}, WR:{}, CA:{}, FLM: {}, CM: {}, PPM: {}, RELOC: {}, ENFRC: {}, CONNECT:{}, OTHER:{}, NCD:{}, NDT:{}, NPR: {}, RQS: {}, TRIS: {}, NLC: {}, NLCR: {}, NLP:{}, NLPR: {}, AFF: {}, EFSP: {}, GA: {}, SUBMIT: {}} as stepsAndPagesNumberInfoType
          const steps = this.steps
         for(const step of steps){
             stepsAndPagesNumber[step.name]._StepNo = Number(step.id)           
diff --git a/web/src/types/Application/StepsAndPages/index.ts b/web/src/types/Application/StepsAndPages/index.ts
index 709a761d3..4a53a28d6 100644
--- a/web/src/types/Application/StepsAndPages/index.ts
+++ b/web/src/types/Application/StepsAndPages/index.ts
@@ -30,6 +30,7 @@ export interface stepsAndPagesNumberInfoType{
     NLPR: NLPRstPgTypes;
     AFF: AFFstPgTypes;
     EFSP: EFSPstPgTypes;
+    GA: GAstPgTypes;
     SUBMIT: SUBMITstPgTypes;
 }
  
@@ -395,6 +396,23 @@ export interface EFSPstPgTypes{
     PreviewFormsEFSP: number;
 }
 
+export interface GAstPgTypes{
+    _StepNo: number;
+
+    GuardianshipAffidavit: number;
+    AboutAffiantGa: number;
+    ChildrenDetailsGa: number;
+    CaringForChildGa: number;
+    BackgroundFamilyViolence: number;
+    BackgroundCivilCourtProceedings: number;
+    BackgroundCriminalHistory: number;
+    Exhibits: number;
+    FilingGA: number;
+    ElectronicFilingStatementGa: number;
+    ReviewYourAnswersGA: number;
+    PreviewFormsGA: number;
+}
+
 export interface SUBMITstPgTypes{
     _StepNo: number;
 
diff --git a/web/src/types/Application/index.ts b/web/src/types/Application/index.ts
index e1b6a3021..68ba51042 100644
--- a/web/src/types/Application/index.ts
+++ b/web/src/types/Application/index.ts
@@ -334,6 +334,19 @@ export interface stepInfoType {
 
     //_____Step 21 ELECTRONIC FILING STATEMENT_____________    
     electronicFilingStatementSurvey?: electronicFilingStatementSurveyInfoType;
+
+    //_____Step 22 GUARDIANSHIP AFFIDAVIT_____________    
+    guardianshipAffidavitSurvey?: any;//affidavitSurveyInfoType;   
+    aboutAffiantGaSurvey?: any;//affidavitSurveyInfoType; 
+    childrenDetailsGaSurvey?: any;//affidavitSurveyInfoType; 
+    caringForChildGaSurvey?: any;//affidavitSurveyInfoType; 
+    backgroundFamilyViolence?: any;//affidavitSurveyInfoType;
+    backgroundCivilCourtProceedings?: any;//affidavitSurveyInfoType;
+    backgroundCriminalHistory?: any;//affidavitSurveyInfoType;
+    exhibits?: any;//affidavitSurveyInfoType;
+    filingGA?: any;//affidavitSurveyInfoType;
+    electronicFilingStatementGa?: any;//affidavitSurveyInfoType;
+    
     
     //__Step 22 SUBMIT
     filingOptionsSurvey?: filingOptionsSurveyInfoType;

From bcd0e543071d43dd11b73b4bff518edc9502ba57 Mon Sep 17 00:00:00 2001
From: marzmehr <mars.mehr@gmail.com>
Date: Thu, 9 Nov 2023 15:02:03 -0800
Subject: [PATCH 02/10] PFCF-439: Applying changes based on regulation updates

---
 web/src/components/NavigationTopbar.vue       |  2 +-
 .../forms/about-the-order-enforcement.json    |  2 +-
 .../steps/caseMgmt/ApplicationUnderFOAEAA.vue | 94 +++++++++++++++++++
 .../steps/caseMgmt/CaseManagementStep.vue     |  5 +-
 .../steps/caseMgmt/CmQuestionnaire.vue        |  4 +-
 .../caseMgmt/WithoutNoticeOrAttendance.vue    |  9 +-
 .../forms/about-case-management-order.json    | 17 ++--
 .../forms/application-under-foaeaa.json       | 70 ++++++++++++++
 ...ing-or-cancelling-a-service-or-notice.json |  4 +-
 ...g-or-cancelling-any-other-requirement.json |  2 +-
 .../requiring-access-to-information.json      |  2 +-
 .../components/steps/caseMgmt/orderTypesCM.ts | 39 ++++----
 .../steps/caseMgmt/reviewCM/RequiredForm.ts   |  3 +-
 .../caseMgmt/reviewCM/pdf/Form10Layout.vue    |  8 +-
 ...about-priority-parenting-matter-order.json |  2 +-
 .../forms/about-written-response-order.json   |  2 +-
 web/src/components/survey/glossary.json       |  5 +-
 web/src/filters/index.ts                      | 12 +++
 web/src/store/modules/application.ts          | 24 +++--
 .../types/Application/CaseManagement/index.ts | 13 +++
 .../types/Application/StepsAndPages/index.ts  |  1 +
 web/src/types/Application/index.ts            |  4 +-
 22 files changed, 265 insertions(+), 59 deletions(-)
 create mode 100644 web/src/components/steps/caseMgmt/ApplicationUnderFOAEAA.vue
 create mode 100644 web/src/components/steps/caseMgmt/forms/application-under-foaeaa.json

diff --git a/web/src/components/NavigationTopbar.vue b/web/src/components/NavigationTopbar.vue
index fb62af925..3d87ba1ef 100644
--- a/web/src/components/NavigationTopbar.vue
+++ b/web/src/components/NavigationTopbar.vue
@@ -269,7 +269,7 @@
                 <p>
                     The Provincial Court of BC website provides information and resources including 
                     the 
-                    <a href="https://www.provincialcourt.bc.ca/downloads/family/Standard%20Wording%20of%20Family%20Law%20Orders%202021.pdf"
+                    <a href="https://www.provincialcourt.bc.ca/downloads/family/Standard%20Wording%20of%20Family%20Court%20Orders%20-%20January%202022.docx"
                         target="_blank">Family Law Picklist</a>, 
                     <a href="https://www.provincialcourt.bc.ca/types-of-cases/family-matters"
                         target="_blank">Resources for Family Cases
diff --git a/web/src/components/steps/agreementEnfrc/forms/about-the-order-enforcement.json b/web/src/components/steps/agreementEnfrc/forms/about-the-order-enforcement.json
index babc24e30..a77551208 100644
--- a/web/src/components/steps/agreementEnfrc/forms/about-the-order-enforcement.json
+++ b/web/src/components/steps/agreementEnfrc/forms/about-the-order-enforcement.json
@@ -21,7 +21,7 @@
               "name": "orderDescription",
               "isRequired": true,
               "title": "Please provide the details of the order you are asking the court to make:",
-              "description": "You do not need to use any special wording. The key is to be clear about what you are asking the court to order. Include how you want to see the order or agreement enforced or the remedy or order you are applying for.</br></br>The Provincial Court’s <a href='https://www.provincialcourt.bc.ca/downloads/family/Standard%20Wording%20of%20Family%20Law%20Orders%202021.pdf' target='blank'>Family Law Act Picklist</a> includes commonly used order terms that might be helpful. "
+              "description": "You do not need to use any special wording. The key is to be clear about what you are asking the court to order. Include how you want to see the order or agreement enforced or the remedy or order you are applying for.</br></br>The Provincial Court’s <a href='https://www.provincialcourt.bc.ca/downloads/family/Standard%20Wording%20of%20Family%20Court%20Orders%20-%20January%202022.docx' target='blank'>Family Law Act Picklist</a> includes commonly used order terms that might be helpful. "
             },
             {
               "type": "helptext",
diff --git a/web/src/components/steps/caseMgmt/ApplicationUnderFOAEAA.vue b/web/src/components/steps/caseMgmt/ApplicationUnderFOAEAA.vue
new file mode 100644
index 000000000..8cf35311d
--- /dev/null
+++ b/web/src/components/steps/caseMgmt/ApplicationUnderFOAEAA.vue
@@ -0,0 +1,94 @@
+<template>
+    <page-base v-on:onPrev="onPrev()" v-on:onNext="onNext()">
+        <survey v-bind:survey="survey"></survey>
+    </page-base>
+</template>
+
+<script lang="ts">
+import { Component, Vue, Prop} from 'vue-property-decorator';
+
+import * as SurveyVue from "survey-vue";
+import * as surveyEnv from "@/components/survey/survey-glossary";
+import surveyJson from "./forms/application-under-foaeaa.json";
+
+import PageBase from "../PageBase.vue";
+import { stepInfoType, stepResultInfoType } from "@/types/Application";
+
+import { namespace } from "vuex-class";   
+import "@/store/modules/application";
+const applicationState = namespace("Application");
+
+@Component({
+    components:{
+        PageBase
+    }
+})
+export default class ApplicationUnderFOAEAA extends Vue {
+    
+    @Prop({required: true})
+    step!: stepInfoType;
+
+    @applicationState.State
+    public steps!: stepInfoType[];      
+
+    @applicationState.Action
+    public UpdateStepResultData!: (newStepResultData: stepResultInfoType) => void
+
+    survey = new SurveyVue.Model(surveyJson);   
+    currentStep =0;
+    currentPage =0;
+
+    beforeCreate() {
+        const Survey = SurveyVue;
+        surveyEnv.setCss(Survey);
+    }
+
+    mounted(){
+        this.initializeSurvey();
+        this.addSurveyListener();
+        this.reloadPageInformation();
+    }
+
+    public initializeSurvey(){       
+        this.survey = new SurveyVue.Model(surveyJson);
+        this.survey.commentPrefix = "Comment";
+        this.survey.showQuestionNumbers = "off";
+        this.survey.showNavigationButtons = false;
+        surveyEnv.setGlossaryMarkdown(this.survey);
+    }    
+    
+    public addSurveyListener(){
+        this.survey.onValueChanged.add((sender, options) => {
+            Vue.filter('surveyChanged')('caseMgmt')
+        })
+    }
+    
+    public reloadPageInformation() { 
+        
+        this.currentStep = this.$store.state.Application.currentStep;
+        this.currentPage = this.$store.state.Application.steps[this.currentStep].currentPage;
+
+        if (this.step.result?.applicationUnderFOAEAASurvey) {
+            this.survey.data = this.step.result.applicationUnderFOAEAASurvey.data; 
+            Vue.filter('scrollToLocation')(this.$store.state.Application.scrollToLocationName);            
+        }
+        
+        Vue.filter('setSurveyProgress')(this.survey, this.currentStep, this.currentPage, 50, false);
+    }   
+
+    public onPrev() {
+        Vue.prototype.$UpdateGotoPrevStepPage()
+    }
+
+    public onNext() {
+        if(!this.survey.isCurrentPageHasErrors) {
+            Vue.prototype.$UpdateGotoNextStepPage()
+        }
+    } 
+    
+    beforeDestroy() {
+        Vue.filter('setSurveyProgress')(this.survey, this.currentStep, this.currentPage, 50, true);        
+        this.UpdateStepResultData({step:this.step, data: {applicationUnderFOAEAASurvey: Vue.filter('getSurveyResults')(this.survey, this.currentStep, this.currentPage)}})
+    }
+}
+</script>
diff --git a/web/src/components/steps/caseMgmt/CaseManagementStep.vue b/web/src/components/steps/caseMgmt/CaseManagementStep.vue
index 61396f781..9ec4f4cb8 100644
--- a/web/src/components/steps/caseMgmt/CaseManagementStep.vue
+++ b/web/src/components/steps/caseMgmt/CaseManagementStep.vue
@@ -8,6 +8,7 @@
         <scheduling                                     v-bind:step="step" v-if="step.currentPage == stPgNo.CM.Scheduling" />
         <about-case-management-order                    v-bind:step="step" v-if="step.currentPage == stPgNo.CM.AboutCaseManagementOrder" />
         <cm-children-info                               v-bind:step="step" v-if="step.currentPage == stPgNo.CM.CmChildrenInfo" />
+        <application-under-foaeaa                       v-bind:step="step" v-if="step.currentPage == stPgNo.CM.ApplicationUnderFOAEAA" />
         <attendance-using-electronic-communication      v-bind:step="step" v-if="step.currentPage == stPgNo.CM.AttendanceUsingElectronicCommunication" />
         <changing-or-cancelling-a-service-or-notice     v-bind:step="step" v-if="step.currentPage == stPgNo.CM.ChangingOrCancellingAServiceOrNotice" />
         <changing-or-cancelling-any-other-requirement   v-bind:step="step" v-if="step.currentPage == stPgNo.CM.ChangingOrCancellingAnyOtherRequirement" />
@@ -33,6 +34,7 @@ import CmNotice from "./CmNotice.vue";
 import Scheduling from "./Scheduling.vue";
 import AboutCaseManagementOrder from "./AboutCaseManagementOrder.vue";
 import CmChildrenInfo from "./childInfo/CmChildrenInfo.vue";
+import ApplicationUnderFoaeaa from "./ApplicationUnderFOAEAA.vue";
 import AttendanceUsingElectronicCommunication from "./AttendanceUsingElectronicCommunication.vue";
 import ChangingOrCancellingAServiceOrNotice from "./ChangingOrCancellingAServiceOrNotice.vue";
 import ChangingOrCancellingAnyOtherRequirement from "./ChangingOrCancellingAnyOtherRequirement.vue";
@@ -53,7 +55,6 @@ const applicationState = namespace("Application");
 @Component({
     components:{
         StepBase,
-
         CmQuestionnaire,
         OtherPersons,        
         WithoutNoticeOrAttendance,
@@ -68,7 +69,7 @@ const applicationState = namespace("Application");
         RequiringAccessToInformation,
         RecognizingAnOrderFromOutsideBc,
         ContactInformationOtherParty,
-
+        ApplicationUnderFoaeaa,
         ReviewYourAnswersCm,
         PreviewForm10Cm,
         PreviewForm11Cm
diff --git a/web/src/components/steps/caseMgmt/CmQuestionnaire.vue b/web/src/components/steps/caseMgmt/CmQuestionnaire.vue
index 4145ab6cf..1075a005e 100644
--- a/web/src/components/steps/caseMgmt/CmQuestionnaire.vue
+++ b/web/src/components/steps/caseMgmt/CmQuestionnaire.vue
@@ -27,8 +27,8 @@
                 >       
                     <div>
                         <b-form-checkbox v-for="order,inx in orderItems " :key="inx" class="checkbox-choices" :value="order.value">
-                            <div class="d-inline" >
-                                {{processTooltip(order.text)[0]}}
+                            <div class="d-inline" v-html="processTooltip(order.text)[0]">
+                               
                             </div>
                             <div v-if="processTooltip(order.text)[1]" class="d-inline">
                                 <tooltip :index="0" size="lg" :title="processTooltip(order.text)[1]" />
diff --git a/web/src/components/steps/caseMgmt/WithoutNoticeOrAttendance.vue b/web/src/components/steps/caseMgmt/WithoutNoticeOrAttendance.vue
index 1dfe7efcc..bc92177c6 100644
--- a/web/src/components/steps/caseMgmt/WithoutNoticeOrAttendance.vue
+++ b/web/src/components/steps/caseMgmt/WithoutNoticeOrAttendance.vue
@@ -137,7 +137,7 @@ export default class WithoutNoticeOrAttendance extends Vue {
 
     public getDescription() {
         let description = '';
-        let listOfIssues = [];
+        const listOfIssues = [];
         const firstDescriptionSection = 'Usually, an application for an order must be made with notice to all other parties so ' +
         'that they can decide if they want to participate in the application. There are circumstances when the court may make an ' + 
         'order without you having to tell the other party about the application and without you having to attend a court appearance.<br><br>\n' + 
@@ -178,12 +178,12 @@ export default class WithoutNoticeOrAttendance extends Vue {
 
             const needWithoutNotice = this.survey.data.needWithoutNotice;
 
-            if (needWithoutNotice == 'n') {
+            if (needWithoutNotice == 'n') {                
                 togglePages([this.stPgNo.CM.ByConsent, this.stPgNo.CM.CmNotice, this.stPgNo.CM.AboutCaseManagementOrder], true, this.currentStep); 
-            } else{                              
+            } else {                                           
                 togglePages([this.stPgNo.CM.ByConsent,this.stPgNo.CM.CmNotice, this.stPgNo.CM.AboutCaseManagementOrder], this.needConsent(), this.currentStep); 
             }
-
+            
             if(surveyChanged){
                 const p = this.stPgNo.CM
                 Vue.filter('setSurveyProgress')(null, this.currentStep, p.ByConsent, 0, false);
@@ -191,6 +191,7 @@ export default class WithoutNoticeOrAttendance extends Vue {
                 Vue.filter('setSurveyProgress')(null, this.currentStep, p.Scheduling, 0, false);
                 Vue.filter('setSurveyProgress')(null, this.currentStep, p.AboutCaseManagementOrder, 0, false);
                 Vue.filter('setSurveyProgress')(null, this.currentStep, p.CmChildrenInfo, 0, false);
+                Vue.filter('setSurveyProgress')(null, this.currentStep, p.ApplicationUnderFOAEAA, 0, false);
                 Vue.filter('setSurveyProgress')(null, this.currentStep, p.AttendanceUsingElectronicCommunication, 0, false);
                 Vue.filter('setSurveyProgress')(null, this.currentStep, p.ChangingOrCancellingAServiceOrNotice, 0, false);
                 Vue.filter('setSurveyProgress')(null, this.currentStep, p.ChangingOrCancellingAnyOtherRequirement, 0, false);
diff --git a/web/src/components/steps/caseMgmt/forms/about-case-management-order.json b/web/src/components/steps/caseMgmt/forms/about-case-management-order.json
index 08f1a0b5e..f160c2cd0 100644
--- a/web/src/components/steps/caseMgmt/forms/about-case-management-order.json
+++ b/web/src/components/steps/caseMgmt/forms/about-case-management-order.json
@@ -21,7 +21,7 @@
               "name": "orderDescription",
               "isRequired": true,
               "title": "Please provide the details of the order you are asking the court to make:",
-              "description": "You do not need to use any special wording. The key is to be clear about what you mean and what you are asking the court to order.</br></br>The Provincial Court’s <a href='https://www.provincialcourt.bc.ca/downloads/family/Standard%20Wording%20of%20Family%20Law%20Orders%202021.pdf' target='blank'>Family Law Act Picklist</a> includes commonly used order terms that might be helpful. "
+              "description": "You do not need to use any special wording. The key is to be clear about what you mean and what you are asking the court to order.</br></br>The Provincial Court’s <a href='https://www.provincialcourt.bc.ca/downloads/family/Standard%20Wording%20of%20Family%20Court%20Orders%20-%20January%202022.docx' target='_blank'>Family Law Act Picklist</a> includes commonly used order terms that might be helpful. "
             },
             {
               "type": "helptext",
@@ -29,13 +29,14 @@
               "title": "I’m not sure what order I need. Where can I get legal assistance?",
               "titleLocation": "hidden",
               "body": "Understanding the law and making sure you get correct information is important. If you get the wrong information or do not know how the law applies to your situation, it can be harder to resolve your case. Getting advice from a lawyer can help.<br/><br/><b>Lawyers:</b> To find a lawyer or to have a free consultation with a lawyer for up to 30 minutes, contact the <a href='https://www.cbabc.org/For-the-Public/Lawyer-Referral-Service' target='blank'>Lawyer Referral Service</a> at 1-800-663-1919<br/><br/><b>Legal Aid, Duty Counsel and Family Advice Lawyers:</b> To find out if you qualify for free legal advice or representation, contact <a href='https://lss.bc.ca/legal_aid/howToApply.php' target=\"blank\">Legal Aid BC</a> at <p style='display:inline-block'>1-866-577-2525.</p><br/><b>Legal Services and Resources:</b> Visit <a href='https://www.clicklaw.bc.ca/helpmap' target=\"blank\">Clicklaw</a> at <a href='https://www.clicklaw.bc.ca/helpmap' target=\"blank\">www.clicklaw.bc.ca/helpmap</a> to find other free and low-cost legal services in your community"
-            },
-            {
-              "type": "comment",
-              "name": "applicationFacts",
-              "description": "Give a short summary of the facts you want the court to consider. You do not need to use any special wording. The key is to be clear about what you mean and why you are asking the court to make the order. If you are applying to change, suspend or cancel an order made in your absence, you must explain why you did not file a reply or attend court when required, why the order should be made and the reasons for any delay in making this application.",
-              "isRequired": true,
-              "title": "The `facts` on which this application is based are as follows:"
+            },            
+            {            
+                "type":"infotext",
+                "name":"noticeDescription1",
+                "title":"<b class='sv_main sv_q_title'>The `facts` on which this application is based must be described for the court in an `affidavit`</b>",
+                "body": "Your application under section 7 of the <a href='https://laws-lois.justice.gc.ca/eng/acts/f-1.4/page-1.html#h-221520' target='_blank'>Family Orders and Agreements Enforcement Assistance Act (Canada)</a> requesting that a court authorize an official of the court to make an application under section 12 of the Act for the release of information must be supported by an affidavit that includes the information set out under section 8 (1)(a) or 9 (1)(a) of that Act, as applicable.<br>To draft an affidavit using this service, select Other family court forms(s) on the Getting Started page, then select <a href='https://www2.gov.bc.ca/assets/gov/law-crime-and-justice/courthouse-services/court-files-records/court-forms/family/pfa762.pdf?forcedownload=true' target='_blank'>Affidavit – General Form 45</a>.",
+                "titleLocation":"hidden",
+                "messageStyle":"inline"
             }
           ]
         }
diff --git a/web/src/components/steps/caseMgmt/forms/application-under-foaeaa.json b/web/src/components/steps/caseMgmt/forms/application-under-foaeaa.json
new file mode 100644
index 000000000..db3bf71e9
--- /dev/null
+++ b/web/src/components/steps/caseMgmt/forms/application-under-foaeaa.json
@@ -0,0 +1,70 @@
+{
+  "title": "Application under FOAEAA",
+  "pages": [
+    {
+      "name": "Application under FOAEAA",
+      "description": "The <a href='https://laws-lois.justice.gc.ca/eng/acts/f-1.4/index.html' target='_blank'>Family Orders and Agreements Enforcement Assistance Act (Canada)</a> (FOAEAA) provides for the search and release of information from designated federal information banks, including an individual’s income information from tax returns, to a court for the purposes of establishing, changing or enforcing family support.<br>A person can apply under section 7 of FOAEAA requesting that a court authorize an official of the court to make an application under section 12 of the Act for the release of information. The Act allows for the application to be made `ex parte`",
+      "elements": [
+        {
+          "type": "panel",
+          "name": "applicationUnderFoaeaaPanel",
+          "elements": [            
+            {
+              "type": "comment",
+              "name": "orderDescription",
+              "isRequired": true,
+              "title": "Please provide the details of the order you are asking the court to make:",
+              "description": "You do not need to use any special wording. The key is to be clear about what you mean and what you are asking the court to order.</br></br>The Provincial Court’s <a href='https://www.provincialcourt.bc.ca/downloads/family/Standard%20Wording%20of%20Family%20Court%20Orders%20-%20January%202022.docx' target='blank'>Family Law Act Picklist</a> includes commonly used order terms that might be helpful. "
+            },
+            {
+              "type": "helptext",
+              "name": "FAQLegalAdvice",
+              "title": "I’m not sure what order I need. Where can I get legal assistance?",
+              "titleLocation": "hidden",
+              "body": "Understanding the law and making sure you get correct information is important. If you get the wrong information or do not know how the law applies to your situation, it can be harder to resolve your case. Getting advice from a lawyer can help.<br/><br/><b>Lawyers:</b> To find a lawyer or to have a free consultation with a lawyer for up to 30 minutes, contact the <a href='https://www.cbabc.org/For-the-Public/Lawyer-Referral-Service' target='blank'>Lawyer Referral Service</a> at 1-800-663-1919<br/><br/><b>Legal Aid, Duty Counsel and Family Advice Lawyers:</b> To find out if you qualify for free legal advice or representation, contact <a href='https://lss.bc.ca/legal_aid/howToApply.php' target=\"blank\">Legal Aid BC</a> at <p style='display:inline-block'>1-866-577-2525.</p><br/><b>Legal Services and Resources:</b> Visit <a href='https://www.clicklaw.bc.ca/helpmap' target=\"blank\">Clicklaw</a> at <a href='https://www.clicklaw.bc.ca/helpmap' target=\"blank\">www.clicklaw.bc.ca/helpmap</a> to find other free and low-cost legal services in your community"
+            },            
+            {            
+                "type":"infotext",
+                "name":"affidavitDescription1",
+                "title":"<b class='sv_main sv_q_title'>The `facts` on which this application is based must be described for the court in an `affidavit`</b>",
+                "body": "Your application under section 7 of the <a href='https://laws-lois.justice.gc.ca/eng/acts/f-1.4/page-1.html#h-221520' target='_blank'>Family Orders and Agreements Enforcement Assistance Act (Canada)</a> requesting that a court authorize an official of the court to make an application under section 12 of the Act for the release of information must be supported by an affidavit that includes the information set out under section 8 (1)(a), (2) and (3) or 9 (1)(a), (2) and (3) of that Act, as applicable.<br>To draft an affidavit using this service, select Other family court forms(s) on the Getting Started page, then select <a href='https://www2.gov.bc.ca/assets/gov/law-crime-and-justice/courthouse-services/court-files-records/court-forms/family/pfa762.pdf?forcedownload=true' target='_blank'>Affidavit – General Form 45</a>.",
+                "titleLocation":"hidden",
+                "messageStyle":"inline"
+            },
+            {            
+                "type":"infotext",
+                "name":"crcDescription1",
+                "title":"<span class='sv_main sv_q_title'>For an application made without notice to the other party, you must also provide the court with the results of a recent <b>criminal record check.</b></span>",
+                "body": "Your application under section 7 of the <a href='https://laws-lois.justice.gc.ca/eng/acts/f-1.4/page-1.html#h-221520' target='_blank'>Family Orders and Agreements Enforcement Assistance Act (Canada)</a> requesting that a court authorize an official of the court to make an application under section 12 of the Act for the release of information must be supported by an affidavit that includes the information set out under section 8 (1)(a), (2) and (3) or 9 (1)(a), (2) and (3) of that Act, as applicable.<br>To draft an affidavit using this service, select Other family court forms(s) on the Getting Started page, then select <a href='https://www2.gov.bc.ca/assets/gov/law-crime-and-justice/courthouse-services/court-files-records/court-forms/family/pfa762.pdf?forcedownload=true' target='_blank'>Affidavit – General Form 45</a>.",
+                "titleLocation":"hidden",
+                "messageStyle":"inline"
+            },
+            {
+              "type": "checkbox",
+              "name": "criminalRecordCheckAcknowledgement",
+              "title": "I understand",
+              "titleLocation": "hidden",
+              "isRequired": true,
+              "choices": [
+                {
+                  "value": "I understand",
+                  "text": "<b >I understand</b>"
+                }
+              ]
+            },
+            {
+                "type": "infotext",
+                "name": "crcInfo",
+                "title": "If you do not want to get a criminal record check, you must make your application with notice to the other party. Go back to the Notice sub-step in this pathway, using the navigation pane to your left or the previous button, to change your answer.",
+                "titleLocation": "hidden",
+                "messageStyle": "info"
+            }
+          ]
+        }
+      ],
+      "title": "About the Order"
+    }
+  ],
+  "showQuestionNumbers": "off",
+  "requiredText": ""
+}
\ No newline at end of file
diff --git a/web/src/components/steps/caseMgmt/forms/changing-or-cancelling-a-service-or-notice.json b/web/src/components/steps/caseMgmt/forms/changing-or-cancelling-a-service-or-notice.json
index 3002d2d19..d101badb1 100644
--- a/web/src/components/steps/caseMgmt/forms/changing-or-cancelling-a-service-or-notice.json
+++ b/web/src/components/steps/caseMgmt/forms/changing-or-cancelling-a-service-or-notice.json
@@ -71,7 +71,7 @@
               "type": "comment",
               "title": "Please provide the details of the order you are asking the court to make:",
               "name": "orderChangesDetail",
-              "description": "You do not need to use any special wording. The key is to be clear about what you mean and what you are asking the court to order. Tell the court the specifics of the order you are applying for. Include if you want the court to waive (cancel) the requirement or modify (change) the requirement for service or giving notice. If you are applying to modify the requirement, specify how you want the requirement changed, for example 3 days’ notice instead of 7 days. <br><br> The Provincial Court’s <a href='https://www.provincialcourt.bc.ca/downloads/family/Standard%20Wording%20of%20Family%20Law%20Orders%202021.pdf' target='_blank'> Family Law Act Picklist </a> includes commonly used order terms that might be helpful. ",
+              "description": "You do not need to use any special wording. The key is to be clear about what you mean and what you are asking the court to order. Tell the court the specifics of the order you are applying for. Include if you want the court to waive (cancel) the requirement or modify (change) the requirement for service or giving notice. If you are applying to modify the requirement, specify how you want the requirement changed, for example 3 days’ notice instead of 7 days. <br><br> The Provincial Court’s <a href='https://www.provincialcourt.bc.ca/downloads/family/Standard%20Wording%20of%20Family%20Court%20Orders%20-%20January%202022.docx' target='_blank'> Family Law Act Picklist </a> includes commonly used order terms that might be helpful. ",
               "isRequired": true,
               "visible": false,
               "visibleIf": "{changeOrCancelRequirementForService} = 'y'"              
@@ -130,7 +130,7 @@
               "type": "comment",
               "title": "Explain the alternative method of service you want to use.",
               "name":"altMethodServingDetails",
-              "description": "Be specific. You need to tell the court how you believe the documents should be served so that they will come to the attention of the person who must be served. Try to include as much detail as possible about how you want the documents served including the name of any other person who might deliver the document, the mailing address, email or other information that would be required to serve the documents. You do not need to use any special wording. The key is to be clear about what you mean and what you are asking the court to order.<br><br>The Provincial Court’s <a href='https://www.provincialcourt.bc.ca/downloads/family/Standard%20Wording%20of%20Family%20Law%20Orders%202021.pdf' target='_blank'> Family Law Act Picklist </a> includes commonly used order terms that might be helpful. ",
+              "description": "Be specific. You need to tell the court how you believe the documents should be served so that they will come to the attention of the person who must be served. Try to include as much detail as possible about how you want the documents served including the name of any other person who might deliver the document, the mailing address, email or other information that would be required to serve the documents. You do not need to use any special wording. The key is to be clear about what you mean and what you are asking the court to order.<br><br>The Provincial Court’s <a href='https://www.provincialcourt.bc.ca/downloads/family/Standard%20Wording%20of%20Family%20Court%20Orders%20-%20January%202022.docx' target='_blank'> Family Law Act Picklist </a> includes commonly used order terms that might be helpful. ",
               "isRequired": true,
               "visible": false,
               "visibleIf": "{anotherMethodOfService} = 'y'"
diff --git a/web/src/components/steps/caseMgmt/forms/changing-or-cancelling-any-other-requirement.json b/web/src/components/steps/caseMgmt/forms/changing-or-cancelling-any-other-requirement.json
index 5f9a1101c..2381d9c2f 100644
--- a/web/src/components/steps/caseMgmt/forms/changing-or-cancelling-any-other-requirement.json
+++ b/web/src/components/steps/caseMgmt/forms/changing-or-cancelling-any-other-requirement.json
@@ -89,7 +89,7 @@
               "type": "comment",
               "title": "Please provide the details of the order you are asking the court to make:",
               "name": "orderDetail",
-              "description": "You do not need to use any special wording. The key is to be clear about what you mean and what you are asking the court to order. Tell the court the specifics of the order you are applying for. Include:<ul><li>If you want the requirement changed (modified) or cancelled (waived)</li><li>If you applying to change the requirement, what you want it changed to </li></ul>The Provincial Court’s <a href='https://www.provincialcourt.bc.ca/downloads/family/Standard%20Wording%20of%20Family%20Law%20Orders%202021.pdf' target='_blank'>Family Law Act Picklist </a> includes commonly used order terms that might be helpful.",
+              "description": "You do not need to use any special wording. The key is to be clear about what you mean and what you are asking the court to order. Tell the court the specifics of the order you are applying for. Include:<ul><li>If you want the requirement changed (modified) or cancelled (waived)</li><li>If you applying to change the requirement, what you want it changed to </li></ul>The Provincial Court’s <a href='https://www.provincialcourt.bc.ca/downloads/family/Standard%20Wording%20of%20Family%20Court%20Orders%20-%20January%202022.docx' target='_blank'>Family Law Act Picklist </a> includes commonly used order terms that might be helpful.",
               "isRequired": true                           
             },
             {
diff --git a/web/src/components/steps/caseMgmt/forms/requiring-access-to-information.json b/web/src/components/steps/caseMgmt/forms/requiring-access-to-information.json
index 8adde3e76..daedf33f2 100644
--- a/web/src/components/steps/caseMgmt/forms/requiring-access-to-information.json
+++ b/web/src/components/steps/caseMgmt/forms/requiring-access-to-information.json
@@ -35,7 +35,7 @@
               "type": "comment",
               "title": "Please provide the details of the order you are asking the court to make:",
               "name": "orderDetail",
-              "description": "You do not need to use any special wording. The key is to be clear about what you mean and what you are asking the court to order.<br><br>The Provincial Court’s <a href='https://www.provincialcourt.bc.ca/downloads/family/Standard%20Wording%20of%20Family%20Law%20Orders%202021.pdf' target='_blank'> Family Law Act Picklist </a> includes commonly used order terms that might be helpful. ",
+              "description": "You do not need to use any special wording. The key is to be clear about what you mean and what you are asking the court to order.<br><br>The Provincial Court’s <a href='https://www.provincialcourt.bc.ca/downloads/family/Standard%20Wording%20of%20Family%20Court%20Orders%20-%20January%202022.docx' target='_blank'> Family Law Act Picklist </a> includes commonly used order terms that might be helpful. ",
               "isRequired": true ,
               "visible": false,
               "visibleIf" : "{officerSearch} = 'y'"                          
diff --git a/web/src/components/steps/caseMgmt/orderTypesCM.ts b/web/src/components/steps/caseMgmt/orderTypesCM.ts
index 4316b9b54..018f2f16e 100644
--- a/web/src/components/steps/caseMgmt/orderTypesCM.ts
+++ b/web/src/components/steps/caseMgmt/orderTypesCM.ts
@@ -6,25 +6,26 @@ export function getOrderTypeCM(form: string, toggle = false, toggleNext = false)
     const stPgNo: stepsAndPagesNumberInfoType = store.state.Application.stPgNo;   
     const p = stPgNo.CM
     const orders = {
-        'changeServiceRequirement':{turquoise: true,  pages:[p.WithoutNoticeOrAttendance, p.ChangingOrCancellingAServiceOrNotice],                              text:'Changing or cancelling the requirement for service or notice to a person, including allowing another method for the service of a document'},
-        'changeRequirement':       {turquoise: true,  pages:[p.WithoutNoticeOrAttendance, p.ChangingOrCancellingAnyOtherRequirement],                           text:'Changing or cancelling `any other requirement` under the rules, including a time limit'},
-        'remoteAttendance':        {turquoise: true,  pages:[p.WithoutNoticeOrAttendance, p.AttendanceUsingElectronicCommunication],                            text:'Attending at a court appearance using another method of attendance, including in-person, by telephone, video or other electronic means'},
-        'adjourningAppearance':    {turquoise: false, pages:[p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder],                                              text:'Adjourning a court appearance'},
-        'fileTransfer':            {turquoise: false, pages:[p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder],                                              text:'Transferring a court file to another registry'},
-        'settingTime':             {turquoise: false, pages:[p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder],                                              text:'Setting a specified time to file and exchange information or evidence, including a financial statement in Form 4'},
-        'nonPartyDisclosure':      {turquoise: false, pages:[p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder],                                              text:'Disclosing of information by a person who is not a party'},
-        'rule112':                 {turquoise: false, pages:[p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder],                                              text:'About the conduct of a party or management of a case, including pre-trial and trial process and evidence disclosure set out in Rule 112(1)'},
-        'orderOfAbsenceChange':    {turquoise: false, pages:[p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder],                                              text:'Changing, suspending or cancelling an `order made in my absence`'},
-        'section211':              {turquoise: false, pages:[p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder],                                              text:'Relating to a report under section 211, including requiring a person who prepared a report to attend trial as a witness'},
-        'fileAccess':              {turquoise: false, pages:[p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder],                                              text:'Management of a court record, file or document including access to a court file'},
-        'fileCorrection':          {turquoise: false, pages:[p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder],                                              text:'Correcting or changing a filed document, including correcting a name or date of birth'},
-        'orderSettlement':         {turquoise: false, pages:[p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder],                                              text:'Settling or correcting the terms of an order'},
-        'section204':              {turquoise: false, pages:[p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder],                                              text:'Adding or removing a party to a case, including leave to intervene under section 204 (2) of the Family Law Act'},
-        'lawyerAppointment':       {turquoise: false, pages:[p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder],                                              text:'Respecting the appointment of a lawyer to represent the interests of a child or a party'},
-        'otherProvinceOrder':      {turquoise: true,  pages:[p.WithoutNoticeOrAttendance, p.RecognizingAnOrderFromOutsideBc, p.ContactInformationOtherParty],   text:'Recognizing an order from outside British Columbia (other than a support order)'},
-        'subpoenaCancelation':     {turquoise: false, pages:[p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder],                                              text:'Cancelling a subpoena'},
-        'section33':               {turquoise: false, pages:[p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder],                                              text:'Requiring that a parentage test be taken under section 33 of the Family Law Act'},
-        'section242':              {turquoise: true,  pages:[p.WithoutNoticeOrAttendance, p.RequiringAccessToInformation],                                      text:'Requiring access to information in accordance with section 242 of the Family Law Act'}
+        'changeServiceRequirement':{turquoise: true,  pages:[p.WithoutNoticeOrAttendance, p.ChangingOrCancellingAServiceOrNotice,p.ApplicationUnderFOAEAA],                              text:'Changing or cancelling the requirement for service or notice to a person, including allowing another method for the service of a document'},
+        'changeRequirement':       {turquoise: true,  pages:[p.WithoutNoticeOrAttendance, p.ChangingOrCancellingAnyOtherRequirement,p.ApplicationUnderFOAEAA],                           text:'Changing or cancelling `any other requirement` under the rules, including a time limit'},
+        'remoteAttendance':        {turquoise: true,  pages:[p.WithoutNoticeOrAttendance, p.AttendanceUsingElectronicCommunication,p.ApplicationUnderFOAEAA],                            text:'Attending at a court appearance using another method of attendance, including in-person, by telephone, video or other electronic means'},
+        'adjourningAppearance':    {turquoise: false, pages:[p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder],                                                                       text:'Adjourning a court appearance'},
+        'fileTransfer':            {turquoise: false, pages:[p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder],                                                                       text:'Transferring a court file to another registry'},
+        'settingTime':             {turquoise: false, pages:[p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder],                                                                       text:'Setting a specified time to file and exchange information or evidence, including a financial statement in Form 4'},
+        'nonPartyDisclosure':      {turquoise: false, pages:[p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder],                                                                       text:'Disclosing of information by a person who is not a party'},
+        'rule112':                 {turquoise: false, pages:[p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder],                                                                       text:'About the conduct of a party or management of a case, including pre-trial and trial process and evidence disclosure set out in Rule 112(1)'},
+        'orderOfAbsenceChange':    {turquoise: false, pages:[p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder],                                                                       text:'Changing, suspending or cancelling an `order made in my absence`'},
+        'section211':              {turquoise: false, pages:[p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder],                                                                       text:'Relating to a report under section 211, including requiring a person who prepared a report to attend trial as a witness'},
+        'fileAccess':              {turquoise: false, pages:[p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder],                                                                       text:'Management of a court record, file or document including access to a court file'},
+        'fileCorrection':          {turquoise: false, pages:[p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder],                                                                       text:'Correcting or changing a filed document, including correcting a name or date of birth'},
+        'orderSettlement':         {turquoise: false, pages:[p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder],                                                                       text:'Settling or correcting the terms of an order'},
+        'section204':              {turquoise: false, pages:[p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder],                                                                       text:'Adding or removing a party to a case, including leave to intervene under section 204 (2) of the Family Law Act'},
+        'lawyerAppointment':       {turquoise: false, pages:[p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder],                                                                       text:'Respecting the appointment of a lawyer to represent the interests of a child or a party'},
+        'otherProvinceOrder':      {turquoise: true,  pages:[p.WithoutNoticeOrAttendance, p.RecognizingAnOrderFromOutsideBc, p.ContactInformationOtherParty,p.ApplicationUnderFOAEAA],   text:'Recognizing an order from outside British Columbia (other than a support order)'},
+        'subpoenaCancelation':     {turquoise: false, pages:[p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder],                                                                       text:'Cancelling a subpoena'},
+        'section33':               {turquoise: false, pages:[p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder],                                                                       text:'Requiring that a parentage test be taken under section 33 of the Family Law Act'},
+        'section242':              {turquoise: true,  pages:[p.WithoutNoticeOrAttendance, p.RequiringAccessToInformation,p.ApplicationUnderFOAEAA],                                      text:'Requiring access to information in accordance with section 242 of the Family Law Act'},
+        'section12':               {turquoise: true,  pages:[p.WithoutNoticeOrAttendance,p.ApplicationUnderFOAEAA],                                                                      text:"Authorizing an official of the court to make an application under section 12 of the <a href='https://laws-lois.justice.gc.ca/eng/acts/f-1.4/page-1.html#h-221520' target='_blank'>Family Orders and Agreements Enforcement Assistance Act (Canada)</a> for the release of information for the establishment or variation of a support provision or the enforcement of a family provision"}
     }
 
     if(form){
diff --git a/web/src/components/steps/caseMgmt/reviewCM/RequiredForm.ts b/web/src/components/steps/caseMgmt/reviewCM/RequiredForm.ts
index 0f2db1fa1..be62977d5 100644
--- a/web/src/components/steps/caseMgmt/reviewCM/RequiredForm.ts
+++ b/web/src/components/steps/caseMgmt/reviewCM/RequiredForm.ts
@@ -37,7 +37,8 @@ function determineNoticeTurquoise(results){
         'changeRequirement',
         'remoteAttendance',
         'otherProvinceOrder',
-        'section242'
+        'section242',
+        'section12'
     ]
 
     const needNotice = needNoticeList.some(turquoise => selectedCaseManagementItems.includes(turquoise)); 
diff --git a/web/src/components/steps/caseMgmt/reviewCM/pdf/Form10Layout.vue b/web/src/components/steps/caseMgmt/reviewCM/pdf/Form10Layout.vue
index a0f8b3579..80bdc4532 100644
--- a/web/src/components/steps/caseMgmt/reviewCM/pdf/Form10Layout.vue
+++ b/web/src/components/steps/caseMgmt/reviewCM/pdf/Form10Layout.vue
@@ -209,6 +209,8 @@
                     <check-box  :check="form10Info.caseList.includes('nonPartyDisclosure')?'yes':''" text="specifying or requiring information that must be disclosed by a person who is not a party to the case"/>
                     <check-box  :check="form10Info.caseList.includes('section33')?'yes':''" text="requiring that a parentage test be taken under section 33 <i>[parentage tests]</i> of the Family Law Act"/>
                     <check-box  :check="form10Info.caseList.includes('section242')?'yes':''" text="requiring access to information in accordance with section 242 <i>[orders respecting searchable information]</i> of the Family Law Act"/>
+                    <check-box  :check="form10Info.caseList.includes('section12')?'yes':''" 
+                        text="authorizing an official of the court, in accordance with section 10 of the Family Orders and Agreements Enforcement Assistance Act (Canada), to make an application under section 12 of that Act for the release of information"/>
                     <check-box  :check="form10Info.caseList.includes('otherProvinceOrder')?'yes':''" text="recognizing an extraprovincial order other than a support order"/>
                     <check-box  :check="form10Info.caseList.includes('changeServiceRequirement')?'yes':''" text="waiving or modifying any requirement related to service or giving notice to a person, including allowing an alternative method for
                                                                     the service of a document"/>
@@ -283,8 +285,8 @@
                         any delay in making this application.</i>
                 </div>
 
-                <div v-if="form10Info.orderFacts" class="answerbox">{{form10Info.orderFacts}}</div>
-                <div v-else style="margin-bottom:3rem;"></div>                
+                <div class="answerbox">Please see the affidavit filed in support of this application.</div>
+                         
             </section>
         </div>   
 
@@ -453,7 +455,7 @@ export default class Form10Layout extends Vue {
         if (this.result?.aboutCaseManagementOrderSurvey){
             const aboutOrderData: aboutCaseManagementOrderSurveyDataInfoType = this.result.aboutCaseManagementOrderSurvey;
             form10Info.orderDetails = aboutOrderData.orderDescription;
-            form10Info.orderFacts = aboutOrderData.applicationFacts;
+            //form10Info.orderFacts = aboutOrderData.applicationFacts;
         }  
         
         if (this.result?.cmNoticeSurvey){
diff --git a/web/src/components/steps/priorityParenting/forms/about-priority-parenting-matter-order.json b/web/src/components/steps/priorityParenting/forms/about-priority-parenting-matter-order.json
index 3d6280472..a572e9851 100644
--- a/web/src/components/steps/priorityParenting/forms/about-priority-parenting-matter-order.json
+++ b/web/src/components/steps/priorityParenting/forms/about-priority-parenting-matter-order.json
@@ -21,7 +21,7 @@
               "name": "orderDescription",
               "isRequired": true,
               "title": "Please provide the details of the order you are asking the court to make:",
-              "description": "You do not need to use any special wording. The key is to be clear about what you mean and what you are asking the court to order.</br></br>The Provincial Court’s <a href='https://www.provincialcourt.bc.ca/downloads/family/Standard%20Wording%20of%20Family%20Law%20Orders%202021.pdf' target='blank'>Family Law Act Picklist</a> includes commonly used order terms that might be helpful. "
+              "description": "You do not need to use any special wording. The key is to be clear about what you mean and what you are asking the court to order.</br></br>The Provincial Court’s <a href='https://www.provincialcourt.bc.ca/downloads/family/Standard%20Wording%20of%20Family%20Court%20Orders%20-%20January%202022.docx' target='blank'>Family Law Act Picklist</a> includes commonly used order terms that might be helpful. "
             },
             {
               "type": "helptext",
diff --git a/web/src/components/steps/writtenResponse/forms/about-written-response-order.json b/web/src/components/steps/writtenResponse/forms/about-written-response-order.json
index c3fb48db6..5254159c6 100644
--- a/web/src/components/steps/writtenResponse/forms/about-written-response-order.json
+++ b/web/src/components/steps/writtenResponse/forms/about-written-response-order.json
@@ -37,7 +37,7 @@
               "visible": false,
               "visibleIf": "{requiredChanges} = 'y'",
               "title": "Please provide the details of the order you are asking the court to make:",
-              "description": "You do not need to use any special wording. The key is to be clear about what you mean and what you are asking the court to order.</br></br>Remember that you can only ask for orders about the same issue that is before the court, for example, case management, enforcement, protection order terms, etc., or changes to the proposed order in the application you are replying to.</br></br>The Provincial Court’s <a href='https://www.provincialcourt.bc.ca/downloads/family/Standard%20Wording%20of%20Family%20Law%20Orders%202021.pdf' target='blank'>Family Law Act Picklist</a> includes commonly used order terms that might be helpful. "
+              "description": "You do not need to use any special wording. The key is to be clear about what you mean and what you are asking the court to order.</br></br>Remember that you can only ask for orders about the same issue that is before the court, for example, case management, enforcement, protection order terms, etc., or changes to the proposed order in the application you are replying to.</br></br>The Provincial Court’s <a href='https://www.provincialcourt.bc.ca/downloads/family/Standard%20Wording%20of%20Family%20Court%20Orders%20-%20January%202022.docx' target='blank'>Family Law Act Picklist</a> includes commonly used order terms that might be helpful. "
             },
             {
               "type": "helptext",
diff --git a/web/src/components/survey/glossary.json b/web/src/components/survey/glossary.json
index 8ba8e158d..42bcaa0e7 100644
--- a/web/src/components/survey/glossary.json
+++ b/web/src/components/survey/glossary.json
@@ -1,5 +1,5 @@
 {
-    "affidavit": "An affidavit is a document that contains facts that you swear under oath or affirm to be true. It is your story that you are telling the court.",
+    "affidavit": "An affidavit is used to present evidence to the court. It is a written document that contains facts that you must swear under oath (usually on a Bible or other religious book) or affirm (non-religious promise) to be true.",
     "best interests of the child": "The 'best interests of the child' is a test that the court uses to make decisions about children.  Before making a decision, both parents and courts must consider the child’s physical, psychological and emotional safety, security and well-being. The <i>Family Law Act section 37</i> includes the following considerations:<ol style='list-style-type:lower-alpha'><li>the child's health and emotional well-being;</li><li>the child's views, unless it would be inappropriate to consider them;</li><li>the nature and strength of the relationships between the child and significant persons in the child's life;</li><li>the history of the child's care;</li><li>the child's need for stability, given the child's age and stage of development;</li><li>the ability of each person who is a guardian or seeks guardianship of the child, or who has or seeks parental responsibilities, parenting time or contact with the child, to exercise his or her responsibilities;</li><li>the impact of any family violence on the child's safety, security or well-being, whether the family violence is directed toward the child or another family member;</li><li>whether the actions of a person responsible for family violence indicate that the person may be impaired in his or her ability to care for the child and meet the child's needs;</li><li>the appropriateness of an arrangement that would require the child's guardians to cooperate on issues affecting the child, including whether requiring cooperation would increase any risks to the safety, security or well-being of the child or other family members;</li><li>any civil or criminal proceeding relevant to the child's safety, security or well-being.</li></ol>",
     "contact with a child": "The time a child spends with someone who is not their guardian.  This person could include a parent who is not a guardian to a child, or other people, like grandparents.",
     "child support": "The amount of money a parent or guardian pays to another parent or guardian to help care for the child(ren).",
@@ -63,5 +63,6 @@
     "probation order": "A probation order is a type of sentence and an alternative to jail. It sets out what an offender can or cannot do.",
     "bail order": "Bail is also called 'judicial interim release'. If a person is granted bail (released until a next court appearance), certain rules and conditions are usually included in a bail order that a person needs to follow.",
     "interim order": "An interim order is a temporary court order that is in place during the time until a final order can be made.",
-    "evidence": "Evidence is how you will prove your case. Your evidence may come from you, your documents, which are entered by the court as exhibits, or your witnesses."
+    "evidence": "Evidence is how you will prove your case. Your evidence may come from you, your documents, which are entered by the court as exhibits, or your witnesses.",
+    "ex parte": "To make an application ex parte, it means the application is made without notice to the party and without them attending the court appearance."
 }
\ No newline at end of file
diff --git a/web/src/filters/index.ts b/web/src/filters/index.ts
index e799c2300..2f4b482d5 100644
--- a/web/src/filters/index.ts
+++ b/web/src/filters/index.ts
@@ -625,6 +625,18 @@ Vue.filter('extractRequiredDocuments', function(questions, type){
 		
 		if(stepCM.pages[stPgCM.RecognizingAnOrderFromOutsideBc].active && questions.recognizingAnOrderFromOutsideBcSurvey?.outsideBcOrder == 'y')
 			requiredDocuments.push("Certified copy of the order from outside BC")
+
+        if(stepCM.pages[stPgCM.WithoutNoticeOrAttendance].active){
+
+            if(questions.withoutNoticeOrAttendanceSurvey?.needWithoutNotice == 'n'){
+                requiredDocuments.push("Affidavit - General Form 45")
+            } else if (questions.withoutNoticeOrAttendanceSurvey?.needWithoutNotice == 'y' 
+                        && stepCM.pages[stPgCM.ApplicationUnderFOAEAA].active
+                        && questions.applicationUnderFOAEAASurvey?.criminalRecordCheckAcknowledgement.includes('I understand')){
+                requiredDocuments.push("Affidavit - General Form 45")
+                requiredDocuments.push("Criminal Record Check")
+            }
+        }
 	}
 
 	if(type == 'agreementEnfrc'){
diff --git a/web/src/store/modules/application.ts b/web/src/store/modules/application.ts
index 09ac55599..86b48ae11 100644
--- a/web/src/store/modules/application.ts
+++ b/web/src/store/modules/application.ts
@@ -1431,6 +1431,14 @@ class Application extends VuexModule {
 
         p = {} as pageInfoType;
         p.key = "8";
+        p.name = "ApplicationUnderFOAEAA";
+        p.label = "Application Under FOAEAA";
+        p.active = false;
+        p.progress = 0;    
+        s.pages.push(p);
+
+        p = {} as pageInfoType;
+        p.key = "9";
         p.name = "AttendanceUsingElectronicCommunication";
         p.label = "Attendance Using Another Method of Attendance";
         p.active = false;
@@ -1438,7 +1446,7 @@ class Application extends VuexModule {
         s.pages.push(p);
 
         p = {} as pageInfoType;
-        p.key = "9";
+        p.key = "10";
         p.name = "ChangingOrCancellingAServiceOrNotice";
         p.label = "Changing or Cancelling a Service or Notice";
         p.active = false;
@@ -1446,7 +1454,7 @@ class Application extends VuexModule {
         s.pages.push(p);
 
         p = {} as pageInfoType;
-        p.key = "10";
+        p.key = "11";
         p.name = "ChangingOrCancellingAnyOtherRequirement";
         p.label = "Changing or Cancelling Any Other Requirement";
         p.active = false;
@@ -1454,7 +1462,7 @@ class Application extends VuexModule {
         s.pages.push(p);
 
         p = {} as pageInfoType;
-        p.key = "11";
+        p.key = "12";
         p.name = "RequiringAccessToInformation";
         p.label = "Requiring Access to Information";
         p.active = false;
@@ -1462,7 +1470,7 @@ class Application extends VuexModule {
         s.pages.push(p);
 
         p = {} as pageInfoType;
-        p.key = "12";
+        p.key = "13";
         p.name = "RecognizingAnOrderFromOutsideBc";
         p.label = "Recognizing an Order from Outside BC";
         p.active = false;
@@ -1470,7 +1478,7 @@ class Application extends VuexModule {
         s.pages.push(p);
 
         p = {} as pageInfoType;
-        p.key = "13";
+        p.key = "14";
         p.name = "ContactInformationOtherParty";
         p.label = "Contact Information Other Party";
         p.active = false;
@@ -1479,7 +1487,7 @@ class Application extends VuexModule {
 
         //____________Review
         p = {} as pageInfoType;
-        p.key = "14";
+        p.key = "15";
         p.name = "ReviewYourAnswersCM";
         p.label = "Review Your Answers";
         p.active = false;
@@ -1487,7 +1495,7 @@ class Application extends VuexModule {
         s.pages.push(p);
 
         p = {} as pageInfoType;
-        p.key = "15";
+        p.key = "16";
         p.name = "PreviewForm10CM";
         p.label = "Preview Form 10";
         p.active = false;
@@ -1495,7 +1503,7 @@ class Application extends VuexModule {
         s.pages.push(p);
 
         p = {} as pageInfoType;
-        p.key = "16";
+        p.key = "17";
         p.name = "PreviewForm11CM";
         p.label = "Preview Form 11";
         p.active = false;
diff --git a/web/src/types/Application/CaseManagement/index.ts b/web/src/types/Application/CaseManagement/index.ts
index fad1766ea..0473d037c 100644
--- a/web/src/types/Application/CaseManagement/index.ts
+++ b/web/src/types/Application/CaseManagement/index.ts
@@ -85,6 +85,19 @@ export interface aboutCaseManagementOrderSurveyDataInfoType {
     applicationFacts: string;
 }
 
+export interface applicationUnderFOAEAASurveyInfoType {
+    data: applicationUnderFOAEAASurveyDataInfoType;
+    questions: questionInfoType[];
+    pageName: string;
+    currentStep: number | string;
+    currentPage: number | string;
+}
+
+export interface applicationUnderFOAEAASurveyDataInfoType {
+    orderDescription: string;
+    criminalRecordCheckAcknowledgement: string[];
+}
+
 export interface cmChildrenInfoSurveyInfoType {
     data: {childData: cmChildrenInfoSurveyDataInfoType[]; childRelatedType: string };
     questions: questionInfoType[];
diff --git a/web/src/types/Application/StepsAndPages/index.ts b/web/src/types/Application/StepsAndPages/index.ts
index fd01cebb8..f474954dc 100644
--- a/web/src/types/Application/StepsAndPages/index.ts
+++ b/web/src/types/Application/StepsAndPages/index.ts
@@ -221,6 +221,7 @@ export interface CMstPgTypes{
     Scheduling: number;
     AboutCaseManagementOrder: number;
     CmChildrenInfo: number;
+    ApplicationUnderFOAEAA: number;
     AttendanceUsingElectronicCommunication: number;
     ChangingOrCancellingAServiceOrNotice: number;
     ChangingOrCancellingAnyOtherRequirement: number;
diff --git a/web/src/types/Application/index.ts b/web/src/types/Application/index.ts
index 224186c99..f6a324049 100644
--- a/web/src/types/Application/index.ts
+++ b/web/src/types/Application/index.ts
@@ -9,7 +9,7 @@ import { aboutExistingSpousalSupportOrderSurveyInfoType, aboutSpousalSupportOrde
 import { relocQuestionnaireSurveyInfoType, relocChildBestInterestSurveyInfoType, relocChildrenInfoSurveyInfoType } from "./RelocationOfChild";
 import { aboutPriorityParentingMatterOrderSurveyInfoType, ppmChildrenInfoSurveyInfoType, ppmBackgroundDataSurveyInfoType, ppmQuestionnaireSurveyInfoType, priorityParentingMatterOrderSurveyInfoType, ppmAdditionalDocumentsSurveyInfoType } from "./PriorityParentingMatter";
 import { aboutPOSurveyInfoType, allchildrenInfoType, backgroundSurveyInfoType, ExistingOrderInfoType, noContactSurveyInfoType, noGoSurveyInfoType, poFilingLocationSurveyInfoType, poQuestionnaireSurveyInfoType, protectionFromWhomSurveyInfoType, removePersonSurveyInfoType, urgencySurveyInfoType, weaponsFirearmsSurveyInfoType, yourinformationPOSurveyInfoType, yourStorySurveyInfoType } from "./ProtectionOrder";
-import { aboutCaseManagementOrderSurveyInfoType, attendanceUsingElectronicCommunicationSurveyInfoType, byConsentSurveyInfoType, changingOrCancellingAnyOtherRequirementSurveyInfoType, changingOrCancellingAServiceOrNoticeSurveyInfoType, cmChildrenInfoSurveyInfoType, cmNoticeSurveyInfoType, cmQuestionnaireSurveyInfoType, contactInformationOtherPartySurveyInfoType, otherPersonsSurveyInfoType, recognizingAnOrderFromOutsideBcSurveyInfoType, requiringAccessToInformationSurveyInfoType, schedulingSurveyInfoType, withoutNoticeOrAttendanceSurveyInfoType } from "./CaseManagement";
+import { aboutCaseManagementOrderSurveyInfoType, applicationUnderFOAEAASurveyInfoType, attendanceUsingElectronicCommunicationSurveyInfoType, byConsentSurveyInfoType, changingOrCancellingAnyOtherRequirementSurveyInfoType, changingOrCancellingAServiceOrNoticeSurveyInfoType, cmChildrenInfoSurveyInfoType, cmNoticeSurveyInfoType, cmQuestionnaireSurveyInfoType, contactInformationOtherPartySurveyInfoType, otherPersonsSurveyInfoType, recognizingAnOrderFromOutsideBcSurveyInfoType, requiringAccessToInformationSurveyInfoType, schedulingSurveyInfoType, withoutNoticeOrAttendanceSurveyInfoType } from "./CaseManagement";
 import { aboutTheOrderEnforcementSurveyInfoType, determineAnAmountOwingForExpensesSurveyInfoType, detrermineArrearsSurveyInfoType, enforceAgreementOrOrderSurveyInfoType, enforceChangeSetAsideDeterminationSurveyInfoType, enfrcQuestionnaireSurveySurveyInfoType } from "./AgreementEnforcement";
 import { aboutWrittenResponseOrderSurveyInfoType, agreeDisagreeSurveyInfoType, wrReplyingToApplicationSurveyInfoType } from "./WrittenResponse";
 import { rflmQuestionnaireSurveyInfoType, rflmCounterAppSurveyInfoType, rflmBackgroundSurveyInfoType, rflmChildDetailsSurveyInfoType, rflmAdditionalDocumentsSurveyInfoType } from "./ReplyFamilyLawMatter";
@@ -29,7 +29,6 @@ import { noticeRemoveLawyerChildSurveyInfoType, otherPartyNLCRConfirmationSurvey
 import { noticeLawyerPartySurveyInfoType, otherPartyNLPConfirmationSurveyInfoType } from "./LawyerParty";
 import { noticeRemoveLawyerPartySurveyInfoType, otherPartyNLPRConfirmationSurveyInfoType } from "./NoticeRemoveLawyerParty";
 import { aboutAffiantSurveyInfoType, affidavitSurveyInfoType, filingAffSurveyInfoType, yourStoryAffSurveyInfoType, electronicFilingStatementAffSurveyInfoType} from "./Affidavit";
-// import { electronicFilingStatementSurveyInfoType } from "./ElectronicFilingStatement";
 
 
 //This is what our database saves.
@@ -236,6 +235,7 @@ export interface stepInfoType {
     schedulingSurvey?: schedulingSurveyInfoType;
     aboutCaseManagementOrderSurvey?: aboutCaseManagementOrderSurveyInfoType;
     cmChildrenInfoSurvey?: cmChildrenInfoSurveyInfoType;
+    applicationUnderFOAEAASurvey?: applicationUnderFOAEAASurveyInfoType;
     childRelatedTypeSurvey?: string;
     attendanceUsingElectronicCommunicationSurvey?: attendanceUsingElectronicCommunicationSurveyInfoType;
 

From 18e6290cb567f400824dbd6dd7a05e8a1c0d6d94 Mon Sep 17 00:00:00 2001
From: marzmehr <mars.mehr@gmail.com>
Date: Sat, 11 Nov 2023 08:50:02 -0800
Subject: [PATCH 03/10] PFCF-439: applying changes based on feedback

---
 .../steps/caseMgmt/forms/application-under-foaeaa.json        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/src/components/steps/caseMgmt/forms/application-under-foaeaa.json b/web/src/components/steps/caseMgmt/forms/application-under-foaeaa.json
index db3bf71e9..d6469f31e 100644
--- a/web/src/components/steps/caseMgmt/forms/application-under-foaeaa.json
+++ b/web/src/components/steps/caseMgmt/forms/application-under-foaeaa.json
@@ -35,7 +35,7 @@
                 "type":"infotext",
                 "name":"crcDescription1",
                 "title":"<span class='sv_main sv_q_title'>For an application made without notice to the other party, you must also provide the court with the results of a recent <b>criminal record check.</b></span>",
-                "body": "Your application under section 7 of the <a href='https://laws-lois.justice.gc.ca/eng/acts/f-1.4/page-1.html#h-221520' target='_blank'>Family Orders and Agreements Enforcement Assistance Act (Canada)</a> requesting that a court authorize an official of the court to make an application under section 12 of the Act for the release of information must be supported by an affidavit that includes the information set out under section 8 (1)(a), (2) and (3) or 9 (1)(a), (2) and (3) of that Act, as applicable.<br>To draft an affidavit using this service, select Other family court forms(s) on the Getting Started page, then select <a href='https://www2.gov.bc.ca/assets/gov/law-crime-and-justice/courthouse-services/court-files-records/court-forms/family/pfa762.pdf?forcedownload=true' target='_blank'>Affidavit – General Form 45</a>.",
+                "body": "The criminal record check is required as part of important safeguards under FOAEAA for the search and release of financial information to help ensure the court is satisfied that the release of information will not likely jeopardize the safety or security of any person.<br><br>To get a criminal record check, ask at the front desk of the police station or RCMP detachment in your community. There is a fee you will need to pay to get the criminal record check.<br><br>The police or RCMP will send you your results.",
                 "titleLocation":"hidden",
                 "messageStyle":"inline"
             },
@@ -62,7 +62,7 @@
           ]
         }
       ],
-      "title": "About the Order"
+      "title": "Application under FOAEAA"
     }
   ],
   "showQuestionNumbers": "off",

From cdcdaa5cea121bc61e0b65af0534ab5da2c140bc Mon Sep 17 00:00:00 2001
From: marzmehr <mars.mehr@gmail.com>
Date: Tue, 14 Nov 2023 07:50:28 -0800
Subject: [PATCH 04/10] PFCF-439: applying changes based on feedback

---
 .../steps/caseMgmt/forms/application-under-foaeaa.json          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/components/steps/caseMgmt/forms/application-under-foaeaa.json b/web/src/components/steps/caseMgmt/forms/application-under-foaeaa.json
index d6469f31e..162556b8f 100644
--- a/web/src/components/steps/caseMgmt/forms/application-under-foaeaa.json
+++ b/web/src/components/steps/caseMgmt/forms/application-under-foaeaa.json
@@ -35,7 +35,7 @@
                 "type":"infotext",
                 "name":"crcDescription1",
                 "title":"<span class='sv_main sv_q_title'>For an application made without notice to the other party, you must also provide the court with the results of a recent <b>criminal record check.</b></span>",
-                "body": "The criminal record check is required as part of important safeguards under FOAEAA for the search and release of financial information to help ensure the court is satisfied that the release of information will not likely jeopardize the safety or security of any person.<br><br>To get a criminal record check, ask at the front desk of the police station or RCMP detachment in your community. There is a fee you will need to pay to get the criminal record check.<br><br>The police or RCMP will send you your results.",
+                "body": "The criminal record check is required as part of important safeguards under the <a href='https://laws-lois.justice.gc.ca/eng/acts/f-1.4/page-1.html#h-221520' target='_blank'>Family Orders and Agreements Enforcement Assistance Act (Canada)</a> for the search and release of financial information to help ensure the court is satisfied that the release of information will not likely jeopardize the safety or security of any person.<br><br>To get a criminal record check, ask at the front desk of the police station or RCMP detachment in your community. There is a fee you will need to pay to get the criminal record check.<br><br>The police or RCMP will send you your results.",
                 "titleLocation":"hidden",
                 "messageStyle":"inline"
             },

From 3d7c05fb33a5e351a02e550acfc21153a59ccdb2 Mon Sep 17 00:00:00 2001
From: marzmehr <mars.mehr@gmail.com>
Date: Tue, 14 Nov 2023 13:30:51 -0800
Subject: [PATCH 05/10] PFCF-439: updates based on Form 11 changes

---
 .../reviewCM/pdf/Schedules/CommonSection.vue      | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/web/src/components/steps/caseMgmt/reviewCM/pdf/Schedules/CommonSection.vue b/web/src/components/steps/caseMgmt/reviewCM/pdf/Schedules/CommonSection.vue
index f0d0535b1..6a3e2c966 100644
--- a/web/src/components/steps/caseMgmt/reviewCM/pdf/Schedules/CommonSection.vue
+++ b/web/src/components/steps/caseMgmt/reviewCM/pdf/Schedules/CommonSection.vue
@@ -147,9 +147,10 @@
                     <check-box  :check="selectedSchedules.includes('schedule2')?'yes':''" text="waiving or modifying any requirement related to service or giving notice to a person, including allowing an alternative method for the service of a document <i>[complete and attach Schedule 2]</i>"/>
                     <check-box  :check="selectedSchedules.includes('schedule3')?'yes':''" text="waiving or modifying any other requirement under the rules <i>[complete and attach Schedule 3]</i>"/>
                     <check-box  :check="selectedSchedules.includes('schedule4')?'yes':''" text="requiring access to information in accordance with section 242 <i>[orders respecting searchable information]</i> of the <i> Family Law Act [complete and attach Schedule 4]</i>"/>
-                    
-                    <check-box  :check="selectedSchedules.includes('schedule5')?'yes':''" text="recognizing an extraprovincial order other than a support order <i>[complete and attach Schedule 5]</i>"/>
-                    
+                    <check-box  :check="(caseList.includes('section12') && understandWithoutNotice)?'yes':''" 
+                        text="authorizing an official of the court, in accordance with section 10 of the <i>Family Orders and Agreements Enforcement Assistance Act (Canada)</i>, to make an application under section 12 of that Act for the release of information <i>[file a criminal
+                        record check and completed affidavit that meets the requirements of sections 8 and 9 of the Family Orders and Agreements Enforcement Assistance Act (Canada)]</i>"/>
+                    <check-box  :check="selectedSchedules.includes('schedule5')?'yes':''" text="recognizing an extraprovincial order other than a support order <i>[complete and attach Schedule 5]</i>"/>                    
                 </div>                  
             </section>
         </div>   
@@ -201,6 +202,7 @@ export default class CommonSection extends Vue {
     childrenInfo: childrenInfoSurveyInfoType[] = [];  
     filingLocationReason = '';    
     understandWithoutNotice = false;
+    caseList = [];
    
     childrenFields = [
         {key:"fullName",               label:"Child's full legal name",                tdClass:"border-dark text-center align-middle", thClass:"border-dark text-center align-middle", thStyle:"font-size:8pt; width:30%;"},
@@ -218,13 +220,18 @@ export default class CommonSection extends Vue {
         this.otherPartyInfo = this.getOtherPartyInfo();  
         this.childrenInfo = this.getChildrenInfo(); 
         this.locationInfo = this.getLocationInfo();
+        this.caseList = [];
 
         if (this.result?.withoutNoticeOrAttendanceSurvey){
             const withoutNoticeData: withoutNoticeOrAttendanceSurveyDataInfoType = this.result.withoutNoticeOrAttendanceSurvey;
             this.understandWithoutNotice = withoutNoticeData.needWithoutNotice == 'y' && withoutNoticeData.orderWithoutNoticeAcknowledgement == 'I understand';
         } else {
             this.understandWithoutNotice = false;
-        }  
+        }
+        
+        if (this.result?.cmQuestionnaireSurvey){
+            this.caseList = this.result.cmQuestionnaireSurvey
+        }
         
         if (this.result.filingLocationSurvey?.ExistingFamilyCase == 'y') {
             this.filingLocationReason = 'It is the court location where my existing case with the same party/parties is filed';

From 2e3f3bd2f23ef94f1f2263af11cc0d0a94cbabbb Mon Sep 17 00:00:00 2001
From: marzmehr <mars.mehr@gmail.com>
Date: Wed, 15 Nov 2023 07:00:05 -0800
Subject: [PATCH 06/10] PFCF-420: adding types

---
 web/src/types/Application/index.ts | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/web/src/types/Application/index.ts b/web/src/types/Application/index.ts
index 51322b179..2433a53a6 100644
--- a/web/src/types/Application/index.ts
+++ b/web/src/types/Application/index.ts
@@ -335,16 +335,16 @@ export interface stepInfoType {
     
 
     //_____Step 21 GUARDIANSHIP AFFIDAVIT_____________    
-    guardianshipAffidavitSurvey?: any;//affidavitSurveyInfoType;   
-    aboutAffiantGaSurvey?: any;//affidavitSurveyInfoType; 
-    childrenDetailsGaSurvey?: any;//affidavitSurveyInfoType; 
-    caringForChildGaSurvey?: any;//affidavitSurveyInfoType; 
-    backgroundFamilyViolence?: any;//affidavitSurveyInfoType;
-    backgroundCivilCourtProceedings?: any;//affidavitSurveyInfoType;
-    backgroundCriminalHistory?: any;//affidavitSurveyInfoType;
-    exhibits?: any;//affidavitSurveyInfoType;
-    filingGA?: any;//affidavitSurveyInfoType;
-    electronicFilingStatementGa?: any;//affidavitSurveyInfoType;
+    guardianshipAffidavitSurvey?: any;//guardianshipAffidavitSurveyInfoType;   
+    aboutAffiantGaSurvey?: any;//aboutAffiantGaSurveyInfoType; 
+    childrenDetailsGaSurvey?: any;//childrenDetailsGaSurveyInfoType; 
+    caringForChildGaSurvey?: any;//caringForChildGaSurveyInfoType; 
+    backgroundFamilyViolenceSurvey?: any;//backgroundFamilyViolenceSurveyInfoType;
+    backgroundCivilCourtProceedingsSurvey?: any;//backgroundCivilCourtProceedingsSurveyInfoType;
+    backgroundCriminalHistorySurvey?: any;//backgroundCriminalHistorySurveyInfoType;
+    exhibitsSurvey?: any;//exhibitsSurveyInfoType;
+    filingGASurvey?: any;//filingGASurveyInfoType;
+    electronicFilingStatementGaSurvey?: any;//electronicFilingStatementGaSurveyInfoType;
     
     
     //__Step 22 SUBMIT

From 871bfe524e52f192b6985562dd9705553df03c33 Mon Sep 17 00:00:00 2001
From: marzmehr <mars.mehr@gmail.com>
Date: Wed, 15 Nov 2023 09:02:42 -0800
Subject: [PATCH 07/10] PFCF-439: applying changes based on new requirements

---
 .../steps/caseMgmt/AboutCaseManagementOrder.vue   | 10 ++++------
 .../forms/about-case-management-order.json        | 15 +++++++++++++--
 web/src/components/steps/caseMgmt/orderTypesCM.ts |  8 ++++----
 .../steps/caseMgmt/reviewCM/pdf/Form10Layout.vue  | 14 ++++++++++++--
 web/src/filters/index.ts                          |  2 +-
 5 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/web/src/components/steps/caseMgmt/AboutCaseManagementOrder.vue b/web/src/components/steps/caseMgmt/AboutCaseManagementOrder.vue
index 00e47af34..a960b5f5c 100644
--- a/web/src/components/steps/caseMgmt/AboutCaseManagementOrder.vue
+++ b/web/src/components/steps/caseMgmt/AboutCaseManagementOrder.vue
@@ -32,11 +32,7 @@ export default class AboutCaseManagementOrder extends Vue {
     step!: stepInfoType;
 
     @applicationState.State
-    public steps!: stepInfoType[];    
-
-    
-
-    
+    public steps!: stepInfoType[];        
 
     @applicationState.Action
     public UpdateStepResultData!: (newStepResultData: stepResultInfoType) => void
@@ -84,6 +80,8 @@ export default class AboutCaseManagementOrder extends Vue {
         if (this.step.result?.cmQuestionnaireSurvey?.data){
             this.listOfIssuesDescription = this.getDescription();
             this.survey.setVariable('listOfIssuesDescription', this.listOfIssuesDescription);
+            const issues = this.step.result.cmQuestionnaireSurvey.data;
+            this.survey.setVariable('IncludesFoaeaa', issues.includes("section12"));
         }
         
         Vue.filter('setSurveyProgress')(this.survey, this.currentStep, this.currentPage, 50, false);
@@ -92,7 +90,7 @@ export default class AboutCaseManagementOrder extends Vue {
     public getDescription() {
 
         let description = '';
-        let listOfIssues = [];
+        const listOfIssues = [];
         const firstDescriptionSection = 'You indicated you are applying for a case management order about:  '
        
        
diff --git a/web/src/components/steps/caseMgmt/forms/about-case-management-order.json b/web/src/components/steps/caseMgmt/forms/about-case-management-order.json
index f160c2cd0..149fc99cd 100644
--- a/web/src/components/steps/caseMgmt/forms/about-case-management-order.json
+++ b/web/src/components/steps/caseMgmt/forms/about-case-management-order.json
@@ -29,14 +29,25 @@
               "title": "I’m not sure what order I need. Where can I get legal assistance?",
               "titleLocation": "hidden",
               "body": "Understanding the law and making sure you get correct information is important. If you get the wrong information or do not know how the law applies to your situation, it can be harder to resolve your case. Getting advice from a lawyer can help.<br/><br/><b>Lawyers:</b> To find a lawyer or to have a free consultation with a lawyer for up to 30 minutes, contact the <a href='https://www.cbabc.org/For-the-Public/Lawyer-Referral-Service' target='blank'>Lawyer Referral Service</a> at 1-800-663-1919<br/><br/><b>Legal Aid, Duty Counsel and Family Advice Lawyers:</b> To find out if you qualify for free legal advice or representation, contact <a href='https://lss.bc.ca/legal_aid/howToApply.php' target=\"blank\">Legal Aid BC</a> at <p style='display:inline-block'>1-866-577-2525.</p><br/><b>Legal Services and Resources:</b> Visit <a href='https://www.clicklaw.bc.ca/helpmap' target=\"blank\">Clicklaw</a> at <a href='https://www.clicklaw.bc.ca/helpmap' target=\"blank\">www.clicklaw.bc.ca/helpmap</a> to find other free and low-cost legal services in your community"
-            },            
+            },     
+            {
+                "type": "comment",
+                "name": "applicationFacts",
+                "description": "Give a short summary of the facts you want the court to consider. You do not need to use any special wording. The key is to be clear about what you mean and why you are asking the court to make the order. If you are applying to change, suspend or cancel an order made in your absence, you must explain why you did not file a reply or attend court when required, why the order should be made and the reasons for any delay in making this application.",
+                "isRequired": true,
+                "title": "The `facts` on which this application is based are as follows:",
+                "visible": false,
+                "visibleIf": "!{IncludesFoaeaa}"
+            },       
             {            
                 "type":"infotext",
                 "name":"noticeDescription1",
                 "title":"<b class='sv_main sv_q_title'>The `facts` on which this application is based must be described for the court in an `affidavit`</b>",
                 "body": "Your application under section 7 of the <a href='https://laws-lois.justice.gc.ca/eng/acts/f-1.4/page-1.html#h-221520' target='_blank'>Family Orders and Agreements Enforcement Assistance Act (Canada)</a> requesting that a court authorize an official of the court to make an application under section 12 of the Act for the release of information must be supported by an affidavit that includes the information set out under section 8 (1)(a) or 9 (1)(a) of that Act, as applicable.<br>To draft an affidavit using this service, select Other family court forms(s) on the Getting Started page, then select <a href='https://www2.gov.bc.ca/assets/gov/law-crime-and-justice/courthouse-services/court-files-records/court-forms/family/pfa762.pdf?forcedownload=true' target='_blank'>Affidavit – General Form 45</a>.",
                 "titleLocation":"hidden",
-                "messageStyle":"inline"
+                "messageStyle":"inline",
+                "visible": false,
+                "visibleIf": "{IncludesFoaeaa}"
             }
           ]
         }
diff --git a/web/src/components/steps/caseMgmt/orderTypesCM.ts b/web/src/components/steps/caseMgmt/orderTypesCM.ts
index 018f2f16e..3f1460d0c 100644
--- a/web/src/components/steps/caseMgmt/orderTypesCM.ts
+++ b/web/src/components/steps/caseMgmt/orderTypesCM.ts
@@ -6,9 +6,9 @@ export function getOrderTypeCM(form: string, toggle = false, toggleNext = false)
     const stPgNo: stepsAndPagesNumberInfoType = store.state.Application.stPgNo;   
     const p = stPgNo.CM
     const orders = {
-        'changeServiceRequirement':{turquoise: true,  pages:[p.WithoutNoticeOrAttendance, p.ChangingOrCancellingAServiceOrNotice,p.ApplicationUnderFOAEAA],                              text:'Changing or cancelling the requirement for service or notice to a person, including allowing another method for the service of a document'},
-        'changeRequirement':       {turquoise: true,  pages:[p.WithoutNoticeOrAttendance, p.ChangingOrCancellingAnyOtherRequirement,p.ApplicationUnderFOAEAA],                           text:'Changing or cancelling `any other requirement` under the rules, including a time limit'},
-        'remoteAttendance':        {turquoise: true,  pages:[p.WithoutNoticeOrAttendance, p.AttendanceUsingElectronicCommunication,p.ApplicationUnderFOAEAA],                            text:'Attending at a court appearance using another method of attendance, including in-person, by telephone, video or other electronic means'},
+        'changeServiceRequirement':{turquoise: true,  pages:[p.WithoutNoticeOrAttendance, p.ChangingOrCancellingAServiceOrNotice],                              text:'Changing or cancelling the requirement for service or notice to a person, including allowing another method for the service of a document'},
+        'changeRequirement':       {turquoise: true,  pages:[p.WithoutNoticeOrAttendance, p.ChangingOrCancellingAnyOtherRequirement],                           text:'Changing or cancelling `any other requirement` under the rules, including a time limit'},
+        'remoteAttendance':        {turquoise: true,  pages:[p.WithoutNoticeOrAttendance, p.AttendanceUsingElectronicCommunication],                            text:'Attending at a court appearance using another method of attendance, including in-person, by telephone, video or other electronic means'},
         'adjourningAppearance':    {turquoise: false, pages:[p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder],                                                                       text:'Adjourning a court appearance'},
         'fileTransfer':            {turquoise: false, pages:[p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder],                                                                       text:'Transferring a court file to another registry'},
         'settingTime':             {turquoise: false, pages:[p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder],                                                                       text:'Setting a specified time to file and exchange information or evidence, including a financial statement in Form 4'},
@@ -24,7 +24,7 @@ export function getOrderTypeCM(form: string, toggle = false, toggleNext = false)
         'otherProvinceOrder':      {turquoise: true,  pages:[p.WithoutNoticeOrAttendance, p.RecognizingAnOrderFromOutsideBc, p.ContactInformationOtherParty,p.ApplicationUnderFOAEAA],   text:'Recognizing an order from outside British Columbia (other than a support order)'},
         'subpoenaCancelation':     {turquoise: false, pages:[p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder],                                                                       text:'Cancelling a subpoena'},
         'section33':               {turquoise: false, pages:[p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder],                                                                       text:'Requiring that a parentage test be taken under section 33 of the Family Law Act'},
-        'section242':              {turquoise: true,  pages:[p.WithoutNoticeOrAttendance, p.RequiringAccessToInformation,p.ApplicationUnderFOAEAA],                                      text:'Requiring access to information in accordance with section 242 of the Family Law Act'},
+        'section242':              {turquoise: true,  pages:[p.WithoutNoticeOrAttendance, p.RequiringAccessToInformation],                                      text:'Requiring access to information in accordance with section 242 of the Family Law Act'},
         'section12':               {turquoise: true,  pages:[p.WithoutNoticeOrAttendance,p.ApplicationUnderFOAEAA],                                                                      text:"Authorizing an official of the court to make an application under section 12 of the <a href='https://laws-lois.justice.gc.ca/eng/acts/f-1.4/page-1.html#h-221520' target='_blank'>Family Orders and Agreements Enforcement Assistance Act (Canada)</a> for the release of information for the establishment or variation of a support provision or the enforcement of a family provision"}
     }
 
diff --git a/web/src/components/steps/caseMgmt/reviewCM/pdf/Form10Layout.vue b/web/src/components/steps/caseMgmt/reviewCM/pdf/Form10Layout.vue
index 80bdc4532..3535c85c3 100644
--- a/web/src/components/steps/caseMgmt/reviewCM/pdf/Form10Layout.vue
+++ b/web/src/components/steps/caseMgmt/reviewCM/pdf/Form10Layout.vue
@@ -285,7 +285,14 @@
                         any delay in making this application.</i>
                 </div>
 
-                <div class="answerbox">Please see the affidavit filed in support of this application.</div>
+                <div class="answerbox" v-if="form10Info.caseList.includes('section12')">
+                    Please see the affidavit filed in support of this application.
+                </div>
+                <div v-if="!form10Info.caseList.includes('section12') && form10Info.orderFacts" class="answerbox">
+                    {{form10Info.orderFacts}}
+                </div>
+                <div v-else-if="!form10Info.caseList.includes('section12') && !form10Info.orderFacts" style="margin-bottom:3rem;"></div>
+
                          
             </section>
         </div>   
@@ -455,7 +462,10 @@ export default class Form10Layout extends Vue {
         if (this.result?.aboutCaseManagementOrderSurvey){
             const aboutOrderData: aboutCaseManagementOrderSurveyDataInfoType = this.result.aboutCaseManagementOrderSurvey;
             form10Info.orderDetails = aboutOrderData.orderDescription;
-            //form10Info.orderFacts = aboutOrderData.applicationFacts;
+            if (!form10Info.caseList.includes('section12')){
+                form10Info.orderFacts = aboutOrderData.applicationFacts;
+            }
+            
         }  
         
         if (this.result?.cmNoticeSurvey){
diff --git a/web/src/filters/index.ts b/web/src/filters/index.ts
index 2f4b482d5..fd2dd2c73 100644
--- a/web/src/filters/index.ts
+++ b/web/src/filters/index.ts
@@ -626,7 +626,7 @@ Vue.filter('extractRequiredDocuments', function(questions, type){
 		if(stepCM.pages[stPgCM.RecognizingAnOrderFromOutsideBc].active && questions.recognizingAnOrderFromOutsideBcSurvey?.outsideBcOrder == 'y')
 			requiredDocuments.push("Certified copy of the order from outside BC")
 
-        if(stepCM.pages[stPgCM.WithoutNoticeOrAttendance].active){
+        if(stepCM.pages[stPgCM.WithoutNoticeOrAttendance].active && questions.cmQuestionnaireSurvey?.includes("section12")){
 
             if(questions.withoutNoticeOrAttendanceSurvey?.needWithoutNotice == 'n'){
                 requiredDocuments.push("Affidavit - General Form 45")

From f4cfb383f0abd986a785f2fbd3a1ca04957d2c59 Mon Sep 17 00:00:00 2001
From: marzmehr <mars.mehr@gmail.com>
Date: Wed, 15 Nov 2023 17:24:46 -0800
Subject: [PATCH 08/10] PFCF-439: updates based on new requirements

---
 .../steps/caseMgmt/AboutCaseManagementOrder.vue    |  7 ++++++-
 .../forms/about-case-management-order.json         |  6 +++---
 web/src/components/steps/caseMgmt/orderTypesCM.ts  |  4 +++-
 .../steps/caseMgmt/reviewCM/pdf/Form10Layout.vue   | 14 ++++++++++----
 web/src/filters/index.ts                           |  2 +-
 5 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/web/src/components/steps/caseMgmt/AboutCaseManagementOrder.vue b/web/src/components/steps/caseMgmt/AboutCaseManagementOrder.vue
index a960b5f5c..5f34cace6 100644
--- a/web/src/components/steps/caseMgmt/AboutCaseManagementOrder.vue
+++ b/web/src/components/steps/caseMgmt/AboutCaseManagementOrder.vue
@@ -80,8 +80,13 @@ export default class AboutCaseManagementOrder extends Vue {
         if (this.step.result?.cmQuestionnaireSurvey?.data){
             this.listOfIssuesDescription = this.getDescription();
             this.survey.setVariable('listOfIssuesDescription', this.listOfIssuesDescription);
-            const issues = this.step.result.cmQuestionnaireSurvey.data;
+            const issues = this.step.result.cmQuestionnaireSurvey.data;            
             this.survey.setVariable('IncludesFoaeaa', issues.includes("section12"));
+            if (issues.length == 1 && issues.includes("section12")){
+                this.survey.setVariable('IncludesFoaeaaOnly', true);
+            } else {
+                this.survey.setVariable('IncludesFoaeaaOnly', false);
+            }
         }
         
         Vue.filter('setSurveyProgress')(this.survey, this.currentStep, this.currentPage, 50, false);
diff --git a/web/src/components/steps/caseMgmt/forms/about-case-management-order.json b/web/src/components/steps/caseMgmt/forms/about-case-management-order.json
index 149fc99cd..f8876e885 100644
--- a/web/src/components/steps/caseMgmt/forms/about-case-management-order.json
+++ b/web/src/components/steps/caseMgmt/forms/about-case-management-order.json
@@ -37,12 +37,12 @@
                 "isRequired": true,
                 "title": "The `facts` on which this application is based are as follows:",
                 "visible": false,
-                "visibleIf": "!{IncludesFoaeaa}"
+                "visibleIf": "!{IncludesFoaeaaOnly}"
             },       
             {            
-                "type":"infotext",
+                "type":"infotexttitle",
                 "name":"noticeDescription1",
-                "title":"<b class='sv_main sv_q_title'>The `facts` on which this application is based must be described for the court in an `affidavit`</b>",
+                "title":"",
                 "body": "Your application under section 7 of the <a href='https://laws-lois.justice.gc.ca/eng/acts/f-1.4/page-1.html#h-221520' target='_blank'>Family Orders and Agreements Enforcement Assistance Act (Canada)</a> requesting that a court authorize an official of the court to make an application under section 12 of the Act for the release of information must be supported by an affidavit that includes the information set out under section 8 (1)(a) or 9 (1)(a) of that Act, as applicable.<br>To draft an affidavit using this service, select Other family court forms(s) on the Getting Started page, then select <a href='https://www2.gov.bc.ca/assets/gov/law-crime-and-justice/courthouse-services/court-files-records/court-forms/family/pfa762.pdf?forcedownload=true' target='_blank'>Affidavit – General Form 45</a>.",
                 "titleLocation":"hidden",
                 "messageStyle":"inline",
diff --git a/web/src/components/steps/caseMgmt/orderTypesCM.ts b/web/src/components/steps/caseMgmt/orderTypesCM.ts
index 3f1460d0c..4e6f5cefe 100644
--- a/web/src/components/steps/caseMgmt/orderTypesCM.ts
+++ b/web/src/components/steps/caseMgmt/orderTypesCM.ts
@@ -25,7 +25,7 @@ export function getOrderTypeCM(form: string, toggle = false, toggleNext = false)
         'subpoenaCancelation':     {turquoise: false, pages:[p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder],                                                                       text:'Cancelling a subpoena'},
         'section33':               {turquoise: false, pages:[p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder],                                                                       text:'Requiring that a parentage test be taken under section 33 of the Family Law Act'},
         'section242':              {turquoise: true,  pages:[p.WithoutNoticeOrAttendance, p.RequiringAccessToInformation],                                      text:'Requiring access to information in accordance with section 242 of the Family Law Act'},
-        'section12':               {turquoise: true,  pages:[p.WithoutNoticeOrAttendance,p.ApplicationUnderFOAEAA],                                                                      text:"Authorizing an official of the court to make an application under section 12 of the <a href='https://laws-lois.justice.gc.ca/eng/acts/f-1.4/page-1.html#h-221520' target='_blank'>Family Orders and Agreements Enforcement Assistance Act (Canada)</a> for the release of information for the establishment or variation of a support provision or the enforcement of a family provision"}
+        'section12':               {turquoise: false, pages:[p.ApplicationUnderFOAEAA],                                                                      text:"Authorizing an official of the court to make an application under section 12 of the <a href='https://laws-lois.justice.gc.ca/eng/acts/f-1.4/page-1.html#h-221520' target='_blank'>Family Orders and Agreements Enforcement Assistance Act (Canada)</a> for the release of information for the establishment or variation of a support provision or the enforcement of a family provision"}
     }
 
     if(form){
@@ -37,6 +37,8 @@ export function getOrderTypeCM(form: string, toggle = false, toggleNext = false)
                 togglePages([order.pages[2]], toggleNext && cmOnly )
                 togglePages([order.pages[1]], toggleNext )
                 togglePages([order.pages[0]], true)
+            } else if(form == 'section12'){                
+                togglePages([order.pages], toggleNext )
             }
             else if(order.turquoise){               
                 togglePages(order.pages, toggleNext )
diff --git a/web/src/components/steps/caseMgmt/reviewCM/pdf/Form10Layout.vue b/web/src/components/steps/caseMgmt/reviewCM/pdf/Form10Layout.vue
index 3535c85c3..41971b93f 100644
--- a/web/src/components/steps/caseMgmt/reviewCM/pdf/Form10Layout.vue
+++ b/web/src/components/steps/caseMgmt/reviewCM/pdf/Form10Layout.vue
@@ -285,13 +285,13 @@
                         any delay in making this application.</i>
                 </div>
 
-                <div class="answerbox" v-if="form10Info.caseList.includes('section12')">
+                <div class="answerbox" v-if="includesFoaeaaOnly">
                     Please see the affidavit filed in support of this application.
                 </div>
-                <div v-if="!form10Info.caseList.includes('section12') && form10Info.orderFacts" class="answerbox">
+                <div v-if="!includesFoaeaaOnly && form10Info.orderFacts" class="answerbox">
                     {{form10Info.orderFacts}}
                 </div>
-                <div v-else-if="!form10Info.caseList.includes('section12') && !form10Info.orderFacts" style="margin-bottom:3rem;"></div>
+                <div v-else-if="!includesFoaeaaOnly && !form10Info.orderFacts" style="margin-bottom:3rem;"></div>
 
                          
             </section>
@@ -342,6 +342,7 @@ export default class Form10Layout extends Vue {
     childrenInfo: childrenInfoSurveyInfoType[] = []; 
     form10Info = {} as form10DataInfoType;  
     filingLocationReason = ''; 
+    includesFoaeaaOnly = false;
     
     childrenFields=[
         {key:"fullName",               label:"Child's full name",                tdClass:"border-dark text-center align-middle", thClass:"border-dark text-center align-middle", thStyle:"font-size:8pt; width:30%;"},
@@ -462,8 +463,13 @@ export default class Form10Layout extends Vue {
         if (this.result?.aboutCaseManagementOrderSurvey){
             const aboutOrderData: aboutCaseManagementOrderSurveyDataInfoType = this.result.aboutCaseManagementOrderSurvey;
             form10Info.orderDetails = aboutOrderData.orderDescription;
-            if (!form10Info.caseList.includes('section12')){
+
+            if (form10Info.caseList.length == 1 && form10Info.caseList.includes("section12")){
+                form10Info.orderFacts = '';
+                this.includesFoaeaaOnly = true;
+            } else {
                 form10Info.orderFacts = aboutOrderData.applicationFacts;
+                this.includesFoaeaaOnly = false;
             }
             
         }  
diff --git a/web/src/filters/index.ts b/web/src/filters/index.ts
index fd2dd2c73..d49ddbbbb 100644
--- a/web/src/filters/index.ts
+++ b/web/src/filters/index.ts
@@ -16,7 +16,7 @@ Vue.filter('get-current-version', function(){
 	//___________________________
     //___________________________
     //___________________________NEW VERSION goes here _________________
-    const CURRENT_VERSION = "1.2.18";
+    const CURRENT_VERSION = "1.2.19";
     //__________________________
     //___________________________
     //___________________________

From 58185e975cd22fd4995174f9b7faf945708198b5 Mon Sep 17 00:00:00 2001
From: marzmehr <mars.mehr@gmail.com>
Date: Wed, 15 Nov 2023 20:31:01 -0800
Subject: [PATCH 09/10] PFCF-439: updates based on new requirements

---
 .../components/steps/caseMgmt/AboutCaseManagementOrder.vue | 5 ++++-
 web/src/components/steps/caseMgmt/CmQuestionnaire.vue      | 3 ++-
 .../steps/caseMgmt/forms/about-case-management-order.json  | 2 +-
 .../steps/caseMgmt/forms/application-under-foaeaa.json     | 2 +-
 web/src/components/steps/caseMgmt/orderTypesCM.ts          | 7 ++++---
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/web/src/components/steps/caseMgmt/AboutCaseManagementOrder.vue b/web/src/components/steps/caseMgmt/AboutCaseManagementOrder.vue
index 5f34cace6..70df882b9 100644
--- a/web/src/components/steps/caseMgmt/AboutCaseManagementOrder.vue
+++ b/web/src/components/steps/caseMgmt/AboutCaseManagementOrder.vue
@@ -108,7 +108,10 @@ export default class AboutCaseManagementOrder extends Vue {
                 
                 const order = getOrderTypeCM(cmType)
                 
-                if((order?.turquoise && !withoutNotice) || (order?.turquoise == false)){
+                if((order?.turquoise && !withoutNotice) || 
+                   (order?.turquoise == false) ||
+                   (cmType == 'section12')
+                ){
                     listOfIssues.push('<li>'+order.text+'</li>')
                 } 
                 
diff --git a/web/src/components/steps/caseMgmt/CmQuestionnaire.vue b/web/src/components/steps/caseMgmt/CmQuestionnaire.vue
index 1075a005e..3e055fd7e 100644
--- a/web/src/components/steps/caseMgmt/CmQuestionnaire.vue
+++ b/web/src/components/steps/caseMgmt/CmQuestionnaire.vue
@@ -179,11 +179,12 @@ export default class CmQuestionnaire extends Vue {
                     Vue.filter('setSurveyProgress')(null, this.currentStep, p.RequiringAccessToInformation, 0, false);
                     Vue.filter('setSurveyProgress')(null, this.currentStep, p.RecognizingAnOrderFromOutsideBc, 0, false);                                                       
                     Vue.filter('setSurveyProgress')(null, this.currentStep, p.ContactInformationOtherParty, 0, false);
+                    Vue.filter('setSurveyProgress')(null, this.currentStep, p.ApplicationUnderFOAEAA, 0, false);
                     Vue.filter('setSurveyProgress')(null, this.currentStep, p.ReviewYourAnswersCM, 0, false);
                 }
 
                 if (this.step.result?.withoutNoticeOrAttendanceSurvey?.data?.needWithoutNotice) {
-                    const needWithoutNotice = this.step.result.withoutNoticeOrAttendanceSurvey.data.needWithoutNotice
+                    const needWithoutNotice = this.$store.state.Application.steps[this.currentStep].pages[p.WithoutNoticeOrAttendance]?.active? this.step.result.withoutNoticeOrAttendanceSurvey.data.needWithoutNotice : ''                    
                     if (needWithoutNotice == 'n') {
                         togglePages([p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder], true, this.currentStep); 
                     } else{                              
diff --git a/web/src/components/steps/caseMgmt/forms/about-case-management-order.json b/web/src/components/steps/caseMgmt/forms/about-case-management-order.json
index f8876e885..01fc1ff9f 100644
--- a/web/src/components/steps/caseMgmt/forms/about-case-management-order.json
+++ b/web/src/components/steps/caseMgmt/forms/about-case-management-order.json
@@ -43,7 +43,7 @@
                 "type":"infotexttitle",
                 "name":"noticeDescription1",
                 "title":"",
-                "body": "Your application under section 7 of the <a href='https://laws-lois.justice.gc.ca/eng/acts/f-1.4/page-1.html#h-221520' target='_blank'>Family Orders and Agreements Enforcement Assistance Act (Canada)</a> requesting that a court authorize an official of the court to make an application under section 12 of the Act for the release of information must be supported by an affidavit that includes the information set out under section 8 (1)(a) or 9 (1)(a) of that Act, as applicable.<br>To draft an affidavit using this service, select Other family court forms(s) on the Getting Started page, then select <a href='https://www2.gov.bc.ca/assets/gov/law-crime-and-justice/courthouse-services/court-files-records/court-forms/family/pfa762.pdf?forcedownload=true' target='_blank'>Affidavit – General Form 45</a>.",
+                "body": "<b>Your application under</b> section 7 of the <a href='https://laws-lois.justice.gc.ca/eng/acts/f-1.4/page-1.html#h-221520' target='_blank'>Family Orders and Agreements Enforcement Assistance Act (Canada)</a> requesting that a court authorize an official of the court to make an application under section 12 of the Act for the release of information <b>must</b> be supported by an affidavit that includes the information set out under section 8 (1)(a) or 9 (1)(a) of that Act, as applicable.<br>To draft an affidavit using this service, select Other family court forms(s) on the Getting Started page, then select <a href='https://www2.gov.bc.ca/assets/gov/law-crime-and-justice/courthouse-services/court-files-records/court-forms/family/pfa762.pdf?forcedownload=true' target='_blank'>Affidavit – General Form 45</a>.",
                 "titleLocation":"hidden",
                 "messageStyle":"inline",
                 "visible": false,
diff --git a/web/src/components/steps/caseMgmt/forms/application-under-foaeaa.json b/web/src/components/steps/caseMgmt/forms/application-under-foaeaa.json
index 162556b8f..7c0bbe839 100644
--- a/web/src/components/steps/caseMgmt/forms/application-under-foaeaa.json
+++ b/web/src/components/steps/caseMgmt/forms/application-under-foaeaa.json
@@ -27,7 +27,7 @@
                 "type":"infotext",
                 "name":"affidavitDescription1",
                 "title":"<b class='sv_main sv_q_title'>The `facts` on which this application is based must be described for the court in an `affidavit`</b>",
-                "body": "Your application under section 7 of the <a href='https://laws-lois.justice.gc.ca/eng/acts/f-1.4/page-1.html#h-221520' target='_blank'>Family Orders and Agreements Enforcement Assistance Act (Canada)</a> requesting that a court authorize an official of the court to make an application under section 12 of the Act for the release of information must be supported by an affidavit that includes the information set out under section 8 (1)(a), (2) and (3) or 9 (1)(a), (2) and (3) of that Act, as applicable.<br>To draft an affidavit using this service, select Other family court forms(s) on the Getting Started page, then select <a href='https://www2.gov.bc.ca/assets/gov/law-crime-and-justice/courthouse-services/court-files-records/court-forms/family/pfa762.pdf?forcedownload=true' target='_blank'>Affidavit – General Form 45</a>.",
+                "body": "<b>Your application under</b> section 7 of the <a href='https://laws-lois.justice.gc.ca/eng/acts/f-1.4/page-1.html#h-221520' target='_blank'>Family Orders and Agreements Enforcement Assistance Act (Canada)</a> requesting that a court authorize an official of the court to make an application under section 12 of the Act for the release of information <b>must</b> be supported by an affidavit that includes the information set out under section 8 (1)(a), (2) and (3) or 9 (1)(a), (2) and (3) of that Act, as applicable.<br>To draft an affidavit using this service, select Other family court forms(s) on the Getting Started page, then select <a href='https://www2.gov.bc.ca/assets/gov/law-crime-and-justice/courthouse-services/court-files-records/court-forms/family/pfa762.pdf?forcedownload=true' target='_blank'>Affidavit – General Form 45</a>.",
                 "titleLocation":"hidden",
                 "messageStyle":"inline"
             },
diff --git a/web/src/components/steps/caseMgmt/orderTypesCM.ts b/web/src/components/steps/caseMgmt/orderTypesCM.ts
index 4e6f5cefe..c0dc9b243 100644
--- a/web/src/components/steps/caseMgmt/orderTypesCM.ts
+++ b/web/src/components/steps/caseMgmt/orderTypesCM.ts
@@ -25,7 +25,7 @@ export function getOrderTypeCM(form: string, toggle = false, toggleNext = false)
         'subpoenaCancelation':     {turquoise: false, pages:[p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder],                                                                       text:'Cancelling a subpoena'},
         'section33':               {turquoise: false, pages:[p.ByConsent, p.CmNotice, p.AboutCaseManagementOrder],                                                                       text:'Requiring that a parentage test be taken under section 33 of the Family Law Act'},
         'section242':              {turquoise: true,  pages:[p.WithoutNoticeOrAttendance, p.RequiringAccessToInformation],                                      text:'Requiring access to information in accordance with section 242 of the Family Law Act'},
-        'section12':               {turquoise: false, pages:[p.ApplicationUnderFOAEAA],                                                                      text:"Authorizing an official of the court to make an application under section 12 of the <a href='https://laws-lois.justice.gc.ca/eng/acts/f-1.4/page-1.html#h-221520' target='_blank'>Family Orders and Agreements Enforcement Assistance Act (Canada)</a> for the release of information for the establishment or variation of a support provision or the enforcement of a family provision"}
+        'section12':               {turquoise: true,  pages:[p.ApplicationUnderFOAEAA],                                                                      text:"Authorizing an official of the court to make an application under section 12 of the <a href='https://laws-lois.justice.gc.ca/eng/acts/f-1.4/page-1.html#h-221520' target='_blank'>Family Orders and Agreements Enforcement Assistance Act (Canada)</a> for the release of information for the establishment or variation of a support provision or the enforcement of a family provision"}
     }
 
     if(form){
@@ -37,8 +37,9 @@ export function getOrderTypeCM(form: string, toggle = false, toggleNext = false)
                 togglePages([order.pages[2]], toggleNext && cmOnly )
                 togglePages([order.pages[1]], toggleNext )
                 togglePages([order.pages[0]], true)
-            } else if(form == 'section12'){                
-                togglePages([order.pages], toggleNext )
+            } 
+            else if(form == 'section12'){                
+                togglePages(order.pages, toggleNext )
             }
             else if(order.turquoise){               
                 togglePages(order.pages, toggleNext )

From 23817dc26d5b0730203655eba4f6d038ed2ed8fa Mon Sep 17 00:00:00 2001
From: marzmehr <mars.mehr@gmail.com>
Date: Thu, 16 Nov 2023 13:56:31 -0800
Subject: [PATCH 10/10] PFCF-439: applying changes based on further
 requirements

---
 .../components/steps/caseMgmt/CmQuestionnaire.vue   |  6 +++++-
 web/src/components/steps/caseMgmt/orderTypesCM.ts   |  4 ++--
 web/src/filters/index.ts                            | 13 +++++++------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/web/src/components/steps/caseMgmt/CmQuestionnaire.vue b/web/src/components/steps/caseMgmt/CmQuestionnaire.vue
index 3e055fd7e..11d7dd6c5 100644
--- a/web/src/components/steps/caseMgmt/CmQuestionnaire.vue
+++ b/web/src/components/steps/caseMgmt/CmQuestionnaire.vue
@@ -161,7 +161,11 @@ export default class CmQuestionnaire extends Vue {
                 togglePages([p.OtherPersons, p.CmChildrenInfo, p.ReviewYourAnswersCM], true, this.currentStep);                              
                 
                 for(const form of this.selectedCaseManagement)
-                    getOrderTypeCM(form,true);           
+                    getOrderTypeCM(form,true);   
+                
+                if (this.selectedCaseManagement.length == 1 && this.selectedCaseManagement.includes("section12")){
+                    togglePages([p.WithoutNoticeOrAttendance], true, this.currentStep);
+                }
         
                 Vue.filter('setSurveyProgress')(null, this.currentStep, p.ReviewYourAnswersCM, 0, false);
 
diff --git a/web/src/components/steps/caseMgmt/orderTypesCM.ts b/web/src/components/steps/caseMgmt/orderTypesCM.ts
index c0dc9b243..2c637e56d 100644
--- a/web/src/components/steps/caseMgmt/orderTypesCM.ts
+++ b/web/src/components/steps/caseMgmt/orderTypesCM.ts
@@ -41,9 +41,9 @@ export function getOrderTypeCM(form: string, toggle = false, toggleNext = false)
             else if(form == 'section12'){                
                 togglePages(order.pages, toggleNext )
             }
-            else if(order.turquoise){               
+            else if(order.turquoise){
                 togglePages(order.pages, toggleNext )
-                togglePages(order.pages.splice(0,1), true)                
+                togglePages(order.pages.splice(0,1), true)        
             }
             else
                 togglePages(order.pages, true)
diff --git a/web/src/filters/index.ts b/web/src/filters/index.ts
index d49ddbbbb..0f3208124 100644
--- a/web/src/filters/index.ts
+++ b/web/src/filters/index.ts
@@ -626,15 +626,16 @@ Vue.filter('extractRequiredDocuments', function(questions, type){
 		if(stepCM.pages[stPgCM.RecognizingAnOrderFromOutsideBc].active && questions.recognizingAnOrderFromOutsideBcSurvey?.outsideBcOrder == 'y')
 			requiredDocuments.push("Certified copy of the order from outside BC")
 
-        if(stepCM.pages[stPgCM.WithoutNoticeOrAttendance].active && questions.cmQuestionnaireSurvey?.includes("section12")){
+        if(questions.cmQuestionnaireSurvey?.includes("section12")){
 
-            if(questions.withoutNoticeOrAttendanceSurvey?.needWithoutNotice == 'n'){
-                requiredDocuments.push("Affidavit - General Form 45")
-            } else if (questions.withoutNoticeOrAttendanceSurvey?.needWithoutNotice == 'y' 
-                        && stepCM.pages[stPgCM.ApplicationUnderFOAEAA].active
-                        && questions.applicationUnderFOAEAASurvey?.criminalRecordCheckAcknowledgement.includes('I understand')){
+            if (stepCM.pages[stPgCM.WithoutNoticeOrAttendance].active
+                && questions.withoutNoticeOrAttendanceSurvey?.needWithoutNotice == 'y' 
+                && stepCM.pages[stPgCM.ApplicationUnderFOAEAA].active
+                && questions.applicationUnderFOAEAASurvey?.criminalRecordCheckAcknowledgement.includes('I understand')){
                 requiredDocuments.push("Affidavit - General Form 45")
                 requiredDocuments.push("Criminal Record Check")
+            } else {
+                requiredDocuments.push("Affidavit - General Form 45");
             }
         }
 	}