-
Notifications
You must be signed in to change notification settings - Fork 0
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
Master overhaul merge to my fork #3
Commits on Sep 19, 2022
-
Configuration menu - View commit details
-
Copy full SHA for f21eaf9 - Browse repository at this point
Copy the full SHA f21eaf9View commit details
Commits on Sep 29, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 6ac01df - Browse repository at this point
Copy the full SHA 6ac01dfView commit details
Commits on Oct 3, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 8c08b70 - Browse repository at this point
Copy the full SHA 8c08b70View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4c8b06d - Browse repository at this point
Copy the full SHA 4c8b06dView commit details
Commits on Oct 11, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 7ea64f7 - Browse repository at this point
Copy the full SHA 7ea64f7View commit details -
Configuration menu - View commit details
-
Copy full SHA for 50588ff - Browse repository at this point
Copy the full SHA 50588ffView commit details
Commits on Oct 17, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 8ce863c - Browse repository at this point
Copy the full SHA 8ce863cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 8c3e68d - Browse repository at this point
Copy the full SHA 8c3e68dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 8213605 - Browse repository at this point
Copy the full SHA 8213605View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2ec55e6 - Browse repository at this point
Copy the full SHA 2ec55e6View commit details
Commits on Oct 25, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 908bf30 - Browse repository at this point
Copy the full SHA 908bf30View commit details -
Configuration menu - View commit details
-
Copy full SHA for 55a37a3 - Browse repository at this point
Copy the full SHA 55a37a3View commit details
Commits on Oct 26, 2022
-
added parameter to the get the recent timestamp records
Configuration menu - View commit details
-
Copy full SHA for 626c901 - Browse repository at this point
Copy the full SHA 626c901View commit details -
Configuration menu - View commit details
-
Copy full SHA for bed5f7a - Browse repository at this point
Copy the full SHA bed5f7aView commit details -
Configuration menu - View commit details
-
Copy full SHA for d5acabc - Browse repository at this point
Copy the full SHA d5acabcView commit details -
Configuration menu - View commit details
-
Copy full SHA for e1319bc - Browse repository at this point
Copy the full SHA e1319bcView commit details
Commits on Oct 27, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 496c48c - Browse repository at this point
Copy the full SHA 496c48cView commit details
Commits on Oct 28, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 0c714a9 - Browse repository at this point
Copy the full SHA 0c714a9View commit details -
Configuration menu - View commit details
-
Copy full SHA for a5ecb04 - Browse repository at this point
Copy the full SHA a5ecb04View commit details
Commits on Oct 29, 2022
-
Configuration menu - View commit details
-
Copy full SHA for fe1f8af - Browse repository at this point
Copy the full SHA fe1f8afView commit details -
Configuration menu - View commit details
-
Copy full SHA for bb12051 - Browse repository at this point
Copy the full SHA bb12051View commit details
Commits on Oct 31, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 98db063 - Browse repository at this point
Copy the full SHA 98db063View commit details -
Configuration menu - View commit details
-
Copy full SHA for f734bab - Browse repository at this point
Copy the full SHA f734babView commit details -
Configuration menu - View commit details
-
Copy full SHA for 89aae11 - Browse repository at this point
Copy the full SHA 89aae11View commit details -
Merge pull request #475 from biocore/csymons_vioscreen_fix
Fix Vioscreen RegCode Bug
Configuration menu - View commit details
-
Copy full SHA for b4a6a59 - Browse repository at this point
Copy the full SHA b4a6a59View commit details
Commits on Nov 1, 2022
-
Configuration menu - View commit details
-
Copy full SHA for e185172 - Browse repository at this point
Copy the full SHA e185172View commit details -
Configuration menu - View commit details
-
Copy full SHA for 17dcca3 - Browse repository at this point
Copy the full SHA 17dcca3View commit details -
Configuration menu - View commit details
-
Copy full SHA for e54e44a - Browse repository at this point
Copy the full SHA e54e44aView commit details -
Configuration menu - View commit details
-
Copy full SHA for fd3b6aa - Browse repository at this point
Copy the full SHA fd3b6aaView commit details
Commits on Nov 2, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 81ce521 - Browse repository at this point
Copy the full SHA 81ce521View commit details -
Configuration menu - View commit details
-
Copy full SHA for 1cb21d9 - Browse repository at this point
Copy the full SHA 1cb21d9View commit details -
Configuration menu - View commit details
-
Copy full SHA for 230efb6 - Browse repository at this point
Copy the full SHA 230efb6View commit details -
Configuration menu - View commit details
-
Copy full SHA for 84650f5 - Browse repository at this point
Copy the full SHA 84650f5View commit details -
Configuration menu - View commit details
-
Copy full SHA for bffb901 - Browse repository at this point
Copy the full SHA bffb901View commit details -
Configuration menu - View commit details
-
Copy full SHA for e4dc6a1 - Browse repository at this point
Copy the full SHA e4dc6a1View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4ace98a - Browse repository at this point
Copy the full SHA 4ace98aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 6562e93 - Browse repository at this point
Copy the full SHA 6562e93View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5563387 - Browse repository at this point
Copy the full SHA 5563387View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0db71e4 - Browse repository at this point
Copy the full SHA 0db71e4View commit details
Commits on Nov 3, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 444669b - Browse repository at this point
Copy the full SHA 444669bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 54e451d - Browse repository at this point
Copy the full SHA 54e451dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 8644706 - Browse repository at this point
Copy the full SHA 8644706View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7d9f81f - Browse repository at this point
Copy the full SHA 7d9f81fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 52c80ae - Browse repository at this point
Copy the full SHA 52c80aeView commit details -
Configuration menu - View commit details
-
Copy full SHA for 7e0a533 - Browse repository at this point
Copy the full SHA 7e0a533View commit details -
Configuration menu - View commit details
-
Copy full SHA for 926aed9 - Browse repository at this point
Copy the full SHA 926aed9View commit details -
Configuration menu - View commit details
-
Copy full SHA for a24c809 - Browse repository at this point
Copy the full SHA a24c809View commit details -
Configuration menu - View commit details
-
Copy full SHA for 95afa04 - Browse repository at this point
Copy the full SHA 95afa04View commit details -
Configuration menu - View commit details
-
Copy full SHA for d62d2cc - Browse repository at this point
Copy the full SHA d62d2ccView commit details -
Merge pull request #477 from biocore/csymons_japan_signup
Changes for THDMI Japan signups
Configuration menu - View commit details
-
Copy full SHA for 77466c2 - Browse repository at this point
Copy the full SHA 77466c2View commit details
Commits on Nov 4, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 0b044c9 - Browse repository at this point
Copy the full SHA 0b044c9View commit details -
Merge pull request #479 from biocore/csymons_japan_signup
Update messages.po for ja_JP
Configuration menu - View commit details
-
Copy full SHA for a38ef24 - Browse repository at this point
Copy the full SHA a38ef24View commit details -
Configuration menu - View commit details
-
Copy full SHA for ebcbb85 - Browse repository at this point
Copy the full SHA ebcbb85View commit details -
Merge pull request #480 from biocore/csymons_japan_signup
Update messages.po for ja_JP
Configuration menu - View commit details
-
Copy full SHA for 5111bcd - Browse repository at this point
Copy the full SHA 5111bcdView commit details -
Configuration menu - View commit details
-
Copy full SHA for cf283c9 - Browse repository at this point
Copy the full SHA cf283c9View commit details -
Merge pull request #481 from biocore/csymons_japan_signup
Update messages.po for ja_JP
Configuration menu - View commit details
-
Copy full SHA for f3c6fa7 - Browse repository at this point
Copy the full SHA f3c6fa7View commit details
Commits on Nov 7, 2022
-
Configuration menu - View commit details
-
Copy full SHA for cfd1850 - Browse repository at this point
Copy the full SHA cfd1850View commit details -
Merge pull request #482 from biocore/csymons_japan_signup
Changes requested by Japanese collaborators
Configuration menu - View commit details
-
Copy full SHA for 979174a - Browse repository at this point
Copy the full SHA 979174aView commit details
Commits on Nov 8, 2022
-
Configuration menu - View commit details
-
Copy full SHA for d5b9d13 - Browse repository at this point
Copy the full SHA d5b9d13View commit details -
Merge pull request #483 from biocore/csymons_japan_signup
Changes requested by Japanese collaborators
Configuration menu - View commit details
-
Copy full SHA for d7027b2 - Browse repository at this point
Copy the full SHA d7027b2View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5778660 - Browse repository at this point
Copy the full SHA 5778660View commit details -
Merge pull request #484 from biocore/csymons_japan_signup
Email change requested by Japanese collaborators
Configuration menu - View commit details
-
Copy full SHA for 1f141fe - Browse repository at this point
Copy the full SHA 1f141feView commit details
Commits on Nov 9, 2022
-
Preventing conflicting patch names so I can merge updates to master into master-overhaul
Configuration menu - View commit details
-
Copy full SHA for a989922 - Browse repository at this point
Copy the full SHA a989922View commit details -
Merge pull request #485 from biocore/master
Merge updates to master into overhaul
Configuration menu - View commit details
-
Copy full SHA for 37c4d57 - Browse repository at this point
Copy the full SHA 37c4d57View commit details
Commits on Nov 11, 2022
-
Merge pull request #476 from raginirai553/master
Adding Data and Bio Consent through DB
Configuration menu - View commit details
-
Copy full SHA for 256be57 - Browse repository at this point
Copy the full SHA 256be57View commit details -
Configuration menu - View commit details
-
Copy full SHA for b2ca0e7 - Browse repository at this point
Copy the full SHA b2ca0e7View commit details
Commits on Nov 14, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 97eb2fe - Browse repository at this point
Copy the full SHA 97eb2feView commit details -
Configuration menu - View commit details
-
Copy full SHA for 75cc25a - Browse repository at this point
Copy the full SHA 75cc25aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 02bfdaf - Browse repository at this point
Copy the full SHA 02bfdafView commit details
Commits on Nov 15, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 27f131b - Browse repository at this point
Copy the full SHA 27f131bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 9c1d3f3 - Browse repository at this point
Copy the full SHA 9c1d3f3View commit details -
Configuration menu - View commit details
-
Copy full SHA for 827c2a1 - Browse repository at this point
Copy the full SHA 827c2a1View commit details
Commits on Nov 16, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 87d4f25 - Browse repository at this point
Copy the full SHA 87d4f25View commit details
Commits on Nov 21, 2022
-
Configuration menu - View commit details
-
Copy full SHA for e6eff67 - Browse repository at this point
Copy the full SHA e6eff67View commit details -
Configuration menu - View commit details
-
Copy full SHA for 216f841 - Browse repository at this point
Copy the full SHA 216f841View commit details
Commits on Nov 22, 2022
-
Merge pull request #488 from biocore/csymons_article_codes
Daklapack Article Code Updates
Configuration menu - View commit details
-
Copy full SHA for bdfad32 - Browse repository at this point
Copy the full SHA bdfad32View commit details -
Configuration menu - View commit details
-
Copy full SHA for ae1f322 - Browse repository at this point
Copy the full SHA ae1f322View commit details -
Configuration menu - View commit details
-
Copy full SHA for 910089c - Browse repository at this point
Copy the full SHA 910089cView commit details -
Merge pull request #490 from biocore/master
Merge master into master-overhaul
Configuration menu - View commit details
-
Copy full SHA for 5d00b26 - Browse repository at this point
Copy the full SHA 5d00b26View commit details
Commits on Nov 28, 2022
-
Merge pull request #487 from raginirai553/master
Update to Consent task previous pull
Configuration menu - View commit details
-
Copy full SHA for 8746dca - Browse repository at this point
Copy the full SHA 8746dcaView commit details
Commits on Nov 30, 2022
-
Configuration menu - View commit details
-
Copy full SHA for ecdfeb7 - Browse repository at this point
Copy the full SHA ecdfeb7View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8c46eee - Browse repository at this point
Copy the full SHA 8c46eeeView commit details
Commits on Dec 1, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 5147c5f - Browse repository at this point
Copy the full SHA 5147c5fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 3f8aaaa - Browse repository at this point
Copy the full SHA 3f8aaaaView commit details -
Configuration menu - View commit details
-
Copy full SHA for bcd996e - Browse repository at this point
Copy the full SHA bcd996eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 5cde512 - Browse repository at this point
Copy the full SHA 5cde512View commit details -
Configuration menu - View commit details
-
Copy full SHA for 1bcae76 - Browse repository at this point
Copy the full SHA 1bcae76View commit details -
Configuration menu - View commit details
-
Copy full SHA for ec5e9f8 - Browse repository at this point
Copy the full SHA ec5e9f8View commit details
Commits on Dec 5, 2022
-
Configuration menu - View commit details
-
Copy full SHA for d54fc81 - Browse repository at this point
Copy the full SHA d54fc81View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7f69b45 - Browse repository at this point
Copy the full SHA 7f69b45View commit details -
Configuration menu - View commit details
-
Copy full SHA for a33654c - Browse repository at this point
Copy the full SHA a33654cView commit details
Commits on Dec 7, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 685ab1a - Browse repository at this point
Copy the full SHA 685ab1aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 0f55513 - Browse repository at this point
Copy the full SHA 0f55513View commit details -
Configuration menu - View commit details
-
Copy full SHA for c752dd7 - Browse repository at this point
Copy the full SHA c752dd7View commit details -
Configuration menu - View commit details
-
Copy full SHA for 36e6d43 - Browse repository at this point
Copy the full SHA 36e6d43View commit details
Commits on Dec 12, 2022
-
Configuration menu - View commit details
-
Copy full SHA for ce2c0bd - Browse repository at this point
Copy the full SHA ce2c0bdView commit details -
Configuration menu - View commit details
-
Copy full SHA for 09e4de7 - Browse repository at this point
Copy the full SHA 09e4de7View commit details -
Merge pull request #459 from SyedAli-789/syed_master-overhaul
Move FFQ's from sample to source
Configuration menu - View commit details
-
Copy full SHA for bd04cf1 - Browse repository at this point
Copy the full SHA bd04cf1View commit details -
Update microsetta_private_api/api/_source.py
Co-authored-by: Daniel McDonald <danielmcdonald@ucsd.edu>
Configuration menu - View commit details
-
Copy full SHA for 327359c - Browse repository at this point
Copy the full SHA 327359cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 65bc9b3 - Browse repository at this point
Copy the full SHA 65bc9b3View commit details
Commits on Dec 13, 2022
-
Merge pull request #497 from biocore/csymons_optout
Functionality to allow interested users to opt out
Configuration menu - View commit details
-
Copy full SHA for a071414 - Browse repository at this point
Copy the full SHA a071414View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2c7a288 - Browse repository at this point
Copy the full SHA 2c7a288View commit details -
Merge pull request #498 from biocore/csymons_delete_fix_new
Resolve external survey account deletion bug.
Configuration menu - View commit details
-
Copy full SHA for 795ff7a - Browse repository at this point
Copy the full SHA 795ff7aView commit details
Commits on Dec 21, 2022
-
Survey database update v2 (#489)
* (WIP) migrating survey to updated structure Work in progress. Triggers need to be added. Some remapped questions need to be remade into new questions due to constraints and new/changed/deleted options. Migraines category needs to be merged and removed. Basic testing w/UI needed. * (WIP) Updated questions 15 new questions created w/shortnames ending in '_v2' to address questions with many changed response options. New questions linked and existing questions unlinked and retired. All triggers added. Migraines section needs merging. Testing against current unittests needed. * (WIP) patch should successfully load. * First unittest fixed Traced entire execution and reviewed all SQL statements. This test appears like it can be resolved with changing some constants. * One test updated * Fix test_edit_sample_locked() Fixed test to use new existing survey. relativedelta(month=2) appeared to have issues w/rollover for both month and year when the current month is 11 (November). Replaced w/standard datetime.timedelta() using 61 days, the median number of days in a given two month span (from beginning of the month to the end of the next month). * Fix test_fetch_survey_template() Added survey information for the new surveys. Did not delete references to the removed surveys for the moment. * Fixed test_delete_source() * Fixed test_survey_localization() Fixed localization using new Basic Information (10) survey. Possible todos in the future would be to replace the magic number 10 w/a new const name and change localization test to es_MX where the localizations are more different. * Fixed test_associate_sample_and_survey() * Fixed test_scrub* tests (3) Also pushing some partial changes for test_bobo_takes_all_local_surveys() from last night. Not sure why they're not in there. * Fixed test_dissociate_sample_from_source_success() * Fixed test_survey_create_success_empty() * Fixed test_fetch_observed_survey_templates() * Fixed test_surveys() * Fixed test_associate_sample_locked() * Fixed test_dissociate_sample_from_source_locked() * Fixed test_dissociate_sample_from_source_success() * Fixed test_update_sample_association_locked() * Fixed test_associate_answered_survey_to_sample_success() * Fixed test_bobo_takes_all_local_surveys() * Fixed last non-test_metadata_qiita_compatible_* test Removed entries from survey_groups that were retired. Added survey_template_ids2() to this commit for possible use fixing test_metadata_qiita_compatible_* tests. * Updated code and tests Updated code and tests to resolve errors after previous adjustments to 0103.sql (now 0104.sql) broke two tests. Broken tests currently stand at four once more. * Resolved conflict * Restored four missing questions in survey groups Four questions were present in the system but missing entries in group_questions, which prevented them from being shown. This has been fixed. * (WIP) Data Migration for Surveys Minor bug in creating new surveys Localization is not implemented Removing old survey not implemented * (WIP) Data Migration Complete Data Migration code complete. Undergoing additional testing. 4 qiita-related tests + 1 additional test is now breaking. Will review and fix along with review of the database changes. * Bugfix * All retired questions migrated to group 10 All retired questions were migrated to group 10 (Basic Information). They previously made up the group number 9 (Retired Questions). They shoudn't appear in querys, because they are retired. However all questions need to be a member of a group, due to the mechanics of the system. * Fixed test_metadata_qiita_compatible_valid() and 1 other error * Fixed test_metadata_qiita_compatible_invalid() * All tests passing * New magic numbers replaced with const names * flake8 * Revised patch sql for new approach. * Updated query to exclude retired survey template ids * Change 0105.sql to 0107.sql * Fixed test_metadata_qiita_compatible_valid() Notes for debug of test_metadata_qiita_compatible_valid_private() included. 3 broken tests outstanding. * All tests passing It appears that the issue was not specifically with template 5, but with some needed reviewing and fixing of _to_pandas_dataframe() and _to_pandas_series(). * flake8 pass * Comments added. Non-ASCII characters replaced. All but one Non-ASCII characters replaced with ASCII equivalents. * sql fix * SQL-injection vectors closed. * lists converted to tuples for sql stmts * ag_login_survey.survey_template_ids now fully populate * Prepended tables w/schema names as may be needed * Inserts updated to handle new constraint * Minor fixes * Resolved name collision * Removed unnecessary updates to text questions. After earlier and more recent changes, including replacing non-ASCII characters with their equivalents and removing encapsulating quotes, there are now only 67 questions which required text changes, down from the original 169. * Minor updates Capitalized a few responses. Removed duplicate entries. Converted magic numbers to consts. * Modified function for clarity. Modified _remote_survey_template_id_from_survey_id() for clarity. * Migrated logic from v1 migration into testable functions. * Added support in migration for text and string values * Confirm free-text is generated dynamically Tests pass locally. Display obs and exp in CI for review * Removed migration function We will not be copying survey data into new surveys with new ids and new template ids. * Migrating code to proper module Migrating new and associated code to survey_template_repo, where it seems more appropriate. * read_survey_template() now uses migrate_templates() migrate_templates() functionality moved to SurveyTemplateRepo, along w/associated functions. Now used by read_survey_template() to populate results w/legacy responses before handing them to the UI. migrate_templates() no longer generates new surveys from old surveys and saves them. migrate_templates() was a better version of get_survey_responses() found in PR #466. Hence I incorporated the other component of #466 (percentage completed value) and folded it into the PR. PR #466 can be considered superseeded. * Possible bugfix tests running on CI appear to think we are constructing a HumanInfo object with 10 parameters, not the nine that are obviously there. Reformatting for clarity and possible fix. * possible bugfix * changing parameter passing to by name * moving back to positional arguments * manually constructing * confirm * clean up and remove comments * Added code + tests to address push to/pull from Qiita. * Fix test to use queried account_id, etc. Test uses an account_id, sample_id, and source_id that are tied to a fixed barcode id, but are dynamically generated on db init. * Fixed private/no private tests Sensitive questions have shortnames that begin with 'PM_'. Unfortunately, all of the 'PM_' questions were retired. Of concern is some of the '_v2' questions (RACE_v2, GENDER_v2, and more) are continuations of retired questions (RACE, GENDER, etc.) that also had 'PM_' variations (PM_ETHNCITIY, PM_GENDER). I've taken the liberty of changing GENDER_v2 to PM_GENDER_v2 as it seems an obvious choice and rebuilt the two tests around that. The others I will leave for discussion. * Updated migrate_responses() methods to use source ids Other minor issues from feedback addressed. * flake8 * (WIP) migrate_responses_by_barcode() updated. migrate_responses_by_barcode() now best fits the responses it returns according to the values closest to a particular timestamp. This timestamp can be defined separately in a helper method. Currently the helper looks for a timestamp from a survey with the same template as the one requested. If a survey doesn't exist, the method will return the creation timestamp of the source associated w/the barcode. * Private data tests now rely on EBI_REMOVE. * Tests fixed * flake8. adjust HumanInfo() for CI * Removed vestigial functionality * HumanInfo fix for CI * flake8 * Update microsetta_private_api/admin/tests/test_admin_api.py Co-authored-by: Daniel McDonald <d3mcdonald@eng.ucsd.edu> * Update microsetta_private_api/admin/tests/test_admin_api.py Co-authored-by: Daniel McDonald <d3mcdonald@eng.ucsd.edu> * Update microsetta_private_api/api/tests/test_api.py Co-authored-by: Daniel McDonald <d3mcdonald@eng.ucsd.edu> * Update microsetta_private_api/repo/tests/test_survey_template_repo.py Co-authored-by: Daniel McDonald <d3mcdonald@eng.ucsd.edu> * Adding constraint to ag_login_surveys Adding constraint to creation_time in ag_login_surveys. * Removed magic numbers * Simplified complex behavior in loop Simplified complex conditionals in a loop. Removed a commented-out test. * Resolve conflict with 0108.sql * Changed timestamp used in _get_timestamp() Changed _get_timestamp() to use date and time w/out timezone values from ag.ag_kit_barcodes. To ensure compatibility with other timestamps, the 'America/Los Angeles' timestamp was assigned to the casted timestamp. The value of the casted timestamp is not changed. * Removed survey_template_id from timesstamp query survey_template_id isn't needed for the revised get_timestamp() query, as the timestamps for all results are going to be the same, due to the way the query is written. Moreover, regardless of whether there are say multiple template 10s, or no template 10s, we would want to center our response results around this timestamp. * flake8 * Resolved post-merge test fail * Add temporal awareness to admin_repo.get_survey_metadata * Lint fixes * Addressing comments * Fix translation of best surveys back into answer:template map * Lint fix * Fix * Fix * Remove duplicate questions from metadata * Lint fix * Fix date casting Co-authored-by: Daniel McDonald <d3mcdonald@eng.ucsd.edu> Co-authored-by: Cassidy Symons <csymons@eng.ucsd.edu>
Configuration menu - View commit details
-
Copy full SHA for e499dad - Browse repository at this point
Copy the full SHA e499dadView commit details
Commits on Jan 5, 2023
-
* WIP: Perk fulfillment code * Lint fixes * Lint fixes * Lint fixes * Lint fixes * Test fix * Email templates for perk fulfillment * Test adjustment * Updates to address comments/requests * Lint fixes * Addressing PR comments * Lint fixes * Disabling Daklapack ordering & celery tasks for testing * Get transactions on celery start * Route invalid address emails to myself temporarily * Test perks without fulfillment details * Test new perk fulfillment * Test shipping updates * Fix shipping update query * Fix shipping update query * Email adjustments * Re-test get fundrazr transactions to verify email fixes * Re-test fulfillment to verify email fixes * Test date limiting of address verification * Test date limiting of address verification * Test date limiting of address verification * Debug not getting new transaction * Re-test perk fulfillment w/ Daklapack ordering * Cleaning up from testing * Lint fixes * Add unit test for shipping updates * Lint fixes * Run Celery tasks on startup * Only send Fundrazr email if transactions > 0 * Add email logging to perk fulfillment * Resolve db patch filename conflict * Test email logging * Lint * Fix subscription fulfillment bug + expand unit tests * Lint * Update perk_fulfillment_repo.py * Update celery_utils.py * Update server_config.json * Update admin_impl.py * Update test_perk_fulfillment_repo.py * Update subscription.py
Configuration menu - View commit details
-
Copy full SHA for 06344e9 - Browse repository at this point
Copy the full SHA 06344e9View commit details
Commits on Jan 6, 2023
-
Request account removal (#447)
* Added user-level request-account-deletion support. * Added unit-testing, cancel method. * Added delete/ignore support, logging. Added admin-level endpoints to delete an account from queue, or ignore the request. All actions are logged and stored in a separate table. Ignore functionality was removed as a user-accessible endpoint. * Added notification email for when an account is deleted * Test removal of send_email() Confirming send_email is cause of test failure in CI. * Toggle disable_auth flag Set disable_authentication = False for the purposes of testing in CI. * Reinstate send_mail() * Remove disable_authentication from server_config.json Removed disable_authentication from server_config.json. Disabled account deleted send_email() for testing. * Bugfix * Undo send_email() * Revert "Bugfix" This reverts commit e1b35f9. * Reapplied fixes * Formatting changes based on feedback. * Updated recent formatting changes * Updated based on feedback. * Commented out send_mail() in allow_removal_request() * Uncommenting send_email() to obtain CI results * Remove send notification email when deleting user * Removed vestigial email notification-related code * Rename 0101.sql to 0102.sql Another 0101.sql has already been merged into the repository. * Update vioscreen_repo.py Removed unneeded closing quote * Resolve name conflict * Commits don't occur in repos * Account queue now records admin id instead of sub * Added unittests for removal_queue_repo.py * New cleanup code targets only ids created for testing * Endpoint added for cancel_request_remove_account() Endpoint added for cancel_request_remove_account(). This endpoint is not currently used by the UI. API test updated to distinguish between removing the user from the queue using cancel_request_remove_account() vs (admin) ignore_removal_request(). Disposition must now be either 'deleted' or 'ignored'. * Changed disposition to enum type * Update server.py * Update vioscreen_repo.py * Rename 0110.sql to 0111.sql Co-authored-by: Cassidy Symons <83246693+cassidysymons@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for c620348 - Browse repository at this point
Copy the full SHA c620348View commit details
Commits on Jan 9, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 9565707 - Browse repository at this point
Copy the full SHA 9565707View commit details
Commits on Jan 10, 2023
-
Merge pull request #500 from charles-cowart/master-overhaul-fix
Fixes error in microsetta-interface integration test
Configuration menu - View commit details
-
Copy full SHA for cdce8dc - Browse repository at this point
Copy the full SHA cdce8dcView commit details
Commits on Jan 12, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 46fab7f - Browse repository at this point
Copy the full SHA 46fab7fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 3b2319f - Browse repository at this point
Copy the full SHA 3b2319fView commit details
Commits on Jan 17, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 5daccbc - Browse repository at this point
Copy the full SHA 5daccbcView commit details
Commits on Jan 18, 2023
-
Pinning flask-babel to 2.x due to breaking changes in 3.0.0.
Configuration menu - View commit details
-
Copy full SHA for 0dd0044 - Browse repository at this point
Copy the full SHA 0dd0044View commit details
Commits on Jan 19, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 3e4df72 - Browse repository at this point
Copy the full SHA 3e4df72View commit details
Commits on Jan 20, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 62f4231 - Browse repository at this point
Copy the full SHA 62f4231View commit details -
Configuration menu - View commit details
-
Copy full SHA for 91183bf - Browse repository at this point
Copy the full SHA 91183bfView commit details
Commits on Jan 23, 2023
-
Configuration menu - View commit details
-
Copy full SHA for dc6dd0e - Browse repository at this point
Copy the full SHA dc6dd0eView commit details
Commits on Jan 24, 2023
-
Configuration menu - View commit details
-
Copy full SHA for bbf8131 - Browse repository at this point
Copy the full SHA bbf8131View commit details
Commits on Jan 25, 2023
-
Configuration menu - View commit details
-
Copy full SHA for d8222fc - Browse repository at this point
Copy the full SHA d8222fcView commit details -
Configuration menu - View commit details
-
Copy full SHA for 704d84b - Browse repository at this point
Copy the full SHA 704d84bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 984a691 - Browse repository at this point
Copy the full SHA 984a691View commit details
Commits on Jan 26, 2023
-
Configuration menu - View commit details
-
Copy full SHA for e48fc14 - Browse repository at this point
Copy the full SHA e48fc14View commit details
Commits on Jan 30, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 6f054c3 - Browse repository at this point
Copy the full SHA 6f054c3View commit details
Commits on Feb 1, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 9c706f0 - Browse repository at this point
Copy the full SHA 9c706f0View commit details -
Configuration menu - View commit details
-
Copy full SHA for f45d8f5 - Browse repository at this point
Copy the full SHA f45d8f5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6aff808 - Browse repository at this point
Copy the full SHA 6aff808View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2bd9d50 - Browse repository at this point
Copy the full SHA 2bd9d50View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4326d16 - Browse repository at this point
Copy the full SHA 4326d16View commit details -
Configuration menu - View commit details
-
Copy full SHA for 1d5d520 - Browse repository at this point
Copy the full SHA 1d5d520View commit details -
Configuration menu - View commit details
-
Copy full SHA for 90b5fb9 - Browse repository at this point
Copy the full SHA 90b5fb9View commit details
Commits on Feb 2, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 501a694 - Browse repository at this point
Copy the full SHA 501a694View commit details -
Configuration menu - View commit details
-
Copy full SHA for a148b57 - Browse repository at this point
Copy the full SHA a148b57View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4938443 - Browse repository at this point
Copy the full SHA 4938443View commit details -
Configuration menu - View commit details
-
Copy full SHA for af4902a - Browse repository at this point
Copy the full SHA af4902aView commit details -
Configuration menu - View commit details
-
Copy full SHA for b757f53 - Browse repository at this point
Copy the full SHA b757f53View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3c8db24 - Browse repository at this point
Copy the full SHA 3c8db24View commit details -
Merge pull request #503 from biocore/csymons_conflict_res_20230202
Get master-overhaul current
Configuration menu - View commit details
-
Copy full SHA for 949edab - Browse repository at this point
Copy the full SHA 949edabView commit details
Commits on Feb 3, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 5440e7a - Browse repository at this point
Copy the full SHA 5440e7aView commit details
Commits on Feb 7, 2023
-
Configuration menu - View commit details
-
Copy full SHA for da4dc7b - Browse repository at this point
Copy the full SHA da4dc7bView commit details
Commits on Feb 14, 2023
-
Update microsetta_private_api/api/microsetta_private_api.yaml
Co-authored-by: Daniel McDonald <danielmcdonald@ucsd.edu>
Configuration menu - View commit details
-
Copy full SHA for caae5df - Browse repository at this point
Copy the full SHA caae5dfView commit details -
Update microsetta_private_api/db/patches/0109.sql
Co-authored-by: Daniel McDonald <danielmcdonald@ucsd.edu>
Configuration menu - View commit details
-
Copy full SHA for 3e12273 - Browse repository at this point
Copy the full SHA 3e12273View commit details -
Update microsetta_private_api/repo/consent_repo.py
Co-authored-by: Daniel McDonald <danielmcdonald@ucsd.edu>
Configuration menu - View commit details
-
Copy full SHA for 66d2b78 - Browse repository at this point
Copy the full SHA 66d2b78View commit details -
Update microsetta_private_api/repo/sample_repo.py
Co-authored-by: Daniel McDonald <danielmcdonald@ucsd.edu>
Configuration menu - View commit details
-
Copy full SHA for c0ca17b - Browse repository at this point
Copy the full SHA c0ca17bView commit details -
Configuration menu - View commit details
-
Copy full SHA for fa12f3a - Browse repository at this point
Copy the full SHA fa12f3aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 41a2be4 - Browse repository at this point
Copy the full SHA 41a2be4View commit details
Commits on Feb 15, 2023
-
Configuration menu - View commit details
-
Copy full SHA for f83f16c - Browse repository at this point
Copy the full SHA f83f16cView commit details -
Configuration menu - View commit details
-
Copy full SHA for fdc267d - Browse repository at this point
Copy the full SHA fdc267dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 2b0490e - Browse repository at this point
Copy the full SHA 2b0490eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 8e53a85 - Browse repository at this point
Copy the full SHA 8e53a85View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2786344 - Browse repository at this point
Copy the full SHA 2786344View commit details -
Configuration menu - View commit details
-
Copy full SHA for b5305b5 - Browse repository at this point
Copy the full SHA b5305b5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3bb97bd - Browse repository at this point
Copy the full SHA 3bb97bdView commit details -
Configuration menu - View commit details
-
Copy full SHA for 7071a33 - Browse repository at this point
Copy the full SHA 7071a33View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5ceadc6 - Browse repository at this point
Copy the full SHA 5ceadc6View commit details -
Configuration menu - View commit details
-
Copy full SHA for e2e340f - Browse repository at this point
Copy the full SHA e2e340fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 0086554 - Browse repository at this point
Copy the full SHA 0086554View commit details -
Configuration menu - View commit details
-
Copy full SHA for a38eb97 - Browse repository at this point
Copy the full SHA a38eb97View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3b4ebd6 - Browse repository at this point
Copy the full SHA 3b4ebd6View commit details -
Configuration menu - View commit details
-
Copy full SHA for b1ed548 - Browse repository at this point
Copy the full SHA b1ed548View commit details -
Configuration menu - View commit details
-
Copy full SHA for fa1174c - Browse repository at this point
Copy the full SHA fa1174cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 2731c07 - Browse repository at this point
Copy the full SHA 2731c07View commit details -
Configuration menu - View commit details
-
Copy full SHA for fb0c58b - Browse repository at this point
Copy the full SHA fb0c58bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 30e610a - Browse repository at this point
Copy the full SHA 30e610aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 901799d - Browse repository at this point
Copy the full SHA 901799dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 7eda22d - Browse repository at this point
Copy the full SHA 7eda22dView commit details -
Configuration menu - View commit details
-
Copy full SHA for ba1592c - Browse repository at this point
Copy the full SHA ba1592cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 65e7d5b - Browse repository at this point
Copy the full SHA 65e7d5bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 5a13935 - Browse repository at this point
Copy the full SHA 5a13935View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6709e37 - Browse repository at this point
Copy the full SHA 6709e37View commit details -
Configuration menu - View commit details
-
Copy full SHA for 13fd456 - Browse repository at this point
Copy the full SHA 13fd456View commit details -
Configuration menu - View commit details
-
Copy full SHA for 088bd48 - Browse repository at this point
Copy the full SHA 088bd48View commit details -
Configuration menu - View commit details
-
Copy full SHA for 32a7c82 - Browse repository at this point
Copy the full SHA 32a7c82View commit details -
Configuration menu - View commit details
-
Copy full SHA for 04ec724 - Browse repository at this point
Copy the full SHA 04ec724View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9c02304 - Browse repository at this point
Copy the full SHA 9c02304View commit details -
Configuration menu - View commit details
-
Copy full SHA for 80c0140 - Browse repository at this point
Copy the full SHA 80c0140View commit details
Commits on Feb 17, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 1b1df99 - Browse repository at this point
Copy the full SHA 1b1df99View commit details
Commits on Feb 21, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 20befd7 - Browse repository at this point
Copy the full SHA 20befd7View commit details -
Configuration menu - View commit details
-
Copy full SHA for 84c55d3 - Browse repository at this point
Copy the full SHA 84c55d3View commit details
Commits on Feb 22, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 6fb00d0 - Browse repository at this point
Copy the full SHA 6fb00d0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2ea05b8 - Browse repository at this point
Copy the full SHA 2ea05b8View commit details -
Configuration menu - View commit details
-
Copy full SHA for b4bcaf4 - Browse repository at this point
Copy the full SHA b4bcaf4View commit details -
Configuration menu - View commit details
-
Copy full SHA for 835cfed - Browse repository at this point
Copy the full SHA 835cfedView commit details -
Configuration menu - View commit details
-
Copy full SHA for 7afe8d8 - Browse repository at this point
Copy the full SHA 7afe8d8View commit details -
Configuration menu - View commit details
-
Copy full SHA for dce550f - Browse repository at this point
Copy the full SHA dce550fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 9042f45 - Browse repository at this point
Copy the full SHA 9042f45View commit details -
Configuration menu - View commit details
-
Copy full SHA for a7f5926 - Browse repository at this point
Copy the full SHA a7f5926View commit details -
Configuration menu - View commit details
-
Copy full SHA for 684ef82 - Browse repository at this point
Copy the full SHA 684ef82View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7fa3689 - Browse repository at this point
Copy the full SHA 7fa3689View commit details -
Configuration menu - View commit details
-
Copy full SHA for 489d8f2 - Browse repository at this point
Copy the full SHA 489d8f2View commit details -
Configuration menu - View commit details
-
Copy full SHA for 521dc73 - Browse repository at this point
Copy the full SHA 521dc73View commit details -
Merge pull request #505 from biocore/csymons_overhaul_yaml_adjustment
YAML Fix for Overhaul
Configuration menu - View commit details
-
Copy full SHA for ee20093 - Browse repository at this point
Copy the full SHA ee20093View commit details
Commits on Feb 24, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 1f5e7ba - Browse repository at this point
Copy the full SHA 1f5e7baView commit details -
Configuration menu - View commit details
-
Copy full SHA for 326b811 - Browse repository at this point
Copy the full SHA 326b811View commit details
Commits on Feb 27, 2023
-
Merge pull request #506 from biocore/csymons_covid_survey_reorg
Remove COVID-19 Survey
Configuration menu - View commit details
-
Copy full SHA for 8791201 - Browse repository at this point
Copy the full SHA 8791201View commit details