Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PFCF-469: Confirm Check fix and signatures on same page #773

Merged
merged 2 commits into from
Sep 11, 2024
Merged

PFCF-469: Confirm Check fix and signatures on same page #773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c38cbd
PFCF-469: Confirm Check fix and signatures on same page
JonTaylorBCGov2 Sep 10, 2024
72923b0
PFCF-476: Adjust capitalization
JonTaylorBCGov2 Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions web/src/components/steps/discontinuance/reviewNDT/pdf/Form50Layout.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
</div>
</section>

<div style="margin-top: 1rem;"></div>
<div style="page-break-after:always;">&nbsp;</div>

<!-- <Part 3> -->
<div style="background: #626262; color: white; font-size: 13pt; width: 80%;">
Expand Down Expand Up @@ -361,6 +361,8 @@
you require the permission of the court to discontinue it [Rule 191 (2)(b) & (3)(b)].</div>
</div>

<div style="page-break-after:always;">&nbsp;</div>

<!-- <Part 5> -->
<div style="background: #626262; color: white; font-size: 13pt; width: 80%;">
<b>Part 5 | Consent of the parties–Complete this part only if consent is required based on your responses in Part 4.</b>
Expand Down Expand Up @@ -489,7 +491,6 @@ export default class Form50Layout extends Vue {
this.getNoticeDiscontinuanceInfo();
this.getDiscontinuanceInfo();
this.existingFileNumber = getLocationInfo(this.result.otherFormsFilingLocationSurvey);
this.acknowledge = this.result.addressChangeNoticeSurvey?.acknowledgement?.length>0;
}

public getNoticeDiscontinuanceInfo(){
Expand All @@ -498,7 +499,8 @@ export default class Form50Layout extends Vue {

let noticeDiscontinuance = {} as noticeDiscontinuanceDataInfoType;

noticeDiscontinuance = this.result.noticeDiscontinuanceSurvey;
noticeDiscontinuance = this.result.noticeDiscontinuanceSurvey;
this.acknowledge = noticeDiscontinuance.ExplanationServe == 'confirm';
this.listOfDiscontinuanceDocs = noticeDiscontinuance.discontinuanceDocs?noticeDiscontinuance.discontinuanceDocs:[];

this.yourInfo = getYourInformationResults(noticeDiscontinuance);
Expand Down
16 changes: 8 additions & 8 deletions web/src/components/steps/noticeLawyerChild/reviewNLC/pdf/Form40Layout.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,36 +127,36 @@
<i>Select all options that apply</i>
<div class="marginleft2p5vue" style="margin:0.25rem 0 0 1.5rem;">
<check-box class="marginleft" checkbox="" shift="5" shiftmark="0" inline="inline" boxMargin="0" style="display:inline;"
:check="listOfIssues.includes('Parenting Arrangements')?'yes':''" text="parenting arrangements"/>
:check="listOfIssues.includes('Parenting Arrangements')?'yes':''" text="Parenting arrangements"/>
</div>
<div class="marginleft2p5vue" style="margin:0.25rem 0 0 1.5rem;">
<check-box class="marginleft" checkbox="" shift="5" shiftmark="0" inline="inline" boxMargin="0" style="display:inline;"
:check="listOfIssues.includes('Child support')?'yes':''" text="child support"/>
:check="listOfIssues.includes('Child support')?'yes':''" text="Child support"/>
</div>
<div class="marginleft2p5vue" style="margin:0.25rem 0 0 1.5rem;">
<check-box class="marginleft" checkbox="" shift="5" shiftmark="0" inline="inline" boxMargin="0" style="display:inline;"
:check="listOfIssues.includes('Contact with a child')?'yes':''" text="contact with a child"/>
:check="listOfIssues.includes('Contact with a child')?'yes':''" text="Contact with a child"/>
</div>
<div class="marginleft2p5vue" style="margin:0.25rem 0 0 1.5rem;">
<check-box class="marginleft" checkbox="" shift="5" shiftmark="0" inline="inline" boxMargin="0" style="display:inline;"
:check="listOfIssues.includes('Guardianship of a child')?'yes':''" text="guardianship of a child"/>
:check="listOfIssues.includes('Guardianship of a child')?'yes':''" text="Guardianship of a child"/>
</div>
<div class="marginleft2p5vue" style="margin:0.25rem 0 0 1.5rem;">
<check-box class="marginleft" checkbox="" shift="5" shiftmark="0" inline="inline" boxMargin="0" style="display:inline;"
:check="listOfIssues.includes('Protection order')?'yes':''" text="protection order"/>
:check="listOfIssues.includes('Protection order')?'yes':''" text="Protection order"/>
</div>
<div class="marginleft2p5vue" style="margin:0.25rem 0 0 1.5rem;">
<check-box class="marginleft" checkbox="" shift="5" shiftmark="0" inline="inline" boxMargin="0" style="display:inline;"
:check="listOfIssues.includes('Priority Parenting Matter')?'yes':''" text="priority parenting matter"/>
:check="listOfIssues.includes('Priority Parenting Matter')?'yes':''" text="Priority parenting matter"/>
</div>
<div class="marginleft2p5vue" style="margin:0.25rem 0 0 1.5rem;">
<check-box class="marginleft" checkbox="" shift="5" shiftmark="0" inline="inline" boxMargin="0" style="display:inline;"
:check="listOfIssues.includes('Relocation')?'yes':''" text="relocation"/>
:check="listOfIssues.includes('Relocation')?'yes':''" text="Relocation"/>
</div>
<div class="marginleft2p5vue" style="margin:0.25rem 0 0 1.5rem;">
<check-box class="marginleft" checkbox="" shift="5" shiftmark="0" inline="inline" boxMargin="0" style="display:inline;"
:check="listOfIssues.includes('other')?'yes':''"
text="other <i>(specify)</i>:"/>
text="Other <i>(specify)</i>:"/>
<div style="margin-top: 0.5rem;"></div>
<div style="margin-left: 28px; background-color: #d6d6d6;" class="answerbox">{{otherIssue ? otherIssue : '&nbsp;'}}</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions web/src/types/Application/Discontinuance/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ export interface noticeDiscontinuanceDataInfoType {
Filed?: string;
ApplicantName?: nameInfoType;
otherPartyInfoDis?: noticeDiscontinuanceOtherPartyInfoType[];
ExplanationServe?: string;
discontinuanceDocs?: string[];
}

Expand Down
Loading