Commit Graph

17094 Commits

Author SHA1 Message Date
Chris Hill-Scott
71f7e144a4 Rename ‘this year’
Make it clear that this section is about what you’ve used, ie your usage

Click ‘breakdown’ to see how the maths is done, and what time period it
covers.
2016-05-03 12:25:01 +01:00
catherineheywood
1df23fff90 Doc tweaks, improve readability (GDS style guide) 2016-05-03 11:36:01 +01:00
Chris Hill-Scott
1d0b28f156 Merge pull request #524 from alphagov/usage
Add usage to the dashboard
2016-05-03 11:35:11 +01:00
Chris Hill-Scott
00030bc254 Add usage to the dashboard
Takes the number of emails and SMS fragments sent from:
https://github.com/alphagov/notifications-api/pull/273

Using these numbers it’s possible to show:
- how much of your allowance is left
- or how much you have spent

For now the allowance and rates are hard coded.

Only for users that have manage service.
2016-05-03 11:06:12 +01:00
NIcholas Staples
9e94d2382d Merge pull request #532 from alphagov/british_time
Times from api are now formatted to the british time.
2016-05-03 11:02:21 +01:00
Chris Hill-Scott
f6ba5ec8d0 Merge pull request #528 from alphagov/activity-improvements
Link up the last 7 days
2016-05-03 10:58:51 +01:00
Nicholas Staples
e1f3975c9a Times from api are now formatted to the british time. 2016-05-03 10:55:37 +01:00
catherineheywood
d4c77f3164 Resize image file 2016-05-03 10:42:31 +01:00
catherineheywood
40db98b2c7 Add anchors to titles 2016-05-03 10:28:49 +01:00
catherineheywood
1721139322 Remove image file 2016-05-03 10:23:42 +01:00
catherineheywood
e11879ede7 Change JWT to JSON Web Tokens 2016-05-03 10:20:53 +01:00
Nicholas Staples
f581ff44d0 Only check on csv is the file extension.
Update validator logic

Update message for the validator.
2016-05-03 10:10:58 +01:00
Chris Hill-Scott
d1dec6d5a0 Default aggregate statistics to 0, not None
If they API returns no statistics for a given time period we should
assume that this is equivalent to 0. This means that the template can
always rely on the dictionary having the same keys.
2016-05-03 09:18:24 +01:00
Chris Hill-Scott
1965537f30 Merge pull request #530 from alphagov/non-bold-7-days-text
Make ‘7 days’ text on activity page not bold’
2016-05-03 09:03:13 +01:00
Chris Hill-Scott
127651b894 Make ‘7 days’ text on activity page not bold’ 2016-05-03 08:57:19 +01:00
Chris Hill-Scott
edc49a2870 Merge pull request #525 from alphagov/api-bumpf
Remove bumf from the API keys page
2016-04-29 16:05:00 +01:00
Chris Hill-Scott
744064e840 Remove activity from the nav
We saw lots of people in the lab clicking activity hoping for…
something. But it’s not really where you go to do a thing, so they
weren’t finding what they were looking for.

Since you can now get to the activity from the dashboard, let’s remove
the link in the nav, to make thing less ambiguous.
2016-04-29 16:03:57 +01:00
Chris Hill-Scott
43ef3e86ae Make big numbers on the homepage linkable
The big numbers on the home page relate directly to the notifications on
the notification page. So let’s link them. With a _hyper_ link.

This commit actually adds two links, one of which is semantically
correct, and one of which is visually correct, ie makes the whole black
area of the box clickable/hoverable.
2016-04-29 16:03:56 +01:00
Chris Hill-Scott
d82569f883 Fix page titles on activity page
We were getting some weirdness like ‘Failed both’.

This commit fixes the problem, and adds some tests for the page headings
to make sure they don’t break again.
2016-04-29 16:03:56 +01:00
Chris Hill-Scott
68bc164f91 Merge pull request #526 from alphagov/7days-reminder
Reminder of 7 days data retention on the activity pages
2016-04-29 15:54:16 +01:00
Pete Herlihy
2f418eed65 Reminder of 7 days data retention on the activity pages 2016-04-29 15:30:44 +01:00
Chris Hill-Scott
e6ed2c9ff6 Remove bumf from the API keys page 2016-04-29 14:36:56 +01:00
NIcholas Staples
96297d2989 Merge pull request #522 from alphagov/sms_msg_limit
Sms msg limit
2016-04-29 12:29:45 +01:00
Nicholas Staples
471eac209e Handling template content size error. All tests passing. 2016-04-29 09:38:59 +01:00
Andrew White
8995a86bb6 Merge pull request #520 from alphagov/redirect-to-dashboard-when-existing-service
Redirect to dashboard if this isn't the first service
2016-04-28 17:23:14 +01:00
Andrew White
7812b1cef5 Redirect to dashboard if this isn't the first service
There's no need to show the tour again if the user has previously
created a service so just redirect to the dashboard instead.
2016-04-28 16:44:12 +01:00
Adam Shimali
32dd627260 Merge pull request #519 from alphagov/week-activity
Change activity to view to request a week of data
2016-04-28 16:40:08 +01:00
Adam Shimali
a627cf9002 Change activity to view to request 7 days data.
Cleaned up filters a bit so that if you want both templates
email and sms is passed.

