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/08/02 22:42:03 UTC
[4/5] airavata-php-gateway git commit: Revert "making project summary
in PGA compatible with airavata master"
Revert "making project summary in PGA compatible with airavata master"
This reverts commit 0e6904b2e55c787b71736841c0ed24ca725e70c1.
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/c9049644
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/c9049644
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/c9049644
Branch: refs/heads/master
Commit: c904964434123cbcdee6717e018981011af2ad72
Parents: da784f9
Author: Supun Nakandala <sc...@apache.org>
Authored: Mon Aug 3 02:07:41 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Mon Aug 3 02:07:41 2015 +0530
----------------------------------------------------------------------
app/libraries/ProjectUtilities.php | 2 +-
app/views/project/summary.blade.php | 57 ++++++++++++++++----------------
2 files changed, 30 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/c9049644/app/libraries/ProjectUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ProjectUtilities.php b/app/libraries/ProjectUtilities.php
index 487f9be..47a640e 100644
--- a/app/libraries/ProjectUtilities.php
+++ b/app/libraries/ProjectUtilities.php
@@ -162,7 +162,7 @@ class ProjectUtilities
$experiments = array();
try {
- $experiments = Airavata::getAllExperimentsInProjectWithPagination(Session::get('authz-token'), $projectId, -1, 0);
+ $experiments = Airavata::getAllExperimentsInProject(Session::get('authz-token'), $projectId);
} catch (InvalidRequestException $ire) {
CommonUtilities::print_error_message('InvalidRequestException!<br><br>' . $ire->getMessage());
} catch (AiravataClientException $ace) {
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/c9049644/app/views/project/summary.blade.php
----------------------------------------------------------------------
diff --git a/app/views/project/summary.blade.php b/app/views/project/summary.blade.php
index 9945aec..1340f01 100755
--- a/app/views/project/summary.blade.php
+++ b/app/views/project/summary.blade.php
@@ -10,7 +10,6 @@
<?php
$project = ProjectUtilities::get_project($_GET['projId']);
?>
-
<h1>Project Summary
@if( !isset($dashboard))
<small><a href="{{ URL::to('/') }}/project/summary?projId={{ $project->projectID }}"
@@ -40,35 +39,19 @@
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);
- $applicationInterface = AppUtilities::get_application_interface($experiment->executionId);
+ $expValues = ExperimentUtilities::get_experiment_values($experiment, ProjectUtilities::get_project($experiment->projectID), true);
+ $expValues["jobState"] = ExperimentUtilities::get_job_status($experiment);
+ $applicationInterface = AppUtilities::get_application_interface($experiment->applicationId);
echo '<tr>';
- echo '<td>'. $experiment->experimentName . '</td>';
-
- echo "<td>$applicationInterface->applicationName</td>";
-
echo '<td>';
- try {
- $cr = CRUtilities::get_compute_resource($experiment->userConfigurationData
- ->computationalResourceScheduling->resourceHostId);
- if (!empty($cr)) {
- echo $cr->hostName;
- }
- } catch (Exception $ex) {
- //Error while retrieving the CR
- }
- echo '</td>';
- echo '<td class="time" unix-time="' . $expValues["experimentTimeOfStateChange"] . '"></td>';
- echo '<td>';
switch ($expValues["experimentStatusString"]) {
case 'CANCELING':
@@ -94,23 +77,41 @@
case 'CANCELING':
case 'COMPLETED':
echo '<a class="' . $textClass . '" href="' . URL::to('/') . '/experiment/summary?expId=' .
- $experiment->experimentId . '">' . $expValues["experimentStatusString"] . '</a>';
+ $experiment->experimentID . '">' . $experiment->name . '</a>';
break;
default:
echo '<a class="' . $textClass . '" href="' . URL::to('/') . '/experiment/summary?expId=' .
- $experiment->experimentId . '">' . $expValues["experimentStatusString"] . '</a>' .
+ $experiment->experimentID . '">' . $experiment->name . '</a>' .
' <a href="' . URL::to('/') . '/experiment/edit?expId=' .
- $experiment->experimentId .
+ $experiment->experimentID .
'" title="Edit"><span class="glyphicon glyphicon-pencil"></span></a>';
break;
}
+
echo '</td>';
-// if ($expValues["jobState"]) echo '
-// <td>' . $expValues["jobState"] . '</td>';
-// else
-// echo '<td></td>';
+ echo "<td>$applicationInterface->applicationName</td>";
+
+ echo '<td>';
+ try {
+ $cr = CRUtilities::get_compute_resource($experiment->userConfigurationData
+ ->computationalResourceScheduling->resourceHostId);
+ if (!empty($cr)) {
+ echo $cr->hostName;
+ }
+ } catch (Exception $ex) {
+ //Error while retrieving the CR
+ }
+ echo '</td>';
+ echo '<td class="time" unix-time="' . $expValues["experimentTimeOfStateChange"] . '"></td>';
+
+ echo '<td>'. $expValues["experimentStatusString"] . '</td>';
+
+ if ($expValues["jobState"]) echo '
+ <td>' . $expValues["jobState"] . '</td>';
+ else
+ echo '<td></td>';
echo '</tr>';
}