Skip to content
Snippets Groups Projects
Commit 12e58382 authored by Lukas Mauß's avatar Lukas Mauß
Browse files

Enable statistics for yes/no-contents + improvements

parent 6ec35cf1
1 merge request!185Fix statistics list
Pipeline #26462 passed with stages
in 5 minutes and 40 seconds
<mat-toolbar></mat-toolbar>
<mat-progress-bar class="progress-theme" mode="determinate" value="{{total}}"
*ngIf="total > status.good" color="primary"></mat-progress-bar>
*ngIf="total >= status.good" color="primary"></mat-progress-bar>
<mat-progress-bar class="progress-theme" mode="determinate" value="{{total}}"
*ngIf="total < status.good && total >= status.okay" color="accent"></mat-progress-bar>
<mat-progress-bar class="progress-theme" mode="determinate" value="{{total}}"
......
......@@ -30,7 +30,7 @@ mat-header-cell {
mat-cell {
color: black!important;
background-color: var(--grey-light);
background-color: var(--grey);
}
mat-toolbar {
......@@ -58,3 +58,7 @@ mat-toolbar {
.invisible {
color: var(--grey)!important;
}
#okayP {
color: var(--yellow);
}
......@@ -97,7 +97,7 @@ export class ListStatisticComponent implements OnInit {
for (let i = 0; i < length; i++) {
this.dataSource[i] = new ContentStatistic(null, null, 0, 0, 0 );
this.dataSource[i].content = this.contents[i];
if (contents[i].format === ContentType.CHOICE) {
if (contents[i].format === ContentType.CHOICE || contents[i].format === ContentType.BINARY) {
this.contentService.getAnswer(contents[i].id).subscribe(answer => {
if (contents[i].multiple) {
percent = this.evaluateMultiple(contents[i].options, answer.roundStatistics[0].combinatedCounts);
......
......@@ -15,7 +15,7 @@ export const blue = {
'--on-background': '#000000',
'--on-surface': '#000000',
'--green': '#AED581',
'--green': '#81c784',
'--red': '#FF8A80',
'--yellow': '#FFD54F',
'--blue': '#3f51b5',
......
......@@ -15,7 +15,7 @@ export const dark = {
'--on-background': '#FFFFFF',
'--on-surface': '#FFFFFF',
'--green': '#AED581',
'--green': '#81c784',
'--red': '#FF8A80',
'--yellow': '#FFD54F',
'--blue': '#3f51b5',
......
......@@ -2,7 +2,7 @@
// Define the palettes for your theme using the Material Design palettes available in palette.scss
// (imported above). For each palette, you can optionally specify a default, lighter, and darker
// hue. Available color palettes: https://www.google.com/design/spec/style/color.html
$arsnova-primary: mat-palette($mat-teal,300);
$arsnova-primary: mat-palette($mat-green,300);
$arsnova-accent: mat-palette($mat-orange, 200); //$mat-blue-gray, A200, A100, A400);
// The warn palette is optional (defaults to red).
......
......@@ -15,7 +15,7 @@ export const arsnova = {
'--on-background': '#000000',
'--on-surface': '#000000',
'--green': '#AED581',
'--green': '#81c784',
'--red': '#FF8A80',
'--yellow': '#FFD54F',
'--blue': '#3f51b5',
......
......@@ -15,7 +15,7 @@ export const purple = {
'--on-background': '#000000',
'--on-surface': '#000000',
'--green': '#AED581',
'--green': '#81c784',
'--red': '#FF8A80',
'--yellow': '#FFD54F',
'--blue': '#3f51b5',
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment