1c02928d04
Merge branch 'dev' into jinja-include-403
2021-10-19 10:09:18 -04:00
afd983e7f5
Merge pull request #404 from sartography/email-attachment-error-503
...
Email attachment error #503
2021-10-19 09:51:15 -04:00
8415ef9776
Merge pull request #402 from sartography/convert-timestamp-499
...
Convert timestamp #499
2021-10-19 09:50:10 -04:00
ee839a85ed
Merge pull request #401 from sartography/email-cleanup-498
...
Email cleanup #498
2021-10-19 08:59:48 -04:00
e1b72c8edf
Merge pull request #380 from sartography/file-cleanup-466
...
File cleanup #466
2021-10-19 08:57:14 -04:00
d84625c51e
Merge branch 'convert-timestamp-499' into email-attachment-error-503
...
# Conflicts:
# tests/emails/test_email_script.py
2021-10-18 17:08:56 -04:00
0122029e30
*** WIP ***
...
Migrating the complete_template script stuff to JinjaService.
Having trouble with the tools stuff.
Pulled back to spot where test pass using CompleteTemplate
2021-10-18 16:56:03 -04:00
da9b902c19
Removed old commented code
2021-10-18 16:10:30 -04:00
dc7b39b5c8
Tests and workflows for the cases where attachments is None or ''
2021-10-18 11:21:24 -04:00
8de05b8fb6
Don't process attachments if argument is None or ''
...
This can happen during workflow processing
2021-10-18 11:19:56 -04:00
6b1e0ebbfe
First couple tests, and a workflow for testing email
2021-10-16 14:23:12 -04:00
f9856d68a9
complete_template works a little different.
...
It uses a Word doc as the Jinja template
Need to decide what to do about this case
2021-10-16 14:22:07 -04:00
983c4104e1
We run the same basic Jinja code in 4 different contexts.
...
Now call the the Jinja service
2021-10-16 14:20:48 -04:00
de1c987c85
New service to create and render template with Jinja
...
Allows us to include Jinja templates within Jinja templates
2021-10-16 14:17:53 -04:00
fc3e7f8183
Simple test for get_localtime script
2021-10-14 11:02:51 -04:00
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
1ef063de37
Merge branch 'email-cleanup-498' into convert-timestamp-499
2021-10-13 15:50:01 -04:00
8015d35424
Script to get localtime from a UTC datetime
2021-10-13 15:36:37 -04:00
2f3fe59a0f
Test for Exception when email service fails
2021-10-13 13:40:14 -04:00
b3d515bf68
Test for condition where email_service.add_email raises an exception.
2021-10-13 13:23:18 -04:00
7a5de44e1d
Merge branch 'dev' into email-cleanup-498
2021-10-13 12:40:58 -04:00
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
58e75a1c8f
Change one condition to compare only user tasks, not non-user-tasks
2021-10-13 12:08:20 -04:00
771019d9ca
Clarify call to email service. We now use the words content and content_html
2021-10-13 12:05:08 -04:00
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
bd6a2f3005
Check the model we get back from the email script
...
Make sure timestamp is UTC
2021-10-13 11:48:27 -04:00
a1a06f06ca
We now get an email model back
2021-10-13 11:47:40 -04:00
f1dbda7f95
Fix timestamp field to use (UTC) timezone
2021-10-13 11:46:57 -04:00
dcb06f3753
Schema for returning email model
2021-10-13 11:42:01 -04:00
e72cf27fe3
Return email model from email script.
2021-10-13 11:41:44 -04:00
c5d8e20e74
Merge pull request #399 from sartography/chore/resource-files-461
...
Chore/resource files 461
2021-10-12 15:56:56 -04:00
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
6428e4ab0a
Merge pull request #397 from sartography/email-data-script-487
...
Email data script #487
2021-10-12 15:55:48 -04:00
dc07d42a9c
Merge pull request #395 from sartography/email-format-489
...
Email format #489
2021-10-12 15:51:57 -04:00
924e66ff45
remove blank line
2021-10-12 15:46:07 -04:00
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
40b5bf3afa
Adds a POST for reference file. and a cool test
2021-10-12 14:29:15 -04:00
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
3366142cf3
Remove unused import
2021-10-12 13:56:43 -04:00
f41406a6d9
Fixes from changing workflow_id to workflow_spec_id
2021-10-12 13:46:05 -04:00
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
63df614f41
Change workflow_id to workflow_spec_id
2021-10-12 13:43:29 -04:00
699fc7daac
Change column in email table from workflow_id to workflow_spec_id
2021-10-12 13:42:11 -04:00
8b5686ce40
wip
2021-10-12 09:46:22 -04:00
1ef18f23aa
one solution for the Parallel nav order problem
2021-10-11 11:50:03 -04:00
1fb298f796
Test for the new formatting
2021-10-08 11:26:54 -04:00
5df8f127c7
Fix email formatting.
...
Markdown was swallowing the carriage returns.
We use the nl2br extension now.
2021-10-08 11:26:30 -04:00
b0a6af8d5e
Merge pull request #392 from sartography/email-data-script-487
...
Email data script #487
2021-10-07 14:52:31 -04:00
5cb5338fe2
Merge pull request #394 from sartography/varchar-category-id-483
...
Varchar category id 483
2021-10-07 14:44:13 -04:00
fdce91507c
Improve the warning messages that come back when running the master workflow spec.
2021-10-07 14:43:38 -04:00
mike cullerton
Dan Funk
alicia pritchett