Fixed bug with sending main view drawOptions to print view

Author: JoelEager

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

@@ -19,7 +19,7 @@ angular.module('sm').controller("AppController", function($scope, localStorage,
 			endDay: 6,
 			bldgStyle: 'code',
 			theme: 'woc',
-			classDetails:'NPL'
+			classDetails: 'NPL'
 		};
 
 		$scope.state.displayOptions = {

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

@@ -23,7 +23,7 @@ angular.module('sm').controller("ScheduleController", function($scope, parsedSch
 
 		// Set the correct draw options
 		for(var key in $scope.state.drawOptions) {
-			$scope.overrideDrawOptions[key] = parsedSchedule[key];
+			$scope.overrideDrawOptions[key] = parsedSchedule[key] || $scope.state.drawOptions[key];
 		}
 
 		// Set image property

assets/src/modules/sm/Schedule/directives/scheduleDirective.js

@@ -227,6 +227,7 @@ angular.module('sm').directive('schedule', function($timeout, $filter) {
 
 				var update = function(options) {
 					if(scope.scheduleController.init(options)) {
+						scope.scheduleDrawOptions = options;
 						// Only redraw if valid options
 						scope.scheduleController.draw();
 

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.drawOptions.theme" ng-options="opt.value as opt.label for opt in ui.optionLists.themeOptions"></select>
+							<select id="printOptions-theme" class="form-control" ng-model="overrideDrawOptions.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.drawOptions.classDetails" ng-options="opt.value as opt.label for opt in ui.optionLists.classDetailsOptions"></select>
+							<select id="printOptions-classDetails" class="form-control" ng-model="overrideDrawOptions.classDetails" ng-options="opt.value as opt.label for opt in ui.optionLists.classDetailsOptions"></select>
 						</div>
 					</div>
 				</div>

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

@@ -1,4 +1,4 @@
-<div class="panel panel-default" ng-class="state.drawOptions.theme" schedule-actions>
+<div class="panel panel-default" ng-class="scheduleDrawOptions.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.drawOptions.classDetails">
+<g ng-switch="scheduleDrawOptions.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>