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

feat: collect external funding on grants #8971

Merged
merged 3 commits into from
Jun 7, 2021
Merged

feat: collect external funding on grants #8971

merged 3 commits into from
Jun 7, 2021

Conversation

thelostone-mc
Copy link
Member

@thelostone-mc thelostone-mc commented May 31, 2021 •
edited

Description
  • adds feature to allow grants to indicate whether or not they have external funding
  • redoes summary section as per https://www.figma.com/file/CP57XgGQwC9ChPCMkTuQ7i/GR10?node-id=6%3A2
  • is mobile friendly
  • all grants are prefilled with unknown (this is to make it clear which grants have not yet been researched on to see of they have external funding)

New Grants

  • During grant creation -> user is forced to select yes/ no to answer if they have external funding source
  • If yes -> it appears on the summary tab on detail page
  • If not -> it does not appear

Old Grants

  • Would have external_funding_source set to unknown
  • When owners try to update grant, they will not be able to unless they have answered yes/not as an external funding source (This is help us backfill data)
Refers/Fixes

Build off of #8618

Testing

https://share.vidyard.com/watch/LsrYtueGYNoev1TSFFU4si?

@gdixon gdixon added this to Done in Grants Round 10 Jun 2, 2021
zlsgh
zlsgh reviewed Jun 3, 2021
View reviewed changes
app/grants/models.py Outdated Show resolved Hide resolved
PixelantDesign
PixelantDesign reviewed Jun 7, 2021
View reviewed changes
Copy link
Contributor

@PixelantDesign PixelantDesign left a comment •
edited

Choose a reason for hiding this comment

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

Looks great! Could you show a video of the responsive view? @willsputra what do you think?

gdixon
gdixon reviewed Jun 7, 2021
View reviewed changes
app/grants/templates/grants/detail/template-grant-details.html
<i class="font-smaller-2 fas fa-globe text-grey-400"></i>
<span class="text-grey-400text-primary py-1 px-2 font-weight-normal mr-2">
<template v-if="grant.region && grant.region.label != 'undefined'">[[grant.region.label]]</template>
<template v-else>Unknown</template>
Copy link
Contributor

Choose a reason for hiding this comment

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

Nice!

gdixon
gdixon approved these changes Jun 7, 2021
View reviewed changes
Copy link
Contributor

@gdixon gdixon left a comment

Choose a reason for hiding this comment

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

LGTM!

@gdixon gdixon merged commit b1bce87 into gitcoinco:master Jun 7, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PixelantDesign PixelantDesign PixelantDesign left review comments

@gdixon gdixon gdixon approved these changes

@zlsgh zlsgh zlsgh approved these changes

@chibie chibie Awaiting requested review from chibie

@frankchen07 frankchen07 Awaiting requested review from frankchen07

@octavioamu octavioamu Awaiting requested review from octavioamu

Assignees

@thelostone-mc thelostone-mc

Labels
None yet
Projects
No open projects
Grants Round 10
  
Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@thelostone-mc @PixelantDesign @gdixon @zlsgh