Merge lp:~c11emian/lenasys/1182127 into lp:lenasys

[Emil Andersson]

=== modified file 'codeigniter/application/controllers/cms.php'
--- codeigniter/application/controllers/cms.php	2013-05-28 08:51:26 +0000
+++ codeigniter/application/controllers/cms.php	2013-05-28 11:53:29 +0000
@@ -46,6 +46,20 @@
 			}
 		}		
 		
+		public function test(){
+			
+			$result = $this->admin_model->getStudentCourses("student");
+			foreach($result as $res) {
+				echo $res->courseID. ' - ';
+				echo $res->name;
+				echo "<br>";
+				
+			}
+			
+			//var_dump($result);
+		}
+		
+		
 		/*
 		 *	This function draws the cms page.
 		 */

=== modified file 'codeigniter/application/models/admin/admin_model.php'
--- codeigniter/application/models/admin/admin_model.php	2013-05-24 11:34:09 +0000
+++ codeigniter/application/models/admin/admin_model.php	2013-05-28 11:53:29 +0000
@@ -12,12 +12,39 @@
 		$this->load->database();
 	}
 
-
+	/* Get all of the courses */
 	function getCourses() {
 		$this->db->order_by("name", "asc");
 		$query = $this->db->get('Courses');
 		return $query->result();
 	}
+	
+	/* Get all the public courses */
+	function getPublicCourses() {
+		$this->db->from("Courses");
+		$this->db->where("isHidden","0");
+		$this->db->where("isPublic","1");
+		$query = $this->db->get();
+		return $query->result();
+	}
+	
+	/* Get all the private courses for a student - If they are published and private*/
+	function getPrivateCourses($studentID) {
+		$this->db->from("Courses");
+		$this->db->join("StudentCourseRegistrations", "Courses.courseID = StudentCourseRegistrations.courseID");
+		$this->db->where("userName", $studentID);
+		$this->db->where("isPublic", "0");
+		$this->db->where("isHidden","0");
+		$query = $this->db->get();
+		return $query->result();
+	}
+	
+	/* Get all the courses for a student, both private from getPrivateCourses(), and public from getPublicCourses() */
+	function getStudentCourses($studentID) {
+		$private = $this->getPrivateCourses($studentID);
+		$public = $this->getPublicCourses();
+		return array_merge($private, $public);
+	}
 
 	function setCourseHidden($courseID) {
 		$this->db->where("courseID", $courseID);

=== modified file 'databas.sql'
--- databas.sql	2013-05-21 14:40:12 +0000
+++ databas.sql	2013-05-28 11:53:29 +0000
@@ -10,8 +10,8 @@
   `courseID` VARCHAR(10) NOT NULL ,
   `name` VARCHAR(50) NULL ,
   `courseData` VARCHAR(128) NULL , -- explanation about course, example: G1N 7,5hp  + additional text
-  `isHidden` BIT(1) NOT NULL DEFAULT 0 ,
-  `isPublic` BIT(1) NOT NULL DEFAULT 1 ,
+  `isHidden` BIT(1) NOT NULL DEFAULT 0 , -- Published or not
+  `isPublic` BIT(1) NOT NULL DEFAULT 1 , -- Public or not
   PRIMARY KEY (`courseID`))
 ENGINE = InnoDB;