admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/2023-03-24' into feature/america

Browse Source
This commit is contained in:
Patrick Fic
2023-03-24 08:39:36 -07:00
parent 27452085e9 2bff7d9567
commit f54c2367f3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/components/schedule-calendar/schedule-calendar.component.jsx
View File

@@ -49,7 +49,7 @@ export function ScheduleCalendarComponent({ data, refetch, bodyshop }) {
filter.employeevacation && filter.employeevacation &&
!!d.employee)) && !!d.employee)) &&
(filter.ins_co_nm && filter.ins_co_nm.length > 0 (filter.ins_co_nm && filter.ins_co_nm.length > 0
? filter.ins_co_nm.includes(d.job.ins_co_nm) ? filter.ins_co_nm.includes(d.job?.ins_co_nm)
: true) : true)
); );
}, [data, filter]); }, [data, filter]);
@@ -69,7 +69,7 @@ export function ScheduleCalendarComponent({ data, refetch, bodyshop }) {
placeholder={t("schedule.labels.ins_co_nm_filter")} placeholder={t("schedule.labels.ins_co_nm_filter")}
allowClear allowClear
onClear={() => setFilter({ ...filter, ins_co_nm: [] })} onClear={() => setFilter({ ...filter, ins_co_nm: [] })}
value={filter?.ins_co_nm} value={filter?.ins_co_nm ? filter.ins_co_nm : []}
onChange={(e) => { onChange={(e) => {
setFilter({ ...filter, ins_co_nm: e }); setFilter({ ...filter, ins_co_nm: e });
}} }}