Commit Graph

1439 Commits

Author SHA1 Message Date
Dan bd3176eea6 Fixes #578 - issue with us displaying an incorrect end event in some cases. 2021-12-22 16:27:52 -05:00
Dan c83b047881 Fixing some bugs I introduced with the latest fix. 2021-12-21 16:22:41 -05:00
Dan f129509802 Looks like reording the deletes allows us to remove workflow specs a little easier. Tested this with libraries, and seems to work ok. 2021-12-20 14:36:45 -05:00
mike cullerton 3fa5505970 Cleanup - remove print statements 2021-12-17 12:30:10 -05:00
mike cullerton 6073412d82 Clean up imports 2021-12-17 12:03:45 -05:00
mike cullerton aa27df7840 Process the spec files and their metadata 2021-12-17 11:46:21 -05:00
alicia pritchett a81f25f0ee Just kidding. We should make deepcopy and put in fake data 4 valdiation
see above. previously i deleted this, because i didnt want unitializsed data in task data. well heres a hint. don't put it in task data. make a deep copy and hold on to that for validation pursposes
2021-12-16 14:47:04 -05:00
mike cullerton 5c90ce01a6 *** WIP ***
Temp services `ToFilesystemService` and `FromFilesystemService` for migrating files To and From the filesystem - Not sure where these classes will end up
Tests to call the two services.
upgrade method in migration that writes workflow spec files and metadata to filesystem
2021-12-16 14:22:37 -05:00
mike cullerton 338352017b *** WIP ***
Moving files to the filesystem
Tools for reading/writing metadata for categories and specs
2021-12-16 08:41:49 -05:00
Dan 421e4fd9aa Fixes related to resent commit to SpiffWorkflow that provides better handling for workflows that loop back on themselves. 2021-12-15 16:00:31 -05:00
Dan Funk e62a99af96
Merge pull request #438 from sartography/bug/fix-task-data
Bug/fix task data
2021-12-13 13:31:37 -05:00
Dan Funk b5f2fe05dc
Merge pull request #439 from sartography/workflow-spec-delete-217
Problem deleting workflow spec #217
2021-12-13 13:19:56 -05:00
Dan c46800171d Merge remote-tracking branch 'origin/dev' into bug/fix-task-data 2021-12-13 13:18:00 -05:00
Dan ad9a480f93 Merge remote-tracking branch 'origin/dev' into waiting-workflow-errors-566 2021-12-13 13:05:02 -05:00
Dan Funk 0bb06f380a
Merge pull request #436 from sartography/more-study-statuses-562
More study statuses #562
2021-12-13 13:02:57 -05:00
Dan Funk 407cc8dd69
Merge pull request #435 from sartography/bug/scheduler_task_recursion_depth
#557 - scheduler recursion because each call to 'process_witing_tasks…
2021-12-13 13:01:31 -05:00
alicia pritchett cdaad5dcc0 Allow 'none' for progress_status
Well this fixes tests but also, I dont think you necessarily have this right off the bat if you havent done anything in a study, which i handle on the frontend. so null is fine
2021-12-13 12:34:32 -05:00
alicia pritchett 8b27423172 Updating study model schema to include Progress Status 2021-12-13 12:29:15 -05:00
mike cullerton daebf42a30 Move some of the work in `crc.api.workflow.delete_workflow_specification` to separate workflow_service methods
Added a session.commit to `delete_workflow_spec_task_events`
2021-12-13 11:04:28 -05:00
mike cullerton acbb8898e4 Merge branch 'more-study-statuses-562' into waiting-workflow-errors-566 2021-12-10 16:52:07 -05:00
mike cullerton f748fa3db8 Removed unused imports 2021-12-10 16:48:28 -05:00
mike cullerton d30405226e Script to get the new progress_status value 2021-12-10 16:16:33 -05:00
mike cullerton 100e822f2e Fixes for set_study_progress_status to use new ProgressStatus enum 2021-12-10 16:15:49 -05:00
mike cullerton 9cd5022bf0 Set progress_status to in_progress when creating a new study.
-- I'm not sure if this is what we want.
2021-12-10 16:00:33 -05:00
mike cullerton 6d09aa1817 We moved the new statuses to a new column and created a separate enum class for them.
They really are sub_statuses of the in_progress status
2021-12-10 15:57:02 -05:00
mike cullerton 61975093f9 Renamed some files to include the word `progress` 2021-12-10 15:47:34 -05:00
alicia pritchett f9fbb32641 Take this garbage out
I can say that because I originally wrote that garbage
2021-12-10 12:10:08 -05:00
alicia pritchett 962cf7c32c Fixes problem with initializing some task data fields
we had a problem where sometimes, task data gets some values set in its fields to None, which conflicts with default values. this fixes that
2021-12-10 11:33:26 -05:00
mike cullerton 52baf25459 In `WorkflowService.do_waiting`, if a workflow causes an exception, change its status from `waiting` to `erroring` so we don't continue to call it in `do_waiting`. 2021-12-09 15:33:39 -05:00
Dan 06960644fa #557 - scheduler recursion because each call to 'process_witing_tasks' would kick off an additional scheduler by settting up a new app_context. 2021-12-09 08:54:44 -05:00
Dan Funk 23fa28bc23
Merge pull request #434 from sartography/bug/ldap_service_rollback_expoded_the_world
The LDAP service didn't do a good enough check to see if the record w…
2021-12-09 06:42:02 -05:00
Dan 412290f2ab The LDAP service didn't do a good enough check to see if the record was already in the database. This caused an error, which left the workflow in a waiting state. And that waiting state meant the error would just happen a million times over again until we pushed up this code change. 2021-12-09 06:33:30 -05:00
mike cullerton 6db9cdabc7 New study statuses 2021-12-08 10:50:30 -05:00
Dan Funk 0cfa59bfea
Merge pull request #429 from sartography/chore/clear-form-data-553
Fixes #553 - Don't load Form data
2021-12-08 10:37:44 -05:00
Dan Funk b28ddef842
Merge pull request #430 from sartography/study-status-scripts-556
Study status scripts #556
2021-12-08 10:36:53 -05:00
Dan ffafc1674a assure we don't overwrite task data with a previous form submission if that data already exists. 2021-12-07 17:04:20 -05:00
mike cullerton 8813098190 Updated to use new ProtocolBuilderCreatorStudy model and schema 2021-12-06 14:37:42 -05:00
mike cullerton db1f3ba6ab Model and schema for new StudyCreator api endpoint
Update StudyModel to use new model
2021-12-06 14:36:34 -05:00
mike cullerton 791328d520 Don't need to ask the question twice 2021-12-03 12:18:17 -05:00
mike cullerton 6be9529b22 Fixed the class names 2021-12-03 11:53:21 -05:00
mike cullerton 34b4913542 Restructured `do_task`
Fixed up `do_task_validate_only`
2021-12-03 11:45:02 -05:00
mike cullerton 52bfa848ac *** WIP ***
Script to set study status
2021-12-02 17:11:28 -05:00
mike cullerton 8c66a3d2ef Script to get the status of the current script 2021-12-02 15:30:47 -05:00
Dan 5cf011f1d9 Quick fix for ldap. 2021-12-02 12:19:36 -05:00
alicia pritchett 7524e97c9a Fixes #553 - Don't load Form data
adds an extension so that you can opt to clear out form data on a given task
2021-12-01 16:11:52 -05:00
Dan ad93b5fae6 We were not correctly handing the possibility of there only being a waiting task (and no ready tasks).
We also had a problem with the validator throwing a 500 when it was trying tell us it would never finish validation.
2021-11-30 12:44:35 -05:00
Mike Cullerton ec9d8f8a5c
Merge pull request #425 from sartography/bug/slow_ldap
Remove wild-card from uid search, it performs very badly.  Add a bit …
2021-11-30 11:09:42 -05:00
Mike Cullerton 8cc581611e
Merge pull request #426 from sartography/feature/performance_improvement
Performance upgrades - study dashboard in less than 2 seconds now
2021-11-30 11:09:28 -05:00
Dan Funk 8c30df011b
Merge pull request #427 from sartography/workflow-status-script-548
Workflow status script #548
2021-11-30 10:51:57 -05:00
Dan Funk c8c8c8b244
Merge pull request #424 from sartography/xls-xlsx-issue-540
Xls xlsx issue #540
2021-11-30 10:50:33 -05:00
mike cullerton 0f1ccd7db5 New script to check workflow status.
Includes test and test workflow
2021-11-30 08:54:15 -05:00
Dan 455c1035f1 Performance upgrade to script.py - reduce the number of times we generate the augmented list of script functions for running python evals.
Performance upgrade to study_service.py - Don't query on the whole WorkflowModel, just get the status that we need.  Saves lots of complex joins.
Performance upgrade to SpiffWorkflow - don't convert to box unless we have to do so.
2021-11-29 17:48:05 -05:00
Dan e5b1daa3d9 Remove wild-card from uid search, it performs very badly. Add a bit of logging so we can easily see performance in the future. 2021-11-29 11:03:14 -05:00
Dan 8ec58fd6d7 Assure better error messages when parsing word documents with jinja syntax.
I also have a pull request into the folks that run the python docx library to improve their error messages that we depend on here.
2021-11-23 14:38:48 -05:00
Dan 4a1285b8e0 When validating a workflow, don't run the master workflow multiple times, its a huge waste of time.
Provide decent data when calling get_study_associate(s) scripts.
2021-11-22 17:17:19 -05:00
Dan 5bb7dbfb19 Improve the error messages returned from jinja template processing. Try to find the actual line with an error in it. 2021-11-22 14:46:33 -05:00
Dan 12b78c1f99 Value Errors should also alert us that we can't serialize the json.
Enum Label was depending on the options attribute not existing in some situtations, which is a bad assumption.  Rather, check for specific properties, and call back to using options as the default.
2021-11-22 12:37:10 -05:00
Dan 4d1f4429ff Fixing a bug in enum_label that was not working when lookup up an select list from a spreadsheet.
Assure we raise more thoughtful error messages when running getting exceptions in engine tasks.
Field Options should always be available now due to a fix in Spiffworkflow.
2021-11-22 12:26:30 -05:00
Dan 7b02f46403 During validation, options were not being handled correctly for certain types of lookups. 2021-11-17 13:38:41 -05:00
mike cullerton cb77db26a3 Minor edit, for clarity 2021-11-16 12:05:20 -05:00
mike cullerton 9f18484ebb Grab exception when reading older xls spreadsheet into pandas
Renamed `xls` variable to `xlsx`, so it makes more sense
Added a hint to error_service for validation
2021-11-16 11:54:31 -05:00
Dan Funk 8c166bd029
Merge pull request #423 from sartography/test-protocol-builder-519
Test protocol builder #519
2021-11-11 11:49:57 -05:00
Dan f4f3842059 Fixing a stupid mistake. 2021-11-11 11:45:35 -05:00
Dan 197b75c6bf Quickfix - validation was failing if we had a date object in the task data, but this isn't really a problem. We now use the same JSON serializer as flask does, when doing validations, to better verify behavior with the front end. 2021-11-11 11:18:58 -05:00
mike cullerton c7147274f0 Resolving issues from code review 2021-11-10 17:43:34 -05:00
mike cullerton a8b7cd8bba Merge branch 'dev' into test-protocol-builder-519 2021-11-10 16:32:34 -05:00
Dan Funk 037692f42b
Merge pull request #422 from sartography/chore/group-repeating-validation-536
Fixes #536 - Group + Repeating property validation
2021-11-10 15:28:04 -05:00
Dan Funk e764bf937d
Merge pull request #421 from sartography/bug/validation_of_enum_label_failing_in_sub_workflows
Validation was failing for enum_label() expressions when called withi…
2021-11-10 15:26:03 -05:00
Dan Funk 81f8aed68b
Merge pull request #420 from sartography/drop-tasklog-on-delete
Delete Task log model when deleting a study
2021-11-10 15:20:11 -05:00
Dan Funk 84f364ce37
Merge branch 'dev' into chore/view-as-382 2021-11-10 15:16:20 -05:00
alicia pritchett accdd281fa Fixes #536 - Group + Repeating property validation
For now, we should not allow both group and repeat properties on a field together.
2021-11-09 13:21:44 -05:00
mike cullerton 5cf742d955 remove unused import 2021-11-09 13:07:01 -05:00
Dan d1eae3c15a Validation was failing for enum_label() expressions when called within a sub-process. Possible (but unlikely) that this would occur outside validation. 2021-11-09 12:55:06 -05:00
alicia pritchett aa1ba59bb1 Delete Task log model when deleting a study
just a minor fix
2021-11-09 10:42:47 -05:00
mike cullerton b193f56f35 Minor cleanup for readability. 2021-11-08 10:13:07 -05:00
mike cullerton 6f09b0d7dd Added comment to _is_valid_study.
Fixed get_required_docs. The data returned for get_required_dcs from UVA PB was *very* different than what we had.
2021-11-05 14:37:41 -04:00
mike cullerton d186b24de3 UVA PB returns the info in a list. We want the dictionary in the list 2021-11-05 14:26:21 -04:00
mike cullerton 271d4da5ff Merge branch 'dev' into test-protocol-builder-519 2021-11-05 10:29:20 -04:00
mike cullerton 6d548c2a74 *** WIP ***
Committing to work on another ticket
There are TODOs in study_service
2021-11-05 09:59:14 -04:00
Dan 9376d3deaf Don't error out trying to send an error about invalid review types. 2021-11-04 13:32:57 -04:00
Dan Funk 3a36a48b88
Merge pull request #418 from sartography/convert-timestamp-499
Added ordered arguments to the get_localtime script #499
2021-11-03 14:28:57 -04:00
mike cullerton b03e596dcf One thing at a time; remove HSRNUMBER for now 2021-11-03 12:58:03 -04:00
mike cullerton 9c8ae36ba3 UVA IRB passes back `Q_COMPLETE` and `HSRNUMBER` 2021-11-03 12:40:43 -04:00
mike cullerton 7f163285c3 Test w/Alex's ID 2021-11-03 11:56:07 -04:00
mike cullerton 8be9a1968b configure logging 2021-11-03 11:21:39 -04:00
mike cullerton 50d4159168 info log didn't show up. Maybe debug? 2021-11-03 10:36:27 -04:00
mike cullerton 8b6c8f9518 Logging to troubleshoot API call 2021-11-03 10:14:11 -04:00
mike cullerton 1f9c80d70d Added ordered arguments to the get_localtime script
Modified the workflow so the first task is a form with booleans that allows me to test all the permutations.
Modified tests to cover all the permutations for calling the script
2021-11-03 08:36:24 -04:00
mike cullerton 47ead5ab45 Fixed validation bug.
There is no element documentation available in the task, so we mock up the email content.
2021-11-02 10:00:41 -04:00
Dan Funk 8a6c1e1b51
Merge pull request #416 from sartography/bug/fix-hide-518
Fixes validation for #518
2021-11-01 16:22:24 -04:00
Dan Funk a4f8e39546
Merge pull request #415 from sartography/upload-file-previous-name-514
Upload file previous name #514
2021-11-01 15:59:57 -04:00
Dan Funk c4f3a3ad0d
Merge pull request #413 from sartography/logging-script-513
Logging script #513
2021-11-01 15:41:38 -04:00
Dan Funk fb25404a90
Merge pull request #412 from sartography/remove-content-html-512
Remove content_html #512
2021-11-01 15:38:46 -04:00
alicia pritchett 1866e6bba9 Fixes validation for #518
Well really what this does is give every field a default value of None. what that does is allow you to use value expressions even without a given default value. this part in the backend fixes validation.
2021-11-01 14:35:30 -04:00
mike cullerton 7722b89faa If a file was archived, users could not update the file.
In some situations, this kept users from re-uploading files that were previously deleted.
We now allow an archived file to be updated and unarchived.
2021-10-29 11:52:27 -04:00
alicia pritchett 702b8eaed6 add ldap endpoint that doesnt require workflow info 2021-10-28 16:19:39 -04:00
mike cullerton 5e569b9167 Unused imports 2021-10-27 17:19:27 -04:00
mike cullerton 81bb0013c8 Doh 2021-10-27 17:15:49 -04:00
mike cullerton c76d8230c0 Cleaned up validation 2021-10-27 17:03:27 -04:00
mike cullerton 6322353c88 Scripts to retrieve logging information 2021-10-27 16:39:25 -04:00