Commit f751059f authored by PkSM3's avatar PkSM3

[UPDATE] conflict resolu?

parent 1160395d
...@@ -128,10 +128,10 @@ ...@@ -128,10 +128,10 @@
} else { } else {
var start__ = new Date(current_timerange[0].setDate(current_timerange[0].getDate()+1) ); var start__ = new Date(current_timerange[0].setDate(current_timerange[0].getDate()+1) );
var end__ = new Date(current_timerange[1].setDate(current_timerange[1].getDate()-1) ); var end__ = new Date(current_timerange[1].setDate(current_timerange[1].getDate()-1) );
var start_ = start__.getFullYear()+"-"+(start__.getMonth()+1)+"-"+(start__.getDay()+1) // var start_ = start__.getFullYear()+"-"+(start__.getMonth()+1)+"-"+(start__.getDay()+1)
var end_ = end__.getFullYear()+"-"+(end__.getMonth()+1)+"-"+(end__.getDay()+1) // var end_ = end__.getFullYear()+"-"+(end__.getMonth()+1)+"-"+(end__.getDay()+1)
url_ += "&start=" + start_ + "&end="+end_; // url_ += "&start=" + start_ + "&end="+end_;
// url_ += "&start=" + start__.getFullYear() + "&end="+end__.getFullYear(); url_ += "&start=" + start__.getFullYear() + "&end="+end__.getFullYear();
} }
window.open(url_,'_blank'); window.open(url_,'_blank');
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment