You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by nd...@apache.org on 2016/01/26 18:46:47 UTC
[1/2] airavata-php-gateway git commit: Fix for Timestamp issue in
JobDetails
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop 6c04ff385 -> e7eaded52
Fix for Timestamp issue in JobDetails
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/b43b9e09
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/b43b9e09
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/b43b9e09
Branch: refs/heads/develop
Commit: b43b9e093026668d5a73ee74d97b8ef256d79f22
Parents: ef5af42
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Tue Jan 26 12:44:51 2016 -0500
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Tue Jan 26 12:44:51 2016 -0500
----------------------------------------------------------------------
app/views/partials/experiment-info.blade.php | 2 +-
public/js/time-conversion.js | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b43b9e09/app/views/partials/experiment-info.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/experiment-info.blade.php b/app/views/partials/experiment-info.blade.php
index cb6ec26..8b86721 100644
--- a/app/views/partials/experiment-info.blade.php
+++ b/app/views/partials/experiment-info.blade.php
@@ -53,7 +53,7 @@
<th>Job Name : {{$jobDetail->jobName}}</th>
<td>Job ID : {{ $jobDetail->jobId}}</td>
<td> Status : {{$jobDetail->jobStatus->jobStateName }}</td>
- <td> Creation Time : {{ date("F j, Y, g:i a", $jobDetail->creationTime )}}</td>
+ <td> Creation Time : <span class="time" unix-time="{{$jobDetail->creationTime}}"></span></td>
</tr>
@endforeach
<!--
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b43b9e09/public/js/time-conversion.js
----------------------------------------------------------------------
diff --git a/public/js/time-conversion.js b/public/js/time-conversion.js
index fb0ba54..459d6a4 100644
--- a/public/js/time-conversion.js
+++ b/public/js/time-conversion.js
@@ -2,7 +2,9 @@
//<td> elements should have the unix time as an attribute e.g. <td class="time" unix-time="423423423524"></td>
function convertTimestamp(timestamp) {
- var d = new Date(timestamp * 1000), // Convert the passed timestamp to milliseconds
+ if( timestamp.length <= 10)
+ timestamp = timestamp * 1000;// Convert the passed timestamp to milliseconds
+ var d = new Date( parseInt( timestamp) ),
yyyy = d.getFullYear(),
mm = ('0' + (d.getMonth() + 1)).slice(-2), // Months are zero based. Add leading 0.
dd = ('0' + d.getDate()).slice(-2), // Add leading 0.
[2/2] airavata-php-gateway git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop
Posted by nd...@apache.org.
Merge branch 'master' 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/e7eaded5
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/e7eaded5
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/e7eaded5
Branch: refs/heads/develop
Commit: e7eaded52bb81a94b18e2763f24f8503f959562b
Parents: b43b9e0 6c04ff3
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Tue Jan 26 12:45:46 2016 -0500
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Tue Jan 26 12:45:46 2016 -0500
----------------------------------------------------------------------
.gitignore | 3 +-
app/config/pga_config.php.template | 26 +-
app/controllers/AccountController.php | 54 +-
app/controllers/AdminController.php | 71 +-
app/controllers/ExperimentController.php | 9 +-
app/controllers/GatewayprofileController.php | 16 +-
app/libraries/AdminUtilities.php | 26 +-
app/libraries/Airavata/API/Airavata.php | 12814 +++++++++++------
app/libraries/Airavata/API/Error/Types.php | 4 +-
app/libraries/Airavata/API/Types.php | 4 +-
.../Model/AppCatalog/AppDeployment/Types.php | 2 +-
.../Model/AppCatalog/AppInterface/Types.php | 2 +-
.../Model/AppCatalog/ComputeResource/Types.php | 11 +-
.../Model/AppCatalog/GatewayProfile/Types.php | 2 +-
.../Model/AppCatalog/StorageResource/Types.php | 2 +-
.../Airavata/Model/Application/Io/Types.php | 2 +-
app/libraries/Airavata/Model/Commons/Types.php | 2 +-
.../Airavata/Model/Data/Movement/Types.php | 4 +-
.../Airavata/Model/Data/Resource/Types.php | 854 ++
.../Airavata/Model/Experiment/Types.php | 25 +-
app/libraries/Airavata/Model/Job/Types.php | 2 +-
.../Airavata/Model/Messaging/Event/Types.php | 2 +-
app/libraries/Airavata/Model/Process/Types.php | 71 +-
.../Airavata/Model/Scheduling/Types.php | 2 +-
app/libraries/Airavata/Model/Security/Types.php | 2 +-
app/libraries/Airavata/Model/Status/Types.php | 2 +-
app/libraries/Airavata/Model/Task/Types.php | 2 +-
app/libraries/Airavata/Model/Types.php | 2 +-
.../Airavata/Model/Workspace/Types.php | 2 +-
app/libraries/CRUtilities.php | 17 +-
app/libraries/ExperimentUtilities.php | 43 +-
app/libraries/ProjectUtilities.php | 1 -
app/libraries/SRUtilities.php | 20 +-
.../Thrift/Exception/TProtocolException.php | 2 -
.../Protocol/TBinaryProtocolAccelerated.php | 17 +-
.../Thrift/Protocol/TCompactProtocol.php | 12 +-
app/libraries/Thrift/Protocol/TJSONProtocol.php | 4 +-
.../Thrift/Serializer/TBinarySerializer.php | 8 +-
app/libraries/Thrift/Thrift.php | 789 +
.../Thrift/Transport/TBufferedTransport.php | 7 +-
app/libraries/Thrift/Transport/TSocket.php | 6 +-
app/libraries/Thrift/autoload.php | 51 +
app/libraries/Wsis/Wsis.php | 8 +-
app/libraries/Wsis/WsisServiceProvider.php | 19 +-
app/routes.php | 24 +-
app/views/account/create.blade.php | 6 +-
app/views/admin/manage-credentials.blade.php | 83 +-
app/views/admin/manage-gateway.blade.php | 287 +-
app/views/application/deployment.blade.php | 4 +-
app/views/application/module.blade.php | 4 +-
app/views/experiment/summary.blade.php | 33 +-
.../compute-resource-preferences.blade.php | 111 +
app/views/partials/dashboard-block.blade.php | 8 +-
.../partials/experiment-container.blade.php | 6 +-
app/views/partials/experiment-info.blade.php | 26 +-
.../partials/experiment-queue-block.blade.php | 14 +-
.../partials/gateway-preferences.blade.php | 110 -
.../partials/interface-input-block.blade.php | 5 +-
.../storage-resource-preferences.blade.php | 64 +
app/views/resource/browse.blade.php | 42 +-
app/views/resource/edit.blade.php | 2 +-
app/views/scigap-admin/manage-gateway.blade.php | 22 +-
app/views/storage-resource/browse.blade.php | 8 +-
app/views/storage-resource/edit.blade.php | 27 -
public/js/gateway.js | 20 +-
65 files changed, 10687 insertions(+), 5243 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e7eaded5/app/views/partials/experiment-info.blade.php
----------------------------------------------------------------------