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

Pheno apps hack 2019 #49

Closed
wants to merge 136 commits into from
Closed

Pheno apps hack 2019 #49

wants to merge 136 commits into from

Conversation

nickpalladino
Copy link
Collaborator

No description provided.

timparsons and others added 30 commits August 20, 2019 15:09
@timparsons
Start of creating a BrAPI Auth workflow for 3rd party systems
c125a69
@timparsons
Added preference change listener to activate opening the browser for …
833d0a3 
…BrAPI authorization
@BrapiCoordinatorSelby
brapi stuff working with javalib
570e881
@nickpalladino
Added dummy put call for observations endpoint
0fe1de3
Pull ontology from external service and select traits from ontology
5137d45
Add back button to brapi traits load page
bd476ed
@nickpalladino
Added export dialogs, work in progress
8b45935
Merging brapi export branch into brapi integration changes
30427b2
Getting missing changes from brapi_export branch
03ec3a9
@nickpalladino
Fixed local export dialog popping up
2c78eec
@timparsons
Adding logic to hide/show the 'Authorize BrAPI' button as well as to …
96a5c4e 
…change the text of the button. Added a 'Log Out' button. Moved strings to the strings.xml file, and updated code accordingly.
@timparsons
removed unneeded interface implementation
cb30976
@timparsons
Changing save button to say 'Save and Authorize'
279162c
@nickpalladino
Added export success message and reworded failed message
1fdfc52
@nickpalladino
Updated brapi export dialog
f971661
Create query to pull data for export through brapi
86e422a
Merge branch 'brapi_fieldbook_integration' of https://github.com/Phen…
9888701 
…oApps/Field-Book into brapi_fieldbook_integration
Getting more traits to show when importing technology
74922ef
@nickpalladino
Added post for phenotypes endpoint
34d283a
@nickpalladino
Merge branch 'brapi_fieldbook_integration' of https://github.com/Phen…
2137136 
…oApps/Field-Book into brapi_fieldbook_integration
@BrapiCoordinatorSelby
refactoring and basic testing complete
d3eb17f
@BrapiCoordinatorSelby
clean up numeric and percentage traits
ede88fc
@BrapiCoordinatorSelby
Merge branch 'brapi-auth' of https://github.com/timparsons/Field-Book …
6953fe3 
…into timparsons-brapi-auth
@BrapiCoordinatorSelby
small fix for smoke test
9d4bc35
@BrapiCoordinatorSelby
Merge branch 'timparsons-brapi-auth' into PhenoApps_Hack_2019
13d82d3
@BrapiCoordinatorSelby
remove extra stuff from build file
6c42fd9
@BrapiCoordinatorSelby
Merge branch 'PhenoApps_Hack_2019' into PhenoApps_Hack_2019_TraitLayo…
7e3b349 
…ut_Refactoring
@BrapiCoordinatorSelby
Merge pull request #31 from PhenoApps/PhenoApps_Hack_2019_TraitLayout…
a0c9021 
…_Refactoring

Pheno apps hack 2019 trait layout refactoring
@nickpalladino
Merged but still needs some work
5f13e06
Implemented /variables endpoint with brapi library for ontology retri…
a59afab 
…eval
Chris Tucker and others added 29 commits October 10, 2019 14:39
Merge pull request #35 from PhenoApps/FIE-57
b9135bb 
BrAPI trait duplicate errors more specific. Added info messages to st…
Merge branch 'PhenoApps_Hack_2019' into FIE-58
6f509c6
Show info dialog when selecting a BrAPI field
4967a09
@nickpalladino
Brapi synced trait delete NA handling
102fbed
Show brapi info on non-BrAPI trait select
d925899
Fix dialog displaying bug. Add title to dialog.
c79ae63
Hide/Show prev/next buttons to match user options on brapi traits
b320d53
Fixing type in comment
c91ce34
Fixed typo in strings.xml
f90b2e0
Merge pull request #36 from PhenoApps/FIE-58
3307817 
Fie 58
Merge branch 'PhenoApps_Hack_2019' into FIE-61-FIE-62
c4e71b6
Merge pull request #38 from PhenoApps/FIE-61-FIE-62
62c870c 
Fie 61 fie 62
@nickpalladino
Merge pull request #37 from PhenoApps/FIE-55
e24c863 
Brapi synced trait delete NA handling
@nickpalladino
Excluded extraneous columns in trait csv export
5a14069
Fix auth btn. Remove unused category from export page.
1df1ba2
@nickpalladino
Updated based on code review
795c050
Merge pull request #39 from PhenoApps/FIE-64
38e0ae3 
Excluded extraneous columns in trait csv export
Remove string that is no longer used
a0ce151
Merge pull request #40 from PhenoApps/FIE-66-67
cee74be 
Fix auth btn. Remove unused category from export page.
@nickpalladino
Made compatible with API 16
296b632
@nickpalladino
Pulled in jdk Objects methods to handle nulls and keep same functiona…
b16f55e 
…lity
@nickpalladino
Added unit tests
c0fa60d
@nickpalladino
Merge pull request #43 from PhenoApps/FIE-68
04dd58a 
Fie 68
Save brapi field with separate thread to display saving progress wheel
23bea6a
Wrap BrAPI field saving in transaction to handle potential db errors
ece3614
Merge branch 'PhenoApps_Hack_2019' of https://github.com/PhenoApps/Fi…
4a042d9 
…eld-Book into PhenoApps_Hack_2019
Add data conversions for extra BrAPI data types
3d5ac1d
Change confusing timeout comment
9e45a66
Merge pull request #47 from PhenoApps/BBase-8
4a3e6de 
Add data conversions for extra BrAPI data types
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@nickpalladino @ctucker3 @timparsons @BrapiCoordinatorSelby