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

971 | calculated expression #5

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

971 | calculated expression #5

wants to merge 92 commits into from

Commits on May 11, 2022

  1. Implement calculated-expression extension

    @maimoonak
    maimoonak committed May 11, 2022
    Configuration menu
    Copy the full SHA
    7bf05ce View commit details
    Browse the repository at this point in the history

Commits on May 12, 2022

  1. Fix form value update bug

    @maimoonak
    maimoonak committed May 12, 2022
    Configuration menu
    Copy the full SHA
    b569b81 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored May 12, 2022
    Configuration menu
    Copy the full SHA
    27aef40 View commit details
    Browse the repository at this point in the history

  3. Detect cyclic dependency | fix on init value loading

    @maimoonak
    maimoonak committed May 12, 2022
    Configuration menu
    Copy the full SHA
    d472190 View commit details
    Browse the repository at this point in the history

  4. Merge branch '971_calc_exp' of https://github.com/opensrp/android-fhir … 

    …into 971_calc_exp
    @maimoonak
    maimoonak committed May 12, 2022
    Configuration menu
    Copy the full SHA
    c44e595 View commit details
    Browse the repository at this point in the history

  5. Fix merge conflict

    @maimoonak
    maimoonak committed May 12, 2022
    Configuration menu
    Copy the full SHA
    5536e96 View commit details
    Browse the repository at this point in the history

  6. Make birthdate age dependent | Handle and fix quantity values

    @maimoonak
    maimoonak committed May 12, 2022
    Configuration menu
    Copy the full SHA
    bce9fd9 View commit details
    Browse the repository at this point in the history

  7. Fix failing test

    @maimoonak
    maimoonak committed May 12, 2022
    Configuration menu
    Copy the full SHA
    777489b View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored May 12, 2022
    Configuration menu
    Copy the full SHA
    1eafc31 View commit details
    Browse the repository at this point in the history

  9. quantity viewholder delegate test covergae

    @maimoonak
    maimoonak committed May 12, 2022
    Configuration menu
    Copy the full SHA
    0ee4c27 View commit details
    Browse the repository at this point in the history

  10. Merge branch '971_calc_exp' of https://github.com/opensrp/android-fhir … 

    …into 971_calc_exp
    @maimoonak
    maimoonak committed May 12, 2022
    Configuration menu
    Copy the full SHA
    1f43305 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2022

  1. Test coverage for update flow

    @maimoonak
    maimoonak committed May 13, 2022
    Configuration menu
    Copy the full SHA
    3fe03fe View commit details
    Browse the repository at this point in the history

  2. spotless fix

    @maimoonak
    maimoonak committed May 13, 2022
    Configuration menu
    Copy the full SHA
    8ae3161 View commit details
    Browse the repository at this point in the history

  3. spotless fix | re-run ci

    @maimoonak
    maimoonak committed May 13, 2022
    Configuration menu
    Copy the full SHA
    e56bd98 View commit details
    Browse the repository at this point in the history

  4. Merge branch '971_calc_exp' of https://github.com/opensrp/android-fhir … 

    …into 971_calc_exp
    @maimoonak
    maimoonak committed May 13, 2022
    Configuration menu
    Copy the full SHA
    d4d8e1f View commit details
    Browse the repository at this point in the history

Commits on May 16, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored May 16, 2022
    Configuration menu
    Copy the full SHA
    1acf759 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2022

  1. Test covergae for questionnaire fragment

    @maimoonak
    maimoonak committed May 19, 2022
    Configuration menu
    Copy the full SHA
    219dd9e View commit details
    Browse the repository at this point in the history

  2. Merge branch '971_calc_exp' of https://github.com/opensrp/android-fhir … 

    …into 971_calc_exp
    @maimoonak
    maimoonak committed May 19, 2022
    Configuration menu
    Copy the full SHA
    0fdb56b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored May 19, 2022
    Configuration menu
    Copy the full SHA
    b613865 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2022

  1. test coverage for quantity types

    @maimoonak
    maimoonak committed May 20, 2022
    Configuration menu
    Copy the full SHA
    5fff50d View commit details
    Browse the repository at this point in the history

  2. questionnaire fragment test with launchInFragmentContainer

    @maimoonak
    maimoonak committed May 20, 2022
    Configuration menu
    Copy the full SHA
    23ed2e3 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored May 30, 2022
    Configuration menu
    Copy the full SHA
    5e41ae4 View commit details
    Browse the repository at this point in the history

  2. Update datacapture/src/main/java/com/google/android/fhir/datacapture/… 

    …QuestionnaireViewModel.kt

Co-authored-by: aditya-07 <[email protected]>
    @maimoonak @aditya-07
    maimoonak and aditya-07 authored May 30, 2022
    Configuration menu
    Copy the full SHA
    1f97b8d View commit details
    Browse the repository at this point in the history

