e7c78c8d0e
Merge branch 'dev' into study-associated-email-207-223
2021-03-11 12:38:47 -05:00
e58f1dc484
Remove unused mails service
2021-03-11 11:56:18 -05:00
b403a3015e
Modified existing tests to work with changes to the email script.
...
Added test for associated emails.
Added test for cc argument.
2021-03-11 11:40:46 -05:00
8bda9889b1
Added a test for the send_email endpoint.
2021-03-11 11:38:34 -05:00
fa028dd517
Modified the email_script workflow to accommodate the changes to the email script.
...
Workflow now uses keyword arguments; subject, recipients, and cc.
If cc is not passed in, we set it to None.
2021-03-11 11:37:54 -05:00
78ae719b97
Moved this test to the test_email_script test file.
2021-03-11 11:35:08 -05:00
fa4707811e
Removed the test and templates from the unused mails service.
...
Mails was removed in previous commit.
2021-03-11 11:34:24 -05:00
67697b5076
Lots of changes!
...
Email Script:
- The email script now accepts 3 keyword arguments; subject, recipients, and cc.
- Subject and recipients are required.
- Recipients (and cc) can be an email address or list of addresses.
- You can use the string 'associated' in place of an email address, in which case we look up the users associated with a study that have send_email set to True.
- Moved some helper methods to email_service.
Email Service:
- Added cc argument
- Added helper methods previously in email script.
- Modified get_rendered_content to accept message and data directly. Previously, we passed in the task and grabbed them from there. Now we can use the method outside a task.
2021-03-11 11:32:21 -05:00
80f1fc276f
Modify api.tools.send_email to accommodate the changes to the api endpoint in api.yml
...
We now accept subject, address, body (the email message), and possible data.
We now use email_service to send the message, and wrap it with the CR Connect html formatting.
**** We import DEFAULT_SENDER from config.default. Will this be a problem on testing and production? ****
2021-03-11 11:19:02 -05:00
14e62a7ec2
Modify the send_email api endpoint (in Configurator Tools section) to accept subject, message, and data.
...
Subject, address and message are required.
Data is not required.
Message is in the body of the request.
Subject, address, and data are in the query string.
2021-03-11 11:10:10 -05:00
d250bac32e
Merge remote-tracking branch 'origin/dev' into dev
2021-03-10 10:59:24 -05:00
2ed825aef3
Fixes problem with swtiching users fixes #237
2021-03-10 10:59:15 -05:00
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
1f32f5fb4d
Merge pull request #259 from sartography/bug/reset_study_when_completely_horked
...
Sometimes a workflow can be completely broken and unload-able. For ins…
2021-03-09 13:51:14 -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
7749f3aeaf
Fixed existing workflows to work with keyword arguments
2021-03-09 06:50:58 -05:00
8c75217042
Test and workflow for associated user emails
2021-03-09 06:50: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
6fda6d83c0
Merge pull request #256 from sartography/add-field-to-apierror-229
...
We now include field.id in the ApiError message for hidden and defaul…
2021-03-08 10:44:31 -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
7d97fe107d
Merge pull request #254 from sartography/bug/225_enum_lookup_same_field_name
...
Bug/225 enum lookup same field name
2021-03-02 14:55:47 -05:00
bf8c0ba86f
fixing migration paths (I hope) and fixing a down migration that wasn't working as I attempted to debug.
2021-03-02 14:36:20 -05:00
9e758c57d3
Merge branch 'dev' into bug/225_enum_lookup_same_field_name
2021-03-02 14:15:58 -05:00
ecfc2ee761
a slightly better test.
2021-03-02 14:15:29 -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
9c31d69c12
Merge pull request #253 from sartography/220-short-study-name
...
Add short_title to study, change update_study task to use kw argument…
2021-03-02 13:37:24 -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
375935b5c6
Merge pull request #249 from sartography/reduce-email-whitespace-221
...
UVA asked us to remove the extra whitespace in emails.
2021-02-26 12:10:33 -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
1504779bba
Make sure we have all test files
2021-02-25 11:40:45 -05:00
a1814a7727
Add some additional comments - just to be clear
2021-02-25 11:40:08 -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
55f8825b3c
Make sure we are testing both versions of the setting functions as well as the getting functions
2021-02-25 09:14:24 -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
6fc8c421c2
Merge pull request #247 from sartography/modify-email-template-215
...
Changes for ticket 215 - Change email header and footer to say CR Con…
2021-02-23 16:24:08 -05:00
Mike Cullerton
mike cullerton
Kelly McDonald
Dan