added FromData to endDate filter in Task list

index.html

@@ -49,6 +49,7 @@
   <!-- Timer Picker -->
   <!-- Flatpickr CSS -->
   <link rel="stylesheet" href="/assets/vendor/libs/flatpickr/flatpickr.css" />
+  <link rel="stylesheet" href="./src/assets/vendor/libs/jquery-timepicker/jquery-timepicker.css" />
 
 
 
@@ -96,7 +97,6 @@
 
   <script src="/assets/vendor/libs/sweetalert2/sweetalert2.js"></script>
 
-
   <!-- <script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.10.2/dist/umd/popper.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.min.js"></script> -->
 

src/assets/vendor/libs/jquery-timepicker/jquery-timepicker.css

@@ -1,86 +1,793 @@
-.ui-timepicker-wrapper {
+.flatpickr-calendar {
-  max-height: 10rem;
+  background: transparent;
-  overflow-y: auto;
+  opacity: 0;
-  margin: 0.125rem 0;
+  display: none;
+  text-align: center;
+  visibility: hidden;
+  padding: 0;
+  -webkit-animation: none;
+  animation: none;
+  direction: ltr;
+  border: 0;
+  font-size: 14px;
+  line-height: 24px;
+  border-radius: 5px;
+  position: absolute;
+  width: 307.875px;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  -ms-touch-action: manipulation;
+  touch-action: manipulation;
   background: #fff;
-  background-clip: padding-box;
+  -webkit-box-shadow: 1px 0 0 #e6e6e6, -1px 0 0 #e6e6e6, 0 1px 0 #e6e6e6,
-  outline: none;
+    0 -1px 0 #e6e6e6, 0 3px 13px rgba(0, 0, 0, 0.08);
-  padding: 0.5rem;
+  box-shadow: 1px 0 0 #e6e6e6, -1px 0 0 #e6e6e6, 0 1px 0 #e6e6e6,
+    0 -1px 0 #e6e6e6, 0 3px 13px rgba(0, 0, 0, 0.08);
 }
-
+.flatpickr-calendar.open,
-.ui-timepicker-list {
+.flatpickr-calendar.inline {
-  list-style: none;
+  opacity: 1;
-  padding: 0.125rem 0;
+  max-height: 640px;
-  margin: 0;
+  visibility: visible;
 }
-
+.flatpickr-calendar.open {
-.ui-timepicker-duration {
+  display: inline-block;
-  margin-left: 0.25rem;
+  z-index: 99999;
 }
-[dir=rtl] .ui-timepicker-duration {
+.flatpickr-calendar.animate.open {
-  margin-left: 0;
+  -webkit-animation: fpFadeInDown 300ms cubic-bezier(0.23, 1, 0.32, 1);
-  margin-right: 0.25rem;
+  animation: fpFadeInDown 300ms cubic-bezier(0.23, 1, 0.32, 1);
 }
-
+.flatpickr-calendar.inline {
-.ui-timepicker-list li {
+  display: block;
-  padding: 0.25rem 0.75rem;
+  position: relative;
-  margin: 0.125rem 0.5625rem;
+  top: 2px;
-  white-space: nowrap;
+}
+.flatpickr-calendar.static {
+  position: absolute;
+  top: calc(100% + 2px);
+}
+.flatpickr-calendar.static.open {
+  z-index: 999;
+  display: block;
+}
+.flatpickr-calendar.multiMonth
+  .flatpickr-days
+  .dayContainer:nth-child(n + 1)
+  .flatpickr-day.inRange:nth-child(7n + 7) {
+  -webkit-box-shadow: none !important;
+  box-shadow: none !important;
+}
+.flatpickr-calendar.multiMonth
+  .flatpickr-days
+  .dayContainer:nth-child(n + 2)
+  .flatpickr-day.inRange:nth-child(7n + 1) {
+  -webkit-box-shadow: -2px 0 0 #e6e6e6, 5px 0 0 #e6e6e6;
+  box-shadow: -2px 0 0 #e6e6e6, 5px 0 0 #e6e6e6;
+}
+.flatpickr-calendar .hasWeeks .dayContainer,
+.flatpickr-calendar .hasTime .dayContainer {
+  border-bottom: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+.flatpickr-calendar .hasWeeks .dayContainer {
+  border-left: 0;
+}
+.flatpickr-calendar.hasTime .flatpickr-time {
+  height: 40px;
+  border-top: 1px solid #e6e6e6;
+}
+.flatpickr-calendar.noCalendar.hasTime .flatpickr-time {
+  height: auto;
+}
+.flatpickr-calendar:before,
+.flatpickr-calendar:after {
+  position: absolute;
+  display: block;
+  pointer-events: none;
+  border: solid transparent;
+  content: "";
+  height: 0;
+  width: 0;
+  left: 22px;
+}
+.flatpickr-calendar.rightMost:before,
+.flatpickr-calendar.arrowRight:before,
+.flatpickr-calendar.rightMost:after,
+.flatpickr-calendar.arrowRight:after {
+  left: auto;
+  right: 22px;
+}
+.flatpickr-calendar.arrowCenter:before,
+.flatpickr-calendar.arrowCenter:after {
+  left: 50%;
+  right: 50%;
+}
+.flatpickr-calendar:before {
+  border-width: 5px;
+  margin: 0 -5px;
+}
+.flatpickr-calendar:after {
+  border-width: 4px;
+  margin: 0 -4px;
+}
+.flatpickr-calendar.arrowTop:before,
+.flatpickr-calendar.arrowTop:after {
+  bottom: 100%;
+}
+.flatpickr-calendar.arrowTop:before {
+  border-bottom-color: #e6e6e6;
+}
+.flatpickr-calendar.arrowTop:after {
+  border-bottom-color: #fff;
+}
+.flatpickr-calendar.arrowBottom:before,
+.flatpickr-calendar.arrowBottom:after {
+  top: 100%;
+}
+.flatpickr-calendar.arrowBottom:before {
+  border-top-color: #e6e6e6;
+}
+.flatpickr-calendar.arrowBottom:after {
+  border-top-color: #fff;
+}
+.flatpickr-calendar:focus {
+  outline: 0;
+}
+.flatpickr-wrapper {
+  position: relative;
+  display: inline-block;
+}
+.flatpickr-months {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+}
+.flatpickr-months .flatpickr-month {
+  background: transparent;
+  color: rgba(0, 0, 0, 0.9);
+  fill: rgba(0, 0, 0, 0.9);
+  height: 34px;
+  line-height: 1;
+  text-align: center;
+  position: relative;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  overflow: hidden;
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+  -ms-flex: 1;
+  flex: 1;
+}
+.flatpickr-months .flatpickr-prev-month,
+.flatpickr-months .flatpickr-next-month {
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  text-decoration: none;
   cursor: pointer;
-  list-style: none;
+  position: absolute;
-  border-radius: var(--bs-border-radius);
+  top: 0;
+  height: 34px;
+  padding: 10px;
+  z-index: 3;
+  color: rgba(0, 0, 0, 0.9);
+  fill: rgba(0, 0, 0, 0.9);
 }
-.ui-timepicker-list li.ui-timepicker-disabled, .ui-timepicker-list li.ui-timepicker-selected.ui-timepicker-disabled {
+.flatpickr-months .flatpickr-prev-month.flatpickr-disabled,
-  background: #fff !important;
+.flatpickr-months .flatpickr-next-month.flatpickr-disabled {
-  cursor: default !important;
+  display: none;
 }
-
+.flatpickr-months .flatpickr-prev-month i,
-.light-style .ui-timepicker-wrapper {
+.flatpickr-months .flatpickr-next-month i {
-  z-index: 1091;
+  position: relative;
-  background: #fff;
-  box-shadow: 0 0.25rem 0.75rem 0 rgba(34, 48, 62, 0.14);
-  border: 0 solid #e4e6e8;
-  border-radius: 0.375rem;
 }
-.light-style .ui-timepicker-list li {
+.flatpickr-months .flatpickr-prev-month.flatpickr-prev-month,
-  color: #384551;
+.flatpickr-months .flatpickr-next-month.flatpickr-prev-month {
+  /*
+      /*rtl:begin:ignore*/
+  left: 0; /*
+      /*rtl:end:ignore*/
+} /*
+      /*rtl:begin:ignore*/
+/*
+      /*rtl:end:ignore*/
+.flatpickr-months .flatpickr-prev-month.flatpickr-next-month,
+.flatpickr-months .flatpickr-next-month.flatpickr-next-month {
+  /*
+      /*rtl:begin:ignore*/
+  right: 0; /*
+      /*rtl:end:ignore*/
+} /*
+      /*rtl:begin:ignore*/
+/*
+      /*rtl:end:ignore*/
+.flatpickr-months .flatpickr-prev-month:hover,
+.flatpickr-months .flatpickr-next-month:hover {
+  color: #959ea9;
 }
-.light-style .ui-timepicker-list li:hover {
+.flatpickr-months .flatpickr-prev-month:hover svg,
-  background: rgba(34, 48, 62, 0.06);
+.flatpickr-months .flatpickr-next-month:hover svg {
+  fill: #f64747;
 }
-.light-style .ui-timepicker-list li:not(.ui-timepicker-selected) .ui-timepicker-duration {
+.flatpickr-months .flatpickr-prev-month svg,
-  color: #a7acb2;
+.flatpickr-months .flatpickr-next-month svg {
+  width: 14px;
+  height: 14px;
 }
-.ui-timepicker-list:hover .light-style .ui-timepicker-list li:not(.ui-timepicker-selected) .ui-timepicker-duration {
+.flatpickr-months .flatpickr-prev-month svg path,
-  color: #a7acb2;
+.flatpickr-months .flatpickr-next-month svg path {
+  -webkit-transition: fill 0.1s;
+  transition: fill 0.1s;
+  fill: inherit;
 }
-.light-style .ui-timepicker-list li.ui-timepicker-disabled,
+.numInputWrapper {
-.light-style .ui-timepicker-list li.ui-timepicker-selected.ui-timepicker-disabled {
+  position: relative;
-  background: #fff !important;
+  height: auto;
-  color: #a7acb2 !important;
 }
-
+.numInputWrapper input,
-.dark-style .ui-timepicker-wrapper {
+.numInputWrapper span {
-  border: 0 solid #4e4f6c;
+  display: inline-block;
-  z-index: 1091;
-  background: #2b2c40;
-  box-shadow: 0 0.25rem 0.75rem 0 rgba(20, 20, 29, 0.24);
-  border-radius: 0.375rem;
 }
-.dark-style .ui-timepicker-list li {
+.numInputWrapper input {
-  color: #d5d5e2;
+  width: 100%;
 }
-.dark-style .ui-timepicker-list li:hover {
+.numInputWrapper input::-ms-clear {
-  background: rgba(230, 230, 241, 0.06);
+  display: none;
 }
-.dark-style .ui-timepicker-list li:not(.ui-timepicker-selected) .ui-timepicker-duration {
+.numInputWrapper input::-webkit-outer-spin-button,
-  color: #7e7f96;
+.numInputWrapper input::-webkit-inner-spin-button {
+  margin: 0;
+  -webkit-appearance: none;
 }
-.ui-timepicker-list:hover .dark-style .ui-timepicker-list li:not(.ui-timepicker-selected) .ui-timepicker-duration {
+.numInputWrapper span {
-  color: #7e7f96;
+  position: absolute;
+  right: 0;
+  width: 14px;
+  padding: 0 4px 0 2px;
+  height: 50%;
+  line-height: 50%;
+  opacity: 0;
+  cursor: pointer;
+  border: 1px solid rgba(57, 57, 57, 0.15);
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
 }
-.dark-style .ui-timepicker-list li.ui-timepicker-disabled,
+.numInputWrapper span:hover {
-.dark-style .ui-timepicker-list li.ui-timepicker-selected.ui-timepicker-disabled {
+  background: rgba(0, 0, 0, 0.1);
-  color: #7e7f96 !important;
+}
-  background: #2b2c40 !important;
+.numInputWrapper span:active {
+  background: rgba(0, 0, 0, 0.2);
+}
+.numInputWrapper span:after {
+  display: block;
+  content: "";
+  position: absolute;
+}
+.numInputWrapper span.arrowUp {
+  top: 0;
+  border-bottom: 0;
+}
+.numInputWrapper span.arrowUp:after {
+  border-left: 4px solid transparent;
+  border-right: 4px solid transparent;
+  border-bottom: 4px solid rgba(57, 57, 57, 0.6);
+  top: 26%;
+}
+.numInputWrapper span.arrowDown {
+  top: 50%;
+}
+.numInputWrapper span.arrowDown:after {
+  border-left: 4px solid transparent;
+  border-right: 4px solid transparent;
+  border-top: 4px solid rgba(57, 57, 57, 0.6);
+  top: 40%;
+}
+.numInputWrapper span svg {
+  width: inherit;
+  height: auto;
+}
+.numInputWrapper span svg path {
+  fill: rgba(0, 0, 0, 0.5);
+}
+.numInputWrapper:hover {
+  background: rgba(0, 0, 0, 0.05);
+}
+.numInputWrapper:hover span {
+  opacity: 1;
+}
+.flatpickr-current-month {
+  font-size: 135%;
+  line-height: inherit;
+  font-weight: 300;
+  color: inherit;
+  position: absolute;
+  width: 75%;
+  left: 12.5%;
+  padding: 7.48px 0 0 0;
+  line-height: 1;
+  height: 34px;
+  display: inline-block;
+  text-align: center;
+  -webkit-transform: translate3d(0, 0, 0);
+  transform: translate3d(0, 0, 0);
+}
+.flatpickr-current-month span.cur-month {
+  font-family: inherit;
+  font-weight: 700;
+  color: inherit;
+  display: inline-block;
+  margin-left: 0.5ch;
+  padding: 0;
+}
+.flatpickr-current-month span.cur-month:hover {
+  background: rgba(0, 0, 0, 0.05);
+}
+.flatpickr-current-month .numInputWrapper {
+  width: 6ch;
+  width: 7ch\0;
+  display: inline-block;
+}
+.flatpickr-current-month .numInputWrapper span.arrowUp:after {
+  border-bottom-color: rgba(0, 0, 0, 0.9);
+}
+.flatpickr-current-month .numInputWrapper span.arrowDown:after {
+  border-top-color: rgba(0, 0, 0, 0.9);
+}
+.flatpickr-current-month input.cur-year {
+  background: transparent;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  color: inherit;
+  cursor: text;
+  padding: 0 0 0 0.5ch;
+  margin: 0;
+  display: inline-block;
+  font-size: inherit;
+  font-family: inherit;
+  font-weight: 300;
+  line-height: inherit;
+  height: auto;
+  border: 0;
+  border-radius: 0;
+  vertical-align: initial;
+  -webkit-appearance: textfield;
+  -moz-appearance: textfield;
+  appearance: textfield;
+}
+.flatpickr-current-month input.cur-year:focus {
+  outline: 0;
+}
+.flatpickr-current-month input.cur-year[disabled],
+.flatpickr-current-month input.cur-year[disabled]:hover {
+  font-size: 100%;
+  color: rgba(0, 0, 0, 0.5);
+  background: transparent;
+  pointer-events: none;
+}
+.flatpickr-current-month .flatpickr-monthDropdown-months {
+  appearance: menulist;
+  background: transparent;
+  border: none;
+  border-radius: 0;
+  box-sizing: border-box;
+  color: inherit;
+  cursor: pointer;
+  font-size: inherit;
+  font-family: inherit;
+  font-weight: 300;
+  height: auto;
+  line-height: inherit;
+  margin: -1px 0 0 0;
+  outline: none;
+  padding: 0 0 0 0.5ch;
+  position: relative;
+  vertical-align: initial;
+  -webkit-box-sizing: border-box;
+  -webkit-appearance: menulist;
+  -moz-appearance: menulist;
+  width: auto;
+}
+.flatpickr-current-month .flatpickr-monthDropdown-months:focus,
+.flatpickr-current-month .flatpickr-monthDropdown-months:active {
+  outline: none;
+}
+.flatpickr-current-month .flatpickr-monthDropdown-months:hover {
+  background: rgba(0, 0, 0, 0.05);
+}
+.flatpickr-current-month
+  .flatpickr-monthDropdown-months
+  .flatpickr-monthDropdown-month {
+  background-color: transparent;
+  outline: none;
+  padding: 0;
+}
+.flatpickr-weekdays {
+  background: transparent;
+  text-align: center;
+  overflow: hidden;
+  width: 100%;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+  -ms-flex-align: center;
+  align-items: center;
+  height: 28px;
+}
+.flatpickr-weekdays .flatpickr-weekdaycontainer {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+  -ms-flex: 1;
+  flex: 1;
+}
+span.flatpickr-weekday {
+  cursor: default;
+  font-size: 90%;
+  background: transparent;
+  color: rgba(0, 0, 0, 0.54);
+  line-height: 1;
+  margin: 0;
+  text-align: center;
+  display: block;
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+  -ms-flex: 1;
+  flex: 1;
+  font-weight: bolder;
+}
+.dayContainer,
+.flatpickr-weeks {
+  padding: 1px 0 0 0;
+}
+.flatpickr-days {
+  position: relative;
+  overflow: hidden;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-align: start;
+  -webkit-align-items: flex-start;
+  -ms-flex-align: start;
+  align-items: flex-start;
+  width: 307.875px;
+}
+.flatpickr-days:focus {
+  outline: 0;
+}
+.dayContainer {
+  padding: 0;
+  outline: 0;
+  text-align: left;
+  width: 307.875px;
+  min-width: 307.875px;
+  max-width: 307.875px;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  display: inline-block;
+  display: -ms-flexbox;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-flex-wrap: wrap;
+  flex-wrap: wrap;
+  -ms-flex-wrap: wrap;
+  -ms-flex-pack: justify;
+  -webkit-justify-content: space-around;
+  justify-content: space-around;
+  -webkit-transform: translate3d(0, 0, 0);
+  transform: translate3d(0, 0, 0);
+  opacity: 1;
+}
+.dayContainer + .dayContainer {
+  -webkit-box-shadow: -1px 0 0 #e6e6e6;
+  box-shadow: -1px 0 0 #e6e6e6;
+}
+.flatpickr-day {
+  background: none;
+  border: 1px solid transparent;
+  border-radius: 150px;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  color: #393939;
+  cursor: pointer;
+  font-weight: 400;
+  width: 14.2857143%;
+  -webkit-flex-basis: 14.2857143%;
+  -ms-flex-preferred-size: 14.2857143%;
+  flex-basis: 14.2857143%;
+  max-width: 39px;
+  height: 39px;
+  line-height: 39px;
+  margin: 0;
+  display: inline-block;
+  position: relative;
+  -webkit-box-pack: center;
+  -webkit-justify-content: center;
+  -ms-flex-pack: center;
+  justify-content: center;
+  text-align: center;
+}
+.flatpickr-day.inRange,
+.flatpickr-day.prevMonthDay.inRange,
+.flatpickr-day.nextMonthDay.inRange,
+.flatpickr-day.today.inRange,
+.flatpickr-day.prevMonthDay.today.inRange,
+.flatpickr-day.nextMonthDay.today.inRange,
+.flatpickr-day:hover,
+.flatpickr-day.prevMonthDay:hover,
+.flatpickr-day.nextMonthDay:hover,
+.flatpickr-day:focus,
+.flatpickr-day.prevMonthDay:focus,
+.flatpickr-day.nextMonthDay:focus {
+  cursor: pointer;
+  outline: 0;
+  background: #e6e6e6;
+  border-color: #e6e6e6;
+}
+.flatpickr-day.today {
+  border-color: #959ea9;
+}
+.flatpickr-day.today:hover,
+.flatpickr-day.today:focus {
+  border-color: #959ea9;
+  background: #959ea9;
+  color: #fff;
+}
+.flatpickr-day.selected,
+.flatpickr-day.startRange,
+.flatpickr-day.endRange,
+.flatpickr-day.selected.inRange,
+.flatpickr-day.startRange.inRange,
+.flatpickr-day.endRange.inRange,
+.flatpickr-day.selected:focus,
+.flatpickr-day.startRange:focus,
+.flatpickr-day.endRange:focus,
+.flatpickr-day.selected:hover,
+.flatpickr-day.startRange:hover,
+.flatpickr-day.endRange:hover,
+.flatpickr-day.selected.prevMonthDay,
+.flatpickr-day.startRange.prevMonthDay,
+.flatpickr-day.endRange.prevMonthDay,
+.flatpickr-day.selected.nextMonthDay,
+.flatpickr-day.startRange.nextMonthDay,
+.flatpickr-day.endRange.nextMonthDay {
+  background: #569ff7;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+  color: #fff;
+  border-color: #569ff7;
+}
+.flatpickr-day.selected.startRange,
+.flatpickr-day.startRange.startRange,
+.flatpickr-day.endRange.startRange {
+  border-radius: 50px 0 0 50px;
+}
+.flatpickr-day.selected.endRange,
+.flatpickr-day.startRange.endRange,
+.flatpickr-day.endRange.endRange {
+  border-radius: 0 50px 50px 0;
+}
+.flatpickr-day.selected.startRange + .endRange:not(:nth-child(7n + 1)),
+.flatpickr-day.startRange.startRange + .endRange:not(:nth-child(7n + 1)),
+.flatpickr-day.endRange.startRange + .endRange:not(:nth-child(7n + 1)) {
+  -webkit-box-shadow: -10px 0 0 #569ff7;
+  box-shadow: -10px 0 0 #569ff7;
+}
+.flatpickr-day.selected.startRange.endRange,
+.flatpickr-day.startRange.startRange.endRange,
+.flatpickr-day.endRange.startRange.endRange {
+  border-radius: 50px;
+}
+.flatpickr-day.inRange {
+  border-radius: 0;
+  -webkit-box-shadow: -5px 0 0 #e6e6e6, 5px 0 0 #e6e6e6;
+  box-shadow: -5px 0 0 #e6e6e6, 5px 0 0 #e6e6e6;
+}
+.flatpickr-day.flatpickr-disabled,
+.flatpickr-day.flatpickr-disabled:hover,
+.flatpickr-day.prevMonthDay,
+.flatpickr-day.nextMonthDay,
+.flatpickr-day.notAllowed,
+.flatpickr-day.notAllowed.prevMonthDay,
+.flatpickr-day.notAllowed.nextMonthDay {
+  color: rgba(57, 57, 57, 0.3);
+  background: transparent;
+  border-color: transparent;
+  cursor: default;
+}
+.flatpickr-day.flatpickr-disabled,
+.flatpickr-day.flatpickr-disabled:hover {
+  cursor: not-allowed;
+  color: rgba(57, 57, 57, 0.1);
+}
+.flatpickr-day.week.selected {
+  border-radius: 0;
+  -webkit-box-shadow: -5px 0 0 #569ff7, 5px 0 0 #569ff7;
+  box-shadow: -5px 0 0 #569ff7, 5px 0 0 #569ff7;
+}
+.flatpickr-day.hidden {
+  visibility: hidden;
+}
+.rangeMode .flatpickr-day {
+  margin-top: 1px;
+}
+.flatpickr-weekwrapper {
+  float: left;
+}
+.flatpickr-weekwrapper .flatpickr-weeks {
+  padding: 0 12px;
+  -webkit-box-shadow: 1px 0 0 #e6e6e6;
+  box-shadow: 1px 0 0 #e6e6e6;
+}
+.flatpickr-weekwrapper .flatpickr-weekday {
+  float: none;
+  width: 100%;
+  line-height: 28px;
+}
+.flatpickr-weekwrapper span.flatpickr-day,
+.flatpickr-weekwrapper span.flatpickr-day:hover {
+  display: block;
+  width: 100%;
+  max-width: none;
+  color: rgba(57, 57, 57, 0.3);
+  background: transparent;
+  cursor: default;
+  border: none;
+}
+.flatpickr-innerContainer {
+  display: block;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  overflow: hidden;
+}
+.flatpickr-rContainer {
+  display: inline-block;
+  padding: 0;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+}
+.flatpickr-time {
+  text-align: center;
+  outline: 0;
+  display: block;
+  height: 0;
+  line-height: 40px;
+  max-height: 40px;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  overflow: hidden;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+}
+.flatpickr-time:after {
+  content: "";
+  display: table;
+  clear: both;
+}
+.flatpickr-time .numInputWrapper {
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+  -ms-flex: 1;
+  flex: 1;
+  width: 40%;
+  height: 40px;
+  float: left;
+}
+.flatpickr-time .numInputWrapper span.arrowUp:after {
+  border-bottom-color: #393939;
+}
+.flatpickr-time .numInputWrapper span.arrowDown:after {
+  border-top-color: #393939;
+}
+.flatpickr-time.hasSeconds .numInputWrapper {
+  width: 26%;
+}
+.flatpickr-time.time24hr .numInputWrapper {
+  width: 49%;
+}
+.flatpickr-time input {
+  background: transparent;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+  border: 0;
+  border-radius: 0;
+  text-align: center;
+  margin: 0;
+  padding: 0;
+  height: inherit;
+  line-height: inherit;
+  color: #393939;
+  font-size: 14px;
+  position: relative;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  -webkit-appearance: textfield;
+  -moz-appearance: textfield;
+  appearance: textfield;
+}
+.flatpickr-time input.flatpickr-hour {
+  font-weight: bold;
+}
+.flatpickr-time input.flatpickr-minute,
+.flatpickr-time input.flatpickr-second {
+  font-weight: 400;
+}
+.flatpickr-time input:focus {
+  outline: 0;
+  border: 0;
+}
+.flatpickr-time .flatpickr-time-separator,
+.flatpickr-time .flatpickr-am-pm {
+  height: inherit;
+  float: left;
+  line-height: inherit;
+  color: #393939;
+  font-weight: bold;
+  width: 2%;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  -webkit-align-self: center;
+  -ms-flex-item-align: center;
+  align-self: center;
+}
+.flatpickr-time .flatpickr-am-pm {
+  outline: 0;
+  width: 18%;
+  cursor: pointer;
+  text-align: center;
+  font-weight: 400;
+}
+.flatpickr-time input:hover,
+.flatpickr-time .flatpickr-am-pm:hover,
+.flatpickr-time input:focus,
+.flatpickr-time .flatpickr-am-pm:focus {
+  background: #eee;
+}
+.flatpickr-input[readonly] {
+  cursor: pointer;
+}
+@-webkit-keyframes fpFadeInDown {
+  from {
+    opacity: 0;
+    -webkit-transform: translate3d(0, -20px, 0);
+    transform: translate3d(0, -20px, 0);
+  }
+  to {
+    opacity: 1;
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+  }
+}
+@keyframes fpFadeInDown {
+  from {
+    opacity: 0;
+    -webkit-transform: translate3d(0, -20px, 0);
+    transform: translate3d(0, -20px, 0);
+  }
+  to {
+    opacity: 1;
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+  }
 }

src/components/common/DatePicker.jsx

@@ -0,0 +1,42 @@
+import React, { useEffect, useRef } from "react";
+
+const DatePicker = ({ onDateChange }) => {
+  const inputRef = useRef(null);
+
+  useEffect(() => {
+    const fp = flatpickr(inputRef.current, {
+      dateFormat: "Y-m-d",
+      defaultDate: new Date(),
+      onChange: (selectedDates, dateStr) => {
+        console.log("Selected date:", dateStr);
+        if (onDateChange) {
+          onDateChange(dateStr); // Pass selected date to parent
+        }
+      }
+    });
+
+    return () => {
+      // Cleanup flatpickr instance
+      fp.destroy();
+    };
+  }, [onDateChange]);
+
+  return (
+    <div className="container mt-3">
+      <div className="mb-3">
+        <label htmlFor="flatpickr-single" className="form-label">
+          Select Date
+        </label>
+        <input
+          type="text"
+          id="flatpickr-single"
+          className="form-control"
+          placeholder="YYYY-MM-DD"
+          ref={inputRef}
+        />
+      </div>
+    </div>
+  );
+};
+
+export default DatePicker;

src/components/common/DateRangePicker.jsx

@@ -0,0 +1,35 @@
+import React, { useEffect, useRef } from 'react';
+
+const DateRangePicker = ({ onRangeChange }) => {
+  const inputRef = useRef(null);
+
+  useEffect(() => {
+    const fp = flatpickr(inputRef.current, {
+        mode: "range",
+        dateFormat: "Y-m-d",
+        static: true, 
+        clickOpens: true, 
+        onChange: (selectedDates, dateStr) => {
+            const [startDate, endDate] = dateStr.split(" to ");
+            onRangeChange?.({ startDate, endDate });
+          }
+      });
+
+    return () => {
+      // Cleanup Flatpickr instance
+      fp.destroy();
+    };
+  }, [onRangeChange]);
+
+  return (
+    <input
+      type="text"
+      className="form-control form-control-sm ms-1"
+      placeholder="From to End"
+      id="flatpickr-range"
+      ref={inputRef}
+    />
+  );
+};
+
+export default DateRangePicker;

src/hooks/useTasks.js

@@ -1,8 +1,9 @@
 import { useEffect, useState } from "react";
 import { TasksRepository } from "../repositories/TaskRepository";
 import { cacheData, getCachedData } from "../slices/apiDataManager";
+// import {formatDate} from "../utils/dateUtils";
 
-export const useTaskList = (projectId, fromDate, ToDate) => {
+export const useTaskList = (projectId, dateFrom, toDate) => {
   const [TaskList, setTaskList] = useState([]);
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState(null);
@@ -14,8 +15,8 @@ export const useTaskList = (projectId, fromDate, ToDate) => {
         setLoading(true);
         const resp = await TasksRepository.getTaskList(
           projectId,
-          fromDate,
+          dateFrom,
-          ToDate
+          toDate
         );
         setTaskList(resp.data);
         cacheData("taskList", { projectId: projectId, data: resp.data });
@@ -30,11 +31,14 @@ export const useTaskList = (projectId, fromDate, ToDate) => {
     }
   };
   console.log(TaskList)
-  useEffect(() => {
+  useEffect( () =>
-    if (projectId) {
+  {
+    console.log( projectId , " ", dateFrom, "" , toDate)
+    if (projectId && dateFrom && toDate) {
       fetchList();
     }
-  }, [projectId, fromDate, ToDate]);
+  
+  }, [projectId, dateFrom, toDate]);
 
   return { TaskList, loading, error, refetch:fetchList};
 };

src/pages/Activities/DailyTask.jsx

@@ -1,3 +1,4 @@
+import React, { useEffect, useState } from "react";
 import { useDispatch, useSelector } from "react-redux";
 import Breadcrumb from "../../components/common/Breadcrumb";
 import { dailyTask } from "../../data/masters";
@@ -5,12 +6,13 @@ import { useTaskList } from "../../hooks/useTasks";
 import { useProjects } from "../../hooks/useProjects";
 import { setProjectId } from "../../slices/localVariablesSlice";
 import { useProfile } from "../../hooks/useProfile";
-import React, { useEffect, useState } from "react";
 import { formatDate } from "../../utils/dateUtils";
 import GlobalModel from "../../components/common/GlobalModel";
 import AssignRoleModel from "../../components/Project/AssignRole";
 import { ReportTask } from "../../components/Activities/ReportTask";
 import ReportTaskComments from "../../components/Activities/ReportTaskComments";
+import DateRangePicker from "../../components/common/DateRangePicker";
+import DatePicker from "../../components/common/DatePicker";
 
 const DailyTask = () => {
   const { profile: LoggedUser } = useProfile();
@@ -23,12 +25,13 @@ const DailyTask = () => {
     (store) => store.localVariables.projectId
   );
   const dispatch = useDispatch(selectedProject);
+  const [dateRange, setDateRange] = useState({ startDate: "", endDate: "" });
   const {
     TaskList,
     loading: task_loading,
     error: task_error,
     refetch,
-  } = useTaskList(selectedProject);
+  } = useTaskList(selectedProject, dateRange.startDate, dateRange.endDate);
   const [TaskLists, setTaskLists] = useState([]);
 
   useEffect(() => {
@@ -50,6 +53,8 @@ const DailyTask = () => {
     selectTask(task);
     openModal();
   };
+  console.log(dateRange)
+
   return (
     <>
       <div
@@ -87,9 +92,9 @@ const DailyTask = () => {
           ]}
         ></Breadcrumb>
         <div className="card card-action mb-6">
-          <div className="card-body">
+          <div className="card-body p-1 p-sm-2">
             <div className="row">
-              <div className="col-sm-3 col-8 text-start mb-1">
+              <div className="col-sm-3 col-6  mb-1">
                 <select
                   name="DataTables_Table_0_length"
                   aria-controls="DataTables_Table_0"
@@ -115,6 +120,9 @@ const DailyTask = () => {
                       ))}
                 </select>
               </div>
+              <div className="col-6 text-start">
+                <DateRangePicker onRangeChange={setDateRange} />
+              </div>
             </div>
             <div className="table-responsive text-nowrap">
               <table className="table">

src/repositories/TaskRepository.jsx

@@ -1,7 +1,19 @@
-import {api} from "../utils/axiosClient";
+import { api } from "../utils/axiosClient";
 
 export const TasksRepository = {
-    getTaskList: ( id, fromdate = null, todate = null ) => api.get( `api/task/list?projectId=${ id }` ),
+  getTaskList: (id, fromdate = null, todate = null) => {
-    reportTsak: ( data ) => api.post( 'api/task/report', data ),
+    let url = `api/task/list?projectId=${id}`;
-    taskComments:(data)=>api.post("api/task/comment",data)
+
-}
+    if (fromdate) {
+      url += `&dateFrom=${fromdate}`;
+    }
+
+    if (todate) {
+      url += `&dateTo=${todate}`;
+    }
+
+    return api.get(url);
+  },
+  reportTsak: (data) => api.post("api/task/report", data),
+  taskComments: (data) => api.post("api/task/comment", data),
+};