[1/3] airavata-php-gateway git commit: Fix for AIRAVATA-1943

[ndoshi]

Repository: airavata-php-gateway
Updated Branches:
  refs/heads/develop 7ba457142 -> c7798cc30


Fix for AIRAVATA-1943


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/45fa6296
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/45fa6296
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/45fa6296

Branch: refs/heads/develop
Commit: 45fa6296515eb5a422960a2bc34858eb561ddf0a
Parents: fb4c36c
Author: Nipurn Doshi 
Authored: Mon Jul 4 00:09:33 2016 -0700
Committer: Nipurn Doshi 
Committed: Mon Jul 4 00:09:33 2016 -0700

--
 public/js/time-conversion.js | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/45fa6296/public/js/time-conversion.js
--
diff --git a/public/js/time-conversion.js b/public/js/time-conversion.js
index 4146baa..04eea52 100644
--- a/public/js/time-conversion.js
+++ b/public/js/time-conversion.js
@@ -4,6 +4,8 @@
 function convertTimestamp(timestamp) {
 if( timestamp == null)
 return;
+else
+timestamp = $.trim( timestamp);
 if( timestamp.length <= 10)
 timestamp = timestamp * 1000;// Convert the passed timestamp to 
milliseconds
 var d = new Date( parseInt( timestamp) ),

[3/3] airavata-php-gateway git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop

[ndoshi]

Merge branch 'develop' of 
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop


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/c7798cc3
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/c7798cc3
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/c7798cc3

Branch: refs/heads/develop
Commit: c7798cc303a5188db2789e22d599e819203a74ad
Parents: d14d073 7ba4571
Author: Nipurn Doshi 
Authored: Mon Jul 4 00:15:07 2016 -0700
Committer: Nipurn Doshi 
Committed: Mon Jul 4 00:15:07 2016 -0700

--
 app/views/admin/manage-credentials.blade.php | 24 +++
 1 file changed, 12 insertions(+), 12 deletions(-)
--

[2/3] airavata-php-gateway git commit: Fixing AIRAVATA-1361 - Local time was being sent to server as GMT. Fixed now.

[ndoshi]

Fixing AIRAVATA-1361 - Local time was being sent to server as GMT. Fixed now.


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/d14d073a
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/d14d073a
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/d14d073a

Branch: refs/heads/develop
Commit: d14d073a9e7d6a1535aee827e7a72c283bbab7d2
Parents: 45fa629
Author: Nipurn Doshi 
Authored: Mon Jul 4 00:10:57 2016 -0700
Committer: Nipurn Doshi 
Committed: Mon Jul 4 00:10:57 2016 -0700

--
 app/libraries/ExperimentUtilities.php | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/d14d073a/app/libraries/ExperimentUtilities.php
--
diff --git a/app/libraries/ExperimentUtilities.php 
b/app/libraries/ExperimentUtilities.php
index 4760181..1b7cf1a 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -984,8 +984,12 @@ class ExperimentUtilities
 
$filters[\Airavata\Model\Experiment\ExperimentSearchFields::APPLICATION_ID] = 
$inputs["search-value"];
 break;
 case 'creation-time':
-
$filters[\Airavata\Model\Experiment\ExperimentSearchFields::FROM_DATE] = 
strtotime($inputs["from-date"]) * 1000;
-
$filters[\Airavata\Model\Experiment\ExperimentSearchFields::TO_DATE] = 
strtotime($inputs["to-date"]) * 1000;
+$timeDifference = Session::get("user_timezone");
+$addOrSubtract = "-";
+if( $timeDifference > 0)
+$addOrSubtract = "+";
+
$filters[\Airavata\Model\Experiment\ExperimentSearchFields::FROM_DATE] = 
strtotime( $addOrSubtract . " " . Session::get("user_timezone") . " hours", 
strtotime($inputs["from-date"]) ) * 1000;
+
$filters[\Airavata\Model\Experiment\ExperimentSearchFields::TO_DATE] = 
strtotime( $addOrSubtract . " " . Session::get("user_timezone") . " hours", 
strtotime($inputs["to-date"]) ) * 1000;
 break;
 case '':
 }