diff --git a/client/src/app/site/assignments/components/assignment-detail/assignment-detail.component.html b/client/src/app/site/assignments/components/assignment-detail/assignment-detail.component.html
index 1848815a8..aae573528 100644
--- a/client/src/app/site/assignments/components/assignment-detail/assignment-detail.component.html
+++ b/client/src/app/site/assignments/components/assignment-detail/assignment-detail.component.html
@@ -27,7 +27,13 @@
picture_as_pdf
PDF
-
+
+
+
+
+
+
-
-
-
-
+
-
+ Description:
-
- This field is required.
-
-
-
+
diff --git a/client/src/app/site/assignments/components/assignment-detail/assignment-detail.component.ts b/client/src/app/site/assignments/components/assignment-detail/assignment-detail.component.ts
index 62775503b..b1b825ab1 100644
--- a/client/src/app/site/assignments/components/assignment-detail/assignment-detail.component.ts
+++ b/client/src/app/site/assignments/components/assignment-detail/assignment-detail.component.ts
@@ -449,7 +449,7 @@ export class AssignmentDetailComponent extends BaseViewComponent implements OnIn
/**
* Assemble a meaningful label for the poll
- * Published polls will look like 'Ballot 2 (published)'
+ * Published polls will look like 'Ballot 2'
* other polls will be named 'Ballot 2' for normal users, with the hint
* '(unpulished)' appended for manager users
*
@@ -458,14 +458,10 @@ export class AssignmentDetailComponent extends BaseViewComponent implements OnIn
*/
public getPollLabel(poll: AssignmentPoll, index: number): string {
const title = `${this.translate.instant('Ballot')} ${index + 1}`;
- if (poll.published) {
- return title + ` (${this.translate.instant('published')})`;
+ if (!poll.published && this.hasPerms('manage')) {
+ return title + ` (${this.translate.instant('unpublished')})`;
} else {
- if (this.hasPerms('manage')) {
- return title + ` (${this.translate.instant('unpublished')})`;
- } else {
- return title;
- }
+ return title;
}
}
@@ -493,4 +489,11 @@ export class AssignmentDetailComponent extends BaseViewComponent implements OnIn
.sortCandidates(listInNewOrder.map(relatedUser => relatedUser.id), this.assignment)
.then(null, this.raiseError);
}
+
+ /**
+ * Gets the link to the list of speakers associated with the assignment
+ */
+ public getSpeakerLink(): string {
+ return `/agenda/${this.assignment.agendaItem.id}/speakers`;
+ }
}
diff --git a/client/src/app/site/assignments/components/assignment-poll/assignment-poll.component.html b/client/src/app/site/assignments/components/assignment-poll/assignment-poll.component.html
index 24fc52194..bf7caccc0 100644
--- a/client/src/app/site/assignments/components/assignment-poll/assignment-poll.component.html
+++ b/client/src/app/site/assignments/components/assignment-poll/assignment-poll.component.html
@@ -28,7 +28,7 @@
-
+
@@ -39,28 +39,6 @@
-
-
- Hint for ballot paper
-
-
-
-
-
-
-
-
-
Election method
- {{ pollMethodName | translate }}
-
-
@@ -139,7 +117,10 @@
>({{ pollService.getPercent(poll, option, vote.value) }}%)
-
+
{{ pollService.yesQuorum(majorityChoice, poll, option) }}
-
{{ pollService.getIcon('yes') }}
@@ -181,7 +163,7 @@
{{ pollService.getSpecialLabel(poll[key]) | translate }}
- ({{ pollService.getValuePercent(poll,key) }} %)
+ ({{ pollService.getValuePercent(poll, key) }} %)
@@ -194,4 +176,27 @@
+
+
+
Election method
+ {{ pollMethodName | translate }}
+
+
+
+ Hint for ballot paper
+
+
+
+
+
+
+
+