Thrivepk branch for merge to master #296
Conversation
test server Conflicts: opensrp-app/res/xml/preferences.xml
Conflicts: opensrp-app/res/drawable-mdpi/homestacks.png opensrp-app/res/layout/smart_register_status_bar.xml opensrp-app/src/main/java/org/ei/opensrp/view/fragment/SecuredNativeSmartRegisterFragment.java opensrp-vaccinator/src/main/java/org/ei/opensrp/vaccinator/child/ChildSmartRegisterActivity.java opensrp-vaccinator/src/main/java/org/ei/opensrp/vaccinator/field/FieldMonitorSmartRegisterActivity.java opensrp-vaccinator/src/main/java/org/ei/opensrp/vaccinator/woman/WomanSmartRegisterActivity.java
Conflicts: opensrp-app/res/drawable-mdpi/homestacks.png opensrp-app/src/main/java/org/ei/opensrp/view/fragment/SecuredNativeSmartRegisterFragment.java opensrp-mcare/src/main/java/org/ei/opensrp/mcare/child/mCareChildServiceModeOption.java opensrp-mcare/src/main/res/layout/childdetail_nav_bar.xml opensrp-vaccinator/src/main/res/layout/childdetail_nav_bar.xml opensrp-vaccinator/src/main/res/layout/detail_nav_bar.xml
Conflicts: opensrp-vaccinator/src/main/java/org/ei/opensrp/vaccinator/child/ChildSmartClientsProvider.java opensrp-vaccinator/src/main/java/org/ei/opensrp/vaccinator/woman/WomanSmartClientsProvider.java opensrp-vaccinator/src/main/java/util/Utils.java
… push in chunks, Fixed registers to allow invalid data Conflicts: opensrp-app/assets/web/forms/footer opensrp-vaccinator/build.gradle opensrp-vaccinator/src/main/assets/www/form/child_enrollment/form.json opensrp-vaccinator/src/main/assets/www/form/child_enrollment/form.xml opensrp-vaccinator/src/main/assets/www/form/child_followup/form.json opensrp-vaccinator/src/main/assets/www/form/child_followup/form.xml opensrp-vaccinator/src/main/assets/www/form/offsite_child_followup/form.json opensrp-vaccinator/src/main/assets/www/form/offsite_child_followup/form.xml opensrp-vaccinator/src/main/assets/www/form/offsite_woman_followup/form.json opensrp-vaccinator/src/main/assets/www/form/offsite_woman_followup/form.xml opensrp-vaccinator/src/main/assets/www/form/offsite_woman_followup/form_definition.json opensrp-vaccinator/src/main/assets/www/form/woman_enrollment/form.json opensrp-vaccinator/src/main/assets/www/form/woman_followup/form.json opensrp-vaccinator/src/main/assets/www/form/woman_followup/form.xml opensrp-vaccinator/src/main/java/org/ei/opensrp/vaccinator/child/ChildDetailActivity.java opensrp-vaccinator/src/main/java/org/ei/opensrp/vaccinator/woman/DetailActivity.java opensrp-vaccinator/src/main/java/org/ei/opensrp/vaccinator/woman/WomanDetailActivity.java
…d to 19, Fixed isses #225
…d to 19, Fixed isses #225
…package application
…Removed required validation from retro vaccines, changed version to 1.2.3
Min version 18 and compile version 23 target version 21. Build tool version updated to 23.0.2. Picasso dependency moved to core app from vaccinator app.
…uired for vaccinator app. Site should add it to module lib if needed. (JakeWharton/butterknife#100)
…ServiceModes, SortOptions, FilterOptions, and Layouts and Views which were register specific and should have been in site module rather than core. These were inherited from drishti app. All tests spcific to those also removed from core.
…for Fragment and Activity both. Also launches playstorre for QR code app installation if not exists
…s but details so all data for client in columns is accessible via columnmap. Also changed to index to column name so that change of column index doesnot impacct
…oman register also added wih new grid column that is contact number
… since fragment already loads all views and adapter data.
…ount in main layout
…d at activity detroy
…instead of calling it on view load. Fixed monthly reports as well
… core activity which provides syncers, UI rendering and child provides site specific details.
|
this is a huge pull request , my initial observation is that there are lot of changes like css and resource change stuff done in core library . It would be great if @keymane or @maina could look at it and also if you could achieve that by overriding the resources of the library in your module instead of opensrp-client module . For references maybe you can look into these links (i am sure there are way better articles on overriding resources/resource merging or resource referencing between libraries and project modules): |
|
Documentation would be here https://smartregister.atlassian.net/wiki/display/Documentation/Thrivepk+as+client+core |
|
Thanks @raihan-mpower . This is helpful. I should have overridden the enkteo css and js in project. Other resources have been deleted and modified intentionally. I would explain it in detail in call this week. |
|
7c135c4 |
|
As discused in call and considering the fact that the merge is going to
make other sites do a lot of refactor in their code, and since everyone hav
tight timelines, we have decided (after discussion with Ona team) to change
code in our module. This would not add any conflicting code and merge would
be automatic. Rightnow we are using master repo as a base and making
changes to our module. Hopefully no one else is making changes to core code
...
|
|
Not applicable |
#295 Addressing issue of core merging of vaccinator app to master