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/02/02 20:03:15 UTC
[1/4] airavata-php-gateway git commit: Fixes for picking local time
than UTC time in experiment statistics
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop bbafbcc94 -> 11f708020
Fixes for picking local time than UTC time in experiment statistics
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/00396836
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/00396836
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/00396836
Branch: refs/heads/develop
Commit: 003968364607db4720f1478eb29f94f51784c5d3
Parents: bbafbcc
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Tue Feb 2 11:58:33 2016 -0500
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Tue Feb 2 11:58:33 2016 -0500
----------------------------------------------------------------------
app/views/admin/manage-experiments.blade.php | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/00396836/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 3bc6d5b..d417032 100644
--- a/app/views/admin/manage-experiments.blade.php
+++ b/app/views/admin/manage-experiments.blade.php
@@ -324,14 +324,13 @@ to be uncommented when actually in use.
-->
<!-- Flot Charts JavaScript -->
+<!--
{{ HTML::script('js/flot/jquery.flot.js')}}
{{ HTML::script('js/flot/jquery.flot.tooltip.min.js')}}
{{ HTML::script('js/flot/jquery.flot.resize.js')}}
{{ HTML::script('js/flot/jquery.flot.pie.js')}}
{{ HTML::script('js/flot/flot-data.js')}}
-
-{{ HTML::script('js/moment.js')}}
-{{ HTML::script('js/datetimepicker.js')}}
+-->
{{ HTML::script('js/time-conversion.js')}}
<script>
@@ -418,7 +417,7 @@ to be uncommented when actually in use.
$fromTime = $("#datetimepicker9").find("input").val();
$fromTime = moment($fromTime).format('MM/DD/YYYY hh:mm A');
$toTime = $("#datetimepicker10").find("input").val();
- $toTime = moment($toTime).utc().format('MM/DD/YYYY hh:mm A');
+ $toTime = moment($toTime).format('MM/DD/YYYY hh:mm A');
if ($fromTime == '' || $toTime == '') {
alert("Please Select Valid Date Inputs!");
} else {
@@ -430,6 +429,9 @@ to be uncommented when actually in use.
$(".oneDayExp").click();
function getExperiments( startTime, endTime, msg){
+
+ console.log( startTime);
+ console.log( endTime);
$(".experiment-statistics").html("");
$(".loading-img-statistics").removeClass("hide");
$.ajax({
[3/4] airavata-php-gateway git commit: Experiment details
modifications
Posted by nd...@apache.org.
Experiment details modifications
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/810d7dc8
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/810d7dc8
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/810d7dc8
Branch: refs/heads/develop
Commit: 810d7dc829aecbcdc4b6584ca20bf87fa9c19ad4
Parents: b1996f9
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Tue Feb 2 11:59:33 2016 -0500
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Tue Feb 2 11:59:33 2016 -0500
----------------------------------------------------------------------
app/views/partials/experiment-info.blade.php | 27 ++++++++++++++++-------
1 file changed, 19 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/810d7dc8/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 7ff3f27..2b46d16 100644
--- a/app/views/partials/experiment-info.blade.php
+++ b/app/views/partials/experiment-info.blade.php
@@ -240,14 +240,25 @@
</span>
@foreach( $process->tasks as $task)
- <br/>Task Id : {{ $task->taskId }}
- <br/>Task Type : {{ $expVal["taskTypes"][$task->taskType] }}
- <br/>Task Status : {{ $expVal["taskStates"][$task->taskStatus->state] }}
- <br/>Jobs : {{ count( $task->jobs)}}
- <br/>@foreach( $task->jobs as $jobIndex => $job)
- Job No. : {{ $jobIndex}}
- @endforeach
-
+ <dl class="well dl-horizontal">
+ <dt>Task Id : </dt> <dd>{{ $task->taskId }}</dd>
+ <dt>Task Type : </dt> <dd>{{ $expVal["taskTypes"][$task->taskType] }}</dd>
+ <dt>Task Status : </dt> <dd>{{ $expVal["taskStates"][$task->taskStatus->state] }}</dd>
+ @if( is_object( $task->taskError))
+ <dt>Task Error Id : </dt><dd>{{ $task->taskError->errorId }}</dd>
+ <dt>Task Error Msg : </dt><dd>{{ $task->taskError->userFriendlyMessage }}</dd>
+ @endif
+ @if( count( $task->jobs) > 0 )
+ <dt>Jobs : </dt><dd>{{ count( $task->jobs)}}</dd>
+ @endif
+ @foreach( $task->jobs as $jobIndex => $job)
+ <dl class="well dl-horizontal">
+ <dt>Job Id. :</dt> <dd>{{ $job->jobId }}</dd>
+ <dt>Job Name : </dt><dd>{{ $job->jobName }}</dd>
+ <dt>Job Description :</dt><dd>{{ $job->jobDescription }}</dd>
+ </dl>
+ @endforeach
+ </dl>
<hr/>
@endforeach
</li>
[2/4] airavata-php-gateway git commit: Adding clarity in
functionality for a Super admin
Posted by nd...@apache.org.
Adding clarity in functionality for a Super admin
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/b1996f9a
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/b1996f9a
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/b1996f9a
Branch: refs/heads/develop
Commit: b1996f9abcc1ac9b3501c599cea415e3ea9f01d3
Parents: 0039683
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Tue Feb 2 11:59:01 2016 -0500
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Tue Feb 2 11:59:01 2016 -0500
----------------------------------------------------------------------
app/views/admin/manage-gateway.blade.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b1996f9a/app/views/admin/manage-gateway.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/manage-gateway.blade.php b/app/views/admin/manage-gateway.blade.php
index a962dc0..206c75f 100644
--- a/app/views/admin/manage-gateway.blade.php
+++ b/app/views/admin/manage-gateway.blade.php
@@ -25,7 +25,7 @@
</div>
<div class="container-fluid">
<div class="panel-group" id="accordion2">
- <h3>Your Gateway Preferences</h3>
+ <h3>Edit your Gateway Preferences</h3>
@foreach( $gateways as $indexGP => $gp )
@if( $gp->gatewayId == Session::get("gateway_id"))
@include('partials/gateway-preferences-block', array("gp" => $gp, "accName" => "accordion2") )
@@ -36,7 +36,7 @@
@if( Session::has('super-admin'))
<div class="row">
<div class="col-md-6">
- <h3>All Gateway Preferences</h3>
+ <h3>Check all Gateway Preferences</h3>
</div>
<div class="col-md-6" style="margin-top:2%">
<input type="text" class="col-md-12 filterinput" placeholder="Search by Gateway Name"/>
[4/4] airavata-php-gateway git commit: Adding ability to update a
Storage Resource Preference
Posted by nd...@apache.org.
Adding ability to update a Storage Resource Preference
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/11f70802
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/11f70802
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/11f70802
Branch: refs/heads/develop
Commit: 11f70802047c13f02654f02dc24f3fb2bab5c7ca
Parents: 810d7dc
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Tue Feb 2 14:02:40 2016 -0500
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Tue Feb 2 14:02:40 2016 -0500
----------------------------------------------------------------------
app/controllers/GatewayprofileController.php | 8 ++++----
app/controllers/StorageResourceController.php | 5 +++--
app/libraries/CRUtilities.php | 3 ---
app/libraries/SRUtilities.php | 12 ++++++------
app/routes.php | 4 ++--
5 files changed, 15 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/11f70802/app/controllers/GatewayprofileController.php
----------------------------------------------------------------------
diff --git a/app/controllers/GatewayprofileController.php b/app/controllers/GatewayprofileController.php
index 0fcbde4..9930344 100644
--- a/app/controllers/GatewayprofileController.php
+++ b/app/controllers/GatewayprofileController.php
@@ -40,15 +40,15 @@ class GatewayprofileController extends BaseController {
{
if( CRUtilities::add_or_update_CRP( Input::all()) )
{
- return Redirect::to("admin/dashboard/gateway")->with("message","Compute Resource Preference for the desired Gateway has been set.");
+ return Redirect::to("admin/dashboard/gateway")->with("message","Compute Resource Preference has been set.");
}
}
- public function modifyDSP()
+ public function modifySRP()
{
- if( SRUtilities::add_or_update_DSP( Input::all()) )
+ if( SRUtilities::add_or_update_SRP( Input::all()) )
{
- return Redirect::to("admin/dashboard/gateway")->with("message","Data Storage Preference for the desired Gateway has been set.");
+ return Redirect::to("admin/dashboard/gateway")->with("message","Storage Preference has been set.");
}
}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/11f70802/app/controllers/StorageResourceController.php
----------------------------------------------------------------------
diff --git a/app/controllers/StorageResourceController.php b/app/controllers/StorageResourceController.php
index 02ff74f..5b26a2e 100644
--- a/app/controllers/StorageResourceController.php
+++ b/app/controllers/StorageResourceController.php
@@ -72,10 +72,11 @@ class StorageresourceController extends BaseController
}
public function editSubmit()
- {
+ {
+ var_dump( Input::all() ); exit;
$this->beforeFilter('verifyeditadmin');
$tabName = "";
- if (Input::get("sr-edit") == "resDesc") /* Modify compute Resource description */ {
+ if (Input::get("sr-edit") == "resDesc") /* Modify storage Resource description */ {
$storageResourceDescription = SRUtilities::get_storage_resource(Input::get("srId"));
$storageResourceDescription->hostName = trim(Input::get("hostname"));
$storageResourceDescription->resourceDescription = Input::get("description");
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/11f70802/app/libraries/CRUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/CRUtilities.php b/app/libraries/CRUtilities.php
index e2c8daa..6261acd 100755
--- a/app/libraries/CRUtilities.php
+++ b/app/libraries/CRUtilities.php
@@ -490,10 +490,7 @@ class CRUtilities
Cache::forget('CR-' . $inputs["computeResourceId"]);
}
}
-
- //var_dump( $inputs); exit;
return Airavata::addGatewayComputeResourcePreference(Session::get('authz-token'), $inputs["gatewayId"], $inputs["computeResourceId"], $computeResourcePreferences);
-
}
public static function deleteGP($gpId)
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/11f70802/app/libraries/SRUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/SRUtilities.php b/app/libraries/SRUtilities.php
index 78669c0..8e22044 100644
--- a/app/libraries/SRUtilities.php
+++ b/app/libraries/SRUtilities.php
@@ -274,7 +274,7 @@ class SRUtilities
return Airavata::updateGatewayResourceProfile( Session::get('authz-token'), $data["gateway_id"], $gatewayResourceProfile);
}
- public static function add_or_update_DSP($inputs)
+ public static function add_or_update_SRP($inputs)
{
$storagePreference = new StoragePreference($inputs);
@@ -283,11 +283,11 @@ class SRUtilities
Cache::forget('SR-' . $inputs["storageResourceId"]);
}
}
-
- //var_dump( $inputs); exit;
- return Airavata::addGatewayStoragePreference(Session::get('authz-token'), $inputs["gatewayId"], $inputs["storageResourceId"],
- $storagePreference);
-
+ return Airavata::addGatewayStoragePreference( Session::get('authz-token'),
+ $inputs["gatewayId"],
+ $inputs["storageResourceId"],
+ $storagePreference
+ );
}
public static function deleteGP($gpId)
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/11f70802/app/routes.php
----------------------------------------------------------------------
diff --git a/app/routes.php b/app/routes.php
index 60c8832..495e439 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -196,9 +196,9 @@ Route::post("gp/add-crp", "GatewayprofileController@modifyCRP");
Route::post("gp/update-crp", "GatewayprofileController@modifyCRP");
-Route::post("gp/add-dsp", "GatewayprofileController@modifyDSP");
+Route::post("gp/add-srp", "GatewayprofileController@modifySRP");
-Route::post("gp/update-dsp", "GatewayprofileController@modifyDSP");
+Route::post("gp/update-srp", "GatewayprofileController@modifySRP");
Route::post("gp/remove-sr", "GatewayprofileController@delete");