forked from dhis2/dhis2-android-capture-app
-
Notifications
You must be signed in to change notification settings - Fork 4
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.
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
Feature/bring from widp add indicators to event screen #24
Merged
ifoche
merged 14 commits into
develop-uio
from
feature/bring_from_widp_add_indicators_to_event_screen
Jul 17, 2020
Merged
Feature/bring from widp add indicators to event screen #24
ifoche
merged 14 commits into
develop-uio
from
feature/bring_from_widp_add_indicators_to_event_screen
Jul 17, 2020
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
…screen' into merge/upstream_develop_add_indicators_to_event_screen_feature # Conflicts: # app/src/main/java/org/dhis2/data/forms/dataentry/EventsRuleEngineRepository.java # app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureActivity.java # app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureComponent.java # app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureContract.java # app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureModule.java # app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCapturePresenterImpl.java # app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureRepositoryImpl.java # app/src/main/java/org/dhis2/usescases/main/program/ProgramPresenter.kt # app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/indicators/IndicatorsAdapter.java # dhis2-rule-engine
…eature' into feature/bring_from_widp_add_indicators_to_event_screen # Conflicts: # app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureContract.java # app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureRepositoryImpl.java # app/src/main/res/layout/activity_event_capture.xml
ifoche
approved these changes
Jul 17, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thanks @xurxodev
ifoche
deleted the
feature/bring_from_widp_add_indicators_to_event_screen
branch
July 17, 2020 16:29
xurxodev
pushed a commit
that referenced
this pull request
Jun 27, 2023
* feat: [ANDROAPP-4954] Use commons sync process * [ANDROAPP-4954] Remove sync logic * feat: [ANDROAPP-4954] Reload data when sync finishes * feat: [ANDROAPP-4954] Testing coroutines * feat: [ANDROAPP-4954] KTLINT check * feat: [ANDROAPP-4954] Fix unused imports * feat: [ANDROAPP-4954] Fix code style
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.
📌 References
⚙️ branches
app:
Origin: feature/bring_from_widp_add_indicators_to_event_screen Target: develop-uio
dhis2-android-SDK:
Origin: develop-uio
dhis2-rule-engine:
Origin: android_2.0.1
🎩 What is the goal?
Bring from widp the feature to add indicators to the event screen
📝 How is it being implemented?
💥 How can it be tested?
Note: I have some problems executing this branch but executing clean project the problems are solved.
Use case 1: - Navigate to events for the program with indicators with the display in forms check active like 'Yaws TCT (Event)' and open an existed event then the indicators icon and menu should be visible and should calculate the indicators
Use case 2: - Create a new event and show indicators after answer questions, the indicators should be calculated
💾 Requires DB migration?
🎨 UI changes?