Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml

Author: KeyboardMonkey

.idea/workspace.xml

@@ -2,9 +2,13 @@
 
 class Preference extends MY_Controller 
 {
+
+	
+
         public function rank_preference()
     {
 
+
         $userInterests = $this -> user_interest_categories -> getWithCondition(
             array(
                 'user_id' => $this -> session -> userdata('user_id'),
@@ -15,7 +19,7 @@ public function rank_preference()
 
         if(count($userInterests) >= 5)
         {
-            
+
             $i = 1;
             foreach($userInterests  as $interest)
             {

application/controllers/preference.php

@@ -11,7 +11,27 @@ public function __construct() {
     public $course_id;
     public $review;
     public $submittion_date;
-    
+    public $marked_by_teacher;
+    public $marks;
+
+    public function getPendingReviewsCourses()
+    {
+        $courses = array();
+        $reviews = $this-> course_review -> getWithCondition(array('marked_by_teacher' => 0));
+        foreach ($reviews as $review) {
+            $course = new course();
+            $course -> load($review -> course_id);
+            $courses[$course->course_id] =$course;
+        }
+    return $courses;
+    }
+    public function getUnmarkedReviews($_course_id = NULL, $_user_id = NULL)
+    {
+        if($_user_id == NULL) $_user_id = $this -> session -> userdata('user_id');
+        if($_course_id == NULL) $_course_id = $this -> course_id;
+        $reviews = $this-> course_review -> getWithCondition(array('marked_by_teacher' => 0, 'course_id' => $_course_id));
+        return $reviews;
+    }
     public function reviewSubmittedByUser( $_course_id = NULL,$_user_id = NULL)
     {
         if($_user_id == NULL) $_user_id = $this -> session -> userdata('user_id');

application/models/course_review.php

@@ -37,7 +37,21 @@
 		<section class="clear"></section>
 		<section id="track-description">
 			<h3>Description</h3>
-			<p><?=$track -> track_description;?></p>
+            <p><?=$track -> track_description;?></p>
+            <?php
+
+            if(strlen($track -> additional_file_path) > 2 && strlen($track -> additional_file_title) > 2)
+            {
+                ?>
+            <h3>Additional Information</h3>
+            <p><a href="<?=base_url($track -> additional_file_path);?>"><?=$track->additional_file_title;?></a></p>
+
+                <?php
+            }
+                  
+            ?>
+
+                        
 		</section>
 		<section class="course-progress">
                     <?php