1523 Commits

Author SHA1 Message Date
mike cullerton
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
mike cullerton
8bda9889b1 Added a test for the send_email endpoint. 2021-03-11 11:38:34 -05:00
mike cullerton
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
mike cullerton
78ae719b97 Moved this test to the test_email_script test file. 2021-03-11 11:35:08 -05:00
mike cullerton
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
mike cullerton
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
mike cullerton
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
mike cullerton
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
mike cullerton
7171219e8b removed unused import 2021-03-09 07:00:20 -05:00
mike cullerton
7749f3aeaf Fixed existing workflows to work with keyword arguments 2021-03-09 06:50:58 -05:00
mike cullerton
8c75217042 Test and workflow for associated user emails 2021-03-09 06:50:20 -05:00
mike cullerton
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
Dan Funk
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
Dan
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
Dan
9e758c57d3 Merge branch 'dev' into bug/225_enum_lookup_same_field_name 2021-03-02 14:15:58 -05:00
Dan
ecfc2ee761 a slightly better test. 2021-03-02 14:15:29 -05:00
Dan Funk
572eb3457a
Merge pull request #252 from sartography/customer-error-messages-192
Customer error messages 192
2021-03-02 13:45:38 -05:00
Dan
adb9e3afba Merge branch 'dev' into bug/225_enum_lookup_same_field_name 2021-03-02 13:40:21 -05:00
Dan Funk
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
Dan
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
Kelly McDonald
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
mike cullerton
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
Dan Funk
3e0541fa15
Merge pull request #250 from sartography/206-extend-study-access
206 extend study access
2021-03-01 14:55:38 -05:00
Dan
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
mike cullerton
9d804c36d5 Merge branch 'dev' into customer-error-messages-192.
Needed some sql changes from dev
2021-03-01 10:29:10 -05:00
Dan Funk
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
Kelly McDonald
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
Kelly McDonald
1504779bba Make sure we have all test files 2021-02-25 11:40:45 -05:00
Kelly McDonald
a1814a7727 Add some additional comments - just to be clear 2021-02-25 11:40:08 -05:00
mike cullerton
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
Kelly McDonald
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
Kelly McDonald
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
Kelly McDonald
f592a8a0b0 Added a few more tests - I think I need to test one more script endpoint 2021-02-25 09:07:46 -05:00
Kelly McDonald
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
Kelly McDonald
c795dd7aea Merge branch 'dev' into 206-extend-study-access 2021-02-24 12:16:35 -05:00
Kelly McDonald
3dbe39c6fe initial checkin of changes for branch 2021-02-24 12:05:06 -05:00
mike cullerton
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
Dan Funk
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
0a58dce394 Changes for ticket 215 - Change email header and footer to say CR Connect 2021-02-23 12:13:21 -05:00
Dan Funk
211c5e1edb
Merge branch 'testing' into dev 2021-02-22 20:21:23 -05:00
Dan Funk
1f5c575093
Merge pull request #245 from sartography/201-changes-to-in-progress
201 changes to in progress
2021-02-22 20:20:44 -05:00
Dan Funk
349c3d657a
Merge branch 'dev' into 201-changes-to-in-progress 2021-02-22 18:17:59 -05:00
Dan Funk
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
Dan
17941ba7fc Merge branch 'dev' of github.com:sartography/cr-connect-workflow into dev 2021-02-22 11:37:22 -05:00
Dan
099e22ca85 update readme with details on how to trasnfer bpmn configuration from one system to another. 2021-02-22 11:37:16 -05:00
mike cullerton
4fc2929356 Put the preamble back in to the error message. 2021-02-19 15:57:01 -05:00
mike cullerton
e0de1d0b3b Fixed 3 tests to reflect a change in crc.api.workflow.validate_workflow_specification.
Added a '\n' to the error message between the actual error and our preamble.
2021-02-19 15:55:40 -05:00
mike cullerton
3b06795c4c File cleanup for readability. Removed some commented code. 2021-02-19 14:49:53 -05:00
Kelly McDonald
4fa0f9720a Allow frontend to honor 'view as' and fix problem with tests 2021-02-18 11:25:17 -05:00
Kelly McDonald
8c309e9a41 Add user display name to the response for task events 2021-02-18 08:44:44 -05:00