Update ThreeYearPlanController.php

Fixes  to queries

app/controllers/ThreeYearPlanController.php

@@ -329,12 +329,12 @@ class ThreeYearPlanController extends \BaseController
           }
 
           // lookup available objectives
-          $result_objectives = DB::table('criterion_objective_outcome')
-              ->join('outcomes','outcomes.id','=','criterion_objective_outcome.outcome_id')
-              ->join('objectives','objectives.id','=','criterion_objective_outcome.objective_id')
+          $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('criterion_objective_outcome.outcome_id',$outcome_id)
+              ->where('objective_outcome.outcome_id',$outcome_id)
               ->select('objectives.id','objectives.text','outcomes.name as outcome_name')
               ->orderBy('objectives.text', 'asc')
               ->get();
@@ -407,8 +407,6 @@ class ThreeYearPlanController extends \BaseController
         // buscar info sobre selected_semsters
         $outcome_->selected_semesters = array();
         foreach ($result_semesters as $semesters_) {
-          $semester_id = $semesters_->semester_id;
-
           $typ_semester_outcome_id = $semesters_->id;
           $result_objectives = DB::table('typ_semester_objectives')
               ->join('objectives','objectives.id','=','typ_semester_objectives.objective_id')
@@ -419,19 +417,13 @@ class ThreeYearPlanController extends \BaseController
 
           $semesters_->selected_objectives = array();
           foreach ($result_objectives as $objectives_) {
-            $objective_id = $objectives_->objective_id;
-            $program_id = $objectives_->program_id;
-            $result_courses = DB::table('objective_program')
-                ->join('objectives','objectives.id','=','objective_program.objective_id')
-                ->join('courses','courses.program_id','=','objective_program.program_id')
-                ->where('objective_program.objective_id', $objective_id)
-                ->where('objective_program.program_id', $program_id)
-                ->where('courses.semester_id', $semester_id)
-                ->distinct('courses.name','courses.code')
-                ->select('courses.id as course_id','courses.name','courses.code','objective_program.objective_id','objective_program.program_id')
+            $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();
+            #los cursos resultantes creo que deberian ser: todos los que se estan dando en mi programa
 
             $objectives_->available_courses = array();
             foreach ($result_courses as $courses_) {