Commit Graph

3366 Commits

Author SHA1 Message Date
Leo Hemsted
331b59eef8 Merge pull request #1220 from alphagov/letter-jobs-on-dashboard
Letter jobs on dashboard
2017-04-07 11:21:19 +01:00
Leo Hemsted
2bb0cba430 add new letter job statuses to job api client
add test to test_dashboard to confirm we're getting for the right queus
2017-04-07 11:08:40 +01:00
Leo Hemsted
c509d3d24f remove unused imports 2017-04-07 10:54:52 +01:00
Chris Hill-Scott
d1c99715b7 Merge pull request #1218 from alphagov/quis-patch-1
Bump utils
2017-04-06 17:06:08 +01:00
Chris Hill-Scott
f5b4d72f8f Bump utils
Didn’t bump it enough versions as part of https://github.com/alphagov/notifications-admin/pull/1215/files

😔
2017-04-06 17:05:55 +01:00
Chris Hill-Scott
a7162b2bd2 Merge pull request #1215 from alphagov/fix-address-column-handling
Fix address column handling
2017-04-06 16:25:18 +01:00
Chris Hill-Scott
7bbb99c461 Merge pull request #1216 from alphagov/88mph
Fix future ‘last edited’ date
2017-04-06 16:02:39 +01:00
Chris Hill-Scott
e0738ec869 Merge pull request #1213 from alphagov/roadmap-typo
Fix typo in roadmap
2017-04-06 15:02:58 +01:00
Pete Herlihy
6052409430 Merge pull request #1217 from alphagov/43-44
43-44 for MOT reminders
2017-04-06 14:36:43 +01:00
Pete Herlihy
e949f19297 43-44 for MOT reminders 2017-04-06 12:01:41 +01:00
Chris Hill-Scott
8df01f7f3f Fix future ‘last edited’ date
The `format_datetime_relative` filter is only used by the scheduling
stuff, which only deals with dates in the future.

When used on dates in the past (more than 1 day ago) it gets confused
and defaults to ‘tomorrow’.

The `format_delta` method does a similar thing, but works for past and
future dates.

Users can still click through to the next page to see the exact date and
time of the edits.
2017-04-06 11:20:47 +01:00
Chris Hill-Scott
0b2a11daf2 Don’t fill out address line 3 in the example
Address line 3 is optional. Currently the only way we have of indicating
to users what is/isn’t optional is by using the example. Which probably
isn’t ideal, but should at least be correct.
2017-04-06 10:25:05 +01:00
Chris Hill-Scott
e34d981dda Fix no. of column headers on breaking change page
The breaking change page wasn’t properly accounting for the fact that
letter recipients span multiple columns – it was assuming they’d only
take up one column like they do for email and SMS.

This commit fixes:
- the number of column headers (A, B, C, …) to be correct
- the count of columns (you will need X columns in your file) to be
  correct

It then parameterises the test to look at a case where a recipient is
in one column (email) and multiple columns (letter).
2017-04-06 10:22:36 +01:00
Chris Hill-Scott
b075c2be65 Fix typo in roadmap 2017-04-05 13:51:35 +01:00
Chris Hill-Scott
ed6d44557a Merge pull request #1212 from alphagov/bump-boto
Bump Boto version
2017-04-04 11:20:41 +01:00
Chris Hill-Scott
35e12a02a0 Bump Boto version
Our deploys have stopped working. It’s complaining with an `ImportError`
somewhere in Boto:

