Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changing pagination results number #956

Merged
merged 2 commits into from
Dec 10, 2024

Conversation

robertjmccarthy
Copy link
Contributor

@robertjmccarthy robertjmccarthy commented Nov 22, 2024

  • Changes pagination example results string starting point from 10 to 11.
  • Fixes aria-label attribute end number to be total number of pages instead of total results.

@robertjmccarthy robertjmccarthy requested a review from a team as a code owner November 22, 2024 08:33
robertjmccarthy and others added 2 commits November 22, 2024 12:07
The paginion component example shows as page 2, but also outputs
"showing results 10-20 of 30". This commit updates that to be results
11-20 as would actually be displayed.
…of total results

The `aria-label` for each page entry was of the form "page x of y" where y was the total number of
results, rather than the total number of pages. This PR fixes the error
@chrispymm chrispymm added the bug A task that fixes something that isn't working label Nov 22, 2024
@chrispymm chrispymm changed the base branch from main to add-interruption-card December 10, 2024 09:48
@chrispymm chrispymm merged commit 58bf023 into add-interruption-card Dec 10, 2024
19 checks passed
@chrispymm chrispymm deleted the pagination-results branch December 10, 2024 09:49
chrispymm added a commit that referenced this pull request Dec 10, 2024
* docs(pagination): update results indexes on pagination example

The paginion component example shows as page 2, but also outputs
"showing results 10-20 of 30". This commit updates that to be results
11-20 as would actually be displayed.

* fix(pagination): fix aria label for pages to use total pages instead of total results

The `aria-label` for each page entry was of the form "page x of y" where y was the total number of
results, rather than the total number of pages. This PR fixes the error

---------

Co-authored-by: Chris Pymm <chris@chrispymm.co.uk>
chrispymm added a commit that referenced this pull request Dec 10, 2024
* feat(interruption card): add interruption card component

add in the macro template and styles for the interruption card component.  Based on the component in
use in HMPPS seen here:
https://github.com/ministryofjustice/hmpps-book-a-prison-visit-ui/pull/156/files with changes made
according to decisions based upon research and discovery.

* feat(interruption card): adjust padding and add border for high contrast mode

* feat(interruption card): add documentation page

Adding documentation page and nav link for interruption card.

* feat(interruption card): adding example images

* feat(interruption card): allow primary action to also be a link

* feat(interruption card): add interruption card component

add in the macro template and styles for the interruption card component.  Based on the component in
use in HMPPS seen here:
https://github.com/ministryofjustice/hmpps-book-a-prison-visit-ui/pull/156/files with changes made
according to decisions based upon research and discovery.

* feat(interruption card): adjust padding and add border for high contrast mode

* feat(interruption card): add documentation page

Adding documentation page and nav link for interruption card.

* feat(interruption card): adding example images

* feat(interruption card): allow primary action to also be a link

* docs(interruption card): bump assets version

* docs(interruption card): add content first version

* docs(interruption card): content tweaks

* docs(interruption card): more content tweaks

* docs(interruption card): 2i changes

* docs(interruption card): team review changes

* docs(interruption card): 2nd team review changes

* docs(interruption card): more team review changes

* docs(interruption card): some more team review changes

* docs: ✏️ adding contributor and 'based on' info

* docs(interruption card): add examples and inline code styling

* docs(interruption card): 3rd team review changes

* feat(interruption card): changing wrapper width of interruption card

- Change content wrapper width from fluid to fixed for readability
- Update example iframe height

✅ Closes: 936

* docs(interruption card): adding anchor

* docs(interruption card): adding another anchor

* docs(interruption card): anchors

* docs(interruption card): add examples and inline code styling

* docs(interruption card): 3rd team review changes

* feat(interruption card): changing wrapper width of interruption card

- Change content wrapper width from fluid to fixed for readability
- Update example iframe height

✅ Closes: 936

* docs(interruption card): adding anchor

* docs(interruption card): adding another anchor

* docs(interruption card): anchors

* docs(interruption card): survey changes

* docs(interruption card): doc changes

* docs(interruption card): add examples and inline code styling

* docs(interruption card): 3rd team review changes

* feat(interruption card): changing wrapper width of interruption card

- Change content wrapper width from fluid to fixed for readability
- Update example iframe height

✅ Closes: 936

