mike cullerton
1c02928d04
Merge branch 'dev' into jinja-include-403
2021-10-19 10:09:18 -04:00
Dan Funk
afd983e7f5
Merge pull request #404 from sartography/email-attachment-error-503
...
Email attachment error #503
2021-10-19 09:51:15 -04:00
Dan Funk
8415ef9776
Merge pull request #402 from sartography/convert-timestamp-499
...
Convert timestamp #499
2021-10-19 09:50:10 -04:00
Dan Funk
ee839a85ed
Merge pull request #401 from sartography/email-cleanup-498
...
Email cleanup #498
2021-10-19 08:59:48 -04:00
Dan Funk
e1b72c8edf
Merge pull request #380 from sartography/file-cleanup-466
...
File cleanup #466
2021-10-19 08:57:14 -04:00
mike cullerton
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
mike cullerton
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
mike cullerton
da9b902c19
Removed old commented code
2021-10-18 16:10:30 -04:00
mike cullerton
8de05b8fb6
Don't process attachments if argument is None or ''
...
This can happen during workflow processing
2021-10-18 11:19:56 -04:00
mike cullerton
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
mike cullerton
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
mike cullerton
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
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
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
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
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
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
fdce91507c
Improve the warning messages that come back when running the master workflow spec.
2021-10-07 14:43:38 -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
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
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
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
alicia pritchett
7b6beae9c1
fixes frontend bailing out
...
workflow id is workflow id
2021-10-06 14:33:09 -04:00
Dan
84680ea846
Fixing multiple issues that came out of Study Info, as we debugged issue #474 related to navigating back to a previous task.
...
There was a problem with the python script engine as well that wasn't handling the de-serialize properly and didn't correctly pick back up on the script engine, and the renaming of methods in PythonScriptEngine created some conflicts with the way we override functions.
We were not handling ldap looks up efficiently, and this was also breaking in Study Info.
Finally we had a bug in SpiffWorkflow that did not allow us to reset back to the previous task in some cases where nested call activities happen far later in the process and are currently active when the reset is created.
2021-10-06 12:17:57 -04:00
mike cullerton
572ca1db6b
Fixes for backend code after removing `name` column from `workflow_spec` and `workflow_spec_category` tables
2021-10-05 14:17:41 -04:00