Skip to content

Commit

Permalink
Owners Group Selection Fix (#1976)
Browse files Browse the repository at this point in the history 
* Owners Bug fix on Frozen Mhr's

* Additional Description Template fix
  • Loading branch information
@cameron-eyds
cameron-eyds authored Jul 11, 2024
1 parent 1a93966 commit 0a93c28
Show file tree
Hide file tree
Showing 6 changed files with 81 additions and 73 deletions.
4 changes: 2 additions & 2 deletions ppr-ui/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ppr-ui/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ppr-ui",
"version": "3.2.35",
"version": "3.2.36",
"private": true,
"appName": "Assets UI",
"sbcName": "SBC Common Components",
Expand Down
134 changes: 68 additions & 66 deletions ppr-ui/src/components/mhrHistory/MhrHistoryLocations.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,74 +97,76 @@
</v-col>
</template>

<v-col
v-else
cols="3"
class="pb-2"
>
<h4>Legal Land Description</h4>
</v-col>
<template v-else>
<v-col
cols="3"
class="pb-2"
>
<h4>Legal Land Description</h4>
</v-col>

<v-col
cols="7"
class="pl-3"
>
<p v-if="content.bandName">
Band Name: {{ content.bandName || '(Not Entered)' }}
</p>
<p v-if="content.reserveNumber">
Reserve Number: {{ content.reserveNumber || '(Not Entered)' }}
</p>
<p v-if="content.lot">
Lot: {{ content.lot }}
</p>
<p v-if="content.parcel">
Parcel: {{ content.parcel }}
</p>
<p v-if="content.block">
Block: {{ content.block }}
</p>
<p v-if="content.districtLot">
District Lot: {{ content.districtLot }}
</p>
<p v-if="content.partOf">
Part of: {{ content.partOf }}
</p>
<p v-if="content.section">
Section: {{ content.section }}
</p>
<p v-if="content.township">
Township: {{ content.township }}
</p>
<p v-if="content.range">
Range: {{ content.range }}
</p>
<p v-if="content.meridian">
Meridian: {{ content.meridian }}
</p>
<p v-if="content.landDistrict">
Land District: {{ content.landDistrict }}
</p>
<p v-if="content.plan">
Plan: {{ content.plan }}
</p>
<p v-if="content.exceptionPlan">
Exception Plan: {{ content.exceptionPlan }}
</p>
</v-col>
<v-col
cols="7"
class="pl-3"
>
<p v-if="content.bandName">
Band Name: {{ content.bandName || '(Not Entered)' }}
</p>
<p v-if="content.reserveNumber">
Reserve Number: {{ content.reserveNumber || '(Not Entered)' }}
</p>
<p v-if="content.lot">
Lot: {{ content.lot }}
</p>
<p v-if="content.parcel">
Parcel: {{ content.parcel }}
</p>
<p v-if="content.block">
Block: {{ content.block }}
</p>
<p v-if="content.districtLot">
District Lot: {{ content.districtLot }}
</p>
<p v-if="content.partOf">
Part of: {{ content.partOf }}
</p>
<p v-if="content.section">
Section: {{ content.section }}
</p>
<p v-if="content.township">
Township: {{ content.township }}
</p>
<p v-if="content.range">
Range: {{ content.range }}
</p>
<p v-if="content.meridian">
Meridian: {{ content.meridian }}
</p>
<p v-if="content.landDistrict">
Land District: {{ content.landDistrict }}
</p>
<p v-if="content.plan">
Plan: {{ content.plan }}
</p>
<p v-if="content.exceptionPlan">
Exception Plan: {{ content.exceptionPlan }}
</p>
</v-col>
</template>

<v-col
v-if="content.additionalDescription"
cols="3"
>
<h4>Additional Description</h4>
</v-col>
<v-col
cols="7"
class="pl-3"
>
<p>{{ content.additionalDescription }}</p>
</v-col>
<template v-if="content.additionalDescription">
<v-col
cols="3"
>
<h4>Additional Description</h4>
</v-col>
<v-col
cols="7"
class="pl-3"
>
<p>{{ content.additionalDescription }}</p>
</v-col>
</template>
</v-row>
</template>
</v-row>
Expand Down
3 changes: 2 additions & 1 deletion ppr-ui/src/components/mhrRegistration/HomeOwners/AddEditHomeOwner.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@
/>

<!-- Group Add / Edit -->
<template v-if="!isTransferDueToDeath && !isFrozenMhr && !(isMhrCorrection && editHomeOwner)">
<template v-if="!isTransferDueToDeath && !isFrozenMhrDueToAffidavit && !(isMhrCorrection && editHomeOwner)">
<hr class="mt-3 mb-10">
<HomeOwnerGroups
:groupId="isDefinedGroup ? ownersGroupId : null"
Expand Down Expand Up @@ -852,6 +852,7 @@ export default defineComponent({
setShowGroups,
AdditionalNameConfig,
isRoleQualifiedSupplier,
isFrozenMhrDueToAffidavit,
...toRefs(localState)
}
}
Expand Down
5 changes: 4 additions & 1 deletion ppr-ui/src/components/mhrRegistration/MhrStatusCorrection.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,10 @@ const { setMhrCorrectStatusType } = useStore()
const { getMhrInformation } = storeToRefs(useStore())
const { correctionState } = useMhrCorrections()
const mhrStatus = ref(getMhrInformation.value?.statusType)
const mhrStatusDefault = getMhrInformation.value?.statusType === MhApiStatusTypes.FROZEN
? MhApiStatusTypes.ACTIVE
: getMhrInformation.value?.statusType
const mhrStatus = ref(mhrStatusDefault)
const displayStatusOptions = computed((): boolean => {
return !containsCurrentRoute([RouteNames.MHR_REVIEW_CONFIRM])
})
Expand Down
6 changes: 4 additions & 2 deletions ppr-ui/src/composables/mhrRegistration/useMhrCorrections.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
getFeatureFlag,
getMhrDraft
} from '@/utils'
import { ActionTypes, APIRegistrationTypes, HomeCertificationOptions, RouteNames } from '@/enums'
import { ActionTypes, APIRegistrationTypes, HomeCertificationOptions, MhApiStatusTypes, RouteNames } from '@/enums'
import { useNavigation, useNewMhrRegistration, useTransportPermits } from '@/composables'
import {
AdminRegistrationIF,
Expand Down Expand Up @@ -261,7 +261,9 @@ export const useMhrCorrections = () => {
certificationOption: certificationOption,
hasNoCertification: certificationOption === null,
},
statusType: getMhrInformation.value?.statusType
statusType: getMhrInformation.value?.statusType === MhApiStatusTypes.FROZEN
? MhApiStatusTypes.ACTIVE
: getMhrInformation.value?.statusType
}))

// Set Current Registration to filing state
Expand Down

0 comments on commit 0a93c28

Please sign in to comment.