airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [2/6] airavata-php-gateway git commit: Clicking on Experiment in Statistics now shows detailed information without taking to summary page
Date Thu, 11 Feb 2016 14:38:57 GMT
Clicking on Experiment in Statistics now shows detailed information without taking to summary
page


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

Branch: refs/heads/master
Commit: e0195ad5ff7c9bd7515da0b805e1f54e978df2eb
Parents: 73f23e8
Author: Nipurn Doshi <nipunhere@gmail.com>
Authored: Wed Feb 10 14:23:15 2016 -0500
Committer: Nipurn Doshi <nipunhere@gmail.com>
Committed: Wed Feb 10 14:23:15 2016 -0500

----------------------------------------------------------------------
 app/views/admin/manage-experiments.blade.php      | 12 ++++++++----
 app/views/partials/experiment-container.blade.php |  5 ++---
 2 files changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e0195ad5/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 26a2e4d..293cb26 100644
--- a/app/views/admin/manage-experiments.blade.php
+++ b/app/views/admin/manage-experiments.blade.php
@@ -358,14 +358,16 @@ to be uncommented when actually in use.
 
     $(".get-experiment").click(function () {
         $(".loading-img").removeClass("hide");
+
+        var expId = $(".experimentId").val();
         $.ajax({
-            url: 'experiment/summary?expId=' + $(".experimentId").val(),
+            url: 'experiment/summary?expId=' + expId,
             type: 'get',
             success: function (data) {
                 //$(".experiment-info").html(data);
-                $("#myTabs").append('<li role="presentation"><a href="#' + $(".experimentId").val()
+ '" aria-controls="' + $(".experimentId").val() + '" role="tab" data-toggle="tab">' +
$(".experimentId").val() + '</a></li>');
-                $(".tab-content").append('<div role="tabpanel" class="tab-pane" id="'
+ $(".experimentId").val() + '">' + data + '</div>');
-                $('#myTabs a[href="#' + $(".experimentId").val() + '"]').tab('show') // Select
tab by name
+                $("#myTabs").append('<li role="presentation"><a href="#' + expId
+ '" aria-controls="' + expId + '" role="tab" data-toggle="tab">' + expId + '</a></li>');
+                $(".tab-content").append('<div role="tabpanel" class="tab-pane" id="'
+ expId + '">' + data + '</div>');
+                $('#myTabs a[href="#' + expId + '"]').tab('show') // Select tab by name
                 
                 //$('#myTabs a[href="#expsummary"]').tab('show') // Select tab by name
                 
@@ -467,5 +469,7 @@ to be uncommented when actually in use.
         var todayDate = month + "/" + date + "/" + cd.getFullYear() + " " + hours + ":" +
cd.getUTCMinutes() + " " + timeOfDay;
         return todayDate;
     }
+
+    $
 </script>
 @stop
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e0195ad5/app/views/partials/experiment-container.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/experiment-container.blade.php b/app/views/partials/experiment-container.blade.php
index 063a56d..e9dc65f 100644
--- a/app/views/partials/experiment-container.blade.php
+++ b/app/views/partials/experiment-container.blade.php
@@ -32,7 +32,7 @@
                 <tr>
                     <!-- Experiment Name -->
                     <td> 
-                        <a href="{{URL::to('/')}}/experiment/summary?expId={{$experiment['experiment']->experimentId}}">
+                        <a @if( isset( $dashboard)) class="get-exp-stats" data-expid="{{$experiment['experiment']->experimentId}}"
@else href="{{URL::to('/')}}/experiment/summary?expId={{$experiment['experiment']->experimentId}}"
@endif style="cursor: pointer;">
                         {{ $experiment['experiment']->name }} 
                         </a>
                         @if( $experiment['expValue']['editable'])
@@ -59,8 +59,7 @@
                     <td class="time" unix-time="{{ $experiment['experiment']->creationTime
/ 1000 }}"></td>
 
                     <td>
-                        <a class="{{ ExperimentUtilities::get_status_color_class( $experiment['expValue']['experimentStatusString']
) }}"
-                           href="{{ URL::to('/') }}/experiment/summary?expId={{$experiment['experiment']->experimentId
}}">
+                        <a @if( isset( $dashboard)) class="get-exp-stats {{ ExperimentUtilities::get_status_color_class(
$experiment['expValue']['experimentStatusString'] ) }}" data-expid="{{$experiment['experiment']->experimentId}}"
@else class="{{ ExperimentUtilities::get_status_color_class( $experiment['expValue']['experimentStatusString']
) }}" href="{{URL::to('/')}}/experiment/summary?expId={{$experiment['experiment']->experimentId}}"
@endif style="cursor: pointer;">
                             {{$experiment['expValue']['experimentStatusString'] }}
                         </a>
                     </td>


Mime
View raw message