ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5373 from tsiegleauq/assignment-poll-card-with-table

Browse Source 
Show assignment poll result table instad of chart
This commit is contained in:
Emanuel Schütze 2020-05-14 19:36:43 +02:00 committed by GitHub
commit f694e2355d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/src/app/site/assignments/components/assignment-poll/assignment-poll.component.html
View File

@ -56,15 +56,13 @@
</div> </div>
</div> </div>
<!-- Chart --> <!-- Chart / Table -->
<div *ngIf="poll.stateHasVotes"> <div *ngIf="poll.stateHasVotes" class="poll-result-wrapper">
<div *osPerms="'assignments.can_manage'; or: poll.isPublished"> <div *osPerms="'assignments.can_manage'; or: poll.isPublished">
<os-charts <os-assignment-poll-detail-content
class="pointer"
routerLink="/assignments/polls/{{ poll.id }}" routerLink="/assignments/polls/{{ poll.id }}"
[labels]="candidatesLabels" [poll]="poll"
[data]="chartDataSubject | async" ></os-assignment-poll-detail-content>
></os-charts>
</div> </div>
<!-- Cannot see unpublished --> <!-- Cannot see unpublished -->

4
client/src/app/site/assignments/components/assignment-poll/assignment-poll.component.scss
View File

@ -11,6 +11,10 @@
right: 0; right: 0;
} }
.poll-result-wrapper {
cursor: pointer;
}
.poll-detail-button-wrapper { .poll-detail-button-wrapper {
display: flex; display: flex;
margin: auto 0; margin: auto 0;