Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Feature/show event program stage name according to attribute value #22

Conversation

xurxodev
Copy link

📌 References

⚙️ branches

app:
Origin: feature/show_event_program_stage_name_according_to_attribute_value Target: develop-uio
dhis2-android-SDK:
Origin:feature/download_program_stage_attribute_relation Target: develop-uio
dhis2-rule-engine:
Origin: master

🎩 What is the goal?

The goal is to show the program stage attribute value in the tei dashboards for every event and the header in the event form instead of the program stage name

📝 How is it being implemented?

  • I have created a getProgramStageName function by flavor. this function has been created in the psi flavor searching the attribute value by code HeaderPattern (pending to review).
  • I have created unit tests to getProgramStageNameByAttributeValue function
    this function

getProgramStageName for all other flavors return always the program stage name

Use case 1: - Execute the app after a login a pull against a server with attribute value of a HeaderPattern code (pending to review) attribute assigned to program stage, then in the tei dashboard and in the event form, the title should be the attribute value instead of the program stage name

💾 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-

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 46259d5 into develop-uio Jul 17, 2020
@ifoche ifoche deleted the feature/show_event_program_stage_name_according_to_attribute_value branch July 17, 2020 15:27
xurxodev pushed a commit that referenced this pull request Jun 27, 2023
xurxodev pushed a commit that referenced this pull request Jun 27, 2023
* ANDROAPP-4900 Integrate RTSM module into capture app

* Fixing exported in debug manifests

Fixing exported in debug manifests

* update dependencies and check styles

* kotlin check style

* Androapp 4915 Link RSTM module with current test program

* Removing RecentActivity section xml code from HomeActivity

* Removing RecentActivity Code code from HomeActivity

* Removing RecentActivity Code from  HomeViewModel.kt

* Removing data persistent package and it's files

* Removed this package files

* Removing imports

* Removinf imports from HomeViewModel

* Removed imports

* Removing un necessary usages.

* Delete RecentActivityAdapter

* Removing all code inside dtabaseModule

* Deliting no used functions

* Remove un necessary code

* Delete DatabaseModule.kt

* Update paperwork.json

* Removing room libraries

* Removing TypeConverter Annotation

* Update paperwork.json

* Removing room compile Options annotation

* Update paperwork.json

* Update paperwork.json

* kotlin check style

* Update dhis2-android-sdk

* Adding variables inside homeActivity xml file

* Adding new topbar to all activity_home.xml files

* Update strings.xml

* Adding variables

* Impoting variables

* Update HomeActivity.java

* Update paperwork.json

* Create ic_filter.xml

* Call Settings Activity

* Update paperwork.json

* Setting title and subtitle

* Set title on select DestributionType

* Update paperwork.json

* Adding from and to Strings.

I have added this only in the main strings.xm file. So you i did't dothe transactions.

* Adding Topbar logic usecase according to selected TransactionType

* Update paperwork.json

* Update HomeActivity.java

* Update paperwork.json

* Changing subtitle font size

* change status bar color dynamically

* Update paperwork.json

* Update dhis2-android-sdk

* Update paperwork.json

* Adding title and subTitle Variables.

* Adding title and subtile variables and removing commented code.

* Removing theme variable

* Removing theme variable

* Removing theme variable

* Removing setTitle and Subtitle Method

* Create method to set title on Toolbar

* Binding data from HomeViewmodel to activity_home.xml file

* inding data from HomeViewModel to activity_home.xml files

* Update paperwork.json

* Add data dynamically to android studio

* Adding method to set subtitle

* Removing methods from HomeActivity

* Update paperwork.json

* Removing not used variables

* Update HomeViewModel.kt

* Update paperwork.json

* Update HomeViewModel.kt

* Implement back buttton.

* Status bar color changing support from API 21+

* Update paperwork.json

* Update dhis2-android-sdk

* Correting title on toolbar click sequence

* Update HomeViewModel.kt

* Update paperwork.json

* Test: Toolbar on title change

* Update dhis2-android-sdk

* Test: Toolbar on subtitle change

