62 globalregional beneficiaries #73
Open
Conversation
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
Collaborator
GISRedeDev
commented
Feb 17, 2024
GISRedeDev
commented
- Filtering countries counts in beneficiary panel by settings flag
- Filtering ics ids for query by settings flag when country is selected
doug-leasure
requested changes
Feb 17, 2024
There was a problem hiding this comment.
Hey @GISRedeDev , this looks great. Could you please modify the pull request to merge into dev rather than main?
Also take a look at resolve any conflicts that arise. I see some conflicts with main related to the test data for the database. Not sure if there will be similar conflicts for merging with dev, but those should be easy to resolve.
Fix rebase conflicts
…ries_global_extracted" columns Rebase merge conflicts
Fix merge conflicts
Merge conflicts
added options to Definition of a "beneficiary country" to the settings
add total imapacts
…ted. add the check if all "beneficiary countries" options in settings are unselected.
…cs ids when country selected
GISRedeDev
force-pushed
the
62-globalregional-beneficiaries
branch
from
3e58f8f to
33dabde
Compare
|
Okay done. I've rebased to dev and main and resolved the conflicts, so please let me know if there's a problem. Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.