show friendly date range name when forward/backward date range

src/lib/utils.js

@@ -77,6 +77,18 @@ function getDayOfWeek(date) {
     return moment(date).format('dddd');
 }
 
+function getHour(date) {
+    return moment(date).hour();
+}
+
+function getMinute(date) {
+    return moment(date).minute();
+}
+
+function getSecond(date) {
+    return moment(date).second();
+}
+
 function getUnixTimeBeforeUnixTime(unixTime, amount, unit) {
     return moment.unix(unixTime).subtract(amount, unit).unix();
 }
@@ -125,6 +137,30 @@ function getThisYearLastUnixTime() {
     return moment.unix(getThisYearFirstUnixTime()).add(1, 'years').subtract(1, 'seconds').unix();
 }
 
+function getShiftedtDateRange(minTime, maxTime, scale) {
+    const minDateTime = parseDateFromUnixTime(minTime);
+    const maxDateTime = parseDateFromUnixTime(maxTime);
+
+    const isFirstTimeOfDay = getHour(minDateTime) === 0 && getMinute(minDateTime) === 0;
+    const isLastTimeOfDay = getHour(maxDateTime) === 23 && getMinute(maxDateTime) === 59;
+
+    if (!isFirstTimeOfDay || !isLastTimeOfDay) {
+        const range = (maxTime - minTime + 1) * scale;
+
+        return {
+            minTime: minTime + range,
+            maxTime: maxTime + range
+        };
+    }
+
+    const range = (maxTime - minTime + 1) * scale;
+
+    return {
+        minTime: minTime + range,
+        maxTime: maxTime + range
+    };
+}
+
 function getDateRangeByDateType(dateType) {
     let maxTime = 0;
     let minTime = 0;
@@ -498,6 +534,9 @@ export default {
     getYearAndMonth,
     getDay,
     getDayOfWeek,
+    getHour,
+    getMinute,
+    getSecond,
     getUnixTimeBeforeUnixTime,
     getMinuteFirstUnixTime,
     getMinuteLastUnixTime,
@@ -509,6 +548,7 @@ export default {
     getThisMonthLastUnixTime,
     getThisYearFirstUnixTime,
     getThisYearLastUnixTime,
+    getShiftedtDateRange,
     getDateRangeByDateType,
     copyObjectTo,
     copyArrayTo,

src/views/mobile/statistics/Transaction.vue

@@ -144,13 +144,13 @@
         </f7-card>
 
         <f7-toolbar tabbar bottom class="toolbar-item-auto-size">
-            <f7-link @click="backwardDateRange(query.startTime, query.endTime)">
+            <f7-link :class="{ 'disabled': query.dateType === $constants.datetime.allDateRanges.All.type }" @click="shiftDateRange(query.startTime, query.endTime, -1)">
                 <f7-icon f7="arrow_left_square"></f7-icon>
             </f7-link>
             <f7-link class="tabbar-text-with-ellipsis" popover-open=".date-popover-menu">
                 <span :class="{ 'tabbar-item-changed': query.maxTime > 0 || query.minTime > 0 }">{{ dateRangeName(query) }}</span>
             </f7-link>
-            <f7-link @click="forwardDateRange(query.startTime, query.endTime)">
+            <f7-link :class="{ 'disabled': query.dateType === $constants.datetime.allDateRanges.All.type }" @click="shiftDateRange(query.startTime, query.endTime, 1)">
                 <f7-icon f7="arrow_right_square"></f7-icon>
             </f7-link>
             <f7-link class="tabbar-text-with-ellipsis" @click="setChartType($constants.statistics.allChartTypes.Pie)">
@@ -554,20 +554,32 @@ export default {
 
             this.reload(null);
         },
-        backwardDateRange(startTime, endTime) {
+        shiftDateRange(startTime, endTime, scale) {
-            this.$store.dispatch('updateTransactionStatisticsFilter', {
+            if (this.query.dateType === this.$constants.datetime.allDateRanges.All.type) {
-                dateType: this.$constants.datetime.allDateRanges.Custom.type,
+                return;
-                startTime: startTime - (endTime - startTime),
+            }
-                endTime: startTime - 1
+
-            });
+            const newDateRange = this.$utilities.getShiftedtDateRange(startTime, endTime, scale);
+            let newDateType = this.$constants.datetime.allDateRanges.Custom.type;
+
+            for (let dateRangeField in this.$constants.datetime.allDateRanges) {
+                if (!Object.prototype.hasOwnProperty.call(this.$constants.datetime.allDateRanges, dateRangeField)) {
+                    continue;
+                }
+
+                const dateRangeType = this.$constants.datetime.allDateRanges[dateRangeField];
+                const dateRange = this.$utilities.getDateRangeByDateType(dateRangeType.type);
+
+                if (dateRange && dateRange.minTime === newDateRange.minTime && dateRange.maxTime === newDateRange.maxTime) {
+                    newDateType = dateRangeType.type;
+                    break;
+                }
+            }
 
-            this.reload(null);
-        },
-        forwardDateRange(startTime, endTime) {
             this.$store.dispatch('updateTransactionStatisticsFilter', {
-                dateType: this.$constants.datetime.allDateRanges.Custom.type,
+                dateType: newDateType,
-                startTime: endTime + 1,
+                startTime: newDateRange.minTime,
-                endTime: endTime + (endTime - startTime)
+                endTime: newDateRange.maxTime
             });
 
             this.reload(null);