Fixed initial index, schedule lines, and related things.

Author: JoelEager

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

@@ -76,6 +76,11 @@ angular.module('sm').controller("AppController", function($scope, localStorage,
 			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')){
+				for (var count = 0; count < $scope.state.schedules.length; count++) {
+					$scope.state.schedules[count][0].initialIndex = count;
+				}
+			}
 		} else {
 
 			// Before state meta

assets/src/modules/sm/App/directives/paginationControlsDirective.js

@@ -12,7 +12,11 @@ angular.module('sm').directive('paginationControls', function() {
 		link: {
 			pre: function(scope) {
 				scope.numberOfPages = function() {
-					return Math.ceil(scope.totalLength / scope.displayOptions.pageSize);
+					var numPages = Math.ceil(scope.totalLength / scope.displayOptions.pageSize);
+					if(scope.displayOptions.currentPage == numPages) {
+						scope.displayOptions.currentPage = numPages - 1;
+					}
+					return numPages;
 				};
 			},
 			post: function(scope, elm, attrs) {

assets/src/modules/sm/Generate/controllers/GenerateController.js

@@ -186,8 +186,8 @@ angular.module('sm').controller("GenerateController", function($scope, globalKbd
 			    	$scope.state.displayOptions.currentPage = 0;
 			    	$scope.scrollToSchedules();
 
-					for (var count = 0; count < schedules.length; count++) {
-						schedules[count].initialIndex = count;
+					for (var count = 0; count < data.schedules.length; count++) {
+						data.schedules[count][0].initialIndex = count;
 					}
 
 			    	$scope.state.schedules = data.schedules;

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

@@ -155,7 +155,6 @@ angular.module('sm').directive('scheduleActions', function($http, $q, shareServi
 			hide: function() {
 				ga('send', 'event', 'schedule', 'hide');
 				scope.$parent.$parent.state.schedules.splice(scope.$index, 1);
-				$timeout(scope.redraw, 10);
 			}
 		}
 	};

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

@@ -189,6 +189,10 @@ angular.module('sm').directive('schedule', function($timeout, $filter) {
 		templateUrl: '/<%=modulePath%>Schedule/templates/scheduleitem.min.html',
 		link: {
 			pre: function(scope, elm, attrs) {
+				if (scope.schedule.length > 0) {
+					scope.initialIndex = scope.schedule[0].initialIndex;
+				}
+				
 				scope.scheduleController = new Schedule(scope);
 				scope.itemEnter = function($event) {
 					var $target = $($event.target),
@@ -225,7 +229,6 @@ angular.module('sm').directive('schedule', function($timeout, $filter) {
 					if(scope.scheduleController.init(options)) {
 						// Only redraw if valid options
 						scope.scheduleController.draw();
-						console.log("poop");
 
 						// Fix pixel alignment issues
 						$timeout(function() {
@@ -243,13 +246,6 @@ angular.module('sm').directive('schedule', function($timeout, $filter) {
 						},10,true);
 					}
 				};
-				scope.redraw = function() {
-					if(!scope.overrideDrawOptions) {
-						update(scope.state.drawOptions);
-					} else {
-						update(scope.overrideDrawOptions);
-					}
-				};
 
 				if(!scope.overrideDrawOptions) {
 					scope.$watchCollection('state.drawOptions', update);

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

@@ -2,7 +2,7 @@
 	<div ng-show="!print" class="panel-heading">
 		<div class="row form-horizontal">
 			<div class="col-xs-12">
-				<h2 class="panel-title control-label pull-left smaller-sm">{{saveAction == "create"?("Schedule " + (state.schedules.indexOf(schedule) + 1)):"My Schedule"}}</h2>
+				<h2 class="panel-title control-label pull-left smaller-sm">{{saveAction == "create"?("Schedule " + (initialIndex + 1)):"My Schedule"}}</h2>
 				<div class="btn-group pull-right hidden-xs hidden-sm">
 					<div class="btn-group">
 						<button ng-click="scheduleActions.save(saveAction)" type="button" class="btn btn-primary"><i class="fa" ng-class="{'fa-save': saveAction == 'create', 'fa-copy': saveAction == 'fork'}"></i> {{saveAction == "create"?"Save":"Copy and Edit"}} </button>
@@ -69,7 +69,7 @@ <h2 class="panel-title control-label pull-left smaller-sm">{{saveAction == "crea
 		</div>
 		<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" ng-attr-id="day{{$index}}" 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}}" ng-attr-fill="url(#day{{$index}})" /></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=".8" /><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><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 svg-text-content="item.content"></g></g></g></svg>
+<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=".8" /><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><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 svg-text-content="item.content"></g></g></g></svg>
 			</div>
 		</div>
 		<div ng-if="!print && totalCredits > state.displayOptions.creditWarning" class="row">