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 erros and statuses issues
Date Thu, 01 Sep 2016 19:53:56 GMT
Repository: airavata-php-gateway
Updated Branches:
  refs/heads/develop 309133e32 -> dbb8638b5


fixing erros and statuses issues


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

Branch: refs/heads/develop
Commit: dbb8638b532d7a37babfb0da409035956d8e3a67
Parents: 309133e
Author: scnakandala <supun.nakandala@gmail.com>
Authored: Thu Sep 1 15:53:47 2016 -0400
Committer: scnakandala <supun.nakandala@gmail.com>
Committed: Thu Sep 1 15:53:47 2016 -0400

----------------------------------------------------------------------
 app/config/pga_config.php                      | 248 ++++++++++++++++++++
 app/controllers/ExperimentController.php       |  10 +-
 app/libraries/Airavata/Model/Job/Types.php     |  22 +-
 app/libraries/Airavata/Model/Process/Types.php |  44 ++--
 app/libraries/Airavata/Model/Task/Types.php    |  44 ++--
 app/libraries/ExperimentUtilities.php          |   7 +-
 app/views/partials/experiment-info.blade.php   |  16 +-
 7 files changed, 320 insertions(+), 71 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/dbb8638b/app/config/pga_config.php
----------------------------------------------------------------------
diff --git a/app/config/pga_config.php b/app/config/pga_config.php
new file mode 100644
index 0000000..0188c67
--- /dev/null
+++ b/app/config/pga_config.php
@@ -0,0 +1,248 @@
+<?php
+return array(
+    /**
+     * *****************************************************************
+     *  WSO2 Identity Server Related Configurations
+     * *****************************************************************
+     */
+
+    'wsis' => [
+
+        /**
+         * Admin Role Name
+         */
+        'admin-role-name' => 'admin',
+
+        /**
+         * Read only Admin Role Name
+         */
+        'read-only-admin-role-name' => 'admin-read-only',
+
+        /**
+         * Gateway user role
+         */
+        'user-role-name' => 'gateway-user',
+
+        /**
+         * Tenant Domain
+         */
+        'tenant-domain' => 'prod.seagrid',
+
+        /**
+         * Tenant admin's username
+         */
+        'admin-username' => 'admin',
+
+        /**
+         * Tenant admin's password
+         */
+        'admin-password' => 'seagr1d_@dmin',
+
+        /**
+         * OAuth client key
+         */
+        'oauth-client-key' => 'y7xgdnNUx6ifOswJTPcqtzw4aOEa',
+
+        /**
+         * OAuth client secret
+         */
+        'oauth-client-secret' => 'CgfbuupAPhaOBSBPSScZUWHNANwa',
+
+        /**
+         * OAuth Grant Type (password or authorization_code)
+         */
+        'oauth-grant-type' => 'password',
+
+        /**
+         * OAuth call back url (only if the grant type is authorization_code)
+         */
+        'oauth-callback-url' => 'http://localhost/airavata-php-gateway/public/callback-url',
+
+        /**
+         * Identity server domain
+         */
+        'server' => 'localhost',
+
+        /**
+         * Identity server url
+         */
+        'service-url' => 'https://idp.scigap.org:9443/',
+
+        /**
+         * Enable HTTPS server verification
+         */
+        'verify-peer' => false,
+
+        /**
+         * Path to the server certificate file
+         */
+        'cafile-path' => app_path() . '/resources/security/idp_scigap_org.pem',
+
+        /**
+         * Allow self signed server certificates
+         */
+        'allow-self-signed-cert' => false
+    ],
+
+
+    /**
+     * *****************************************************************
+     *  Airavata Client Configurations
+     * *****************************************************************
+     */
+    'airavata' => [
+
+        /**
+         * Airavata API server location. Use tls:// as the protocol to
+         * connect TLS enabled Airavata
+         */
+        'airavata-server' => 'tls://gw56.iu.xsede.org',
+
+        /**
+         * Airavata API server port
+         */
+        'airavata-port' => '9930',
+
+        /**
+         * Airavata API server thrift communication timeout
+         */
+        'airavata-timeout' => '1000000',
+
+        /**
+         * PGA Gateway ID
+         */
+        'gateway-id' => 'seagrid',
+
+        /**
+         * Maximum size of a file which is allowed to upload to the server
+         */
+        'server-allowed-file-size' => 64,
+
+        /**
+         * absolute path of the data dir
+         */
+        'experiment-data-absolute-path' => '/Users/supun/test',
+
+        /**
+         * Advanced experiments options
+         */
+        'advanced-experiment-options' => '',
+
+        /**
+         * Default queue name
+         */
+        'queue-name' => 'long',
+
+        /**
+         * Default node count
+         */
+        'node-count' => '1',
+
+        /**
+         * Default total core count
+         */
+        'total-cpu-count' => '16',
+
+        /**
+         * Default wall time limit
+         */
+        'wall-time-limit' => '30',
+
+        /**
+         * Enable app-catalog cache
+         */
+        'enable-app-catalog-cache' => true,
+
+        /**
+         * Life time of app catalog data cache in minutes
+         */
+        'app-catalog-cache-duration' => 5,
+ 
+         /**
+         * Gateway data store resource id
+         */
+         'gateway-data-store-resource-id' => ''
+    ],
+
+    /**
+     * *****************************************************************
+     *  Portal Related Configurations
+     * *****************************************************************
+     */
+    'portal' => [
+        /**
+         * Whether this portal is the SciGaP admin portal
+         */
+        'super-admin-portal' => true,
+
+        /**
+         * Set the name of theme in use here
+         */
+        'theme' => 'base',
+
+        /**
+         * Portal title
+         */
+        'portal-title' => 'Airavata PHP Gateway',
+
+        /**
+         * Email address of the portal admin. Portal admin well get email notifications for
events
+         * such as new user creation
+         */
+        'admin-emails' => ['xxx@xxx.com','yyy@yyy.com'],
+
+        /**
+         * Email account that the portal should login to send emails
+         */
+        'portal-email-username' => 'xyz@abc.com',
+
+        /**
+         * Password for the portal's email account
+         */
+        'portal-email-password' => 'xxxxxxxxxxx',
+
+        /**
+         * SMTP server on which the portal should connect
+         */
+        'portal-smtp-server-host' => 'smtp.gmail.com',
+
+        /**
+         * SMTP server port on which the portal should connect
+         */
+        'portal-smtp-server-port' => '587',
+
+        /**
+         * Set JIRA Issue Collector scripts here.
+         */
+        'jira-help' => 
+        [
+            /**
+             * Report Issue Script issued for your app by Atlassian JIRA
+             */
+            'report-issue-script' => '',
+            /**
+             * Collector id at the end of the above script
+             */
+            'report-issue-collector-id' => '',
+            /**
+             * Create Report Script issued for your app by Atlassian JIRA
+             */
+            'request-feature-script' => '',
+            /**
+             * Collector id at the end of the above script
+             */
+            'request-feature-collector-id' => ''
+        ],
+
+        /**
+         * Set Google Analytics Id here. ID format that generates from  
+         * creating tracker object should be 
+         *
+         * UA-XXXXX-Y 
+         *
+         * for it to be working correctly. Currently it is only set for 
+         * sending pageviews.
+         */
+        'google-analytics-id' => ''
+    ]
+);
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/dbb8638b/app/controllers/ExperimentController.php
----------------------------------------------------------------------
diff --git a/app/controllers/ExperimentController.php b/app/controllers/ExperimentController.php
index 3a3dcda..e760cee 100755
--- a/app/controllers/ExperimentController.php
+++ b/app/controllers/ExperimentController.php
@@ -122,14 +122,14 @@ class ExperimentController extends BaseController
             $project = ProjectUtilities::get_project($experiment->projectId);
             $expVal = ExperimentUtilities::get_experiment_values($experiment);
             $jobDetails = ExperimentUtilities::get_job_details($experiment->experimentId);
