You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2015/06/02 12:17:53 UTC

airavata-php-gateway git commit: Fixing AIRAVATA-1690

Repository: airavata-php-gateway
Updated Branches:
  refs/heads/master 45768f362 -> 6a96bf70b


Fixing AIRAVATA-1690


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

Branch: refs/heads/master
Commit: 6a96bf70b4e441d1a9cc6d259ee33c3dd10d5837
Parents: 45768f3
Author: Supun Nakandala <sc...@apache.org>
Authored: Tue Jun 2 15:47:32 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Tue Jun 2 15:47:32 2015 +0530

----------------------------------------------------------------------
 app/views/partials/experiment-info.blade.php | 20 ++++++++++++++++++++
 app/views/project/summary.blade.php          |  5 +++--
 2 files changed, 23 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/6a96bf70/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 458a28f..a57f922 100644
--- a/app/views/partials/experiment-info.blade.php
+++ b/app/views/partials/experiment-info.blade.php
@@ -16,6 +16,10 @@
     
     <table class="table">
         <tr>
+            <td><strong>Experiment Id</strong></td>
+            <td><?php echo $experiment->experimentID; ?></td>
+        </tr>
+        <tr>
             <td><strong>Name</strong></td>
             <td><?php echo $experiment->name; ?></td>
         </tr>
@@ -78,6 +82,22 @@
             <td class="time" unix-time="<?php echo $expVal["experimentTimeOfStateChange"]; ?>"></td>
         </tr>
         <tr>
+            <td><strong>Wall time</strong></td>
+            <td><?php echo $experiment->userConfigurationData->computationalResourceScheduling->wallTimeLimit; ?></td>
+        </tr>
+        <tr>
+            <td><strong>CPU count</strong></td>
+            <td><?php echo $experiment->userConfigurationData->computationalResourceScheduling->totalCPUCount; ?></td>
+        </tr>
+        <tr>
+            <td><strong>Node count</strong></td>
+            <td><?php echo $experiment->userConfigurationData->computationalResourceScheduling->nodeCount; ?></td>
+        </tr>
+        <tr>
+            <td><strong>Queue</strong></td>
+            <td><?php echo $experiment->userConfigurationData->computationalResourceScheduling->queueName; ?></td>
+        </tr>
+        <tr>
             <td><strong>Inputs</strong></td>
             <td><?php Utilities::list_input_files($experiment); ?></td>
         </tr>

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/6a96bf70/app/views/project/summary.blade.php
----------------------------------------------------------------------
diff --git a/app/views/project/summary.blade.php b/app/views/project/summary.blade.php
index fc1c0b7..f0b827c 100755
--- a/app/views/project/summary.blade.php
+++ b/app/views/project/summary.blade.php
@@ -37,6 +37,7 @@
 
     echo '<th>Name</th>';
     echo '<th>Application</th>';
+    echo '<th>Compute Resource</th>';
     echo '<th>Time</th>';
     echo '<th>Status</th>';
 
@@ -75,8 +76,8 @@
 
         echo "<td>$applicationInterface->applicationName</td>";
 
-
-
+        echo '<td>' . Utilities::get_compute_resource($experiment->userConfigurationData
+                ->computationalResourceScheduling->resourceHostId)->hostName . '</td>';
         echo '<td class="time" unix-time="' . $expValues["experimentTimeOfStateChange"] . '"></td>';