From 3532c559247d47a08b89e700cb1ddd2211ce5660 Mon Sep 17 00:00:00 2001
From: Joshua Sangmeister <joshua.sangmeister@gmail.com>
Date: Thu, 24 Jun 2021 15:52:03 +0200
Subject: [PATCH] Remove chart for analog polls with a majority & fix random
 TypeError

---
 .../motion-poll-detail-content.component.html                 | 2 +-
 .../app/site/polls/components/base-poll-detail.component.ts   | 3 +++
 client/src/app/site/polls/models/view-base-poll.ts            | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/client/src/app/shared/components/motion-poll-detail-content/motion-poll-detail-content.component.html b/client/src/app/shared/components/motion-poll-detail-content/motion-poll-detail-content.component.html
index 8922e3cee..8533058b3 100644
--- a/client/src/app/shared/components/motion-poll-detail-content/motion-poll-detail-content.component.html
+++ b/client/src/app/shared/components/motion-poll-detail-content/motion-poll-detail-content.component.html
@@ -43,7 +43,7 @@
         </table>
 
         <!-- Chart -->
-        <div class="doughnut-chart">
+        <div *ngIf="!poll.hasSpecialVoteValues" class="doughnut-chart">
             <os-charts type="doughnut" [data]="chartData"></os-charts>
         </div>
     </ng-container>
diff --git a/client/src/app/site/polls/components/base-poll-detail.component.ts b/client/src/app/site/polls/components/base-poll-detail.component.ts
index 61843a659..4e0e59bde 100644
--- a/client/src/app/site/polls/components/base-poll-detail.component.ts
+++ b/client/src/app/site/polls/components/base-poll-detail.component.ts
@@ -213,6 +213,9 @@ export abstract class BasePollDetailComponentDirective<V extends ViewBasePoll, S
         if (this.entitledUsersSubscription) {
             this.entitledUsersSubscription.unsubscribe();
         }
+        if (this.poll.isAnalog) {
+            return;
+        }
         const userIds = new Set<number>();
         for (const entry of this.poll.entitled_users_at_stop) {
             userIds.add(entry.user_id);
diff --git a/client/src/app/site/polls/models/view-base-poll.ts b/client/src/app/site/polls/models/view-base-poll.ts
index e588f341c..54a49dae6 100644
--- a/client/src/app/site/polls/models/view-base-poll.ts
+++ b/client/src/app/site/polls/models/view-base-poll.ts
@@ -112,6 +112,10 @@ export abstract class ViewBasePoll<
         }
     }
 
+    public get hasSpecialVoteValues(): boolean {
+        return this.poll.isAnalog && this.options.some(option => option.votes.some(vote => vote.weight < 0));
+    }
+
     public abstract get pollmethodVerbose(): string;
 
     public abstract get percentBaseVerbose(): string;