Skip to content

Commit

Permalink
fix: #2312 agency Name not appearing on Recent Activity on Dashboard
Browse files Browse the repository at this point in the history
Dashboard.vue:
Remove dead code from GrantsTable feature flag cleanup. This will make it easier to see other warnings.
Use "team" property where it had replaced "agency"
  • Loading branch information
adele-usdr committed Dec 19, 2023
1 parent a7527dd commit 3b5606b
Showing 1 changed file with 4 additions and 35 deletions.
39 changes: 4 additions & 35 deletions packages/client/src/views/Dashboard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</div>
</template>
<template #cell(agencyAndGrant)="agencies">
<div>{{ agencies.item.agency }}
<div>{{ agencies.item.team }}
<span v-if="agencies.item.interested === 0" class="color-red" > <strong> rejected </strong> </span>
<span v-if="agencies.item.interested === 1" > is
<span class="color-green">
Expand Down Expand Up @@ -83,39 +83,8 @@
</b-container>
</div>
<b-row v-if="showStats">
<b-col cols='4'>
<b-card bg-variant='secondary' text-variant='white' header='New Grants Matching Search Criteria, Last 24Hrs'
class='text-center mb-3 mt-3'>
<h3>{{ grantsCreatedInTimeframeMatchingCriteria }} of {{ grantsCreatedInTimeframe }}</h3>
<b-link class='stretched-link' to='/grants' />
</b-card>
</b-col>
<b-col cols='4'>
<b-card bg-variant='secondary' text-variant='white' header='Updated Grants Matching Search Criteria, Last 24Hrs'
class='text-center mb-3 mt-3'>
<h3>{{ grantsUpdatedInTimeframeMatchingCriteria }} of {{ grantsUpdatedInTimeframe }}</h3>
<b-link class='stretched-link' to='/grants' />
</b-card>
</b-col>
<b-col cols='4'>
<b-card bg-variant='secondary' text-variant='white' header='Total Grants Matching Search Criteria'
class='text-center mb-3 mt-3'>
<h3>{{ totalGrantsMatchingAgencyCriteria }} of {{ totalGrants }}</h3>
<b-link class='stretched-link' to='/grants' />
</b-card>
</b-col>
</b-row>
<br v-if="!showStats" />
<br />
<b-card :title="newTerminologyEnabled ? 'Total Interested Grants by Team' : 'Total Interested Grants by Agency'" v-if="showStats" >
<b-table sticky-header="600px" hover :items="totalInterestedGrantsByAgencies" :fields="groupByFields">
<template #cell()="{field, value}">
<div :style="field.style" v-text="value">
</div>
</template>
</b-table>
</b-card>
<GrantDetailsLegacy v-if="!newGrantsDetailPageEnabled" :selected-grant.sync="selectedGrant" />
</section>
</template>
Expand Down Expand Up @@ -416,8 +385,8 @@ export default {
return (`(${res})`);
},
formatDate(grantCloseDate) {
const warn = this.agency.warning_threshold;
const danger = this.agency.danger_threshold;
const warn = this.team.warning_threshold;
const danger = this.team.danger_threshold;
const closeDatePlusDangerThreshold = new Date(new Date().setDate(new Date().getDate() + danger));
const closeDatePlusWarningThreshold = new Date(new Date().setDate(new Date().getDate() + warn));
// if the grant close date is <= danger date---------------
Expand Down

0 comments on commit 3b5606b

Please sign in to comment.