WIP changes to theme and class details options for printing and viewing schedules.

Author: JoelEager

assets/src/modules/sm/App/controllers/AppController.js

@@ -11,7 +11,7 @@ angular.module('sm').controller("AppController", function($scope, localStorage,
 		$scope.state.courseMap = {};
 		$scope.state.nonCourses = [];
 		$scope.state.noCourses = [];
-		$scope.state.schedules =[];
+		$scope.state.schedules = [];
 		$scope.state.drawOptions = {
 			startTime: 480,
 			endTime: 1320,
@@ -38,13 +38,16 @@ angular.module('sm').controller("AppController", function($scope, localStorage,
 			alert_searchFeatures: true,
 			alert_browseFeatures: true,
 			alert_labClasses: false,
-			action_generateSchedules: false,
+			action_generateSchedules: false
 		};
 
 		$scope.state.meta = {
 			stateVersion: $scope.stateVersion,
 			lastSaved: new Date().getTime()
 		};
+		
+		$scope.state.theme = 'woc';
+		$scope.state.classDetails = 'NPL';
 	};
 	$scope.resetState = function() {
 		$scope.initState();
@@ -591,7 +594,30 @@ angular.module('sm').controller("AppController", function($scope, localStorage,
 					1410: '11:30pm',
 					1440: '12:00am',
 				}
-			}
+			},
+			themeOptions: [{
+				value: 'woc',
+				label: "Modern Colors"
+			}, {
+				value: 'bow',
+				label: "Classic B&W"
+			}, {
+				value: 'gow',
+				label: "Classic Greyscale"
+			}, {
+				value: 'boc',
+				label: "Black Text & Colors"
+			}],
+			classDetailsOptions: [{
+				value: 'NPL',
+				label: "Number, Professor, Location"
+			}, {
+				value: 'LPN',
+				label: "Location, Professor, Number"
+			}, {
+				value: 'LNP',
+				label: "Location, Number, Professor"
+			}]
 		},
 		colors:
 			["#7BA270",

assets/src/modules/sm/App/styles/global.css

@@ -63,28 +63,28 @@ body.print div[schedule] > .panel {
 	margin: 0 auto;
 }
 
-body.print div[schedule].bow svg g[svg-schedule-item] rect,
-body.print div[schedule].gow svg g[svg-schedule-item] rect {
+body div[schedule].bow svg g[svg-schedule-item] rect,
+body div[schedule].gow svg g[svg-schedule-item] rect {
 	fill: #FFFFFF !important;
 	fill-opacity: 1 !important;
 	stroke: #000;
 	stroke-width: 1px;
 }
 
-body.print div[schedule].gow svg g[svg-schedule-item] rect {
+body div[schedule].gow svg g[svg-schedule-item] rect {
 	stroke: #555;
 }
 
-body.print div[schedule].bow text,
-body.print div[schedule].boc svg g[svg-schedule-item] text {
+body div[schedule].bow text,
+body div[schedule].boc svg g[svg-schedule-item] text {
 	fill: #000000 !important;
 }
 
-body.print div[schedule].bow svg line {
+body div[schedule].bow svg line {
 	stroke: #000000 !important;
 }
 
-body.print div[schedule].gow svg g[svg-schedule-item] text {
+body div[schedule].gow svg g[svg-schedule-item] text {
 	fill: #333 !important;
 }
 
@@ -113,7 +113,6 @@ body.print header.main {
 	display: none;
 }
 
-
 body.print footer.main.print {
 	display: block;
 }

assets/src/modules/sm/Schedule/controllers/SchedulePrintController.js

@@ -25,39 +25,6 @@ angular.module('sm').controller("SchedulePrintController", function($scope, $loc
 
         $scope.heading = "My " + year + "-" + (year+1) + " " + term  + " Schedule";
 	}
-        
-	if (!$scope.state.printTheme) {
-		$scope.state.printTheme = 'woc';
-	}
-	
-	$scope.printThemeOptions = [{
-		value: 'woc',
-		label: "Modern Colors"
-	}, {
-		value: 'bow',
-		label: "Classic B&W"
-	}, {
-		value: 'gow',
-		label: "Classic Greyscale"
-	}, {
-		value: 'boc',
-		label: "Black Text & Colors"
-	}];
-	
-	if (!$scope.state.printClassDetails) {
-		$scope.state.printClassDetails = 'NPL';
-	}
-	
-	$scope.printClassDetailsOptions = [{
-		value: 'NPL',
-		label: "Number, Professor, Location"
-	}, {
-		value: 'LPN',
-		label: "Location, Professor, Number"
-	}, {
-		value: 'LNP',
-		label: "Location, Number, Professor"
-	}];
 
 	localStorage.setItem("reloadSchedule", null);
 

assets/src/modules/sm/Schedule/templates/schedule.print.html

@@ -20,15 +20,15 @@ <h3 class="panel-title">
 					<div class="form-group">
 						<label for="printOptions-theme" class="col-sm-4 control-label">Theme:</label>
 						<div class="col-sm-8">
-							<select id="printOptions-theme" class="form-control" ng-model="state.printTheme" ng-options="opt.value as opt.label for opt in printThemeOptions"></select>
+							<select id="printOptions-theme" class="form-control" ng-model="state.theme" ng-options="opt.value as opt.label for opt in ui.optionLists.themeOptions"></select>
 						</div>
 					</div>
 				</div>
 				<div class="col-sm-9">
 					<div class="form-group">
 						<label for="printOptions-classDetails" class="col-sm-3 control-label">Class Details:</label>
 						<div class="col-sm-7">
-							<select id="printOptions-classDetails" class="form-control" ng-model="state.printClassDetails" ng-options="opt.value as opt.label for opt in printClassDetailsOptions"></select>
+							<select id="printOptions-classDetails" class="form-control" ng-model="state.classDetails" ng-options="opt.value as opt.label for opt in ui.optionLists.classDetailsOptions"></select>
 						</div>
 					</div>
 				</div>
@@ -42,4 +42,4 @@ <h3 class="panel-title">
 	</div>
 </div>
 <h2 id="print_header" class="center" ng-bind="heading"></h2>
-<div ng-class="state.printTheme" schedule print="true"></div>
+<div schedule print="true"></div>

assets/src/modules/sm/Schedule/templates/scheduleitem.html

@@ -1,4 +1,4 @@
-<div class="panel panel-default" schedule-actions>
+<div class="panel panel-default" ng-class="state.printTheme" schedule-actions>
 	<div ng-show="!print" class="panel-heading">
 		<div class="row form-horizontal">
 			<div class="col-xs-12">