File tree Expand file tree Collapse file tree 2 files changed +14
-3
lines changed
Expand file tree Collapse file tree 2 files changed +14
-3
lines changed Original file line number Diff line number Diff line change @@ -90,8 +90,19 @@ function zeroAppend(time) {
9090 else return time ;
9191}
9292
93- function isDateInRange ( date , range ) {
94- return date >= range . from && date <= range . to ;
93+ function isDateInRange ( dateStr , range ) {
94+ var arr = dateStr . split ( '.' ) ;
95+ var date = new Date ( arr [ 2 ] , arr [ 1 ] , arr [ 0 ] ) ;
96+ var arrFrom = range . from . split ( '.' ) ;
97+ var from = new Date ( arrFrom [ 2 ] , arrFrom [ 1 ] , arr [ 0 ] ) ;
98+ var arrTo = range . to . split ( '.' ) ;
99+ var to = new Date ( arrTo [ 2 ] , arrTo [ 1 ] , arrTo [ 0 ] ) ;
100+ return date >= from && date <= to ;
101+ }
102+
103+ function convertToDate ( date ) {
104+ var arr = date . split ( '.' ) ;
105+ return new Date ( arr [ 2 ] , arr [ 1 ] , arr [ 0 ] ) ;
95106}
96107
97108function getDateFromRange ( range ) {
Original file line number Diff line number Diff line change @@ -207,7 +207,7 @@ function getTabsByDays(tabs) {
207207 } ) ;
208208 } ) ;
209209 listOfDays = listOfDays . sort ( function ( a , b ) {
210- return new Date ( a . date ) - new Date ( b . date ) ;
210+ return convertToDate ( a . date ) - convertToDate ( b . date ) ;
211211 } ) ;
212212
213213 ui . fillListOfDays ( listOfDays ) ;
You can’t perform that action at this time.
0 commit comments