Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C7EDA176AF for ; Thu, 14 May 2015 18:12:40 +0000 (UTC) Received: (qmail 11271 invoked by uid 500); 14 May 2015 18:12:40 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 11218 invoked by uid 500); 14 May 2015 18:12:40 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 11199 invoked by uid 99); 14 May 2015 18:12:40 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 May 2015 18:12:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 884C5DFC81; Thu, 14 May 2015 18:12:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ndoshi@apache.org To: commits@airavata.apache.org Date: Thu, 14 May 2015 18:12:40 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/4] airavata-php-gateway git commit: Dashboard Experiments Overview Page in Progress Repository: airavata-php-gateway Updated Branches: refs/heads/master fa1b1c123 -> 0e68bf27b Dashboard Experiments Overview Page in Progress 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/bc3634fd Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/bc3634fd Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/bc3634fd Branch: refs/heads/master Commit: bc3634fdc93d207d8a0ef649293225263eaa215e Parents: 0677c08 Author: Nipurn Doshi Authored: Thu May 14 11:04:06 2015 -0400 Committer: Nipurn Doshi Committed: Thu May 14 11:04:06 2015 -0400 ---------------------------------------------------------------------- app/controllers/AdminController.php | 8 +- app/libraries/AdminUtilities.php | 9 +- app/libraries/Utilities.php | 2 +- app/routes.php | 1 + app/views/admin/manage-experiments.blade.php | 224 ++++++++++++++++++- app/views/admin/manage-users.blade.php | 24 +- .../partials/experiment-queue-block.blade.php | 2 +- app/views/resource/browse.blade.php | 77 ++++--- app/views/scigap-admin/manage-gateway.blade.php | 2 +- 9 files changed, 292 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/bc3634fd/app/controllers/AdminController.php ---------------------------------------------------------------------- diff --git a/app/controllers/AdminController.php b/app/controllers/AdminController.php index fc0c244..b3c9ac4 100755 --- a/app/controllers/AdminController.php +++ b/app/controllers/AdminController.php @@ -94,7 +94,7 @@ class AdminController extends BaseController { public function rolesView(){ $idStore = $this->idStore; $roles = $idStore->getRoleNames(); - + var_dump( $roles); exit; return View::make("admin/manage-roles", array("roles" => $roles)); } @@ -141,9 +141,11 @@ class AdminController extends BaseController { $idStore = $this->idStore; + $gateway = AdminUtilities::addGateway(Input::all() ); + $tm = $idStore->createTenant(1, $inputs["admin-username"], $inputs["admin-password"], $inputs["admin-email"], $inputs["admin-firstname"], $inputs["admin-lastname"], $inputs["domain"]); - print_r( $tm); exit; - $gateway = AdminUtilities::addGateway(Input::all() ); + + return $gateway; } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/bc3634fd/app/libraries/AdminUtilities.php ---------------------------------------------------------------------- diff --git a/app/libraries/AdminUtilities.php b/app/libraries/AdminUtilities.php index 5775991..c768874 100644 --- a/app/libraries/AdminUtilities.php +++ b/app/libraries/AdminUtilities.php @@ -2,10 +2,15 @@ use Airavata\Model\Workspace\Gateway; -public function addGateway( $input){ +class AdminUtilities{ + +public static function addGateway( $input){ $gateway = new Gateway(); - $gateway->domain = $input["domainName"]; + $gateway->gatewayId = $input["gatewayName"]; + $gateway->domain = $input["domain"]; $gateway->gatewayName = $input["gatewayName"]; $gateway->emailAddress = $input["admin-email"]; return Airavata::addGateway( $gateway); +} + } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/bc3634fd/app/libraries/Utilities.php ---------------------------------------------------------------------- diff --git a/app/libraries/Utilities.php b/app/libraries/Utilities.php index 722f326..0cf23e6 100644 --- a/app/libraries/Utilities.php +++ b/app/libraries/Utilities.php @@ -1035,7 +1035,7 @@ public static function clone_experiment($expId) //create new experiment to receive the clone $experiment = Airavata::getExperiment($expId); - $cloneId = $airavataclient->cloneExperiment($expId, 'Clone of ' . $experiment->name); + $cloneId = Airavata::cloneExperiment($expId, 'Clone of ' . $experiment->name); Utilities::print_success_message("

Experiment cloned!

" . '

You will be redirected to the edit page shortly, or you can http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/bc3634fd/app/routes.php ---------------------------------------------------------------------- diff --git a/app/routes.php b/app/routes.php index 0bceb1a..2f98343 100755 --- a/app/routes.php +++ b/app/routes.php @@ -187,6 +187,7 @@ Route::post("admin/delete-role", "AdminController@deleteRole"); //Super Admin Specific calls Route::post("admin/add-gateway", "AdminController@addGateway"); +Route::get("admin/add-gateway", "AdminController@addGateway"); //Airavata Server Check Route::get("airavata/down", function(){ http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/bc3634fd/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 0aaddc5..ebb693d 100644 --- a/app/views/admin/manage-experiments.blade.php +++ b/app/views/admin/manage-experiments.blade.php @@ -2,7 +2,8 @@ @section('page-header') @parent - {{ HTML::style('css/admin.css')}} + {{ HTML::style('css/admin.css')}} + {{ HTML::style('css/datetimepicker.css')}} @stop @section('content') @@ -36,6 +37,190 @@ +

+
+ Select dates between which you want to review experiments. +
+
+
+
+
+ + + +
+
+
+
+
+
+ + + +
+
+
+
+
+ +
+
+
+
+
+
+ +
+
+
26
+
Total Experiments
+
+
+
+ +
+ View Details + +
+
+ +
+
+ +
+
+
+
+
+ +
+
+
16
+
Successful Experiments
+
+
+
+ +
+ View Details + +
+
+ +
+
+ +
+
+
+
+
+ +
+
+
10
+
Canceled Experiments
+
+
+
+ +
+ View Details + +
+
+ +
+
+ +
+
+
+
+
+ +
+
+
6
+
Failed Experiments
+
+
+
+ +
+ View Details + +
+
+ +
+
+
+ +
+
+
+
+

Line Graph Example with Tooltips

+
+
+
+
+ + +
+
+
0
+
1
+
2
+
3
+
4
+
5
+
6
+
7
+
8
+
9
+
10
+
11
+
+
+
-1.0
+
-0.5
+
0.0
+
0.5
+
1.0
+
+
+
+
+ + + + + + + + + + + +
+
+
+
+ 		sin(x)
+
+ 		cos(x)
+
+
+ + +
+
+
+
+
+
    @@ -122,7 +307,9 @@ @section('scripts') @parent - {{ HTML::script('js/gateway.js') }} + {{ HTML::script('js/gateway.js') }} + {{ HTML::script('js/moment.js')}} + {{ HTML::script('js/datetimepicker.js')}} @stop \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/bc3634fd/app/views/admin/manage-users.blade.php ---------------------------------------------------------------------- diff --git a/app/views/admin/manage-users.blade.php b/app/views/admin/manage-users.blade.php index 5cbdb7b..5a500b5 100644 --- a/app/views/admin/manage-users.blade.php +++ b/app/views/admin/manage-users.blade.php @@ -75,27 +75,31 @@

    - Getting User Roles. Please Wait... + Getting User Roles. Please Wait...
    +
    +
    + + +
    +
    - +
- -
-
- - -
-
@stop @section('scripts') @@ -133,7 +137,7 @@ $(".role-block").find(".role-name").html( roles[i]); var newRoleBlock = $(".role-block").html(); roleBlocks += newRoleBlock; - $(".roles-list").html( roleBlocks); + $(".roles-list").prepend( roleBlocks); } $(".roles-load").addClass("hide"); $(".roles-list").removeClass("hide"); http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/bc3634fd/app/views/partials/experiment-queue-block.blade.php ---------------------------------------------------------------------- diff --git a/app/views/partials/experiment-queue-block.blade.php b/app/views/partials/experiment-queue-block.blade.php index a0453b0..2e2a947 100644 --- a/app/views/partials/experiment-queue-block.blade.php +++ b/app/views/partials/experiment-queue-block.blade.php @@ -38,7 +38,7 @@ - minutes + hours
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/bc3634fd/app/views/resource/browse.blade.php ---------------------------------------------------------------------- diff --git a/app/views/resource/browse.blade.php b/app/views/resource/browse.blade.php index 3edcca6..7580200 100644 --- a/app/views/resource/browse.blade.php +++ b/app/views/resource/browse.blade.php @@ -19,47 +19,50 @@ {{ Utilities::print_warning_message('No Compute Resources are registered. Please use "Register Compute Resource" to register a new resources.') }} @else
+

Existing Compute Resources :

-
- - - - - - - - - - - - @foreach ($allCRs as $crId => $crName) - - - - - - - - - @endforeach - -
NameIdEditViewDelete
{{ $crName }}{{ $crId }} - - - - - - - - - - -
-
- +
+
+
+ + + + + + + + + + + + @foreach ($allCRs as $crId => $crName) + + + + + + + + + @endforeach + +
NameIdEditViewDelete
{{ $crName }}{{ $crId }} + + + + + + + + + + +
+
+
@endif @endif http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/bc3634fd/app/views/scigap-admin/manage-gateway.blade.php ---------------------------------------------------------------------- diff --git a/app/views/scigap-admin/manage-gateway.blade.php b/app/views/scigap-admin/manage-gateway.blade.php index 2a7a4d8..288e122 100644 --- a/app/views/scigap-admin/manage-gateway.blade.php +++ b/app/views/scigap-admin/manage-gateway.blade.php @@ -175,7 +175,7 @@ $(".gateway-error").html(data).removeClass("hide"); } }).complete( function(){ - $("add-gateway-loading").modal("hide"); + $("#add-gateway-loading").modal("hide"); }); });