From 7541b8157e61c8a25f8e0ad099c2d706c30b9d61 Mon Sep 17 00:00:00 2001 From: neeraj-lad Date: Thu, 28 Sep 2017 07:13:57 -0400 Subject: [PATCH 1/4] Add pga_config to gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9ab27139f..9e4b54be1 100755 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ composer.lock .env.php .DS_Store Thumbs.db +pga_config.php /app/storage -/themes \ No newline at end of file +/themes From 15e9405ec84b01873bbd601cf67c440624b87a2e Mon Sep 17 00:00:00 2001 From: neeraj-lad Date: Sat, 30 Sep 2017 12:45:40 -0400 Subject: [PATCH 2/4] Modify RoleMapper to start PGA on localhost --- app/libraries/Keycloak/API/RoleMapper.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/libraries/Keycloak/API/RoleMapper.php b/app/libraries/Keycloak/API/RoleMapper.php index f2fab42ac..9fd7d5dbc 100644 --- a/app/libraries/Keycloak/API/RoleMapper.php +++ b/app/libraries/Keycloak/API/RoleMapper.php @@ -30,6 +30,7 @@ public function getRealmRoleMappingsForUser($realm, $user_id){ curl_setopt($r, CURLOPT_RETURNTRANSFER, 1); curl_setopt($r, CURLOPT_ENCODING, 1); curl_setopt($r, CURLOPT_SSL_VERIFYPEER, $this->verify_peer); + curl_setopt($r, CURLOPT_CAINFO, $this->cafile_path); curl_setopt($r, CURLOPT_HTTPHEADER, array( "Authorization: Bearer " . $access_token )); From 662cc2dbca533e7d465805ccb2ea8d5d07b28276 Mon Sep 17 00:00:00 2001 From: neeraj-lad Date: Mon, 16 Oct 2017 23:31:14 -0400 Subject: [PATCH 3/4] Add jQuery code to toggle table row view using checkboxes --- app/views/partials/experiment-info.blade.php | 119 ++++++++++++++++--- 1 file changed, 100 insertions(+), 19 deletions(-) diff --git a/app/views/partials/experiment-info.blade.php b/app/views/partials/experiment-info.blade.php index b910aeab6..8e98d4f6c 100644 --- a/app/views/partials/experiment-info.blade.php +++ b/app/views/partials/experiment-info.blade.php @@ -40,21 +40,95 @@ class="sr-only">Close @endif +
+ + + + + + + + + + + + + + + + + + +
- + - + - + - + @if (isset($project)) @@ -62,17 +136,17 @@ class="sr-only">Close @endif - + - + - + @endif - + @@ -154,39 +228,39 @@ class="sr-only">Close @endif - + - + - + - + - + - + - + - + - + userConfigurationData->experimentDataDir, Config::get("pga_config.airavata")['experiment-data-absolute-path'])){ @@ -199,7 +273,7 @@ class="sr-only">Close {{-- @if( $expVal["editable"] == false)--}} - +
Experiment ID {{{ $experiment->experimentId }}}
Name {{{ $experiment->experimentName }}}
Description {{{ $experiment->description }}}
Project{{{ $project->name }}} You don't have access to this project.
Owner {{{ $experiment->userName }}}
Application applicationName; } ?>
Compute Resource hostName; @@ -86,7 +160,7 @@ class="sr-only">Close
Experiment Status {{{ $expVal["experimentStatusString"] }}}
Creation Time
Last Modified Time
Wall Time {{ $experiment->userConfigurationData->computationalResourceScheduling->wallTimeLimit }}
CPU Count {{ $experiment->userConfigurationData->computationalResourceScheduling->totalCPUCount }}
Node Count {{ $experiment->userConfigurationData->computationalResourceScheduling->nodeCount }}
Queue {{ $experiment->userConfigurationData->computationalResourceScheduling->queueName }}
Inputs {{ ExperimentUtilities::list_input_files($experiment->experimentInputs) }}
Outputs {{ ExperimentUtilities::list_output_files($experiment->experimentOutputs, $experiment->experimentStatus[0]->state, false) }}
Storage Directory
Errors @if( $experiment->errors != null) @@ -445,7 +519,14 @@ class="btn btn-info" $("#clone-experiment-modal form").submit(); } return false; - }); + }); + $('input:checked').on('change', function(){ + if ($(this).is(':checked')) { + $('tr.' + $(this).attr('class')).show(); + } else { + $('tr.' + $(this).attr('class')).hide(); + } + }); From 3688f3a54296e5e6d0f6223b9f8d345cc4b306ac Mon Sep 17 00:00:00 2001 From: neeraj-lad Date: Mon, 13 Nov 2017 23:06:02 -0500 Subject: [PATCH 4/4] Add localStorage support to save checkbox state --- app/views/partials/experiment-info.blade.php | 56 +++++++++++++++++--- 1 file changed, 49 insertions(+), 7 deletions(-) diff --git a/app/views/partials/experiment-info.blade.php b/app/views/partials/experiment-info.blade.php index 8e98d4f6c..9349db9e1 100644 --- a/app/views/partials/experiment-info.blade.php +++ b/app/views/partials/experiment-info.blade.php @@ -4,6 +4,7 @@ margin-bottom: 20px; } +
@if(isset( $invalidExperimentId ) )
@@ -504,6 +505,38 @@ class="btn btn-info"