diff --git a/src/components/Calendar/calendarComponent.scss b/src/components/Calendar/calendarComponent.scss index ec3f0358..3e43059f 100644 --- a/src/components/Calendar/calendarComponent.scss +++ b/src/components/Calendar/calendarComponent.scss @@ -243,6 +243,26 @@ } } +.selectDays { + border-style: dashed !important; + + &:hover { + background-color: #edf1ff !important; + } +} + +.selectedDay { + background-color: #edf1ff !important; + + &:hover { + background-color: #edf1ff !important; + } +} + +.disable { + pointer-events: none; +} + .before { background-color: #e5f9b6 !important; } @@ -272,66 +292,6 @@ font-weight: 500; position: relative; - .react-datepicker-wrapper { - display: none; - } - - .react-datepicker__tab-loop { - position: absolute; - top: 50px; - } - - .react-datepicker-popper { - transform: none !important; - } - - .datePicker { - visibility: hidden; - height: 0; - padding: 0; - width: 0; - position: absolute; - } - - .react-datepicker { - border: 1px solid #398208; - } - - .react-datepicker-popper { - top: -15px !important; - } - - .react-datepicker__current-month { - font-size: 14px; - font-family: "LabGrotesque", sans-serif; - text-transform: capitalize; - } - - .react-datepicker__header { - padding: 5px 0 10px; - border-bottom: 1px solid #398208; - } - - .react-datepicker__day { - font-size: 14px; - width: 35px; - font-family: "LabGrotesque", sans-serif; - } - - .react-datepicker__day-name { - font-size: 14px; - width: 35px; - font-family: "LabGrotesque", sans-serif; - } - - .react-datepicker__triangle { - transform: translate(140px, 0px) !important; - - &:before { - border-bottom-color: #398208 !important; - } - } - .select { border-radius: 5px; border: 1px solid #c4c4c4; @@ -341,4 +301,11 @@ text-align: center; min-width: 350px; } + + .close { + cursor: pointer; + margin-left: 8px; + width: 14px; + height: 14px; + } } diff --git a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx index fd50c8be..7a7f38e6 100644 --- a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx +++ b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx @@ -553,7 +553,7 @@ export const TicketFullScreen = () => { })} {projectInfo.projectUsers?.length > 3 && ( - +1 + +1 )} { setCalendar(calendarHelper(value)); + calendarHelper(value).map((array) => { + setSelectedRangeDays((prevState) => ({...prevState, [array[0]]: false})) + }) }, [value]); useEffect(() => { @@ -103,10 +103,8 @@ export const ProfileCalendarComponent = React.memo( return value.clone().add(1, "month"); } - function reportsByDate(start, end) { - const requestDates = `fromDate=${getCorrectYYMMDD( - start - )}&toDate=${getCorrectYYMMDD(end)}`; + function reportsByDate(endDay) { + const requestDates = `fromDate=${getCorrectYYMMDD(startDate._d)}&toDate=${getCorrectYYMMDD(endDay._d)}`; apiRequest( `/reports/reports-by-date?${requestDates}&user_card_id=${localStorage.getItem( "cardId" @@ -124,6 +122,36 @@ export const ProfileCalendarComponent = React.memo( }); } + function rangeDays (day) { + if (!startDate) { + setStartDate(day) + } else { + setEndDate(day) + reportsByDate(day) + } + } + + function onMouseRangeDays (day) { + let selectRange = {} + for (let curDay in selectedRangeDays) { + if (day > startDate && new Date(curDay) > startDate && new Date(curDay) < day) { + selectRange[curDay] = true + } else { + selectRange[curDay] = false + } + } + setSelectedRangeDays(selectRange) + } + + function resetRangeDays () { + setStartDate(null) + setEndDate(null) + setTotalRangeHours(0) + calendarHelper(value).map((array) => { + setSelectedRangeDays((prevState) => ({...prevState, [array[0]]: false})) + }) + } + return (
@@ -183,16 +211,27 @@ export const ProfileCalendarComponent = React.memo( week.map((day) => (
{shortReport && }
diff --git a/src/pages/ProjectTracker/ProjectTracker.js b/src/pages/ProjectTracker/ProjectTracker.js index 99a7ff16..19764778 100644 --- a/src/pages/ProjectTracker/ProjectTracker.js +++ b/src/pages/ProjectTracker/ProjectTracker.js @@ -386,7 +386,7 @@ export const ProjectTracker = () => { )} {projectBoard.projectUsers?.length > 3 && ( - +1 + +1 )} { {loader && } - {projects && Boolean(projects.length) && + {projects && + Boolean(projects.length) && !loader && projects.map((project, index) => { return project.status !== 10 ? ( @@ -187,10 +188,11 @@ export const Tracker = () => { "" ); })} - {typeof projects === "object" && (!Boolean(projects.length) || - !Boolean( - projects.filter((project) => project.status !== 10).length - )) && + {typeof projects === "object" && + (!Boolean(projects.length) || + !Boolean( + projects.filter((project) => project.status !== 10).length + )) && !loader && (
diff --git a/src/utils/helper.js b/src/utils/helper.js index a1bd4fe3..aff836ec 100644 --- a/src/utils/helper.js +++ b/src/utils/helper.js @@ -65,9 +65,9 @@ export function getCorrectRequestDate(date) { } export function getCorrectYYMMDD(date) { - const yyyy = String(date.getUTCFullYear()); - const mm = String(date.getUTCMonth() + 1).padStart(2, "0"); - const dd = String(date.getUTCDate()).padStart(2, "0"); + const yyyy = String(date.getFullYear()); + const mm = String(date.getMonth() + 1).padStart(2, "0"); + const dd = String(date.getDate()).padStart(2, "0"); return `${yyyy}-${mm}-${dd}`; }