From b2192106a115418d0ef2d61c9849d19e644c0d2c Mon Sep 17 00:00:00 2001 From: Innocent-akim Date: Mon, 18 Nov 2024 22:13:56 +0200 Subject: [PATCH] fix:bug --- .cspell.json | 2 +- apps/web/app/interfaces/IDailyPlan.ts | 8 ++++---- apps/web/components/pages/kanban/menu-kanban-card.tsx | 5 ++--- .../features/daily-plan/create-daily-plan-form-modal.tsx | 8 ++++---- .../features/integrations/calendar/table-time-sheet.tsx | 4 ++-- apps/web/lib/features/task/task-card.tsx | 2 +- 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.cspell.json b/.cspell.json index be2df850e..9c47d01cc 100644 --- a/.cspell.json +++ b/.cspell.json @@ -372,7 +372,7 @@ "tinvitations", "tnode", "Togger", - "tomorow", + "tomorrow", "Tongatapu", "tota", "TRANSFERT", diff --git a/apps/web/app/interfaces/IDailyPlan.ts b/apps/web/app/interfaces/IDailyPlan.ts index 8eba961df..e296af463 100644 --- a/apps/web/app/interfaces/IDailyPlan.ts +++ b/apps/web/app/interfaces/IDailyPlan.ts @@ -25,12 +25,12 @@ export interface ICreateDailyPlan extends IDailyPlanBase, IRelationnalEmployee, export interface IUpdateDailyPlan extends Partial, - Pick, - Partial> {} + Pick, + Partial> { } export interface IDailyPlanTasksUpdate extends Pick, - IBasePerTenantAndOrganizationEntity {} + IBasePerTenantAndOrganizationEntity { } export enum DailyPlanStatusEnum { OPEN = 'open', @@ -38,4 +38,4 @@ export enum DailyPlanStatusEnum { COMPLETED = 'completed' } -export type IDailyPlanMode = 'today' | 'tomorow' | 'custom'; +export type IDailyPlanMode = 'today' | 'tomorrow' | 'custom'; diff --git a/apps/web/components/pages/kanban/menu-kanban-card.tsx b/apps/web/components/pages/kanban/menu-kanban-card.tsx index 457433d6b..26ebbc833 100644 --- a/apps/web/components/pages/kanban/menu-kanban-card.tsx +++ b/apps/web/components/pages/kanban/menu-kanban-card.tsx @@ -170,7 +170,7 @@ export default function MenuKanbanCard({ item: task, member }: { item: ITeamTask
  • - +
  • @@ -227,8 +227,7 @@ function TeamMembersSelect(props: ITeamMemberSelectProps): JSX.Element { - `relative cursor-default select-none py-2 pl-10 pr-4 ${ - active ? 'bg-primary/5' : 'text-gray-900' + `relative cursor-default select-none py-2 pl-10 pr-4 ${active ? 'bg-primary/5' : 'text-gray-900' }` } value={member} diff --git a/apps/web/lib/features/daily-plan/create-daily-plan-form-modal.tsx b/apps/web/lib/features/daily-plan/create-daily-plan-form-modal.tsx index 2baacd152..147d9e459 100644 --- a/apps/web/lib/features/daily-plan/create-daily-plan-form-modal.tsx +++ b/apps/web/lib/features/daily-plan/create-daily-plan-form-modal.tsx @@ -91,7 +91,7 @@ export function CreateDailyPlanFormModal({ date: planMode == 'today' ? toDay - : planMode == 'tomorow' + : planMode == 'tomorrow' ? tomorrowDate : new Date(moment(date).format('YYYY-MM-DD')), status: DailyPlanStatusEnum.OPEN, @@ -302,12 +302,12 @@ function MembersList({ {(member?.employee?.user?.image?.thumbUrl || member?.employee?.user?.image?.fullUrl || member?.employee?.user?.imageUrl) && - isValidUrl( - member?.employee?.user?.image?.thumbUrl || + isValidUrl( + member?.employee?.user?.image?.thumbUrl || member?.employee?.user?.image?.fullUrl || member?.employee?.user?.imageUrl || '' - ) ? ( + ) ? ( )} - {planMode === 'tomorow' && !taskPlannedForTomorrow && ( + {planMode === 'tomorrow' && !taskPlannedForTomorrow && ( {isPending || createDailyPlanLoading ? (