tykayn
/
funky-framadate-front
mirror of https://framagit.org/framasoft/framadate/funky-framadate-front.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

⚡ link graphic in nav

This commit is contained in:
Baptiste Lemoine 2019-11-19 14:53:53 +01:00
parent e81389eae1
commit c0f800ff91
4 changed files with 58 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/app/config/Routes.ts
View File

@ -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},
]
;

11
src/app/poll-graphic/poll-graphic.component.html
View File

@ -3,18 +3,17 @@
name="selector"
autofocus="autofocus"
[(ngModel)]="isColorblind"
(change)="setColorblind()"
(change)="toggleColorblind()"
>
<option value="colorblind">
<option value="true">
{{ "pollGraphic.choiceColorblind" | translate }}
</option>
<option value="notColorblind">
<option value="false">
{{ "pollGraphic.choiceNotColorblind" | translate }}
</option>
</select>
{{ "pollGraphic.colorblindText" | translate }}
{{ "pollGraphic.colorblindText" | translate }}
<div>
<canvas id="graph" width="100" height="50"></canvas>
</div>

20
src/app/poll-graphic/poll-graphic.component.ts
View File

@ -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;

57
src/app/ui/navigation/navigation.component.html
View File

@ -1,29 +1,32 @@
<nav class="choices">
<a [routerLink]="'/step/creation'" i18n>
Création
</a>
<a [routerLink]="'/step/date'" i18n>
Les Dates
</a>
<a [routerLink]="'/step/answers'" i18>
Réponses
</a>
<a [routerLink]="'/step/visibility'" i18n>
Visibilité
</a>
<a [routerLink]="'/step/base'" i18n>
Base
</a>
<a [routerLink]="'/step/pictures'" i18n>
Images
</a>
<a [routerLink]="'/step/resume'" i18n>
Résumé
</a>
<a [routerLink]="'/step/kind'" i18n>
Page démo
</a>
<a [routerLink]="'/home'" i18n>
Accueil
</a>
<a [routerLink]="'/step/creation'" i18n>
Création
</a>
<a [routerLink]="'/step/date'" i18n>
Les Dates
</a>
<a [routerLink]="'/step/answers'" i18>
Réponses
</a>
<a [routerLink]="'/step/visibility'" i18n>
Visibilité
</a>
<a [routerLink]="'/step/base'" i18n>
Base
</a>
<a [routerLink]="'/step/pictures'" i18n>
Images
</a>
<a [routerLink]="'/step/resume'" i18n>
Résumé
</a>
<a [routerLink]="'/step/kind'" i18n>
Page démo
</a>
<a [routerLink]="'/graphic/toto'" i18n>
Graphique
</a>
<a [routerLink]="'/home'" i18n>
Accueil
</a>
</nav>