Browse Source

Prod fix and change

merge-requests/373/merge
Oksana Stepanenko 2 years ago committed by Coder
parent
commit
b59bd01017
  1. 2
      src/modules/tasks/hooks/use-fetch-tasks-by-filter.hook.ts
  2. 2
      src/modules/tasks/smart-components/tasks-list.smart-component.tsx

2
src/modules/tasks/hooks/use-fetch-tasks-by-filter.hook.ts

@ -49,7 +49,7 @@ export const useFetchTasksByFilter = ({ @@ -49,7 +49,7 @@ export const useFetchTasksByFilter = ({
isOutdate: filter?.isOverdue,
status: filter?.status,
executorId: filter?.isMy ? accountId : filter?.executor?.id,
authorId: filter?.isMy ? null : filter?.creator?.id,
authorId: filter?.isMy ? accountId : filter?.creator?.id,
groupsIds: filter?.group ? [filter?.group?.id] : null,
targetDate: filter?.date,
startDateFrom: filter?.startDate,

2
src/modules/tasks/smart-components/tasks-list.smart-component.tsx

@ -41,7 +41,7 @@ export const TasksListSmart = ({ @@ -41,7 +41,7 @@ export const TasksListSmart = ({
onPressActionBtn,
}: IProps) => {
const isOverdueCheck = (endDate: string, status: TaskStatus) =>
moment(new Date()).isAfter(endDate) && status === TaskStatus.Active
moment(endDate).endOf('day') < moment() && status === TaskStatus.Active
const renderItem = (item: ITaskPreview, index: number) => (
<SwipableTaskCard

Loading…
Cancel
Save