mike cullerton
7e3c47f8bf
Added timestamp, and now return a schema just like the do_task method
2021-10-22 12:52:43 -04:00
Dan Funk
61e51e736f
Merge pull request #408 from sartography/jinja-complete-template-508
...
Jinja complete template #508
2021-10-21 14:22:00 -04:00
Dan Funk
36d30f23a1
Merge pull request #407 from sartography/jinja-include-403
...
Jinja include #403
2021-10-21 14:20:04 -04:00
Dan Funk
2ef03b0c79
Merge pull request #406 from sartography/convert-timestamp-499
...
Convert timestamp #499
2021-10-21 14:12:59 -04:00
Dan
84ce24243f
add an enum_label script that will return the label given a value selection.
2021-10-21 13:57:49 -04:00
mike cullerton
1220f7bef8
Allow embedded templates in Word documents
2021-10-21 13:37:13 -04:00
mike cullerton
1671caacec
Use the new JinjaService
2021-10-21 10:30:42 -04:00
mike cullerton
3619240bae
Move the parts for using Word documents as Jinja templates into JinjaService
2021-10-21 10:29:56 -04:00
mike cullerton
3291ea8cb0
Unused imports
2021-10-20 14:04:45 -04:00
mike cullerton
073875aa51
Put this back the way it was
2021-10-20 13:56:09 -04:00
mike cullerton
62bf7c50bb
Move to new branch
2021-10-20 13:48:20 -04:00
mike cullerton
8fd55565a4
Move changes to another branch
2021-10-20 13:11:06 -04:00
mike cullerton
7d48fa6b31
The get_localtime script now returns a datetime object instead of a string.
...
Validation also returns a datetime object instead of boolean
2021-10-20 12:15:45 -04:00
mike cullerton
45e119a435
Changed validation to return an email_model, so it can be used in further validation
2021-10-20 12:14:16 -04:00
mike cullerton
e707783cea
*** WIP ***
...
committing changes to work on another ticket.
Still need to figure out the complete_template piece
2021-10-20 09:21:45 -04:00
Dan
1c84bd9f1b
Merge branch 'dev' into refactor/enums_as_key_value
2021-10-19 12:02:45 -04:00
Dan
5429e7da7d
All enumerated lists used in web forms should contain a single value, not a dictionary of value/labels.
...
Removing the spreadsheet.value.column and data.value.column so we just have value.column for both.
Improving the __str__ function in the ApiError class, to make debugging a little easier.
Adding a "validate_all" flask command, to help us track down any issues with current workflows in production (use this in concert with sync_with_testing)
Fixed logs of tests.
removed fact_runner.py, a very early and crufty bit of code.
2021-10-19 10:13:43 -04:00
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
