File tree Expand file tree Collapse file tree 2 files changed +10
-16
lines changed
Expand file tree Collapse file tree 2 files changed +10
-16
lines changed Original file line number Diff line number Diff line change @@ -127,29 +127,20 @@ function zeroAppend(time) {
127127}
128128
129129function isDateInRange ( dateStr , range ) {
130- var arr = dateStr . split ( '.' ) ;
131- var date = new Date ( arr [ 2 ] , arr [ 1 ] - 1 , arr [ 0 ] ) ;
132- var from = getValueFromArrayRange ( range . from ) ;
133- var to = getValueFromArrayRange ( range . to ) ;
134- return date >= from && date <= to ;
130+ return dateStr >= range . from && dateStr <= range . to ;
135131}
136132
137- function getValueFromArrayRange ( value ) {
133+ function getDateValueFromString ( value ) {
138134 var arr ;
139135 if ( value . indexOf ( '.' ) !== - 1 ) {
140136 arr = value . split ( '.' ) ;
141137 return new Date ( arr [ 2 ] , arr [ 1 ] - 1 , arr [ 0 ] ) ;
142138 }
143139 if ( value . indexOf ( '/' ) !== - 1 )
144- arr = value . split ( '/' ) ;
140+ arr = value . split ( '/' ) ; ч
145141 return new Date ( arr [ 2 ] , arr [ 0 ] - 1 , arr [ 1 ] ) ;
146142}
147143
148- function convertToDate ( date ) {
149- var arr = date . split ( '.' ) ;
150- return new Date ( arr [ 2 ] , arr [ 1 ] - 1 , arr [ 0 ] ) ;
151- }
152-
153144function getDateFromRange ( range ) {
154145 switch ( range ) {
155146 case 'days2' : return 2 ;
Original file line number Diff line number Diff line change @@ -280,16 +280,19 @@ function getTabsByDays(tabs) {
280280 } ) ;
281281 } ) ;
282282 listOfDays = listOfDays . sort ( function ( a , b ) {
283- return convertToDate ( a . date ) - convertToDate ( b . date ) ;
283+ return new Date ( a . date ) - new Date ( b . date ) ;
284284 } ) ;
285285
286286 var getDaysArray = function ( start , end ) {
287- for ( var arr = [ ] , dt = start ; dt <= end ; dt . setDate ( dt . getDate ( ) + 1 ) ) {
288- arr . push ( dt . toLocaleDateString ( ) ) ;
287+ let first = new Date ( start ) ;
288+ let second = new Date ( end ) ;
289+ var arr = [ ] ;
290+ for ( let i = first ; i <= second ; i = new Date ( i . setDate ( i . getDate ( ) + 1 ) ) ) {
291+ arr . push ( new Date ( i ) . toLocaleDateString ( ) ) ;
289292 }
290293 return arr ;
291294 } ;
292- ui . fillListOfDays ( listOfDays , getDaysArray ( getValueFromArrayRange ( range . from ) , getValueFromArrayRange ( range . to ) ) ) ;
295+ ui . fillListOfDays ( listOfDays , getDaysArray ( getDateValueFromString ( range . from ) , getDateValueFromString ( range . to ) ) ) ;
293296 }
294297 else {
295298 ui . fillEmptyBlockForDaysIfInvalid ( ) ;
You can’t perform that action at this time.
0 commit comments