Commit Graph

2801 Commits

Author SHA1 Message Date
Leo Hemsted
805639a2e1 add test for choose services and related redirects to it
it'll just show the add service button if you only have archived services
2016-11-16 13:18:49 +00:00
Leo Hemsted
08881e5bd1 add get_active_services method
* all current invocations of get_services now call get_active_services
  EXCEPT for platform admin page (where we want to see inactive services
* cleaned up parameter names and unpacking (since *params is unhelpful)
* fixed incorrect kwarg name in conftest
2016-11-16 11:08:20 +00:00
Leo Hemsted
b885ce9cf4 clean up some usage of active in tests and remove it from service_api_client.create_service (created services are always active) 2016-11-16 11:08:20 +00:00
Leo Hemsted
045864f052 Merge pull request #1022 from alphagov/deactivate-services-plat-admin
Deactivate services plat admin
2016-11-16 11:07:52 +00:00
Chris Hill-Scott
48496eefde Merge pull request #1024 from alphagov/add-letters-templates-2
Let users upload a CSV file of addresses against a letter template
2016-11-15 17:57:28 +01:00
Leo Hemsted
3e779675a7 Merge pull request #1026 from alphagov/plat-adm-stats
fix platform admin statistics bug
2016-11-15 11:20:14 +00:00
Leo Hemsted
5edb8cd086 revert platform admin statistics
was erroneously using 'requested' rather than calculating 'sending'
2016-11-15 11:12:19 +00:00
Leo Hemsted
28adea52ab fix tests for new platform admin layout 2016-11-14 17:25:07 +00:00
Leo Hemsted
d26f7ac441 Merge branch 'master' of github.com:alphagov/notifications-admin into deactivate-services-plat-admin 2016-11-14 17:15:05 +00:00
imdadahad
6a9973d1b6 Merge pull request #1025 from alphagov/show-email-sms-stats-platform-admin
Show email and sms counts for each service on platform admin
2016-11-14 16:56:00 +00:00
imdadahad
49082ab646 Revert user_profile back original
This change shouldn't be in this PR and got in somehow :(
2016-11-14 16:49:25 +00:00
Imdad Ahad
5ce0cbe1db Refactor stats into a macro and add format number red on failure 2016-11-14 16:42:08 +00:00
Imdad Ahad
eaa246bd26 Use SASS var for border colour and correct closing tbody tag 2016-11-14 16:00:45 +00:00
Chris Hill-Scott
a108165e47 Give more realistic example address data
Posit that examples of where you can put different parts of the address
is more helpful than ‘example, example, example’. Also shows that you
don’t have to fill all of the address columns.

Spot the Easter egg 🎅
2016-11-14 14:53:07 +00:00
Chris Hill-Scott
34e01824fa Add errors for missing address(es) 2016-11-14 14:53:06 +00:00
Chris Hill-Scott
69ad5fe156 Handle multi-column recipients
Implements https://github.com/alphagov/notifications-utils/pull/81

Handles addresses as multiple columns:
- in ‘Send yourself a test’
- in example CSV files
- in validating that a CSV file has recipients (eg at least an ‘address
  line 1’ and ‘postcode’ column)
- when showing the contents of a CSV file

As few UI changes as possible, once we have the thing working end-to-end
we can think about how the UI might need to work differently.
2016-11-14 14:53:06 +00:00
Chris Hill-Scott
5772fd34fe Remove placeholder letters page
👋 emoji
2016-11-14 14:51:28 +00:00
Chris Hill-Scott
70eec8fe73 Don’t let people actually start a letter job
Who knows what would happen if a job with a letter template actually
got into the database. `403`ing the page is a quick and dirty hack to
stop this from happening.
2016-11-14 14:51:27 +00:00
Chris Hill-Scott
0c5a224fef Add letter-specific formatting advice
Letters can’t have callouts.
2016-11-14 14:51:27 +00:00
Chris Hill-Scott
88631a680c Sprinkle letter throughout the app
Let users create/edit/delete letter templates.

Let them upload a CSV file or send a test against a letter template.

Big assumption at the moment is that addresses only have one line, and
therefore one column in the CSV file.
2016-11-14 14:51:26 +00:00
Chris Hill-Scott
4a0c860a04 Make border around letter neater
The drop shadow stolen from GOV.UK was a bit crude; this commit makes
it a bit more refined.

Also makes things line up a bit better.
2016-11-14 14:51:26 +00:00
Imdad Ahad
dbbb2f7848 Fix comment 2016-11-14 14:50:36 +00:00
Imdad Ahad
c1649e85a6 Ensure stats shown on platform admin are correct and refactor original test for new layout 2016-11-14 14:46:52 +00:00
Imdad Ahad
7e269a454a Show more granular email & sms counts on platform admin page 2016-11-14 14:46:26 +00:00
Imdad Ahad
ec7ec77b69 Return the email and sms stats instead of summing them 2016-11-14 14:45:41 +00:00
Chris Hill-Scott
fb410496dc Add letter component
Similar to the components we have for previewing email and text
messages.

Style stolen from PDF thumbnail at
https://www.gov.uk/government/publications/honey-bees
2016-11-14 14:29:13 +00:00
Chris Hill-Scott
c3b580b645 Update utils 2016-11-14 14:29:13 +00:00
Chris Hill-Scott
620b0cf9ee Merge pull request #1021 from alphagov/fix-page-title-send-test
Fix page title on send test page
2016-11-14 15:04:52 +01:00
Chris Hill-Scott
e164c4d5b1 Merge pull request #1023 from alphagov/sms-sender-fix
Fix errant service name in text messages
2016-11-14 15:04:25 +01:00
Chris Hill-Scott
b68ebbb107 Fix errant service name in text messages
Was missed as part of:
https://github.com/alphagov/notifications-admin/pull/905
2016-11-14 13:08:27 +00:00
Leo Hemsted
63de598d31 Merge pull request #1008 from alphagov/deactivate-service
Deactivate service
2016-11-14 11:41:13 +00:00
Leo Hemsted
fb85877c75 add tests for platform admin list ordering 2016-11-14 11:33:39 +00:00
Chris Hill-Scott
df6899b6e5 Merge pull request #1020 from alphagov/optional-content
Add guidance for optional content into template pages
2016-11-11 16:15:29 +01:00
Chris Hill-Scott
e1e2bec746 Refine content 2016-11-11 14:57:48 +00:00
imdadahad
115cbe67e5 Merge pull request #1011 from alphagov/update-user-profile
Update user profile
2016-11-11 14:47:13 +00:00
Chris Hill-Scott
46eae17c85 Remove redundant word 2016-11-11 14:46:00 +00:00
Chris Hill-Scott
e0cee58346 Add full stop to example 2016-11-11 14:43:56 +00:00
Chris Hill-Scott
047fb943db Use typographic quotes 2016-11-11 14:38:15 +00:00
Chris Hill-Scott
00438e5363 Wrap content to 80 chars 2016-11-11 14:37:50 +00:00
Chris Hill-Scott
d9f273ab86 Fix page title on send test page 2016-11-11 12:47:26 +00:00
Pete Herlihy
ab345c0871 Added optional content guidance on edit sms template view 2016-11-11 11:44:48 +00:00
Pete Herlihy
50e2cd5863 Added optional content guidance to email template view 2016-11-11 11:43:56 +00:00
Pete Herlihy
22c5b44c4c Added some guidance around using optional placeholders 2016-11-11 11:42:26 +00:00
Chris Hill-Scott
ac2b18d95a Merge pull request #1019 from alphagov/quis-patch-1
Remove external link icon on info security link
2016-11-11 11:26:53 +01:00
Chris Hill-Scott
cd03cb70d3 Remove external link icon on info security link
It’s an internal link now
2016-11-11 10:26:35 +00:00
Chris Hill-Scott
e27bab48db Merge pull request #1018 from alphagov/infosec-link
Point information security link at new URL
2016-11-11 11:15:57 +01:00
Imdad Ahad
1da498164f Use POST req to update a user attr 2016-11-10 12:10:01 +00:00
Chris Hill-Scott
3b85afc095 Point information security link at new URL
We’re publishing it in the app now. No more Google doc. 🎉
2016-11-10 11:12:19 +00:00
imdadahad
910a6adef1 Merge pull request #1013 from alphagov/install-reqs-from-wheels
Use python wheels to speed up deployments
2016-11-10 10:49:10 +00:00
Imdad Ahad
e5ea81b184 Fix pep issues and refactor tests 2016-11-10 10:45:09 +00:00