Commits on May 31, 2022

  1. Move widget to LayoutList | Run Calculation after state-change

    @maimoonak
    maimoonak committed May 31, 2022
    Configuration menu
    Copy the full SHA
    9e31819 View commit details
    Browse the repository at this point in the history

  2. Revert the run-expression after state-flow

    @maimoonak
    maimoonak committed May 31, 2022
    Configuration menu
    Copy the full SHA
    501f4ef View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jun 1, 2022
    Configuration menu
    Copy the full SHA
    a7b8709 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jun 1, 2022
    Configuration menu
    Copy the full SHA
    39cebfa View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jun 2, 2022
    Configuration menu
    Copy the full SHA
    8ed91d7 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jun 3, 2022
    Configuration menu
    Copy the full SHA
    37fd56d View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jun 6, 2022
    Configuration menu
    Copy the full SHA
    dddfd20 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jun 6, 2022
    Configuration menu
    Copy the full SHA
    cda1f03 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2022

  1. Merge branch 'master' into 971_calc_exp

    @dubdabasoduba
    dubdabasoduba authored Jun 7, 2022
    Configuration menu
    Copy the full SHA
    a5993ff View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jun 8, 2022
    Configuration menu
    Copy the full SHA
    b5e8352 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2022

  1. Merge branch 'master' into 971_calc_exp

    @dubdabasoduba
    dubdabasoduba authored Jun 10, 2022
    Configuration menu
    Copy the full SHA
    58fb48e View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2022

  1. Merge branch 'master' into 971_calc_exp

    @dubdabasoduba
    dubdabasoduba authored Jun 15, 2022
    Configuration menu
    Copy the full SHA
    b566b28 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2022

  1. Merge branch 'master' into 971_calc_exp

    @dubdabasoduba
    dubdabasoduba authored Jun 16, 2022
    Configuration menu
    Copy the full SHA
    28f0c65 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jun 20, 2022
    Configuration menu
    Copy the full SHA
    284524b View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jun 30, 2022
    Configuration menu
    Copy the full SHA
    2ce0055 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jul 4, 2022
    Configuration menu
    Copy the full SHA
    bf956c5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jul 4, 2022
    Configuration menu
    Copy the full SHA
    3c227f2 View commit details
    Browse the repository at this point in the history

  3. remove empty line changes

    @maimoonak
    maimoonak committed Jul 4, 2022
    Configuration menu
    Copy the full SHA
    0414961 View commit details
    Browse the repository at this point in the history

  4. Merge branch '971_calc_exp' of https://github.com/opensrp/android-fhir … 

    …into 971_calc_exp
    @maimoonak
    maimoonak committed Jul 4, 2022
    Configuration menu
    Copy the full SHA
    2406e26 View commit details
    Browse the repository at this point in the history

  5. spotless fix

    @maimoonak
    maimoonak committed Jul 4, 2022
    Configuration menu
    Copy the full SHA
    bbda724 View commit details
    Browse the repository at this point in the history

  6. Esperesso test | Fix failing test

    @maimoonak
    maimoonak committed Jul 4, 2022
    Configuration menu
    Copy the full SHA
    1fd726c View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jul 5, 2022
    Configuration menu
    Copy the full SHA
    4c4f1ef View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2022

  1. Merge main and resolve conflicts

    @maimoonak
    maimoonak committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    4793baf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jul 20, 2022
    Configuration menu
    Copy the full SHA
    d402a3f View commit details
    Browse the repository at this point in the history

  3. Remove unnessary changes

    @maimoonak
    maimoonak authored Jul 20, 2022
    Configuration menu
    Copy the full SHA
    e738864 View commit details
    Browse the repository at this point in the history

  4. Fix espresso tests

    @maimoonak
    maimoonak committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    4b4aaaf View commit details
    Browse the repository at this point in the history

  5. Merge branch '971_calc_exp' of https://github.com/opensrp/android-fhir … 

    …into 971_calc_exp
    @maimoonak
    maimoonak committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    f1cb2bf View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jul 20, 2022
    Configuration menu
    Copy the full SHA
    be654e1 View commit details
    Browse the repository at this point in the history

  7. Ignore Failing tests

    @maimoonak
    maimoonak committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    c6032aa View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jul 21, 2022
    Configuration menu
    Copy the full SHA
    7b2b4bd View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jul 21, 2022
    Configuration menu
    Copy the full SHA
    2c6a86f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jul 21, 2022
    Configuration menu
    Copy the full SHA
    26fb54a View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jul 25, 2022
    Configuration menu
    Copy the full SHA
    cefbb96 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jul 26, 2022
    Configuration menu
    Copy the full SHA
    f51eb9e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jul 26, 2022
    Configuration menu
    Copy the full SHA
    1d2ae03 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jul 27, 2022
    Configuration menu
    Copy the full SHA
    e12f3bc View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Jul 29, 2022
    Configuration menu
    Copy the full SHA
    2f868ce View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Aug 5, 2022
    Configuration menu
    Copy the full SHA
    f2a1aec View commit details
    Browse the repository at this point in the history

  2. Revert ignore test | merge main | refactor

    @maimoonak
    maimoonak committed Aug 5, 2022
    Configuration menu
    Copy the full SHA
    9302aa0 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Aug 12, 2022
    Configuration menu
    Copy the full SHA
    01bc73d View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2022

  1. Merge master and resolve conflicts

    @maimoonak
    maimoonak committed Sep 2, 2022
    Configuration menu
    Copy the full SHA
    6651038 View commit details
    Browse the repository at this point in the history

  2. Merge branch '971_calc_exp' of https://github.com/opensrp/android-fhir … 

    …into 971_calc_exp
    @maimoonak
    maimoonak committed Sep 2, 2022
    Configuration menu
    Copy the full SHA
    cb2a027 View commit details
    Browse the repository at this point in the history

  3. spotless fix

    @maimoonak
    maimoonak committed Sep 2, 2022
    Configuration menu
    Copy the full SHA
    77b163e View commit details
    Browse the repository at this point in the history

  4. Rename tests

    @maimoonak
    maimoonak committed Sep 2, 2022
    Configuration menu
    Copy the full SHA
    b9f40b6 View commit details
    Browse the repository at this point in the history

  5. Add tests and docs

    @maimoonak
    maimoonak committed Sep 2, 2022
    Configuration menu
    Copy the full SHA
    54a8f11 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak committed Sep 15, 2022
    Configuration menu
    Copy the full SHA
    9089ceb View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Sep 15, 2022
    Configuration menu
    Copy the full SHA
    76c934f View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Sep 19, 2022
    Configuration menu
    Copy the full SHA
    dc93bdb View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2022

  1. Move catalog calculation to behavior tab

    @maimoonak
    maimoonak committed Sep 23, 2022
    Configuration menu
    Copy the full SHA
    e80c3f4 View commit details
    Browse the repository at this point in the history

  2. Merge master and resolve conflicts

    @maimoonak
    maimoonak committed Sep 23, 2022
    Configuration menu
    Copy the full SHA
    a041d1e View commit details
    Browse the repository at this point in the history

  3. spotless fix

    @maimoonak
    maimoonak committed Sep 23, 2022
    Configuration menu
    Copy the full SHA
    e3f303a View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Sep 26, 2022
    Configuration menu
    Copy the full SHA
    6d06948 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Sep 27, 2022
    Configuration menu
    Copy the full SHA
    f494aff View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Sep 27, 2022
    Configuration menu
    Copy the full SHA
    7459ea4 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Sep 30, 2022
    Configuration menu
    Copy the full SHA
    02f926e View commit details
    Browse the repository at this point in the history

  2. Update datacapture/src/main/java/com/google/android/fhir/datacapture/… 

    …MoreQuestionnaireItemComponents.kt

