airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject airavata-php-gateway git commit: fixing AIRAVATA-1799
Date Mon, 19 Oct 2015 22:36:11 GMT
Repository: airavata-php-gateway
Updated Branches:
  refs/heads/master 875c5a10d -> 764755ca8


fixing AIRAVATA-1799


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

Branch: refs/heads/master
Commit: 764755ca871b04dbcc347a20d6e2d519e2998332
Parents: 875c5a1
Author: scnakandala <supun.nakandala@gmail.com>
Authored: Mon Oct 19 18:36:07 2015 -0400
Committer: scnakandala <supun.nakandala@gmail.com>
Committed: Mon Oct 19 18:36:07 2015 -0400

----------------------------------------------------------------------
 .../Airavata/Model/Experiment/Types.php         | 31 +++++++++++++++++---
 .../partials/experiment-container.blade.php     | 13 ++++++--
 2 files changed, 37 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/764755ca/app/libraries/Airavata/Model/Experiment/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Experiment/Types.php b/app/libraries/Airavata/Model/Experiment/Types.php
index 84279c2..8d5ea8e 100644
--- a/app/libraries/Airavata/Model/Experiment/Types.php
+++ b/app/libraries/Airavata/Model/Experiment/Types.php
@@ -883,6 +883,10 @@ class ExperimentSummaryModel {
   /**
    * @var string
    */
+  public $resourceHostId = null;
+  /**
+   * @var string
+   */
   public $experimentStatus = null;
   /**
    * @var int
@@ -925,10 +929,14 @@ class ExperimentSummaryModel {
           'type' => TType::STRING,
           ),
         9 => array(
-          'var' => 'experimentStatus',
+          'var' => 'resourceHostId',
           'type' => TType::STRING,
           ),
         10 => array(
+          'var' => 'experimentStatus',
+          'type' => TType::STRING,
+          ),
+        12 => array(
           'var' => 'statusUpdateTime',
           'type' => TType::I64,
           ),
@@ -959,6 +967,9 @@ class ExperimentSummaryModel {
       if (isset($vals['executionId'])) {
         $this->executionId = $vals['executionId'];
       }
+      if (isset($vals['resourceHostId'])) {
+        $this->resourceHostId = $vals['resourceHostId'];
+      }
       if (isset($vals['experimentStatus'])) {
         $this->experimentStatus = $vals['experimentStatus'];
       }
@@ -1045,12 +1056,19 @@ class ExperimentSummaryModel {
           break;
         case 9:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->experimentStatus);
+            $xfer += $input->readString($this->resourceHostId);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
         case 10:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->experimentStatus);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 12:
           if ($ftype == TType::I64) {
             $xfer += $input->readI64($this->statusUpdateTime);
           } else {
@@ -1110,13 +1128,18 @@ class ExperimentSummaryModel {
       $xfer += $output->writeString($this->executionId);
       $xfer += $output->writeFieldEnd();
     }
+    if ($this->resourceHostId !== null) {
+      $xfer += $output->writeFieldBegin('resourceHostId', TType::STRING, 9);
+      $xfer += $output->writeString($this->resourceHostId);
+      $xfer += $output->writeFieldEnd();
+    }
     if ($this->experimentStatus !== null) {
-      $xfer += $output->writeFieldBegin('experimentStatus', TType::STRING, 9);
+      $xfer += $output->writeFieldBegin('experimentStatus', TType::STRING, 10);
       $xfer += $output->writeString($this->experimentStatus);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->statusUpdateTime !== null) {
-      $xfer += $output->writeFieldBegin('statusUpdateTime', TType::I64, 10);
+      $xfer += $output->writeFieldBegin('statusUpdateTime', TType::I64, 12);
       $xfer += $output->writeI64($this->statusUpdateTime);
       $xfer += $output->writeFieldEnd();
     }

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/764755ca/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 7a59041..6e00cd4 100644
--- a/app/views/partials/experiment-container.blade.php
+++ b/app/views/partials/experiment-container.blade.php
@@ -19,8 +19,8 @@ else
         <tr>
             <th>Name</th>
             <th>Application</th>
-            <th>Description</th>
-            <!--<th>Resource</th>-->
+            {{--<th>Description</th>--}}
+            <th>Resource</th>
             <th>Creation Time</th>
             <th>Status</th>
             <!--                    <select class="form-control select-status">-->
@@ -41,6 +41,13 @@ else
                 $description = substr($experiment['experiment']->description, 0, 17) .
'<span class="text-muted">...</span>';
             }
 
+            $resource  = $experiment['experiment']->resourceHostId;
+            if(!empty($resource)){
+                $resource = explode("_", $resource)[0];
+            }else{
+                $resource = "";
+            }
+
             echo '<tr>';
             $addEditOption = "";
             if ($experiment['expValue']['editable'])
@@ -50,7 +57,7 @@ else
 
             echo '<td>' . $experiment['expValue']['applicationInterface']->applicationName
. '</td>';
 
-            echo '<td>' . $description . '</td>';
+            echo '<td>' . $resource . '</td>';
 
             //echo "<td>$computeResource->hostName</td>";
             echo '<td class="time" unix-time="' . $experiment['experiment']->creationTime
/ 1000 . '"></td>';


Mime
View raw message