scottk/chatwoot
1
0
Fork 0
mirror of https://github.com/lingble/chatwoot.git synced 2025-11-02 20:18:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Start calender is not moving properly is last 30 days range (#9322)

Browse Source 
* fix: Start calender is not moving properly is last 30 days range

* chore: Minor fix
This commit is contained in:
Sivin Varghese
2024-04-30 10:09:08 +05:30
committed by GitHub
parent 43b79aba9e
commit 2012d00109
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/javascript/dashboard/components/ui/DatePicker/DatePicker.vue
View File

@@ -31,7 +31,7 @@ import CalendarMonth from './components/CalendarMonth.vue';
import CalendarWeek from './components/CalendarWeek.vue'; import CalendarWeek from './components/CalendarWeek.vue';
import CalendarFooter from './components/CalendarFooter.vue'; import CalendarFooter from './components/CalendarFooter.vue';
const { LAST_7_DAYS, CUSTOM_RANGE } = DATE_RANGE_TYPES; const { LAST_7_DAYS, LAST_30_DAYS, CUSTOM_RANGE } = DATE_RANGE_TYPES;
const { START_CALENDAR, END_CALENDAR } = CALENDAR_TYPES; const { START_CALENDAR, END_CALENDAR } = CALENDAR_TYPES;
const { WEEK, MONTH, YEAR } = CALENDAR_PERIODS; const { WEEK, MONTH, YEAR } = CALENDAR_PERIODS;
@@ -59,14 +59,16 @@ const emit = defineEmits(['change']);
// Watcher will set the start and end dates based on the selected range // Watcher will set the start and end dates based on the selected range
watch(selectedRange, newRange => { watch(selectedRange, newRange => {
if (newRange !== CUSTOM_RANGE) { if (newRange !== CUSTOM_RANGE) {
// If selecting a range other than last 7 days, set the start and end dates to the selected start and end dates // If selecting a range other than last 7 days or last 30 days, set the start and end dates to the selected start and end dates
// If selecting last 7 days, set the start date to the selected start date // If selecting last 7 days or last 30 days is, set the start date to the selected start date
// and the end date to one month ahead of the start date if the start date and end date are in the same month // and the end date to one month ahead of the start date if the start date and end date are in the same month
// Otherwise set the end date to the selected end date // Otherwise set the end date to the selected end date
const isLast7days = newRange === LAST_7_DAYS; const isLastSevenOrThirtyDays =
newRange === LAST_7_DAYS || newRange === LAST_30_DAYS;
startCurrentDate.value = selectedStartDate.value; startCurrentDate.value = selectedStartDate.value;
endCurrentDate.value = endCurrentDate.value =
isLast7days && isSameMonth(selectedStartDate.value, selectedEndDate.value) isLastSevenOrThirtyDays &&
isSameMonth(selectedStartDate.value, selectedEndDate.value)
? startOfMonth(addMonths(selectedStartDate.value, 1)) ? startOfMonth(addMonths(selectedStartDate.value, 1))
: selectedEndDate.value; : selectedEndDate.value;
selectingEndDate.value = false; selectingEndDate.value = false;