Commit Graph

8302 Commits

Author SHA1 Message Date
Chris Hill-Scott
d41effe8ce Allow GPs to click through to the agreement
We want GPs to be able to accept the agreement online. But at the moment
they don’t get automatically assigned to organisations. So we need to
let them enter the agreement accepting journey even if they don’t have
an organisation set up.
2019-09-05 14:46:02 +01:00
Chris Hill-Scott
2fe7887ec6 Merge pull request #3113 from alphagov/remove-expanded
Update utils to remove toggle for expanding email previews
2019-09-03 09:15:28 +01:00
Chris Hill-Scott
1f2863a48d Merge pull request #3102 from alphagov/pyup-scheduled-update-2019-08-26
Scheduled weekly dependency update for week 34
2019-09-03 09:15:16 +01:00
Chris Hill-Scott
40e020d40d Remove expand_emails argument from get_template
It isn’t used for anything now.
2019-09-02 17:04:53 +01:00
Chris Hill-Scott
17b8c0194b Update utils and remove expanded argument
This argument was removed in https://github.com/alphagov/notifications-utils/pull/643
2019-09-02 17:04:53 +01:00
Leo Hemsted
0cf1251cad Merge pull request #3101 from alphagov/billing-for-all-services-report
Usage for all services
2019-09-02 16:38:23 +01:00
karlchillmaid
df617c570e Merge pull request #3112 from alphagov/send-a-file-formatting-update
Send a file by email – reintroduce instructions
2019-09-02 16:05:54 +01:00
karlchillmaid
f2611f61b8 Update app/templates/partials/templates/guidance-send-a-document.html
Co-Authored-By: Chris Hill-Scott <me@quis.cc>
2019-09-02 15:48:27 +01:00
karlchillmaid
a94ca9082c Remove comment-out
Because we've added 'Send a document' content to all client docs and we added channel-specific features pages with 'Send files by email' content, we're going to reintroduce the instructions that were commented out as part of https://github.com/alphagov/notifications-admin/pull/2270
2019-09-02 15:30:34 +01:00
Tom Byers
af689d4ac3 Merge pull request #3108 from alphagov/remove-expand-collapse-js
Remove expandCollapse JS
2019-08-30 14:29:34 +01:00
Chris Hill-Scott
c1014b1589 Merge pull request #3109 from alphagov/set-free-allowance-gp
Set free allowance for GP surgeries
2019-08-30 10:06:35 +01:00
Tom Byers
26e1e3a5cb Remove CSS tied to .js-enabled class
Not as obviously connected to expandCollapse but
no longer needed.
2019-08-30 08:44:14 +01:00
Chris Hill-Scott
13a98a73c1 Set free allowance for GP surgeries
This also tests that a user from an unknown organisation can pick any
of the available options and get the right allowance.
2019-08-29 17:47:14 +01:00
Tom Byers
c9c3f90fd8 Remove CSS used by expandCollapse.js 2019-08-29 16:42:47 +01:00
Tom Byers
030979a864 Remove expandCollapse.js script and refs to it 2019-08-29 16:42:27 +01:00
Sakis
5cd52d7996 Merge pull request #3107 from alphagov/bump-utils-again
Bump utils again
2019-08-29 16:33:07 +01:00
Athanasios Voutsadakis
f0011cbd58 Bump rest of the packages 2019-08-29 14:47:15 +01:00
Athanasios Voutsadakis
c35e2c1270 Bump utils to 33.2.9 2019-08-29 14:46:59 +01:00
Tom Byers
68d533fa18 Merge pull request #3103 from alphagov/split-up-js-test-helpers
Split JS test helpers into separate files
2019-08-29 14:02:25 +01:00
Tom Byers
9d176d8d8d Merge pull request #3093 from alphagov/fix-aria-on-fullscreen-table
Change method of hiding extra table layer
2019-08-29 14:01:54 +01:00
Chris Hill-Scott
55de46976c Freeze requirements 2019-08-29 13:50:28 +01:00
pyup-bot
104a674de2 Update eventlet from 0.25.0 to 0.25.1 2019-08-29 13:48:23 +01:00
pyup-bot
0c01fb80e6 Update pytz from 2019.1 to 2019.2 2019-08-29 13:48:23 +01:00
pyup-bot
3cbb1fa720 Update pyexcel-io from 0.5.18 to 0.5.20 2019-08-29 13:48:22 +01:00
pyup-bot
e7b2300b69 Update pyexcel from 0.5.14 to 0.5.15 2019-08-29 13:48:22 +01:00
pyup-bot
5da63cc6fb Update flask from 1.0.3 to 1.1.1 2019-08-29 13:48:21 +01:00
Leo Hemsted
6412a4ab33 use a flash error message on the platform admin usage report
that makes more sense than attaching the error to a field

also fix tests and assert csv contents are correct
2019-08-29 10:49:38 +01:00
Chris Hill-Scott
1a3264671c Merge pull request #3104 from alphagov/gp
Add ‘GP’ as an organisation type
2019-08-28 17:18:15 +01:00
Chris Hill-Scott
c9a32c7327 Remove duplication of org type lookup
There’s a couple of places where we’re looking up the label for the type
of organisation.

