Skip to content

Commit

Permalink
Misc UXA for Exemptions
Browse files Browse the repository at this point in the history
  • Loading branch information
cameron-eyds committed Apr 23, 2024
1 parent 049c630 commit c0b1c06
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 15 deletions.
4 changes: 4 additions & 0 deletions ppr-ui/src/assets/svgs/ic_exemption2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions ppr-ui/src/components/tables/common/TableRow.vue
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@
<img
alt="exemption-icon"
class="ml-0 icon-small"
src="@/assets/svgs/ic_exemption.svg"
src="@/assets/svgs/ic_exemption2.svg"
>
<span class="ml-1">Re-Register Home</span>
</v-list-item-subtitle>
Expand Down Expand Up @@ -531,7 +531,7 @@
<img
alt="exemption-icon"
class="ml-0 icon-small"
src="@/assets/svgs/ic_exemption.svg"
src="@/assets/svgs/ic_exemption2.svg"
>
Residential Exemption
</span>
Expand All @@ -546,7 +546,7 @@
<img
alt="exemption-icon"
class="ml-0 icon-small"
src="@/assets/svgs/ic_exemption.svg"
src="@/assets/svgs/ic_exemption2.svg"
>
<span class="ml-1">Residential Exemption</span>
</span>
Expand Down
2 changes: 1 addition & 1 deletion ppr-ui/src/composables/exemption/useExemptions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ export const useExemptions = () => {
reg =>
[APIMhrDescriptionTypes.RESIDENTIAL_EXEMPTION.toString(),
APIMhrDescriptionTypes.NON_RESIDENTIAL_EXEMPTION.toString()].includes(reg.registrationDescription) &&
(reg.statusType === MhApiStatusTypes.EXEMPT || reg.statusType === MhApiStatusTypes.ACTIVE)
[MhApiStatusTypes.EXEMPT, MhApiStatusTypes.ACTIVE, MhApiStatusTypes.FROZEN].includes(reg.statusType)
).length > 0
}

Expand Down
16 changes: 8 additions & 8 deletions ppr-ui/src/utils/feature-flags.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ export const defaultFlagSet: LDFlagSet = {
'search-registration-number': true,
'search-serial-number': true,
'mhr-ui-enabled': true, // Mhr Search - default true: Should remove from codebase
'mhr-registration-enabled': true, // Enables MHR table tab
'mhr-staff-correction-enabled': true, // Enables access to staff mhr correction
'mhr-transfer-enabled': true, // Enables changes to base MHR HomeOwners within the MHR Information flow
'mhr-exemption-enabled': true,
'mhr-non-res-exemption-enabled': true, // Enables Non-Residential Exemption for Staff
'mhr-transport-permit-enabled': true,
'mhr-amend-transport-permit-enabled': true,
'mhr-user-access-enabled': true,
'mhr-registration-enabled': false, // Enables MHR table tab
'mhr-staff-correction-enabled': false, // Enables access to staff mhr correction
'mhr-transfer-enabled': false, // Enables changes to base MHR HomeOwners within the MHR Information flow
'mhr-exemption-enabled': false,
'mhr-non-res-exemption-enabled': false, // Enables Non-Residential Exemption for Staff
'mhr-transport-permit-enabled': false,
'mhr-amend-transport-permit-enabled': false,
'mhr-user-access-enabled': false,
'sentry-enable': false, // by default, no sentry logs
'banner-text': '' // by default, there is no banner text
}
Expand Down
5 changes: 2 additions & 3 deletions ppr-ui/src/views/exemption/ExemptionReview.vue
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<img
alt="exemption-icon"
class="ml-0 icon-large"
src="@/assets/svgs/ic_exemption.svg"
src="@/assets/svgs/ic_exemption2.svg"
>
<label class="font-weight-bold pl-2">{{ exemptionLabel }}</label>
</header>
Expand Down Expand Up @@ -247,8 +247,7 @@ export default defineComponent({
const localState = reactive({
nonResidentialDisplayReason: computed((): string => {
const reason = getMhrExemptionNote.value?.nonResidentialReason === 'Other'
? `${getMhrExemptionNote.value?.nonResidentialReason} '${getMhrExemptionNote.value?.nonResidentialOther ||
'(Not Entered)'}'`
? `${getMhrExemptionNote.value?.nonResidentialOther || '(Not Entered)'}`
: getMhrExemptionNote.value?.nonResidentialReason
return`Reason for the Non-Residential Exemption: ${getMhrExemptionNote.value?.nonResidentialOption} - ${reason}`
}),
Expand Down

0 comments on commit c0b1c06

Please sign in to comment.