Commit Graph
5626 Commits
Author SHA1 Message Date
Nicholas Staples b3249831cf Fix up front end so you can navigate to the edit page. 2016-03-03 15:43:53 +00:00
Chris Hill-Scott b31c9fbc0d Make job page poll for updates
This is a first go at having the job page update without refreshing.

The approach I’ve taken is to do all the rendering of HTML on the server side,
rather than use a Javascipt templating engine like mustache. This ensures that
we don’t have to maintain two sets of templates.

So the approach is to split the job page into partials. These partials can then:
- be included in the job page to render the whole page
- be rendered indivudually and then returned as a blob of HTML inside a JSON
  response

Then I’ve added a Javascript module which looks for areas of the page that should
be reloaded. For each area of the page it will poll a URL and re-render that
section of the page when it gets new HTML. It implements some throttling so that
API calls will never happen more frequently than 0.67 times/second.
2016-03-03 14:28:36 +00:00
NIcholas Staples 0e663e044f Merge pull request #226 from alphagov/real-data-on-job-page
Put real data on job page
2016-03-03 14:27:10 +00:00
Nicholas Staples 9e710711cb Updated form and fixed existing tests. 2016-03-03 13:00:12 +00:00
Nicholas Staples 8287e1bad1 Fix permission names, all tests passing. 2016-03-03 12:15:24 +00:00
Chris Hill-Scott d9073862fa Put data from job on job page
The main change is showing the finished time if the job is finished, rather
than the start time.
2016-03-03 11:38:38 +00:00
Chris Hill-Scott 3a3e4258ef Remove template column
As one of our user research participants pointed out, this column is redundant
because we’re showing the template on the page already.
2016-03-03 11:38:38 +00:00
Chris Hill-Scott a4a93116be Put real notifications on job page 2016-03-03 11:38:38 +00:00
Chris Hill-Scott 542f097b6d Make the template preview work
The template was displaying raw, eg ‘Hello ((name))’

This commit changes it to use the `.formatted_as_markup` property so the
template is rendered with:
- the placeholders as blue lozenges
- the service name prefixing the message
2016-03-03 11:15:50 +00:00
Nicholas Staples 9b31761001 Merge remote-tracking branch 'origin/master' into add_send_permission 2016-03-03 09:20:19 +00:00
Nicholas Staples 1b59e5c7f1 Review comments fixed. All tests passing. 2016-03-03 09:02:56 +00:00
Adam Shimali 6ba13a6513 [WIP] New user can now accept invite and will be made to
register. On succesful register and verfication they
will be added to service and forwarded to dashboard.

Nothing is done yet with the permissions requested in the
invite to the user.
2016-03-02 17:52:32 +00:00
Rebecca Law 8acfc06432 Merge branch 'master' into cancel-invited-user 2016-03-02 17:25:17 +00:00
Rebecca Law 1b64a212ea Change label to exclude the type of message being sent. 2016-03-02 16:49:16 +00:00
Nicholas Staples dde2fba705 Merge with master again. 2016-03-02 13:53:05 +00:00
NIcholas Staples f0e0006a7c Merge pull request #213 from alphagov/accept-phone-or-email-column
Accept CSVs with 'email address' or 'phone number'
2016-03-02 11:27:24 +00:00
Chris Hill-Scott b57ac2f7e5 Accept CSVs with 'email address' or 'phone number'
CSV files currently have ‘to’ as the recipient column. This is changing in
https://github.com/alphagov/notifications-api/pull/109

The admin app also has to validate that the CSV files have the right columns,
because the API expects any CSV that it’s given to have been checked (also we
want things to actually work).

This commit is the minimum code change needed. In the future it should reuse
the same code as the API for processing CSV files. This will need more thinking.
2016-03-02 10:41:35 +00:00
Rebecca Law 0b8b419798 Fix missing import on template for email_message.
https://www.pivotaltracker.com/story/show/113991355
2016-03-02 09:55:59 +00:00
Rebecca Law 65f4506028 Show status of invited user on manage team page. 2016-03-02 09:28:33 +00:00
Rebecca Law bfea4a42bc Merge branch 'master' into cancel-invited-user
Conflicts:
	app/notify_client/invite_api_client.py
	tests/app/main/views/test_manage_users.py
2016-03-01 18:01:20 +00:00
Adam Shimali 5f02d4cefe [WIP] Post does not need any data
Invites rest module can use invited user object instead
of dict.
2016-03-01 17:23:23 +00:00
Rebecca Law 219c740071 Add button to cancel invitation of invited user. 2016-03-01 16:12:26 +00:00
Nicholas Staples d3bc390b6c Merge with master. 2016-03-01 15:23:00 +00:00
Adam Shimali 5f3c72729e [WIP] Start of user accepting invite.
This commit only deals with acceptance by
users who are already in system.

Changed invite client to return invited user objects
instead of dictionaries.