Having this repeated in multiple places means it’s more likely we forget
to update one of these places when making a change.

This commit looks up from the tuple in the organisation model, which is
where other code references this stuff from. This is only possible now
that we don’t have duplicate keys (ie GP practice doesn’t share a key
any more).
2019-08-28 15:36:09 +01:00
Chris Hill-Scott
38c2b32fa8 Add ‘GP’ as an organisation type
Although their allowances are the same as what we call `nhs_local` it
makes more sense to store them separately because:

- we already present them as two separate choices to the user
- we may want to handle them differently in the future, eg in terms of
  what branding choices are available to them

Once the API is updated we can start passing in this new value from
the admin app.
2019-08-28 15:36:09 +01:00
Chris Hill-Scott
efabf0e87d Refactor to avoid redefinition of org types
We’re defining the list of org types in a few different places. This
makes it more likely we’ll forget to update one of these places, thereby
introducing a bug.

This commit moves the definition to be on the organisation model, which
feels like a sensible enough place for it.
2019-08-28 15:36:08 +01:00
Tom Byers
baf8c1fddb Split helpers into separate files 2019-08-27 17:00:22 +01:00
Leo Hemsted
b69321bf7a rename logged_in_platform_admin_client to platform_admin_client
of course it's logged in, it's a platform admin

also, reduce use of the `client` fixture in test_platform_admin
(replace it with platform_admin_client)
2019-08-27 16:02:15 +01:00
Rebecca Law
464a74b329 fix codestyle 2019-08-23 17:18:05 +01:00
Rebecca Law
2fe5c4a96e New report on platform-admin/reports page to get the usage for all services. 2019-08-23 17:14:04 +01:00
karlchillmaid
0466d57565 Merge pull request #3100 from alphagov/fix-heading
Fix heading
2019-08-23 14:40:19 +01:00
karlchillmaid
4c232a9cab Fix h2 tag so heading displays properly 2019-08-23 14:16:23 +01:00
karlchillmaid
0d7005094a Merge pull request #3099 from alphagov/update-receive-text-message-content
Update explanation of inbound SMS
2019-08-23 14:13:54 +01:00
Chris Hill-Scott
922a7fc9dc Fix tests 2019-08-23 13:52:41 +01:00
Tom Byers
86e2b4b117 Merge pull request #3079 from alphagov/add-js-tests-for-sticky-js
Add js tests for sticky js
2019-08-23 13:14:13 +01:00
Tom Byers
78d6419f80 Add tests for window resizing 2019-08-22 15:21:33 +01:00
Tom Byers
fbc68b7bf2 Add tests for viewports < 769px wide
Elements should not stick unless the viewport is
768px wide or larger.
2019-08-22 15:21:33 +01:00
Tom Byers
6871dbcffe Add tests for when caret is underneath sticky
If focus moves to a textarea, we care more about
the caret being overlapped than the textarea.

This adds tests for the caret being overlapped on
load and as a result of it moving underneath the
sticky element from a keyboard event.
2019-08-22 15:21:33 +01:00
Tom Byers
fac116b835 Add tests for handling overlap of activeElement
If an element receives focus when underneath a
stick element, the window should scroll so the
focused element is revealed.

Includes some changes to the WindowMock API to
allow access to data from Jest spies.
2019-08-22 15:21:33 +01:00
Tom Byers
ab6e81a8a6 Add tests for 'shim'
A 'shim' element needs to be added to the page
when an element is made sticky to ensure the
vertical position of everything doesn't change.

When an element becomes sticky it is made
`position: fixed` which removes it from the layout
of the page. The 'shim' is an element added at the
same place in the page with the same dimensions,
so the layout isn't changed.
2019-08-22 15:21:33 +01:00
Tom Byers
381e745ec8 Make helper plug gap in JSDOM's DOM API
Errors fired from JSDOM showed it doesn't support
`window.scrollTo` (or `window.scroll` for that
matter).

This stubs it, to the extent that our use (jQuery
really) of it works.
2019-08-22 15:21:33 +01:00
Tom Byers
8a82d42bf7 Add tests for 'dialog' mode
'dialog' mode was introduced as part of this work:

https://github.com/alphagov/notifications-admin/pull/2682

It lets multiple elements sticky to the viewport
together so a set of UI can be present for a set
scrolling range. It's called a 'dialog' because
the behaviour is closest to that of a modal
dialog.
2019-08-22 15:21:31 +01:00
Tom Byers
85d54637fa Add tests for most scenarios 2019-08-22 15:16:45 +01:00
Tom Byers
823c5a6119 Add clearEvents method & refactor setEvents
`clearEvents` helps write the tests and also gives
users the opportunity to remove all of this
functionality.

Refactor of `setEvents` tidies up use of `self`.
2019-08-22 15:16:45 +01:00
Tom Byers
9ef093cfda Add ScreenMock to helpers
Mocks DOM API calls for position and dimension of
elements and provides an API to allow access to
them.
2019-08-22 15:16:42 +01:00