Merge pull request #6037 from tsiegleauq/poll-progress-speaker-manage

Allow LOS-Manager to see poll progress

client/src/app/site/assignments/modules/assignment-poll/components/assignment-poll/assignment-poll.component.html

@@ -76,9 +76,7 @@
         </div>
 
         <!-- Poll progress bar -->
-        <div *osPerms="'assignments.can_manage'; and: poll && poll.isStarted">
+        <os-poll-progress *ngIf="poll && poll.isStarted" [poll]="poll"></os-poll-progress>
-            <os-poll-progress [poll]="poll"></os-poll-progress>
-        </div>
 
         <!-- The Vote -->
         <os-assignment-poll-vote *ngIf="poll.canBeVotedFor()" [poll]="poll"></os-assignment-poll-vote>

client/src/app/site/cinema/components/poll-collection/poll-collection.component.html

@@ -16,7 +16,7 @@
             <a [routerLink]="getPollDetailLink(poll)" [state]="{ back: 'true' }">{{ getPollVoteTitle(poll) }}</a>
         </p>
 
-        <os-poll-progress *ngIf="canManage(poll) && poll.canBeVotedFor()" [poll]="poll"></os-poll-progress>
+        <os-poll-progress *ngIf="poll.canBeVotedFor()" [poll]="poll"></os-poll-progress>
 
         <div *ngIf="poll.pollClassType === 'motion'">
             <os-motion-poll-vote [poll]="poll" *ngIf="poll.canBeVotedFor() && !last"></os-motion-poll-vote>

client/src/app/site/cinema/components/poll-collection/poll-collection.component.ts

@@ -143,13 +143,4 @@ export class PollCollectionComponent extends BaseViewComponentDirective implemen
         }
         return null;
     }
-
-    public canManage(poll: ViewBasePoll): boolean {
-        if (poll.pollClassType === PollClassType.Motion) {
-            return this.operator.hasPerms(this.permission.motionsCanManagePolls);
-        } else if (poll.pollClassType === PollClassType.Assignment) {
-            return this.operator.hasPerms(this.permission.assignmentsCanManage);
-        }
-        return false;
-    }
 }

client/src/app/site/motions/modules/motion-poll/motion-poll/motion-poll.component.html

@@ -67,9 +67,7 @@
 
     <!-- Results -->
     <ng-container *ngIf="poll && !poll.stateHasVotes && poll.type !== 'analog'; else votingResult">
-        <div *osPerms="'motions.can_manage_polls'; and: poll && poll.isStarted">
+        <os-poll-progress *ngIf="poll && poll.isStarted" [poll]="poll"></os-poll-progress>
-            <os-poll-progress [poll]="poll"></os-poll-progress>
-        </div>
         <os-motion-poll-vote [poll]="poll" *ngIf="poll.canBeVotedFor()"></os-motion-poll-vote>
     </ng-container>
 

client/src/app/site/polls/components/poll-progress/poll-progress.component.ts

@@ -1,4 +1,4 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit } from '@angular/core';
 import { MatSnackBar } from '@angular/material/snack-bar';
 import { Title } from '@angular/platform-browser';
 
@@ -13,7 +13,8 @@ import { PollClassType, ViewBasePoll } from 'app/site/polls/models/view-base-pol
 @Component({
     selector: 'os-poll-progress',
     templateUrl: './poll-progress.component.html',
-    styleUrls: ['./poll-progress.component.scss']
+    styleUrls: ['./poll-progress.component.scss'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class PollProgressComponent extends BaseViewComponentDirective implements OnInit {
     @Input()
@@ -24,14 +25,28 @@ export class PollProgressComponent extends BaseViewComponentDirective implements
         return this.poll?.votescast || 0;
     }
 
-    public get canSeeProgressBar(): boolean {
+    private get canSeeNames(): boolean {
-        let canManage = false;
+        return this.operator.hasPerms(this.permission.usersCanSeeName);
-        if (this.poll?.pollClassType === PollClassType.Motion) {
+    }
-            canManage = this.operator.hasPerms(this.permission.motionsCanManagePolls);
+
-        } else if (this.poll?.pollClassType === PollClassType.Assignment) {
+    private get canManageSpeakers(): boolean {
-            canManage = this.operator.hasPerms(this.permission.assignmentsCanManage);
+        return this.operator.hasPerms(this.permission.agendaCanManageListOfSpeakers);
+    }
+
+    private get canManagePoll(): boolean {
+        if (this.poll.pollClassType === PollClassType.Motion) {
+            return this.operator.hasPerms(this.permission.motionsCanManagePolls);
+        } else if (this.poll.pollClassType === PollClassType.Assignment) {
+            return this.operator.hasPerms(this.permission.assignmentsCanManage);
         }
-        return canManage && this.operator.hasPerms(this.permission.usersCanSeeName);
+        return false;
+    }
+
+    public get canSeeProgressBar(): boolean {
+        if (!this.canSeeNames) {
+            return false;
+        }
+        return this.canManageSpeakers || this.canManagePoll;
     }
 
     public constructor(
@@ -39,7 +54,8 @@ export class PollProgressComponent extends BaseViewComponentDirective implements
         protected translate: TranslateService,
         snackbar: MatSnackBar,
         private userRepo: UserRepositoryService,
-        private operator: OperatorService
+        private operator: OperatorService,
+        private cd: ChangeDetectorRef
     ) {
         super(title, translate, snackbar);
     }
@@ -67,7 +83,11 @@ export class PollProgressComponent extends BaseViewComponentDirective implements
                     )
                     .subscribe(users => {
                         this.max = users.length;
-                    })
+                        this.cd.markForCheck();
+                    }),
+                this.operator.getUserObservable().subscribe(() => {
+                    this.cd.markForCheck();
+                })
             );
         }
     }