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

Drishtinew #32

Open
wants to merge 119 commits into
base: master
Choose a base branch
from
Open

Drishtinew #32

wants to merge 119 commits into from

Conversation

beloved23
Copy link

Merger

@naveen-kommuri
Migrate to gradle
64cd123
@naveen-kommuri
Conversion from drishti to opensrp
ff4cf44
@naveen-kommuri
Removing kannada language in all forms
a6f189d
@naveen-kommuri
Doctor module and dependent source
faab9ac
@naveen-kommuri
Migrate bluetooth devices
63f5537
@naveen-kommuri
Modifications on doctor url
16d8ccf
@naveen-kommuri
Append logout and network status
f53afcf
@naveen-kommuri
Added logout feature and network status icon
8e3c6a1
@naveen-kommuri
Auto populating age based on woman date of birth
f6c5b4f
@naveen-kommuri
Added flags for completed plan of care and pending.
b840d09
@naveen-kommuri
Age validation logic updated in Xforms.
286133a
@naveen-kommuri
ANM to suggest drugs based on health condition
5f31dbc
@naveen-kommuri
Login flow updated
d443642
@naveen-kommuri
Add new graph of vitals for doctors to view
b74dc00
@naveen-kommuri
Convert from hybrid to native overview screen for anms
d588812
@naveen-kommuri
Add new forms for Anc registeration,anc Registeration OA, Anc Visit Edit
0b3b35f
@naveen-kommuri
Add new library for charts
79e56ee
@naveen-kommuri
Minor Changes & Miscellaneous
93c99c9
@naveen-kommuri
Minor changes in ANC Registeration,ANC Registeration OA,ANC Visit, Vi…
cd9263e 
…ew ANC Registeration OA Forms
@naveen-kommuri
Display vital readings in overview screen
eaa0913
@naveen-kommuri
Implemented High risk priority view for patient on doctor view. And D…
9dfc3b5 
…octor refer to further consultation functionality has been added
@naveen-kommuri
Configurable/Custom form fields for EC,ANC,PNC,Child Registerations
af4d0a1
@naveen-kommuri
Append village field to enkento forms
d3bd7ec
@naveen-kommuri
Minor Changes & Miscellaneous
8dc1cd6
@naveen-kommuri
Updated ANC Registeration,ANC Registeration OA,ANC Visit Edit,Child R…
8dddd33 
…egisteration EC,Child Registeration OA,Delivery Plan, EC Edit,EC Registeration,PNC Registeration OA,PNC Visit,Edit ANC Registeration,Edit ANC Registeration OA,Edit PNC Registeration,Edit PNC Registeration OA forms
@naveen-kommuri
Add new feature anm can give Plan of care
1680ccf
@naveen-kommuri
Minor Changes & Miscellaneous
88972bc
@naveen-kommuri
Updated DOB,LMP Date fields and minor changes in ANC Registeration OA…
69b27e6 
…,ANC Registeration Edit,ANC Registeration,ANC Visit,Child Registeration OA,Edit EC,EC Registeration,PNC Registeration OA,PNC Registeration Edit OA enkento forms.
@naveen-kommuri
Minor & Miscellaneous Changes
e1cbf80
@naveen-kommuri
Updated urls with new params for Doctor refer further and Plan of care.
e1794f5
harykeyrun and others added 30 commits December 4, 2015 18:32
@harykeyrun
Rename
a113734
@naveen-kommuri
Update .travis.yml
3a3af4d
@naveen-kommuri
Update .travis.yml
8c44b11
@naveen-kommuri
Update README.md
99466a9
@naveen-kommuri
Update README.md
cef44b6
@naveen-kommuri
Update README.md
dd7d104
@naveen-kommuri
Functionality Changes in syncing
6d1ba62
@beloved23
Unit testing Doctor's module
33d546e 
2 Classes done so far
@beloved23
Merge remote-tracking branch 'origin/drishtinew' into drishtinew
d741177 
# Conflicts:
#	.gradle/2.2.1/taskArtifacts/cache.properties.lock
#	.gradle/2.2.1/taskArtifacts/fileHashes.bin
#	.gradle/2.2.1/taskArtifacts/fileSnapshots.bin
#	.gradle/2.2.1/taskArtifacts/outputFileStates.bin
#	.gradle/2.2.1/taskArtifacts/taskArtifacts.bin
#	app/build/intermediates/dex/debug/classes.dex
#	app/build/intermediates/incremental/mergeResources/debug/merger.xml
#	app/build/intermediates/pre-dexed/debug/CMSSXT_SDK v1.2-c36f0bfa59ad5bc536071e8db446a62a6ef2bccc.jar
#	app/build/intermediates/pre-dexed/debug/CONTEC08A_SDK v1.6-ee32aa420bf6df2839a221d212a318cec30b4d0a.jar
#	app/build/intermediates/pre-dexed/debug/EarTemperature_SDK-8b0609d461572d0485f4a1e12bc42636abcc6185.jar
#	app/build/intermediates/pre-dexed/debug/Sonoline-S_SDK v1.0-2794c4dd515219d8987a7f963d1c2e49b495b80c.jar
#	app/build/intermediates/pre-dexed/debug/achartengine-1.1.0-0767ace40439cd27718ba3d88117a0fa4401c0e2.jar
#	app/build/intermediates/pre-dexed/debug/acra-4.5.0-cef13c010bf00e616d5220ed6ca71eb2108c3e94.jar
#	app/build/intermediates/pre-dexed/debug/autobahn-0.5.0-ee4216b9fd4fb37d2799153b4ebb214f2ddcb18c.jar
#	app/build/intermediates/pre-dexed/debug/classes-3f8a60dfb9eaddbd7ba1eb3c0816476654083796.jar
#	app/build/intermediates/pre-dexed/debug/classes-4c0c94b0312199ef9def29a62978b025d0a48df7.jar
#	app/build/intermediates/pre-dexed/debug/classes-fb75e21d162cee090ef461c99be44d3f55f0e646.jar
#	app/build/intermediates/pre-dexed/debug/commons-codec-1.6-854c1e947a57653cc98da5f5a0e5ed91303e59db.jar
#	app/build/intermediates/pre-dexed/debug/commons-io-2.1-f0c6271f4fabaaec51cd7c5f24f136d112149539.jar
#	app/build/intermediates/pre-dexed/debug/commons-lang3-3.1-a2a519f5564ccd4ce249fb74ae0f4ba238b0842c.jar
#	app/build/intermediates/pre-dexed/debug/gson-2.2.2-2ea3f58d56d2b3db90d0d6e25bf244608911e006.jar
#	app/build/intermediates/pre-dexed/debug/guava-18.0-8033af55fac5554573e37a190c6b09679fdb9528.jar
#	app/build/intermediates/pre-dexed/debug/hellocharts-library-1.5.6-cc77a14b66de8201d0f84371073c91c8245d7ab9.jar
#	app/build/intermediates/pre-dexed/debug/httpcore-4.2.2-b2a70e96f1b3b3d0b3b9d3ca24007ac50028ca43.jar
#	app/build/intermediates/pre-dexed/debug/httpmime-4.2.3-4e7f2f36047cad2b1b5346bdcb884ad096e8a913.jar
#	app/build/intermediates/pre-dexed/debug/internal_impl-21.0.3-79c35000a0b03497a8ddbfcb94595fb5f60eae76.jar
#	app/build/intermediates/pre-dexed/debug/jackson-all-1.6.1-9755d1064d9574c44553d838290cba0fbb9b8ccd.jar
#	app/build/intermediates/pre-dexed/debug/joda-time-2.0-a71521b7a37d4bb1e8a7f551c82b6fef30f0fa99.jar
#	app/build/intermediates/pre-dexed/debug/junit-50f95833abeeed555639f63fa893abd824972839.jar
#	app/build/intermediates/pre-dexed/debug/mockito-all-1.9.5-15a37123f27f5bbc7c108ada31b5c9b441cf0da3.jar
#	app/build/intermediates/pre-dexed/debug/prettytime-1.0.8.final-93d51841dd6a2abe69dbab7cf472855a083fb47d.jar
#	app/build/intermediates/pre-dexed/debug/project_cms50dj_jar-d8bd02ed84b544af8e40b2ca9f75a342d33f93be.jar
#	app/build/intermediates/pre-dexed/debug/rhino-1.7R4-f51eddb7738f5074499b1901b4952036ce185d6d.jar
#	app/build/intermediates/pre-dexed/debug/robotium-solo-5.4.1-c49e2989a5bc85ebc3974633d441def7ba84f7ee.jar
#	app/build/intermediates/pre-dexed/debug/sqlcipher-2.2.0-67dd2786a8cd151de7662d4022898e46ca334457.jar
#	app/build/intermediates/pre-dexed/debug/support-annotations-21.0.3-0b51b1740dd74daea8597eaa3f24d47b216f7082.jar
#	app/build/intermediates/resources/resources-debug-androidTest.ap_
#	app/build/intermediates/resources/resources-debug.ap_
#	app/build/outputs/apk/app-debug-unaligned.apk
#	app/build/outputs/apk/app-debug.apk
#	build/intermediates/dex-cache/cache.xml
#	build/intermediates/gradle_project_sync_data.bin
From Daniel Obuba
a21a5bd
@EswarSakamuri
Update .travis.yml
e5dfd0f
@suresudheer
Updated build.gradle with jacoco configuration
149760b
@suresudheer
Update test cases and add new test case in domain module
398edb3
@suresudheer
Changes in test classes
a533848
@suresudheer
Minor Changes
cc3272a
@suresudheer
Changes in build.gradle file
057196b
@naveen-kommuri
Delete AlertRepositoryTest.java
c8f38fd 
Not necessary
@naveen-kommuri
Delete ChildRepositoryTest.java
7946ee8
@naveen-kommuri
Delete TimelineEventRepositoryTest.java
65b2573
@naveen-kommuri
Delete SettingsRepositoryTest.java
b1fb8d7
@naveen-kommuri
Delete DoctorRepositoryTest.java
73a2293 
Unnecessary Files
@naveen-kommuri
Delete EligibleCoupleRepositoryTest.java
df4c8e5 
Unnecessary Files
@naveen-kommuri
Delete FormDataRepositoryTest.java
3c16cc8 
Unnecessary Files
@naveen-kommuri
Delete MotherRepositoryTest.java
dab8fb8 
Unnecessary Files
@naveen-kommuri
Delete ReportRepositoryTest.java
6e64256 
Unnecessary Files
@naveen-kommuri
Delete RepositoryTest.java
9a878d3 
Unnecessary Files
@naveen-kommuri
Delete ServiceProvidedRepositoryTest.java
427a89d 
Unnecessary Files
@beloved23
Plan of care update...more test cases to be added
873c316
@beloved23
commit
b2a295a
@beloved23
Merge branch 'doctor-diagnosis' of https://github.com/DhanushInfotech…
3e19134 
…/dristhi-app into drishtinew

