Skip to content

Commit

Permalink
Exemptions Review, Validation, Submissions and misc Component/Style U…
Browse files Browse the repository at this point in the history
…pdates (#1583)

* Base Components placed

* Updated Validations

* Party Form Updates

* Submitting Party for Staff implemented

* Confirm Requirements Staff

* Ongoing Submission

* Staff Submission

* Staff and QS Exemption Filings

* clean up

* version bump

* PR Clean up
  • Loading branch information
cameron-eyds authored Oct 16, 2023
1 parent b9caadf commit cf73b1d
Show file tree
Hide file tree
Showing 53 changed files with 1,239 additions and 311 deletions.
4 changes: 2 additions & 2 deletions ppr-ui/package-lock.json

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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ppr-ui",
"version": "2.1.16",
"version": "2.1.17",
"private": true,
"appName": "Assets UI",
"sbcName": "SBC Common Components",
Expand Down
6 changes: 5 additions & 1 deletion ppr-ui/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ import * as Views from '@/views'
import {
authPprError, authAssetsError, draftDeleteError, historyRegError, loginError, openDocError, paymentErrorReg,
paymentErrorSearch, registrationCompleteError, registrationDeleteError, registrationLoadError,
registrationOpenDraftError, registrationSaveDraftError, searchResultsError, unitNoteFilingError
registrationOpenDraftError, registrationSaveDraftError, searchResultsError, unitNoteFilingError, exemptionSaveError
} from '@/resources/dialogOptions'
import {
getFees,
Expand Down Expand Up @@ -524,6 +524,10 @@ export default defineComponent({
case ErrorCategories.SEARCH:
handleErrorSearch(error)
break
case ErrorCategories.EXEMPTION_SAVE:
localState.errorOptions = exemptionSaveError
localState.errorDisplay = true
break
case ErrorCategories.SEARCH_COMPLETE:
// handled in search comp
break
Expand Down
61 changes: 54 additions & 7 deletions ppr-ui/src/assets/styles/base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -215,10 +215,24 @@ p {
}

// Common
ul.list {
margin: 0;
padding: 0;
list-style-type: none;
ol, ul {
li {
color: $gray7;
}
li::marker {
font-weight: bold;
}
}
ul {
list-style-type: disc;
li::marker {
font-size: 0.75rem;
}
.list {
margin: 0;
padding: 0;
list-style-type: none;
}
}

.list-item {
Expand Down Expand Up @@ -450,12 +464,16 @@ tr.disabled-text-not-action td, tr.disabled-text-not-first td {
color: #2e8540 !important;
}

.rounded-all {
border-radius: 4px 4px 4px 4px;
}

.rounded-top {
border-radius: 4px 4px 0px 0px;
border-radius: 4px 4px 0 0;
}

.rounded-bottom {
border-radius: 0px 0px 4px 4px;
border-radius: 0 0 4px 4px;
}

.icon-div {
Expand Down Expand Up @@ -770,11 +788,15 @@ tr.registration-row.draft-registration-row.added-reg-effect td.actions-cell,
color: $gray9;
}

.exemption-icon {
.icon-small {
width: 18px;
height: 18px;
margin-bottom: -2px;
}
.icon-large {
width: 24px;
height: 24px;
}

.home-owners-icon {
width: 25px;
Expand Down Expand Up @@ -890,4 +912,29 @@ tr.registration-row.draft-registration-row.added-reg-effect td.actions-cell,

.overlap {
z-index: 7;
}

// Contact Type Radio Btns
.person-radio {
width: 47%;
margin-right: 20px !important;
background-color: rgba(0, 0, 0, 0.06);
height: 60px;
padding: 10px;
color: red !important
}
.business-radio {
width: 50%;
background-color: rgba(0, 0, 0, 0.06);
height: 60px;
padding: 10px;
margin-right: 0px !important;
}

.selected-radio {
border: 1px solid $app-blue;
background-color: white;
::v-deep .theme--light.v-label:not(.v-label--is-disabled), .theme--light.v-messages {
color: $gray9 !important;
}
}
4 changes: 4 additions & 0 deletions ppr-ui/src/assets/styles/layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@
}
}

.col-3, .col-sm-3 {
max-width: 25%;
}

.column-width-xxl {
width: 40%;
}
Expand Down
3 changes: 1 addition & 2 deletions ppr-ui/src/assets/styles/overrides.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ td {
color: $gray7 !important;
font-size: 0.875rem !important;
min-width: 9rem;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}

// Buttons
Expand Down
2 changes: 1 addition & 1 deletion ppr-ui/src/components/common/AccountInfo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ import { BaseAddress } from '@/composables/address'
import { PartyAddressSchema } from '@/schemas'
import { defineComponent } from 'vue-demi'
import { toDisplayPhone } from '@/utils'
import { AccountInfoIF } from '@/interfaces' // eslint-disable-line no-unused-vars
import { AccountInfoIF, PartyIF } from '@/interfaces' // eslint-disable-line no-unused-vars
export default defineComponent({
name: 'AccountInfo',
Expand Down
7 changes: 6 additions & 1 deletion ppr-ui/src/components/common/Attention.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import { defineComponent, toRefs, computed, reactive, ref, watch } from 'vue-dem
import { useInputRules } from '@/composables'
import { FormField } from '@/components/common'
import { attentionConfigManufacturer, attentionConfig } from '@/resources/attnRefConfigs'
import { AttnRefConfigIF } from '@/interfaces'
export default defineComponent({
name: 'Attention',
Expand All @@ -63,6 +64,10 @@ export default defineComponent({
validate: {
type: Boolean,
default: false
},
configOverride: {
type: Object as () => AttnRefConfigIF,
default: () => null
}
},
setup (props, { emit }) {
Expand All @@ -71,7 +76,7 @@ export default defineComponent({
const { maxLength } = useInputRules()
const localState = reactive({
config: isRoleManufacturer.value ? attentionConfigManufacturer : attentionConfig,
config: props.configOverride || isRoleManufacturer.value ? attentionConfigManufacturer : attentionConfig,
isFormValid: false,
setShowErrors: computed((): boolean => props.validate && !localState.isFormValid)
})
Expand Down
6 changes: 3 additions & 3 deletions ppr-ui/src/components/common/ButtonFooter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -248,10 +248,10 @@ export default defineComponent({
// Undetected Duplicate Secured Party API check to be implemented here.
// Use secured party dialog with isDuplicate and isReview props to display error if found.
if ([RouteNames.REVIEW_CONFIRM, RouteNames.MHR_REVIEW_CONFIRM, RouteNames.QS_ACCESS_REVIEW_CONFIRM]
.includes(props.currentStepName as RouteNames)) {
if ([RouteNames.REVIEW_CONFIRM, RouteNames.MHR_REVIEW_CONFIRM, RouteNames.QS_ACCESS_REVIEW_CONFIRM,
RouteNames.EXEMPTION_REVIEW].includes(props.currentStepName as RouteNames)) {
// -- Intersect here for Submitting MHR Registration --
if ([RouteNames.MHR_REVIEW_CONFIRM, RouteNames.QS_ACCESS_REVIEW_CONFIRM]
if ([RouteNames.MHR_REVIEW_CONFIRM, RouteNames.QS_ACCESS_REVIEW_CONFIRM, RouteNames.EXEMPTION_REVIEW]
.includes(props.currentStepName as RouteNames)) {
emit('submit')
return
Expand Down
5 changes: 3 additions & 2 deletions ppr-ui/src/components/common/CertifyInformation.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
<!-- Table Body -->
<tbody v-if="registeringParty.length > 0">
<tr v-for="(item, index) in registeringParty" :key="`${item}: ${index}`" class="party-row">
<td class="list-item__title title-text" style="padding-left:30px">
<v-icon class="v-icon mt-n2">mdi-account</v-icon><span>{{ legalName }}</span>
<td class="list-item__title title-text icon-text" style="padding-left:30px">
<v-icon class="v-icon mt-n1">mdi-account</v-icon><span>{{ legalName }}</span>
</td>
<td class="pl-1">{{ item.businessName }}</td>
<td>
Expand Down Expand Up @@ -107,6 +107,7 @@ import { authorizedTableHeaders } from '@/resources'
export default defineComponent({
name: 'CertifyInformation',
emits: ['certifyValid'],
components: {
BaseAddress
},
Expand Down
29 changes: 3 additions & 26 deletions ppr-ui/src/components/common/ContactInformation.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@
class="pa-8 pr-6"
:class="{ 'border-error-left': showBorderError }"
>
<v-row no-gutters justify="space-between">
<v-col cols="12" sm="2" class="mt-1">
<v-row no-gutters>
<v-col cols="12" sm="3" class="mt-1">
<label
class="generic-label"
:class="{ 'error-text': showBorderError }"
>
{{ content.sideLabel }}
</label>
</v-col>
<v-col cols="12" sm="10" class="px-1">
<v-col cols="12" sm="9">
<v-radio-group
id="contact-info-type-options"
v-model="contactInfoType"
Expand Down Expand Up @@ -404,29 +404,6 @@ export default defineComponent({
p {
color: $gray7
}
.person-radio {
width: 47%;
margin-right: 20px !important;
background-color: rgba(0, 0, 0, 0.06);
height: 60px;
padding: 10px;
color: red !important
}
.business-radio {
width: 50%;
background-color: rgba(0, 0, 0, 0.06);
height: 60px;
padding: 10px;
margin-right: 0px !important;
}
.selected-radio {
border: 1px solid $app-blue;
background-color: white;
::v-deep .theme--light.v-label:not(.v-label--is-disabled), .theme--light.v-messages {
color: $gray9 !important;
}
}
.long-error-message::v-deep .v-messages.error--text {
position: absolute;
Expand Down
4 changes: 2 additions & 2 deletions ppr-ui/src/components/common/DocumentId.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
flat
>
<v-row no-gutters>
<v-col cols="12" sm="2">
<v-col cols="12" sm="3">
<label
class="generic-label"
:class="{ 'error-text': showBorderError }"
Expand All @@ -21,7 +21,7 @@
{{ content.sideLabel }}
</label>
</v-col>
<v-col cols="12" sm="10" class="px-1">
<v-col cols="12" sm="9">
<v-text-field
filled
id="doc-id-field"
Expand Down
4 changes: 2 additions & 2 deletions ppr-ui/src/components/common/FormCard.vue
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<template>
<v-card id="form-card" flat class="pa-8">
<v-row no-gutters>
<v-col cols="2">
<v-col cols="3">
<label class="generic-label" :class="{ 'error-text': showErrors }">{{ label }}</label>
</v-col>
<v-col class="ml-8">
<v-col cols="9">
<!-- Form information slot -->
<slot name="infoSlot" />
<!-- Form slot -->
Expand Down
Loading

0 comments on commit cf73b1d

Please sign in to comment.