sartography
/
cr-connect-workflow
mirror of https://github.com/sartography/cr-connect-workflow.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,291 Commits 13 Branches 0 Tags 8.7 MiB
Commit Graph

1291 Commits

Author SHA1 Message Date
Kelly McDonald 0e8913434a refactor a bit 2020-12-03 08:44:15 -05:00
Kelly McDonald 92aa1b971d commit before removing big long SQL 2020-12-02 16:04:00 -05:00
Dan afc0cbf83e fix a stupid mistake. 2020-12-01 11:20:32 -05:00
Dan e0c28cbc7d Make it easer to start things up. 2020-12-01 11:17:07 -05:00
Dan 0eefc26006 Bouncing spiffworkflow version. 2020-11-27 11:56:19 -05:00
Dan c14e50046c Merging in changes from Kelly. 2020-11-23 16:20:10 -05:00
Kelly McDonald 871c9e4409 Merge remote-tracking branch 'origin/dev' into dev 2020-11-23 16:12:30 -05:00
Kelly McDonald 255dca09ec Try out some options for SQLAlchemy engine to head off connectoin issues 2020-11-23 16:12:10 -05:00
Dan 5499adb10e Making more modifications to the default configuration to try and debug an issue with the database connections. 2020-11-23 15:33:51 -05:00
Dan Funk 3305ecd72f
Merge branch 'testing' into dev 2020-11-23 14:10:10 -05:00
Dan cc6f1a926c Merge branch 'dev' of github.com:sartography/cr-connect-workflow into dev 2020-11-19 11:26:11 -05:00
Dan 071c98d72e Some minor config tweaks to try and deal with some database timeout issues. 2020-11-19 11:25:58 -05:00
Dan Funk 5a822ea1ed
Merge pull request #198 from sartography/token_reset_message 
moving back to master of spiffworkflow now that changes are committed.
 2020-11-19 10:53:06 -05:00
Dan Funk b8a91a513b
Merge pull request #196 from sartography/128-data-store 
128 data store
 2020-11-18 18:55:33 -05:00
Dan Funk f98d919bc3
Merge pull request #197 from sartography/token_reset_message 
Token reset message
 2020-11-18 18:17:59 -05:00
Dan bb8b65f195 moving back to master of spiffworkflow now that changes are committed. 2020-11-18 18:17:08 -05:00
Dan 70c621fe87 fixing the bpmn to use cancel, and pulling in pudates to the spiffworkflow branch. 2020-11-18 16:39:09 -05:00
Dan b83ab1bcd1 Move data store base into its own file. 2020-11-18 15:34:50 -05:00
mike cullerton d198f124d7 Committing a merge from dev 2020-11-18 15:33:44 -05:00
mike cullerton bfa6247ae2 Merge branch 'token_reset_message' of https://github.com/sartography/cr-connect-workflow into token_reset_message 2020-11-18 15:11:51 -05:00
Dan 66693d9f3a Removing datastore script, as it isn't used in the api at all. 2020-11-18 15:06:28 -05:00
Dan c62b73a539 drop some of the test-only api endpints and rework the tests so they aren't needed 2020-11-18 15:04:36 -05:00
mike cullerton 16313609ec removed call to signal (changed to cancel_notify) 2020-11-18 13:55:30 -05:00
mike cullerton 67ccbaddb8 Pushed so Dan could look at the code 2020-11-17 13:08:04 -05:00
Kelly McDonald 72ade3c367 Add crosstalk test 2020-11-17 10:29:49 -05:00
Kelly McDonald e9979efb0d Add some tests 2020-11-17 09:33:29 -05:00
mike cullerton 781f62df64 Merge remote-tracking branch 'origin/dev' into token_reset_message 2020-11-16 14:48:04 -05:00
mike cullerton a2dc3c4812 Use Cancel Event 
New title 'New Title'
 2020-11-16 09:59:22 -05:00
Kelly McDonald 70425eee0d Add last_updated field - change the api signature to be closer to what we need going forward, but retain the old methods for testing the script get/set through the API 2020-11-13 12:03:29 -05:00
Kelly McDonald 7c2c725840 save before changing how API works 2020-11-13 09:58:21 -05:00
Kelly McDonald acaf633b45 Added ID as pk 2020-11-11 11:36:25 -05:00
Kelly McDonald 9a4d167dcd Add in api changes 2020-11-11 09:44:58 -05:00
Kelly McDonald cef221be32 Refactor to reuse code 2020-11-10 11:32:59 -05:00
Kelly McDonald 3ba11f5e6b add user_data_get/set and alter test so that it ensures that we don't grab study_data stuff from the user_data calls 
change the test to mock up the user.
 2020-11-10 10:32:37 -05:00
Kelly McDonald 92595e3c42 base_test didn't 'know' about the DataStoreModel so it wasn't creating the data_store table, causing a lot of problems after the initial setup/teardown 2020-11-10 09:33:54 -05:00
Kelly McDonald 69fe55aa56 Add mostly-working elements of the data-store, compare with dev to see why db is not working after running tests 2020-11-10 08:24:17 -05:00
Kelly McDonald 245124779e Add mostly-working elements of the data-store, compare with dev to see why db is not working after running tests 2020-11-10 08:21:46 -05:00
Dan Funk d0286432ef
Merge pull request #195 from sartography/dev 
Dev to Testing
 2020-11-05 12:55:52 -05:00
Dan 9967aec632 Updating the pip lock file. 2020-11-05 12:33:59 -05:00
Kelly McDonald 5c4aae6802 Make sure we have PB_SPONSORS_URL defined 2020-11-05 10:45:51 -05:00
Kelly McDonald e598994d34 Change the study_sponsors script so that we can actually call it : 
var = study_info('sponsors')

to keep it more in line with other scripts that we have
 2020-11-05 10:31:47 -05:00
Kelly McDonald 1815a4b657 Merge branch '117-save-restore' into dev 2020-11-05 08:24:18 -05:00
mike cullerton a78af4eab8 Run cancel task during interrupt. Currently this uses Signal event. We may change this to the Cancel event. 2020-11-04 14:37:53 -05:00
Kelly McDonald 2931f45187 Add 'sponsors' to study_info call 2020-11-04 14:34:10 -05:00
Kelly McDonald 849a4e9f94 Made changes to how soft_reset works so it is backward compatible - essentially, we use the file if we are doing a soft-reset or a new workflow. NB, this may actually still have problems if we have a workflow with P/SMI and we do a soft-reset on it even if there are no structural changes. 
Also, change how default_value is interpreted, looking at the object attribute rather than the properties list.
 2020-10-09 11:00:33 -04:00
Kelly McDonald 8b23cdc05c commit changes before switching branches 2020-10-09 08:46:14 -04:00
Dan Funk b2aede2b8d Glob on windows seems to return directories where in linux it does not, so now assuring we don't try to add files from the sub-directory. 2020-10-05 17:35:35 -04:00
Dan Funk 8358dc1bb7 Merge branch 'dev' into feature/updates_for_windows 2020-10-05 17:02:44 -04:00
Dan Funk d7258f6cf2 Adding a new docker compose for Windows and readme that will help describe the steps required to run. 2020-10-05 16:58:43 -04:00
Dan Funk c60cec90e2
Merge pull request #194 from sartography/dev 
Bug fixes and timeouts
 2020-09-02 08:53:29 -04:00