-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor and fix bugs in Recent Activity and Upcoming Closing Dates t…
…ables.
- Loading branch information
Showing
16 changed files
with
467 additions
and
515 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,151 @@ | ||
| <template> | ||
| <b-table | ||
| hover | ||
| :items="activityItems" | ||
| :fields="activityFields" | ||
| sort-by="dateSort" | ||
| sort-desc | ||
| class="table table-borderless" | ||
| thead-class="d-none" | ||
| selectable | ||
| select-mode="single" | ||
| @row-selected="onRowSelected" | ||
| @row-clicked="onRowClicked" | ||
| > | ||
| <template #cell(icon)="list"> | ||
| <div class="gutter-icon row"> | ||
| <b-icon v-if="list.item.interested === statuses.rejected" icon="x-circle-fill" scale="1" variant="danger"></b-icon> | ||
| <b-icon v-if="list.item.interested === statuses.interested" icon="check-circle-fill" scale="1" variant="success"></b-icon> | ||
| <b-icon v-if="list.item.interested === statuses.assigned" icon="arrow-right-circle-fill" scale="1"></b-icon> | ||
| <b-icon v-if="list.item.interested === statuses.awarded" icon="award-fill" scale="1" class="color-yellow"></b-icon> | ||
| <b-icon v-if="list.item.interested === statuses.applied" icon="check-circle-fill" scale="1" class="color-green"></b-icon> | ||
| <b-iconstack v-if="list.item.interested === statuses.lost"> | ||
| <b-icon stacked icon="award-fill" scale="1" class="color-yellow"></b-icon> | ||
| <b-icon stacked icon="x-lg" scale="1.2"></b-icon> | ||
| </b-iconstack> | ||
| </div> | ||
| </template> | ||
| <template #cell(agencyAndGrant)="agencies"> | ||
| <div>{{ agencies.item.agency }} | ||
| <span v-if="agencies.item.interested === statuses.rejected" class="color-red"> <strong> rejected </strong> </span> | ||
| <span v-if="agencies.item.interested === statuses.interested"> is | ||
| <span class="color-green"> | ||
| <strong> interested </strong> | ||
| </span> in | ||
| </span> | ||
| <span v-if="agencies.item.interested === statuses.assigned"> was<strong> assigned </strong> </span> | ||
| <span v-if="agencies.item.interested === statuses.awarded"> was<strong><span | ||
| class="color-yellow"> awarded </span></strong> </span> | ||
| <span v-if="agencies.item.interested === statuses.applied"><strong><span | ||
| class="color-green"> applied </span></strong>for </span> | ||
| <span v-if="agencies.item.interested === statuses.lost"><strong><span | ||
| class="color-yellow"> lost </span></strong> </span>{{ agencies.item.grant }} | ||
| </div> | ||
| </template> | ||
| <template #cell(date)="dates"> | ||
| <div class="color-gray">{{ dates.item.date }}</div> | ||
| </template> | ||
| </b-table> | ||
| </template> | ||
|
|
||
| <script> | ||
| export default { | ||
| props: { | ||
| grantsInterested: { | ||
| type: Array, | ||
| required: true, | ||
| }, | ||
| onRowSelected: { | ||
| type: Function, | ||
| required: true, | ||
| }, | ||
| onRowClicked: { | ||
| type: Function, | ||
| required: true, | ||
| }, | ||
| }, | ||
| data() { | ||
| return { | ||
| activityFields: [ | ||
| { | ||
| // col for the check or X icon | ||
| key: 'icon', | ||
| label: '', | ||
| // thStyle: { width: '1%' }, | ||
| }, | ||
| { | ||
| // col for the agency is interested or not in grant | ||
| key: 'agencyAndGrant', | ||
| label: '', | ||
| // thStyle: { width: '79%' }, | ||
| }, | ||
| { | ||
| // col for when the event being displayed happened | ||
| key: 'date', | ||
| label: '', | ||
| // thStyle: { width: '20%' }, | ||
| }, | ||
| ], | ||
| statuses: { | ||
| rejected: 'Rejected', | ||
| interested: 'Interested', | ||
| assigned: 'Assigned', | ||
| awarded: 'Awarded', | ||
| applied: 'Applied', | ||
| lost: 'Lost', | ||
| }, | ||
| }; | ||
| }, | ||
| computed: { | ||
| activityItems() { | ||
| const rtf = new Intl.RelativeTimeFormat('en', { | ||
| numeric: 'auto', | ||
| }); | ||
| const oneDayInMs = 1000 * 60 * 60 * 24; | ||
| return this.grantsInterested.map((grantsInterested) => ({ | ||
| agency: grantsInterested.name, | ||
| grant: grantsInterested.title, | ||
| grant_id: grantsInterested.grant_id, | ||
| interested: (() => { | ||
| let retVal = null; | ||
| if (grantsInterested.status_code != null) { | ||
| if (grantsInterested.status_code === 'Rejected') { | ||
| retVal = this.statuses.rejected; | ||
| } else if ((grantsInterested.status_code === 'Interested')) { | ||
| retVal = this.statuses.interested; | ||
| } else if ((grantsInterested.status_code === 'Result')) { | ||
| if (grantsInterested.interested_name === 'Award') { | ||
| retVal = this.statuses.awarded; | ||
| } else if (grantsInterested.interested_name === 'Pending') { | ||
| retVal = this.statuses.applied; | ||
| } else if (grantsInterested.interested_name === 'Non-award') { | ||
| retVal = this.statuses.lost; | ||
| } | ||
| } | ||
| } else if (grantsInterested.assigned_by != null) { | ||
| retVal = this.statuses.assigned; | ||
| } | ||
| return retVal; | ||
| })(), | ||
| dateSort: new Date(grantsInterested.created_at), | ||
| date: (() => { | ||
| const timeSince = rtf.format(Math.round((new Date(grantsInterested.created_at).getTime() - new Date().getTime()) / oneDayInMs), 'day'); | ||
| const timeSinceInt = parseInt(timeSince, 10); | ||
| if (!Number.isNaN(timeSinceInt) && timeSinceInt > 7) { | ||
| return new Date(grantsInterested.created_at).toLocaleDateString('en-US'); | ||
| } | ||
| return timeSince.charAt(0).toUpperCase() + timeSince.slice(1); | ||
| })(), | ||
| })); | ||
| }, | ||
| }, | ||
| }; | ||
| </script> | ||
|
|
||
| <style scoped> | ||
| .gutter-icon.row { | ||
| margin-right: -8px; | ||
| margin-left: -8px; | ||
| margin-top: 3px; | ||
| } | ||
| </style> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| <template> | ||
| <b-table | ||
| hover | ||
| :items="closestGrants" | ||
| :fields="upcomingFields" | ||
| sort-by="close_date" | ||
| class="table table-borderless" | ||
| thead-class="d-none" | ||
| selectable | ||
| select-mode="single" | ||
| @row-selected="onRowSelected" | ||
| @row-clicked="onRowClicked" | ||
| > | ||
| <template #cell(title)="data"> | ||
| <div>{{ data.value }}</div> | ||
| <div class="color-gray">{{ data.item.interested_agencies.join(', ') }}</div> | ||
| </template> | ||
| <template #cell(close_date)="data"> | ||
| <div :class="styleDate(data.value)">{{ formatDate(data.value) }}</div> | ||
| </template> | ||
| </b-table> | ||
| </template> | ||
|
|
||
| <script> | ||
| import { daysUntil } from '@/helpers/dates'; | ||
| import { defaultCloseDateThresholds } from '@/helpers/constants'; | ||
| export default { | ||
| props: { | ||
| closestGrants: { | ||
| type: Array, | ||
| required: true, | ||
| }, | ||
| onRowSelected: { | ||
| type: Function, | ||
| required: true, | ||
| }, | ||
| onRowClicked: { | ||
| type: Function, | ||
| required: true, | ||
| }, | ||
| dangerThreshold: { | ||
| type: Number, | ||
| default: defaultCloseDateThresholds.danger, | ||
| }, | ||
| warningThreshold: { | ||
| type: Number, | ||
| default: defaultCloseDateThresholds.warning, | ||
| }, | ||
| }, | ||
| data() { | ||
| return { | ||
| upcomingFields: [ | ||
| { | ||
| // col for Grants and interested agencies | ||
| key: 'title', | ||
| label: '', | ||
| thStyle: { width: '80%' }, | ||
| }, | ||
| { | ||
| // col for when the grant will be closing | ||
| key: 'close_date', | ||
| label: '', | ||
| thStyle: { width: '20%' }, | ||
| }, | ||
| ], | ||
| }; | ||
| }, | ||
| methods: { | ||
| styleDate(value) { | ||
| // value is an ISO string representing close date of grant | ||
| const daysUntilClose = daysUntil(value); | ||
| if (daysUntilClose <= this.dangerThreshold) { | ||
| return 'dangerDate'; | ||
| } | ||
| if (daysUntilClose <= this.warningThreshold) { | ||
| return 'warnDate'; | ||
| } | ||
| return 'normalDate'; | ||
| }, | ||
| formatDate(value) { | ||
| // value is an ISO string representing the close date of grant | ||
| // needs to be treated as local date | ||
| return new Date(value).toLocaleDateString('en-US', { timeZone: 'UTC' }); | ||
| }, | ||
| }, | ||
| }; | ||
| </script> | ||
|
|
||
| <style scoped> | ||
| .dangerDate { | ||
| color: #C22E31; | ||
| font-weight: bold; | ||
| } | ||
| .warnDate { | ||
| color: #956F0D; | ||
| font-weight: bold; | ||
| } | ||
| .normalDate { | ||
| color: black; | ||
| } | ||
| </style> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| import { DateTime } from 'luxon'; | ||
|
|
||
| // Given a date (represented as a date-only ISO string), return the number of days until that date. | ||
| // Specifically, the number of whole days between now and the end of the given day in the local time-zone. | ||
| // Example: If today is 2021-01-01, then daysUntil('2021-01-02') returns 1. | ||
| // Returns zero if the date is in the past. | ||
| export function daysUntil(dateString) { | ||
| const daysDiff = DateTime.fromISO(dateString).endOf('day').diffNow('days').days; | ||
| return daysDiff < 0 ? 0 : Math.floor(daysDiff); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.