Repository: airavata-php-gateway Updated Branches: refs/heads/master de69764c7 -> b5ca077e1
fixing merge conflixt 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/aa4d3b49 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/aa4d3b49 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/aa4d3b49 Branch: refs/heads/master Commit: aa4d3b4997c9d5a39245c92e8c285eb33088ddc8 Parents: de69764 Author: Supun Nakandala <[email protected]> Authored: Thu Jun 11 22:50:27 2015 +0530 Committer: Supun Nakandala <[email protected]> Committed: Thu Jun 11 22:50:27 2015 +0530 ---------------------------------------------------------------------- app/config/app.php | 1 + app/libraries/ExperimentUtilities.php | 17 ++++--- app/views/admin/manage-experiments.blade.php | 20 ++------ app/views/project/summary.blade.php | 61 ++++++++++++----------- composer.json | 5 +- 5 files changed, 52 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/aa4d3b49/app/config/app.php ---------------------------------------------------------------------- diff --git a/app/config/app.php b/app/config/app.php index efbfed8..973a1ee 100755 --- a/app/config/app.php +++ b/app/config/app.php @@ -121,6 +121,7 @@ return array( 'Illuminate\Validation\ValidationServiceProvider', 'Illuminate\View\ViewServiceProvider', 'Illuminate\Workbench\WorkbenchServiceProvider', + 'Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider', 'Wsis\WsisServiceProvider', 'Airavata\AiravataServiceProvider', ), http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/aa4d3b49/app/libraries/ExperimentUtilities.php ---------------------------------------------------------------------- diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php index 2561168..bde7bfe 100644 --- a/app/libraries/ExperimentUtilities.php +++ b/app/libraries/ExperimentUtilities.php @@ -665,13 +665,18 @@ class ExperimentUtilities * @param $experiment * @return null */ - public static function get_job_status($experiment) + public static function get_job_status(Experiment $experiment) { - $jobStatus = Airavata::getJobStatuses($experiment->experimentID); - - if ($jobStatus) { - $jobName = array_keys($jobStatus); - $jobState = JobState::$__names[$jobStatus[$jobName[0]]->jobState]; + //$jobStatus = Airavata::getJobStatuses($experiment->experimentID); + if(!empty($experiment->workflowNodeDetailsList)){ + if(!empty($experiment->workflowNodeDetailsList[0]->taskDetailsList)){ + if(!empty($experiment->workflowNodeDetailsList[0]->taskDetailsList[0]->jobDetailsList)){ + $jobStatus = $experiment->workflowNodeDetailsList[0]->taskDetailsList[0]->jobDetailsList[0]->jobStatus; + } + } + } + if (isset($jobStatus)) { + $jobState = JobState::$__names[$jobStatus->jobState]; } else { $jobState = null; } http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/aa4d3b49/app/views/admin/manage-experiments.blade.php ---------------------------------------------------------------------- diff --git a/app/views/admin/manage-experiments.blade.php b/app/views/admin/manage-experiments.blade.php index c6aae9b..895bd0d 100644 --- a/app/views/admin/manage-experiments.blade.php +++ b/app/views/admin/manage-experiments.blade.php @@ -399,6 +399,10 @@ to be uncommented when actually in use. {{ HTML::script('js/flot/jquery.flot.resize.js')}} {{ HTML::script('js/flot/jquery.flot.pie.js')}} {{ HTML::script('js/flot/flot-data.js')}} + +{{ HTML::script('js/moment.js')}} +{{ HTML::script('js/datetimepicker.js')}} + <script> //make first tab of accordion open by default. @@ -440,7 +444,7 @@ to be uncommented when actually in use. //Experiment stages are under development. $(".tree").parent().addClass("hide"); - /* making datetimepicker work for exp search */ + /* making datetimepicker work for exp stat search */ $('#datetimepicker9').datetimepicker({ pick12HourFormat: false @@ -455,19 +459,5 @@ to be uncommented when actually in use. $('#datetimepicker9').data("DateTimePicker").setMaxDate(e.date); }); - /* selecting creation time */ - $("#search-key").on("change", function () { - if (this.value == "creation-time") { - $(".search-text-block").addClass("hide"); - $(".select-dates").removeClass("hide"); - $("#search-value").removeAttr("required"); - - } - else { - $(".search-text-block").removeClass("hide"); - $(".select-dates").addClass("hide"); - $("#search-value").attr("required"); - } - }); </script> @stop \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/aa4d3b49/app/views/project/summary.blade.php ---------------------------------------------------------------------- diff --git a/app/views/project/summary.blade.php b/app/views/project/summary.blade.php index aeb6579..81680aa 100755 --- a/app/views/project/summary.blade.php +++ b/app/views/project/summary.blade.php @@ -6,7 +6,7 @@ @section('content') -<div class="container" style="max-width: 750px;"> +<div class="container" style="max-width: 80%;"> <h1>Project Summary</h1> @@ -38,12 +38,14 @@ echo '<th>Application</th>'; echo '<th>Compute Resource</th>'; echo '<th>Time</th>'; - echo '<th>Status</th>'; + echo '<th>Experiment 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->applicationId); echo '<tr>'; @@ -52,16 +54,35 @@ switch ($expValues["experimentStatusString"]) { + case 'CANCELING': + case 'CANCELED': + case 'UNKNOWN': + $textClass = 'text-warning'; + break; + case 'FAILED': + $textClass = 'text-danger'; + break; + case 'COMPLETED': + $textClass = 'text-success'; + break; + default: + $textClass = 'text-info'; + break; + } + + switch ($expValues["experimentStatusString"]) { case 'SCHEDULED': case 'LAUNCHED': case 'EXECUTING': case 'CANCELING': case 'COMPLETED': - echo $experiment->name; + echo '<a class="' . $textClass . '" href="' . URL::to('/') . '/experiment/summary?expId=' . + $experiment->experimentID . '">' . $experiment->name . '</a>'; break; default: - echo $experiment->name . - ' <a href="edit?expId=' . + echo '<a class="' . $textClass . '" href="' . URL::to('/') . '/experiment/summary?expId=' . + $experiment->experimentID . '">' . $experiment->name . '</a>' . + ' <a href="' . URL::to('/') . '/experiment/edit?expId=' . $experiment->experimentID . '" title="Edit"><span class="glyphicon glyphicon-pencil"></span></a>'; break; @@ -77,32 +98,12 @@ echo '<td class="time" unix-time="' . $expValues["experimentTimeOfStateChange"] . '"></td>'; - switch ($expValues["experimentStatusString"]) { - case 'CANCELING': - case 'CANCELED': - case 'UNKNOWN': - $textClass = 'text-warning'; - break; - case 'FAILED': - $textClass = 'text-danger'; - break; - case 'COMPLETED': - $textClass = 'text-success'; - break; - default: - $textClass = 'text-info'; - break; - } - - - echo '<td><a class="' . - $textClass . - '" href="' . URL::to('/') . '/experiment/summary?expId=' . - $experiment->experimentID . - '">' . - $expValues["experimentStatusString"] . - '</a></td>'; + echo '<td>'. $expValues["experimentStatusString"] . '</td>'; + if ($expValues["jobState"]) echo ' + <td>' . $expValues["jobState"] . '</td>'; + else + echo '<td></td>'; echo '</tr>'; } http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/aa4d3b49/composer.json ---------------------------------------------------------------------- diff --git a/composer.json b/composer.json index 88a580b..bbd97d9 100755 --- a/composer.json +++ b/composer.json @@ -5,7 +5,8 @@ "license": "MIT", "require": { "laravel/framework": "4.2.*", - "apache/thrift": "1.0.*@dev" + "apache/thrift": "1.0.*@dev", + "barryvdh/laravel-ide-helper": "1.*" }, "autoload": { "classmap": [ @@ -18,10 +19,12 @@ "scripts": { "post-install-cmd": [ "php artisan clear-compiled", + "php artisan ide-helper:generate", "php artisan optimize" ], "post-update-cmd": [ "php artisan clear-compiled", + "php artisan ide-helper:generate", "php artisan optimize" ], "post-create-project-cmd": [
