Skip to content

Commit

Permalink
Merge pull request #223 from bcgov/feature/fe-wording-changes
Browse files Browse the repository at this point in the history
FE Wording Changes
  • Loading branch information
kyle1morel authored Dec 18, 2024
2 parents e13963d + 69169a6 commit d8e676f
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 24 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ const {
>
Your enquiry has been successfully submitted.
</Message>
<h3>Confirmation ID: {{ assignedActivityId }}</h3>
<h3>Enquiry ID: {{ assignedActivityId }}</h3>
<div>
Your submission will be reviewed and you will be contacted by your Housing Navigator in 2 business days. Please
check your email for the confirmation email and keep the confirmation ID for future reference.
check your email for the confirmation email and keep the enquiry ID for future reference.
</div>
<div
v-if="showHomeLink"
Expand Down
10 changes: 5 additions & 5 deletions frontend/src/components/housing/enquiry/EnquiryIntakeForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ const formSchema = object({
isRelated: string().required().oneOf(YES_NO_LIST).label('Related to existing application'),
relatedActivityId: string().when('isRelated', {
is: (isRelated: string) => isRelated === BasicResponse.YES,
then: (schema) => schema.required().max(255).label('Confirmation ID'),
otherwise: (schema) => schema.notRequired().label('Confirmation ID')
then: (schema) => schema.required().max(255).label('Project ID'),
otherwise: (schema) => schema.notRequired().label('Project ID')
}),
enquiryDescription: string().required().label('Enquiry'),
applyForPermitConnect: string()
Expand Down Expand Up @@ -341,11 +341,11 @@ onBeforeMount(async () => {
<template #title>
<div class="flex">
<span class="section-header">
Enter the confirmation ID given to you when you registered your project with a Navigator
Enter the project ID given to you when you registered your project with a Navigator
</span>
<div
v-tooltip.right="
`Confirmation ID can be found in the confirmation email you received at the time of submission.`
`Project ID can be found in the confirmation email you received at the time of submission.`
"
>
<font-awesome-icon icon="fa-solid fa-circle-question" />
Expand All @@ -358,7 +358,7 @@ onBeforeMount(async () => {
<EditableDropdown
class="col-3"
name="basic.relatedActivityId"
label="Confirmation ID"
label="Project ID"
:disabled="!editable"
:options="filteredProjectActivityIds"
:get-option-label="
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,9 @@ function updateQueryParams() {
</template>
<Column
field="activity.activityId"
header="Activity"
header="Enquiry ID"
:sortable="true"
style="min-width: 136px"
frozen
>
<template #body="{ data }">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const { t } = useI18n();
</template>
<Column
field="activity.activityId"
:header="t('enquiryListProponent.confirmationId')"
:header="t('enquiryListProponent.enquiryId')"
:sortable="true"
style="width: 45%"
frozen
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/housing/submission/SubmissionForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ const formSchema = object({
astNotes: string().notRequired().max(4000).label('Automated Status Tool (AST) Notes'),
intakeStatus: string().oneOf(INTAKE_STATUS_LIST).label('Intake state'),
user: assignedToValidator('intakeStatus', IntakeStatus.SUBMITTED),
applicationStatus: string().oneOf(APPLICATION_STATUS_LIST).label('Activity state'),
applicationStatus: string().oneOf(APPLICATION_STATUS_LIST).label('Project state'),
waitingOn: string().notRequired().max(255).label('waiting on')
});
Expand Down Expand Up @@ -720,7 +720,7 @@ onMounted(async () => {
<Dropdown
class="col-3"
name="applicationStatus"
label="Activity state"
label="Project state"
:disabled="!editable"
:options="APPLICATION_STATUS_LIST"
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -237,9 +237,9 @@ onMounted(() => {
</Column>
<Column
field="activityId"
header="Activity"
header="Project ID"
:sortable="true"
style="min-width: 125px"
style="min-width: 133px"
frozen
>
<template #body="{ data }">
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/locales/en-CA.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"disclaimer": "This information is being collected under the legal authority of section 26 (c)(e) and 27 (1)(a)(i) of the Freedom of Information and Protection of Privacy Act (the Act) and is being used for the purpose of creating a client relationship between you or your organization and Government of British Columbia. It may also be shared when strictly necessary with partner agencies that are also subject to the provisions of the Act. Personal information may be used by the Permitting Solutions Branch for survey purposes. If you have any questions regarding the use of this personal information, please contact Housing Authorizations at"
},
"enquiryListProponent": {
"confirmationId": "Confirmation ID",
"enquiryId": "Enquiry ID",
"listEmpty": "Submit a general enquiry for questions that are not related to existing projects",
"of": "of",
"state": "State",
Expand Down Expand Up @@ -40,7 +40,7 @@
"logout": "Log out"
},
"housing": {
"confirmationId": "Confirmation ID",
"confirmationId": "Project ID",
"drafts": "Drafts",
"enquiriesTooltip": "General enquiries are for questions that are not related to existing projects. To enquire about an existing project, select the project from “My projects” and enquire there.",
"generalEnquiries": "General enquiries",
Expand Down
8 changes: 4 additions & 4 deletions frontend/src/utils/templates.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ export const confirmationTemplateSubmission = (replaceConfig: { [key: string]: s
'" height="120rem" width="880px" alt="B.C. Government Logo" /><br><br>' +
'<div style="margin-left: 3rem; margin-right: 3rem;">' +
'Dear {{ contactName }},<br><br>' +
'<b>Confirmation ID: {{ activityId }}</b><br><br>' +
'<b>Project ID: {{ activityId }}</b><br><br>' +
// eslint-disable-next-line max-len
'Thank you for registering your project with the Navigator Service. We have successfully received your project submission. A Navigator will review your submission and contact you. Please keep your confirmation ID for future reference.<br><br>' +
'Thank you for registering your project with the Navigator Service. We have successfully received your project submission. A Navigator will review your submission and contact you. Please keep your project ID for future reference.<br><br>' +
'View your project submission <a href="' +
PCNS_URL +
'/housing/submission/intake?activityId={{ activityId }}&submissionId={{ submissionId }}">here<a>.<br><br>' +
Expand All @@ -97,9 +97,9 @@ export const confirmationTemplateEnquiry = (replaceConfig: { [key: string]: stri
'" height="120rem" width="880px" alt="B.C. Government Logo" /><br><br>' +
'<div style="margin-left: 3rem; margin-right: 3rem;">' +
'Dear {{ contactName }},<br><br>' +
'<b>Confirmation ID: {{ activityId }}</b><br><br>' +
'<b>Enquiry ID: {{ activityId }}</b><br><br>' +
// eslint-disable-next-line max-len
'Thank you for submitting an enquiry to the Navigator Service. We have successfully received your enquiry. A Navigator will review your enquiry and contact you. Please keep your confirmation ID for future reference.<br><br>' +
'Thank you for submitting an enquiry to the Navigator Service. We have successfully received your enquiry. A Navigator will review your enquiry and contact you. Please keep your enquiry ID for future reference.<br><br>' +
'<b>Enquiry detail:</b><br><br>' +
'{{ enquiryDescription }}<br><br>' +
'View your enquiry <a href="' +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const {
>
Your enquiry has been successfully submitted.
</Message>
<h3 class="inline-block mr-2">Confirmation ID:</h3>
<h3 class="inline-block mr-2">Enquiry ID:</h3>
<router-link
:to="{
name: RouteName.HOUSING_ENQUIRY_INTAKE,
Expand All @@ -38,7 +38,7 @@ const {
</router-link>
<div>
A Housing Navigator will review your submission and contact you in 2 business days. Please check your email for
the confirmation email and keep the confirmation ID for future reference.
the confirmation email and keep the enquiry ID for future reference.
</div>
<div
v-if="showHomeLink"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/housing/project/ProjectView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ onMounted(async () => {
</div>
<div class="mb-8">
<span class="mr-3">
Confirmation ID:
Project ID:
<span class="font-bold">{{ getSubmission.activityId }}</span>
</span>
<span v-if="assignee">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const { activityId, submissionId } = defineProps<{
>
Your application has been successfully submitted.
</Message>
<h3 class="inline-block mr-2">Confirmation ID:</h3>
<h3 class="inline-block mr-2">Project ID:</h3>
<router-link
:to="{
name: RouteName.HOUSING_SUBMISSION_INTAKE,
Expand All @@ -31,7 +31,7 @@ const { activityId, submissionId } = defineProps<{
</router-link>
<div>
Your submission will be reviewed and you will be contacted by a Housing Navigator in 2 business days. Please check
your email for the confirmation email and keep the confirmation ID for future reference.
your email for the confirmation email and keep the project ID for future reference.
</div>
<div class="mt-4"><router-link :to="{ name: RouteName.HOUSING }">Back to Housing</router-link></div>
</div>
Expand Down

0 comments on commit d8e676f

Please sign in to comment.