You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@climate.apache.org by jo...@apache.org on 2013/06/13 01:18:45 UTC

svn commit: r1492485 - in /incubator/climate/trunk/rcmet/src/main/ui/app: index.html js/services.js js/services/EvaluationSettings.js

Author: joyce
Date: Wed Jun 12 23:18:45 2013
New Revision: 1492485

URL: http://svn.apache.org/r1492485
Log:
Resolves CLIMATE-99 - Break up services.js

- Moves EvaluationSettings service to a new file.
- Removes the old services.js file that is no longer useful.

Added:
    incubator/climate/trunk/rcmet/src/main/ui/app/js/services/EvaluationSettings.js   (with props)
Removed:
    incubator/climate/trunk/rcmet/src/main/ui/app/js/services.js
Modified:
    incubator/climate/trunk/rcmet/src/main/ui/app/index.html

Modified: incubator/climate/trunk/rcmet/src/main/ui/app/index.html
URL: http://svn.apache.org/viewvc/incubator/climate/trunk/rcmet/src/main/ui/app/index.html?rev=1492485&r1=1492484&r2=1492485&view=diff
==============================================================================
--- incubator/climate/trunk/rcmet/src/main/ui/app/index.html (original)
+++ incubator/climate/trunk/rcmet/src/main/ui/app/index.html Wed Jun 12 23:18:45 2013
@@ -228,9 +228,9 @@
   <script src="js/jasny-bootstrap.min.js"></script>
   <script src="http://cdn.leafletjs.com/leaflet-0.5/leaflet.js"></script>
   <script src="js/app.js"></script>
-  <script src="js/services.js"></script>
   <script src="js/services/SelectedDatasetInformation.js"></script>
   <script src="js/services/RegionSelectParams.js"></script>
+  <script src="js/services/EvaluationSettings.js"></script>
   <script src="js/controllers/WorldMapCtrl.js"></script>
   <script src="js/controllers/ParameterSelectCtrl.js"></script>
   <script src="js/controllers/DatasetDisplayCtrl.js"></script>

Added: incubator/climate/trunk/rcmet/src/main/ui/app/js/services/EvaluationSettings.js
URL: http://svn.apache.org/viewvc/incubator/climate/trunk/rcmet/src/main/ui/app/js/services/EvaluationSettings.js?rev=1492485&view=auto
==============================================================================
--- incubator/climate/trunk/rcmet/src/main/ui/app/js/services/EvaluationSettings.js (added)
+++ incubator/climate/trunk/rcmet/src/main/ui/app/js/services/EvaluationSettings.js Wed Jun 12 23:18:45 2013
@@ -0,0 +1,35 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.You may obtain a copy of the License at
+// 
+// http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+// EvaluationSettings gives controllers access to the user's selected evaluation settings.
+angular.module('rcmes').service('evaluationSettings', function() {
+	var settings = {
+		'metrics': [ 
+			{'name': 'bias', 'select': true},
+		],
+		'temporal': {
+			'options': ['daily', 'monthly', 'yearly'],
+			'selected': 'monthly',
+		},
+	};
+
+	return {
+		getSettings: function() {
+			return settings;
+		}
+	};
+});		

Propchange: incubator/climate/trunk/rcmet/src/main/ui/app/js/services/EvaluationSettings.js
------------------------------------------------------------------------------
    svn:executable = *