diff --git a/src/app/features/consultation/poll-results-compact/poll-results-compact.component.ts b/src/app/features/consultation/poll-results-compact/poll-results-compact.component.ts
index 6df66375..366d421d 100644
--- a/src/app/features/consultation/poll-results-compact/poll-results-compact.component.ts
+++ b/src/app/features/consultation/poll-results-compact/poll-results-compact.component.ts
@@ -16,7 +16,6 @@ import { StorageService } from '../../../core/services/storage.service';
export class PollResultsCompactComponent implements OnInit {
@Input() public poll: Poll;
public answerEnum = Answer;
-
constructor(private modalService: ModalService, private storageService: StorageService) {}
ngOnInit(): void {
@@ -35,4 +34,19 @@ export class PollResultsCompactComponent implements OnInit {
showAsDate(date_string: string) {
return new Date(date_string);
}
+
+ toggleAllOfChoice(groupe: any) {
+ console.log('groupe', groupe);
+
+ if (!groupe.subSetToYes) {
+ this.storageService.setAllSubchoicesTo(groupe, 'yes');
+ groupe.subSetToYes = true;
+ } else {
+ this.storageService.setAllSubchoicesTo(groupe, '');
+ groupe.subSetToYes = false;
+ }
+ // savoir si on a déjà tout mis en "yes"
+ // si oui, on enlève toutes les réponses
+ // autrement on met tout à "yes"
+ }
}
diff --git a/src/app/features/consultation/poll-results-detailed/poll-results-detailed.component.html b/src/app/features/consultation/poll-results-detailed/poll-results-detailed.component.html
index 8468857a..f8ba850b 100644
--- a/src/app/features/consultation/poll-results-detailed/poll-results-detailed.component.html
+++ b/src/app/features/consultation/poll-results-detailed/poll-results-detailed.component.html
@@ -8,7 +8,7 @@
{{ choice.name }}
- {{ choice.name | date: 'short':'Europe/Paris':'fr_FR' }}
+ {{ make_date(choice.name) | date: 'fullDate':'Europe/Paris':'fr_FR' }}
diff --git a/src/app/features/consultation/poll-results-detailed/poll-results-detailed.component.scss b/src/app/features/consultation/poll-results-detailed/poll-results-detailed.component.scss
index 5feaefdb..3f667c6b 100644
--- a/src/app/features/consultation/poll-results-detailed/poll-results-detailed.component.scss
+++ b/src/app/features/consultation/poll-results-detailed/poll-results-detailed.component.scss
@@ -10,6 +10,11 @@
background: #ffd7d7;
}
+table {
+ overflow: scroll;
+ max-width: 90vw !important;
+ display: block;
+}
table {
th,
th * {
diff --git a/src/app/features/consultation/poll-results-detailed/poll-results-detailed.component.ts b/src/app/features/consultation/poll-results-detailed/poll-results-detailed.component.ts
index 556c2df3..8a4cc7dd 100644
--- a/src/app/features/consultation/poll-results-detailed/poll-results-detailed.component.ts
+++ b/src/app/features/consultation/poll-results-detailed/poll-results-detailed.component.ts
@@ -1,6 +1,5 @@
import { Component, Input, OnInit } from '@angular/core';
-import { Answer } from '../../../core/enums/answer.enum';
import { Poll } from '../../../core/models/poll.model';
import { PollService } from '../../../core/services/poll.service';
@@ -24,4 +23,10 @@ export class PollResultsDetailedComponent {
}
return null;
}
+
+ make_date(name: string) {
+ name = name.substr(0, 24);
+ console.log('name.length', name.length, name);
+ return new Date(name);
+ }
}
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 0e893209..05b0fc11 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -3,12 +3,12 @@
// The list of file replacements can be found in `angular.json`.
const backendApiUrlsInDev = {
- local: 'http://tktest.lan/api/v1',
- remote: 'http://tktest.lan/api/v1',
+ local: 'http://127.0.0.1:8000/api/v1',
+ remote: 'http://127.0.0.1:8000/api/v1',
// remote: 'https://framadate-api.cipherbliss.com/api/v1',
};
const apiV1 = {
- baseHref: 'http://tktest.lan/api/v1',
+ baseHref: 'http://127.0.0.1:8000/api/v1',
// baseHref: 'https://framadate-api.cipherbliss.com/api/v1',
api_new_poll: '/poll/',
api_get_poll: '/poll/{id}',
@@ -18,7 +18,7 @@ const apiV1 = {
};
export const environment = {
- frontDomain: 'http://tktest.lan',
+ frontDomain: 'http://127.0.0.1:8000',
production: false,
display_routes: false,
autofill: true,