Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stage #3120

Merged
merged 20 commits into from
Oct 3, 2024
Merged

Stage #3120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
d721732
In tab 'Tomorrow' button 'Edit Plan' should be active even if warning…
CREDO23 Sep 26, 2024
817d766
disable only past date without plan
CREDO23 Sep 26, 2024
7190b05
feat: user can create plan from 'See Plans' modal / calendar
CREDO23 Sep 27, 2024
e76fd64
feat: user can add tasks for today / tomorrow plan from 'See plan' modal
CREDO23 Sep 30, 2024
366136e
use i18
CREDO23 Sep 30, 2024
46e01fd
Merge pull request #3087 from ever-co/3028-improvement-see-plan--abil…
evereq Oct 1, 2024
298f16c
Merge pull request #3082 from ever-co/3007-improvement-see-plan--add-…
evereq Oct 1, 2024
8c4eba2
refactor: display notifications one time per day (#3065)
CREDO23 Oct 1, 2024
50ac797
improve past plans view
CREDO23 Oct 1, 2024
9ef979e
fix dropdowns in 'See plan' modal
CREDO23 Oct 2, 2024
07c7917
merge develop
CREDO23 Oct 1, 2024
641d419
user is able to double-click on specific dates and see a Plan
CREDO23 Oct 2, 2024
4674f00
[Fix] Settings | Icon direction
land-bit Oct 3, 2024
3d6b72c
feat: impreove the warnings order
CREDO23 Oct 3, 2024
b9cd449
Merge pull request #3097 from ever-co/3061-improvement-see-plan--past…
evereq Oct 3, 2024
0e1939f
Merge pull request #3103 from ever-co/3062-improvement-see-plan--drop…
evereq Oct 3, 2024
dc9907f
Merge pull request #3110 from ever-co/3063-improvement-see-plan--how-…
evereq Oct 3, 2024
6540f49
Merge pull request #3112 from land-bit/develop
evereq Oct 3, 2024
0da0f0f
[NORTHFLANK] Updated template file contents
northflank-cloud-build-run[bot] Oct 3, 2024
bd50011
Merge pull request #3118 from ever-co/2903-improvement-planned--warni…
evereq Oct 3, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/web/app/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 3 additions & 1 deletion apps/web/app/hooks/features/useDailyPlan.ts
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,11 @@ export function useDailyPlan() {
createQueryCall,
employeePlans,
getMyDailyPlans,
profileDailyPlans,
profileDailyPlans.items,
profileDailyPlans.total,
setEmployeePlans,
setProfileDailyPlans,
user?.employee?.id,
user?.tenantId
]
);
Expand Down
2 changes: 1 addition & 1 deletion apps/web/lib/components/accordian.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 6 additions & 1 deletion apps/web/lib/components/modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ type Props = {
description?: string;
isOpen: boolean;
closeModal: () => void;
customCloseModal?: () => void;
className?: string;
alignCloseIcon?: boolean;
showCloseIcon?: boolean;
Expand All @@ -19,6 +20,7 @@ type Props = {
export function Modal({
isOpen,
closeModal,
customCloseModal,
children,
title,
titleClass,
Expand Down Expand Up @@ -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`}
Expand Down
Loading
Loading