You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2016/04/23 04:08:00 UTC
[03/23] airavata-php-gateway git commit: Fix for dates on the first
date of a month.
Fix for dates on the first date of a month.
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/e4a7b192
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/e4a7b192
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/e4a7b192
Branch: refs/heads/master
Commit: e4a7b19222c75aca4035ab08af7eaefaed689676
Parents: bf10853
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Fri Apr 1 12:44:29 2016 -0400
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Fri Apr 1 12:44:29 2016 -0400
----------------------------------------------------------------------
app/views/admin/manage-experiments.blade.php | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e4a7b192/app/views/admin/manage-experiments.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/manage-experiments.blade.php b/app/views/admin/manage-experiments.blade.php
index cb3b2d8..e4f21c5 100644
--- a/app/views/admin/manage-experiments.blade.php
+++ b/app/views/admin/manage-experiments.blade.php
@@ -460,6 +460,10 @@ to be uncommented when actually in use.
function getCurrentDate( subtractDaysFromToday){
var cd = new Date();
+ if( subtractDaysFromToday!= null)
+ {
+ cd = new Date( cd.setDate( cd.getDate() - subtractDaysFromToday) );
+ }
var hours = cd.getHours();
month = cd.getMonth() + 1; //getmonth()starts from 0 for some reason
var timeOfDay = "AM";
@@ -470,9 +474,7 @@ to be uncommented when actually in use.
hours = hours - 12;
}
var date = cd.getDate();
- if( subtractDaysFromToday!= null)
- date = date - subtractDaysFromToday;
-
+
var todayDate = month + "/" + date + "/" + cd.getFullYear() + " " + hours + ":" + cd.getUTCMinutes() + " " + timeOfDay;
return todayDate;
}