Merge branch 'add-musr69-course' into 'develop'

Add MUSR 69 course

See merge request !7

include/functions.inc.php

@@ -466,6 +466,11 @@ function update_credit_tardy_etc_fix( $local_db )
                 'OR enrollments.course_id=CONCAT( events.semester_code, \'.MUSR068002\' ) ' .
                 'OR enrollments.course_id=CONCAT( \'MUSR-68-002.\', events.semester_code )) ' .
 				'AND events.grad_credit=\'true\' ' .
+			') OR ( ' .
+				'(enrollments.course_id=CONCAT( \'20\', LPAD(events.semester_code, 3, 0), \'.MUSR069001\' ) ' .
+				'OR enrollments.course_id=CONCAT( events.semester_code, \'.MUSR069001\' ) ' .
+				'OR enrollments.course_id=CONCAT( \'MUSR-69-001.\', events.semester_code )) ' .
+				'AND events.grad_credit=\'true\' ' .
 			') )';
 	$local_db->Execute( $sql );
 

include/user.class.php

@@ -188,7 +188,7 @@ class User
 					'USING( course_id ) ' .
 				'WHERE people.nuid = \'' . $this->nuid . '\' ' .
 				'AND department = \'MUSR\' ' .
-				'AND (course_number = \'068\' OR course_number = \'68\')' .
+				'AND (course_number = \'068\' OR course_number = \'68\' OR course_number = \'069\' OR course_number = \'69\')' .
 				'AND courses.semester_code = \'' . $_SESSION['semester_code'] . '\'' .
 				'ORDER BY department, course_number, section;';
 		}
@@ -198,7 +198,7 @@ class User
 				'SELECT courses.* ' .
 				'FROM courses ' .
 				'WHERE department = \'MUSR\' ' .
-				'AND (course_number = \'068\' OR course_number = \'68\')' .
+				'AND (course_number = \'068\' OR course_number = \'68\' OR course_number = \'069\' OR course_number = \'69\')' .
 				'AND courses.semester_code = \'' . $_SESSION['semester_code'] . '\' ' .
 				'ORDER BY department, course_number, section;';
 		}
@@ -213,7 +213,7 @@ class User
 					'USING( course_id ) ' .
 				'WHERE people.nuid = \'' . $this->nuid . '\' ' .
 				'AND department = \'MUSR\' ' .
-				'AND (course_number = \'068\' OR course_number = \'68\')' .
+				'AND (course_number = \'068\' OR course_number = \'68\' OR course_number = \'069\' OR course_number = \'69\')' .
 				'AND courses.semester_code = \'' . $_SESSION['semester_code'] . '\'' .
 				'ORDER BY department, course_number, section;';
 		}