Merge branch 'main' of https://git.shiblysolution.id/SAUDE-TL/service-master-data
This commit is contained in:
@ -103,6 +103,7 @@ export class ScheduleModel {
|
|||||||
.andWhere("ScheduleSeries.start_date <= :rangeEndDate", { rangeEndDate: dayjs(rangeEnd).format("YYYY-MM-DD") })
|
.andWhere("ScheduleSeries.start_date <= :rangeEndDate", { rangeEndDate: dayjs(rangeEnd).format("YYYY-MM-DD") })
|
||||||
.andWhere("(ScheduleSeries.until_date IS NULL OR ScheduleSeries.until_date >= :rangeStartDate)", { rangeStartDate: dayjs(rangeStart).format("YYYY-MM-DD") })
|
.andWhere("(ScheduleSeries.until_date IS NULL OR ScheduleSeries.until_date >= :rangeStartDate)", { rangeStartDate: dayjs(rangeStart).format("YYYY-MM-DD") })
|
||||||
.andWhere("ScheduleSeries.deleted_at IS NULL")
|
.andWhere("ScheduleSeries.deleted_at IS NULL")
|
||||||
|
.orderBy("ScheduleSeries.start_time", "ASC")
|
||||||
.getMany();
|
.getMany();
|
||||||
|
|
||||||
const allEvents: any[] = [];
|
const allEvents: any[] = [];
|
||||||
|
|||||||
Reference in New Issue
Block a user