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: Showing Job State in Project Summary
Date Tue, 06 Oct 2015 18:40:28 GMT
Repository: airavata-php-gateway
Updated Branches:
  refs/heads/master 7f17e30d9 -> 0a8d23b42


Showing Job State in Project Summary


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

Branch: refs/heads/master
Commit: 0a8d23b423a01e184aadc2b7c061e70ee7becf06
Parents: 7f17e30
Author: scnakandala <supun.nakandala@gmail.com>
Authored: Tue Oct 6 11:47:27 2015 -0400
Committer: scnakandala <supun.nakandala@gmail.com>
Committed: Tue Oct 6 11:47:27 2015 -0400

----------------------------------------------------------------------
 app/views/partials/experiment-inputs.blade.php |  9 +++++----
 app/views/project/summary.blade.php            | 12 ++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/0a8d23b4/app/views/partials/experiment-inputs.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/experiment-inputs.blade.php b/app/views/partials/experiment-inputs.blade.php
index f708f8b..98f20f5 100644
--- a/app/views/partials/experiment-inputs.blade.php
+++ b/app/views/partials/experiment-inputs.blade.php
@@ -51,15 +51,15 @@
             <label class="control-label" for="compute-resource">Compute Resource</label>
             @if( count( $expInputs['computeResources']) > 0)
             <select class="form-control" name="compute-resource" id="compute-resource"
required="required">
-                {{--<option value="">Select a resource</option>--}}
+                <option value="">Select a resource</option>
                 @foreach ($expInputs['computeResources'] as $id => $name)
                 <option value="{{$id}}"
                 {{ ($expInputs['resourceHostId'] == $id)? ' selected' : '' }}>{{$name}}</option>
                 @endforeach
             </select>
             @else
-            <h4>Application deployed Computational resources are currently unavailable
-                @endif
+            <h4>Application deployed Computational resources are currently unavailable</h4>
+            @endif
         </div>
         <div class="queue-block">
             <div class="loading-img text-center hide">
@@ -104,4 +104,5 @@
             <input type="text" class="form-control" name="userDN" placeholder="user"/>
         </div>
     </div>
-    @endif
+</div>
+@endif

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/0a8d23b4/app/views/project/summary.blade.php
----------------------------------------------------------------------
diff --git a/app/views/project/summary.blade.php b/app/views/project/summary.blade.php
index 736ed60..6e003b9 100755
--- a/app/views/project/summary.blade.php
+++ b/app/views/project/summary.blade.php
@@ -39,13 +39,13 @@
     echo '<th>Compute Resource</th>';
     echo '<th>Last Modified Time</th>';
     echo '<th>Experiment Status</th>';
-//    echo '<th>Job Status</th>';
+    echo '<th>Job Status</th>';
 
     echo '</tr>';
 
     foreach ($experiments as $experiment) {
         $expValues = ExperimentUtilities::get_experiment_values($experiment, ProjectUtilities::get_project($experiment->projectId),
true);
-//        $expValues["jobState"] = ExperimentUtilities::get_job_status($experiment);
+        $expValues["jobState"] = ExperimentUtilities::get_job_status($experiment);
         $applicationInterface = AppUtilities::get_application_interface($experiment->executionId);
 
         echo '<tr>';
@@ -110,10 +110,10 @@
 
         echo '</td>';
 
-//        if ($expValues["jobState"]) echo '
-//            <td>' . $expValues["jobState"] . '</td>';
-//        else
-//            echo '<td></td>';
+        if ($expValues["jobState"]) echo '
+            <td>' . $expValues["jobState"] . '</td>';
+        else
+            echo '<td></td>';
         echo '</tr>';
     }
 


Mime
View raw message