Fixed a number of issues

More commits to come, to finish changes later

Drop track select fixed
Updated angular verion etc

Author: Pringlez

frontend/advanced.html

@@ -127,13 +127,6 @@
 							</div>
 
 							<div class="row">
-								<div class="col-sm-4">
-									<div class="form-group" show-errors>
-										<label>Kick Vote Quorum</label>
-										<input class="form-control" name="kick_vote_quorum" ng-model="server.KICK_QUORUM"/>
-									</div>
-								</div>
-								
 								<div class="col-sm-4">
 									<div class="form-group" show-errors>
 										<label>Blacklist Mode</label>
@@ -234,15 +227,14 @@
 		</div>
 	</body>
 
-    <script src="js/jquery-1.10.2.js" type="text/javascript"></script>
+    <script src="js/jquery-1.12.4.min.js" type="text/javascript"></script>
 	<script src="js/bootstrap.min.js" type="text/javascript"></script>
-	<script src="js/bootstrap-switch.js"></script>
-	<script src="js/chartist.min.js"></script>
+	<script src="js/bootstrap-checkbox-radio-switch.js"></script>
     <script src="js/bootstrap-notify.js"></script>
 	<script src="js/light-bootstrap-dashboard.js"></script>
 	<script src="js/angular/angular.min.js"></script>
 	<script src="js/angular/angular-resource.min.js"></script>
-	<script src="js/angular/ui-bootstrap-tpls-0.13.0.min.js"></script>
+	<script src="js/angular/ui-bootstrap-tpls-2.5.0.min.js"></script>
 	<script src="js/angular/show-errors.min.js"></script>
 	<script src="app/app.js"></script>
 	<script src="app/angular-toggle-switch.js"></script>

frontend/app/app.js

@@ -1,18 +1,17 @@
 'use strict';
 
 angular
-	.module('acServerManager', ['acServerManager.services', 'ui.bootstrap', 'ui.bootstrap.showErrors', 'toggle-switch'])
-	
-.directive('stringToNumber', function() {
-  return {
-    require: 'ngModel',
-    link: function(scope, element, attrs, ngModel) {
-      ngModel.$parsers.push(function(value) {
-        return '' + value;
-      });
-      ngModel.$formatters.push(function(value) {
-        return parseFloat(value, 10);
-      });
-    }
-  };
-});
+    .module('acServerManager', ['acServerManager.services', 'ui.bootstrap', 'ui.bootstrap.showErrors', 'toggle-switch'])
+    .directive('stringToNumber', function() {
+        return {
+            require: 'ngModel',
+            link: function(scope, element, attrs, ngModel) {
+                ngModel.$parsers.push(function(value) {
+                    return '' + value;
+                });
+                ngModel.$formatters.push(function(value) {
+                    return parseFloat(value, 10);
+                });
+            }
+        };
+    });

frontend/app/controllers.js

@@ -192,19 +192,14 @@ angular.module('acServerManager')
 
 			try {
 				$scope.selectedCars = data.CARS.split(';');
-				$scope.selectedTracks = data.TRACK; //TODO: Multi-track
+				$scope.selectedTrack = data.TRACK;
 				$scope.selectedTyres = data.LEGAL_TYRES.split(';');
-			
+
 				data.LOOP_MODE = data.LOOP_MODE == 1;
 				data.LOCKED_ENTRY_LIST = data.LOCKED_ENTRY_LIST == 1;
 				data.PICKUP_MODE_ENABLED = data.PICKUP_MODE_ENABLED == 1;
 				data.REGISTER_TO_LOBBY = data.REGISTER_TO_LOBBY == 1;
-			
-				if(data.SUN_ANGLE > 0){
-					var time = getTime(data.SUN_ANGLE);
-					$scope.hours = time.getHours();
-					$scope.mins = time.getMinutes();
-				}
+
 			} catch (e) {
 				console.log('Error - ' + e);
 			}
@@ -300,17 +295,16 @@ angular.module('acServerManager')
 		}
 
 		$scope.trackChanged = function() {
-			var track = findInArray($scope.tracks, {name: $scope.selectedTracks})
+			var track = findInArray($scope.tracks, {name: $scope.selectedTrack})
 			if (track !== null) {
 				if (track.configs && track.configs.length) {
 					$scope.configs = track.configs;
-					$scope.server.CONFIG_TRACK = $scope.configs[0];
 
 					TrackService.GetTrackDetails(track.name, $scope.server.CONFIG_TRACK, function(data) {
 						$scope.trackDetails = data;
 					});
 
-					$scope.trackImage = '/api/tracks/' + $scope.selectedTracks + '/' + $scope.server.CONFIG_TRACK + '/image';
+					$scope.trackImage = '/api/tracks/' + $scope.selectedTrack + '/' + $scope.server.CONFIG_TRACK + '/image';
 				} else {
 					$scope.configs = null;
 					$scope.server.CONFIG_TRACK = '';
@@ -319,7 +313,7 @@ angular.module('acServerManager')
 						$scope.trackDetails = data;
 					});
 
-					$scope.trackImage = '/api/tracks/' + $scope.selectedTracks + '/image';
+					$scope.trackImage = '/api/tracks/' + $scope.selectedTrack + '/image';
 				}
 			}
 		};
@@ -340,8 +334,7 @@ angular.module('acServerManager')
 				data.PICKUP_MODE_ENABLED = $scope.server.PICKUP_MODE_ENABLED ? 1 : 0;
 				data.REGISTER_TO_LOBBY = $scope.server.REGISTER_TO_LOBBY ? 1 : 0;
 				data.CARS = $scope.selectedCars.join(';');
-				data.TRACK = $scope.selectedTracks; //TODO: Multi-track
-				data.SUN_ANGLE = getSunAngle($scope.hours, $scope.mins);
+				data.TRACK = $scope.selectedTrack;
 
 				if (typeof $scope.tyres.length === 'undefined' || !$scope.tyres.length){
 					data.LEGAL_TYRES = $scope.selectedTyres.length === $scope.tyres.length ? '' : $scope.selectedTyres.join(';');
@@ -430,24 +423,6 @@ angular.module('acServerManager')
 		$scope.closeAlert = function(index) {
 			$scope.alerts.splice(index, 1);
 		};
-		
-		function getTime(sunAngle) {
-			var baseLine = new Date(2000, 1, 1, 13, 0, 0, 0);
-			var offset = sunAngle / 16;
-			var multiplier = offset * 60;
-			baseLine.setMinutes(baseLine.getMinutes() + multiplier);
-			return baseLine;
-		}
-		
-		function getSunAngle(hours, mins) {
-			var baseLine = new Date(2000, 1, 1, 13, 0, 0, 0);
-			var time = new Date(2000, 1, 1, hours, mins, 0);
-			var diff = time - baseLine;
-			var minDiff = Math.round(diff / 60000);
-			var multiplier = minDiff / 60;
-			var sunAngle = multiplier * 16;
-			return sunAngle;
-		}
 
 		function createAlert(type, msg, icon) {
 			$.notify({