Added commented out test. fixed up fixtures to return invited user
object for invites
2016-03-01 14:10:35 +00:00
Martyn Inglis 7b5e8061e2 Slight (bad) hack to ensure that the ticks appear on the manage user page
- changes imports for utils from broken version on previous branch
2016-03-01 10:45:13 +00:00
Nicholas Staples ffe30c3070 Permissions added for templates and send_messages pages. All tests passing.
Fix up page heading.
2016-02-29 17:18:12 +00:00
Nicholas Staples 58351a094c Merge with master. 2016-02-29 14:59:15 +00:00
Nicholas Staples 48943527ec API keys hooked up and working. All tests passing. 2016-02-29 14:57:07 +00:00
Rebecca Law 5c885c545c Merge pull request #210 from alphagov/create-invite-with-permissions
Invite user form now posts permissions string to api with
2016-02-29 11:38:44 +00:00
Adam Shimali 9c748404e1 Merge pull request #209 from alphagov/better-csv-guidance
Give users better guidance about CSV files
2016-02-29 11:04:48 +00:00
Adam Shimali 8c10c36f50 Invite user form now posts permissions string to api with
data to create invite.
2016-02-29 11:03:35 +00:00
Chris Hill-Scott 0cce5db3d1 Give users better guidance about CSV files
This commit adds some guidance on the ‘Add recipients’ page about what should
be in the CSV file. The guidance is contextual to the template, and based on
the problems that we saw users having yesterday.
2016-02-26 16:23:56 +00:00
Adam Shimali c76717942f Manage user pages now surfaces invited users
fetched from api.
2016-02-26 15:34:12 +00:00
Adam Shimali 9730db0e89 Merge pull request #206 from alphagov/drop-preview-service-name
Make ‘add service’ flow one page again
2016-02-26 15:05:21 +00:00
Chris Hill-Scott 865ea3ca4f Use correct API endpoint in docs
This has confused people, should change it before the site visits next week.
2016-02-26 15:00:32 +00:00
Chris Hill-Scott f129cc3db2 Reword the add service page
Without the preview service name we probably have to go back to communicating
a bit more on the add service page. This commit brings back the two bullet
points about where the service name will appear, and tries to tie it into the
nice words that Matt Sheret wrote for us.
2016-02-26 13:17:58 +00:00
Chris Hill-Scott ce221fc40b Drop ‘preview service name’ page
This page:
- confused users in research
- didn’t communicate what it was intended to (eg the generated email address,
  how your service name would appear in messages)

This commit removes the page so that after typing in the service name the user
is sent straight to the dashboard for their new service.
2016-02-26 13:12:25 +00:00
Adam Shimali 77c9c9a323 Merge pull request #201 from alphagov/stub-send-letters
Stub out the send letters page
2016-02-26 12:03:32 +00:00
Chris Hill-Scott 2f91848a42 Prefix text messages with service name
Brings in: https://github.com/alphagov/notifications-utils/pull/4
2016-02-26 11:57:13 +00:00
Chris Hill-Scott a51d92c87a Consolidate page templates for emails + texts
Use one page template for each of:
- choosing a message template
- adding recipients
- checking an email message
- looking at a job

This commit consolidates the two templates into one, and adds logic to show
the SMS message pattern or the email message pattern depending on the type of
template.

It also gives email templates a bit more width, because the body and the from
address tend to be quite long.
2016-02-26 11:57:13 +00:00
Chris Hill-Scott 8d81c4d984 Stub out the send letters page 2016-02-25 17:34:53 +00:00
Martyn Inglis 10d595c7a9 Merge branch 'master' into celery-jobs 2016-02-25 11:30:28 +00:00
Martyn Inglis 87391f2aa1 Renamed header of CSV to be 'to' - matches API 2016-02-25 11:30:09 +00:00
minglis b4fd7f4ffd Merge pull request #198 from alphagov/fix-create-sms-template
Fix create SMS template
2016-02-25 10:50:32 +00:00
Chris Hill-Scott c733b4318e Fix create SMS template
When creating an SMS template the form validation was looking for a subject.
SMS messages don’t have a subject.
2016-02-25 10:43:48 +00:00
Chris Hill-Scott 522bf0566a Fix broken link on dashboard
The link in the yellow box for adding a template was missing the parameter
specifying what type of template should be created.
2016-02-25 10:21:40 +00:00
Adam Shimali 602d505dc7 Merge pull request #196 from alphagov/get-users-for-service
Get users for service
2016-02-24 17:41:45 +00:00
Nicholas Staples c959678c49 Remember me functionality added and tested.
Merge extra.

Fixed comment.
2016-02-24 17:32:15 +00:00
Rebecca Law 2905d11fe4 Get users for service to show on the manage team page.
Calls api endpoint /service/<service_id>/users to retrieve all users associated with the service
2016-02-24 17:32:15 +00:00
Chris Hill-Scott bc1899e8c0 Make email pattern work in new context
The email pattern looked a bit shonky when displayed in a narrower column. This
commit fixes it by making the email’s metadata (eg subject, from) into a table,
which it sort of is. This means that it is more flexible about the size of
container in which it sits.
2016-02-24 09:23:38 +00:00