```
017-04-04T10:46:26.17+0100 [APP/PROC/WEB/0]ERR Traceback (most recent call last):
2017-04-04T10:46:26.17+0100 [APP/PROC/WEB/0]ERR   File “/home/vcap/app/.heroku/python/bin/aws”, line 19, in <module>
2017-04-04T10:46:26.17+0100 [APP/PROC/WEB/0]ERR     import awscli.clidriver
2017-04-04T10:46:26.17+0100 [APP/PROC/WEB/0]ERR   File “/app/.heroku/python/lib/python3.5/site-packages/awscli/clidriver.py”, line 33, in <module>
2017-04-04T10:46:26.17+0100 [APP/PROC/WEB/0]ERR     from awscli.help import ProviderHelpCommand
2017-04-04T10:46:26.17+0100 [APP/PROC/WEB/0]ERR   File “/app/.heroku/python/lib/python3.5/site-packages/awscli/help.py”, line 27, in <module>
2017-04-04T10:46:26.17+0100 [APP/PROC/WEB/0]ERR     from awscli.clidocs import ProviderDocumentEventHandler
2017-04-04T10:46:26.17+0100 [APP/PROC/WEB/0]ERR   File “/app/.heroku/python/lib/python3.5/site-packages/awscli/clidocs.py”, line 18, in <module>
2017-04-04T10:46:26.17+0100 [APP/PROC/WEB/0]ERR     from botocore.utils import is_json_value_header
2017-04-04T10:46:26.17+0100 [APP/PROC/WEB/0]ERR ImportError: cannot import name ‘is_json_value_header’
2017-04-04T10:46:26.20+0100 [APP/PROC/WEB/0]OUT Terminating application process with pid
```

Our version of Boto is a year old. Upgrading it to the latest version
seems like a good idea.

Not a breaking version number change. Changelog here:
https://github.com/boto/boto3/blob/develop/CHANGELOG.rst

Complete changes:
https://github.com/boto/boto3/compare/1.3.0...1.4.4
2017-04-04 11:05:04 +01:00
Chris Hill-Scott
6e8c1a5105 Merge pull request #1205 from alphagov/handle-lists-as-placeholder-values
Handle lists as CSV field values
2017-04-04 09:47:32 +01:00
Chris Hill-Scott
2ad9753de2 Add test for preview of CSV file 2017-04-04 09:46:57 +01:00
Leo Hemsted
a037cd53c8 move formatted_list to utils 2017-04-04 09:35:16 +01:00
Chris Hill-Scott
b0a995beb2 Handle lists as CSV field values
Brings in:
- [ ] https://github.com/alphagov/notifications-utils/pull/128

This means that `RecipientCSV` will sometimes return the value of a cell
in a spreadsheet as a `list`, not a `string`. So we need to handle that,
rather than putting a Python representation (`['one', 'two', 'three']`)
on the page.

This commit handles it by putting a bulleted list on the page instead.

This breaks our model of showing the spreadsheet as it appears in Excel
or whatever, because we’re showing the aggregation of the columns into a
list. However:
- this is the easier thing to do for now
- it might actually be more usable because it keeps the table narrower
2017-04-04 09:35:15 +01:00
Chris Hill-Scott
f41b95fe0c Refactor check table to use text fields
No need to repeat the same field-calling code each time.

Think we didn’t do this before because there was no way of passing the
`status` through to the `text_field` macro.
2017-04-04 09:35:14 +01:00
Chris Hill-Scott
e81b9f9b06 Merge pull request #1210 from alphagov/redirect-to-template
Improve flow of editing letter contact details
2017-04-03 17:28:59 +01:00
Chris Hill-Scott
de532b65d9 Merge pull request #1211 from alphagov/use-http-for-images-locally
Don’t use https for localhost
2017-04-03 17:24:08 +01:00
Chris Hill-Scott
3f3d3930e0 Don’t use https for localhost
We set a URL for the app to use to access itself. On PaaS this is
configurable, locally we default to `localhost`. `localhost` doesn’t
(easily?) support HTTPS, so this default wasn’t working.
2017-04-03 13:47:39 +01:00
Chris Hill-Scott
2f900d55c5 Explain contact details changes apply all letters
This is different to how editing most parts of a letter works, so we
should make it explicit.
2017-04-03 10:53:18 +01:00
Chris Hill-Scott
1f278bdd07 Go back to template after editing contact details
Users who go to edit the contact details for a letter from the template
page get very confused when they click save and are dumped on the
settings page. It doesn’t match the way editing other parts of
letter works, and you can’t see an accurate preview of the changes from
the settings page.

