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

Added integration of database and data table #19

Merged
merged 5 commits into from
Oct 4, 2018

Conversation

mdmurbach
Copy link
Member

Currently, the MasterTable is hardcoded to be displayed in the data table on the main page, however, eventually it will be automatically updated by the dropdown experiment type selection.

Currently, the User table is hardcoded to be displayed in the data table on the main page, however, we will change that to the MasterTable once populated and eventually it will be automatically updated by the dropdown experiment type selection.

Also added a custom JSONEncoder mixin (from https://github.com/dacb/viscount/blob/a1965fcf0537a64fcaa60f31e9b00fb09afc4ce0/viscount/utils.py) so that the results of the sqlalchemy queries can be jsonified. A work around for setting the default JSON encoding of the AppenderQuery object had to be set to None.
@dacb dacb merged commit 919681a into ECSHackWeek:master Oct 4, 2018
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