2d01b92a50
Merge pull request #230 from sartography/pretty-emails-160
...
Pretty emails 160
2021-02-03 16:20:38 -05:00
1eba20f420
Merge pull request #229 from sartography/workflow-spec-order-74
...
Workflow spec order 74
2021-02-03 16:18:34 -05:00
b090e31e00
This fixes 2 issues with setting boolean defaults
...
- If the default was False, we failed an early test and returned None. We now only return None if default is None
- We have a better test for deciding if the default value we return should be True or False. We used to return True if the value was the string 'false'.
2021-02-03 09:50:16 -05:00
c5cf3ea7ff
Changed call to WorkflowProcessor.reset to reflect change from class method to instance method.
2021-01-29 14:34:09 -05:00
7e76639cf3
When a study is put on hold, we now reset workflows and call any pending cancel_notify events.
...
In api.study.update_study we test the study status and call the new WorkflowService method process_workflows_for_cancels.
In services.workflow_service we added the new method process_workflows_for_cancels. It loops through workflows for a study, and resets them if they are in progress.
In services.workflow_processor, we changed the reset method to be an instance method so we can call self.cancel_notify.
In tests.test_lookup_service we changed the call to WorkflowProcessor.reset to reflect the change from class method to instance method
2021-01-29 14:05:07 -05:00
958d5a6281
Possible solution for W3C issues raised by Sonarcloud
2021-01-28 09:45:53 -05:00
d7a3afe8f4
changed the template to use the responsive html email template at https://github.com/leemunroe/responsive-html-email-template
...
added method get_cr_connect_wrapper to render our new html email template. This takes the email text generated from the task element documentation as the email_body.
2021-01-27 17:12:03 -05:00
cccb722e07
Merge pull request #226 from sartography/enum_default_value_expression_162
...
Enum default value expression 162
2021-01-27 10:43:46 -05:00
81e55b6055
Cleaning up my smell. A task should only have default_value *or* value_expresion, not both.
2021-01-27 10:21:13 -05:00
c99a388405
We now set the display_order automatically. Users can modify order using the arrows.
2021-01-27 09:50:29 -05:00
98f946c119
Merge pull request #227 from sartography/missing_form_key_163
...
Missing form key 163
2021-01-27 09:42:46 -05:00
ecc553c4ea
Jinja templates and svg file for pretty emails
2021-01-26 09:20:16 -05:00
909af9b8d6
Change HTML emails so they look like the CR-Connect website. Add logo, color, style, etc.
...
Cleaned up email script a little.
Also, email script no longer uses services.mails. It uses email_service directly now.
2021-01-26 09:19:28 -05:00
b71fd93dd4
We now make sure that forms have a form key. Ticket 163
2021-01-22 12:14:17 -05:00
00d9276483
In spiff_task_to_api_task, when looping through fields, if the field doesn't have a value, we now try to set it with the default value
...
In test_spec, we now check for FIELD_PROP_VALUE_EXPRESSION when setting default values
2021-01-22 10:00:28 -05:00
5921ce9f10
Merge branch 'dev' into 152-workflow-spec-pull
2021-01-21 12:30:43 -05:00
5b13195182
Merge pull request #224 from sartography/restart-with-no-data-99
...
Restart with no data 99
2021-01-20 17:22:18 -05:00
41dac33039
Removed two tests around soft_reset that are no longer required.
...
Reset should construct the workflow_processor, thus completing the reset process.
Removed the spec argument from init, as it is never used anywhere.
2021-01-20 13:24:53 -05:00
039a1dcd79
WorkflowProcessor code for new restart_workflow api endpoint. WorkflowProcessor.reset will clear workflow_model.bpmn_workflow_json, and if clear_data is True will clear form data.
...
WorkflowProcessor.__init__ is mostly unchanged.
2021-01-19 15:14:36 -05:00
9c71a503ca
Python code for new restart_workflow api endpoint. Cleaned up code and docstring in get_workflow to match.
2021-01-19 15:09:20 -05:00
e1532a90c9
New api endpoint for restarting a workflow. Unsure if I needed the responses section. **Dan, can you check this?**
...
Also, removed clear_data and reload_spec as parameters for standard get workflow endpoint.
2021-01-19 15:00:39 -05:00
6a9e6d3570
Restart workflow without form data. Committing so Dan can check it out
2021-01-14 15:32:14 -05:00
cf7990ce85
Refactor for better readability due to code smell test
2021-01-12 08:54:32 -05:00
e14b896225
Add documentation
2021-01-11 09:31:08 -05:00
f282a9ef73
Make sure that top_level_workflow is transferred over, also include reference files in the list of files to sync
...
We may want to revisit this because I used a 'Magic' workflow_ref_id of 'REFERENCE_FILES' as a special case so I could re-use most of what I already had. This works well, but we may want to structure it different.
2021-01-11 09:21:44 -05:00
336c093bf8
Catch errors when building enumeration lists.
2021-01-08 15:15:24 -05:00
26655b26d3
merging in dev, and fixing a failing test from dev.
2021-01-08 14:42:13 -05:00
9118517995
Merge pull request #220 from sartography/prevent-duplicate-template-upload-111
...
Users cannot upload a workflow_spec_file that already exists. We rais…
2021-01-08 13:55:19 -05:00
be288ae048
Merge pull request #219 from sartography/fix-api-call-missing-fieldname-143
...
Fixed ApiError call. Now includes task_id and task_name.
2021-01-08 13:46:26 -05:00
81fe3e7957
Merge pull request #218 from sartography/is-file-uploaded-143
...
Ticket 143. Test whether file is uploaded.
2021-01-08 13:45:24 -05:00
72a73c1fc4
Allow for synch to work even if the local set of workflow specifications are completely empty.
2021-01-08 13:23:01 -05:00
d274813ae5
We now check form field IDs so they play well with Python and Javascript.
2021-01-07 11:10:31 -05:00
c9a4a9685f
Users cannot upload a workflow_spec_file that already exists. We raise an error that is displayed on the fron end.
2021-01-04 15:47:45 -05:00
0ae4448fbe
Fixed ApiError call. Now includes task_id and task_name.
2021-01-04 13:48:34 -05:00
b0dc834682
Don't error out on autocomplete_num
2021-01-04 13:41:57 -05:00
0c47d09972
Ticket 143. Test whether file is uploaded.
2021-01-04 10:53:21 -05:00
386feddeed
Merge pull request #214 from sartography/validate-hide-expression-103
...
Modified study_info do_task_validate_only so that we take the default…
2020-12-31 10:53:27 -05:00
cf106fb9cd
Merge pull request #216 from sartography/place-study-on-hold-20
...
Studies can now be put on hold in the dashboard. We were overriding t…
2020-12-31 10:53:03 -05:00
ede5df4df5
Studies can now be put on hold in the dashboard. We were overriding the status in StudyModel.update_from_protocol_builder.
2020-12-30 17:49:59 -05:00
efdbbcbc72
StudyInfo sometimes returns arrays of items, each item in the array should be coverted to a Box dictionary if possible.
2020-12-30 14:51:51 -05:00
f29429f0d0
Modified study_info do_task_validate_only so that we take the default path in ind_update workflow.
2020-12-30 10:04:10 -05:00
e5a38874f6
A hard or soft reset should also cause a 'cancel_notify' which will kick off any CANCEL events. If this happens during
...
a hard or soft reset, and an error is thrown trying to fulfil a cancel event, the reset should still fire.
Sending emails still had a number of issues correctly parsing it's arguments. This is corrected.
2020-12-29 18:05:13 -05:00
c288a8a2bc
Merge branch 'dev' into check-field-type#143
2020-12-29 11:11:43 -05:00
7938ac8eed
We now assure each form field has a field type. Modified populate_form_with_random_data, added check at beginning of form field loop.
2020-12-28 18:02:16 -05:00
6cfce839c1
Validation now assures that we won't encounter errors when generating navigation lists.
...
Fixing workflow sync paths that were incorrect.
Repairing a suddenly failing test in files, that just don't make no sense.
Bumping spiffworkflow that contains a fix for issue #155
2020-12-28 17:33:38 -05:00
1f9bf72c59
Merge branch 'dev' into bug/navigation
2020-12-14 11:46:44 -05:00
4268d0f482
Merge pull request #208 from sartography/152-workflow-spec-pull
...
152 workflow spec pull
2020-12-14 11:35:06 -05:00
bcb78de225
Merge branch 'dev' into bug/navigation
2020-12-14 11:33:51 -05:00
e54404e424
Merge pull request #205 from sartography/test-email-script
...
Test email script
2020-12-14 11:28:14 -05:00
6bf24cc438
fixing some failing tests related to changes in the underlying spiffworkflow library.
2020-12-14 11:27:38 -05:00
b62a9c7074
Merge remote-tracking branch 'origin/dev' into bug/navigation
2020-12-14 10:40:21 -05:00
fd4b881416
upgrading the pip libraries.
2020-12-14 10:30:10 -05:00
ee3ee9fd4a
Added tests to cover most of the use cases and code, and a bunch of stuff to make the mocks happy
2020-12-14 10:27:40 -05:00
02ea414b94
Additional fixes to Navigation to allow a nested navigation structure.
2020-12-14 10:07:19 -05:00
7defc2b02f
Tests for uid in logs. Currently we test for uid in a response. This covers ApiError.
...
Currently, we don't have a test for Sentry. Unsure how to do this.
Also added a script, service and test workflow to help. (Also to learn about adding a script and service.)
2020-12-11 17:47:53 -05:00
856fe445b0
Added user.uid to ApiError and Sentry logging
2020-12-11 16:26:03 -05:00
adc4dc4453
redid the api a bit so that nothing was using open security - added a new endpoint for getting a workflow spec that uses the alternate API_TOKEN security and leave the original endpoint as it was.
2020-12-11 12:03:41 -05:00
55e6f5b753
refactored calls into a service - forgot to add actual service
2020-12-11 11:42:00 -05:00
3a1160efac
refactored calls into a service
2020-12-11 11:41:32 -05:00
9eea26e019
add workflow_sync test
2020-12-11 08:34:59 -05:00
993c7bc76e
fixed error on api.yml from search / replace
2020-12-11 08:29:37 -05:00
3f56dfe484
Move all workflow sync stuff into new file
...
Make changes to api naming scheme
add some error checking around endpoints for missing/invalid endpoints
2020-12-10 10:46:23 -05:00
a8203ed01d
save changes before refactor
2020-12-10 10:06:21 -05:00
e377a05dea
Add some punctuation
2020-12-09 13:50:52 -05:00
c57b17df1e
Add a robust way of adding an API key, update examples and documentation for swagger API and add the ability to completely sync the local system from the remote system.
2020-12-09 12:13:17 -05:00
32c5060a31
No longer use eval on the email address. It is already parsed.
...
Tests for single and multiple emails, and email error checking.
Still need to figure out how to implement multiple emails.
2020-12-09 12:11:46 -05:00
0e1aa59fa1
Make a change to make sure that if there is a new file locally that is not present remotely when we pull from the remote, the new local file gets deleted.
...
Also: add several things to the requirements.txt that should have been there in the first place.
2020-12-08 13:42:01 -05:00
730d0ca18f
Email script now uses an email address instead of a UVA LDAP user_id.
2020-12-07 16:23:41 -05:00
44c72115ae
Make sure we get the file we intended
2020-12-07 08:50:20 -05:00
f26a8615a4
Get more file details so we can fill out everything locally and also add a method to download the file by md5_hash
2020-12-07 08:49:38 -05:00
93b12a8e82
updates using new navigation from spiff workflow's navigation branch, all tests passing.
2020-12-04 17:56:12 -05:00
cad613cf63
Fix problem when method is run for a workflow that is non-existant locally
2020-12-04 12:00:02 -05:00
d41d018fe3
For a given workflow - find the files that are different from a remote endpoint for the same workflow
2020-12-04 11:49:07 -05:00
3e8d4ca7c9
Add some inline documentation to make the process more clear
2020-12-04 10:23:03 -05:00
10dce542ec
documentation change
2020-12-03 15:27:45 -05:00
0f59d3de09
add endpoint that gets a record for all changed /new workflow_specs at a remote endpoint
2020-12-03 14:45:57 -05:00
bcb45a59c8
allow cors
2020-12-03 08:46:34 -05:00
0e8913434a
refactor a bit
2020-12-03 08:44:15 -05:00
92aa1b971d
commit before removing big long SQL
2020-12-02 16:04:00 -05:00
aca1fb366b
Fixing a failing test and updating the personnel.
2020-12-01 15:47:27 -05:00
e15130e09c
Merge pull request #203 from sartography/151-data-store-exclusive-branch-expression
...
Added the ability to use the custom functions within a decision/flow …
2020-12-01 14:44:27 -05:00
801c5df75e
Merge pull request #201 from sartography/verify-end-event-#105
...
Verify end event #105
2020-12-01 14:24:12 -05:00
e0c28cbc7d
Make it easer to start things up.
2020-12-01 11:17:07 -05:00
94662c560e
Added the ability to use the custom functions within a decision/flow coming off of an exclusive join
...
Altered previous test to test this feature
2020-12-01 09:13:12 -05:00
73e01b347b
Ticket #105 . Verify End Event Documentation. Added explicit call to _process_documentation at end of crc.services.workflow_service.test_spec for the end event
2020-11-24 16:51:18 -05:00
071c98d72e
Some minor config tweaks to try and deal with some database timeout issues.
2020-11-19 11:25:58 -05:00
b8a91a513b
Merge pull request #196 from sartography/128-data-store
...
128 data store
2020-11-18 18:55:33 -05:00
b83ab1bcd1
Move data store base into its own file.
2020-11-18 15:34:50 -05:00
d198f124d7
Committing a merge from dev
2020-11-18 15:33:44 -05:00
66693d9f3a
Removing datastore script, as it isn't used in the api at all.
2020-11-18 15:06:28 -05:00
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
16313609ec
removed call to signal (changed to cancel_notify)
2020-11-18 13:55:30 -05:00
72ade3c367
Add crosstalk test
2020-11-17 10:29:49 -05:00
e9979efb0d
Add some tests
2020-11-17 09:33:29 -05:00
a2dc3c4812
Use Cancel Event
...
New title 'New Title'
2020-11-16 09:59:22 -05:00
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
7c2c725840
save before changing how API works
2020-11-13 09:58:21 -05:00
acaf633b45
Added ID as pk
2020-11-11 11:36:25 -05:00
9a4d167dcd
Add in api changes
2020-11-11 09:44:58 -05:00
cef221be32
Refactor to reuse code
2020-11-10 11:32:59 -05:00
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
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
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
1815a4b657
Merge branch '117-save-restore' into dev
2020-11-05 08:24:18 -05:00
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
2931f45187
Add 'sponsors' to study_info call
2020-11-04 14:34:10 -05:00
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
8b23cdc05c
commit changes before switching branches
2020-10-09 08:46:14 -04:00
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
014a4d9757
Fixing a failing test and updating the personnel.
2020-09-02 08:24:48 -04:00
b544334f45
1. Updating Personnel BPMN diagram to debug some issues.
...
2. Disabling the token timeout for now, to see if this corrects the issues Alex is having with lost work.
3. Raising more thoughtful error messages for unknown lookup options.
4. Providing better validation of default values and injecting the correct value for defaults related to enum lists of all types.
5. Bumping Spiffworkflow library which contains some better error messages and checks.
2020-09-01 15:58:50 -04:00
1052dff549
Merge remote-tracking branch 'origin/dev' into feature/python_eval
2020-08-27 14:33:16 -04:00
5dacc46600
Adding some additional bpmns from Staging server to include in tests.
2020-08-27 14:00:45 -04:00
53d09303d8
Validating that field properties are valid - they must exist as constants on the Task model.
...
Making all the lookup field names consistent.
Fixing the lookup service which was failing at times trying to find the correct field to use for building the lookup table.
Updating validation to check for additional fields and properties.
When connexion level errors occur, wrapping it in an API Error to be consistent.
2020-08-27 14:00:14 -04:00
1a713bd140
updating bpmn files from the staging server.
2020-08-27 13:55:27 -04:00
d31fd47837
Merge branch 'dev' into feature/python_eval
2020-08-25 11:08:42 -04:00
5be35e8bab
Adding a study sponsors script to return details about study sponsors
2020-08-25 10:30:46 -04:00
182e375fdc
Adds a test for string manipulation
2020-08-21 13:46:10 -04:00
4dc98a6b6b
Injects current user into task data.
2020-08-21 13:34:37 -04:00
66e49a347a
Minor tweaks to the eval endpoint, which should take both the expression and the data as one data structure.
2020-08-20 16:13:48 -04:00
7f60a19d55
Merge pull request #189 from sartography/feature/documents_publishing
...
Update github routines to use branches
2020-08-17 15:52:47 -04:00
8f5488d910
Don't raise an error when validating workflows that use the ldap script.
2020-08-17 15:45:37 -04:00
35b1b20960
Merge remote-tracking branch 'origin/dev' into feature/documents_publishing
2020-08-17 15:19:24 -04:00
dfaffc22b5
Merge remote-tracking branch 'origin/dev' into fix/returning_failed_name_message
2020-08-17 15:18:17 -04:00
d4c5e297cc
Merge remote-tracking branch 'origin/dev' into fix/delete_workflow_endpoint
2020-08-17 15:09:11 -04:00
32d47c1417
Merge remote-tracking branch 'origin/dev' into fix/delete_workflow_endpoint
2020-08-17 15:08:44 -04:00
c09441d019
Merge branch 'dev' into fix/delete_workflow_endpoint
2020-08-17 15:07:58 -04:00
85ad477b2b
Some minor cleanup on the study status and automatic events. I wanted to avoid having one database model automatically generating other database models as a side effect. The study service now has full responsiblity to recording study events.
...
To help in running tests, adding __init__.py methods to all the test directories.
2020-08-17 14:56:00 -04:00
2bd906e96d
Update github routines to use branches
2020-08-14 11:04:22 -06:00
304ca77e3e
Fixing exception within NameError handler
2020-08-14 09:01:15 -06:00
369fe4bb35
Automatic events refactoring
2020-08-14 08:36:46 -06:00
aa010272cc
Automatic event creation in study creation
2020-08-14 08:36:10 -06:00
c57ac6d302
Merge pull request #185 from sartography/feature/107_current_user_info
...
calling ldap with no argument will return information about the curre…
2020-08-14 09:18:10 -04:00
08c24b7441
Merge pull request #184 from sartography/PMI_fix
...
Pmi fix
2020-08-14 09:17:58 -04:00
c12e2b97f3
calling ldap with no argument will return information about the current user.
2020-08-13 21:09:52 -04:00
1a963cf940
Merge branch 'dev' into PMI_fix
2020-08-13 20:49:45 -04:00
9a5c1d7cfb
I may have finally wrapped my head around full text search in python. Now properly using an index based on simple rather than english dictionary which has far fewer stop words and stemming processes and plays much better to the type ahead search we are trying to provide.
...
Stop words are no longer excluded, so "other" is a valid search and gets a result.
2020-08-13 18:13:41 -04:00
e8067fe34e
adding additional data to the study details returned during validation/shield testing.
2020-08-12 17:04:59 -04:00
7bfcdd53cd
Merge branch 'dev' into cr-workflow-108
2020-08-12 10:50:19 -04:00
c4a15be90c
Change dmn files to python standard,
...
NB: this means mostly false=>False and true=>True
We may have to decide if we want to add false and true as extensions in the python namespace.
2020-08-12 10:48:59 -04:00
9a31d591ae
Adds user uid and cascades study event in study model. Fixes migration to properly downgrade enums.
2020-08-12 10:13:23 -04:00
79c14ad23c
Unlinking file from workflow instead of trying to delete it
2020-08-10 22:23:20 -06:00
3cfcd74a6a
Just finding a few more edge cases, all tests should pass now.
2020-08-10 15:16:53 -04:00
b53d033400
Cleaning up the delete workflow method in study service so we don't try to delete the same thing more than once)
2020-08-10 14:56:33 -04:00
56b161a234
Fixing the failing tests by passing in workflow.id rather than workflow to the delete workflow endpoint
2020-08-10 13:51:05 -04:00
d3462d2e15
Deleting all dependencies for a workflow
2020-08-10 07:42:56 -06:00
a561a5cddc
Adjusting study events attribute
2020-08-08 18:25:01 -06:00
1ab765b50b
Add test for PMI problem
2020-08-06 10:29:14 -04:00
bf3dae1885
Collecting user generated study changes
2020-08-05 20:29:05 -06:00
c25536dcca
Makes Sonar happy.
2020-08-04 16:42:35 -04:00
2846bf9451
Fleshes out fake PB response, so workflows that pull from PB actually trigger validation errors
2020-08-04 15:50:29 -04:00
b4595b345a
Raises ApiError for 'display_name' extension property exception
2020-08-04 13:59:50 -04:00
04399eec2a
Accepting None for primary_investigator_id
2020-08-04 11:38:46 -06:00
cd9376cf8e
Adding back ability to update studies
2020-08-04 09:13:24 -06:00
50b207307a
Merge branch 'dev' into feature/update_study_status_latest
2020-07-31 14:26:24 -06:00
4fcba113b8
Fixing tests
2020-07-31 11:49:04 -06:00
2c2967e633
Normalizing enum values
2020-07-31 11:19:50 -06:00
5d23223e51
New study status update
2020-07-30 21:03:11 -06:00
73699e66bd
Merge branch 'dev' into feature/admin_impersonations
2020-07-30 17:36:20 -04:00
9704cbcb26
Modifications to the ldap scripts to bring them back in line with what Kelly is doing with the evaluation process.
2020-07-30 13:35:20 -04:00
f8944da31f
Merge branch 'dev' into feature/admin_impersonations
2020-07-30 13:01:46 -04:00
faba0f55ab
Adds AdminSession model and refactors impersonation methods to use it.
2020-07-30 12:40:53 -04:00
a6ec0c92c7
Merge remote-tracking branch 'origin/dev' into cr-connect-106-augment-eval-methods
2020-07-30 11:38:47 -04:00
44deee12de
Merge branch 'dev' into feature/improved_task_event_api
2020-07-30 11:28:52 -04:00
37d1ba5d5a
Merge pull request #160 from sartography/feature/ldap_lookup_script
...
Ldap lookup script
2020-07-30 11:27:38 -04:00
bf4d882519
Merge branch 'dev' into feature/ldap_lookup_script
2020-07-30 11:19:24 -04:00
2905fc6173
Merge branch 'feature/ldap_lookup_script' of github.com:sartography/cr-connect-workflow into feature/ldap_lookup_script
2020-07-30 11:17:48 -04:00
aa0f24bd33
Fully deletes users from g in test tearDown
2020-07-30 10:40:06 -04:00
31982f81ae
Merge branch 'dev' into feature/documents_publishing
...
# Conflicts:
# Pipfile.lock
2020-07-30 10:17:08 -04:00
1b0ebecbf4
Uses Flask session to store impersonation state.
2020-07-30 10:17:02 -04:00
d301e9e6fa
Adds list_users endpoint. Adds admin impersonate uid parameter to user endpoint. Adds some utility methods to user service. Refactors authentication tests.
2020-07-29 22:47:47 -04:00
63537d7765
Adds is_admin boolean flag to user schema
2020-07-29 22:45:56 -04:00
de49397549
Adjustings tests for protocol builder status changes
2020-07-29 10:51:34 -06:00
73a6b7adf1
Fixing tests
2020-07-29 10:25:57 -06:00
6aa21638de
Updating properly study status & fixing tests
2020-07-29 10:25:57 -06:00
f897ee3aea
Merge branch 'feature/approvals_dashboard_prototype' into feature/admin_impersonations
2020-07-29 10:32:46 -04:00
0ea4c13d09
Convert protocol builder status to always be in lower case in order to better match the front end. And also fixing an issue with the multi_instance that is oddly broken suddenly, and I don't know why.
2020-07-28 17:16:48 -04:00
79adb673f2
Fixes display_name custom properties
2020-07-28 14:04:18 -04:00
4d11fc04a0
dropping the "read_only" flag in favor of a "do_engine_steps" flag, which more clearly defines what is happening.
2020-07-28 13:51:29 -04:00
f15626033d
Allow the workflow to be requested without making changes to the workflow - requires that you specify a read_only flag of true, otherwise it assumes that you want a fully prepared workflow with the next ready task set to run.
2020-07-28 13:33:38 -04:00
d617af8565
All tests are passing - may need to refactor a bit, / remove comments
2020-07-28 11:02:49 -04:00
300026cbc8
Expanding the task events endpoint to accept workflow and study ids as additional filters.
...
Removing events from the study endpoint, too noisy.
2020-07-28 10:16:48 -04:00
0cb480801b
Provide event data on the Study api endpoint.
...
Speed up the tests a little, because that got out of hand. Need to dig into what is causing this problem.
2020-07-27 17:05:01 -04:00
51d6d6a5fa
Fixing failing tests around a notifications workflow.
2020-07-27 16:54:46 -04:00
8d42d520a0
Adding events to the study that is returned via the api.
2020-07-27 16:32:23 -04:00
452f2c3723
Building out a user service for getting the current user, it will provide a number of functions, one of which will allow administrative users to impersonate other users in some circumstances (but will assure that we log events correctly when an impersonation occures)
2020-07-27 14:38:57 -04:00
0d2cb8c1b8
Correcting an issue with the Navigation where it did not correctly handle looking back to a previous task within the workflow.
...
In some cases the session was not getting committed, leaving rogue assignments outstanding for a workflow.
2020-07-27 12:36:20 -06:00
263ea4d00f
Adds manual task
2020-07-27 12:35:53 -06:00
6cdb9c3b3a
Exposes date in TaskEvent endpoint
2020-07-27 12:35:53 -06:00
4adb6a1b44
Adds enrollment_date to study model
2020-07-27 12:34:25 -06:00
6379b26a71
Add a few more details to the workflow metadata model.
2020-07-27 12:34:25 -06:00
cc55aed89c
Change exception name
2020-07-27 12:18:28 -04:00
70ad3872a7
Fix several bugs, most had an issue with the bpmn document
2020-07-27 12:02:34 -04:00
824582dab1
Hot fix to correct for a failing test due to updates in Spiffworkflow library,
...
and modifying the token authorization so that we can log in as different users when not in production mode.
2020-07-27 11:25:29 -04:00
a124e13c6a
Replace all legacy style calls with new calls.
...
Still having issues where we try to eval an empty definition, not quite sure why there is a difference from what we had before. I may need to revert some of it and determine what is going on.
2020-07-24 14:33:24 -04:00
f5ab283538
Test of adding in the ability of augmenting the workflow to include internal scripts like StudyInfo
...
This is the first waypoint on a larger effort to make all of the 'special scripts' that currently require a shebang to be just another python function.
2020-07-24 12:08:46 -04:00
842d2ee100
Supporting study status update
2020-07-23 10:58:24 -06:00
6fae89b1fc
Adds manual task
2020-07-22 14:48:36 -04:00
b87f55fbd7
Exposes date in TaskEvent endpoint
2020-07-22 14:48:10 -04:00
aa7437bfc4
Merge branch 'dev' into feature/approvals_dashboard_prototype
2020-07-22 13:08:32 -04:00
acb43cc271
Removing an unused function and addign a fix me.
2020-07-22 11:40:49 -04:00
a243c14d75
Updating to lastest spiffworkflow which uses box to support dot notation.
...
Adding a new endpoint for evaluating the results of a python expression into the tools section of the api.
2020-07-22 11:30:16 -04:00
855f5544e5
Adds enrollment_date to study model
2020-07-22 09:35:08 -04:00
41cbce8e01
Updating bpmn test
2020-07-21 21:08:08 -06:00
522f848682
Addressing feedback
2020-07-21 20:54:03 -06:00
313770d538
Ldap lookup script
2020-07-21 20:54:03 -06:00
3d9eeab502
Add a few more details to the workflow metadata model.
2020-07-21 15:18:08 -04:00
d01b30debc
Building the start of an endpoint that could be used by logged in / authenticated users that will evaluate basic python functions sent in via the API.
...
The hope here is that we can process these in real time for the front end, but still do it using the same evaluation engine we use everywhere else, so
the syntax for things like hide-expressions can be properly verified during workflow validation and will be assured to work during front end rendering.
Removing any all javascript code in the BPMN models.
2020-07-21 13:57:33 -04:00
73338e61d5
Merge branch 'dev' into feature/ldap_lookup_script
2020-07-20 14:56:34 -04:00
7f8c7097ef
Merge branch 'dev' into feature/ldap_lookup_script
2020-07-20 13:05:33 -04:00
6caf44544c
Merge branch 'dev' into cr-connect-92-scripting-enhancements
...
# Conflicts:
# crc/static/bpmn/ind_supplement/ind_supplement.bpmn
# tests/workflow/test_workflow_service.py
2020-07-20 13:01:23 -04:00
dd0f984347
Drop backwards compatibility of scripts. While this will cause some initial pain, it's less confusing and error prone, and we are still in the development phase of the project. Were this going straight to production we would likely want to keep this backwards compatibility.
...
Don't parse on spaces if this is python code, so we avoid any errors in processing - spaces should be valid.
2020-07-20 12:26:34 -04:00
b85869905b
Merge branch 'cr-connect-92-scripting-enhancements' of github.com:sartography/cr-connect-workflow into cr-connect-92-scripting-enhancements
2020-07-20 11:40:10 -04:00
06430550c8
Dropping the RRT-Data-Fix, it should have come out already, but had a failing test, so pulling it out now rather than delve into what is going wrong with obsolete code.
2020-07-20 11:39:50 -04:00
f415f22ccb
Add warning message when we fail due to syntax error and then we try to look up the class as a backup
2020-07-20 10:12:15 -04:00
a39cacdf00
Ldap lookup script
2020-07-19 21:53:18 -06:00
fcb772c900
Reporting to Sentry all captured exceptions and enabling multiple environments
2020-07-19 16:40:33 -06:00
59d04feb23
Adding missing import
2020-07-17 17:08:44 -06:00
73400ed6c7
Adding proper tests for files publishing
2020-07-17 16:59:25 -06:00
d34d08b121
Trying to force re-run to clear SonarCloud
2020-07-17 13:33:42 -06:00
331a6c0aeb
Fixing tests
2020-07-17 12:52:09 -06:00
f4eb592b87
Extracting token to env var
2020-07-17 12:31:05 -06:00
419d06c95b
Updating file by latest version
2020-07-17 12:31:05 -06:00
a10ef9066d
Github integration with admin
2020-07-17 12:31:05 -06:00
e82532aad8
Updates IND workflow spec. Fixes validation process to return lookups for enum values.
2020-07-17 11:51:21 -04:00
de54b63e20
Process scripts with no shebang (#!) as a regular python script. If there is a shebang, we look up the class as we did before.
...
I've also made it so that it falls back if we accidentally forget to add a shebang to a study as this would be a breaking change.
With the fallback feature, it should work with unmodified bpmn documents.
2020-07-17 10:56:04 -04:00
ab5771024e
Check in for sanity check
2020-07-17 09:24:53 -04:00
d67105332f
Merge branch 'dev' into feature/lanes_and_roles
2020-07-16 14:00:53 -04:00
6c6c5d315d
Fixing a stupid mistake where I used an unquoted value in the mock data for validation, which created a dict that could not be serilized.
2020-07-16 13:28:00 -04:00
6a24bcbf6f
Clears out Jinja statements to get test to pass for now
2020-07-16 09:45:11 -04:00
d0279a11e5
Fixes failing unit test
2020-07-15 17:44:46 -04:00
3fe9662f26
Updates DSP workflow
2020-07-15 16:48:32 -04:00
77948c7828
Updates Personnel workflow
2020-07-15 14:28:55 -04:00
08fba1a4dc
Merge branch 'dev' into feature/dynamic_enum_list
2020-07-15 13:09:02 -04:00
c7662315aa
Assure that any errors that occur during the do_engine_steps is correctly captured and returned to the end user or configurator with enough information for them to act on.
2020-07-15 11:16:35 -04:00
fa7608053a
fixing a failed test.
2020-07-14 22:23:54 -04:00
d85ca1ce51
Whenever a workflow is loaded or updated, add events to the TaskEvent table with assignments for the next set of ready tasks, along with who should complete those tasks.
...
Add the lane information to the Task model.
Drop the foreign key constraint on the user_uid in the task log, as we might create tasks for users before they ever log into the system.
Add a new endpoint to the API called task events. It should be possible to query this and get a list of all tasks that need a users attention.
The task events returned include detailed information about the workflow and study as sub-models
Rename all the actions in event log to things that are easier to pass over the api as arguments, make this backwards compatible, updating existing names in the database via the migration.
Throughly test the navigation and task details as control of the workflow is passed between two lanes.
2020-07-14 22:16:44 -04:00
c8214a4cc4
Updates DSP
2020-07-14 14:49:04 -04:00
d71ff80eac
Adds end and start events
2020-07-14 13:42:52 -04:00
9077ff3ebf
It is not possible to use task_data for an auto-complete field. It's too expensive an operation to provide that feature on the backend, and the data already fully resides on the front end anyway. Task-data can be used to populate enum fields if needed, so it can populate dropdowns, radios and checkboxes, just not auto-complete.
2020-07-14 11:38:48 -04:00
a48322ef6a
Partial work on CR Connect Roles.
...
Adding checks in the API to assure the correct person is completeing a task based on the task's lane.
Adding lane to the Navigation item.
Adding a check to assure that unique user ids can be identified using task.data
Added some additional ldap entries to make testing and development easier.
Removed a big chunk of duplicate code from task_tests_api
Modified some of the helper functions to make it easier to test as specific users.
Added some additional bpmn models to the tests for testing lanes and roles.
2020-07-14 10:29:25 -04:00
463660f185
Merge branch 'dev' into feature/dynamic_enum_list
2020-07-13 17:47:56 -04:00
07066b8a16
Looks up enum options from task data
2020-07-13 17:46:28 -04:00
069a9cac5e
Merge branch 'feature/enum_lookup_data' of github.com:sartography/cr-connect-workflow into feature/enum_lookup_data
2020-07-13 12:46:13 -04:00
9e29a43785
Correct for a race condition where multiple lookup tables are built for the same field and workflow specification, causing it to appear that the models are not updating correctly.
2020-07-13 12:45:51 -04:00
32343c04d6
Merge branch 'feature/enum_lookup_data' into feature/dynamic_enum_list
2020-07-13 11:53:29 -04:00
ccb2addeb5
Fixes another one
2020-07-10 16:27:09 -04:00
743e18746b
Fixes some syntax issues
2020-07-10 16:17:49 -04:00
aea7b23aab
Removes unnecessary test workflow spec
2020-07-10 14:52:08 -04:00
b7920989ed
WIP: Adds Camunda property for retrieving enum field options from task data.
2020-07-10 14:48:38 -04:00
1f454536e3
Renames TOKEN_AUTH_SECRET_KEY to SECRET_KEY
2020-07-10 11:26:15 -04:00
7f0b35ff27
Merge branch 'dev' into feature/enum_lookup_data
2020-07-10 10:27:51 -04:00
ff7c30b879
Merge pull request #138 from sartography/fix/cleanup_todos
...
Cleanup pending TODOs
2020-07-10 08:26:47 -04:00
6a79fb3581
There may be multiple investigators of the same type that come back from the protocol builder, adding some tests and additional code to handle this, but still keep the list flat, currently appends a number to the investigator type when there is more than one.
2020-07-07 17:16:33 -04:00
64f9bd2ca7
Tiny leftover
2020-07-07 08:38:33 -06:00
b4e127b3b7
Cleaning properly previous versions
2020-07-07 08:32:41 -06:00
a302208890
Updating test for study with approvals
2020-07-07 08:32:41 -06:00
c7b864f9c7
Cleaning up old notes
2020-07-07 08:32:20 -06:00
517cd8fc91
Merge branch 'dev' into feature/enum_lookup_data
2020-07-06 16:31:19 -04:00
bb4000ff6d
Don't attept to load up the workflows for abandoned studies.
2020-07-06 16:01:43 -04:00
8a66128189
Bug fixes after bumping the version of Spiffworlflow to the latest - which has fixes for sequential multi-instance.
2020-07-06 15:34:24 -04:00
419c05e46c
Merge branch 'dev' into fix/more-info-in-exceptions
2020-07-06 12:51:24 -04:00
a5cef8775e
* Modifying the StudyInfo script to return both "investigators" and "roles", the investigators argument will return only the current active investigators according to the protocol builder. The "roles" argument returns all possible roles - it is what "investigators" use to be.
...
* The Task.title returned to the front end will now attempt to process the "display_name" property for dot-notation syntax, making it possible to use this for multi-instance tasks,
but will work in all cases where we want he title to change based on values in the data model.
* Fixing a bug the test_study_api where it wasn't updated when we made recent changes to the different states of a study.
*
2020-07-06 12:09:21 -04:00
1d9fef380a
Merge branch 'fix/more-info-in-exceptions' into feature/enum_lookup_data
2020-07-03 14:22:11 -04:00
f344fe60c0
WIP: Adds enum field lookup option data
2020-07-03 12:20:10 -04:00
817333f26e
Adding proper exception information
2020-07-02 16:10:33 -06:00
340ae68eed
Sets PB status to Active by default
2020-07-01 11:01:36 -04:00
84973d2351
resolving comments from pull request.
2020-06-30 12:24:48 -04:00
93bf46354b
A last minute change to make the API a little clearer and cleaner broke some tests.
2020-06-30 11:12:28 -04:00
f183e12fe5
Provides some basic tools for getting additional information about a lookup field.
...
Adds an optional 'value' parameter to the lookup endpoint so you can find a specific entry in the lookup table.
Makes sure the data attribute returned on a lookup model is a dictionary, and not a string.
Fixes a previous bug that would crop up if double spaces were used when performing a search.
2020-06-30 10:34:16 -04:00
d3ce1af1ce
Provides some basic tools for getting additional information about a lookup field.
...
Adds an optional 'id' parameter to the lookup endpoint so you can find a specific entry in the lookup table.
Makes sure the data attribute returned on a lookup model is a dictionary, and not a string.
Fixes a previous bug that would crop up in double spaces were used when performing a search.
2020-06-30 10:00:22 -04:00
e650a46073
Fixes local testing bug where working directory was sometimes wrong.
2020-06-29 16:41:42 -04:00
e03e3d9bd9
Merge branch 'dev' into fix/empty_task
2020-06-29 15:22:30 -04:00
49e80398be
Merge branch 'rrt/dev' into dev
2020-06-29 14:56:01 -04:00
9e1881ed89
Merge branch 'dev' into fix/empty_task
2020-06-29 14:43:34 -04:00
cff270071a
Merge branch 'rrt/dev' into fix/empty_task
2020-06-29 08:41:21 -06:00
a996c81508
Gets mi_index out of Spiff task internal data
2020-06-28 11:35:35 -04:00
d4bcb9af65
Proper error handling in csv/dumps for approvals
2020-06-27 13:59:04 -06:00
848ad563d3
Only filters by mi_index if task has a mult_instance_index
2020-06-26 12:47:42 -04:00
f9f3003ef0
Filters by multi-instance index, if applicable
2020-06-26 12:31:37 -04:00
150117587e
Merge branch 'dev' into feature/parallel_multiinstance_tasks
2020-06-25 23:20:38 -04:00
665faaa175
Send emails from service
2020-06-25 16:18:42 -06:00
44995e3813
Merge branch 'feature/emails-enhancement' of github.com:sartography/cr-connect-workflow into feature/emails-enhancement
2020-06-25 14:37:04 -06:00
c3ceda4c2f
Replaces xml.etree with lxml.etree
2020-06-25 14:02:16 -04:00
7116b582e8
Splitting commands properly without losing double quoted strings
2020-06-25 12:01:24 -06:00
fe5a7ddce3
Merge remote-tracking branch 'origin/rrt/dev' into feature/emails-enhancement
2020-06-25 13:29:06 -04:00
23941d73ad
Fixes variable names. Updates Spiff to STG-26 branch. Updates package versions.
2020-06-25 11:02:57 -04:00
5d1ae402b6
Slight refactor on data passed to template rendering
2020-06-24 22:43:44 -06:00
a0d877e02f
Feedback from PR addressed
2020-06-24 22:23:31 -06:00
5327b469f6
Merge branch 'rrt/dev' into feature/emails-enhancement
2020-06-24 21:46:53 -06:00
a40adeca3a
Merge branch 'dev' into STG-26
2020-06-22 19:57:43 -04:00
dd10e56d1a
Adding forgotten variables to returned dict
2020-06-22 14:56:24 -06:00
bb825f8097
Dropping old parameter from endpoint
2020-06-22 14:09:58 -06:00
dc5ffd29d0
Refactoring shared code
2020-06-22 14:07:57 -06:00
e5541e4950
Enable CSV download
2020-06-22 09:24:58 -06:00
b8d60ca944
Spreadsheet generation
2020-06-22 07:14:00 -06:00
6aec15cc7c
Shifting to a different model, where the TaskEvents store ONLY the form data submitted for that task.
...
In order to allow proper deletion of tasks, we no longer merge data returned from the front end, we set it directly as the task_data.
When returning data to the front end, we take any previous form submission and merge it into the current task data, allowing users to keep their previous submissions.
There is now an "extract_form_data" method that does it's best job to calculate what form data might have changed from the front end.
2020-06-19 08:22:53 -04:00
e6d74aaa1a
Removing extra index when parsing users info
2020-06-18 12:53:50 -06:00
4db815a999
Handling incoming values from processor
2020-06-17 21:11:47 -06:00
e947f40ec7
Merge branch 'rrt/dev' into feature/emails-enhancement
2020-06-17 20:10:11 -06:00
5ce279b663
Dropping silly pdb statement
2020-06-17 17:36:15 -06:00
896ba6b377
Email relies now on markdown content
2020-06-17 17:00:16 -06:00
2ce2dc73b5
Rendering proper content & organizing file structure for email tests
2020-06-17 16:09:38 -06:00
da048d358e
Merge branch 'dev' into feature/refactor_data_loading
2020-06-17 17:14:30 -04:00
3b57adb84c
Continuing a major refactor. Some important points:
...
* TaskEvents now contain the data for each event as it was when the task was completed.
* When loading a task for the front end, if the task was completed previously, we take that data, and overwrite it with the lastest data, allowing users to see previously entered values.
* Pulling in the Admin branch, as there are changes in that branch that are critical to seeing what is happening when we do this thing.
* Moved code for converting a workflow to an API ready data stricture into the Workflow service where it belongs, and out of the API.
* Hard resets just convert to using the latest spec, they don't try to keep the data from the last task. There is a better way.
* Moving to a previous task does not attept to keep the data from the last completed task.
* Added a function that will fix all the existing RRT data by adding critical data into the TaskEvent model. This can be called with from the flask command line tool.
2020-06-17 17:11:15 -04:00
cf09d986ea
Merge branch 'feature/admin' into feature/refactor_data_loading
2020-06-17 16:48:43 -04:00
1844c93919
STG-26 - basic test case for a looping task
...
Criteria :
task.multi_instance_type == 'looping'
to terminate, use the standard endpoint for submitting form data with a query variable of terminate_loop=true
Will likely need two buttons:
"Submit and quit"
"Submit and add another"
or something similar
2020-06-17 11:35:06 -04:00
c730a7b1ec
Sending subject and using default sender
2020-06-17 08:53:02 -06:00
40ff3b5fcb
Uses mock LDAP if LDAP_URL environment variable is 'mock'
2020-06-16 21:43:20 -04:00
2ff836019f
Sonarcloud fix
2020-06-16 18:55:18 -06:00
d4a285883f
Email script
2020-06-16 18:42:36 -06:00
59d66be10f
Handling empty task state
2020-06-16 13:13:30 -06:00
1b9166dcb7
Cleaning up the merge, which resulted in some lost code.
2020-06-16 13:34:21 -04:00
c7d8eaff30
Merge branch 'dev' into feature/refactor_data_loading
2020-06-16 13:15:43 -04:00
bd1321baf0
Merge branch 'dev' into feature/admin
2020-06-16 12:29:43 -04:00
0608ffa08a
Restricting the admin endpoints to be admin only, and adding a bit of configuration.
2020-06-16 12:26:25 -04:00
7723862530
Merge branch 'dev' of https://github.com/sartography/cr-connect-workflow into dev
2020-06-15 16:30:17 -04:00
672ed367e0
Merge branch 'rrt/dev' into feature/admin
2020-06-15 16:13:57 -04:00
706c4afda5
Create a parameter 'lane' since we are using the output from the nav-list as the input to the NavigationItem initializer.
...
NB - this doesn't do anything with the lane designation, it just keeps it from blowing up.
2020-06-15 12:33:51 -04:00
92580ee867
adding an additional error check for invalid json returned from the Protocol builder.
2020-06-15 12:26:53 -04:00
eec4b579a7
Don't error out if we don't have a valid study id when doing validation.
2020-06-15 11:27:28 -04:00
5f13b96079
More enhancements
2020-06-12 12:17:08 -06:00
2a84d5196a
filter, not filter_by
2020-06-12 14:13:27 -04:00
e3126620b3
Eschews obfuscation
2020-06-12 14:09:08 -04:00
561e254315
Prevents non-admin users from editing each others' tasks. Fixes bug where test user uid was not being set from token. Moves complete form and get workflow API test utility methods into BaseTest.
2020-06-12 13:46:10 -04:00
691258a4fb
Fixes bug where approvals counts were off by 1. Tests CSV export and all approvals endpoints with lots of records.
2020-06-11 17:15:44 -04:00
f51e5e4e6b
Adds tests for approval counts and all approvals endpoints
2020-06-11 16:39:00 -04:00
768f14b3ac
Cleans up console logging
2020-06-11 13:42:44 -04:00
312eef4d40
Raises 403 error if no user found
2020-06-11 13:07:27 -04:00
cccff9b856
Fixes broken unit tests. But still broken.
2020-06-11 11:29:58 -04:00
1f5554d0d8
Merge branch 'rrt/dev' into feature/swagger_admin_authentication
2020-06-11 08:55:29 -04:00
e9e805b2c9
Storing emails in database
2020-06-09 22:57:56 -06:00
5c1c0f685e
Tests update
2020-06-08 16:17:41 -06:00
777e429382
Merging production back into dev, because we got out of whack somehow.
2020-06-08 14:19:30 -04:00
8cf420b781
Default mail user name and password to blank.
2020-06-08 14:15:56 -04:00
e370148380
Merge pull request #112 from sartography/rrt/dev
...
Rrt/dev
2020-06-08 13:18:41 -04:00
0351b3548a
Adding bcc to all emails sent
2020-06-08 11:17:17 -06:00
f91fbf76b9
Capturing explicit errors from mails
2020-06-08 09:16:26 -06:00
87e2379871
Merge branch 'rrt/dev' into feature/swagger_admin_authentication
2020-06-08 10:30:16 -04:00
4cf52b527c
Adding admin dashboard
2020-06-08 07:14:31 -06:00
1c8c085afe
Merge branch 'rrt/dev' into rrt/testing
2020-06-07 22:39:34 -04:00
049424d01b
Adds back an endpoint that returns all approvals across all statuses or users
2020-06-07 22:38:21 -04:00
af1c848f65
Merge branch 'rrt/dev' into rrt/testing
2020-06-07 19:57:09 -04:00
0774942b99
Merge branch 'feature/better_approval_status' into rrt/dev
2020-06-05 22:19:58 -04:00
1d3f98b381
Adds endpoint to quickly get counts of approvals in each status group for a user
2020-06-05 22:19:37 -04:00
213d3f3501
Merge branch 'feature/better_approval_status' into rrt/dev
2020-06-05 19:11:16 -04:00
6861991d8f
Allow setting the type of approvals you want back, by status.
...
Some very minor performance enhancements, that will add up on the Approvers page.
2020-06-05 17:49:55 -04:00
f0904e75a6
Sets main approval status after related approvals have been populated
2020-06-05 15:54:53 -04:00
663da57d8b
Config can read smtp values from environment now
2020-06-05 13:54:37 -06:00
57a7c7fa54
Approve/deny fixes
2020-06-05 13:39:52 -06:00
Dan Funk
mike cullerton
Kelly McDonald
Aaron Louie
Carlos Lopez