AIRAVATA-1792 App/hostname filters are select controls
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/8fee1f78 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/8fee1f78 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/8fee1f78 Branch: refs/heads/develop Commit: 8fee1f7845678bab5fbb3eafdbc9309c4c897663 Parents: 60a8b48 Author: Marcus Christie <[email protected]> Authored: Tue Dec 13 10:51:53 2016 -0500 Committer: Marcus Christie <[email protected]> Committed: Tue Dec 13 10:51:53 2016 -0500 ---------------------------------------------------------------------- app/controllers/AdminController.php | 7 +++++- app/views/admin/manage-experiments.blade.php | 26 ++++++++++++++++------- 2 files changed, 24 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/8fee1f78/app/controllers/AdminController.php ---------------------------------------------------------------------- diff --git a/app/controllers/AdminController.php b/app/controllers/AdminController.php index c2b547d..ec6af5d 100644 --- a/app/controllers/AdminController.php +++ b/app/controllers/AdminController.php @@ -185,7 +185,12 @@ class AdminController extends BaseController { public function experimentsView(){ Session::put("admin-nav", "exp-statistics"); - return View::make("admin/manage-experiments" ); + + $applications = AppUtilities::get_all_applications(); + uksort($applications, 'strcasecmp'); + $hostnames = CRUtilities::getAllCRObjects(true); + uksort($hostnames, 'strcasecmp'); + return View::make("admin/manage-experiments", array("applications" => $applications, "hostnames" => $hostnames)); } public function resourcesView(){ http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/8fee1f78/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 09c0e4e..54ff414 100644 --- a/app/views/admin/manage-experiments.blade.php +++ b/app/views/admin/manage-experiments.blade.php @@ -121,7 +121,12 @@ <div class="col-md-5 hide" id="appname-filter-row"> <div class="form-group"> <div class='input-group'> - <input type='text' class="form-control" placeholder="Application name" id="appname" name="appname"/> + <select id="appname" name="appname" class="form-control"> + <option value="">Select Application</option> + @foreach ($applications as $applicationId => $applicationName) + <option value="{{ $applicationId }}">{{{ $applicationName }}}</option> + @endforeach + </select> <div class="input-group-btn"> <button id="remove-appname-filter" class="btn btn-default" type="button"> <span class="glyphicon glyphicon-remove"></span> @@ -135,7 +140,12 @@ <div class="col-md-5 hide" id="hostname-filter-row"> <div class="form-group"> <div class='input-group'> - <input type='text' class="form-control" placeholder="Hostname" id="hostname" name="hostname"/> + <select id="hostname" name="hostname" class="form-control"> + <option value="">Select Hostname</option> + @foreach ($hostnames as $hostnameId => $hostname) + <option value="{{ $hostnameId }}">{{{ $hostname }}}</option> + @endforeach + </select> <div class="input-group-btn"> <button id="remove-hostname-filter" class="btn btn-default" type="button"> <span class="glyphicon glyphicon-remove"></span> @@ -542,7 +552,7 @@ to be uncommented when actually in use. $("#add-appname-filter").click(function() { $("#appname-filter-row").removeClass("hide"); - $("#appname-filter-row input").focus(); + $("#appname-filter-row select").focus(); $("#add-filter-dropdown").dropdown('toggle'); $("#add-appname-filter").addClass("hide"); return false; @@ -550,13 +560,13 @@ to be uncommented when actually in use. $("#remove-appname-filter").click(function() { $("#appname-filter-row").addClass("hide"); - $("#appname-filter-row input").val(''); + $("#appname-filter-row select").val(''); $("#add-appname-filter").removeClass("hide"); }); $("#add-hostname-filter").click(function() { $("#hostname-filter-row").removeClass("hide"); - $("#hostname-filter-row input").focus(); + $("#hostname-filter-row select").focus(); $("#add-filter-dropdown").dropdown('toggle'); $("#add-hostname-filter").addClass("hide"); return false; @@ -564,12 +574,12 @@ to be uncommented when actually in use. $("#remove-hostname-filter").click(function() { $("#hostname-filter-row").addClass("hide"); - $("#hostname-filter-row input").val(''); + $("#hostname-filter-row select").val(''); $("#add-hostname-filter").removeClass("hide"); }); - // submit request if user presses ENTER key - $("#username, #appname, #hostname").keydown(function(e) { + // get statistics if user presses ENTER key in username filter field + $("#username").keydown(function(e) { if (e.which === 13) { $('#getStatistics').click(); return false;
