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/add indicators to event screen #2

Merged
merged 7 commits into from
Jul 17, 2020

Conversation

xurxodev
Copy link

@xurxodev xurxodev commented Dec 10, 2019

📌 References

⚙️ branches

app:
Origin: feature/add_indicators_to_event_screen Target: 2.0.0_beta
dhis2-android-SDK:
Origin: 056d6e33d3204f8514bf438bc3af6876feeb9a4e
dhis2-rule-engine:
Origin: master

🎩 What is the goal?

Add indicators to event screen

📝 How is it being implemented?

  • I have added a new icon in toolbar and menu of event screen. This icon only is visible if the program of the event has program indicators.
  • I have created a new DialogFragment, layout, presenter for indicators and Dagger classes Component and module
  • I have used existed EventsRuleEngineRepository fixing a bug

The presenter is a copy from enrollment indicators presenter but using event repositories and without filter by enrollment.

For success build It's necessary to add this build gradle to dhis2-rule-engine:

apply plugin: 'java'

dependencies {
    testImplementation 'junit:junit:4.12'
    testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.11.1'
    testImplementation group: 'org.mockito', name: 'mockito-all', version: '1.8.4'
    testImplementation "com.google.truth:truth:0.44"
    testImplementation group: 'nl.jqno.equalsverifier', name: 'equalsverifier', version: '3.1.9'

    implementation 'com.google.code.findbugs:jsr305:3.0.2'
    implementation 'com.google.guava:guava:24.1-android'
    compileOnly "com.google.auto.value:auto-value:1.5.2"
    annotationProcessor "com.google.auto.value:auto-value:1.5.2"
    implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.8.1'
    implementation group: 'commons-logging', name: 'commons-logging', version: '1.2'
    implementation group: 'org.apache.commons', name: 'commons-jexl', version: '2.1.1'
}

💥 How can it be tested?

Use case 1: - Navigate to events for the program 'Yaws - case register (Yaws/003)' and open an existed event then the indicators icon and menu should not be visible
Use case 2: - Navigate to events for the program 'BU02 - Register - With scoring' and open an existed event then the indicators icon and menu should be visible
Use case 3: - 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-

device-2019-12-10-072412

ifoche pushed a commit that referenced this pull request May 27, 2020
@ifoche ifoche merged commit 87a5de6 into 2.0.0_beta Jul 17, 2020
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