So this commit changes the flow to go from the _edit contact details_
page back to the _view template_ page when the user has got there by
clicking the blue _Edit_ button on the _view template_ page.
2017-04-03 10:49:15 +01:00
Chris Hill-Scott
b5127967fe Make page title match H1 on letter contact details 2017-04-03 10:49:14 +01:00
Chris Hill-Scott
61ccc8ad51 Remove contact block guidance from edit page
This page is not the place where you edit the contact details. Nor is
it the place where you can preview changes to the contact block. In
research users never found the link to get from this page to the edit
contact details page. So this commit removes it.
2017-04-03 10:47:40 +01:00
Leo Hemsted
2b325ec572 Merge pull request #1207 from alphagov/42-43
42-43 for Companies House CHS (Follow)
2017-03-30 14:23:18 +01:00
Andras Ferencz-Szabo
701ebb85db Merge pull request #1208 from alphagov/paas_final_routes
Add final routes to the Paas app
2017-03-28 13:31:32 +01:00
bandesz
d2659522e8 Add final routes to the Paas app 2017-03-28 12:22:44 +01:00
Pete Herlihy
909a724f90 42-43 for Companies House CHS (Follow) 2017-03-28 10:17:32 +01:00
Leo Hemsted
f5f1155f52 Merge pull request #1206 from alphagov/letters
letters on paas - bump utils to 13.10.0
2017-03-28 10:16:35 +01:00
Leo Hemsted
85404f20db bump utils to 13.10.0
pass in the base URL - if not set in the environment this is set to
localhost, but on paas we can pull this out of vcap_services so that
letters render properly on paas
2017-03-27 17:59:06 +01:00
Chris Hill-Scott
89e429f745 Merge pull request #1204 from alphagov/bump-utils-letters-tweaks
Bump utils to bring in letter layout tweaks
2017-03-24 14:08:51 +00:00
Chris Hill-Scott
566b83227e Merge pull request #1203 from alphagov/roadmap
Roadmap page first pass
2017-03-24 14:08:27 +00:00
Chris Hill-Scott
0cbac2719e Merge pull request #1193 from alphagov/link-service-count-to--perf
Add links to performance platform service list on homepage
2017-03-24 13:55:06 +00:00
Pete Herlihy
c348730e38 Adding Roadmap link to the footer 2017-03-24 13:52:26 +00:00
Pete Herlihy
4a59cae96c Added a route to the new Roadmap page 2017-03-24 13:52:25 +00:00
Pete Herlihy
8b3f299f91 Roadmap page 2017-03-24 13:52:23 +00:00
Chris Hill-Scott
e18c6b66e7 Make it a single plain text link 2017-03-24 13:37:14 +00:00
Pete Herlihy
092fbb3c53 Add links to performance platform service list on homepage 2017-03-24 13:36:46 +00:00
Pete Herlihy
aed00309a2 Merge pull request #1202 from alphagov/41-42
41-42 for Digital Permissions (Home Office)
2017-03-24 13:02:51 +00:00
Chris Hill-Scott
c5d418e165 Bump utils to bring in letter layout tweaks
Includes
- [x] https://github.com/alphagov/notifications-utils/pull/127
- [ ] https://github.com/alphagov/notifications-utils/pull/129
2017-03-24 11:35:27 +00:00
bandesz
71b4d9eb6e Fix PaaS scaling at deploy 2017-03-23 12:29:36 +00:00
Pete Herlihy
f99a824ac9 41-42 for Digital Permissions (Home Office) 2017-03-23 12:26:51 +00:00
Chris Hill-Scott
677cad51d8 Merge pull request #1199 from alphagov/fix-broken-links-template-stats
Fix broken links on template statistics page
2017-03-22 14:49:31 +00:00
Chris Hill-Scott
e622a264bc Merge pull request #1201 from alphagov/back-to-templates-link
Add a back to template link on job page
2017-03-22 14:49:25 +00:00
Chris Hill-Scott
aa4237b934 Rationalise the spacing on the job page
Having two different margin sizes here meant that the page jumped
slightly once the report was ready to download. No good reason in favour
of it.
2017-03-22 10:57:38 +00:00
Chris Hill-Scott
3f1b5603f6 Add a back to template link on job page
When you’ve sent message(s) using a template, often the next thing you
want to do is go and send the same template again, or edit it.

Currently there’s no way of getting to a template from a job except for
going back to the list of templates and re-finding it.

This commit adds a link at the bottom of the job page that gives you a
shortcut back to the individual template, where you can find actions
like edit/send/etc.
2017-03-22 10:55:15 +00:00