Skip to content

Commit 999e2f4

Browse files
cameronpettitcameronpettit
authored
NRPT-788 and NRPT-809 NRCED card alignment (#906)
1 parent 7840186 commit 999e2f4

28 files changed

+324
-287
lines changed

‎angular/projects/common/src/app/legislation/legislation-list-detail-public/legislation-list-detail.component.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
<label class="grid-item-name">Legislation</label>
21
<div class="grid-item-value">
32
<div *ngIf="data && data.length" class="legislation-divider"></div>
43
<ng-container *ngFor="let legislation of data ; let idx = index">
54
<div class="grid-section section-1">
6-
<div class="grid-item__row">
5+
<div class="grid-item__row">
76
<label *ngIf="idx === 0" class="grid-item-name">{{firstSectionLabel}}</label>
87
<label *ngIf="idx !== 0" class="grid-item-name">{{subsequentSectionLabels}}</label>
98
<span class="grid-item-value">{{ this.populateTextField(legislation) || '-' }}</span>

‎angular/projects/common/src/app/legislation/legislation-list-detail-public/legislation-list-detail.component.scss‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,23 @@
1111
grid-template-columns: auto;
1212
}
1313

14+
.grid-item-name{
15+
font-size: 1rem;
16+
font-weight: bold;
17+
}
18+
19+
.section-1 {
20+
grid-template-columns: 7fr 5fr;
21+
}
22+
1423
@media screen and (max-width: 768px) {
1524
.grid-section-1 {
1625
grid-template-columns: none;
1726
}
1827

1928
.grid-item__row {
2029
grid-template-rows: none;
21-
grid-template-columns: 1fr 2fr;
30+
grid-template-columns: 2fr 1fr;
2231
grid-gap: 0.625rem;
2332
}
2433
}

‎angular/projects/public-nrpti/src/app/records/administrative-penalties/administrative-penalty-detail/administrative-penalty-detail.component.html‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,32 @@
3131
<span class="grid-item-value__col">{{ (data && data.recordType) || '-' }}</span>
3232
</div>
3333
<div class="grid-item__row">
34-
<label class="grid-item-name">Issued On</label>
34+
<label class="grid-item-name">Location</label>
35+
<span class="grid-item-value__col">{{ (data && data.location) || '-' }}</span>
36+
</div>
37+
<div></div>
38+
<div class="grid-item__row">
39+
<label class="grid-item-name">Date Issued</label>
3540
<span class="gird-item-value">{{ (data && data.dateIssued | date: 'mediumDate') || '-' }}</span>
3641
</div>
3742
</div>
3843
<div class="grid-section section-2">
39-
<div class="grid-item__row">
40-
<label class="grid-item-name">Summary</label>
41-
<span class="grid-item-value__col">{{ (data && data.summary) || '-' }}</span>
42-
</div>
4344
<div class="grid-item__row">
4445
<label class="grid-item-name">Issuing Agency</label>
4546
<span class="grid-item-value__col">{{ data && data.issuingAgency ? displayName(data.issuingAgency) : '-' }}</span>
4647
</div>
48+
<div class="grid-item__row">
49+
<label class="grid-item-name">Site/Project</label>
50+
<span class="grid-item-value__col" [innerHtml]="( data && data.projectName ) || '-' | projectLink"></span>
51+
</div>
52+
<div class="grid-item__row">
53+
<label class="grid-item-name">Lat/Long</label>
54+
<span class="grid-item-value__col">{{ data && data.centroid ? data.centroid[1] + '/' + data.centroid[0]: '-' }}</span>
55+
</div>
56+
<div class="grid-item__row">
57+
<label class="grid-item-name">Summary</label>
58+
<span class="grid-item-value__col">{{ (data && data.summary) || '-' }}</span>
59+
</div>
4760
</div>
4861

4962
<div class="grid-section section-3">
@@ -55,24 +68,9 @@
5568
subsequentDescriptionLabel="Offence"
5669
></app-legislation-list-detail-public>
5770
</div>
58-
5971
<div class="grid-section section-3">
6072
<app-penalty-detail-public [data]="data && data.penalties"></app-penalty-detail-public>
6173
</div>
62-
<div class="grid-section section-4">
63-
<div class="grid-item__row">
64-
<label class="grid-item-name">Site/Project</label>
65-
<span class="grid-item-value__col" [innerHtml]="(data && data.projectName) || '-' | projectLink"></span>
66-
</div>
67-
<div class="grid-item__row">
68-
<label class="grid-item-name">Location Description</label>
69-
<span class="grid-item-value__col">{{ (data && data.location) || '-' }}</span>
70-
</div>
71-
<div class="grid-item__row">
72-
<label class="grid-item-name">Lat/Long</label>
73-
<span class="grid-item-value__col">{{ data && data.centroid ? data.centroid[1] + '/' + data.centroid[0]: '-' }}</span>
74-
</div>
75-
</div>
7674
<div class="grid-section section-5">
7775
<div class="grid-item__row">
7876
<label class="grid-item-name">Documents</label>

