Fixes #44 by adding credit support everywhere.

Fixes #14, made class heights snap to 15-minute blocks.
Fixes #72 by adding a simple responsive table wrapper, along with a potential iPhone weekView fix for schedules.

Author: bgrawi

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

@@ -23,6 +23,7 @@ angular.module('sm').controller("AppController", function($scope, localStorage,
 		$scope.state.displayOptions = {
 			currentPage: 0,
 			pageSize: 3,
+			creditWarning: 18,
 			fullscreen: ''
 		};
 
@@ -72,6 +73,10 @@ angular.module('sm').controller("AppController", function($scope, localStorage,
 		// Check if state version exists or is correct
 		if(storedState.hasOwnProperty('meta') && storedState.meta.stateVersion == $scope.stateVersion) {
 			$scope.state = storedState;
+			console.log('asdjasdjk');
+			if(!$scope.state.displayOptions.hasOwnProperty('creditWarning') || !$scope.state.displayOptions.creditWarning) {
+				$scope.state.displayOptions.creditWarning = 18;
+			}
 		} else {
 
 			// Before state meta

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

@@ -57,7 +57,7 @@ angular.module('sm').directive('courseDetailPopover', function($http, $filter) {
 								trigger:'click',
 
 								title: data.courseNum,
-								content: '<div class="well-sm pull-right" style=" background-color: #ddd;" title="Other students enrolled as of 6AM today">' + data.curenroll + '/' + data.maxenroll + ' <i class="fa fa-user"></i></div><p>' + data.title + '<br><span class="label label-default popover-white">' + RMPUrl(data.instructor) + '</span></p><p>' + getTimesHTML(data.times) + '</p><p>' + data.description + '</p>',
+								content: '<div class="well-sm pull-right" style=" background-color: #ddd;" title="Other students enrolled as of 6AM today">' + data.curenroll + '/' + data.maxenroll + ' <i class="fa fa-user"></i></div><p>' + data.title + ' - ' + data.credits + ' credits<br><span class="label label-default popover-white">' + RMPUrl(data.instructor) + '</span></p><p>' + getTimesHTML(data.times) + '</p><p>' + data.description + '</p>',
 								container: '#container'
 							});
 							elm.popover('show');

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

@@ -650,6 +650,7 @@ svg g.item:hover rect {
 	.schedule-track.mobileWeek svg {
 		width: 1000px;
 		transform: scale(.25);
+		-webkit-transform: scale(.25);
 		position: relative;
 		left: -366px;
 		margin-bottom: -400px;

assets/src/modules/sm/Generate/templates/generate.html

@@ -267,18 +267,18 @@ <h3 class="panel-title">Mobile Display</h3>
 				<div class="panel panel-default">
 					<div class="panel-heading panel-heading-controls">
 						<div class="row form-horizontal">
-							<div class="col-md-3">
+							<div class="col-md-2">
 								<div class="form-group">
-									<label for="options-bldgStyle" class="col-sm-4 control-label">Buildings:</label>
-									<div class="col-sm-8">
+									<label for="options-bldgStyle" class="col-sm-6 control-label">Buildings:</label>
+									<div class="col-sm-6">
 										<select id="options-bldgStyle" class="form-control" ng-model="state.drawOptions.bldgStyle">
 											<option value="code">Codes (eg. GOL)</option>
 											<option value="number">Number (eg. 70)</option>
 										</select>
 									</div>
 								</div>
 							</div>
-							<div class="col-md-3">
+							<div class="col-md-2">
 								<div class="form-group hidden-xs">
 									<label for="options-fullscreen" class="col-sm-4 control-label">Width:</label>
 									<div class="col-sm-8">
@@ -304,6 +304,14 @@ <h3 class="panel-title">Mobile Display</h3>
 									</div>
 								</div>
 							</div>
+							<div class="col-md-2">
+								<div class="form-group">
+									<label for="displayOptions-creditWarning" class="col-sm-6 control-label">Credits:</label>
+									<div class="col-sm-6">
+										<input ng-pattern="/^\d{1,2}$/" type="text" id="displayOptions-creditWarning" class="form-control" ng-model="state.displayOptions.creditWarning" />
+									</div>
+								</div>
+							</div>
 							<div class="col-md-3">
 								<div class="pull-right" pagination-controls="state.displayOptions" pagination-length="state.schedules.length" pagination-callback="scrollToSchedules()"></div>
 							</div>

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

@@ -14,6 +14,7 @@ angular.module('sm').directive('schedule', function($timeout, $filter) {
 		this.scope.hiddenCourses = [];
 		this.scope.onlineCourses = [];
 		this.scope.scheduleItems = [];
+		this.scope.totalCredits = 10;
 
 		return true;
 	};
@@ -121,9 +122,10 @@ angular.module('sm').directive('schedule', function($timeout, $filter) {
 
 			// Calculate the height
 			var timeHeight = parseInt(courseEnd) - parseInt(courseStart);
-			timeHeight = timeHeight / 30;
+			timeHeight = timeHeight / 15;
 			timeHeight = Math.ceil(timeHeight);
-			timeHeight = (timeHeight * 20);
+
+			timeHeight = (timeHeight * 10);
 
 			// Calculate the top offset
 			var timeTop = parseInt(courseStart) - startTime;
@@ -163,6 +165,7 @@ angular.module('sm').directive('schedule', function($timeout, $filter) {
 
 	Schedule.prototype.drawCourses = function() {
 		this.courseDrawIndex = 0;
+		this.scope.totalCredits = 0;
 		for(var coursesIndex = 0, coursesLength = this.scope.schedule.length; coursesIndex < coursesLength; coursesIndex++) {
 			var course = this.scope.schedule[coursesIndex];
 			this.courseDrawIndex++;
@@ -171,6 +174,8 @@ angular.module('sm').directive('schedule', function($timeout, $filter) {
 			} else if(course.times != undefined) {
 				this.drawCourse(course);
 			}
+			//console.log(course);
+			this.scope.totalCredits+= (course.hasOwnProperty('credits')? +course.credits: 0);
 		}
 	};
 

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

@@ -70,6 +70,13 @@ <h2 class="panel-title control-label pull-left smaller-sm">{{saveAction == "crea
 <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" 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)" /></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="totalCredits > state.displayOptions.creditWarning" class="row">
+			<div class="col-xs-12">
+				<div class="alert alert-warning">
+					<strong>Warning!</strong> This schedule contains {{totalCredits}} credits, which is {{state.displayOptions.creditWarning - totalCredits}} over the limit. You can adjust the limit by changing the number of max credits at the bottom.
+				</div>
+			</div>
+		</div>
 		<div ng-if="hiddenCourses.length > 0" class="row">
 			<div class="col-xs-12">
 				<div class="alert alert-warning">

assets/src/modules/sm/Status/templates/status.html

@@ -1,9 +1,10 @@
 <div class="container">
 	<div class="panel panel-default">
-		<div class="panel-heading">
+		<div class="panel-heading clearfix">
 			<h3 class="panel-title">Last 20 Data Scrapes <div class="pull-right">Last run: {{logs.length > 0?timeConvert(logs[0].timeStarted):'Never'}}</div></h3>
 		</div>
 		<div class="panel-body">
+			<div class="table-responsive">
 		<table class="table">
 			<thead>
 				<tr>
@@ -31,6 +32,7 @@ <h3 class="panel-title">Last 20 Data Scrapes <div class="pull-right">Last run: {
 				</tr>
 			</tbody>
 		</table>
+			</div>
 		</div>
 	</div>
 </div>

inc/databaseConn.php

@@ -44,7 +44,8 @@ function getMeetingInfo($sectionData) {
         "courseParentNum" => "{$sectionData['department']}-{$sectionData['course']}",
         "courseId"   => $sectionData['courseId'],
         "id"         => $sectionData['id'],
-        "online"     => $sectionData['type'] == "O"
+        "online"     => $sectionData['type'] == "O",
+		"credits"	 => $sectionData['credits']
         );
 
 	if(isset($sectionData['description'])) {
@@ -96,7 +97,7 @@ function getCourseBySectionId($id, $withDescription = false) {
 	$query = "SELECT s.id,
                 (CASE WHEN (s.title != '') THEN s.title ELSE c.title END) AS title,
                 c.id AS courseId,
-                s.instructor, s.curenroll, s.maxenroll, s.type, c.quarter, c.course{$descriptionSQL}, s.section, d.number, d.code
+                s.instructor, s.curenroll, s.maxenroll, s.type, c.quarter, c.credits, c.course{$descriptionSQL}, s.section, d.number, d.code
                 FROM sections AS s
                   JOIN courses AS c ON s.course = c.id
                   JOIN departments AS d ON d.id = c.department
@@ -133,7 +134,7 @@ function getCourse($term, $dept, $courseNum, $sectNum) {
     if($term > 20130) {
         $query = "SELECT s.id,
                     (CASE WHEN (s.title != '') THEN s.title ELSE c.title END) AS title,
-                    s.instructor, s.curenroll, s.maxenroll, s.type, d.code AS department, c.course, s.section
+                    s.instructor, s.curenroll, s.maxenroll, s.type, d.code AS department, c.course, c.credits, s.section
                   FROM sections AS s
                     JOIN courses AS c ON c.id=s.course
                     JOIN departments AS d ON d.id=c.department
@@ -143,7 +144,7 @@ function getCourse($term, $dept, $courseNum, $sectNum) {
     } else {
         $query = "SELECT s.id,
                     (CASE WHEN (s.title != '') THEN s.title ELSE c.title END) AS title,
-                    s.instructor, s.curenroll, s.maxenroll, s.type, d.number AS department, c.course, s.section
+                    s.instructor, s.curenroll, s.maxenroll, s.type, d.number AS department, c.course, c.credits, s.section
                   FROM sections AS s
                     JOIN courses AS c ON c.id=s.course
                     JOIN departments AS d ON d.id=c.department

package.json

@@ -1,6 +1,6 @@
 {
   "name": "schedulemaker",
-  "version": "3.0.14",
+  "version": "3.0.15",
   "private": true,
   "description": "A course database lookup tool and schedule building web application for use at Rochester Institute of Technology.",
   "main": "index.php",

tools/processDump.php

@@ -523,7 +523,7 @@ function procInstrArray($lineSplit) {
 $departmentsProc = mysqli_affected_rows($dbConn);
 
 // Grab each COURSE from the classes table
-$courseQuery = "SELECT strm, subject, acad_org, catalog_nbr, descr, course_descrlong,";
+$courseQuery = "SELECT strm, subject, units, acad_org, catalog_nbr, descr, course_descrlong,";
 $courseQuery .= " crse_id, crse_offer_nbr, session_code";
 $courseQuery .= " FROM classes WHERE strm < 20130 GROUP BY crse_id, strm, session_code";
 debug("... Updating courses\n0%", false);
@@ -556,7 +556,7 @@ function procInstrArray($lineSplit) {
 
 	// Insert or update the course
     $courseId = insertOrUpdateCourse($row['qtr'], $row['subject'], $row['acad_org'], $row['catalog_nbr'],
-	                                 0, $row['descr'], $row['course_descrlong']);
+	                                 $row['units'], $row['descr'], $row['course_descrlong']);
 	if(!is_numeric($courseId)) {
 		echo("    *** Error: Failed to update {$row['qtr']} {$row['subject']}{$row['acad_org']}-{$row['catalog_nbr']}\n");
 		echo("    ");