From 7598fc536771b12763697f74167a9af3d369545b Mon Sep 17 00:00:00 2001
From: Joshua Sangmeister <joshua.sangmeister@gmail.com>
Date: Fri, 14 Feb 2020 16:44:06 +0100
Subject: [PATCH] Fixed the numbering of assignment candidates for projector
 and PDF

---
 .../services/assignment-pdf.service.ts        |  3 ++-
 .../assignment/assignment-slide-data.ts       |  1 +
 .../assignment-slide.component.html           | 20 +++++++++++++------
 openslides/assignments/projector.py           |  1 +
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/client/src/app/site/assignments/services/assignment-pdf.service.ts b/client/src/app/site/assignments/services/assignment-pdf.service.ts
index d1a3e37e5..d3fb04020 100644
--- a/client/src/app/site/assignments/services/assignment-pdf.service.ts
+++ b/client/src/app/site/assignments/services/assignment-pdf.service.ts
@@ -131,6 +131,7 @@ export class AssignmentPdfService {
                     margin: [0, 0, 0, 10]
                 };
             });
+            const listType = assignment.number_poll_candidates ? 'ol' : 'ul';
 
             return {
                 columns: [
@@ -141,7 +142,7 @@ export class AssignmentPdfService {
                         style: 'textItem'
                     },
                     {
-                        ul: userList,
+                        [listType]: userList,
                         style: 'textItem'
                     }
                 ]
diff --git a/client/src/app/slides/assignments/assignment/assignment-slide-data.ts b/client/src/app/slides/assignments/assignment/assignment-slide-data.ts
index 4b9f9a2b2..e8ee34539 100644
--- a/client/src/app/slides/assignments/assignment/assignment-slide-data.ts
+++ b/client/src/app/slides/assignments/assignment/assignment-slide-data.ts
@@ -7,4 +7,5 @@ export interface AssignmentSlideData {
         user: string;
         elected: boolean;
     }[];
+    number_poll_candidates: boolean;
 }
diff --git a/client/src/app/slides/assignments/assignment/assignment-slide.component.html b/client/src/app/slides/assignments/assignment/assignment-slide.component.html
index 368ac2366..d5b31f51a 100644
--- a/client/src/app/slides/assignments/assignment/assignment-slide.component.html
+++ b/client/src/app/slides/assignments/assignment/assignment-slide.component.html
@@ -7,10 +7,18 @@
     <div *ngIf="data.data && data.data.description" [innerHTML]="data.data.description | trust: 'html'"></div>
 
     <h3 translate>Candidates</h3>
-    <ul *ngIf="data.data.assignment_related_users && data.data.assignment_related_users.length">
-        <li *ngFor="let candidate of data.data.assignment_related_users">
-            {{ candidate.user }}
-            <mat-icon *ngIf="candidate.elected">star</mat-icon>
-        </li>
-    </ul>
+    <ng-container *ngIf="data.data.assignment_related_users && data.data.assignment_related_users.length">
+        <ol *ngIf="data.data.number_poll_candidates">
+            <li *ngFor="let candidate of data.data.assignment_related_users">
+                {{ candidate.user }}
+                <mat-icon *ngIf="candidate.elected">star</mat-icon>
+            </li>
+        </ol>
+        <ul *ngIf="!data.data.number_poll_candidates">
+            <li *ngFor="let candidate of data.data.assignment_related_users">
+                {{ candidate.user }}
+                <mat-icon *ngIf="candidate.elected">star</mat-icon>
+            </li>
+        </ul>
+    </ng-container>
 </div>
diff --git a/openslides/assignments/projector.py b/openslides/assignments/projector.py
index 2d12e9c67..ec078861a 100644
--- a/openslides/assignments/projector.py
+++ b/openslides/assignments/projector.py
@@ -34,6 +34,7 @@ async def assignment_slide(
         "open_posts": assignment["open_posts"],
         "description": assignment["description"],
         "assignment_related_users": assignment_related_users,
+        "number_poll_candidates": assignment["number_poll_candidates"],
     }