2326 Commits

Author SHA1 Message Date
mike cullerton
c2c79bd014 Convert UTC datetime object to a different timezone.
JSON doesn't know about dates, so we have to return a string
2021-10-14 11:02:16 -04:00
mike cullerton
1ef063de37 Merge branch 'email-cleanup-498' into convert-timestamp-499 2021-10-13 15:50:01 -04:00
mike cullerton
8015d35424 Script to get localtime from a UTC datetime 2021-10-13 15:36:37 -04:00
mike cullerton
2f3fe59a0f Test for Exception when email service fails 2021-10-13 13:40:14 -04:00
mike cullerton
b3d515bf68 Test for condition where email_service.add_email raises an exception. 2021-10-13 13:23:18 -04:00
mike cullerton
7a5de44e1d Merge branch 'dev' into email-cleanup-498 2021-10-13 12:40:58 -04:00
Dan Funk
bfd931e854
Merge pull request #400 from sartography/bug/nav-order-420
one solution for the Parallel nav order problem
2021-10-13 12:11:07 -04:00
alicia pritchett
58e75a1c8f Change one condition to compare only user tasks, not non-user-tasks 2021-10-13 12:08:20 -04:00
mike cullerton
771019d9ca Clarify call to email service. We now use the words content and content_html 2021-10-13 12:05:08 -04:00
mike cullerton
3ae00d190d Raise error if we have a problem sending email.
This should be processed by Spiff ultimately.
2021-10-13 12:03:48 -04:00
mike cullerton
bd6a2f3005 Check the model we get back from the email script
Make sure timestamp is UTC
2021-10-13 11:48:27 -04:00
mike cullerton
a1a06f06ca We now get an email model back 2021-10-13 11:47:40 -04:00
mike cullerton
f1dbda7f95 Fix timestamp field to use (UTC) timezone 2021-10-13 11:46:57 -04:00
mike cullerton
dcb06f3753 Schema for returning email model 2021-10-13 11:42:01 -04:00
mike cullerton
e72cf27fe3 Return email model from email script. 2021-10-13 11:41:44 -04:00
Dan Funk
c5d8e20e74
Merge pull request #399 from sartography/chore/resource-files-461
Chore/resource files 461
2021-10-12 15:56:56 -04:00
Dan Funk
5d5256df3a
Merge pull request #398 from sartography/bug/422_value_expression_enum
When dealing with enum default values, assure that we are looking at …
2021-10-12 15:56:25 -04:00
Dan Funk
6428e4ab0a
Merge pull request #397 from sartography/email-data-script-487
Email data script #487
2021-10-12 15:55:48 -04:00
Dan Funk
dc07d42a9c
Merge pull request #395 from sartography/email-format-489
Email format #489
2021-10-12 15:51:57 -04:00
alicia pritchett
924e66ff45 remove blank line 2021-10-12 15:46:07 -04:00
Dan
5706fb3ad3 Don't error out here until we decide if we are going to fully refactor emums or leave as is. 2021-10-12 14:32:51 -04:00
alicia pritchett
40b5bf3afa Adds a POST for reference file. and a cool test 2021-10-12 14:29:15 -04:00
Dan
00e0bd5dd2 When dealing with enum default values, assure that we are looking at the '.value' attribute, not at the value itself.
Minor change to front end as well, please see companion ticket in the sartography_libraries.
2021-10-12 14:11:00 -04:00
mike cullerton
3366142cf3 Remove unused import 2021-10-12 13:56:43 -04:00
mike cullerton
f41406a6d9 Fixes from changing workflow_id to workflow_spec_id 2021-10-12 13:46:05 -04:00
mike cullerton
32aa1fba85 Change workflow_id to workflow_spec_id
We can use workflow_spec_id along with study_id to get a group of emails
2021-10-12 13:44:36 -04:00
mike cullerton
63df614f41 Change workflow_id to workflow_spec_id 2021-10-12 13:43:29 -04:00
mike cullerton
699fc7daac Change column in email table from workflow_id to workflow_spec_id 2021-10-12 13:42:11 -04:00
alicia pritchett
8b5686ce40 wip 2021-10-12 09:46:22 -04:00
alicia pritchett
1ef18f23aa one solution for the Parallel nav order problem 2021-10-11 11:50:03 -04:00
mike cullerton
1fb298f796 Test for the new formatting 2021-10-08 11:26:54 -04:00
mike cullerton
5df8f127c7 Fix email formatting.
Markdown was swallowing the carriage returns.
We use the nl2br extension now.
2021-10-08 11:26:30 -04:00
Dan Funk
b0a6af8d5e
Merge pull request #392 from sartography/email-data-script-487
Email data script #487
2021-10-07 14:52:31 -04:00
Dan Funk
5cb5338fe2
Merge pull request #394 from sartography/varchar-category-id-483
Varchar category id 483
2021-10-07 14:44:13 -04:00
Dan
fdce91507c Improve the warning messages that come back when running the master workflow spec. 2021-10-07 14:43:38 -04:00
mike cullerton
cdcb3a8bd0 Fixed revision conflict 2021-10-07 12:39:07 -04:00
mike cullerton
24932072dc Merge branch 'dev' into email-data-script-487 2021-10-07 12:30:13 -04:00
Dan Funk
a39e0ba219
Merge pull request #390 from sartography/varchar-category-id-483
Varchar category id #483
2021-10-07 12:23:56 -04:00
mike cullerton
7f11d5bd58 Tests for get_email_data script. 2021-10-07 12:11:22 -04:00
mike cullerton
826b98a6ea Can't use workflow_id, because that conflicts with the id of the current workflow (that we pass in to every script) 2021-10-07 12:10:37 -04:00
Dan
548c35a4a3 Merge branch 'dev' into varchar-category-id-483 2021-10-07 11:35:10 -04:00
Dan Funk
77bd649b3b
Merge pull request #389 from sartography/bug/474_navigation_to_prevous_task
Bug/474 navigation to prevous task
2021-10-07 11:16:43 -04:00
Dan Funk
208ca92fb2
Merge pull request #388 from sartography/bug/472_date_time
fixes 472 - a bug with the datetime validation
2021-10-07 11:13:53 -04:00
mike cullerton
10abf51f70 Added workflow_spec_id to WorkflowMetadata model, because the id is the workflow id, not the workflow_spec id.
Then, we use workflow_spec_id in StudyService when looking for workflow status.
2021-10-07 10:02:13 -04:00
mike cullerton
ea083e3a52 Changes to tests, and new test for the get_file_data script 2021-10-07 09:25:07 -04:00
mike cullerton
6f93554e7e Migration script for new email columns
!!!This will need to be merged with another migration happening in another ticket concurrently!!!
2021-10-07 09:23:58 -04:00
mike cullerton
42346cf01e New get_email_data script. 2021-10-07 09:22:30 -04:00
mike cullerton
be066b7d59 Add cc, bcc, and workflow_id to the email record, for reporting 2021-10-07 09:22:05 -04:00
mike cullerton
7551b99386 Add workflow_id to email_service call, for reporting
We now return the ID of the email model to the configurator, so they can track it.
2021-10-07 09:20:53 -04:00
mike cullerton
dab233a07a Add columns to email model for reporting
Add Schema for email model
2021-10-07 09:19:37 -04:00