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.

Sign up for GitHub

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

Jump to bottom

HWPV-186: Updating dashboard page #637

Merged
merged 8 commits into from
Jun 11, 2024
Merged

HWPV-186: Updating dashboard page #637

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
80d4854
HWPV-186: Updating dashboard page
ashleygyngell May 2, 2024
eec2604
HWPV-186: Moving back link to beforeContent block
ashleygyngell May 2, 2024
34c4ac3
HWPV-186: Slight tweak to layout
ashleygyngell May 3, 2024
d584076
HWPV-186: shortening 'download' nav option text
ashleygyngell May 16, 2024
48a3b70
Merge branch 'main' of ssh://github.com/ministryofjustice/help-with-p…
ashleygyngell Jun 11, 2024
6e79e73
HWPV-186: Include ticketPanel macros on dashboard
ashleygyngell Jun 11, 2024
837ab9e
adding whitepace for nunjucks file
ashleygyngell Jun 11, 2024
76f0242
Remove backlink import
ashleygyngell Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
HWPV-186: Include ticketPanel macros on dashboard
  • Loading branch information
@ashleygyngell
ashleygyngell committed Jun 11, 2024
commit 6e79e73731101db12c3c2c004c412d4bd4889ae6
106 changes: 68 additions & 38 deletions app/views/dashboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{% extends "includes/layout_new.html" %}
{% from "govuk/components/back-link/macro.njk" import govukBackLink %}
{%- from "moj/components/ticket-panel/macro.njk" import mojTicketPanel -%}
{% from "govuk/components/select/macro.njk" import govukSelect %}

{% block pageTitle %}
Expand Down Expand Up @@ -58,50 +59,79 @@
</form>

<div class="grid-row">
<article class="moj-ticket-panel" aria-label="Sub navigation 1">
<div class="column-one-third">
<section class="moj-ticket-panel__content moj-ticket-panel__content--blue" aria-label="Section 1">
<h2 class="govuk-heading-l govuk-!-margin-bottom-2">{{ pendingCount }}</h2>
<p class="govuk-body">Pending</p>
</section>
</div>
{{ mojTicketPanel({
attributes: {
'aria-label': 'Pending'
},
classes: 'column-one-third',
items: [{
html: '<h2 class="govuk-heading-l govuk-!-margin-bottom-2">' + pendingCount + '</h2>
<p class="govuk-body">Pending</p>',
classes: 'moj-ticket-panel__content--blue'
}]
}) }}

<div class="column-one-third">
<section class="moj-ticket-panel__content moj-ticket-panel__content--blue" aria-label="Section 1">
<h2 class="govuk-heading-l govuk-!-margin-bottom-2">{{ inProgressCount }}</h2>
<p class="govuk-body">In Progress</p>
</section>
</div>
{{ mojTicketPanel({
attributes: {
'aria-label': 'In Progress'
},
classes: 'column-one-third',
items: [{
html: '<h2 class="govuk-heading-l govuk-!-margin-bottom-2">' + inProgressCount + '</h2>
<p class="govuk-body">In Progress</p>',
classes: 'moj-ticket-panel__content--blue'
}]
}) }}

<div class="column-one-third">
<section class="moj-ticket-panel__content moj-ticket-panel__content--blue" aria-label="Section 1">
<h2 class="govuk-heading-l govuk-!-margin-bottom-2">{{ paidCount }}</h2>
<p class="govuk-body">Paid</p>
</section>
</div>
{{ mojTicketPanel({
attributes: {
'aria-label': 'Paid Count'
},
classes: 'column-one-third',
items: [{
html: '<h2 class="govuk-heading-l govuk-!-margin-bottom-2">' + paidCount + '</h2>
<p class="govuk-body">Paid</p>',
classes: 'moj-ticket-panel__content--blue'
}]
}) }}

<div class="column-one-third">
<section class="moj-ticket-panel__content moj-ticket-panel__content--blue" aria-label="Section 1">
<h2 class="govuk-heading-l govuk-!-margin-bottom-2">{{ autoApprovedCount }}</h2>
<p class="govuk-body">Auto approved</p>
</section>
</div>
{{ mojTicketPanel({
attributes: {
'aria-label': 'Auto Approved'
},
classes: 'column-one-third',
items: [{
html: '<h2 class="govuk-heading-l govuk-!-margin-bottom-2">' + autoApprovedCount + '</h2>
<p class="govuk-body">Auto Approved</p>',
classes: 'moj-ticket-panel__content--blue'
}]
}) }}

<div class="column-one-third">
<section class="moj-ticket-panel__content moj-ticket-panel__content--blue" aria-label="Section 1">
<h2 class="govuk-heading-l govuk-!-margin-bottom-2">{{ manuallyApprovedCount }}</h2>
<p class="govuk-body">Manually Approved</p>
</section>
</div>
{{ mojTicketPanel({
attributes: {
'aria-label': 'Manually Approved'
},
classes: 'column-one-third',
items: [{
html: '<h2 class="govuk-heading-l govuk-!-margin-bottom-2">' + manuallyApprovedCount + '</h2>
<p class="govuk-body">Manually Approved</p>',
classes: 'moj-ticket-panel__content--blue'
}]
}) }}

<div class="column-one-third">
<section class="moj-ticket-panel__content moj-ticket-panel__content--blue" aria-label="Section 1">
<h2 class="govuk-heading-l govuk-!-margin-bottom-2">{{ rejectedCount }}</h2>
<p class="govuk-body">Rejected</p>
</section>
</div>
</article>
{{ mojTicketPanel({
attributes: {
'aria-label': 'Rejected'
},
classes: 'column-one-third',
items: [{
html: '<h2 class="govuk-heading-l govuk-!-margin-bottom-2">' + rejectedCount + '</h2>
<p class="govuk-body">Rejected</p>',
classes: 'moj-ticket-panel__content--blue'
}]
}) }}
</div>

{% endblock %}

{% block bodyEnd %}
Expand Down