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

Author: JoelEager

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

@@ -71,23 +71,30 @@ angular.module('sm').controller("AppController", function($scope, localStorage,
 
 	// Reload the state if it exists
 	var storedState = localStorage.getItem('state');
-	if(storedState != null) {
-		
+	if (storedState != null) {
 		// Check if state version exists or is correct
-		if(storedState.hasOwnProperty('meta') && storedState.meta.stateVersion == $scope.stateVersion) {
+		if (storedState.hasOwnProperty('meta') && storedState.meta.stateVersion == $scope.stateVersion) {
 			$scope.state = storedState;
-			if(!$scope.state.displayOptions.hasOwnProperty('creditWarning') || !$scope.state.displayOptions.creditWarning) {
+			if (!$scope.state.displayOptions.hasOwnProperty('creditWarning') || !$scope.state.displayOptions.creditWarning) {
 				$scope.state.displayOptions.creditWarning = 18;
 			}
-			if($scope.state.schedules.length > 0 && $scope.state.schedules[0].length > 0 && !$scope.state.schedules[0][0].hasOwnProperty('initialIndex')){
+			
+			// Initialize new values
+			if ($scope.state.schedules.length > 0 && $scope.state.schedules[0].length > 0 && !$scope.state.schedules[0][0].hasOwnProperty('initialIndex')) {
 				for (var count = 0; count < $scope.state.schedules.length; count++) {
 					$scope.state.schedules[count][0].initialIndex = count;
 				}
 			}
+			if (!$scope.state.classDetails) {
+				$scope.state.classDetails = 'NPL';
+			}
+			if (!$scope.state.theme) {
+				$scope.state.theme = 'woc';
+			}
 		} else {
 
 			// Before state meta
-			if(confirm('We need to clear your session in order to update ScheduleMaker, is that ok? \n If you press cancel, you may run into errors.')) {
+			if (confirm('We need to clear your session in order to update ScheduleMaker, is that ok? \n If you press cancel, you may run into errors.')) {
 				$scope.resetState();
 			} else {
 				$scope.state = storedState;
@@ -103,7 +110,6 @@ angular.module('sm').controller("AppController", function($scope, localStorage,
 	// Default, images are supported
 	$scope.imageSupport = true;
 
-
 	var courseNumFilter = $filter('courseNum');
 
 	// Course cart tools for non-generate pages.

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

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

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

@@ -1,4 +1,4 @@
-<div class="panel panel-default" ng-class="state.printTheme" schedule-actions>
+<div class="panel panel-default" ng-class="state.theme" schedule-actions>
 	<div ng-show="!print" class="panel-heading">
 		<div class="row form-horizontal">
 			<div class="col-xs-12">
@@ -70,7 +70,7 @@ <h2 class="panel-title control-label pull-left smaller-sm">{{saveAction == "crea
 		<div class="schedule-cont">
 			<div class="schedule-track" ng-class="mobileTrackClass">
 <svg version="1.1" ng-attr-height="{{grid.opts.height}}" width="100%" xmlns="http://www.w3.org/2000/svg"><defs><pattern vector-effect="non-scaling-stroke" id="day{{initialIndex}}" width="100%" x="0" height="40" patternUnits="userSpaceOnUse"><line vector-effect="non-scaling-stroke" x1="0" y1="19.5" x2="100%" y2="19.5" style="stroke:#bbb;stroke-width:1" /></pattern></defs><rect x="0" y="0" width="100%" height="100%" fill="#ffffff" /><g ng-attr-transform="{{grid.opts.pixelAlignment}}" font-family="Roboto" font-size="15"><g class="svg-schedule-hours"><text fill="#aaa" text-anchor="end" ng-repeat="hour in grid.hours track by $index" ng-attr-x="{{print?'41':'5%'}}" ng-attr-y="{{($index * 40) + 25}}">{{hour}}</text></g><g ng-repeat="day in grid.days"><text y="12" ng-attr-x="{{day.offset}}" ng-attr-width="{{grid.opts.daysWidth}}" fill="#aaa" ng-bind="day.name"></text><rect y="19" ng-attr-x="{{day.offset}}" ng-attr-width="{{grid.opts.daysWidth}}" ng-attr-height="{{grid.opts.daysHeight}}" fill="url(#day{{initialIndex}})" /></g><g svg-schedule-item class="item" ng-mouseenter="itemEnter($event)" ng-mouseleave="itemLeave($event)" ng-repeat="item in scheduleItems | orderBy:'-boundry.y'"><rect ng-attr-x="{{item.boundry.x}}" ng-attr-y="{{item.boundry.y}}" ng-attr-width="{{item.boundry.width}}" ng-attr-height="{{item.boundry.height}}" ng-attr-fill="{{item.color}}" fill-opacity="1" /><rect ng-if="item.boundry.shorten != 0" ng-attr-x="{{item.boundry.x}}" ng-attr-y="{{item.boundry.shorten < 0 ?item.boundry.y : item.boundry.y + item.boundry.height - 2}}" ng-attr-width="{{item.boundry.width}}" height="2" fill="#ffff00" /><text svg-text-line="{{item.title}}" ng-attr-x="{{item.boundry.x}}" ng-attr-y="{{item.boundry.y + 16}}" transform="translate(3,0)" font-weight="bold" fill="white"></text>
-<g ng-switch="state.printClassDetails">
+<g ng-switch="state.classDetails">
 	<g ng-switch-default>
 		<text ng-if="item.boundry.height > 32 && item.content.courseNum" svg-text-line="{{item.content.courseNum}}" ng-attr-x="{{item.boundry.x}}" ng-attr-y="{{item.boundry.y + 32}}" transform="translate(3,0)" fill="#fff"></text><text ng-if="item.boundry.height > 48 && item.content.instructor" svg-text-line="{{item.content.instructor}}" ng-attr-x="{{item.boundry.x}}" ng-attr-y="{{item.boundry.y + 48}}" transform="translate(3,0)" fill="#fff"></text><text ng-if="item.boundry.height > 64 && item.content.location" svg-text-line="{{item.content.location}}" ng-attr-x="{{item.boundry.x}}" ng-attr-y="{{item.boundry.y + 64}}" transform="translate(3,0)" fill="#fff"></text>
 	</g>