Author: joyce
Date: Thu May 16 03:01:30 2013
New Revision: 1483170
URL: http://svn.apache.org/r1483170
Log:
Resolves CLIMATE-26. Display queued dataset count to the user.
- Adds display of the number of datasets the user has added so far to
the dataset selection views.
Modified:
incubator/climate/trunk/rcmet/src/main/ui/app/js/controllers.js
incubator/climate/trunk/rcmet/src/main/ui/app/partials/selectObservation.html
incubator/climate/trunk/rcmet/src/main/ui/app/partials/selectRcmed.html
Modified: incubator/climate/trunk/rcmet/src/main/ui/app/js/controllers.js
URL:
http://svn.apache.org/viewvc/incubator/climate/trunk/rcmet/src/main/ui/app/js/controllers.js?rev=1483170&r1=1483169&r2=1483170&view=diff
==============================================================================
--- incubator/climate/trunk/rcmet/src/main/ui/app/js/controllers.js (original)
+++ incubator/climate/trunk/rcmet/src/main/ui/app/js/controllers.js Thu May 16
03:01:30 2013
@@ -311,6 +311,9 @@ function DatasetDisplayCtrl($rootScope,
// Controller for observation selection in modal
function ObservationSelectCtrl($rootScope, $scope, $http, $q, $timeout,
selectedDatasetInformation) {
+ // Grab a copy of the datasets so we can display a count to the user!
+ $scope.datasetCount = selectedDatasetInformation.getDatasets();
+
// Initalize the option arrays and default to the first element
$scope.params = ["Please select a file above"];
$scope.paramSelect = $scope.params[0];
@@ -466,6 +469,8 @@ function ObservationSelectCtrl($rootScop
}
function RcmedSelectionCtrl($rootScope, $scope, $http, $timeout,
selectedDatasetInformation) {
+ // Grab a copy of the datasets so we can display a count to the user!
+ $scope.datasetCount = selectedDatasetInformation.getDatasets();
$scope.fileAdded = false;
var getObservations = function() {
Modified:
incubator/climate/trunk/rcmet/src/main/ui/app/partials/selectObservation.html
URL:
http://svn.apache.org/viewvc/incubator/climate/trunk/rcmet/src/main/ui/app/partials/selectObservation.html?rev=1483170&r1=1483169&r2=1483170&view=diff
==============================================================================
---
incubator/climate/trunk/rcmet/src/main/ui/app/partials/selectObservation.html
(original)
+++
incubator/climate/trunk/rcmet/src/main/ui/app/partials/selectObservation.html
Thu May 16 03:01:30 2013
@@ -2,6 +2,7 @@
<li class="active"><a href="#/obs">Local File</a></li>
<li><a href="#/rcmed">RCMED</a></li>
<li class="disabled"><a href="#/esg">ESG</a></li>
+ <li class="pull-right">Queued Datasets: {{datasetCount.length}}</li>
</ul>
<form class="form-inline" autocomplete="off">
Modified:
incubator/climate/trunk/rcmet/src/main/ui/app/partials/selectRcmed.html
URL:
http://svn.apache.org/viewvc/incubator/climate/trunk/rcmet/src/main/ui/app/partials/selectRcmed.html?rev=1483170&r1=1483169&r2=1483170&view=diff
==============================================================================
--- incubator/climate/trunk/rcmet/src/main/ui/app/partials/selectRcmed.html
(original)
+++ incubator/climate/trunk/rcmet/src/main/ui/app/partials/selectRcmed.html Thu
May 16 03:01:30 2013
@@ -2,6 +2,7 @@
<li><a href="#/obs">Local File</a></li>
<li class="active"><a href="#/rcmed">RCMED</a></li>
<li class="disabled"><a href="#/esg">ESG</a></li>
+ <li class="pull-right">Queued Datasets: {{datasetCount.length}}</li>
</ul>
<div class="row">
