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

add and sort dates in text mode

Browse Source
This commit is contained in:
Tykayn 2021-11-17 17:03:24 +01:00 committed by tykayn
parent 0f4aac7e81
commit b1b6ec650a
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/core/services/poll.service.ts
View File

@ -669,7 +669,9 @@ export class PollService implements Resolve<Poll> {
for (let someDate of this.calendar) {
converted.push(this.DateUtilitiesService.convertDateToDateChoiceObject(someDate));
}
this.dateChoiceList = converted;
this.dateChoiceList = converted.sort((first: any, second: any) => {
return second.date_object < first.date_object;
});
return converted;
}

18
src/app/features/administration/form/date/list/day/day-list.component.ts
View File

@ -129,8 +129,24 @@ export class DayListComponent {
}
addChoice(optionalLabel = ''): void {
this.pollService.dateChoiceList.push(this.dateUtilitiesService.convertDateToDateChoiceObject(new Date()));
let lastDateChoice = this.pollService.dateChoiceList[this.pollService.dateChoiceList.length];
console.log('lastDateChoice', lastDateChoice);
let lastDateChoiceObject = this.dateUtilitiesService.addDaysToDate(
this.pollService.dateChoiceList.length,
new Date()
);
if (lastDateChoice && lastDateChoice.date_object) {
lastDateChoiceObject = lastDateChoice.date_object;
}
this.pollService.dateChoiceList.push(
this.dateUtilitiesService.convertDateToDateChoiceObject(
this.dateUtilitiesService.addDaysToDate(1, lastDateChoiceObject)
)
);
this.pollService.dateChoiceList = this.pollService.dateChoiceList.sort((a: any, b: any) => {
return b.date_object < a.date_object;
});
this.focusOnChoice(this.storageService.dateChoices.length - 1);
}

2
src/app/features/administration/form/steps/step-two/step-two.component.ts
View File

@ -42,8 +42,6 @@ export class StepTwoComponent implements OnInit {
this.pollService.step_current = 2;
}
addIntervalOfDates() {}
get choices(): FormArray {
return this.form.get('choices') as FormArray;
}