From 56273946c3f598e58df960a56756d877d443ece7 Mon Sep 17 00:00:00 2001
From: tykayn <contact@cipherbliss.com>
Date: Sat, 24 Apr 2021 12:46:26 +0200
Subject: [PATCH] =?UTF-8?q?montrer=20consultation=20et=20pr=C3=A9ciser=20s?=
 =?UTF-8?q?i=20aucun=20vote?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/core/services/poll.service.ts            |  4 ++--
 .../consultation/consultation.component.html     |  6 +++++-
 .../consultation/consultation.component.ts       |  2 +-
 .../poll-results-compact.component.html          |  1 +
 .../poll-results-detailed.component.html         | 16 +++++++++-------
 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/app/core/services/poll.service.ts b/src/app/core/services/poll.service.ts
index 3526c125..2fd3560b 100644
--- a/src/app/core/services/poll.service.ts
+++ b/src/app/core/services/poll.service.ts
@@ -160,8 +160,8 @@ export class PollService implements Resolve<Poll> {
 
 	public buildAnswersByChoiceLabelByPseudo(poll: Poll): Map<string, Map<string, Answer>> {
 		const pseudos: Set<string> = new Set();
-		poll.choices.forEach((choice: Choice) => {
-			choice.participants.forEach((users: Set<User>) => {
+		poll.votes.forEach((choice: Choice) => {
+			choice.voters.forEach((users: Set<User>) => {
 				users.forEach((user: User) => {
 					pseudos.add(user.pseudo);
 				});
diff --git a/src/app/features/consultation/consultation.component.html b/src/app/features/consultation/consultation.component.html
index 890efbbe..115f12b3 100644
--- a/src/app/features/consultation/consultation.component.html
+++ b/src/app/features/consultation/consultation.component.html
@@ -4,7 +4,11 @@
 	</div>
 </div>
 <section class="loading_poll" *ngIf="fetching"></section>
-<section class="poll_loaded" *ngIf="!fetching && poll">
+<section class="poll_loaded padded" *ngIf="!fetching && poll">
+	<div class="alert alert-info" *ngIf="poll.votes.length == 0">
+		aucun vote pour le moment
+	</div>
+
 	<div class="columns">
 		<div class="column">
 			<div class="card">
diff --git a/src/app/features/consultation/consultation.component.ts b/src/app/features/consultation/consultation.component.ts
index 7f7b2566..5e0e1d19 100644
--- a/src/app/features/consultation/consultation.component.ts
+++ b/src/app/features/consultation/consultation.component.ts
@@ -11,7 +11,7 @@ import { PollService } from '../../core/services/poll.service';
 	styleUrls: ['./consultation.component.scss'],
 })
 export class ConsultationComponent implements OnInit, OnDestroy {
-	public isCompactMode = true;
+	public isCompactMode = false;
 	public poll: Poll;
 	public pollSlug: string;
 	public passHash: string;
diff --git a/src/app/features/consultation/poll-results-compact/poll-results-compact.component.html b/src/app/features/consultation/poll-results-compact/poll-results-compact.component.html
index 9cbfd39e..6d80a6a4 100644
--- a/src/app/features/consultation/poll-results-compact/poll-results-compact.component.html
+++ b/src/app/features/consultation/poll-results-compact/poll-results-compact.component.html
@@ -3,6 +3,7 @@
 		<div class="column">
 			<label class="label">{{ choice.name }}</label>
 		</div>
+
 		<div class="column is-narrow">
 			<div class="buttons has-addons is-right" (click)="openModal(choice)">
 				<button class="button is-white">
diff --git a/src/app/features/consultation/poll-results-detailed/poll-results-detailed.component.html b/src/app/features/consultation/poll-results-detailed/poll-results-detailed.component.html
index 20f19d21..2e173549 100644
--- a/src/app/features/consultation/poll-results-detailed/poll-results-detailed.component.html
+++ b/src/app/features/consultation/poll-results-detailed/poll-results-detailed.component.html
@@ -2,15 +2,17 @@
 	<thead>
 		<tr>
 			<th></th>
-			<th *ngFor="let choice of poll.choices">{{ choice.label }}</th>
+			<th *ngFor="let choice of poll.choices">
+				{{ choice.name }}
+			</th>
 		</tr>
 	</thead>
 	<tbody>
-		<ng-container *ngFor="let item of buildAnswersByChoiceLabelByPseudo() | keyvalue">
-			<tr>
-				<td>{{ item.key }}</td>
-				<td *ngFor="let subItem of item.value | keyvalue">{{ subItem.value }}</td>
-			</tr>
-		</ng-container>
+		<!--		<ng-container *ngFor="let item of buildAnswersByChoiceLabelByPseudo() | keyvalue">-->
+		<!--			<tr>-->
+		<!--				<td>{{ item.key }}</td>-->
+		<!--				<td *ngFor="let subItem of item.name | keyvalue">{{ subItem.name }}</td>-->
+		<!--			</tr>-->
+		<!--		</ng-container>-->
 	</tbody>
 </table>