darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-18 05:29:38 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
43aaa85247ea179bc540656fcd8f2665cc9dde72
notifications-admin/app/main/views/dashboard.py

64 lines
2.0 KiB
Python
Raw Normal View History

Flash message to confirm invitation accepted and user has been added to service.
2016-03-08 08:18:41 +00:00
from flask import (
render_template,
session,
flash
)
Logout functionality and test added.
2016-01-06 16:40:38 +00:00
from flask_login import login_required
Make data consistent from dashboard -> job - adds a table of recent activity to the job page, which is shared by the dashboard page - uses the same filename and message template as the first job shown on the dashboard - sets the time of file uploads/message delivery/message sending to always match ‘just now’
2015-12-18 10:26:56 +00:00
from app.main import main
Test add service completed.
2016-01-15 16:10:24 +00:00
from app.main.dao.services_dao import get_service_by_id
Add prompt to add first template to dashboard https://www.pivotaltracker.com/story/show/112814667 > As you need to have templates to send any notifications, we should be nudging > people to do that when they sign in. > > This should be in the dashboard, with a link to manage templates. > > Should be bright and shiny and only show if the service has no templates. This commit adds the above. It also rationalises the language (some places used ‘create template’, others used ‘add template’, this changes everything to the latter).
2016-02-02 09:38:58 +00:00
from app.main.dao import templates_dao
Put some statistics on the dashboard This commit adds two new sections to the dashboard 1. A banner telling you about trial mode, including a count of how many messages you have left today, which is a restriction of trial mode 2. Panels with counts of how many emails and text messages have been sent in a day, plus the failure rates for each It does **not**: - link through to any further information about what trial mode is (coming later) - link through to pages for the failure rates (coming later) - change the ‘recent jobs’ section to ‘recent notifications’
2016-03-17 11:45:48 +00:00
from app import job_api_client, statistics_api_client
Make data consistent from dashboard -> job - adds a table of recent activity to the job page, which is shared by the dashboard page - uses the same filename and message template as the first job shown on the dashboard - sets the time of file uploads/message delivery/message sending to always match ‘just now’
2015-12-18 10:26:56 +00:00
Update service_id to a UUID from an integer. This commit must go along side a commit on the notifications-api app. There will be a breif outage until both app are deployed.
2016-02-02 14:24:08 +00:00
@main.route("/services/<service_id>/dashboard")
Logout functionality and test added.
2016-01-06 16:40:38 +00:00
@login_required
Work in progress, all tests passing and implemented mocks for services_dao.
2016-01-15 17:46:09 +00:00
def service_dashboard(service_id):
Refactored register_errorhandlers so that it handles HTTPError Remove most cases where we catch HTTPError
2016-03-10 11:53:29 +00:00
templates = templates_dao.get_service_templates(service_id)['data']
jobs = job_api_client.get_job(service_id)['data']
service = get_service_by_id(service_id)
session['service_name'] = service['data']['name']
session['service_id'] = service['data']['id']
if session.get('invited_user'):
session.pop('invited_user', None)
service_name = service['data']['name']
Fix bug in error handlers. Correct spelling error
2016-03-11 10:16:06 +00:00
message = 'You have successfully accepted your invitation and been added to {}'.format(service_name)
Refactored register_errorhandlers so that it handles HTTPError Remove most cases where we catch HTTPError
2016-03-10 11:53:29 +00:00
flash(message, 'default_with_tick')
Flash message to confirm invitation accepted and user has been added to service.
2016-03-08 08:18:41 +00:00
Put some statistics on the dashboard This commit adds two new sections to the dashboard 1. A banner telling you about trial mode, including a count of how many messages you have left today, which is a restriction of trial mode 2. Panels with counts of how many emails and text messages have been sent in a day, plus the failure rates for each It does **not**: - link through to any further information about what trial mode is (coming later) - link through to pages for the failure rates (coming later) - change the ‘recent jobs’ section to ‘recent notifications’
2016-03-17 11:45:48 +00:00
statistics = statistics_api_client.get_statistics_for_service(service_id)['data']
Make data consistent from dashboard -> job - adds a table of recent activity to the job page, which is shared by the dashboard page - uses the same filename and message template as the first job shown on the dashboard - sets the time of file uploads/message delivery/message sending to always match ‘just now’
2015-12-18 10:26:56 +00:00
return render_template(
Put some statistics on the dashboard This commit adds two new sections to the dashboard 1. A banner telling you about trial mode, including a count of how many messages you have left today, which is a restriction of trial mode 2. Panels with counts of how many emails and text messages have been sent in a day, plus the failure rates for each It does **not**: - link through to any further information about what trial mode is (coming later) - link through to pages for the failure rates (coming later) - change the ‘recent jobs’ section to ‘recent notifications’
2016-03-17 11:45:48 +00:00
'views/dashboard/dashboard.html',
Fix ordering of jobs
2016-03-14 16:50:02 +00:00
jobs=jobs[:5],
Limit number of jobs on dashboard to 5 …and add a link to view the rest of the jobs if there are more than 5.
2016-02-04 17:13:57 +00:00
more_jobs_to_show=(len(jobs) > 5),
Updates to ‘send SMS’ page Based on discussion with Pete. Make the blue banner an ‘important’ banner (copied from Register to Vote, used because it’s not as boxy and fits on the page better). Remove the back button because you haven’t changed any data yet. If you need to go back you can just press back or start again. Make the filename stand out more. Remove the ‘download example’ link. Will need to revist the best way of doing this. Make text messages consistently 2/3rd width.
2016-02-04 12:20:24 +00:00
free_text_messages_remaining='250,000',
Add mocked service ID to all service-specific pages
2016-01-13 12:10:29 +00:00
spent_this_month='0.00',
Put some statistics on the dashboard This commit adds two new sections to the dashboard 1. A banner telling you about trial mode, including a count of how many messages you have left today, which is a restriction of trial mode 2. Panels with counts of how many emails and text messages have been sent in a day, plus the failure rates for each It does **not**: - link through to any further information about what trial mode is (coming later) - link through to pages for the failure rates (coming later) - change the ‘recent jobs’ section to ‘recent notifications’
2016-03-17 11:45:48 +00:00
service=service['data'],
statistics=expand_statistics(statistics),
templates=templates,
Update service_id to a UUID from an integer. This commit must go along side a commit on the notifications-api app. There will be a breif outage until both app are deployed.
2016-02-02 14:24:08 +00:00
service_id=str(service_id))
Put some statistics on the dashboard This commit adds two new sections to the dashboard 1. A banner telling you about trial mode, including a count of how many messages you have left today, which is a restriction of trial mode 2. Panels with counts of how many emails and text messages have been sent in a day, plus the failure rates for each It does **not**: - link through to any further information about what trial mode is (coming later) - link through to pages for the failure rates (coming later) - change the ‘recent jobs’ section to ‘recent notifications’
2016-03-17 11:45:48 +00:00
def expand_statistics(statistics, danger_zone=25):
if not statistics or not statistics[0]:
return {}
today = statistics[0]
today.update({
Fix division by zero
2016-03-17 14:40:08 +00:00
'emails_failure_rate':
int(today['emails_error'] / today['emails_requested'] * 100) if today['emails_requested'] else 0,
'sms_failure_rate':
int(today['sms_error'] / today['sms_requested'] * 100) if today['sms_requested'] else 0
Put some statistics on the dashboard This commit adds two new sections to the dashboard 1. A banner telling you about trial mode, including a count of how many messages you have left today, which is a restriction of trial mode 2. Panels with counts of how many emails and text messages have been sent in a day, plus the failure rates for each It does **not**: - link through to any further information about what trial mode is (coming later) - link through to pages for the failure rates (coming later) - change the ‘recent jobs’ section to ‘recent notifications’
2016-03-17 11:45:48 +00:00
})
today.update({
'emails_percentage_of_danger_zone': min(today['emails_failure_rate'] / (danger_zone / 100), 100),
'sms_percentage_of_danger_zone': min(today['sms_failure_rate'] / (danger_zone / 100), 100)
})
return today
Reference in New Issue Copy Permalink