Merge pull request #3121 from ever-co/stage

Stage
ever-co · Oct 3, 2024 · cc42d58 · cc42d58
2 parents ce5e77b + 3b6457e
commit cc42d58
Show file tree

Hide file tree

Showing 24 changed files with 818 additions and 363 deletions.
diff --git a/apps/web/app/constants.ts b/apps/web/app/constants.ts
@@ -285,7 +285,7 @@ export const TASKS_ESTIMATE_HOURS_MODAL_DATE = 'tasks-estimate-hours-modal-date'
 export const DAILY_PLAN_ESTIMATE_HOURS_MODAL_DATE = 'daily-plan-estimate-hours-modal';
 export const DEFAULT_PLANNED_TASK_ID = 'default-planned-task-id';
 export const LAST_OPTION__CREATE_DAILY_PLAN_MODAL = 'last-option--create-daily-plan-modal';
-export const HAS_VISITED_OUTSTANDING_TAB = 'has-visited-outstanding-tab';
+export const HAS_VISITED_OUTSTANDING_TASKS = 'has-visited-outstanding-tasks';
 
 // OAuth provider's keys
 

diff --git a/apps/web/app/hooks/features/useDailyPlan.ts b/apps/web/app/hooks/features/useDailyPlan.ts
@@ -147,9 +147,11 @@ export function useDailyPlan() {
 			createQueryCall,
 			employeePlans,
 			getMyDailyPlans,
-			profileDailyPlans,
+			profileDailyPlans.items,
+			profileDailyPlans.total,
 			setEmployeePlans,
 			setProfileDailyPlans,
+			user?.employee?.id,
 			user?.tenantId
 		]
 	);

diff --git a/apps/web/lib/components/accordian.tsx b/apps/web/lib/components/accordian.tsx
@@ -30,7 +30,7 @@ export const Accordian = ({ children, title, className, isDanger, id, defaultOpe
 
 								<ChevronUpIcon
 									className={`${
-										open ? 'rotate-180 transform' : ''
+										!open ? 'rotate-180 transform' : ''
 									} h-5 w-5 text-[#292D32] dark:text-white`}
 								/>
 							</Disclosure.Button>

diff --git a/apps/web/lib/components/modal.tsx b/apps/web/lib/components/modal.tsx
@@ -11,6 +11,7 @@ type Props = {
 	description?: string;
 	isOpen: boolean;
 	closeModal: () => void;
+	customCloseModal?: () => void;
 	className?: string;
 	alignCloseIcon?: boolean;
 	showCloseIcon?: boolean;
@@ -19,6 +20,7 @@ type Props = {
 export function Modal({
 	isOpen,
 	closeModal,
+	customCloseModal,
 	children,
 	title,
 	titleClass,
@@ -54,7 +56,10 @@ export function Modal({
 						{description && <Dialog.Description>{description}</Dialog.Description>}
 						{showCloseIcon && (
 							<div
-								onClick={closeModal}
+								onClick={() => {
+									closeModal();
+									customCloseModal?.();
+								}}
 								className={`absolute ${
 									alignCloseIcon ? 'right-2 top-3' : 'right-3 top-3'
 								}  md:right-2 md:top-3 cursor-pointer z-50`}