Annual PLans bug

app/controllers/AnnualPlansController.php

@@ -150,7 +150,12 @@ class AnnualPlansController extends \BaseController
     //Dame los annual plans que esten dentro del three year plan
 
 
-    $annual_plans = DB::select("
+    $annual_plans = DB::table('annual_cycle')
+      ->join('annual_plans', 'annual_cycle_id', '=', 'annual_cycle.id')
+      ->where('program_id', $program_id)
+      ->orderBy('semester_start')
+      ->get();
+    /*$annual_plans = DB::select("
     
     select 
       academic_year, 
@@ -173,7 +178,7 @@ class AnnualPlansController extends \BaseController
         join typ_program on typ_semester_outcome.typ_program_id = typ_program.id 
         where program_id = {$program_id} )
       )
-      order by semester_start desc");
+      order by semester_start desc");*/
     // $annual_plans = DB::select("select academic_year, semester_start, semester_end, program_id, annual_plans.id as id from annual_plans, annual_cycle where program_id = {$program_id} and annual_cycle.id = annual_plans.annual_cycle_id order by annual_plans.id desc ");
     // Log::info($annual_plans);
     $outcomes = array();

app/controllers/CoursesController.php

@@ -46,6 +46,7 @@ CoursesController extends \BaseController
             $active_semesters[] = $active_semester->id;
         }
 
+
         return View::make('local.professors.course', compact('title', 'course', 'activities', 'students', 'outcomes', 'outcomes_achieved', 'outcomes_attempted', 'active_semesters'));
     }
 
@@ -506,4 +507,4 @@ CoursesController extends \BaseController
         } else {
         }
     }
-}
+}

app/views/local/professors/course.blade.php

@@ -142,9 +142,9 @@
                   <div class="modal-body">
                                            
           
-                          <p>Vas a seleccionar dos actividades para comparar y presentar los datos de las actividades</p>
+                          <p></p>
                           
-                          <h5>Escoge dos actividades para comparar <br></h5>
+                          <h5>Select two activities to compare and present their data. <br></h5>
           
                           <div class="form-group">