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

BrAPI Workflow UI #1048

Draft
wants to merge 15 commits into
base: main
Choose a base branch
from
Draft

BrAPI Workflow UI #1048

wants to merge 15 commits into from

Commits on May 17, 2024

  1. init temporary commit

    @chaneylc
    chaneylc committed May 17, 2024
    Configuration menu
    Copy the full SHA
    f8231b1 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. Merge branch 'refs/heads/main' into brapi_workflows

    @chaneylc
    chaneylc committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    f9bce5d View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2024

  1. Rename .java to .kt

    @chaneylc
    chaneylc committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    ee796f8 View commit details
    Browse the repository at this point in the history

  2. init commit

    @chaneylc
    chaneylc committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    0dccfaf View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2024

  1. init commit

    @chaneylc
    chaneylc committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    6b46d3e View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/brapi_workflows' into brapi_work… 

    …flows

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/fieldbook/tracker/activities/brapi/update/BrapiCropsFilterActivity.kt
#	app/src/main/java/com/fieldbook/tracker/activities/brapi/update/BrapiFilterActivity.kt
#	app/src/main/java/com/fieldbook/tracker/activities/brapi/update/BrapiProgramFilterActivity.kt
#	app/src/main/java/com/fieldbook/tracker/activities/brapi/update/BrapiSeasonsFilterActivity.kt
#	app/src/main/java/com/fieldbook/tracker/activities/brapi/update/BrapiStudyFilterActivity.kt
#	app/src/main/java/com/fieldbook/tracker/activities/brapi/update/BrapiStudyImportActivity.kt
#	app/src/main/java/com/fieldbook/tracker/activities/brapi/update/BrapiTrialsFilterActivity.kt
#	app/src/main/java/com/fieldbook/tracker/brapi/service/BrAPIServiceV2.java
#	app/src/main/java/com/fieldbook/tracker/brapi/service/core/BrapiAlias.kt
#	app/src/main/java/com/fieldbook/tracker/brapi/service/core/ProgramService.kt
#	app/src/main/java/com/fieldbook/tracker/brapi/service/core/SeasonService.kt
#	app/src/main/java/com/fieldbook/tracker/brapi/service/core/StudyService.kt
#	app/src/main/java/com/fieldbook/tracker/brapi/service/core/TrialService.kt
#	app/src/main/java/com/fieldbook/tracker/dialogs/BrapiFilterBottomSheetDialog.kt
#	app/src/main/res/layout/activity_brapi_importer.xml
    @chaneylc
    chaneylc committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    9f6ec26 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2024

  1. init commit

    @chaneylc
    chaneylc committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    2c193fd View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2024

  1. added delete sweep / total result number chip in study filter 

    various ui updates
filtered level selection to those that exist, view is disabled until all data is received
changed text filtering to AND unique tokens instead of OR
trials are now filtered by chosen program
seasons are filtered by program and trial
    @chaneylc
    chaneylc committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    237da00 View commit details
    Browse the repository at this point in the history

  2. fixed clearing all filter preferences

    @chaneylc
    chaneylc committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    764c9fa View commit details
    Browse the repository at this point in the history

  3. added ui flow to go back to study filter if the importer found 0 plot… 

    …s in a selected study
    @chaneylc
    chaneylc committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    5bbe25e View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2024

  1. minor ui fixes 

    fix observation levels showing when they don't exist as units
    @chaneylc
    chaneylc committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    a6d216d View commit details
    Browse the repository at this point in the history

  2. slightly decreased shading around search bar

    @chaneylc
    chaneylc committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    4123d87 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2024

  1. search bar shadow fix

    @trife
    trife committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    06dba8a View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. added invalidate brapi import cache interval preference

    @chaneylc
    chaneylc committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    5a8eef4 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/brapi_workflows' into brapi_work… 

    …flows
    @chaneylc
    chaneylc committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    bd1d8f3 View commit details
    Browse the repository at this point in the history