Co-authored-by: Jing Tang <[email protected]>
    @maimoonak @jingtang10
    maimoonak and jingtang10 authored Sep 30, 2022
    Configuration menu
    Copy the full SHA
    4c16c3a View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2022

  1. Resolve feedback for naming

    @maimoonak
    maimoonak committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    0a3c836 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2022

  1. Resolve feedback for doc and naming

    @maimoonak
    maimoonak committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    e20451d View commit details
    Browse the repository at this point in the history

  2. Refactor the update answer handling logic

    @maimoonak
    maimoonak committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    cfe4c4a View commit details
    Browse the repository at this point in the history

  3. Merge branch '971_calc_exp' of https://github.com/opensrp/android-fhir … 

    …into 971_calc_exp
    @maimoonak
    maimoonak committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    27acf14 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Oct 6, 2022
    Configuration menu
    Copy the full SHA
    8fe48fe View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Oct 6, 2022
    Configuration menu
    Copy the full SHA
    9879702 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Oct 10, 2022
    Configuration menu
    Copy the full SHA
    58184f1 View commit details
    Browse the repository at this point in the history

  2. Resolve feedback and merge master

    @maimoonak
    maimoonak committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    800bba1 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Oct 10, 2022
    Configuration menu
    Copy the full SHA
    4e90294 View commit details
    Browse the repository at this point in the history

  4. Fix failing test

    @maimoonak
    maimoonak committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    89f1115 View commit details
    Browse the repository at this point in the history

  5. Merge branch '971_calc_exp' of https://github.com/opensrp/android-fhir … 

    …into 971_calc_exp
    @maimoonak
    maimoonak committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    1a25f28 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Oct 11, 2022
    Configuration menu
    Copy the full SHA
    6c2e0e4 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2022

  1. Merge branch 'master' into 971_calc_exp

    @maimoonak
    maimoonak authored Oct 12, 2022
    Configuration menu
    Copy the full SHA
    86e7a2b View commit details
    Browse the repository at this point in the history