Skip to content

Commit 36be759

Browse files
committed
Fix range by days for eng version windows
1 parent 8e78b52 commit 36be759

File tree

1 file changed

+19
-11
lines changed

1 file changed

+19
-11
lines changed

scripts/common.js

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -91,24 +91,32 @@ function zeroAppend(time) {
9191
else return time;
9292
}
9393

94-
function isDateInRange(dateStr, range){
94+
function isDateInRange(dateStr, range) {
9595
var arr = dateStr.split('.');
96-
var date = new Date(arr[2], arr[1]-1, arr[0]);
97-
var arrFrom = range.from.split('.');
98-
var from = new Date(arrFrom[2], arrFrom[1]-1, arrFrom[0]);
99-
var arrTo = range.to.split('.');
100-
var to = new Date(arrTo[2], arrTo[1]-1, arrTo[0]);
96+
var date = new Date(arr[2], arr[1] - 1, arr[0]);
97+
var from = getValueFromArrayRange(range.from);
98+
var to = getValueFromArrayRange(range.to);
10199
return date >= from && date <= to;
102100
}
103101

104-
function convertToDate(date){
102+
function getValueFromArrayRange(value){
103+
var arr;
104+
if (value.indexOf('.') !== -1){
105+
arr = value.split('.');
106+
return new Date(arr[2], arr[1] - 1, arr[0]);
107+
}
108+
if (value.indexOf('/') !== -1)
109+
arr = value.split('/');
110+
return new Date(arr[2], arr[0] - 1, arr[1]);
111+
}
112+
113+
function convertToDate(date) {
105114
var arr = date.split('.');
106-
return new Date(arr[2], arr[1]-1, arr[0]);
115+
return new Date(arr[2], arr[1] - 1, arr[0]);
107116
}
108117

109-
function getDateFromRange(range){
110-
switch (range)
111-
{
118+
function getDateFromRange(range) {
119+
switch (range) {
112120
case 'days2': return 2;
113121
case 'days3': return 3;
114122
case 'days4': return 4;

0 commit comments

Comments
 (0)