# Conflicts:
#	.gradle/2.2.1/taskArtifacts/cache.properties.lock
#	.gradle/2.2.1/taskArtifacts/fileHashes.bin
#	.gradle/2.2.1/taskArtifacts/fileSnapshots.bin
#	.gradle/2.2.1/taskArtifacts/outputFileStates.bin
#	.gradle/2.2.1/taskArtifacts/taskArtifacts.bin
#	app/build.gradle
#	app/build/generated/source/r/debug/org/ei/telemedicine/R.java
#	app/build/intermediates/incremental/mergeAssets/debug/merger.xml
#	app/build/intermediates/incremental/mergeResources/debug/merger.xml
#	app/build/intermediates/manifests/full/debug/AndroidManifest.xml
#	app/build/intermediates/res/debug/layout/bluetooth_info_layout.xml
#	app/build/intermediates/resources/resources-debug-androidTest.ap_
#	app/build/intermediates/resources/resources-debug.ap_
#	app/build/intermediates/symbols/debug/R.txt
#	app/build/outputs/logs/manifest-merger-debug-report.txt
#	app/src/main/java/org/ei/telemedicine/view/activity/LoginActivity.java
#	app/src/test/java/org/ei/telemedicine/test/doctor/DoctorANCScreenActivityTest.java
#	app/src/test/java/org/ei/telemedicine/test/doctor/DoctorPNCScreenActivityTest.java
#	app/src/test/java/org/ei/telemedicine/test/view/activity/LoginActivityTest.java
#	build/intermediates/dex-cache/cache.xml
#	build/intermediates/gradle_project_sync_data.bin
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@beloved23 @naveen-kommuri @harykeyrun @EswarSakamuri @suresudheer