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

Jump to bottom

SAN: Amendent Id's #1953

Merged
merged 1 commit into from
Jun 26, 2024
Merged

SAN: Amendent Id's #1953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 1 addition & 4 deletions ppr-ui/src/components/registration/securities-act-notices/CourtCommissionOrderReview.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
cols="9"
class="pt-1 pb-0 mb-0"
>
<p class="effect-of-order-text">
<p>
{{ order.effectOfOrder || '(Not Entered)' }}
</p>
</v-col>
Expand Down Expand Up @@ -133,9 +133,6 @@ p {
opacity: .5
}
}
.effect-of-order-text {
line-height: 22px;
}
#court-commission-order-review {
background-color: #F2F6FB;
}
Expand Down
2 changes: 2 additions & 0 deletions ppr-ui/src/interfaces/ppr-api-interfaces/court-order-interface.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@ import { ActionTypes } from '@/enums'

// Existing court order information may not be altered. All elements are required.
export interface CourtOrderIF {
orderId?: number
courtOrder?: boolean // Optional property indicating court order otherwise commission order
courtName?: string, // Max length 250.
courtRegistry?: string, // Max length 60.
fileNumber: string, // Max length 20.
orderDate: string, // UTC ISO 8601 datetime format YYYY-MM-DDThh:mm:ssTZD.
effectOfOrder?: string, // Max length 500.
action?: ActionTypes // Optional action type for amendments
amendOrderId?: number // to associate amended order to removed order
}
1 change: 1 addition & 0 deletions ppr-ui/src/interfaces/registration-interfaces/security-act-notice-interfaces.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { CourtOrderIF } from '@/interfaces'

export interface AddEditSaNoticeIF {
noticeId?: number
amendNoticeId?: number // to associate amended notice to removed notice
securitiesActNoticeType: SaNoticeTypes
effectiveDateTime: string
securitiesActOrders?: Array<CourtOrderIF>
Expand Down
2 changes: 2 additions & 0 deletions ppr-ui/src/utils/registration-helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,14 @@ export function setAmendmentList (baseList:Array<any>, addList:Array<any>, delet
// Clean and format notice and orders
const formattedNotice = {
...removeEmptyProperties(notice),
amendNoticeId: notice.noticeId,
...(!!notice.effectiveDateTime && {
effectiveDateTime: convertToISO8601LastMinute(notice.effectiveDateTime.split('T')[0])
}),
securitiesActOrders: notice.securitiesActOrders?.filter(order =>
order.action !== ActionTypes.REMOVED).map(order => ({
...removeEmptyProperties(order),
amendOrderId: order.orderId,
orderDate: convertToISO8601LastMinute(order.orderDate.split('T')[0])
}))
} as AddEditSaNoticeIF
Expand Down
Loading