diff --git a/src/app/components/shared/list-statistic/list-statistic.component.html b/src/app/components/shared/list-statistic/list-statistic.component.html index 7819f3608c4d7bd8cba763efd187d40e8b9f9de2..f15b78a3b1e11bb9fc536d2ef1cb82f20e1fa99e 100644 --- a/src/app/components/shared/list-statistic/list-statistic.component.html +++ b/src/app/components/shared/list-statistic/list-statistic.component.html @@ -1,6 +1,6 @@ <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}}" diff --git a/src/app/components/shared/list-statistic/list-statistic.component.scss b/src/app/components/shared/list-statistic/list-statistic.component.scss index 4a6726750c90690cd07b3c0b496a2088a91daa27..00adbe55fb791540cd3ecc77c8db0ea22aff6f48 100644 --- a/src/app/components/shared/list-statistic/list-statistic.component.scss +++ b/src/app/components/shared/list-statistic/list-statistic.component.scss @@ -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); +} diff --git a/src/app/components/shared/list-statistic/list-statistic.component.ts b/src/app/components/shared/list-statistic/list-statistic.component.ts index c1223d79b8dda5337922ea66e5a0ea6432f07ac6..3480e3ece17c69ebae2b386b12930cd9ae84d050 100644 --- a/src/app/components/shared/list-statistic/list-statistic.component.ts +++ b/src/app/components/shared/list-statistic/list-statistic.component.ts @@ -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); diff --git a/src/theme/blue-theme/blueTheme.const.ts b/src/theme/blue-theme/blueTheme.const.ts index 36e771589e16ff3e939ad1e1b12c286889b9162f..38b2781314c080a099585b5b7dce9562e9136e8b 100644 --- a/src/theme/blue-theme/blueTheme.const.ts +++ b/src/theme/blue-theme/blueTheme.const.ts @@ -15,7 +15,7 @@ export const blue = { '--on-background': '#000000', '--on-surface': '#000000', - '--green': '#AED581', + '--green': '#81c784', '--red': '#FF8A80', '--yellow': '#FFD54F', '--blue': '#3f51b5', diff --git a/src/theme/dark-theme/darkTheme.const.ts b/src/theme/dark-theme/darkTheme.const.ts index b25e5738b7b036c41dbaace3bcc36c48d58eb8b1..192c876839cf4c368917b2e3784d177bb2e54a5e 100644 --- a/src/theme/dark-theme/darkTheme.const.ts +++ b/src/theme/dark-theme/darkTheme.const.ts @@ -15,7 +15,7 @@ export const dark = { '--on-background': '#FFFFFF', '--on-surface': '#FFFFFF', - '--green': '#AED581', + '--green': '#81c784', '--red': '#FF8A80', '--yellow': '#FFD54F', '--blue': '#3f51b5', diff --git a/src/theme/default-theme/_variables.scss b/src/theme/default-theme/_variables.scss index 81c04ab7cabcc8da8e4943ebbe24fcba8ae5185d..b12daaf80b49fadc02a8353eaa3c48501389ccfa 100644 --- a/src/theme/default-theme/_variables.scss +++ b/src/theme/default-theme/_variables.scss @@ -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). diff --git a/src/theme/default-theme/defaultTheme.const.ts b/src/theme/default-theme/defaultTheme.const.ts index 365c782c274062b69f10df27155df7e4d998aa2f..143687c13b8f353a8f9c6bf175c83e839434b36e 100644 --- a/src/theme/default-theme/defaultTheme.const.ts +++ b/src/theme/default-theme/defaultTheme.const.ts @@ -15,7 +15,7 @@ export const arsnova = { '--on-background': '#000000', '--on-surface': '#000000', - '--green': '#AED581', + '--green': '#81c784', '--red': '#FF8A80', '--yellow': '#FFD54F', '--blue': '#3f51b5', diff --git a/src/theme/purple-theme/purpleTheme.const.ts b/src/theme/purple-theme/purpleTheme.const.ts index 3d892b1cd796575f9d956b0e3d8fe5aac07555be..3eaa032ea275dd5931c9e8fc694769f819900a7f 100644 --- a/src/theme/purple-theme/purpleTheme.const.ts +++ b/src/theme/purple-theme/purpleTheme.const.ts @@ -15,7 +15,7 @@ export const purple = { '--on-background': '#000000', '--on-surface': '#000000', - '--green': '#AED581', + '--green': '#81c784', '--red': '#FF8A80', '--yellow': '#FFD54F', '--blue': '#3f51b5',