Skip to content

Commit f8f9876

Browse files
paulmsmithpaulmsmith
committed
updates progress report
1 parent db7c087 commit f8f9876

File tree

4 files changed

+127
-49
lines changed

4 files changed

+127
-49
lines changed

‎application/static/stylesheets/application.css

+58
Original file line numberDiff line numberDiff line change
@@ -8349,6 +8349,64 @@ p + .govuk-heading-s,
83498349
font-size: 14pt;
83508350
line-height: 1.15; } }
83518351

8352+
.app-stats {
8353+
display: flex;
8354+
justify-content: flex-start;
8355+
gap: 5px;
8356+
flex-wrap: wrap; }
8357+
.app-stats:not(:last-of-type) {
8358+
margin-bottom: 30px; }
8359+
@media (min-width: 40.0625em) {
8360+
.app-stats:not(:last-of-type) {
8361+
margin-bottom: 50px; } }
8362+
.app-stats * {
8363+
box-sizing: border-box; }
8364+
.app-stats__card {
8365+
background: #1d70b8;
8366+
padding: 1em;
8367+
color: white;
8368+
margin: 0;
8369+
font-family: "GDS Transport", arial, sans-serif;
8370+
-webkit-font-smoothing: antialiased;
8371+
-moz-osx-font-smoothing: grayscale;
8372+
font-weight: 400;
8373+
font-size: 16px;
8374+
font-size: 1rem;
8375+
line-height: 1.25;
8376+
flex-grow: 1; }
8377+
@media print {
8378+
.app-stats__card {
8379+
font-family: sans-serif; } }
8380+
@media (min-width: 40.0625em) {
8381+
.app-stats__card {
8382+
font-size: 19px;
8383+
font-size: 1.1875rem;
8384+
line-height: 1.31579; } }
8385+
@media print {
8386+
.app-stats__card {
8387+
font-size: 14pt;
8388+
line-height: 1.15; } }
8389+
.app-stats__key {
8390+
font-family: "GDS Transport", arial, sans-serif;
8391+
-webkit-font-smoothing: antialiased;
8392+
-moz-osx-font-smoothing: grayscale;
8393+
font-weight: 700;
8394+
font-size: 24px;
8395+
font-size: 1.5rem;
8396+
line-height: 1.04167; }
8397+
@media print {
8398+
.app-stats__key {
8399+
font-family: sans-serif; } }
8400+
@media (min-width: 40.0625em) {
8401+
.app-stats__key {
8402+
font-size: 36px;
8403+
font-size: 2.25rem;
8404+
line-height: 1.11111; } }
8405+
@media print {
8406+
.app-stats__key {
8407+
font-size: 24pt;
8408+
line-height: 1.05; } }
8409+
83528410
.app-icon {
83538411
font-style: normal; }
83548412
.govuk-button .app-icon {

‎application/templates/progress.html

+45-49
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,53 @@
11
{% extends 'layouts/base.html' %}
22

3-
43
{% block beforeContent %}
54
<a href="{{ url_for('main.index') }}" class="govuk-back-link">Back</a>
65
{% endblock beforeContent %}
76

8-
{% block content %}
9-
<div class='govuk-grid-row'>
10-
<div class='govuk-grid-column-two-thirds'>
7+
{% block content_primary %}
8+
119
<h1 class="govuk-heading-l">Statistics</h1>
1210

13-
<h2 class="govuk-heading-m">Completeness</h2>
14-
15-
<ul class="govuk-list">
16-
<li class="dl-data-item">
17-
<div class="dl-data-item__number">{{ data.total }}</div>
18-
<div class="dl-data-item__label">Total planning considerations</div>
19-
</li>
20-
<li class="dl-data-item dl-data-item--inline">
21-
<span class="dl-data-item__number">{{ data.with.legislation }}</span>
22-
<span class="dl-data-item__label">with legislation</span>
23-
</li>
24-
<li class="dl-data-item dl-data-item--inline">
25-
<span class="dl-data-item__number">{{ data.with.specification }}</span>
26-
<span class="dl-data-item__label">with a specification</span>
27-
</li>
28-
<li class="dl-data-item dl-data-item--inline">
29-
<span class="dl-data-item__number">{{ data.with.schemas }}</span>
30-
<span class="dl-data-item__label">with associated schemas</span>
31-
</li>
32-
<li class="dl-data-item dl-data-item--inline">
33-
<span class="dl-data-item__number">{{ data.with.github_discussion }}</span>
34-
<span class="dl-data-item__label">with an active github discussion</span>
35-
</li>
36-
<li class="dl-data-item dl-data-item--inline">
37-
<span class="dl-data-item__number">{{ data.with.useful_links }}</span>
38-
<span class="dl-data-item__label">with useful links</span>
39-
</li>
40-
</ul>
41-
42-
<h2 class="govuk-heading-m">Progress</h2>
43-
44-
<ul class="govuk-list">
45-
<li class="dl-data-item">
46-
<div class="dl-data-item__number">{{ data.edits.total }}</div>
47-
<div class="dl-data-item__label">Total updates to planning considerations</div>
48-
</li>
49-
<li class="dl-data-item dl-data-item--inline">
50-
<span class="dl-data-item__number">{{ data.edits.recent }}</span>
51-
<span class="dl-data-item__label">since {{ since.strftime('%Y-%m-%d') }}</span>
52-
</li>
53-
</ul>
54-
</div>
55-
</div>
56-
57-
{% endblock content %}
11+
<h2 class="govuk-heading-m">Completeness 📊</h2>
12+
13+
<div class="app-stats">
14+
<div class="app-stats__card">
15+
<div class="app-stats__key">{{ data.total }}</div>
16+
<div class="app-stats__value">Total planning considerations</div>
17+
</div>
18+
<div class="app-stats__card">
19+
<div class="app-stats__key">{{ data.with.legislation }}</div>
20+
<div class="app-stats__value">with legislation</div>
21+
</div>
22+
<div class="app-stats__card">
23+
<div class="app-stats__key">{{ data.with.specification }}</div>
24+
<div class="app-stats__value">with a specification</div>
25+
</div>
26+
<div class="app-stats__card">
27+
<div class="app-stats__key">{{ data.with.schemas }}</div>
28+
<div class="app-stats__value">with associated schemas</div>
29+
</div>
30+
<div class="app-stats__card">
31+
<div class="app-stats__key">{{ data.with.github_discussion }}</div>
32+
<div class="app-stats__value">with an active github discussion</div>
33+
</div>
34+
<div class="app-stats__card">
35+
<div class="app-stats__key">{{ data.with.useful_links }}</div>
36+
<div class="app-stats__value">with useful links</div>
37+
</div>
38+
</div>
39+
40+
<h2 class="govuk-heading-m">Progress 📈</h2>
41+
42+
<div class="app-stats">
43+
<div class="app-stats__card">
44+
<div class="app-stats__key">{{ data.edits.total }}</div>
45+
<div class="app-stats__value">Total updates to planning considerations</div>
46+
</div>
47+
<div class="app-stats__card">
48+
<div class="app-stats__key">{{ data.edits.recent }}</div>
49+
<div class="app-stats__value">since {{ since.strftime('%Y-%m-%d') }}</div>
50+
</div>
51+
</div>
52+
53+
{% endblock content_primary %}

‎src/scss/application.scss

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ $govuk-new-link-styles: true;
1515
@import "components/question-set";
1616
@import "components/report-bar";
1717
@import "components/subnavigation";
18+
@import "components/stats";
1819

1920

2021
// used in buttons like "add new planning consideration"

‎src/scss/components/_stats.scss

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
.app-stats {
2+
display: flex;
3+
justify-content: flex-start;
4+
gap: 5px;
5+
&:not(:last-of-type) {
6+
@include govuk-responsive-margin(8, "bottom");
7+
}
8+
flex-wrap: wrap;
9+
* {
10+
box-sizing: border-box;;
11+
}
12+
&__card {
13+
background: $govuk-brand-colour;
14+
padding: 1em;
15+
color: white;
16+
margin: 0;
17+
@include govuk-font(19);
18+
flex-grow: 1;
19+
}
20+
&__key {
21+
@include govuk-font(36, 'bold');
22+
}
23+
}

0 commit comments

Comments
 (0)