‎angular/projects/public-nrpti/src/app/records/administrative-penalties/administrative-penalty-detail/administrative-penalty-detail.component.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// base scss found in record-details.scss
22

33
.section-1 {
4-
grid-template-columns: 3fr 2fr 2fr 2fr;
4+
grid-template-columns: 3fr 2fr 2fr 3fr 2fr;
55
}
66

77
.section-2 {
8-
grid-template-columns: 3fr 2fr 4fr;
8+
grid-template-columns: 3fr 2fr 2fr 5fr;
99
}
1010

1111
.section-3 {

‎angular/projects/public-nrpti/src/app/records/administrative-penalties/administrative-penalty-detail/administrative-penalty-detail.component.ts‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,14 @@ export class AdministrativePenaltyDetailComponent implements OnInit, OnChanges,
1919

2020
public loading = true;
2121
public activeTab = 'detail';
22+
public siteName = '-';
2223

2324
constructor(
2425
public route: ActivatedRoute,
2526
public router: Router,
2627
public factoryService: FactoryService,
2728
public _changeDetectionRef: ChangeDetectorRef
28-
) {}
29+
) { }
2930

3031
ngOnInit(): void {
3132
if (!this.data) {
@@ -45,11 +46,24 @@ export class AdministrativePenaltyDetailComponent implements OnInit, OnChanges,
4546
}
4647
}
4748

