Update ThreeYearPlanController.php

app/controllers/ThreeYearPlanController.php

@@ -8,14 +8,14 @@ class ThreeYearPlanController extends \BaseController
   // load the Three year Plan page
   public function threeYearsReport()
   {
-    $user_id = auth::user()->id;
+    $user_id = Auth::user()->id;
 
     // el ID de los semestres que el usuario tiene seleccionado.
     $semesters_ids = Session::get('semesters_ids');
     // buscar informacion de los semestres seleccionados
     $semesters = Semester::whereIn('id', $semesters_ids)->get();
 
-
+    $title = "Three Year Plans";
     $typs = DB::table('three_year_plan')
       ->orderBy('year_start', 'asc')
       ->get();
@@ -25,7 +25,7 @@ class ThreeYearPlanController extends \BaseController
       ->select('program_id')
       ->get();
     $program_id = $program_id[0]->program_id;
-
+    $outcomes = DB::table('outcomes')->where('deactivation_date', '=', null)->orderBy('name', 'ASC')->get();
     // se annadio la nueva variable
     return View::make('global.view-three-year-plan', compact('title', 'outcomes', 'typs', 'criteria', 'semesters', 'program_id'));
   }
@@ -36,15 +36,15 @@ class ThreeYearPlanController extends \BaseController
   {
     $id = Input::get('id');
 
-      $semesters = DB::table('typ_semesters')
-          ->join('semesters','semesters.id','=','typ_semesters.semester_id')
-          ->where('typ_semesters.typ_id',$id)
-          ->orderBy('typ_semesters.semester_id', 'asc')
-          ->get();
-      $typs = DB::table('three_year_plan')
-          ->where('id',$id)
-          ->orderBy('year_start', 'asc')
-          ->get();
+    $semesters = DB::table('typ_semesters')
+      ->join('semesters', 'semesters.id', '=', 'typ_semesters.semester_id')
+      ->where('typ_semesters.typ_id', $id)
+      ->orderBy('typ_semesters.semester_id', 'asc')
+      ->get();
+    $typs = DB::table('three_year_plan')
+      ->where('id', $id)
+      ->orderBy('year_start', 'asc')
+      ->get();
 
     $typs  = $typs[0];
     $typs->semesters = $semesters;
@@ -62,9 +62,9 @@ class ThreeYearPlanController extends \BaseController
 
     $user_id = auth::user()->id;
     $program_id = DB::table('program_user')
-    ->where('user_id',$user_id)
-    ->select('program_id')
-    ->get();
+      ->where('user_id', $user_id)
+      ->select('program_id')
+      ->get();
     $program_id = $program_id[0]->program_id;
 
 
@@ -202,9 +202,9 @@ class ThreeYearPlanController extends \BaseController
     // get program_id
     $user_id = auth::user()->id;
     $program_id = DB::table('program_user')
-        ->where('user_id',$user_id)
-        ->select('program_id')
-        ->get();
+      ->where('user_id', $user_id)
+      ->select('program_id')
+      ->get();
     $program_id = $program_id[0]->program_id;
 
     // get typ_program_id
@@ -260,9 +260,9 @@ class ThreeYearPlanController extends \BaseController
     // get program_id
     $user_id = auth::user()->id;
     $program_id = DB::table('program_user')
-        ->where('user_id',$user_id)
-        ->select('program_id')
-        ->get();
+      ->where('user_id', $user_id)
+      ->select('program_id')
+      ->get();
     $program_id = $program_id[0]->program_id;
 
     // get typ_program_id
@@ -326,14 +326,14 @@ class ThreeYearPlanController extends \BaseController
 
           // lookup available objectives
           $result_objectives = DB::table('objective_outcome')
-              ->join('outcomes','outcomes.id','=','objective_outcome.outcome_id')
-              ->join('objectives','objectives.id','=','objective_outcome.objective_id')
-              ->join('objective_program','objective_program.objective_id','=','objectives.id')
-              ->where('objective_program.program_id',$program_id)
-              ->where('objective_outcome.outcome_id',$outcome_id)
-              ->select('objectives.id','objectives.text','outcomes.name as outcome_name')
-              ->orderBy('objectives.text', 'asc')
-              ->get();
+            ->join('outcomes', 'outcomes.id', '=', 'objective_outcome.outcome_id')
+            ->join('objectives', 'objectives.id', '=', 'objective_outcome.objective_id')
+            ->join('objective_program', 'objective_program.objective_id', '=', 'objectives.id')
+            ->where('objective_program.program_id', $program_id)
+            ->where('objective_outcome.outcome_id', $outcome_id)
+            ->select('objectives.id', 'objectives.text', 'outcomes.name as outcome_name')
+            ->orderBy('objectives.text', 'asc')
+            ->get();
 
           $semesters_->available_objectives = array();
           foreach ($result_objectives as $objectives_) {
@@ -355,9 +355,9 @@ class ThreeYearPlanController extends \BaseController
     // get program_id
     $user_id = auth::user()->id;
     $program_id = DB::table('program_user')
-        ->where('user_id',$user_id)
-        ->select('program_id')
-        ->get();
+      ->where('user_id', $user_id)
+      ->select('program_id')
+      ->get();
     $program_id = $program_id[0]->program_id;
 
     // get typ_program_id
@@ -414,11 +414,11 @@ class ThreeYearPlanController extends \BaseController
           $semesters_->selected_objectives = array();
           foreach ($result_objectives as $objectives_) {
             $result_courses = DB::table('courses')
-                ->where('courses.program_id', $program_id)
-                ->select('courses.id as course_id','courses.name','courses.code','courses.program_id')
-                ->orderBy('courses.name', 'asc')
-                ->groupBy('courses.name','courses.code')
-                ->get();
+              ->where('courses.program_id', $program_id)
+              ->select('courses.id as course_id', 'courses.name', 'courses.code', 'courses.program_id')
+              ->orderBy('courses.name', 'asc')
+              ->groupBy('courses.name', 'courses.code')
+              ->get();
             #los cursos resultantes creo que deberian ser: todos los que se estan dando en mi programa
 
             $objectives_->available_courses = array();
@@ -464,9 +464,9 @@ class ThreeYearPlanController extends \BaseController
     // get program_id
     $user_id = auth::user()->id;
     $program_id = DB::table('program_user')
-        ->where('user_id',$user_id)
-        ->select('program_id')
-        ->get();
+      ->where('user_id', $user_id)
+      ->select('program_id')
+      ->get();
     $program_id = $program_id[0]->program_id;
 
     // get typ_program_id