From c0f800ff91822255a4d84e18106d238506dfaab4 Mon Sep 17 00:00:00 2001 From: Baptiste Lemoine Date: Tue, 19 Nov 2019 14:53:53 +0100 Subject: [PATCH] :zap: link graphic in nav --- src/app/config/Routes.ts | 24 ++++---- .../poll-graphic/poll-graphic.component.html | 11 ++-- .../poll-graphic/poll-graphic.component.ts | 20 ++++--- .../ui/navigation/navigation.component.html | 57 ++++++++++--------- 4 files changed, 58 insertions(+), 54 deletions(-) diff --git a/src/app/config/Routes.ts b/src/app/config/Routes.ts index af8f3df6..7cf26526 100644 --- a/src/app/config/Routes.ts +++ b/src/app/config/Routes.ts @@ -1,14 +1,14 @@ -import { KindComponent } from "../pages/kind/kind.component"; -import { DatesComponent } from "../pages/dates/dates.component"; -import { VisibilityComponent } from "../pages/visibility/visibility.component"; -import { ResumeComponent } from "../pages/resume/resume.component"; -import { PicturesComponent } from "../pages/pictures/pictures.component"; -import { EndConfirmationComponent } from "../pages/end-confirmation/end-confirmation.component"; -import { AnswersComponent } from "../pages/answers/answers.component"; -import { CreateOrRetrieveComponent } from "../pages/create-or-retrieve/create-or-retrieve.component"; -import { BaseComponent } from "../pages/base-page/base.component"; -import { HomeComponent } from "../pages/home/home.component"; -import { PollGraphicComponent } from '../poll-graphic/poll-graphic.component'; +import {KindComponent} from "../pages/kind/kind.component"; +import {DatesComponent} from "../pages/dates/dates.component"; +import {VisibilityComponent} from "../pages/visibility/visibility.component"; +import {ResumeComponent} from "../pages/resume/resume.component"; +import {PicturesComponent} from "../pages/pictures/pictures.component"; +import {EndConfirmationComponent} from "../pages/end-confirmation/end-confirmation.component"; +import {AnswersComponent} from "../pages/answers/answers.component"; +import {CreateOrRetrieveComponent} from "../pages/create-or-retrieve/create-or-retrieve.component"; +import {BaseComponent} from "../pages/base-page/base.component"; +import {HomeComponent} from "../pages/home/home.component"; +import {PollGraphicComponent} from '../poll-graphic/poll-graphic.component'; import {VoteChoiceComponent} from "../vote-choice/vote-choice.component"; /** @@ -28,7 +28,7 @@ export const Routes = {path: 'step/visibility', component: VisibilityComponent}, {path: 'step/resume', component: ResumeComponent}, {path: 'step/end', component: EndConfirmationComponent}, - { path: "graphic/:poll", component: PollGraphicComponent }, + {path: 'graphic/:poll', component: PollGraphicComponent}, {path: 'votechoice', component: VoteChoiceComponent}, ] ; diff --git a/src/app/poll-graphic/poll-graphic.component.html b/src/app/poll-graphic/poll-graphic.component.html index 731002b5..6f969732 100644 --- a/src/app/poll-graphic/poll-graphic.component.html +++ b/src/app/poll-graphic/poll-graphic.component.html @@ -3,18 +3,17 @@ name="selector" autofocus="autofocus" [(ngModel)]="isColorblind" - (change)="setColorblind()" + (change)="toggleColorblind()" > - - - {{ "pollGraphic.colorblindText" | translate }} +{{ "pollGraphic.colorblindText" | translate }}
- - \ No newline at end of file + diff --git a/src/app/poll-graphic/poll-graphic.component.ts b/src/app/poll-graphic/poll-graphic.component.ts index 2ad7a7f9..f3ba0682 100644 --- a/src/app/poll-graphic/poll-graphic.component.ts +++ b/src/app/poll-graphic/poll-graphic.component.ts @@ -1,5 +1,5 @@ -import { Component, OnInit } from "@angular/core"; -import { Chart } from "chart.js"; +import {Component, OnInit} from "@angular/core"; +import {Chart} from "chart.js"; @Component({ selector: "framadate-poll-graphic", @@ -7,7 +7,7 @@ import { Chart } from "chart.js"; styleUrls: ["./poll-graphic.component.scss"] }) export class PollGraphicComponent implements OnInit { - isColorblind: boolean; + isColorblind: boolean = false; lineChart: Chart; pollData: any; yesList: number[] = []; @@ -15,7 +15,9 @@ export class PollGraphicComponent implements OnInit { noList: number[] = []; nbPoll: number = 0; dateList: string[] = []; - constructor() {} + + constructor() { + } ngOnInit() { var toto = { @@ -100,11 +102,11 @@ export class PollGraphicComponent implements OnInit { ] }, options: { - legend: { display: false }, + legend: {display: false}, scales: { xAxes: [ { - gridLines: { drawBorder: false, display: false }, + gridLines: {drawBorder: false, display: false}, display: false, stacked: true, ticks: { @@ -116,7 +118,7 @@ export class PollGraphicComponent implements OnInit { ], yAxes: [ { - gridLines: { drawBorder: true, display: false }, + gridLines: {drawBorder: true, display: false}, display: true, stacked: true } @@ -126,7 +128,7 @@ export class PollGraphicComponent implements OnInit { }); } - setColorblind() { + toggleColorblind() { this.isColorblind = !this.isColorblind; } @@ -151,7 +153,7 @@ export class PollGraphicComponent implements OnInit { initPollCounter() { this.nbPoll++; - this.dateList[this.nbPoll -1] = "jeudi"; + this.dateList[this.nbPoll - 1] = "jeudi"; this.maybeList[this.nbPoll - 1] = 0; this.yesList[this.nbPoll - 1] = 0; this.noList[this.nbPoll - 1] = 0; diff --git a/src/app/ui/navigation/navigation.component.html b/src/app/ui/navigation/navigation.component.html index c7fa566b..fcce0856 100644 --- a/src/app/ui/navigation/navigation.component.html +++ b/src/app/ui/navigation/navigation.component.html @@ -1,29 +1,32 @@