-            //var_dump( $jobDetails); exit;
+//            var_dump( $jobDetails); exit;
             foreach( $jobDetails as $index => $jobDetail){
-                if(isset($jobDetail->jobStatus)){
-                      $jobDetails[ $index]->jobStatus->jobStateName = JobState::$__names[$jobDetail->jobStatus->jobState];
+                if(isset($jobDetail->jobStatuses)){
+                      $jobDetails[ $index]->jobStatuses[0]->jobStateName = JobState::$__names[$jobDetail->jobStatuses[0]->jobState];
                 }
                 else{
-                    $jobDetails[ $index]->jobStatus = new stdClass();
-                    $jobDetails[ $index]->jobStatus->jobStateName = null;
+                    $jobDetails[ $index]->jobStatuses = [new stdClass()];
+                    $jobDetails[ $index]->jobStatuses[0]->jobStateName = null;
                 }
             }
             $expVal["jobDetails"] = $jobDetails;

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/dbb8638b/app/libraries/Airavata/Model/Job/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Job/Types.php b/app/libraries/Airavata/Model/Job/Types.php
index 8f50b70..bb25859 100644
--- a/app/libraries/Airavata/Model/Job/Types.php
+++ b/app/libraries/Airavata/Model/Job/Types.php
@@ -43,7 +43,7 @@ class JobModel {
   /**
    * @var \Airavata\Model\Status\JobStatus[]
    */
-  public $jobStatus = null;
+  public $jobStatuses = null;
   /**
    * @var string
    */
@@ -93,7 +93,7 @@ class JobModel {
           'type' => TType::I64,
           ),
         6 => array(
-          'var' => 'jobStatus',
+          'var' => 'jobStatuses',
           'type' => TType::LST,
           'etype' => TType::STRUCT,
           'elem' => array(
@@ -143,8 +143,8 @@ class JobModel {
       if (isset($vals['creationTime'])) {
         $this->creationTime = $vals['creationTime'];
       }
-      if (isset($vals['jobStatus'])) {
-        $this->jobStatus = $vals['jobStatus'];
+      if (isset($vals['jobStatuses'])) {
+        $this->jobStatuses = $vals['jobStatuses'];
       }
       if (isset($vals['computeResourceConsumed'])) {
         $this->computeResourceConsumed = $vals['computeResourceConsumed'];
@@ -223,7 +223,7 @@ class JobModel {
           break;
         case 6:
           if ($ftype == TType::LST) {
-            $this->jobStatus = array();
+            $this->jobStatuses = array();
             $_size0 = 0;
             $_etype3 = 0;
             $xfer += $input->readListBegin($_etype3, $_size0);
@@ -232,7 +232,7 @@ class JobModel {
               $elem5 = null;
               $elem5 = new \Airavata\Model\Status\JobStatus();
               $xfer += $elem5->read($input);
-              $this->jobStatus []= $elem5;
+              $this->jobStatuses []= $elem5;
             }
             $xfer += $input->readListEnd();
           } else {
@@ -319,15 +319,15 @@ class JobModel {
       $xfer += $output->writeI64($this->creationTime);
       $xfer += $output->writeFieldEnd();
     }
-    if ($this->jobStatus !== null) {
-      if (!is_array($this->jobStatus)) {
+    if ($this->jobStatuses !== null) {
+      if (!is_array($this->jobStatuses)) {
         throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
       }
-      $xfer += $output->writeFieldBegin('jobStatus', TType::LST, 6);
+      $xfer += $output->writeFieldBegin('jobStatuses', TType::LST, 6);
       {
-        $output->writeListBegin(TType::STRUCT, count($this->jobStatus));
+        $output->writeListBegin(TType::STRUCT, count($this->jobStatuses));
         {
-          foreach ($this->jobStatus as $iter6)
+          foreach ($this->jobStatuses as $iter6)
           {
             $xfer += $iter6->write($output);
           }

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/dbb8638b/app/libraries/Airavata/Model/Process/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Process/Types.php b/app/libraries/Airavata/Model/Process/Types.php
index e1b7b81..9e0b0b2 100644
--- a/app/libraries/Airavata/Model/Process/Types.php
+++ b/app/libraries/Airavata/Model/Process/Types.php
@@ -48,7 +48,7 @@ class ProcessModel {
   /**
    * @var \Airavata\Model\Status\ProcessStatus[]
    */
-  public $processStatus = null;
+  public $processStatuses = null;
   /**
    * @var string
    */
@@ -88,7 +88,7 @@ class ProcessModel {
   /**
    * @var \Airavata\Model\Commons\ErrorModel[]
    */
-  public $processError = null;
+  public $processErrors = null;
   /**
    * @var string
    */
@@ -142,7 +142,7 @@ class ProcessModel {
           'type' => TType::I64,
           ),
         5 => array(
-          'var' => 'processStatus',
+          'var' => 'processStatuses',
           'type' => TType::LST,
           'etype' => TType::STRUCT,
           'elem' => array(
@@ -203,7 +203,7 @@ class ProcessModel {
           'type' => TType::STRING,
           ),
         15 => array(
-          'var' => 'processError',
+          'var' => 'processErrors',
           'type' => TType::LST,
           'etype' => TType::STRUCT,
           'elem' => array(
@@ -262,8 +262,8 @@ class ProcessModel {
       if (isset($vals['lastUpdateTime'])) {
         $this->lastUpdateTime = $vals['lastUpdateTime'];
       }
-      if (isset($vals['processStatus'])) {
-        $this->processStatus = $vals['processStatus'];
+      if (isset($vals['processStatuses'])) {
+        $this->processStatuses = $vals['processStatuses'];
       }
       if (isset($vals['processDetail'])) {
         $this->processDetail = $vals['processDetail'];
@@ -292,8 +292,8 @@ class ProcessModel {
       if (isset($vals['taskDag'])) {
         $this->taskDag = $vals['taskDag'];
       }
-      if (isset($vals['processError'])) {
-        $this->processError = $vals['processError'];
+      if (isset($vals['processErrors'])) {
+        $this->processErrors = $vals['processErrors'];
       }
       if (isset($vals['gatewayExecutionId'])) {
         $this->gatewayExecutionId = $vals['gatewayExecutionId'];
@@ -371,7 +371,7 @@ class ProcessModel {
           break;
         case 5:
           if ($ftype == TType::LST) {
-            $this->processStatus = array();
+            $this->processStatuses = array();
             $_size0 = 0;
             $_etype3 = 0;
             $xfer += $input->readListBegin($_etype3, $_size0);
@@ -380,7 +380,7 @@ class ProcessModel {
               $elem5 = null;
               $elem5 = new \Airavata\Model\Status\ProcessStatus();
               $xfer += $elem5->read($input);
-              $this->processStatus []= $elem5;
+              $this->processStatuses []= $elem5;
             }
             $xfer += $input->readListEnd();
           } else {
@@ -486,7 +486,7 @@ class ProcessModel {
           break;
         case 15:
           if ($ftype == TType::LST) {
-            $this->processError = array();
+            $this->processErrors = array();
             $_size24 = 0;
             $_etype27 = 0;
             $xfer += $input->readListBegin($_etype27, $_size24);
@@ -495,7 +495,7 @@ class ProcessModel {
               $elem29 = null;
               $elem29 = new \Airavata\Model\Commons\ErrorModel();
               $xfer += $elem29->read($input);
-              $this->processError []= $elem29;
+              $this->processErrors []= $elem29;
             }
             $xfer += $input->readListEnd();
           } else {
@@ -601,15 +601,15 @@ class ProcessModel {
       $xfer += $output->writeI64($this->lastUpdateTime);
       $xfer += $output->writeFieldEnd();
     }
-    if ($this->processStatus !== null) {
-      if (!is_array($this->processStatus)) {
+    if ($this->processStatuses !== null) {
+      if (!is_array($this->processStatuses)) {
         throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
       }
-      $xfer += $output->writeFieldBegin('processStatus', TType::LST, 5);
+      $xfer += $output->writeFieldBegin('processStatuses', TType::LST, 5);
       {
-        $output->writeListBegin(TType::STRUCT, count($this->processStatus));
+        $output->writeListBegin(TType::STRUCT, count($this->processStatuses));
         {
-          foreach ($this->processStatus as $iter36)
+          foreach ($this->processStatuses as $iter36)
           {
             $xfer += $iter36->write($output);
           }
@@ -702,15 +702,15 @@ class ProcessModel {
       $xfer += $output->writeString($this->taskDag);
       $xfer += $output->writeFieldEnd();
     }
-    if ($this->processError !== null) {
-      if (!is_array($this->processError)) {
+    if ($this->processErrors !== null) {
+      if (!is_array($this->processErrors)) {
         throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
       }
-      $xfer += $output->writeFieldBegin('processError', TType::LST, 15);
+      $xfer += $output->writeFieldBegin('processErrors', TType::LST, 15);
       {
-        $output->writeListBegin(TType::STRUCT, count($this->processError));
+        $output->writeListBegin(TType::STRUCT, count($this->processErrors));
         {
-          foreach ($this->processError as $iter40)
+          foreach ($this->processErrors as $iter40)
           {
             $xfer += $iter40->write($output);
           }

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/dbb8638b/app/libraries/Airavata/Model/Task/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Task/Types.php b/app/libraries/Airavata/Model/Task/Types.php
index b655020..202fde8 100644
--- a/app/libraries/Airavata/Model/Task/Types.php
+++ b/app/libraries/Airavata/Model/Task/Types.php
@@ -91,7 +91,7 @@ class TaskModel {
   /**
    * @var \Airavata\Model\Status\TaskStatus[]
    */
-  public $taskStatus = null;
+  public $taskStatuses = null;
   /**
    * @var string
    */
@@ -103,7 +103,7 @@ class TaskModel {
   /**
    * @var \Airavata\Model\Commons\ErrorModel[]
    */
-  public $taskError = null;
+  public $taskErrors = null;
   /**
    * @var \Airavata\Model\Job\JobModel[]
    */
@@ -133,7 +133,7 @@ class TaskModel {
           'type' => TType::I64,
           ),
         6 => array(
-          'var' => 'taskStatus',
+          'var' => 'taskStatuses',
           'type' => TType::LST,
           'etype' => TType::STRUCT,
           'elem' => array(
@@ -150,7 +150,7 @@ class TaskModel {
           'type' => TType::STRING,
           ),
         9 => array(
-          'var' => 'taskError',
+          'var' => 'taskErrors',
           'type' => TType::LST,
           'etype' => TType::STRUCT,
           'elem' => array(
@@ -185,8 +185,8 @@ class TaskModel {
       if (isset($vals['lastUpdateTime'])) {
         $this->lastUpdateTime = $vals['lastUpdateTime'];
       }
-      if (isset($vals['taskStatus'])) {
-        $this->taskStatus = $vals['taskStatus'];
+      if (isset($vals['taskStatuses'])) {
+        $this->taskStatuses = $vals['taskStatuses'];
       }
       if (isset($vals['taskDetail'])) {
         $this->taskDetail = $vals['taskDetail'];
@@ -194,8 +194,8 @@ class TaskModel {
       if (isset($vals['subTaskModel'])) {
         $this->subTaskModel = $vals['subTaskModel'];
       }
-      if (isset($vals['taskError'])) {
-        $this->taskError = $vals['taskError'];
+      if (isset($vals['taskErrors'])) {
+        $this->taskErrors = $vals['taskErrors'];
       }
       if (isset($vals['jobs'])) {
         $this->jobs = $vals['jobs'];
@@ -259,7 +259,7 @@ class TaskModel {
           break;
         case 6:
           if ($ftype == TType::LST) {
-            $this->taskStatus = array();
+            $this->taskStatuses = array();
             $_size0 = 0;
             $_etype3 = 0;
             $xfer += $input->readListBegin($_etype3, $_size0);
@@ -268,7 +268,7 @@ class TaskModel {
               $elem5 = null;
               $elem5 = new \Airavata\Model\Status\TaskStatus();
               $xfer += $elem5->read($input);
-              $this->taskStatus []= $elem5;
+              $this->taskStatuses []= $elem5;
             }
             $xfer += $input->readListEnd();
           } else {
@@ -291,7 +291,7 @@ class TaskModel {
           break;
         case 9:
           if ($ftype == TType::LST) {
-            $this->taskError = array();
+            $this->taskErrors = array();
             $_size6 = 0;
             $_etype9 = 0;
             $xfer += $input->readListBegin($_etype9, $_size6);
@@ -300,7 +300,7 @@ class TaskModel {
               $elem11 = null;
               $elem11 = new \Airavata\Model\Commons\ErrorModel();
               $xfer += $elem11->read($input);
-              $this->taskError []= $elem11;
+              $this->taskErrors []= $elem11;
             }
             $xfer += $input->readListEnd();
           } else {
@@ -363,15 +363,15 @@ class TaskModel {
       $xfer += $output->writeI64($this->lastUpdateTime);
       $xfer += $output->writeFieldEnd();
     }
-    if ($this->taskStatus !== null) {
-      if (!is_array($this->taskStatus)) {
+    if ($this->taskStatuses !== null) {
+      if (!is_array($this->taskStatuses)) {
         throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
       }
-      $xfer += $output->writeFieldBegin('taskStatus', TType::LST, 6);
+      $xfer += $output->writeFieldBegin('taskStatuses', TType::LST, 6);
       {
-        $output->writeListBegin(TType::STRUCT, count($this->taskStatus));
+        $output->writeListBegin(TType::STRUCT, count($this->taskStatuses));
         {
-          foreach ($this->taskStatus as $iter18)
+          foreach ($this->taskStatuses as $iter18)
           {
             $xfer += $iter18->write($output);
           }
@@ -390,15 +390,15 @@ class TaskModel {
       $xfer += $output->writeString($this->subTaskModel);
       $xfer += $output->writeFieldEnd();
     }
-    if ($this->taskError !== null) {
-      if (!is_array($this->taskError)) {
+    if ($this->taskErrors !== null) {
+      if (!is_array($this->taskErrors)) {
         throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
       }
-      $xfer += $output->writeFieldBegin('taskError', TType::LST, 9);
+      $xfer += $output->writeFieldBegin('taskErrors', TType::LST, 9);
       {
-        $output->writeListBegin(TType::STRUCT, count($this->taskError));
+        $output->writeListBegin(TType::STRUCT, count($this->taskErrors));
         {
-          foreach ($this->taskError as $iter19)
+          foreach ($this->taskErrors as $iter19)
           {
             $xfer += $iter19->write($output);
           }

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/dbb8638b/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 91d038c..c11bbca 100755
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -945,10 +945,11 @@ class ExperimentUtilities
         $expVal["taskTypes"] = TaskTypes::$__names;
 
 
-        if( is_object( $experiment->experimentStatus ) )
+        if( is_array( $experiment->experimentStatus ) )
             $experimentStatusString = $expVal["experimentStates"][$experiment->experimentStatus[0]->state];
-        else
-            $experimentStatusString = $experiment->experimentStatus[0];
+        else {
+            $experimentStatusString = $experiment->experimentStatus;
+        }
 
         $expVal["experimentStatusString"] = $experimentStatusString;
         if ( $experimentStatusString == ExperimentState::FAILED)

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/dbb8638b/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 65b188c..52aa9a6 100644
--- a/app/views/partials/experiment-info.blade.php
+++ b/app/views/partials/experiment-info.blade.php
@@ -83,7 +83,7 @@
                         <tr>
                             <td>{{$jobDetail->jobName}}</td>
                             <td>{{ $jobDetail->jobId}}</td>
-                            <td>{{$jobDetail->jobStatus->jobStateName }}</td>
+                            <td>{{$jobDetail->jobStatuses[0]->jobStateName }}</td>
                             <td class="time" unix-time="{{$jobDetail->creationTime}}"></td>
                         </tr>
                     </table>
@@ -100,7 +100,7 @@
         -->
         @if( isset( $experiment->enableEmailNotification))
             <tr>
-                <td>Notifications Enabled for:</td>
+                <td><strong>Notifications Enabled for:</strong></td>
                 <td>
                     @if(isset($experiment->emailAddresses))
                         @foreach( $experiment->emailAddresses as $email)
@@ -194,7 +194,7 @@
         {{--@endif--}}
         @foreach( $expVal["jobDetails"] as $index => $jobDetail)
             @if($experiment->experimentStatus[0]->state == \Airavata\Model\Status\ExperimentState::FAILED
-                    || $jobDetail->jobStatus->jobStateName == "FAILED")
+                    || $jobDetail->jobStatuses[0]->jobStateName == "FAILED")
             <tr>
                 <th>Job Submission Response</th>
                 <td>{{$jobDetail->stdOut . $jobDetail->stdErr}}</td>
@@ -291,10 +291,10 @@
                                     <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 }} <a tabindex="0" class="popover-taskinfo
btn btn-sm btn-default" role="button" data-toggle="popover" data-html="true" title="Detailed
Task Information" data-content="{{ str_replace( ',', '<br/><br/>', $task->taskError->actualErrorMessage
) }}">More Info</a></dd>
+                                        <dt>Task Status : </dt> <dd>{{
$expVal["taskStates"][$task->taskStatuses[0]->state] }}</dd>
+                                    @if( is_object( $task->taskErrors))
+                                        <dt>Task Error Id : </dt><dd>{{
$task->taskErrors[0]->errorId }}</dd>
+                                        <dt>Task Error Msg : </dt><dd>{{
$task->taskErrors[0]->userFriendlyMessage }} <a tabindex="0" class="popover-taskinfo
btn btn-sm btn-default" role="button" data-toggle="popover" data-html="true" title="Detailed
Task Information" data-content="{{ str_replace( ',', '<br/><br/>', $task->taskError->actualErrorMessage
) }}">More Info</a></dd>
                                     @endif
                                     @if( count( $task->jobs) > 0 )
                                         <dt>Jobs : </dt><dd>{{ count( $task->jobs)}}</dd>
@@ -313,7 +313,7 @@
                         <li>
                             <span class="alert"><i class="icon-time"></i>
                                 <p>Outputs<hr/>
-                                {{ ExperimentUtilities::list_process_output_files( $process->processOutputs,
$process->processStatus->state) }}</p>
+                                {{ ExperimentUtilities::list_process_output_files( $process->processOutputs,
$process->processStatuses[0]->state) }}</p>
                             </span>
                         </li>
                     </ul>


Mime
View raw message