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.

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

Bug/8162 #1724

Merged
merged 3 commits into from
Jul 9, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export default class AccountInformation extends Vue {

@Prop({ default: 'Account Information' }) private title: string
@Prop({ default: {} }) accountUnderReview: any
@Prop({ default: {} }) accountUnderReviewAddress: Address
@Prop({ default: null }) accountUnderReviewAddress: Address
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why this change?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There was this warn message
image


AccessType = AccessType
Account = Account
Expand Down
20 changes: 18 additions & 2 deletions auth-web/src/components/auth/staff/review-task/AccountStatus.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@
>{{ statusLabel }}
</v-col>
</v-row>
<v-row v-if="isAccountOnHold">
<v-col class="col-12 col-sm-5 py-2">Reason</v-col>
<v-col class="py-2">
{{ accountOnHoldRemarks }}
</v-col>
</v-row>
<v-row v-if="!isPendingReviewPage">
<v-col class="col-12 col-sm-5 py-2">
<span v-if="taskDetails.relationshipStatus === TaskRelationshipStatusEnum.ACTIVE">Approved By</span>
Expand All @@ -26,8 +32,8 @@

<script lang="ts">
import { Component, Prop, Vue } from 'vue-property-decorator'
import { TaskRelationshipStatus, TaskStatus } from '@/util/constants'
import { Task } from '@/models/Task'
import { TaskRelationshipStatus } from '@/util/constants'
import moment from 'moment'

@Component({})
Expand All @@ -45,11 +51,21 @@ export default class AccountStatusTab extends Vue {
case TaskRelationshipStatus.REJECTED:
return 'Rejected'
case TaskRelationshipStatus.PENDING_STAFF_REVIEW:
return 'Pending'
// Eg, If the task pertaining to the BCEID account review is on hold then we display the status as "on hold" else "pending"
return this.isAccountOnHold ? 'On Hold' : 'Pending'
default:
return ''
}
}

private get isAccountOnHold (): boolean {
return this.taskDetails.status === TaskStatus.HOLD
}

private get accountOnHoldRemarks (): string {
return this.taskDetails?.remarks
}

private formatDate (date: Date): string {
return moment(date).format('MMM DD, YYYY')
}
Expand Down
1 change: 1 addition & 0 deletions auth-web/src/models/Task.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export interface Task {
user?: number;
dueDate?: Date;
accountId?:number;
remarks?: string;
}
export interface TaskFilterParams {
statuses?: string[];
Expand Down