To Master 3.1.0 #4651
Merged
To Master 3.1.0 #4651
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
Ommited commit hooks to just track work
…HH-collect_individual_date,-admin_area,-registration_id # Conflicts: # src/hct_mis_api/apps/registration_datahub/schema.py # tests/unit/apps/household/test_household_query.py # tests/unit/apps/household/test_individual_query.py # tests/unit/one_time_scripts/test_migrate_data_to_representations.py # tests/unit/one_time_scripts/test_migrate_data_to_representations_performance.py # tests/unit/one_time_scripts/test_migrate_data_to_representations_unit.py
…HH-collect_individual_date,-admin_area,-registration_id # Conflicts: # src/hct_mis_api/apps/household/celery_tasks.py # src/hct_mis_api/apps/household/migrations/0004_migration.py # src/hct_mis_api/one_time_scripts/migrate_data_to_representations.py # tests/unit/apps/household/test_models.py
…HH-collect_individual_date,-admin_area,-registration_id
Staging back
ordering models
…HH-collect_individual_date,-admin_area,-registration_id
drop migration model
Master back
Staging back
Back merge Master > STG
Co-authored-by: Jan Romaniak <[email protected]>
stg- error handling in program cycle mutations
More cleaning
tweak admin
To staging 3.1.0
* remove TP i HS * fix tests & fixes * fix more unit tests * tests * clean up * fix * fixes again * upd filters * upd test * small fixes & add more unit tests * generate schema, remove old properties from queries * pragma no cover * more adjustments * add filter_by_household_id * coverage & set PP.targeting_criteria not nullable * upd migrations * upd tests * upd schema * more changes * fix tests * temp fix * add status filtering to payment verification page * fix snapshot * fix status in test_payment_verification * upd filter * fix filter & upd tests * remove arr in arr verificationStatus * fix PV page, PP plan page displays * upd unit test * test one more time * remove empy files * test * test unit * more ut * upd tests * upd tests * upd tests * pragma added * comment * upd coverage * fix snapshot --------- Co-authored-by: Maciej Szewczyk <[email protected]> Co-authored-by: Maciej Szewczyk <[email protected]>
* add get methods * mypy * fix cache * imports * remove prints * upd ut
update packages frontend part 2
Staging update
Fix migration for dev and stg
* fix default filter * imports
Co-authored-by: Maciej Szewczyk <[email protected]>
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.
No description provided.