LeadMagnet/leadchat
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

fix: Consider timezone in the reports (#4027)

Browse Source 
Co-authored-by: Sojan Jose <sojan@pepalo.com>
This commit is contained in:
Pranav Raj S
2022-02-28 10:56:24 +05:30
committed by GitHub
parent 4ca66c1195
commit 9b615f11f1
7 changed files with 73 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/javascript/dashboard/routes/dashboard/settings/reports/components/FilterSelector.vue
View File

@@ -50,6 +50,7 @@ import subDays from 'date-fns/subDays';
import startOfDay from 'date-fns/startOfDay';
import getUnixTime from 'date-fns/getUnixTime';
import { GROUP_BY_FILTER } from '../constants';
import endOfDay from 'date-fns/endOfDay';
export default {
components: {
@@ -79,9 +80,9 @@ export default {
},
to() {
if (this.isDateRangeSelected) {
return this.fromCustomDate(this.customDateRange[1]);
return this.toCustomDate(this.customDateRange[1]);
}
return this.fromCustomDate(new Date());
return this.toCustomDate(new Date());
},
from() {
if (this.isDateRangeSelected) {
@@ -134,6 +135,9 @@ export default {
fromCustomDate(date) {
return getUnixTime(startOfDay(date));
},
toCustomDate(date) {
return getUnixTime(endOfDay(date));
},
changeDateSelection(selectedRange) {
this.currentDateRangeSelection = selectedRange;
this.onDateRangeChange();

18
app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportFilters.vue
View File

@@ -148,13 +148,15 @@
</div>
</template>
<script>
import WootDateRangePicker from 'dashboard/components/ui/DateRangePicker.vue';
const CUSTOM_DATE_RANGE_ID = 5;
import subDays from 'date-fns/subDays';
import startOfDay from 'date-fns/startOfDay';
import endOfDay from 'date-fns/endOfDay';
import getUnixTime from 'date-fns/getUnixTime';
import startOfDay from 'date-fns/startOfDay';
import subDays from 'date-fns/subDays';
import Thumbnail from 'dashboard/components/widgets/Thumbnail.vue';
import WootDateRangePicker from 'dashboard/components/ui/DateRangePicker.vue';
import { GROUP_BY_FILTER } from '../constants';
const CUSTOM_DATE_RANGE_ID = 5;
export default {
components: {
@@ -194,9 +196,9 @@ export default {
},
to() {
if (this.isDateRangeSelected) {
return this.fromCustomDate(this.customDateRange[1]);
return this.toCustomDate(this.customDateRange[1]);
}
return this.fromCustomDate(new Date());
return this.toCustomDate(new Date());
},
from() {
if (this.isDateRangeSelected) {
@@ -253,6 +255,7 @@ export default {
},
methods: {
onDateRangeChange() {
console.log(this.from, this.to);
this.$emit('date-range-change', {
from: this.from,
to: this.to,
@@ -262,6 +265,9 @@ export default {
fromCustomDate(date) {
return getUnixTime(startOfDay(date));
},
toCustomDate(date) {
return getUnixTime(endOfDay(date));
},
changeDateSelection(selectedRange) {
this.currentDateRangeSelection = selectedRange;
this.onDateRangeChange();