Commit Graph

3854 Commits

Author SHA1 Message Date
Chris Hill-Scott
94bc8191ae Remove irrelevant stuff from error check pages
If you have errors in your file then there’s stuff you’re not going to
see on the page. So this doesn’t need to be in the Jinja templates that
are only used when there are errors.

Basically the conditional stuff is moving up to the level above these
templates.
2017-07-20 11:56:37 +01:00
Chris Hill-Scott
5a9f817e52 Remove anything error-related from the OK view
If you’ve uploaded a file and everything is OK, the page that you see
doesn’t need to look at any errors (because there won’t be any).
2017-07-20 11:55:46 +01:00
Chris Hill-Scott
ddeed88210 Refactor check page into 3 separate templates
The check page is a very complex Jinja template. It needs breaking up
to make it easier to understand what’s going on.

I think there are three di
2017-07-20 11:47:04 +01:00
Chris Hill-Scott
b003162932 Merge pull request #1368 from alphagov/quis-patch-1
Reduce spacing before button on invite page
2017-07-19 09:13:36 +01:00
Chris Hill-Scott
35e7866b96 Merge pull request #1372 from alphagov/correct-descalation-link
Fix broken link in support process
2017-07-19 09:13:31 +01:00
Chris Hill-Scott
95347a89db Merge pull request #1371 from alphagov/fix-form-focus-list-entry
Fix button keyboard focus on whitelist
2017-07-19 09:13:21 +01:00
Chris Hill-Scott
9a81489066 Merge pull request #1362 from alphagov/letter-delivery-estimates
Add function to estimate letter delivery date
2017-07-18 09:44:56 +01:00
Chris Hill-Scott
5b4a15495e Fix remove button keyboard focus on whitelist
Replicates @pcraig3’s work here:
https://github.com/alphagov/digitalmarketplace-frontend-toolkit/pull/333
2017-07-17 09:55:11 +01:00
Chris Hill-Scott
109b41a430 Fix broken link in support process
The idea is if you decide your problem isn’t such an emergency after
all, we direct you to the form where you can report it as such. This
link wasn’t working because it didn’t understand `False` to mean ‘not
severe’. Only ‘no’ means not severe.

The result was that users got sent in a bit of a convoluted loop
where they were asked again if their problem was an emergency or not.

Testing this by making sure that both:
- the URL in the link is what we expected
- when visited it gives the page title we expect

Because even if we had had the first test only, it wouldn’t have caught
this bug.
2017-07-15 07:23:22 +01:00
Chris Hill-Scott
e20483c462 Add print timings to letter timings
It will also be useful to know (especially for the API):
- when a letter was printed
- if it’s been printed or not

This commit:
- adds code to calculate these two pieces of information
- refactors the function to return a `namedtuple` – a tuple of two items
  was manageable, but with four items it was getting hard to know what
  each one meant – this lets us label each piece of information that is
  being returned
2017-07-14 20:09:23 +01:00
Chris Hill-Scott
6ceffd02c4 Reduce spacing before button on invite page
It was too much, the button looked adrift.
2017-07-13 15:55:32 +01:00
Chris Hill-Scott
a6b3ae0965 Merge pull request #1360 from alphagov/ajax-conversation-page
Make conversation and inbox pages update using AJAX
2017-07-13 15:18:33 +01:00
Chris Hill-Scott
a6eb18fbf3 Merge pull request #1366 from alphagov/roadmap-july
Updates for July for the Roadmap
2017-07-13 15:01:52 +01:00
Chris Hill-Scott
49494d2751 Merge pull request #1365 from alphagov/65-67
65-68
2017-07-13 15:01:46 +01:00
Chris Hill-Scott
cfbe767dff Test permissions on the inbox updates 2017-07-13 14:58:24 +01:00
Pete Herlihy
44a6221060 Updates for July for the Roadmap 2017-07-13 12:22:03 +01:00
Pete Herlihy
b7a28eff21 Adding HO Right to work check - 68 2017-07-13 11:54:48 +01:00
Chris Hill-Scott
5f6351762a Make inbox page update using AJAX
Fairly self-explanatory. Uses the same pattern of breaking things up
into functions as the jobs page.
2017-07-12 17:10:27 +01:00
Chris Hill-Scott
dc3f26a646 Make conversation page update using AJAX
Fairly self-explanatory. Uses the same pattern of breaking things up
into functions as the jobs page.
2017-07-12 17:09:33 +01:00
Chris Hill-Scott
7244bbf849 Merge pull request #1363 from alphagov/footer-fix
Fix alignment and spacing of page footer on mobile
2017-07-12 16:07:23 +01:00
Chris Hill-Scott
dca0fce1e4 Merge pull request #1361 from alphagov/fix-permissions-inbox
Fix wrong permissions on dashboard pages
2017-07-12 16:07:13 +01:00
Chris Hill-Scott
5fea26c7f7 Fix alignment and spacing of page footer on mobile
SASS pinched from here:
696ce451a7/source/pay-product-page/stylesheets/modules/_footer-categories.scss
2017-07-12 15:23:09 +01:00
Chris Hill-Scott
c1a5cad0d6 Add function to estimate letter delivery date
Letter delivery depends on:
- how long it takes to print
- how long it takes to post

Both of these process are impacted by weekends, because people don’t
work on weekends.

It also depends on if you submit your letter before or after 5pm,
because that’s the cut off time for getting a letter printed on a given
day – ie after 5pm on Monday is effectively the same as Tuesday and so
on.