Added mock assertion to test.
2016-04-28 15:52:20 +01:00
Nicholas Staples
fbf30129b0 Update app to the latest notifications_utils. 2016-04-28 14:02:51 +01:00
Chris Hill-Scott
5572058e50 Merge pull request #518 from alphagov/dashboard-stats-all-aligned
Count only requested and failed messages on dashboard
2016-04-28 13:08:29 +01:00
Adam Shimali
1b13837e85 Merge pull request #517 from alphagov/temp-event-view
Add events to temp history page for story sign off
2016-04-28 10:52:22 +01:00
Chris Hill-Scott
876a0781fe Requested, delivered, and failed messages on dash
Requested, delivered and failed are the three states stored in the
notification statistics table. They are not discrete, eg a message can
be counted in delivered and failed.

`requested` is incremented *when a notification is created*, and has no
chance of being incremented twice for the same notification.

The template statistics are incremented *when a notification is created
only*.

Therefore the only way to make the numbers line up is to count:
- messages sent as being `requested`
- failure rate being `failed`/`requested` *not*
  `failed`/`failed`+`delivered`
2016-04-28 08:59:36 +01:00
Adam Shimali
72c1ecc9cb Believe it or not this broke functional tests 2016-04-27 18:00:46 +01:00
Adam Shimali
266a76adec Add events to temp history page for story sign off 2016-04-27 17:24:44 +01:00
Adam Shimali
fa59bd3461 Merge pull request #516 from alphagov/login-events
Login events
2016-04-27 17:20:34 +01:00
Chris Hill-Scott
43b95b0473 Merge pull request #515 from alphagov/align-dashboard-stats
Show sent, not pending numbers on the dashboard
2016-04-27 17:06:28 +01:00
Adam Shimali
7b611faee9 Missing requirement 2016-04-27 16:45:50 +01:00
Adam Shimali
7c1867fde6 Record login including remembered user login events to the api based of flask login
signals.
2016-04-27 16:39:17 +01:00
Nicholas Staples
337eeb60d1 Update requirements version. 2016-04-27 12:52:25 +01:00
Chris Hill-Scott
00507fc7be Show sent, not pending numbers on the dashboard
The dashboard should only talk about notifications that are *successful* or
*failed*. It should not count notifications that are still queued.

This will stop:
- a situation like ‘0 emails, 14.1% failed’
- the big numbers and the template statistics numbers not adding up to
  the same total
2016-04-27 12:31:52 +01:00
Chris Hill-Scott
4da63f2876 Merge pull request #512 from alphagov/ajax-patching
Patch update sections of the page on AJAX
2016-04-27 11:54:30 +01:00
catherineheywood
b508596871 change 'two' to '2' (GDS style guide) 2016-04-27 11:16:11 +01:00
Chris Hill-Scott
338789f7b7 Merge pull request #511 from alphagov/environment-in-tickets
Put app environment in support tickets
2016-04-27 10:19:37 +01:00
Chris Hill-Scott
2f49e919e7 Add ARIA live attribute to all AJAX updated areas
So that screenreaders will report on updates to the page.
2016-04-27 10:09:52 +01:00
Chris Hill-Scott
33b4138e79 Patch update sections of the page on AJAX
Currently, when we update a section of the page with AJAX we replace the
entire HTML of the section with the new HTML. This causes problems:
- if you’re trying to interact with that section of the page, eg by
  inpecting it, clicking or hovering an element
- (probably) for screenreaders trying to navigate a page which is
  changing more than is necessary

This commit replaces the call to `.html()` with a pretty clever library
called diffDOM[1]. DiffDOM works by taking a diff of the old element and
the new element, then doing a patch update, ie only modifying the parts
that have changed.

This is similar in concept to React’s virtual DOM, while still allowing
us to render all markup from one set of templates on the server-side.

1. https://github.com/fiduswriter/diffDOM
2016-04-27 10:08:57 +01:00
Chris Hill-Scott
a65466327c Put environment URL in feedback tickets
So that:
- we know what environment a request has been sent from
2016-04-26 16:46:00 +01:00
Chris Hill-Scott
456291d630 Put URL to service in request to go live ticket
So that:
- we know what environment the request has come from
- a platform admin user can jump straight to that service to check it
  out
2016-04-26 16:28:16 +01:00
Chris Hill-Scott
36d2889a59 Merge pull request #510 from alphagov/pricing
Removed reference to fail over rates on pricing page
2016-04-26 15:52:55 +01:00
Chris Hill-Scott
799dcfd80f Merge pull request #508 from alphagov/request-to-go-live-form
Put a form on the request to go live page
2016-04-26 14:52:57 +01:00
Chris Hill-Scott
3b7cedd542 Merge pull request #509 from alphagov/slack-link-update
Update Slack link to point at channel, not archive
2016-04-26 14:47:15 +01:00