* Androapp 4924 (#7)

* update SDK

* Create android.yml (#8)

* setup ci (#9)

* Fix item list layout

* Fix imports on ProgramFragment.kt

* Androapp 4930 (#12)

ANDROAPP-4930 Replace Sync button behaviour

* Androapp 4923 (#11) Settings section new layout

* Sync develop (#15)

* Androapp 4955 (#13)

App bar design review

* fix GranularSyncPresenterImpl.kt test

* Androapp 4953 (#14)

* Androapp 5000 (#16)

Create DataentryFragment

* Androapp 5025 (#17)

Move Search box and scan code buttons to Dataentry section

* Androapp 4925 (#18)

* Implement table structure for data entry

* Initialize ManageStockViewModel.kt to get data entry into table

* stock table label

* update

* loading ManageStockViewModel.kt for data entry

* building table for data entry

* updade

* Removing initialization by SavedStateHandle, removing init method to initialize data

* Resolving merge

* Resolving code style

* update

* update

* adding test dependency

* resolving tests

* update

* resolving code style

* resolving manage stock view model unit test

* initializing transaction

* update

* resolving code style

* removing stock management

* Insert table into main content

* moving table, methods and removing unnecessary vars

* fixing code style

* removing form dependency

* removing hardcoded appconfig

* removing commend and make proceed button go to review

* resolving code style

* Changing text color

* calling mdc theme as parent of the tree component

* moving mapTableModel to ManageStockViewModel.kt

* implementing mapTableModel to ManageStockViewModel.kt

* Removing mdctheme

* Resolving code style

* Androapp 5036 (#19)

Implement search

* ANDROAPP-4900 Integrate RTSM module into capture app

* Fixing exported in debug manifests

Fixing exported in debug manifests

* update dependencies and check styles

* kotlin check style

* Androapp 4915 Link RSTM module with current test program

* Removing RecentActivity section xml code from HomeActivity

* Removing RecentActivity Code code from HomeActivity

* Removing RecentActivity Code from  HomeViewModel.kt

* Removing data persistent package and it's files

* Removed this package files

* Removing imports

* Removinf imports from HomeViewModel

* Removed imports

* Removing un necessary usages.

* Delete RecentActivityAdapter

* Removing all code inside dtabaseModule

* Deliting no used functions

* Remove un necessary code

* Delete DatabaseModule.kt

* Update paperwork.json

* Removing room libraries

* Removing TypeConverter Annotation

* Update paperwork.json

* Removing room compile Options annotation

* Update paperwork.json

* Update paperwork.json

* kotlin check style

* Adding variables inside homeActivity xml file

* Adding new topbar to all activity_home.xml files

* Update strings.xml

* Adding variables

* Impoting variables

* Update HomeActivity.java

* Update paperwork.json

* Create ic_filter.xml

* Call Settings Activity

* Update paperwork.json

* Setting title and subtitle

* Set title on select DestributionType

* Update paperwork.json

* Adding from and to Strings.

I have added this only in the main strings.xm file. So you i did't dothe transactions.

* Adding Topbar logic usecase according to selected TransactionType

* Update paperwork.json

* Update HomeActivity.java

* Update paperwork.json

* Changing subtitle font size

* Update paperwork.json

* change status bar color dynamically

* Update paperwork.json

* Adding title and subTitle Variables.

* Adding title and subtile variables and removing commented code.

* Removing theme variable

* Removing theme variable

* Removing theme variable

* Removing setTitle and Subtitle Method

* Create method to set title on Toolbar

* Binding data from HomeViewmodel to activity_home.xml file

* inding data from HomeViewModel to activity_home.xml files

* Update paperwork.json

* Add data dynamically to android studio

* Adding method to set subtitle

* Removing methods from HomeActivity

* Update paperwork.json

* Removing not used variables

* Update HomeViewModel.kt

* Update paperwork.json

* Update HomeViewModel.kt

* Implement back buttton.

* Update paperwork.json

* Status bar color changing support from API 21+

* Correting title on toolbar click sequence

* Update HomeViewModel.kt

* Update paperwork.json

* Test: Toolbar on title change

* Test: Toolbar on subtitle change

* Androapp 4924 (#7)

* Create android.yml (#8)

* setup ci (#9)

* Fix item list layout

* Fix imports on ProgramFragment.kt

* Androapp 4930 (#12)

ANDROAPP-4930 Replace Sync button behaviour

* Androapp 4923 (#11) Settings section new layout

* Sync develop (#15)

* Androapp 4955 (#13)

App bar design review

* fix GranularSyncPresenterImpl.kt test

* Androapp 4953 (#14)

* Androapp 5000 (#16)

Create DataentryFragment

* Androapp 5025 (#17)

Move Search box and scan code buttons to Dataentry section

* Androapp 4925 (#18)

* Implement table structure for data entry

* Initialize ManageStockViewModel.kt to get data entry into table

* stock table label

* update

* loading ManageStockViewModel.kt for data entry

* building table for data entry

* updade

* Removing initialization by SavedStateHandle, removing init method to initialize data

* Resolving merge

* Resolving code style

* update

* update

* adding test dependency

* resolving tests

* update

* resolving code style

* resolving manage stock view model unit test

* initializing transaction

* update

* resolving code style

* removing stock management

* Insert table into main content

* moving table, methods and removing unnecessary vars

* fixing code style

* removing form dependency

* removing hardcoded appconfig

* removing commend and make proceed button go to review

* resolving code style

* Changing text color

* calling mdc theme as parent of the tree component

* moving mapTableModel to ManageStockViewModel.kt

* implementing mapTableModel to ManageStockViewModel.kt

* Removing mdctheme

* Resolving code style

* Androapp 5036 (#19)

Implement search

* update table usage

* Androapp 5037 (#21)

Implement scan button

* adding testing credentials to lmis

* fix code style

* implementing data entry

* Adding Verifications to solve table colors (#22)

Correct table color

* implementing data entry: test

* creating state for table data entry

* implementing screen state and stock item load

* feat: [ANDROAPP-4919] Remove SDK submodule and use LMIS SNAPSHOT

* Implementing data entry with item cache stored: blocked

* fixing merge conflicts

* stock items

* when user finish edition apply program rules

* Set title and subtitle on input field

* Implementing conceal backdrop when cell is clicked and table error management

* code style format

* unused var

* code style format (removing comma)

* code style format

* refactoring table error handler

* refactoring table on edit cell

* refactoring table on edit cell to conceal backdrop

* code style check

* [ANDROAPP-5035] avoid crash on backdrop

Co-authored-by: Miguel Vasco Macamo <miguelvascomacamo@gmail.com>
Co-authored-by: Carlos Macaneta <56470814+CarlosMacaneta@users.noreply.github.com>
Co-authored-by: Carlos Macaneta <carlosmacaneta@hotmail.com>
Co-authored-by: andresmr <personal@andresmr.com>
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants