\
@@ -4046,9 +4046,6 @@ function accountingGraphs(div, opt){
$("#acct_start_time", div).val(d.getFullYear() + '/' + (d.getMonth()+1) + '/' + d.getDate());
- $("#acct_start_time", div).jdPicker();
- $("#acct_end_time", div).jdPicker();
-
//--------------------------------------------------------------------------
// VM owner: all, group, user
//--------------------------------------------------------------------------
@@ -4105,20 +4102,38 @@ function accountingGraphs(div, opt){
// Submit request
//--------------------------------------------------------------------------
- // TODO: make start_time mandatory
-
$("#acct_submit", div).on("click", function(){
var start_time = -1;
var end_time = -1;
var v = $("#acct_start_time", div).val();
- if (v != ""){
- start_time = new Date(v).getTime() / 1000;
+ if (v == ""){
+ notifyError(tr("Time range start is mandatory"));
+ return false;
+ }else{
+ start_time = Date.parse(v);
+
+ if (isNaN(start_time)){
+ notifyError(tr("Time range start is not a valid date. It must be YYYY/MM/DD"));
+ return false;
+ }
+
+ // ms to s
+ start_time = start_time / 1000;
}
var v = $("#acct_end_time", div).val();
if (v != ""){
- end_time = new Date(v).getTime() / 1000;
+
+ end_time = Date.parse(v);
+
+ if (isNaN(end_time)){
+ notifyError(tr("Time range end is not a valid date. It must be YYYY/MM/DD"));
+ return false;
+ }
+
+ // ms to s
+ end_time = end_time / 1000;
}
var options = {