@ministryofjustice/hmpps-digital-prison-reporting-frontend 4.28.7 → 4.29.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (194) hide show
  1. package/dpr/all.js +6 -8
  2. package/dpr/all.js.map +3 -3
  3. package/dpr/all.scss +296 -414
  4. package/dpr/all.ts +6 -11
  5. package/dpr/components/_catalogue/catalogue-list/utils.test.ts +1 -1
  6. package/dpr/components/_charts/chart/clientClass.js +1 -0
  7. package/dpr/components/_charts/chart/clientClass.js.map +2 -2
  8. package/dpr/components/_charts/chart/clientClass.ts +1 -0
  9. package/dpr/components/_reports/{report-actions → report-heading/report-actions}/actionsTemplate.js.map +1 -1
  10. package/dpr/components/_reports/{report-actions → report-heading/report-actions}/clientClass.js +1 -1
  11. package/dpr/components/_reports/report-heading/report-actions/clientClass.js.map +7 -0
  12. package/dpr/components/_reports/{report-actions → report-heading/report-actions}/clientClass.ts +1 -1
  13. package/dpr/components/_reports/report-heading/report-actions/types.d.js.map +7 -0
  14. package/dpr/components/_reports/{report-actions → report-heading/report-actions}/types.d.ts +1 -1
  15. package/dpr/components/_reports/{report-actions → report-heading/report-actions}/utils.js.map +1 -1
  16. package/dpr/components/_reports/{report-actions → report-heading/report-actions}/utils.test.ts +2 -2
  17. package/dpr/components/_reports/{report-columns-form → report-heading/report-columns/report-columns-form}/clientClass.js +1 -3
  18. package/dpr/components/_reports/report-heading/report-columns/report-columns-form/clientClass.js.map +7 -0
  19. package/dpr/components/_reports/{report-columns-form → report-heading/report-columns/report-columns-form}/clientClass.ts +1 -3
  20. package/dpr/components/_reports/{report-columns-form → report-heading/report-columns/report-columns-form}/types.d.js.map +1 -1
  21. package/dpr/components/_reports/{report-columns-form → report-heading/report-columns/report-columns-form}/utils.js +1 -1
  22. package/dpr/components/_reports/report-heading/report-columns/report-columns-form/utils.js.map +7 -0
  23. package/dpr/components/_reports/{report-columns-form → report-heading/report-columns/report-columns-form}/utils.ts +2 -2
  24. package/dpr/components/_reports/{report-columns → report-heading/report-columns}/view.njk +1 -1
  25. package/dpr/components/_reports/{report-download-message → report-heading/report-download-message}/clientClass.js +1 -1
  26. package/dpr/components/_reports/report-heading/report-download-message/clientClass.js.map +7 -0
  27. package/dpr/components/_reports/{report-download-message → report-heading/report-download-message}/clientClass.ts +1 -1
  28. package/dpr/components/_reports/{report-filters → report-heading/report-filters}/view.njk +1 -1
  29. package/dpr/components/_reports/report-heading/view.njk +4 -4
  30. package/dpr/components/_reports/report-page/report-print-message/view.njk +10 -0
  31. package/dpr/components/_reports/report-page/report-template/report-no-data-message/styles.scss +8 -0
  32. package/dpr/components/_reports/report-page/report-template/report-no-data-message/view.njk +11 -0
  33. package/dpr/components/_reports/{report-pagination → report-page/report-template/report-pagination}/clientClass.js +1 -1
  34. package/dpr/components/_reports/report-page/report-template/report-pagination/clientClass.js.map +7 -0
  35. package/dpr/components/_reports/{report-pagination → report-page/report-template/report-pagination}/clientClass.ts +1 -1
  36. package/dpr/components/_reports/{report-pagination → report-page/report-template/report-pagination}/types.d.js.map +1 -1
  37. package/dpr/components/_reports/{report-pagination → report-page/report-template/report-pagination}/utils.js.map +1 -1
  38. package/dpr/components/_reports/report-page/report-template/report-section/parent-child-template/styles.scss +88 -0
  39. package/dpr/components/_reports/report-page/report-template/report-section/parent-child-template/view.njk +29 -0
  40. package/dpr/components/_reports/{report-data-table → report-page/report-template/report-section/report-data-table}/clientClass.js +17 -10
  41. package/dpr/components/_reports/report-page/report-template/report-section/report-data-table/clientClass.js.map +7 -0
  42. package/dpr/components/_reports/{report-data-table → report-page/report-template/report-section/report-data-table}/clientClass.ts +20 -10
  43. package/dpr/components/_reports/{report-data-table → report-page/report-template/report-section/report-data-table}/style.scss +35 -185
  44. package/dpr/components/_reports/report-page/report-template/report-section/report-data-table/types.d.js.map +7 -0
  45. package/dpr/components/_reports/{report-data-table → report-page/report-template/report-section/report-data-table}/types.d.ts +2 -2
  46. package/dpr/components/_reports/report-page/report-template/report-section/report-data-table/view.njk +27 -0
  47. package/dpr/components/_reports/report-page/report-template/report-section/styles.scss +33 -0
  48. package/dpr/components/_reports/report-page/report-template/report-section/view.njk +58 -0
  49. package/dpr/components/_reports/{report-summary-table → report-page/report-template/report-summary-table}/styles.scss +21 -4
  50. package/dpr/components/_reports/{report-totals → report-page/report-template/report-totals}/utils.js.map +1 -1
  51. package/dpr/components/_reports/report-page/report-template/styles.scss +5 -0
  52. package/dpr/components/_reports/report-page/report-template/template-config.js +66 -0
  53. package/dpr/components/_reports/report-page/report-template/template-config.js.map +7 -0
  54. package/dpr/components/_reports/report-page/report-template/template-config.ts +45 -0
  55. package/dpr/components/_reports/report-page/report-template/utils.js +82 -0
  56. package/dpr/components/_reports/report-page/report-template/utils.js.map +7 -0
  57. package/dpr/components/_reports/report-page/report-template/utils.ts +100 -0
  58. package/dpr/components/_reports/report-page/report-template/view.njk +61 -0
  59. package/dpr/components/_reports/{report-wrapper → report-page}/styles.scss +7 -5
  60. package/dpr/components/_reports/report-page/view.njk +26 -0
  61. package/dpr/components/card-group/view.njk +0 -4
  62. package/dpr/components/report-list/utils.js +11 -3
  63. package/dpr/components/report-list/utils.js.map +2 -2
  64. package/dpr/components/report-list/utils.ts +11 -1
  65. package/dpr/components/report-list/view.njk +2 -2
  66. package/dpr/components/show-more/style.scss +3 -4
  67. package/dpr/data/reportingClient.js.map +2 -2
  68. package/dpr/data/reportingClient.ts +4 -4
  69. package/dpr/routes/journeys/view-report/async/dashboard/utils.js +1 -1
  70. package/dpr/routes/journeys/view-report/async/dashboard/utils.js.map +1 -1
  71. package/dpr/routes/journeys/view-report/async/dashboard/utils.ts +1 -1
  72. package/dpr/routes/journeys/view-report/async/report/controller.js.map +2 -2
  73. package/dpr/routes/journeys/view-report/async/report/controller.ts +0 -1
  74. package/dpr/routes/journeys/view-report/async/report/report-variants.cy.js +207 -56
  75. package/dpr/routes/journeys/view-report/async/report/report-variants.cy.js.map +2 -2
  76. package/dpr/routes/journeys/view-report/async/report/report-variants.cy.ts +333 -64
  77. package/dpr/routes/journeys/view-report/async/report/utils.js +9 -17
  78. package/dpr/routes/journeys/view-report/async/report/utils.js.map +3 -3
  79. package/dpr/routes/journeys/view-report/async/report/utils.ts +12 -22
  80. package/dpr/routes/journeys/view-report/report.njk +2 -2
  81. package/dpr/routes/journeys/view-report/sync/dashboard/utils.js +2 -2
  82. package/dpr/routes/journeys/view-report/sync/dashboard/utils.js.map +1 -1
  83. package/dpr/routes/journeys/view-report/sync/dashboard/utils.ts +2 -2
  84. package/dpr/routes/journeys/view-report/sync/report/utils.js +38 -11
  85. package/dpr/routes/journeys/view-report/sync/report/utils.js.map +3 -3
  86. package/dpr/routes/journeys/view-report/sync/report/utils.ts +39 -14
  87. package/dpr/routes/journeys/view-report/utils.js +1 -1
  88. package/dpr/routes/journeys/view-report/utils.js.map +1 -1
  89. package/dpr/routes/journeys/view-report/utils.ts +1 -1
  90. package/dpr/services/reportingService.js.map +2 -2
  91. package/dpr/services/reportingService.ts +2 -2
  92. package/dpr/types/ReportQuery.js +1 -1
  93. package/dpr/types/ReportQuery.js.map +1 -1
  94. package/dpr/types/ReportQuery.ts +1 -1
  95. package/dpr/types/UserReports.js.map +1 -1
  96. package/dpr/types/UserReports.ts +3 -3
  97. package/dpr/utils/TemplateBuilder/ParentChildDataBuilder/ParentChildDataBuilder.js +193 -0
  98. package/dpr/utils/TemplateBuilder/ParentChildDataBuilder/ParentChildDataBuilder.js.map +7 -0
  99. package/dpr/utils/TemplateBuilder/ParentChildDataBuilder/ParentChildDataBuilder.ts +203 -0
  100. package/dpr/utils/TemplateBuilder/ParentChildDataBuilder/types.d.js.map +7 -0
  101. package/dpr/utils/TemplateBuilder/ParentChildDataBuilder/types.d.ts +36 -0
  102. package/dpr/utils/TemplateBuilder/ReportBuilder/ReportBuilder.js +114 -0
  103. package/dpr/utils/TemplateBuilder/ReportBuilder/ReportBuilder.js.map +7 -0
  104. package/dpr/utils/TemplateBuilder/ReportBuilder/ReportBuilder.ts +117 -0
  105. package/dpr/utils/TemplateBuilder/ReportBuilder/types.d.js.map +7 -0
  106. package/dpr/utils/TemplateBuilder/ReportBuilder/types.d.ts +6 -0
  107. package/dpr/utils/TemplateBuilder/SectionedDataHelper/SectionedDataHelper.js +202 -0
  108. package/dpr/utils/TemplateBuilder/SectionedDataHelper/SectionedDataHelper.js.map +7 -0
  109. package/dpr/utils/TemplateBuilder/SectionedDataHelper/SectionedDataHelper.ts +246 -0
  110. package/dpr/utils/TemplateBuilder/SectionedDataHelper/types.js +17 -0
  111. package/dpr/utils/TemplateBuilder/SectionedDataHelper/types.js.map +7 -0
  112. package/dpr/utils/TemplateBuilder/SectionedDataHelper/types.ts +41 -0
  113. package/dpr/utils/{CollatedSummaryBuilder/CollatedSummaryBuilder.js → TemplateBuilder/SummaryDataHelper/SummaryDataHelper.js} +6 -8
  114. package/dpr/utils/TemplateBuilder/SummaryDataHelper/SummaryDataHelper.js.map +7 -0
  115. package/dpr/utils/{CollatedSummaryBuilder/CollatedSummaryBuilder.test.ts → TemplateBuilder/SummaryDataHelper/SummaryDataHelper.test.ts} +4 -4
  116. package/dpr/utils/{CollatedSummaryBuilder/CollatedSummaryBuilder.ts → TemplateBuilder/SummaryDataHelper/SummaryDataHelper.ts} +6 -9
  117. package/dpr/utils/TemplateBuilder/TemplateBuilder.js +74 -0
  118. package/dpr/utils/TemplateBuilder/TemplateBuilder.js.map +7 -0
  119. package/dpr/utils/TemplateBuilder/TemplateBuilder.ts +68 -0
  120. package/dpr/utils/definitionUtils.js +22 -2
  121. package/dpr/utils/definitionUtils.js.map +2 -2
  122. package/dpr/utils/definitionUtils.ts +26 -1
  123. package/package.json +1 -1
  124. package/dpr/DprLoadingHelper.js +0 -51
  125. package/dpr/DprLoadingHelper.js.map +0 -7
  126. package/dpr/DprLoadingHelper.ts +0 -27
  127. package/dpr/components/_reports/report/view.njk +0 -40
  128. package/dpr/components/_reports/report-actions/clientClass.js.map +0 -7
  129. package/dpr/components/_reports/report-actions/types.d.js.map +0 -7
  130. package/dpr/components/_reports/report-columns-form/clientClass.js.map +0 -7
  131. package/dpr/components/_reports/report-columns-form/utils.js.map +0 -7
  132. package/dpr/components/_reports/report-data-table/clientClass.js.map +0 -7
  133. package/dpr/components/_reports/report-data-table/types.d.js.map +0 -7
  134. package/dpr/components/_reports/report-data-table/utils.js +0 -123
  135. package/dpr/components/_reports/report-data-table/utils.js.map +0 -7
  136. package/dpr/components/_reports/report-data-table/utils.test.ts +0 -604
  137. package/dpr/components/_reports/report-data-table/utils.ts +0 -150
  138. package/dpr/components/_reports/report-data-table/view.njk +0 -24
  139. package/dpr/components/_reports/report-data-table-wrapper/view.njk +0 -27
  140. package/dpr/components/_reports/report-download-message/clientClass.js.map +0 -7
  141. package/dpr/components/_reports/report-no-data-message/styles.scss +0 -4
  142. package/dpr/components/_reports/report-no-data-message/view.njk +0 -13
  143. package/dpr/components/_reports/report-pagination/clientClass.js.map +0 -7
  144. package/dpr/components/_reports/report-print-message/view.njk +0 -8
  145. package/dpr/components/_reports/report-template/view.njk +0 -44
  146. package/dpr/components/_reports/report-wrapper/view.njk +0 -19
  147. package/dpr/components/loading-anim/styles.scss +0 -117
  148. package/dpr/components/loading-anim/view.njk +0 -18
  149. package/dpr/utils/CollatedSummaryBuilder/CollatedSummaryBuilder.js.map +0 -7
  150. package/dpr/utils/ParentChildDataTableBuilder/ParentChildDataTableBuilder.js +0 -202
  151. package/dpr/utils/ParentChildDataTableBuilder/ParentChildDataTableBuilder.js.map +0 -7
  152. package/dpr/utils/ParentChildDataTableBuilder/ParentChildDataTableBuilder.test.ts +0 -503
  153. package/dpr/utils/ParentChildDataTableBuilder/ParentChildDataTableBuilder.ts +0 -224
  154. package/dpr/utils/ParentChildDataTableBuilder/types.d.js.map +0 -7
  155. package/dpr/utils/ParentChildDataTableBuilder/types.d.ts +0 -11
  156. package/dpr/utils/SectionedDataTableBuilder/SectionedDataTableBuilder.js +0 -311
  157. package/dpr/utils/SectionedDataTableBuilder/SectionedDataTableBuilder.js.map +0 -7
  158. package/dpr/utils/SectionedDataTableBuilder/SectionedDataTableBuilder.test.ts +0 -492
  159. package/dpr/utils/SectionedDataTableBuilder/SectionedDataTableBuilder.ts +0 -342
  160. package/dpr/utils/SectionedDataTableBuilder/types.d.js.map +0 -7
  161. package/dpr/utils/SectionedDataTableBuilder/types.d.ts +0 -5
  162. package/dpr/utils/SectionedFieldsTableBuilder/SectionedFieldsTableBuilder.js +0 -146
  163. package/dpr/utils/SectionedFieldsTableBuilder/SectionedFieldsTableBuilder.js.map +0 -7
  164. package/dpr/utils/SectionedFieldsTableBuilder/SectionedFieldsTableBuilder.test.ts +0 -140
  165. package/dpr/utils/SectionedFieldsTableBuilder/SectionedFieldsTableBuilder.ts +0 -150
  166. /package/dpr/components/_reports/{report-actions → report-heading/report-actions}/actionsTemplate.js +0 -0
  167. /package/dpr/components/_reports/{report-actions → report-heading/report-actions}/actionsTemplate.ts +0 -0
  168. /package/dpr/components/_reports/{report-actions → report-heading/report-actions}/style.scss +0 -0
  169. /package/dpr/components/_reports/{report-actions → report-heading/report-actions}/types.d.js +0 -0
  170. /package/dpr/components/_reports/{report-actions → report-heading/report-actions}/utils.js +0 -0
  171. /package/dpr/components/_reports/{report-actions → report-heading/report-actions}/utils.ts +0 -0
  172. /package/dpr/components/_reports/{report-actions → report-heading/report-actions}/view.njk +0 -0
  173. /package/dpr/components/_reports/{report-columns-form → report-heading/report-columns/report-columns-form}/style.scss +0 -0
  174. /package/dpr/components/_reports/{report-columns-form → report-heading/report-columns/report-columns-form}/types.d.js +0 -0
  175. /package/dpr/components/_reports/{report-columns-form → report-heading/report-columns/report-columns-form}/types.d.ts +0 -0
  176. /package/dpr/components/_reports/{report-columns-form → report-heading/report-columns/report-columns-form}/view.njk +0 -0
  177. /package/dpr/components/_reports/{report-columns → report-heading/report-columns}/styles.scss +0 -0
  178. /package/dpr/components/_reports/{report-download-message → report-heading/report-download-message}/style.scss +0 -0
  179. /package/dpr/components/_reports/{report-download-message → report-heading/report-download-message}/view.njk +0 -0
  180. /package/dpr/components/_reports/{report-pagination → report-page/report-template/report-pagination}/style.scss +0 -0
  181. /package/dpr/components/_reports/{report-data-table → report-page/report-template/report-pagination}/types.d.js +0 -0
  182. /package/dpr/components/_reports/{report-pagination → report-page/report-template/report-pagination}/types.d.ts +0 -0
  183. /package/dpr/components/_reports/{report-pagination → report-page/report-template/report-pagination}/utils.js +0 -0
  184. /package/dpr/components/_reports/{report-pagination → report-page/report-template/report-pagination}/utils.test.ts +0 -0
  185. /package/dpr/components/_reports/{report-pagination → report-page/report-template/report-pagination}/utils.ts +0 -0
  186. /package/dpr/components/_reports/{report-pagination → report-page/report-template/report-pagination}/view.njk +0 -0
  187. /package/dpr/components/_reports/{report-pagination → report-page/report-template/report-section/report-data-table}/types.d.js +0 -0
  188. /package/dpr/components/_reports/{report-summary-table → report-page/report-template/report-summary-table}/view.njk +0 -0
  189. /package/dpr/components/_reports/{report-totals → report-page/report-template/report-totals}/style.scss +0 -0
  190. /package/dpr/components/_reports/{report-totals → report-page/report-template/report-totals}/utils.js +0 -0
  191. /package/dpr/components/_reports/{report-totals → report-page/report-template/report-totals}/utils.ts +0 -0
  192. /package/dpr/components/_reports/{report-totals → report-page/report-template/report-totals}/view.njk +0 -0
  193. /package/dpr/utils/{ParentChildDataTableBuilder → TemplateBuilder/ParentChildDataBuilder}/types.d.js +0 -0
  194. /package/dpr/utils/{SectionedDataTableBuilder → TemplateBuilder/ReportBuilder}/types.d.js +0 -0
package/dpr/all.scss CHANGED
@@ -105,7 +105,7 @@ $moj-images-path: '/assets/images/';
105
105
  }
106
106
  .dpr-show-more {
107
107
  .dpr-show-hide-button {
108
- display: inline-block
108
+ display: inline-block;
109
109
  }
110
110
 
111
111
  .dpr-show-more-content {
@@ -127,7 +127,7 @@ ul.dpr-card-group__item__filters-list {
127
127
  margin-bottom: govuk-spacing(1);
128
128
  margin-right: govuk-spacing(1);
129
129
  }
130
-
130
+
131
131
  li.dpr-query-summary {
132
132
  background-color: govuk-colour('light-grey');
133
133
  }
@@ -137,10 +137,10 @@ ul.dpr-card-group__item__filters-list {
137
137
  }
138
138
 
139
139
  li:last-child {
140
- margin-bottom: govuk-spacing(0);
140
+ margin-bottom: govuk-spacing(0);
141
141
  }
142
142
  }
143
- .report-list-container {
143
+ .report-list-container {
144
144
  position: relative;
145
145
 
146
146
  .columns-header {
@@ -223,123 +223,6 @@ ul.dpr-card-group__item__filters-list {
223
223
  }
224
224
  }
225
225
  }
226
- .dpr-loading-panel {
227
- display: none;
228
- width: 100%;
229
- height: 100%;
230
- position: absolute;
231
- top: 0;
232
- left: 0;
233
- z-index: 2;
234
- justify-content: center;
235
- align-items: center;
236
- background-color: rgba(255, 255, 255, 0.8);
237
-
238
- &.show {
239
- display: flex;
240
- }
241
- }
242
-
243
- .dpr-loading-anim {
244
- display: none;
245
-
246
- &.show {
247
- display: inline-block;
248
- position: relative;
249
- width: 80px;
250
- height: 80px;
251
- }
252
-
253
- &.show div {
254
- position: absolute;
255
- width: 6px;
256
- height: 6px;
257
- background: govuk-colour("light-blue");
258
- border-radius: 50%;
259
- animation: dpr-loading-anim 1.2s linear infinite;
260
- }
261
-
262
- &.show div:nth-child(1) {
263
- animation-delay: 0s;
264
- top: 37px;
265
- left: 66px;
266
- }
267
-
268
- &.show div:nth-child(2) {
269
- animation-delay: -0.1s;
270
- top: 22px;
271
- left: 62px;
272
- }
273
-
274
- &.show div:nth-child(3) {
275
- animation-delay: -0.2s;
276
- top: 11px;
277
- left: 52px;
278
- }
279
-
280
- &.show div:nth-child(4) {
281
- animation-delay: -0.3s;
282
- top: 7px;
283
- left: 37px;
284
- }
285
-
286
- &.show div:nth-child(5) {
287
- animation-delay: -0.4s;
288
- top: 11px;
289
- left: 22px;
290
- }
291
-
292
- &.show div:nth-child(6) {
293
- animation-delay: -0.5s;
294
- top: 22px;
295
- left: 11px;
296
- }
297
-
298
- &.show div:nth-child(7) {
299
- animation-delay: -0.6s;
300
- top: 37px;
301
- left: 7px;
302
- }
303
-
304
- &.show div:nth-child(8) {
305
- animation-delay: -0.7s;
306
- top: 52px;
307
- left: 11px;
308
- }
309
-
310
- &.show div:nth-child(9) {
311
- animation-delay: -0.8s;
312
- top: 62px;
313
- left: 22px;
314
- }
315
-
316
- &.show div:nth-child(10) {
317
- animation-delay: -0.9s;
318
- top: 66px;
319
- left: 37px;
320
- }
321
-
322
- &.show div:nth-child(11) {
323
- animation-delay: -1s;
324
- top: 62px;
325
- left: 52px;
326
- }
327
-
328
- &.show div:nth-child(12) {
329
- animation-delay: -1.1s;
330
- top: 52px;
331
- left: 62px;
332
- }
333
- }
334
-
335
- @keyframes dpr-loading-anim {
336
- 0%, 20%, 80%, 100% {
337
- transform: scale(1);
338
- }
339
- 50% {
340
- transform: scale(1.5);
341
- }
342
- }
343
226
  // VARIANT 1 STYLES
344
227
  .dpr-card-group-v1 {
345
228
  .card {
@@ -660,10 +543,12 @@ ul.dpr-card-group__item__filters-list {
660
543
  line-height: 22px !important;
661
544
  }
662
545
  }
663
- .dpr-reports-heading-container {
664
- position: relative;
665
- margin-top: govuk-spacing(5);
666
- margin-bottom: govuk-spacing(5);
546
+ .dpr-report-page {
547
+ .dpr-report-page__heading-container {
548
+ position: relative;
549
+ margin-top: govuk-spacing(5);
550
+ margin-bottom: govuk-spacing(5);
551
+ }
667
552
  }
668
553
 
669
554
  .dpr-columns-section-wrapper {
@@ -677,7 +562,7 @@ ul.dpr-card-group__item__filters-list {
677
562
  display: none;
678
563
  }
679
564
 
680
- .dpr-reports-heading-container {
565
+ .dpr-report-page__heading-container {
681
566
  h1.govuk-heading-l {
682
567
  font-size: 20px;
683
568
  }
@@ -702,6 +587,11 @@ ul.dpr-card-group__item__filters-list {
702
587
  margin-top: -10px;
703
588
  }
704
589
  }
590
+ .dpr-report-template-container {
591
+ .dpr-report-template__page-totals--footer {
592
+ margin-bottom: govuk-spacing(6);
593
+ }
594
+ }
705
595
  .dpr-report-totals p {
706
596
  text-align: right;
707
597
  margin-bottom: govuk-spacing(2);
@@ -721,20 +611,22 @@ ul.dpr-card-group__item__filters-list {
721
611
  position: relative;
722
612
  row-gap: 15px;
723
613
  flex-flow: column wrap;
614
+ margin-top: govuk-spacing(6);
724
615
 
725
616
  .dpr-summary-container {
726
617
  min-width: 200px;
727
618
  width: fit-content;
728
619
 
729
620
  .govuk-table {
730
- border: solid 1px govuk-colour("mid-grey");
621
+ border: solid 1px govuk-colour('mid-grey');
731
622
  margin-bottom: 0;
732
623
 
733
- th, td {
624
+ th,
625
+ td {
734
626
  padding: 10px;
735
627
  }
736
628
  th {
737
- background-color: govuk-colour("light-grey");
629
+ background-color: govuk-colour('light-grey');
738
630
  border-bottom: 0px;
739
631
  }
740
632
  }
@@ -754,126 +646,60 @@ ul.dpr-card-group__item__filters-list {
754
646
  margin-bottom: 30px;
755
647
  }
756
648
 
757
-
758
- .dpr-pagination {
759
- overflow: auto;
760
- }
761
-
762
- .drp-pagination-rows-suffix {
763
- flex-grow: 1;
764
- }
765
-
766
- #page-size-select {
767
- min-width: 5em;
768
- }
769
-
770
649
  @media print {
771
- .dpr-pagination {
772
- display: none;
773
- }
774
- }
775
- .report-no-data-available {
776
- text-align: left;
777
- margin-top: govuk-spacing(6);
778
- }
779
- .dpr-report-header {
780
- padding-top: govuk-spacing(2);
781
- margin-bottom: govuk-spacing(2);
782
-
783
- .dpr-report-heading {
784
- display: flex;
785
- flex-wrap: wrap;
786
-
787
- .dpr-report-heading__title {
788
- flex: 1;
789
-
790
- #dpr-report-name {
791
- margin-bottom: govuk-spacing(2);
792
- }
793
-
794
- .govuk-heading-l {
795
- margin-bottom: govuk-spacing(4);
796
- }
797
-
798
- @media(max-width: 1019px) {
799
- order: 1;
800
- flex: 1 0 100%;
801
- }
802
- }
803
-
804
- .dpr-report-heading__actions {
805
-
806
- @media(max-width: 1019px) {
807
- order: 0;
808
- flex: 1 0 100%;
650
+ .dpr-summary-container-group {
651
+ .dpr-summary-container {
652
+ .govuk-table {
653
+ th,
654
+ td {
655
+ padding: govuk-spacing(1);
656
+ }
657
+ th {
658
+ background-color: govuk-colour('light-grey');
659
+ border-bottom: 0px;
809
660
  }
661
+ }
810
662
  }
811
663
  }
664
+ }
665
+ .dpr-report-section {
666
+ margin-bottom: govuk-spacing(6);
812
667
 
813
- .dpr-report-details-print {
814
- display: none;
815
- }
668
+ .dpr-report-section__title {
669
+ position: sticky;
670
+ top: 0;
671
+ background-color: white;
672
+ padding-top: govuk-spacing(2);
673
+ padding-bottom: govuk-spacing(1);
674
+ z-index: 100;
675
+ border-bottom: solid 3px govuk-colour('light-blue');
676
+ margin-bottom: govuk-spacing(6);
816
677
 
817
- @media print {
818
- .dpr-bookmark,
819
- .dpr-meta-data-details,
820
- .dpr-report-heading,
821
- .dpr-pagination {
822
- display: none;
678
+ h2.govuk-heading-m {
679
+ margin-bottom: govuk-spacing(1);
823
680
  }
681
+ }
682
+ }
824
683
 
825
- .dpr-report-details-print {
826
- display: block;
684
+ @media print {
685
+ .dpr-report-section {
686
+ .dpr-report-section__title {
687
+ border-bottom: solid 1px govuk-colour('mid-grey');
827
688
 
828
- .dpr-request-details {
829
- p, ul, li, h1, h2 {
689
+ h2.govuk-heading-m {
690
+ font-size: 12px;
691
+ .govuk-caption-m {
830
692
  font-size: 12px;
831
- margin-top: 0px;
832
- margin-bottom: 5px;
833
- padding-top: 0px;
834
- }
835
- ul {
836
- padding: 0;
837
- list-style-type: none;
838
- li {
839
- display: inline;
840
- padding-right: 10px;
841
- }
842
- }
843
- .dpr-request-details__table {
844
- margin-top: 0px;
845
- margin-bottom: 0px;
846
-
847
- tbody {
848
- vertical-align: top;
849
- }
850
-
851
- td {
852
- padding: 0px;
853
- }
854
-
855
- .dpr-request-details__table-heading {
856
- width: 15%;
857
- }
858
693
  }
859
694
  }
860
695
  }
861
696
  }
862
697
  }
863
- .dpr-download-message--hidden {
864
- display: none;
865
- }
866
-
867
- .download-success-panel {
868
- width: 70%;
869
- }
870
-
871
698
  // Cannibalised from MoJ sortable table
872
699
 
873
700
  .dpr-table-container {
874
701
  position: relative;
875
702
 
876
-
877
703
  .dpr-section-header {
878
704
  border-bottom: 0px;
879
705
  padding-left: govuk-spacing(0);
@@ -885,60 +711,13 @@ ul.dpr-card-group__item__filters-list {
885
711
  }
886
712
  }
887
713
 
888
- .dpr-section-header-spacer {
889
- padding: govuk-spacing(4);
890
- border-left: 0px !important;
891
- border-right: 0px !important;
892
- border-bottom: 0px !important;
893
- }
894
-
895
- .dpr-section-header-spacer-bottom {
896
- padding: govuk-spacing(1);
897
- border-bottom: 0px;
898
- }
899
-
900
- .dpr-summary-cell {
901
- border-bottom: 0px;
902
- }
903
-
904
- .dpr-parent-cell, .dpr-child-report-cell {
905
- border-bottom: 0px;
906
- }
907
-
908
- .dpr-child-report-cell {
909
- padding-left: govuk-spacing(2);
910
- padding-right: govuk-spacing(2);
911
- padding-top: govuk-spacing(1);
912
- background-color: white;
913
- }
914
-
915
714
  .govuk-table__cell {
916
- .dpr-child-report {
917
- border: 1px solid govuk-colour("mid-grey");
918
- margin-bottom: govuk-spacing(3);
919
-
920
- h2 {
921
- background-color: govuk-colour('light-grey');
922
- padding: govuk-spacing(2);
923
- padding-left: govuk-spacing(2);
924
- margin-bottom: govuk-spacing(0);
925
- margin-top: govuk-spacing(0);
926
- }
927
-
928
- .dpr-child-report_table {
929
- padding: govuk-spacing(2);
930
-
931
- table {
932
- border: 0px;
933
- margin-bottom: 0px;
934
-
935
- tr:last-child {
936
- td {
937
- border-bottom: 0px;
938
- }
939
- }
940
- }
941
- }
715
+ h2 {
716
+ background-color: govuk-colour('light-grey');
717
+ padding: govuk-spacing(2);
718
+ padding-left: govuk-spacing(2);
719
+ margin-bottom: govuk-spacing(0);
720
+ margin-top: govuk-spacing(0);
942
721
  }
943
722
  }
944
723
 
@@ -979,7 +758,7 @@ ul.dpr-card-group__item__filters-list {
979
758
  }
980
759
 
981
760
  .data-table-header-button-sort-none:before {
982
- content: " \25bc";
761
+ content: ' \25bc';
983
762
  position: absolute;
984
763
  right: -1px;
985
764
  top: 9px;
@@ -987,7 +766,7 @@ ul.dpr-card-group__item__filters-list {
987
766
  }
988
767
 
989
768
  .data-table-header-button-sort-none:after {
990
- content: " \25b2";
769
+ content: ' \25b2';
991
770
  position: absolute;
992
771
  right: -1px;
993
772
  top: 1px;
@@ -995,16 +774,16 @@ ul.dpr-card-group__item__filters-list {
995
774
  }
996
775
 
997
776
  .data-table-header-button-sort-ascending:after {
998
- content: " \25b2";
999
- font-size: .8em;
777
+ content: ' \25b2';
778
+ font-size: 0.8em;
1000
779
  position: absolute;
1001
780
  right: -5px;
1002
781
  top: 2px;
1003
782
  }
1004
783
 
1005
784
  .data-table-header-button-sort-descending:after {
1006
- content: " \25bc";
1007
- font-size: .8em;
785
+ content: ' \25bc';
786
+ font-size: 0.8em;
1008
787
  position: absolute;
1009
788
  right: -5px;
1010
789
  top: 2px;
@@ -1051,11 +830,11 @@ ul.dpr-card-group__item__filters-list {
1051
830
  .data-table-page-size {
1052
831
  float: right;
1053
832
 
1054
- @media(max-width: 640px) {
833
+ @media (max-width: 640px) {
1055
834
  width: 100%;
1056
835
  }
1057
836
 
1058
- @media(max-width: 319px) {
837
+ @media (max-width: 319px) {
1059
838
  .govuk-form-group {
1060
839
  margin-bottom: 0;
1061
840
  }
@@ -1064,7 +843,7 @@ ul.dpr-card-group__item__filters-list {
1064
843
  }
1065
844
  }
1066
845
 
1067
- @media(max-width: 319px) {
846
+ @media (max-width: 319px) {
1068
847
  #pageSize {
1069
848
  width: 100%;
1070
849
  }
@@ -1079,55 +858,42 @@ ul.dpr-card-group__item__filters-list {
1079
858
  }
1080
859
  }
1081
860
 
1082
- .table-row-count {
1083
- color: govuk-colour("dark-grey");
1084
- font-weight: 100;
1085
- text-align: right;
1086
- }
1087
-
1088
861
  .table-row--no-border {
1089
862
  border-bottom: none;
1090
863
  }
1091
864
 
1092
- .table-row-count--top {
1093
- padding-bottom: govuk-spacing(0);
1094
- }
1095
-
1096
- .table-row-count--bottom {
1097
- padding-top: govuk-spacing(2);
1098
- padding-bottom: govuk-spacing(2);
1099
- }
1100
-
1101
865
  .govuk-table__cell h2 {
1102
866
  margin-bottom: 0;
1103
867
  margin-top: 40px;
1104
868
  }
1105
869
 
1106
870
  .dpr-report-summary-cell {
1107
- background-color: govuk-colour("light-grey");
1108
871
  font-weight: bold;
1109
872
  padding-top: govuk-spacing(3);
1110
873
  padding-bottom: govuk-spacing(3);
1111
874
  }
1112
875
 
1113
876
  .dpr-report-summary-cell-table-header {
1114
- border-bottom: 0px;
877
+ border-bottom: solid 4px govuk-colour('mid-grey');
878
+ background-color: white;
1115
879
  }
1116
880
 
1117
881
  .dpr-report-summary-cell-table-footer {
1118
- border-top: 0px;
882
+ border-top: solid 4px govuk-colour('mid-grey');
883
+ border-bottom: solid 2px govuk-colour('mid-grey');
884
+ background-color: white;
1119
885
  }
1120
886
  }
1121
887
 
888
+ .dpr-table-container--parent-child-section,
889
+ .dpr-table-container--parent-child,
890
+ .dpr-table-container--list-section,
1122
891
  .dpr-table-container--list {
1123
892
  .govuk-table {
1124
893
  td {
1125
- padding-left: govuk-spacing(0);
1126
- }
894
+ padding-left: govuk-spacing(0);
895
+ }
1127
896
  }
1128
- }
1129
-
1130
- .dpr-table-container--list {
1131
897
  .govuk-table__header {
1132
898
  padding-right: govuk-spacing(4);
1133
899
  white-space: nowrap;
@@ -1136,62 +902,26 @@ ul.dpr-card-group__item__filters-list {
1136
902
  .govuk-table__cell {
1137
903
  padding-right: govuk-spacing(4);
1138
904
  }
905
+ }
1139
906
 
907
+ // Zebra stripes
908
+ .dpr-table-container--list-section,
909
+ .dpr-table-container--list {
1140
910
  .govuk-table__body {
1141
- tr.govuk-table__row:nth-child(odd) {
1142
- background-color: govuk-colour("light-grey");
911
+ tr.govuk-table__row:nth-child(even) {
912
+ background-color: govuk-colour('light-grey');
1143
913
  }
1144
914
  }
1145
915
  }
1146
916
 
1147
- .dpr-table-container--row-section, .dpr-table-container--row-section-child {
1148
- th {
1149
- border-bottom: 0px;
1150
- }
1151
- th.dpr-row-section-header {
1152
- width: 33%;
1153
- }
1154
- th.pr-row-section-header-value {
1155
- width: 66%;
1156
- }
1157
-
1158
- .dpr-section-header {
1159
- background-color: govuk-colour('light-grey');
1160
- border-top: 1px solid govuk-colour("mid-grey");
1161
- border-bottom: none;
1162
- padding: govuk-spacing(3);
1163
- }
1164
-
1165
- .dpr-section-header-spacer {
1166
- padding: govuk-spacing(6);
1167
- }
1168
-
1169
- .dpr-section-header-spacer-bottom {
1170
- // border-left: 1px solid govuk-colour("mid-grey");
1171
- // border-right: 1px solid govuk-colour("mid-grey");
1172
- }
1173
-
1174
- .dpr-row-heading {
1175
- padding: govuk-spacing(2);
1176
- font-weight: 800;
1177
- // border-left: 1px solid govuk-colour("mid-grey");
1178
- }
1179
-
1180
- .dpr-row-heading-data {
1181
- padding: govuk-spacing(2);
1182
- // border-right: 1px solid govuk-colour("mid-grey");
1183
- }
1184
- }
1185
-
1186
- .data-table-empty-message {
1187
- text-align: center;
1188
- position: relative;
1189
- }
1190
-
1191
917
  @media print {
1192
918
  .dpr-table-container {
1193
919
  .dpr-table-wrapper {
1194
920
  overflow: visible;
921
+
922
+ .govuk-table__cell--content.print-header-footer {
923
+ font-size: 8px;
924
+ }
1195
925
  }
1196
926
  .dpr-overflow-gradient {
1197
927
  display: none;
@@ -1211,12 +941,6 @@ ul.dpr-card-group__item__filters-list {
1211
941
  padding: 0px;
1212
942
  }
1213
943
 
1214
- .dpr-reports-heading-container {
1215
- margin-top: govuk-spacing(1);
1216
- margin-bottom: 0px;
1217
- padding: 0px;
1218
- }
1219
-
1220
944
  .govuk-table__body {
1221
945
  tr.govuk-table__row:nth-child(odd) {
1222
946
  background-color: transparent !important;
@@ -1227,80 +951,212 @@ ul.dpr-card-group__item__filters-list {
1227
951
  color: black;
1228
952
  text-decoration: none;
1229
953
  }
954
+ }
955
+ .dpr-parent-child-data {
956
+ padding-bottom: govuk-spacing(4);
1230
957
 
1231
- // Parent Child table
1232
- .dpr-table-container--parent-child-section,
1233
- .dpr-table-container--parent-child {
1234
- .dpr-section-header-spacer {
1235
- padding: 5px
958
+ .govuk-table {
959
+ tr:last-child {
960
+ td {
961
+ border-bottom: none;
1236
962
  }
963
+ }
964
+ }
1237
965
 
1238
- .govuk-table__cell {
1239
- .dpr-child-report {
1240
- h2 {
1241
- font-size: 12px;
1242
- font-weight: 700;
1243
- }
1244
- .dpr-child-report_table {
1245
- padding: 0px;
1246
-
1247
- td, th {
1248
- padding: govuk-spacing(1);
966
+ .dpr-parent-child-data__parent {
967
+ margin-bottom: govuk-spacing(3);
968
+
969
+ .govuk-table {
970
+ margin-bottom: govuk-spacing(0);
971
+ }
972
+ }
973
+
974
+ .dpr-parent-child-data__child {
975
+ .dpr-parent-child-data__child-table {
976
+ padding: govuk-spacing(3);
977
+ padding-top: govuk-spacing(1);
978
+ padding-bottom: govuk-spacing(1);
979
+
980
+ .govuk-table {
981
+ margin-bottom: 0px;
982
+
983
+ tr:last-child {
984
+ td {
985
+ border-bottom: none;
1249
986
  }
1250
987
  }
1251
988
  }
1252
989
  }
990
+
991
+ margin-bottom: govuk-spacing(6);
992
+ border: solid 1px #b1b4b6;
993
+ border-left: solid 4px govuk-colour('light-blue');
994
+
995
+ h2 {
996
+ background-color: #f3f2f1;
997
+ margin-bottom: 0px;
998
+ padding: govuk-spacing(2);
999
+ padding-left: govuk-spacing(3);
1000
+ }
1253
1001
  }
1254
-
1255
- .dpr-section-header {
1256
- padding: govuk-spacing(1);
1257
- h2 {
1258
- font-size: 14px;
1259
- span.govuk-caption-m {
1002
+ }
1003
+
1004
+ @media print {
1005
+ .dpr-parent-child-data {
1006
+ padding-bottom: govuk-spacing(2);
1007
+
1008
+ .dpr-parent-child-data__parent {
1009
+ .dpr-table-container {
1010
+ .dpr-table-wrapper {
1011
+ .govuk-table__cell--content.print-header-footer--footer {
1012
+ display: none;
1013
+ }
1014
+ }
1015
+ }
1016
+ }
1017
+
1018
+ .dpr-parent-child-data__child {
1019
+ .dpr-parent-child-data__child-table {
1020
+ padding: govuk-spacing(1);
1021
+ padding-bottom: 0px;
1022
+ padding-top: 0px;
1023
+
1024
+ .dpr-table-container {
1025
+ .dpr-table-wrapper {
1026
+ .govuk-table__cell--content.print-header-footer {
1027
+ display: none;
1028
+ }
1029
+ }
1030
+ }
1031
+ }
1032
+
1033
+ border-left: solid 1px govuk-colour('mid-grey');
1034
+ margin-bottom: govuk-spacing(2);
1035
+
1036
+ h2 {
1260
1037
  font-size: 12px;
1038
+ padding: govuk-spacing(1);
1261
1039
  }
1262
1040
  }
1263
1041
  }
1264
- .dpr-table-container--list-section {
1265
- .dpr-section-header-spacer {
1266
- padding: 5px
1267
- }
1042
+ }
1043
+ .dpr-pagination {
1044
+ overflow: auto;
1045
+ }
1268
1046
 
1269
- .dpr-report-summary-cell-table-footer,
1270
- .dpr-report-summary-cell-table-header {
1271
- background-color: transparent;
1272
- padding: govuk-spacing(2);
1273
- padding-left: 0px;
1274
- border-bottom: 1px solid #b1b4b6;
1275
- }
1047
+ .drp-pagination-rows-suffix {
1048
+ flex-grow: 1;
1049
+ }
1050
+
1051
+ #page-size-select {
1052
+ min-width: 5em;
1053
+ }
1054
+
1055
+ @media print {
1056
+ .dpr-pagination {
1057
+ display: none;
1276
1058
  }
1277
1059
  }
1278
- .dpr-columns-form {
1279
- margin-left: govuk-spacing(2);
1060
+ .dpr-report-no-data-message {
1061
+ text-align: left;
1062
+ margin-top: govuk-spacing(6);
1280
1063
 
1281
- .columns-container {
1282
- position: relative;
1064
+ p {
1065
+ margin-bottom: govuk-spacing(3);
1066
+ }
1067
+ }
1068
+ .dpr-report-header {
1069
+ padding-top: govuk-spacing(2);
1070
+ margin-bottom: govuk-spacing(2);
1283
1071
 
1284
- .govuk-checkboxes.govuk-checkboxes--small {
1285
- display: grid;
1286
- grid-template-columns: 1fr 1fr 1fr;
1287
- column-gap: 10px;
1072
+ .dpr-report-heading {
1073
+ display: flex;
1074
+ flex-wrap: wrap;
1288
1075
 
1289
- @media(min-width: 769px) and (max-width: 1019px) {
1290
- grid-template-columns: 1fr 1fr;
1076
+ .dpr-report-heading__title {
1077
+ flex: 1;
1078
+
1079
+ #dpr-report-name {
1080
+ margin-bottom: govuk-spacing(2);
1291
1081
  }
1292
1082
 
1293
- @media(max-width: 768px) {
1294
- grid-template-columns: 1fr;
1083
+ .govuk-heading-l {
1084
+ margin-bottom: govuk-spacing(4);
1295
1085
  }
1086
+
1087
+ @media(max-width: 1019px) {
1088
+ order: 1;
1089
+ flex: 1 0 100%;
1090
+ }
1091
+ }
1092
+
1093
+ .dpr-report-heading__actions {
1094
+
1095
+ @media(max-width: 1019px) {
1096
+ order: 0;
1097
+ flex: 1 0 100%;
1098
+ }
1296
1099
  }
1297
1100
  }
1298
1101
 
1299
- .columns-header {
1300
- padding-left: 10px;
1301
- padding-top: 10px;
1102
+ .dpr-report-details-print {
1103
+ display: none;
1104
+ }
1105
+
1106
+ @media print {
1107
+ .dpr-bookmark,
1108
+ .dpr-meta-data-details,
1109
+ .dpr-report-heading,
1110
+ .dpr-pagination {
1111
+ display: none;
1112
+ }
1113
+
1114
+ .dpr-report-details-print {
1115
+ display: block;
1116
+
1117
+ .dpr-request-details {
1118
+ p, ul, li, h1, h2 {
1119
+ font-size: 12px;
1120
+ margin-top: 0px;
1121
+ margin-bottom: 5px;
1122
+ padding-top: 0px;
1123
+ }
1124
+ ul {
1125
+ padding: 0;
1126
+ list-style-type: none;
1127
+ li {
1128
+ display: inline;
1129
+ padding-right: 10px;
1130
+ }
1131
+ }
1132
+ .dpr-request-details__table {
1133
+ margin-top: 0px;
1134
+ margin-bottom: 0px;
1135
+
1136
+ tbody {
1137
+ vertical-align: top;
1138
+ }
1139
+
1140
+ td {
1141
+ padding: 0px;
1142
+ }
1143
+
1144
+ .dpr-request-details__table-heading {
1145
+ width: 15%;
1146
+ }
1147
+ }
1148
+ }
1149
+ }
1302
1150
  }
1303
1151
  }
1152
+ .dpr-download-message--hidden {
1153
+ display: none;
1154
+ }
1155
+
1156
+ .download-success-panel {
1157
+ width: 70%;
1158
+ }
1159
+
1304
1160
  .dpr-columns-section-wrapper {
1305
1161
  position: relative;
1306
1162
 
@@ -1340,6 +1196,32 @@ ul.dpr-card-group__item__filters-list {
1340
1196
  }
1341
1197
  }
1342
1198
  }
1199
+ .dpr-columns-form {
1200
+ margin-left: govuk-spacing(2);
1201
+
1202
+ .columns-container {
1203
+ position: relative;
1204
+
1205
+ .govuk-checkboxes.govuk-checkboxes--small {
1206
+ display: grid;
1207
+ grid-template-columns: 1fr 1fr 1fr;
1208
+ column-gap: 10px;
1209
+
1210
+ @media(min-width: 769px) and (max-width: 1019px) {
1211
+ grid-template-columns: 1fr 1fr;
1212
+ }
1213
+
1214
+ @media(max-width: 768px) {
1215
+ grid-template-columns: 1fr;
1216
+ }
1217
+ }
1218
+ }
1219
+
1220
+ .columns-header {
1221
+ padding-left: 10px;
1222
+ padding-top: 10px;
1223
+ }
1224
+ }
1343
1225
  .report-actions {
1344
1226
  text-align: right;
1345
1227
  position: relative;