But I reckon all our users need to know is roughly how long it will take
until the letter turns up on the user’s doorstep. So this commit adds
a function to calculate this. Doesn’t surface it on the front end _yet_.
2017-07-12 15:11:39 +01:00
Chris Hill-Scott
7664ffb998 Merge pull request #1358 from alphagov/remove-pygments
Remove unused dependency
2017-07-12 09:10:29 +01:00
Chris Hill-Scott
037970c48c Fix wrong permissions on dashboard pages
Anyone with access to a service should be able to see:
- monthly breakdown (non financial)
- incoming messages

Adds tests to check the same.
2017-07-12 09:07:14 +01:00
kentsanggds
18e7f3eccb Merge pull request #1346 from alphagov/allow-email-and-sms-to-be-disabled
Allow email and sms to be disabled
2017-07-10 12:43:17 +01:00
Ken Tsang
bdf3f20f4c Fixed tests 2017-07-10 12:25:01 +01:00
Ken Tsang
e3e6376c68 Updated action_blocked text 2017-07-10 12:12:41 +01:00
Pete Herlihy
fc203653d1 65-67 and 32-33 for SSRO and Digital Framework Management 2017-07-10 10:47:54 +01:00
Chris Hill-Scott
cfa63b450e Merge pull request #1359 from alphagov/fix-inbound-page
Fix 500 on two-way conversation page
2017-07-07 14:28:00 +01:00
Chris Hill-Scott
84a291f24f No idea why this is failing on Jenkins 2017-07-07 14:16:18 +01:00
Chris Hill-Scott
91a071ce5d Fix import conflict 2017-07-07 14:04:49 +01:00
Chris Hill-Scott
61fd27c4f6 Fix 500 on two-way conversation page
We changed the schema used by the endpoint that searches for
notifications by recipient. So the admin app was looking for the wrong
thing in the JSON.

This is hard to catch in tests because it relies on our fixtures
matching what the API really returns.

This commit fixes the code to use the correct key to lookup the template
content from the JSON.

This also exposed the fact that we weren’t passing in the
personalisation any more (perhaps got lost in the re-reverts somehow)
so users were only seeing the template in the inbound view, not the
full message content.
2017-07-07 10:16:33 +01:00
Chris Hill-Scott
b69198bc0f Remove unused dependency
We used this for code highlighting when we had documentation in the
admin app.
2017-07-06 14:29:34 +01:00
Chris Hill-Scott
9f4018b36f Merge pull request #1355 from alphagov/fix-page-title-notification
Fix page title on notification page
2017-07-06 14:08:37 +01:00
Pete Herlihy
fbdf16e513 Merge pull request #1356 from alphagov/63-64
63-64 and 31-32 for Ofsted IT
2017-07-06 14:05:36 +01:00
Pete Herlihy
dab897b7d9 And 65... 2017-07-06 14:05:21 +01:00
Pete Herlihy
a978cd644f 63-64 and 31-32 for Ofsted IT 2017-07-06 11:21:52 +01:00
Katie Smith
aaadd867f7 Refactor code to check whether email/sms is enabled 2017-07-05 09:15:58 +01:00
Katie Smith
42a8474415 Stop users from editing/adding templates without the correct permission
If sending SMS is disabled for a service, it should not be possible to
add or modify SMS templates. If a user tries to do this, they should see
a different page with a link to go back. The same thing should happen
with email templates.
2017-07-05 09:15:32 +01:00
Katie Smith
95f9d26e91 Allow sending sms to be disabled
Platform admins can now disable sending sms for a service. If sending
sms is disabled, this will also hide all the other sms options in the
Settings table.
2017-07-05 09:15:32 +01:00
Katie Smith
5986dfd415 Allow sending emails to be disabled
Platform admins can now disable sending of emails for a service. If
sending emails is disabled, this will also hide the option to change the
Email reply to address.
2017-07-05 09:15:32 +01:00
Chris Hill Scott
17199f0c26 Test for page titles in client request fixture
We’re frequently ending up with mismatched page titles on our pages
because:
- they’re hard to spot in the browsers tab bar
- new pages are often created by copy pasting old ones

It would be hard to write some kind of macro that spat out the h1
and the page title because they go into different blocks in the
parent template.

Instead, we can catch these mistakes by testing for them. Going
forward we should be using the `client_request` fixture for testing.
So it makes sense to put the page title test in here so that we
get it for free in every test – same way we do for testing response
codes.

fixup! Test for page titles in client request fixture
2017-07-05 09:01:46 +01:00
Chris Hill Scott
7ff6075e0a Fix page title on 404
Should match the `<h1>` on the page
2017-07-04 14:28:58 +01:00
Chris Hill Scott
dd52f60828 Fix page titles on preview page
Should match the `<h1>`
2017-07-04 14:28:12 +01:00
Chris Hill Scott
5a76244d6d Fix page title on individual notification page
Should match `<h1>` on the page.
2017-07-04 14:27:20 +01:00
Chris Hill Scott
ecc506306b Move helper function
`test_utils.py` is actually a file for testing some utils, not
some utils for testing.

Test helper functions and fixtures are better placed in conftest,
and also means that we can use them in conftest.
2017-07-04 14:17:36 +01:00
Chris Hill-Scott
11adf17330 Merge pull request #1354 from alphagov/no-template-link-tour
Don’t link to template in tour
2017-07-04 09:51:18 +01:00
Chris Hill-Scott
5a519ae637 Merge pull request #1353 from alphagov/bump-utils-sms-character-count-validation
Bump utils to count characters in SMS properly
2017-07-04 09:51:12 +01:00
Chris Hill-Scott
8585f3bdba Merge pull request #1350 from alphagov/package-lock
Add `package-lock.json` to version control
2017-07-04 09:51:05 +01:00