eaf52a21ca
Merge pull request #260 from sartography/bug/delete_study
...
Allows us to delete a study even if there are emails, and associated …
2021-03-09 13:51:25 -05:00
80ff8a6212
Allows us to delete a study even if there are emails, and associated study users connected to that study.
2021-03-09 13:31:26 -05:00
576aebab19
Sometimes a workflow can be completely broken and unloadable. For instance, it starts off with a engine step / script task that will not execute. So the failure happens the second it is processed. When calling reset on a workflow, we should catch the failure, and reset the workflow, so we aren't trapped in an unrecoverable state.
...
To do so, I changed the WorkflowProcessor's reset method to be static, it will try to instantiate the current workflow and execute a cancel_notify event, but if that fails, it will continue and always return a new workflow processor using the latest spec.
2021-03-09 11:52:55 -05:00
7171219e8b
removed unused import
2021-03-09 07:00:20 -05:00
44ac55bc32
We can now send emails to users associated with a study, by using 'associated' as the recipient
...
We now use keyword arguments in the email script; subject and recipients
2021-03-09 06:49:39 -05:00
36dcc58705
Merge branch 'dev' of github.com:sartography/cr-connect-workflow into dev
2021-03-08 14:00:14 -05:00
291216e081
Fixing a bug that prevented proper evaluation of a enum field where the default value was null or empty.
2021-03-08 14:00:03 -05:00
f883eb2bbe
We now include field.id in the ApiError message for hidden and default validation. (The field must have a default value or value expression)
...
While working on this ticket I found a logic error in the test. I expected both default_value and value_expression. It turns out the default_value is always there, it's just null if we don't set it.
Modified the existing test for hidden and required, and added tests to make sure my passing logic is now correct.
2021-03-04 10:42:13 -05:00
9e758c57d3
Merge branch 'dev' into bug/225_enum_lookup_same_field_name
2021-03-02 14:15:58 -05:00
572eb3457a
Merge pull request #252 from sartography/customer-error-messages-192
...
Customer error messages 192
2021-03-02 13:45:38 -05:00
adb9e3afba
Merge branch 'dev' into bug/225_enum_lookup_same_field_name
2021-03-02 13:40:21 -05:00
c8f5a44050
adding a warning in the logger so we can see when expensive calls are made to rebuild searches for enumerations. But all looks good.
2021-03-02 12:21:51 -05:00
06dedd8a32
Add short_title to study, change update_study task to use kw arguments and add the short_title to the update_study script
2021-03-02 10:03:53 -05:00
9a2ffb98ad
Customer Error is in a place that we can try it out on testing.
...
So far, there are two known errors.
- Missing condition type (Ticket 178)
- Invalid property value in extensions tab for display_name (No ticket for this error)
We now have the option of using regular expressions to pull task_id, etc. from an error to pass back to the user in the hint.
2021-03-01 16:41:55 -05:00
3e0541fa15
Merge pull request #250 from sartography/206-extend-study-access
...
206 extend study access
2021-03-01 14:55:38 -05:00
aac3d5c16e
Bug #255 , this requires the front end to pass in the name of the task, when doing a lookup. This will prevent a bug where we have multiple user tasks, with enum fields that set the same variable, but use different lookup tables to populate the dropbown or search feature.
2021-03-01 14:54:04 -05:00
9d804c36d5
Merge branch 'dev' into customer-error-messages-192.
...
Needed some sql changes from dev
2021-03-01 10:29:10 -05:00
0b08a95e25
Add test and make sure that the API endpoint does the right thing when we switch users - checks both associated with access and associated with no access
2021-02-25 12:20:43 -05:00
5c3d791bf3
UVA asked us to remove the extra whitespace in emails.
...
We removed the string replacement of '\n' -> '<br>' to solve this.
This means you can't purposely add blank lines any more.
Trade offs.
2021-02-25 11:08:08 -05:00
f3414e22c1
use the associated table to grant access to users who have been designated to have access to the study, not just the study owner.
2021-02-25 11:08:06 -05:00
f592a8a0b0
Added a few more tests - I think I need to test one more script endpoint
2021-02-25 09:07:46 -05:00
9bd3aa8dcb
service and scripts with working test - still needs a few more tests to try out, but should work to get Mike going
2021-02-24 12:55:23 -05:00
c795dd7aea
Merge branch 'dev' into 206-extend-study-access
2021-02-24 12:16:35 -05:00
3dbe39c6fe
initial checkin of changes for branch
2021-02-24 12:05:06 -05:00
f937ac3ce9
Getting some thoughts down for the extension property error. This might force us to use regexes for the error service.
...
Committing so I can work on another branch.
2021-02-24 10:56:25 -05:00
0a58dce394
Changes for ticket 215 - Change email header and footer to say CR Connect
2021-02-23 12:13:21 -05:00
349c3d657a
Merge branch 'dev' into 201-changes-to-in-progress
2021-02-22 18:17:59 -05:00
53fa49e668
Merge pull request #243 from sartography/183-remove-study-approval-code
...
Remove Approvals per ticket 183
2021-02-22 18:12:02 -05:00
4fc2929356
Put the preamble back in to the error message.
2021-02-19 15:57:01 -05:00
3b06795c4c
File cleanup for readability. Removed some commented code.
2021-02-19 14:49:53 -05:00
4fa0f9720a
Allow frontend to honor 'view as' and fix problem with tests
2021-02-18 11:25:17 -05:00
8c309e9a41
Add user display name to the response for task events
2021-02-18 08:44:44 -05:00
6fbaecf9b2
Change selection to include task events that are for someone else, but are on a study I own.
2021-02-18 08:09:13 -05:00
f0a921d46d
Merge pull request #242 from sartography/allow-period-in-field-id-199
...
Allow period in field id 199
2021-02-17 15:08:53 -05:00
93f29e86d8
Merge branch 'dev' into STG-181_frontend-ux-model-changes
2021-02-17 07:49:05 -05:00
ff8a44a7b1
Make sure we always have a current user, even if the very first task is a script task.
2021-02-16 12:42:59 -05:00
e54a6956df
Make a change in the case that we have no task_events at all.
2021-02-16 11:10:40 -05:00
118cf62172
Merge remote-tracking branch 'origin/dev' into STG-181_frontend-ux-model-changes
2021-02-16 10:07:34 -05:00
003bf2f9b9
Remove Approvals per ticket 183
2021-02-16 09:05:29 -05:00
3b1dc70558
Add comment for later ticket
2021-02-16 08:44:41 -05:00
ed6218028c
We now allow periods in field ids.
...
Also, added task_id and task_name to the ApiError for missing default value on hidden and required fields
2021-02-15 16:27:56 -05:00
39eb5c5c21
This is a decent beginning framework for customer error messages.
...
It is not complete, but is in a state where we can start to interact with the front end.
Two tests are failing.
Committing so I can work on an error for Alex.
2021-02-12 14:18:42 -05:00
c44e784eb2
Fixing a bug with the user model.
2021-02-12 09:48:41 -05:00
35773ebc29
Merge pull request #240 from sartography/weird-email-error
...
The email script was failing validation because of missing parameters…
2021-02-12 09:31:52 -05:00
7eeb491dfa
User str decode Removed
2021-02-12 09:30:18 -05:00
d8bd203139
The email script was failing validation because of missing parameters in scripts.email.do_task_validate_only.
...
I added a test in tests.test_email_script to make sure we get the default email_address.
I also found and fixed a bug in workflow_service.populate_form_with_random_data where we would overwrite default_values with random text because of a missing continue.
(We don't want to continue if we have repeating fields though.)
2021-02-11 15:36:12 -05:00
fe4e737596
Merge pull request #238 from sartography/value-expression-failing-shield-test-194
...
We now allow value_expression to evaluate to an empty string ("") so …
2021-02-11 11:25:09 -05:00
df0cfc755b
Merge pull request #237 from sartography/get-study-from-model-error-191
...
We now test whether we have a valid StudyModel when getting a study b…
2021-02-11 11:23:59 -05:00
40639bbd03
Merge pull request #236 from sartography/trap-non-api-errors-187
...
New error handler for non Api errors. Ticket 187
2021-02-11 11:22:48 -05:00
df25b83958
Merge pull request #235 from sartography/index-error-for-enums-186
...
Index error for enums 186
2021-02-11 11:21:50 -05:00
10b9c7b892
Merge pull request #234 from sartography/hidden-and-required-fields-185
...
Hidden and required fields 185
2021-02-11 11:20:35 -05:00
f7337f4e54
Merge branch 'dev' of github.com:sartography/cr-connect-workflow into dev
2021-02-11 11:17:56 -05:00
2ada9f6f42
Private Ldap settings
2021-02-11 11:17:21 -05:00
39e874504f
We now allow value_expression to evaluate to an empty string ("") so that we *do not* set a default value for enums in some cases.
...
This was causing an error because "" was not an option for the enum.
2021-02-10 14:35:58 -05:00
8a2a8b1443
Still not in working order. Committing to work on another ticket.
2021-02-10 12:28:59 -05:00
da0af14724
Changes to enable front-end changes
...
Added a human readable name to created user
added last updated task time and name,
added is_review on the workflow which is triggered by a swimlane with a name present.
Notably - it does NOT update or change any of the performance concerns that we were having with this.
2021-02-10 11:58:19 -05:00
777cfbdecd
We now test whether we have a valid StudyModel when getting a study by study model.
...
We raise an ApiError if the model is None or empty.
2021-02-09 17:37:55 -05:00
3e32cdedc4
New error handler for non Api errors. Ticket 187
2021-02-09 16:35:57 -05:00
b42b843f7d
It was possible for an enum field lookup to return an empty list. This meant there were no options for the list.
...
We now test for this and raise an error.
2021-02-08 15:10:53 -05:00
e87e7b5b8b
Form fields that can be hidden and required must now have a default value or value_expression.
...
Also, if a field is hidden but not required, it should not produce a value.
2021-02-08 10:18:41 -05:00
fa34bee18a
First commit for cleaning up error messages for customers.
...
This is *not* in a working state.
Committing this so I can work on another ticket.
2021-02-04 11:23:05 -05:00
329146237e
Merge pull request #232 from sartography/boolean-default-values-175
...
Boolean default values 175
2021-02-03 16:34:54 -05:00
effd11f947
Merge pull request #231 from sartography/cancellations-137
...
Cancellations 137
2021-02-03 16:31:18 -05:00
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
Mike Cullerton
Dan
mike cullerton
Kelly McDonald
Nile Walker