Skip to content

Commit 0c1c4a3

Browse files
Csaba79-coderCsaba79-coder
committed
rendering (map into the model) and formatting data from the translations
1 parent 57b7b70 commit 0c1c4a3

File tree

4 files changed

+38
-6
lines changed

4 files changed

+38
-6
lines changed

‎frontend/src/app/government-service/components/government-list/government-list/government-list.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<div class="menu-sidebar-content js-scrollbar1">
88
<nav class="navbar-sidebar">
99
<ul class="list-unstyled navbar-list">
10-
<a routerLink="/{{ languageShortName }}/api/admin/gov-representatives" routerLinkActive="active">All Governments</a>
10+
<a routerLink="/{{ languageShortName }}/api/admin/gov-representatives" routerLinkActive="active">Összes</a>
1111
<li *ngFor="let government of governments">
12-
<a routerLink="/{{ languageShortName }}/api/admin/gov-representatives/governments/{{ government.id }}" routerLinkActive="active-link">{{ government.name }}</a>
12+
<a routerLink="/{{ languageShortName }}/api/admin/gov-representatives/governments/{{ government.governmentId }}" routerLinkActive="active-link">{{ government.name }}</a>
1313
</li>
1414
</ul>
1515
</nav>

‎frontend/src/app/government-service/components/representative-list/representative-list.component.html

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
routerLinkActive="active-link">
2222
{{ government.name }}
2323
</a>-->
24-
<a [routerLink]="['/', currentLanguage, 'api', 'admin', 'gov-representatives', 'governments', government?.id]"
24+
<a [routerLink]="['/', currentLanguage, 'api', 'admin', 'gov-representatives', 'governments', government?.governmentId]"
2525
routerLinkActive="active-link"
2626
[queryParamsHandling]="'merge'">
2727
{{ government.name }}
@@ -46,6 +46,9 @@ <h1>{{ tempRepresentative.name }}</h1>
4646
<div class="price">
4747
{{ tempRepresentative.jobTitle }}
4848
</div>
49+
<div class="secret">
50+
{{ tempRepresentative.secretNote }}
51+
</div>
4952
<div class="description">
5053
{{ tempRepresentative.governmentName }}
5154
</div>
@@ -61,6 +64,9 @@ <h1>{{ tempRepresentative.name }}</h1>
6164
<div class="description">
6265
{{ tempRepresentative.address }}
6366
</div>
67+
<div class="description">
68+
{{ tempRepresentative.country }}
69+
</div>
6470
<div class="description">
6571
{{ tempRepresentative.note }}
6672
</div>

‎frontend/src/app/government-service/components/representative-list/representative-list.component.ts

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,22 @@ export class RepresentativeListComponent implements OnInit {
7373
}
7474

7575
private listAllRepresentatives() {
76-
this.representativeService.renderAllRepresentatives(this.currentLanguage!).subscribe((data) => {
76+
this.representativeService.renderAllRepresentatives(this.currentLanguage!).subscribe(
77+
(data) => {
7778
this.representatives = data.map((representative) => {
7879
console.log("Representatives: " + JSON.stringify(representative));
7980
const government = representative.government;
81+
const reprTranslation = representative.representativeTranslation;
8082
return {
8183
...representative,
84+
name: reprTranslation? reprTranslation.name: '',
85+
address: reprTranslation? reprTranslation.address: '',
86+
country: reprTranslation? reprTranslation.country: '',
87+
jobTitle: reprTranslation? reprTranslation.jobTitle: '',
88+
note: reprTranslation? reprTranslation.note: '',
89+
secretNote: reprTranslation? reprTranslation.secretNote: '',
8290
governmentName: government ? government.name : '',
91+
secretairat: reprTranslation? reprTranslation.secretairat: '',
8392
image: this.sanitizer.bypassSecurityTrustUrl(`data:image/png;base64,${representative.image}`),
8493
};
8594
});
@@ -91,13 +100,22 @@ export class RepresentativeListComponent implements OnInit {
91100
this.currentLanguage = currentLanguage;
92101
this.representativeService
93102
.findByGovernmentId(this.currentGovernmentId, this.currentLanguage)
94-
.subscribe((data) => {
103+
.subscribe(
104+
(data) => {
95105
this.representatives = data.map((representative) => {
96106
console.log("Representatives: " + JSON.stringify(representative));
97107
const government = representative.government;
108+
const reprTranslation = representative.representativeTranslation;
98109
return {
99110
...representative,
111+
name: reprTranslation? reprTranslation.name: '',
112+
address: reprTranslation? reprTranslation.address: '',
113+
country: reprTranslation? reprTranslation.country: '',
114+
jobTitle: reprTranslation? reprTranslation.jobTitle: '',
115+
note: reprTranslation? reprTranslation.note: '',
116+
secretNote: reprTranslation? reprTranslation.secretNote: '',
100117
governmentName: government ? government.name : '',
118+
secretairat: reprTranslation? reprTranslation.secretairat: '',
101119
image: this.sanitizer.bypassSecurityTrustUrl(`data:image/png;base64,${representative.image}`),
102120
};
103121
});
@@ -108,16 +126,17 @@ export class RepresentativeListComponent implements OnInit {
108126
interface SanitizedRepresentativeAdminModel {
109127
id?: string;
110128
name?: string;
111-
lang?: string;
112129
email?: string;
113130
phoneNumber?: string;
114131
address?: string;
132+
country?: string,
115133
image: SafeUrl;
116134
jobTitle?: string;
117135
note?: string;
118136
availability?: Availability;
119137
governmentName?: string;
120138
secretairat?: string;
139+
secretNote?: string;
121140
createdAt?: string;
122141
updatedAt?: string;
123142
createdBy?: string;

‎frontend/src/styles.css

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -546,6 +546,13 @@ input.au-input.au-input-xl{
546546
font-weight:800;
547547
color:#0da8e4
548548
}
549+
550+
.secret {
551+
margin:15px 0 0;
552+
font-weight:800;
553+
color:#05143f
554+
}
555+
549556
.product-box h1{
550557
font-size:18px;
551558
border-bottom:1px solid #ccc;

0 commit comments

Comments
 (0)