Commit Graph

2215 Commits

Author SHA1 Message Date
dependabot[bot] e78cfd89c0
Bump babel from 2.9.0 to 2.9.1 in /deploy
Bumps [babel](https://github.com/python-babel/babel) from 2.9.0 to 2.9.1.
- [Release notes](https://github.com/python-babel/babel/releases)
- [Changelog](https://github.com/python-babel/babel/blob/master/CHANGES)
- [Commits](https://github.com/python-babel/babel/compare/v2.9.0...v2.9.1)

---
updated-dependencies:
- dependency-name: babel
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-21 18:41:22 +00: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
mike cullerton 9ffd003d56 Test for embedded templates 2021-10-21 13:37:56 -04:00
mike cullerton 1220f7bef8 Allow embedded templates in Word documents 2021-10-21 13:37:13 -04:00
mike cullerton 383bb964d1 Use the new JinjaService 2021-10-21 10:31:02 -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 0db96fbbad Merge branch 'dev' into jinja-include-403 2021-10-21 09:40:31 -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 3cdb3fe311 Move to new branch 2021-10-20 13:41:16 -04:00
mike cullerton a9aa3fac89 Renamed tests for clarification 2021-10-20 13:40:44 -04:00
mike cullerton 8fd55565a4 Move changes to another branch 2021-10-20 13:11:06 -04:00
mike cullerton c566fa1c8f Fixed test to look for datetime object 2021-10-20 12:16:18 -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
mike cullerton 4efdef3d77 Better/more assertions 2021-10-20 09:20:15 -04:00
Dan 980aafa7a1 bumping SpiffWorkflow with a fix for display order. 2021-10-19 10:55:20 -04:00
mike cullerton 2ad9f71232 Merge branch 'dev' into jinja-include-403 2021-10-19 10:50:37 -04:00
mike cullerton dfd1a6a7f6 Fix failing test.
We removed `name` from WorkflowSpecModel, and use `id` now
2021-10-19 10:44: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 dc7b39b5c8 Tests and workflows for the cases where attachments is None or '' 2021-10-18 11:21:24 -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 6b1e0ebbfe First couple tests, and a workflow for testing email 2021-10-16 14:23:12 -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 fc3e7f8183 Simple test for get_localtime script 2021-10-14 11:02:51 -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 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