diff --git a/src/app/core/models/choice.model.ts b/src/app/core/models/choice.model.ts
index 3bafb2eb..707e7100 100644
--- a/src/app/core/models/choice.model.ts
+++ b/src/app/core/models/choice.model.ts
@@ -1,6 +1,11 @@
import { Answer } from '../enums/answer.enum';
import { Owner } from './owner.model';
+export class ChoiceGroup {
+ date_string: string;
+ choices: Choice[];
+}
+
export class Choice {
public id: number;
public name: string;
diff --git a/src/app/core/models/poll.model.ts b/src/app/core/models/poll.model.ts
index 4a96c093..f64693f1 100644
--- a/src/app/core/models/poll.model.ts
+++ b/src/app/core/models/poll.model.ts
@@ -1,12 +1,7 @@
-import { Choice } from './choice.model';
+import { Choice, ChoiceGroup } from './choice.model';
import { Comment } from './comment.model';
import { Owner } from './owner.model';
-import { DateChoice, TimeSlices } from '../../../../mocks/old-stuff/config/defaultConfigs';
-
-export class ChoiceGroup {
- date_string: string;
- choices: Choice[];
-}
+import { DateChoice, TimeSlices } from './dateChoice.model';
export class Poll {
public id = 0;
diff --git a/src/app/features/administration/form/date-select/date-select.component.scss b/src/app/features/administration/form/date-select/date-select.component.scss
index a0c7f53e..a8e0edc6 100644
--- a/src/app/features/administration/form/date-select/date-select.component.scss
+++ b/src/app/features/administration/form/date-select/date-select.component.scss
@@ -1,9 +1,7 @@
:host {
.time-choice {
background: rgba(255, 255, 255, 1);
- //border: solid 1px #dedede;
padding: 0.5em;
- //padding: 20px 10px;
border-bottom: solid 1px #ccc;
color: rgba(0, 0, 0, 0.87);
box-sizing: border-box;
diff --git a/src/app/features/administration/form/date/list/day/day-list.component.scss b/src/app/features/administration/form/date/list/day/day-list.component.scss
index 9c5f784d..a2d8e796 100644
--- a/src/app/features/administration/form/date/list/day/day-list.component.scss
+++ b/src/app/features/administration/form/date/list/day/day-list.component.scss
@@ -1,5 +1,5 @@
.day-weekend {
- background: #dedede;
+ background: #dccfed;
}
.button {
min-width: 9ch;
@@ -12,6 +12,14 @@
.several-times {
padding-left: 2em;
}
+.date-choice {
+ &:nth-child(odd) {
+ background: #fbf8ff;
+ &.day-weekend {
+ background: #d7cae9;
+ }
+ }
+}
.date-choice-item {
width: 75%;
}
diff --git a/src/app/features/administration/form/form.component.ts b/src/app/features/administration/form/form.component.ts
index c45ab8b4..035715ed 100644
--- a/src/app/features/administration/form/form.component.ts
+++ b/src/app/features/administration/form/form.component.ts
@@ -116,7 +116,7 @@ export class FormComponent implements OnInit, AfterViewInit {
creatorEmail: '',
description: 'RSVP',
isAboutDate: true,
- hasSeveralHours: true,
+ hasSeveralHours: false,
kind: 'date',
password: '',
whoCanChangeAnswers: 'everybody',
@@ -134,7 +134,6 @@ export class FormComponent implements OnInit, AfterViewInit {
allowNewDateTime: false,
startDateInterval: dateStart,
endDateInterval: dateEnd,
- comments: [],
});
}
diff --git a/src/app/features/administration/success/success.component.html b/src/app/features/administration/success/success.component.html
index b4972eeb..3b37584b 100644
--- a/src/app/features/administration/success/success.component.html
+++ b/src/app/features/administration/success/success.component.html
@@ -72,7 +72,7 @@
Pour être sûr de retrouver ces liens, nous pouvons vous les envoyer sur votre mail :
-
+