Skip to content

[AIRAVATA-2531] Change PGA + registry to show Job details #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sachinkariyattin wants to merge 7 commits into
base: develop
Choose a base branch
from
Open

[AIRAVATA-2531] Change PGA + registry to show Job details #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
290874f
AIRAVATA-2531 modified search results to include job details
Sep 27, 2017
f2fecb3
AIRAVATA-2531 modified search results to include job details
Sep 27, 2017
99fd540
Merge remote-tracking branch 'upstream/develop' into develop
Sep 29, 2017
c9ceddb
Change PGA + registry to show Job details (backend part)
sachinkariyattin Oct 1, 2017
36dd7e2
Merge remote-tracking branch 'upstream/develop' into develop
sachinkariyattin Oct 1, 2017
788ccb4
AIRAVATA 2531 Change PGA + registry to show Job details (backend part)
sachinkariyattin Oct 1, 2017
3a59cca
AIRAVATA 2531 Change PGA + registry to show Job details (backend part)
sachinkariyattin Oct 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions app/libraries/AdminUtilities.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
use Airavata\Model\Workspace\GatewayApprovalStatus;
use Airavata\Model\Workspace\Notification;
use Airavata\Model\Workspace\NotificationPriority;
use Airavata\Model\Status\JobState;
use Airavata\Model\Credential\Store\CredentialOwnerType;
use Illuminate\Support\Facades\Log;

Expand Down Expand Up @@ -300,7 +301,19 @@ public static function get_experiments_of_time_range($inputs)
foreach ($experiments as $experiment) {
//var_dump( $experiment); exit;
$expValue = ExperimentUtilities::get_experiment_values($experiment, true);
$jobDetails = ExperimentUtilities::get_job_details($experiment->experimentId);
foreach( $jobDetails as $index => $jobDetail){
if(isset($jobDetail->jobStatuses)){
$jobDetails[ $index]->jobStatuses[0]->jobStateName = JobState::$__names[$jobDetail->jobStatuses[0]->jobState];
}
else{
$jobDetails[ $index]->jobStatuses = [new stdClass()];
$jobDetails[ $index]->jobStatuses[0]->jobStateName = null;
}
}

$expContainer[$expNum]['experiment'] = $experiment;
$expContainer[$expNum]['jobDetails'] = $jobDetails;
$expValue["editable"] = false;
$expContainer[$expNum]['expValue'] = $expValue;
$expNum++;
Expand Down
21 changes: 21 additions & 0 deletions app/libraries/ExperimentUtilities.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1243,15 +1243,36 @@ public static function get_expsearch_results_with_pagination($inputs, $limit, $o
if(Config::get('pga_config.airavata')["data-sharing-enabled"]){
if (SharingUtilities::userCanRead(Session::get('username'), $experiment->experimentId, ResourceType::EXPERIMENT)) {
$expValue = ExperimentUtilities::get_experiment_values($experiment, true);
$jobDetails = ExperimentUtilities::get_job_details($experiment->experimentId);
foreach( $jobDetails as $index => $jobDetail){
if(isset($jobDetail->jobStatuses)){
$jobDetails[ $index]->jobStatuses[0]->jobStateName = JobState::$__names[$jobDetail->jobStatuses[0]->jobState];
}else {
$jobDetails[ $index]->jobStatuses = [new stdClass()];
$jobDetails[ $index]->jobStatuses[0]->jobStateName = null;
}
}

$expContainer[$expNum]['experiment'] = $experiment;
$expContainer[$expNum]['jobDetails'] = $jobDetails;
if ($expValue["experimentStatusString"] == "FAILED")
$expValue["editable"] = false;
$expContainer[$expNum]['expValue'] = $expValue;
$expNum++;
}
}else{
$expValue = ExperimentUtilities::get_experiment_values($experiment, true);
$jobDetails = ExperimentUtilities::get_job_details($experiment->experimentId);
foreach( $jobDetails as $index => $jobDetail){
if(isset($jobDetail->jobStatuses)){
$jobDetails[ $index]->jobStatuses[0]->jobStateName = JobState::$__names[$jobDetail->jobStatuses[0]->jobState];
}else {
$jobDetails[ $index]->jobStatuses = [new stdClass()];
$jobDetails[ $index]->jobStatuses[0]->jobStateName = null;
}
}
$expContainer[$expNum]['experiment'] = $experiment;
$expContainer[$expNum]['jobDetails'] = $jobDetails;
if ($expValue["experimentStatusString"] == "FAILED")
$expValue["editable"] = false;
$expContainer[$expNum]['expValue'] = $expValue;
Expand Down