* docs(interruption card): adding anchor

* docs(interruption card): adding another anchor

* docs(interruption card): anchors

* docs(interruption card): survey changes

* docs(interruption card): doc changes

* docs(interruption card): update image urls to use revisioned assets

* docs(interruption card): update images and example

- update example images
- update example iframe height

* docs(interruption card): final changes

* docs(interruption card): pre release changes

* docs(interruption card): more final changes

* fix: (multi-select) add idPrefix option to allow multiple multi-selects on the same page (#930)

* Changing pagination results number (#956)

* docs(pagination): update results indexes on pagination example

The paginion component example shows as page 2, but also outputs
"showing results 10-20 of 30". This commit updates that to be results
11-20 as would actually be displayed.

* fix(pagination): fix aria label for pages to use total pages instead of total results

The `aria-label` for each page entry was of the form "page x of y" where y was the total number of
results, rather than the total number of pages. This PR fixes the error

---------

Co-authored-by: Chris Pymm <chris@chrispymm.co.uk>

* docs(interruption card): minor tweaks

* docs(interruption card): add examples and inline code styling

* docs(interruption card): 3rd team review changes

* feat(interruption card): changing wrapper width of interruption card

- Change content wrapper width from fluid to fixed for readability
- Update example iframe height

✅ Closes: 936

* docs(interruption card): adding anchor

* docs(interruption card): adding another anchor

* docs(interruption card): anchors

* docs(interruption card): survey changes

* docs(interruption card): doc changes

* docs(interruption card): update image urls to use revisioned assets

* docs(interruption card): update images and example

- update example images
- update example iframe height

* docs(interruption card): final changes

* docs(interruption card): pre release changes

* docs(interruption card): more final changes

* fix: (multi-select) add idPrefix option to allow multiple multi-selects on the same page (#930)

* Changing pagination results number (#956)

* docs(pagination): update results indexes on pagination example

The paginion component example shows as page 2, but also outputs
"showing results 10-20 of 30". This commit updates that to be results
11-20 as would actually be displayed.

* fix(pagination): fix aria label for pages to use total pages instead of total results

The `aria-label` for each page entry was of the form "page x of y" where y was the total number of
results, rather than the total number of pages. This PR fixes the error

---------

Co-authored-by: Chris Pymm <chris@chrispymm.co.uk>

* docs(interruption card): minor tweaks

* style(interruption card): format nunjucks template

* docs(interruption card)

- Figma link added
- "What's new" content added

---------

Co-authored-by: Murray Lippiatt <murray.lippiatt1@digital.justice.gov.uk>
Co-authored-by: helennickols <helen.nickols@digital.justice.gov.uk>
Co-authored-by: Stephen Dicks <github@starswan.com>
Co-authored-by: Rob McCarthy <56701345+robertjmccarthy@users.noreply.github.com>
chrispymm added a commit that referenced this pull request Dec 10, 2024
* feat(interruption card): add interruption card component

add in the macro template and styles for the interruption card component.  Based on the component in
use in HMPPS seen here:
https://github.com/ministryofjustice/hmpps-book-a-prison-visit-ui/pull/156/files with changes made
according to decisions based upon research and discovery.

* feat(interruption card): adjust padding and add border for high contrast mode

* feat(interruption card): add documentation page

Adding documentation page and nav link for interruption card.

* feat(interruption card): adding example images

* feat(interruption card): allow primary action to also be a link

* feat(interruption card): add interruption card component

add in the macro template and styles for the interruption card component.  Based on the component in
use in HMPPS seen here:
https://github.com/ministryofjustice/hmpps-book-a-prison-visit-ui/pull/156/files with changes made
according to decisions based upon research and discovery.

* feat(interruption card): adjust padding and add border for high contrast mode

* feat(interruption card): add documentation page

Adding documentation page and nav link for interruption card.

* feat(interruption card): adding example images

* feat(interruption card): allow primary action to also be a link

* docs(interruption card): bump assets version

* docs(interruption card): add content first version

* docs(interruption card): content tweaks

* docs(interruption card): more content tweaks

* docs(interruption card): 2i changes

* docs(interruption card): team review changes

* docs(interruption card): 2nd team review changes

* docs(interruption card): more team review changes

* docs(interruption card): some more team review changes

* docs: ✏️ adding contributor and 'based on' info

* docs(interruption card): add examples and inline code styling

* docs(interruption card): 3rd team review changes

* feat(interruption card): changing wrapper width of interruption card

- Change content wrapper width from fluid to fixed for readability
- Update example iframe height

✅ Closes: 936

* docs(interruption card): adding anchor

* docs(interruption card): adding another anchor

* docs(interruption card): anchors

* docs(interruption card): add examples and inline code styling

* docs(interruption card): 3rd team review changes

* feat(interruption card): changing wrapper width of interruption card

- Change content wrapper width from fluid to fixed for readability
- Update example iframe height

✅ Closes: 936

* docs(interruption card): adding anchor

* docs(interruption card): adding another anchor

* docs(interruption card): anchors

* docs(interruption card): survey changes

* docs(interruption card): doc changes

* docs(interruption card): add examples and inline code styling

* docs(interruption card): 3rd team review changes

* feat(interruption card): changing wrapper width of interruption card

- Change content wrapper width from fluid to fixed for readability
- Update example iframe height

✅ Closes: 936

* docs(interruption card): adding anchor

* docs(interruption card): adding another anchor

* docs(interruption card): anchors

* docs(interruption card): survey changes

* docs(interruption card): doc changes

* docs(interruption card): update image urls to use revisioned assets

* docs(interruption card): update images and example

- update example images
- update example iframe height

* docs(interruption card): final changes

* docs(interruption card): pre release changes

* docs(interruption card): more final changes

* fix: (multi-select) add idPrefix option to allow multiple multi-selects on the same page (#930)

* Changing pagination results number (#956)

* docs(pagination): update results indexes on pagination example

The paginion component example shows as page 2, but also outputs
"showing results 10-20 of 30". This commit updates that to be results
11-20 as would actually be displayed.

* fix(pagination): fix aria label for pages to use total pages instead of total results

The `aria-label` for each page entry was of the form "page x of y" where y was the total number of
results, rather than the total number of pages. This PR fixes the error

---------

Co-authored-by: Chris Pymm <chris@chrispymm.co.uk>

* docs(interruption card): minor tweaks

* docs(interruption card): add examples and inline code styling

* docs(interruption card): 3rd team review changes

* feat(interruption card): changing wrapper width of interruption card

- Change content wrapper width from fluid to fixed for readability
- Update example iframe height

✅ Closes: 936

* docs(interruption card): adding anchor

* docs(interruption card): adding another anchor

* docs(interruption card): anchors

* docs(interruption card): survey changes

* docs(interruption card): doc changes

* docs(interruption card): update image urls to use revisioned assets

* docs(interruption card): update images and example

- update example images
- update example iframe height

* docs(interruption card): final changes

* docs(interruption card): pre release changes

* docs(interruption card): more final changes

* fix: (multi-select) add idPrefix option to allow multiple multi-selects on the same page (#930)

* Changing pagination results number (#956)

* docs(pagination): update results indexes on pagination example

The paginion component example shows as page 2, but also outputs
"showing results 10-20 of 30". This commit updates that to be results
11-20 as would actually be displayed.

* fix(pagination): fix aria label for pages to use total pages instead of total results

The `aria-label` for each page entry was of the form "page x of y" where y was the total number of
results, rather than the total number of pages. This PR fixes the error

---------

Co-authored-by: Chris Pymm <chris@chrispymm.co.uk>

* docs(interruption card): minor tweaks

* style(interruption card): format nunjucks template

* docs(interruption card)

- Figma link added
- "What's new" content added

---------

Co-authored-by: Murray Lippiatt <murray.lippiatt1@digital.justice.gov.uk>
Co-authored-by: helennickols <helen.nickols@digital.justice.gov.uk>
Co-authored-by: Stephen Dicks <github@starswan.com>
Co-authored-by: Rob McCarthy <56701345+robertjmccarthy@users.noreply.github.com>
gregtyler pushed a commit that referenced this pull request Dec 10, 2024
# [3.2.0](v3.1.0...v3.2.0) (2024-12-10)

### Features

* Add interruption card ([#988](#988)) ([506bf09](506bf09)), closes [#930](#930) [#956](#956)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug A task that fixes something that isn't working
Projects
Development

Successfully merging this pull request may close these issues.

3 participants