Update master with code on staging #501
Merged
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
# Conflicts: # formlibrary/urls.py # formlibrary/views.py # static/vue.js/training_participants_table.js # templates/formlibrary/participants_table.html
# Conflicts: # templates/components/modals/objective_form.html
* Act-658: Add program create modal * ACT-658: Re-write stakeholder creation modal using vue.js * ACT-658: Re-write project creating modal using Vue * ACT-658: Re-write programs listing logic using vue.js * ACT-658: Link program create, delete requests to REST * Code clean up * Code clean up * ACT-658: Fix minor issues * ACT-658: Minor fix * ACT-658: Refactor program start and end date field * ACT-658: Code clean up * ACT-658: Code clean up * ACT-658: Code clean up * ACT-658: Code clean up * ACT-658: Fix select component * ACT-658: Code clean up * ACT-658: Remove unused code * ACT-658: Code clean up
* fixed hikaya 404 link - now linking to hikaya homepage * minor changes * refactoring and failure of transforming modal trigger to vuejs * migrated customdashbaord admin models to admin.py * migrated configurabledashboard admin models to admin.py * deleted footer links * removed programLinksAdmin model
# Conflicts: # templates/components/modals/objective_form.html
* feat: Add partcipants table to training list details * fix: Correct styling issues with dropdown * refactor: Correct styling for funding code dropdown * refactor: Correct styling for add results modal
* moves footer to bottom * formatting Co-authored-by: Andrew <andrew.tc.pham@gmail.com>
* change country code field to MultiSelect * fix pillow version * fix location creation map Co-authored-by: Ninette Adhikari <13760198+ninetteadhikari@users.noreply.github.com> Co-authored-by: Isaac Kimaiyo <40719885+Kimaiyo077@users.noreply.github.com> Co-authored-by: Andrew <andrew.tc.pham@gmail.com>
Add config to create staging image Add config to deploy to staging custer
- Updates branch naming convention from Jira to GitHub issue number
* feat: Add partcipants table to training list details * fix: Correct styling issues with dropdown * refactor: Correct styling for funding code dropdown * fix: Add missing dropdown when adding fund code in admin Co-authored-by: Andrew <andrew.tc.pham@gmail.com>
…lable (#439) Current Behavior: All the programs in the system are available when editing a project Expected Behavior: Only programs belonging to an organization should be available when editing a projects Co-authored-by: Andrew <andrew.tc.pham@gmail.com>
* add admin bounnndary field to location setting form * update locations settings form * display country bounndaries * load country data dynamically based on selected country and admin level * dynamically load the geoJson data * render map boundaries on load of the page * update the map view with boundaries on lat, long and zoom value changes * display the map when a user selects the country for the first time * allow users to reset org location settings.
* ACT-688 Renamed beneficiary model to Individual * ACT-688 Renamed beneficiary to individual * ACT-688 Updated related fields * ACT-688 Reworked migrations * ACT-688 Reworked migrations * ACT-688 Fixed training tests * ACT-688 Reworked migrations * Renamed templates * ACT-688 Fixed migrations Co-authored-by: Isaac Kimaiyo <40719885+Kimaiyo077@users.noreply.github.com> Co-authored-by: Andrew <andrew.tc.pham@gmail.com>
* add description field to stakeholder type * remove print statements
#448) * add validation for disaggregation values against actual value * allow users to add results without disaggregation Co-authored-by: Ninette Adhikari <13760198+ninetteadhikari@users.noreply.github.com>
Add config to build prod image Add config to deploy to production Co-authored-by: Andrew <andrew.tc.pham@gmail.com>
* patch security vulnerability * add map boundaries to home dashboard * display admin boundaries on maps page * add boundaries to map details view * fix map error * update geojson file referemcing Co-authored-by: Andrew <andrew.tc.pham@gmail.com>
* fixed hikaya 404 link - now linking to hikaya homepage * minor changes * refactoring and failure of transforming modal trigger to vuejs * migrated customdashbaord admin models to admin.py * migrated configurabledashboard admin models to admin.py * deleted footer links * removed programLinksAdmin model * added funding input group * added new field to fund code modal, and added field validation * changed fund code model to 'percentage_of_funding' and changed the labels and placeholders * added null=True to fund code model * committed model changes * merged migrations Co-authored-by: Isaac Kimaiyo <40719885+Kimaiyo077@users.noreply.github.com> Co-authored-by: Andrew <andrew.tc.pham@gmail.com>
…st in all environments (#458) * add fixtures for global data * update countries model description field * fix failing tests
Co-authored-by: Erin Thomas <aronthomas@MacBook-Pro.local> Co-authored-by: Isaac Kimaiyo <40719885+Kimaiyo077@users.noreply.github.com> Co-authored-by: Andrew <andrew.tc.pham@gmail.com>
* ACT-725 When Editing a project other organizations' programs are available Current Behavior: All the programs in the system are available when editing a project Expected Behavior: Only programs belonging to an organization should be available when editing a projects * Align table data and icons Expected behavior The first column text for Target period is left aligned and all the rest of the column text is center aligned with equal spacing Co-authored-by: Andrew <andrew.tc.pham@gmail.com> Co-authored-by: Isaac Kimaiyo <40719885+Kimaiyo077@users.noreply.github.com>
* #459: format the invite email HTML * Expose DB's port in Docker Compose * #456: update email templates * Bug 459: correct spelling of relationship name * #459: revert unneeded change * #459: create an ActivityUserOrganizationGroup when an existing user accepts an invite Co-authored-by: Isaac Kimaiyo <40719885+Kimaiyo077@users.noreply.github.com>
* ACT-725 When Editing a project other organizations' programs are available Current Behavior: All the programs in the system are available when editing a project Expected Behavior: Only programs belonging to an organization should be available when editing a projects * ACT-727 Change Django views to DRF views: Individual model Left the previous views for now. If this is ok, I can proceed to integrate with the front-end. Also, having one view for both List+CRUD is no good practice. so, my changes can be tested at /formlibrary/individual for List and formlibrary/individual/PK for single items Co-authored-by: Andrew <andrew.tc.pham@gmail.com>
* Use jquery datepicker instead of default date input field * show date on edit Co-authored-by: Isaac Kimaiyo <40719885+Kimaiyo077@users.noreply.github.com>
…re not specified (#468) Co-authored-by: Isaac Kimaiyo <40719885+Kimaiyo077@users.noreply.github.com>
Co-authored-by: Andrew <andrew.tc.pham@gmail.com>
* rename existing labels * add new reporting frequencies * add migrations Co-authored-by: Andrew <andrew.tc.pham@gmail.com>
Update staging branch
Update staging with fix for indicator delete
Codecov Report
@@ Coverage Diff @@
## master #501 +/- ##
=======================================
Coverage 50.65% 50.65%
=======================================
Files 111 111
Lines 8427 8427
=======================================
Hits 4269 4269
Misses 4158 4158 Continue to review full report at Codecov.
|
andrewtpham
approved these changes
Apr 28, 2020
andrewtpham
reviewed
Apr 28, 2020
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.
What is the Purpose?
Update master branch with code from staging in preparation for the upcoming release
What was the approach?
Update master branch with code from staging in preparation for the upcoming release
Are there any concerns to addressed further before or after merging this PR?
Do not squash and merge this pull request. All the commits are needed on the branch exactly as they are in the base branch
Mentions?
@andrewtpham @odenypeter
Issue(s) affected?
None