49+
setProjectName() {
50+
if (this.data) {
51+
if (this.data.projectName) {
52+
this.siteName = this.data.projectName;
53+
} else if (this.data._master && this.data._master.unlistedMine) {
54+
this.siteName = this.data._master.unlistedMine;
55+
} else {
56+
this.siteName = '-';
57+
}
58+
}
59+
}
60+
4861
updateComponent() {
4962
this.data = new AdministrativePenaltyNRCED(this.data);
5063

5164
// populate documents
5265
this.getDocuments();
66+
this.setProjectName();
5367

5468
this.loading = false;
5569
this._changeDetectionRef.detectChanges();

‎angular/projects/public-nrpti/src/app/records/administrative-sanctions/administrative-sanction-detail/administrative-sanction-detail.component.html‎

Lines changed: 32 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@
22
<div>
33
<section class="nav-section">
44
<ul class="nav-items">
5-
<li
6-
class="nav-item"
7-
[ngClass]="{ active: isTabActive('detail') }"
8-
(click)="activateTab('detail')"
9-
title="Administrative sanction activity details"
10-
>
5+
<li class="nav-item" [ngClass]="{ active: isTabActive('detail') }" (click)="activateTab('detail')"
6+
title="Administrative sanction activity details">
117
<i class="nav-item-icon material-icons">info</i>
128
<a class="nav-item-value">Activity Details</a>
139
</li>
@@ -16,63 +12,59 @@
1612
<section class="content-section" *ngIf="isTabActive('detail')">
1713
<div class="content-grid">
1814
<div class="grid-section section-1">
19-
<div class="grid-item__row">
20-
<label class="grid-item-name">Type</label>
21-
<span class="grid-item-value__col">{{ (data && data.recordType) || '-' }}</span>
22-
</div>
2315
<div class="grid-item__row">
2416
<label class="grid-item-name">Issued To</label>
2517
<span class="grid-item-value__col">
2618
{{
27-
(data &&
28-
((data.issuedTo && data.issuedTo.getEntityNameString()) || (!data.issuedTo && 'Unpublished'))) ||
29-
'-'
19+
(data &&
20+
((data.issuedTo && data.issuedTo.getEntityNameString()) || (!data.issuedTo && 'Unpublished'))) ||
21+
'-'
3022
}}
3123
</span>
3224
</div>
3325
<div class="grid-item__row">
34-
<label class="grid-item-name">Issued On</label>
26+
<label class="grid-item-name">Type</label>
27+
<span class="grid-item-value__col">{{ (data && data.recordType) || '-' }}</span>
28+
</div>
29+
<div class="grid-item__row">
30+
<label class="grid-item-name">Location</label>
31+
<span class="grid-item-value__col">{{ (data && data.location) || '-' }}</span>
32+
</div>
33+
<div></div>
34+
<div class="grid-item__row">
35+
<label class="grid-item-name">Date Issued</label>
3536
<span class="gird-item-value">{{ (data && data.dateIssued | date: 'mediumDate') || '-' }}</span>
3637
</div>
3738
</div>
3839
<div class="grid-section section-2">
39-
<div class="grid-item__row">
40-
<label class="grid-item-name">Summary</label>
41-
<span class="grid-item-value__col">{{ (data && data.summary) || '-' }}</span>
42-
</div>
4340
<div class="grid-item__row">
4441
<label class="grid-item-name">Issuing Agency</label>
45-
<span class="grid-item-value__col">{{ data && data.issuingAgency ? displayName(data.issuingAgency) : '-' }}</span>
42+
<span class="grid-item-value__col">{{ data && data.issuingAgency ? displayName(data.issuingAgency) : '-'
43+
}}</span>
4644
</div>
47-
</div>
48-
49-
<div class="grid-section section-3">
50-
<app-legislation-list-detail-public
51-
[data]="data && data.legislation"
52-
firstSectionLabel="Authorizing Legislation"
53-
subsequentSectionLabels="Contravention"
54-
firstDescriptionLabel="Description"
55-
subsequentDescriptionLabel="Offence"
56-
></app-legislation-list-detail-public>
57-
</div>
58-
59-
<div class="grid-section section-3">
60-
<app-penalty-detail-public [data]="data && data.penalties"></app-penalty-detail-public>
61-
</div>
62-
<div class="grid-section section-4">
6345
<div class="grid-item__row">
6446
<label class="grid-item-name">Site/Project</label>
6547
<span class="grid-item-value__col" [innerHtml]="(data && data.projectName) || '-' | projectLink"></span>
6648
</div>
6749
<div class="grid-item__row">
68-
<label class="grid-item-name">Location Description</label>
69-
<span class="grid-item-value__col">{{ (data && data.location) || '-' }}</span>
50+
<label class="grid-item-name">Lat/Long</label>
51+
<span class="grid-item-value__col">{{ data && data.centroid ? data.centroid[1] + '/' + data.centroid[0]: '-'
52+
}}</span>
7053
</div>
7154
<div class="grid-item__row">
72-
<label class="grid-item-name">Lat/Long</label>
73-
<span class="grid-item-value__col">{{ data && data.centroid ? data.centroid[1] + '/' + data.centroid[0]: '-' }}</span>
55+
<label class="grid-item-name">Summary</label>
56+
<span class="grid-item-value__col">{{ (data && data.summary) || '-' }}</span>
7457
</div>
7558
</div>
59+
<div class="grid-section section-3">
60+
<app-legislation-list-detail-public [data]="data && data.legislation"
61+
firstSectionLabel="Authorizing Legislation" subsequentSectionLabels="Contravention"
62+
firstDescriptionLabel="Description" subsequentDescriptionLabel="Offence">
63+
</app-legislation-list-detail-public>
64+
</div>
65+
<div class="grid-section section-3">
66+
<app-penalty-detail-public [data]="data && data.penalties"></app-penalty-detail-public>
67+
</div>
7668
<div class="grid-section section-5">
7769
<div class="grid-item__row">
7870
<label class="grid-item-name">Documents</label>
@@ -94,4 +86,4 @@
9486
This is a map!
9587
</section>
9688
</div>
97-
</main>
89+
</main>

‎angular/projects/public-nrpti/src/app/records/administrative-sanctions/administrative-sanction-detail/administrative-sanction-detail.component.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// base scss found in record-details.scss
22

33
.section-1 {
4-
grid-template-columns: 3fr 2fr 2fr 2fr;
4+
grid-template-columns: 3fr 2fr 2fr 3fr 2fr;
55
}
66

77
.section-2 {
8-
grid-template-columns: 3fr 2fr 4fr;
8+
grid-template-columns: 3fr 2fr 2fr 5fr;
99
}
1010

1111
.section-3 {

‎angular/projects/public-nrpti/src/app/records/court-convictions/court-conviction-detail/court-conviction-detail.component.html‎

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -16,34 +16,47 @@
1616
<section class="content-section" *ngIf="isTabActive('detail')">
1717
<div class="content-grid">
1818
<div class="grid-section section-1">
19-
<div class="grid-item__row">
20-
<label class="grid-item-name">Type</label>
21-
<span class="grid-item-value__col">{{ (data && data.recordType) || '-' }}</span>
22-
</div>
2319
<div class="grid-item__row">
2420
<label class="grid-item-name">Issued To</label>
2521
<span class="grid-item-value__col">
2622
{{
2723
(data &&
28-
((data.issuedTo && data.issuedTo.getEntityNameString()) || (!data.issuedTo && 'Unpublished'))) ||
29-
'-'
24+
((data.issuedTo && data.issuedTo.getEntityNameString()) || (!data.issuedTo && 'Unpublished'))) ||
25+
'-'
3026
}}
3127
</span>
3228
</div>
3329
<div class="grid-item__row">
34-
<label class="grid-item-name">Issued On</label>
30+
<label class="grid-item-name">Type</label>
31+
<span class="grid-item-value__col">{{ (data && data.recordType) || '-' }}</span>
32+
</div>
33+
<div class="grid-item__row">
34+
<label class="grid-item-name">Location</label>
35+
<span class="grid-item-value__col">{{ (data && data.location) || '-' }}</span>
36+
</div>
37+
<div></div>
38+
<div class="grid-item__row">
39+
<label class="grid-item-name">Date Issued</label>
3540
<span class="gird-item-value">{{ (data && data.dateIssued | date: 'mediumDate') || '-' }}</span>
3641
</div>
3742
</div>
3843
<div class="grid-section section-2">
39-
<div class="grid-item__row">
40-
<label class="grid-item-name">Summary</label>
41-
<span class="grid-item-value__col">{{ (data && data.summary) || '-' }}</span>
42-
</div>
4344
<div class="grid-item__row">
4445
<label class="grid-item-name">Issuing Agency</label>
4546
<span class="grid-item-value__col">{{ data && data.issuingAgency ? displayName(data.issuingAgency) : '-' }}</span>
4647
</div>
48+
<div class="grid-item__row">
49+
<label class="grid-item-name">Site/Project</label>
50+
<span class="grid-item-value__col" [innerHtml]="(data && data.projectName) || '-' | projectLink"></span>
51+
</div>
52+
<div class="grid-item__row">
53+
<label class="grid-item-name">Lat/Long</label>
54+
<span class="grid-item-value__col">{{ data && data.centroid ? data.centroid[1] + '/' + data.centroid[0]: '-' }}</span>
55+
</div>
56+
<div class="grid-item__row">
57+
<label class="grid-item-name">Summary</label>
58+
<span class="grid-item-value__col">{{ (data && data.summary) || '-' }}</span>
59+
</div>
4760
</div>
4861
<div class="grid-section section-3">
4962
<app-legislation-list-detail-public
@@ -57,20 +70,6 @@
5770
<div class="grid-section section-3">
5871
<app-penalty-detail-public [data]="data && data.penalties"></app-penalty-detail-public>
5972
</div>
60-
<div class="grid-section section-4">
61-
<div class="grid-item__row">
62-
<label class="grid-item-name">Site/Project</label>
63-
<span class="grid-item-value__col" [innerHtml]="(data && data.projectName) || '-' | projectLink"></span>
64-
</div>
65-
<div class="grid-item__row">
66-
<label class="grid-item-name">Location Description</label>
67-
<span class="grid-item-value__col">{{ (data && data.location) || '-' }}</span>
68-
</div>
69-
<div class="grid-item__row">
70-
<label class="grid-item-name">Lat/Long</label>
71-
<span class="grid-item-value__col">{{ data && data.centroid ? data.centroid[1] + '/' + data.centroid[0]: '-' }}</span>
72-
</div>
73-
</div>
7473
<div class="grid-section section-5">
7574
<div class="grid-item__row">
7675
<label class="grid-item-name">Documents</label>

‎angular/projects/public-nrpti/src/app/records/court-convictions/court-conviction-detail/court-conviction-detail.component.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// base scss found in record-details.scss
22

33
.section-1 {
4-
grid-template-columns: 3fr 2fr 2fr 2fr;
4+
grid-template-columns: 3fr 2fr 2fr 3fr 2fr;
55
}
66

77
.section-2 {
8-
grid-template-columns: 3fr 2fr 4fr;
8+
grid-template-columns: 3fr 2fr 2fr 5fr;
99
}
1010

1111
.section-3 {

‎angular/projects/public-nrpti/src/app/records/court-convictions/court-conviction-detail/court-conviction-detail.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export class CourtConvictionDetailComponent implements OnInit, OnDestroy {
2525
public router: Router,
2626
public factoryService: FactoryService,
2727
public _changeDetectionRef: ChangeDetectorRef
28-
) {}
28+
) { }
2929

3030
ngOnInit(): void {
3131
if (this.data) {

0 commit comments

Comments
 (0)