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.

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

Conversation

xurxodev
Copy link

📌 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?

  • I have merged the branch and solve conflicts

💥 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?

  • Nope, we can just merge this branch.
  • Yes, but we need to apply it before merging this branch.
  • Yes, it's already applied.

🎨 UI changes?

  • Nope, the UI remains as beautiful as it was before!
  • Yeap, here you have some screenshots-

xurxodev and others added 14 commits December 2, 2019 13:32
…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
Copy link
Member

@ifoche ifoche left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks @xurxodev

@ifoche ifoche merged commit c8d8a7e into develop-uio Jul 17, 2020
@ifoche 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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants