Liness/framadate-responsive
5
0
Fork 0
forked from tykayn/funky-framadate-front
Code Pull Requests Activity

put back leaving modal, and focus on hour choice when we add one for a day

Browse Source
This commit is contained in:
tykayn 2022-03-21 13:50:38 +01:00 committed by Baptiste Lemoine
parent 5e92466854
commit 778f5b4716
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/features/administration/form/steps/step-four/step-four.component.html
View File

@ -39,7 +39,7 @@
<div class="add-time-choice"> <div class="add-time-choice">
<button <button
class="has-text-primary has-no-border is-large-button has-text-left has-background-transparent has-background-plus has-background-icon-left is-filtered-icon-primary" class="has-text-primary has-no-border is-large-button has-text-left has-background-transparent has-background-plus has-background-icon-left is-filtered-icon-primary"
(click)="addChoiceForDay(day_id, dayChoice)" (click)="addChoiceHourForDay(day_id, dayChoice)"
> >
{{ 'hours.add' | translate }} {{ 'hours.add' | translate }}
</button> </button>

13
src/app/features/administration/form/steps/step-four/step-four.component.ts
View File

@ -51,25 +51,16 @@ export class StepFourComponent implements OnInit {
}); });
} }
addChoiceForDay(day_id, dayChoice: DateChoice): void { addChoiceHourForDay(day_id, dayChoice: DateChoice): void {
let lastDateChoice = this.pollService.dateChoiceList[this.pollService.dateChoiceList.length]; let lastDateChoice = this.pollService.dateChoiceList[this.pollService.dateChoiceList.length];
let lastDateChoiceObject = this.dateUtilitiesService.addDaysToDate(
this.pollService.dateChoiceList.length,
new Date()
);
if (lastDateChoice && lastDateChoice.date_object) {
lastDateChoiceObject = lastDateChoice.date_object;
} else {
lastDateChoiceObject = new Date();
}
dayChoice.timeSlices.push({ dayChoice.timeSlices.push({
literal: '', literal: '',
}); });
dayChoice.timeSlices.sort((a: any, b: any) => { dayChoice.timeSlices.sort((a: any, b: any) => {
return a.date_object - b.date_object; return a.date_object - b.date_object;
}); });
this.focusOnChoice(day_id, this.storageService.dateChoices.length - 1); this.focusOnChoice(day_id, dayChoice.timeSlices.length - 1);
} }
focusOnChoice(day_id, index): void { focusOnChoice(day_id, index): void {