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

Feature 3W Country #640

Merged
merged 12 commits into from
Apr 28, 2020
Merged

Feature 3W Country #640

merged 12 commits into from
Apr 28, 2020

Conversation

thenav56
Copy link
Member

@thenav56 thenav56 commented Mar 23, 2020 •
edited
Loading

Changes

  • 3W feedbacks changes.
  • Pull HPC data from google doc.

Checklist

Things that should succeed before merging.

Release

If there is a version update, make sure to tag the repository with the latest version.

@frozenhelium frozenhelium mentioned this pull request Mar 23, 2020
Merged
@thenav56 thenav56 force-pushed the feature/databank-fts-google-sheet branch 2 times, most recently from f64c2d2 to 3a919b8 Compare March 23, 2020 12:08
@thenav56 thenav56 force-pushed the feature/databank-fts-google-sheet branch 3 times, most recently from 74e7ced to 46ca7a1 Compare April 9, 2020 10:46
@thenav56 thenav56 force-pushed the feature/databank-fts-google-sheet branch 2 times, most recently from c572911 to 53debfd Compare April 22, 2020 11:54
@thenav56 thenav56 requested review from GergiH, szabozoltan69 and batpad and removed request for szabozoltan69 April 22, 2020 11:57
@thenav56 thenav56 marked this pull request as ready for review April 22, 2020 11:57
@thenav56 thenav56 changed the title Feature/databank fts google sheet Feature 3W Country Apr 22, 2020
@thenav56 thenav56 force-pushed the feature/databank-fts-google-sheet branch from 487adbd to cbff2af Compare April 22, 2020 12:14
GergiH
GergiH approved these changes Apr 22, 2020
View reviewed changes
Copy link
Collaborator

@GergiH GergiH left a comment

Choose a reason for hiding this comment

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

@batpad Should we merge this into develop (staging) only first or straight into master too?

@batpad
Copy link
Collaborator

batpad commented Apr 23, 2020

@thenav56 apologies - can I ask you to switch the base branch for this PR to develop from master? Let me know if you run into issues (sorry, we started using the develop workflow after you first created this PR .. ).

@batpad
Copy link
Collaborator

batpad commented Apr 23, 2020

@thenav56 is it safe to merge the Country Databank things to staging? Would we need to enable any cronjobs?

@thenav56 thenav56 force-pushed the feature/databank-fts-google-sheet branch from cbff2af to 1497bd4 Compare April 23, 2020 12:21
@thenav56 thenav56 changed the base branch from master to develop April 23, 2020 12:22
@thenav56
Copy link
Member Author

@thenav56 apologies - can I ask you to switch the base branch for this PR to develop from master? Let me know if you run into issues (sorry, we started using the develop workflow after you first created this PR .. ).

@batpad Sure just rebased the branch with develop. I think we should make develop as a default branch for this repo.

@thenav56 is it safe to merge the Country Databank things to staging? Would we need to enable any cronjobs?

The additional work is under previous cronjob docker-compose run --rm ingest_databank which I think was already added to staging by Zoltan.

thenav56 added 9 commits April 28, 2020 09:02
@thenav56
Fetch data from FTS Google sheet
29d8d5e
@thenav56
Log cronlog on error and success in Databank ingest
da512c1 
* Also changed Project project_district to be null to specify all
  districts
@thenav56
Add is_private field for Project
1977c57 
Private Project will not be visible to unauthenticated users.
@thenav56
Add Programme Type Domestic
fa2d310 
* Add Seperate Serializer for List Mini Event route
* Change api/v2/event/ url pattern for action route support
@thenav56
Add Project Bulk Import
f6dda67
@thenav56
Add reversion for Project
f520e59 
* Fix migration node issue
@thenav56
Private project only accessable to ifrc users.
7cb03ca
@thenav56
Add dtype to Mini Event View
ae57909
@thenav56
Replace is_private by visibility choices
1dab1fe
thenav56 added 3 commits April 28, 2020 09:02
@thenav56
Clean up data for project import
3d3bb66
@thenav56
Change Sector Health
d8dbcc4 
- Update old health to `Health Public`
- Add `Health Clinical`
@thenav56
Fix Public/Clinical Health Project Import Error
fae7ee6 
- Add custom transalter for New Health Sectors/Tags
@thenav56 thenav56 force-pushed the feature/databank-fts-google-sheet branch from 1497bd4 to fae7ee6 Compare April 28, 2020 03:28
@GergiH GergiH merged commit ca1666b into develop Apr 28, 2020
@thenav56 thenav56 deleted the feature/databank-fts-google-sheet branch April 29, 2020 05:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GergiH GergiH GergiH approved these changes

@batpad batpad Awaiting requested review from batpad

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@thenav56 @batpad @GergiH