app/controllers/CriteriaController.php

@@ -257,7 +257,11 @@ class CriteriaController extends \BaseController
             ->where('criterion_id', $criteria_id)
             ->orderBy('position')
             ->get();
-        $criterion->program =  DB::table('program_criterion')->where('criterion_id', $criteria_id)->get();
+        $criterion->program =  DB::table('program_criterion_objective_outcome as poco')
+            ->join('criterion_objective_outcome as cobo', 'cobo.id', '=', 'poco.cri_obj_out_id')
+            ->where('criterion_id', $criteria_id)
+            ->select('poco.program_id')
+            ->distinct()->get();
         $criterion->activity_criterion = DB::table('assessments')
             ->join('activity_criterion', 'activity_criterion.id', '=', 'assessments.activity_criterion_id')
             ->where('activity_criterion.criterion_id', $criteria_id)
@@ -336,8 +340,9 @@ class CriteriaController extends \BaseController
 
 
         $saved_criterion = DB::table('criteria')
-            ->join('program_criterion', 'program_criterion.criterion_id', '=', 'criteria.id')
             ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
+            ->join('program_criterion_objective_outcome', 'program_criterion_objective_outcome.cri_obj_out_id', '=', 'criterion_objective_outcome.id')
+
             ->join('criterion_scale', 'criterion_scale.criterion_id', '=', 'criteria.id')
             ->whereIn('program_id', $input['program_id'])
             ->whereIn('objective_id', $objectives)
@@ -461,7 +466,7 @@ class CriteriaController extends \BaseController
      */
     public function create()
     {
-        $clean_input = $this->cleanInput();	
+        $clean_input = $this->cleanInput();
 
         Log::info(json_encode($clean_input));
 
@@ -489,7 +494,7 @@ class CriteriaController extends \BaseController
                     return Redirect::to('criteria')->withInput();
 
                 case 2:
-//                     Log::info(Input::all());
+                    //                     Log::info(Input::all());
                     return Redirect::to('school-criteria')->withInput();
 
                 case 3:
@@ -630,9 +635,9 @@ class CriteriaController extends \BaseController
                 }*/
 
 
-                foreach ($clean_input['program_id'] as $program_id) {
-                    DB::insert("insert into `program_criterion` (`criterion_id`, `program_id`) values({$criterionId},{$program_id})");
-                }
+                //foreach ($clean_input['program_id'] as $program_id) {
+                //    DB::insert("insert into `program_criterion` (`criterion_id`, `program_id`) values({$criterionId},{$program_id})");
+                //}
 
                 Session::flash('status', 'success');
                 Session::flash('message', 'Criterion created: "' . $criterion->name . '".');
@@ -873,7 +878,7 @@ class CriteriaController extends \BaseController
                 $criterionId = $criterion->id;
                 DB::table('criterion_objective_outcome as cobo')
                     ->join('program_criterion_objective_outcome as poco', 'poco.cri_obj_out_id', '=', 'cobo.id')
-                    ->where($criterionId)
+                    ->where('cobo.criterion_id', $criterionId)
                     ->delete();
                 // DB::delete("delete from `criterion_objective_outcome` where `criterion_id` ={$criterionId}");
                 DB::delete("delete from `program_criterion` where `criterion_id` ={$criterionId}");
@@ -964,9 +969,9 @@ class CriteriaController extends \BaseController
 
                         break;
                 }*/
-                foreach ($clean_input['program_id'] as $program_id) {
-                    DB::insert("insert into `program_criterion` (`criterion_id`, `program_id`) values({$criterionId},{$program_id})");
-                }
+                //foreach ($clean_input['program_id'] as $program_id) {
+                //    DB::insert("insert into `program_criterion` (`criterion_id`, `program_id`) values({$criterionId},{$program_id})");
+                //}
 
 
 

app/controllers/Objective2Controller.php

@@ -660,9 +660,9 @@ class Objective2Controller extends \BaseController
 				if ($clean_input['agreement']) {
 					DB::table('criterion_objective_outcome')
 						//QUE PONEMOS CORRADA
-						//->join('program_criterion_objective_outcome', 'criterion_objective_outcome.id', "=", 'program_criterion_objective_outcome.cri_obj_out_id')
+						->join('program_criterion_objective_outcome', 'criterion_objective_outcome.id', "=", 'program_criterion_objective_outcome.cri_obj_out_id')
 
-						->join('program_criterion', 'criterion_objective_outcome.criterion_id', "=", 'program_criterion.criterion_id')
+						//->join('program_criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', "=", 'program_criterion_objective_outcome.criterion_id')
 						->whereIn('program_id', $clean_input['program_id'])
 						->whereIn('outcome_id', $clean_input['outcome_id'])
 						->where('objective_id', '=', 0)

app/controllers/ObjectivesController.php

@@ -242,8 +242,8 @@ class ObjectivesController extends \BaseController
     }
 
     $criteria_scales = DB::table('criteria')
-      ->join('criterion_objective_outcome as cobo', 'criterion_id', '=', 'criteria.id')
-      ->join('program_criterion', 'cobo.criterion_id', '=', 'program_criterion.criterion_id')
+      ->join('criterion_objective_outcome as cobo', 'cobo.criterion_id', '=', 'criteria.id')
+      ->join('program_criterion_objective_outcome as poco', 'cobo.id', '=', 'poco.cri_obj_out_id')
       ->whereIn('program_id', $program_ids)
       ->where('objective_id', $objective->id)
       ->select('num_scales')
@@ -255,7 +255,7 @@ class ObjectivesController extends \BaseController
 
       $objective->criteria[$num_scales] = DB::table('criteria')
         ->join('criterion_objective_outcome as cobo', 'cobo.criterion_id', '=', 'criteria.id')
-        ->join('program_criterion', 'program_criterion.criterion_id', '=', 'criteria.id')
+        ->join('program_criterion_objective_outcome as poco', 'cobo.id', '=', 'poco.cri_obj_out_id')
         ->whereIn('program_id', $program_ids)
         ->where('objective_id', $objective->id)
         ->where('num_scales', $num_scales)
@@ -265,8 +265,13 @@ class ObjectivesController extends \BaseController
 
       foreach ($objective->criteria[$num_scales] as $criteria) {
         $criteria->programs = DB::table('programs')
-          ->join('program_criterion', 'programs.id', '=', 'program_criterion.program_id')
+          ->join('program_criterion_objective_outcome as poco', 'poco.program_id', '=', 'programs.id')
+          ->join('criterion_objective_outcome as cobo', 'cobo.id', '=', 'poco.cri_obj_out_id')
+
+
           ->where('criterion_id', $criteria->criterion_id)
+          ->select("programs.*")
+          ->distinct()
           ->get();
 
         $criteria->outcomes = DB::table('outcomes')
@@ -289,4 +294,4 @@ class ObjectivesController extends \BaseController
       'objective' => $objective
     );
   }
-}
+}

app/controllers/OutcomesController.php

@@ -14,7 +14,7 @@ class OutcomesController extends \BaseController
     {
         $title = "Learning Outcomes";
         $outcomes = Outcome::withTrashed()->orderBy('id', 'ASC')->get();
-//         $outcomes = Outcome::withTrashed()->orderBy('name', 'ASC')->get();
+        //         $outcomes = Outcome::withTrashed()->orderBy('name', 'ASC')->get();
         $schools = School::orderBy('name', 'ASC')->get();
         // $semesters_ids = Session::get('semesters_ids');
         // $semesters = Semester::whereIn('id',$semesters_ids)->get();
@@ -343,28 +343,26 @@ class OutcomesController extends \BaseController
     public function delete()
     {
         $outcomeArray = json_decode(Input::get('outcomeArray'), true);
-// 		Log::info("delete".json_encode($outcomeArray));
-		$outcome = Outcome::withTrashed()
-			->where('id', '=', $outcomeArray['id'])
-			->firstOrFail();
-// 		Log::info("delete2".json_encode($outcome));
-		$outcome->forceDelete();
-// 		Log::info("sal".json_encode($sal));
-// 		if($sal)
-		{
-			Session::flash('status', 'success');
-			Session::flash('message', 'Learning Outcome deleted.');
-			
-		}
-
-	}
-    
+        // 		Log::info("delete".json_encode($outcomeArray));
+        $outcome = Outcome::withTrashed()
+            ->where('id', '=', $outcomeArray['id'])
+            ->firstOrFail();
+        // 		Log::info("delete2".json_encode($outcome));
+        $outcome->forceDelete();
+        // 		Log::info("sal".json_encode($sal));
+        // 		if($sal)
+        {
+            Session::flash('status', 'success');
+            Session::flash('message', 'Learning Outcome deleted.');
+        }
+    }
+
     public function updateMore()
     {
         $outcomeArray = json_decode(Input::get('outcomeArray'), true);
         Session::flash('status', 'success');
         Session::flash('message', 'Learning Outcomes updated.');
-		Log::info("Ahora1".json_encode($outcomeArray));
+        Log::info("Ahora1" . json_encode($outcomeArray));
 
         foreach ($outcomeArray as $outcomeObject) {
 
@@ -375,9 +373,9 @@ class OutcomesController extends \BaseController
                     'definition' => $outcomeObject['definition'],
                     'expected_outcome' => $outcomeObject['expected_outcome'],
                     'activation_date' => $outcomeObject['activation_date'],
-//                     'deactivation_date' => (isset($outcomeObject['deactivation_date'])?$outcomeObject['deactivation_date']:NULL),
+                    //                     'deactivation_date' => (isset($outcomeObject['deactivation_date'])?$outcomeObject['deactivation_date']:NULL),
                     'level' => $outcomeObject['level'],
-//                     'new_outcome_id'=>$outcomeObject['new_outcome_id']
+                    //                     'new_outcome_id'=>$outcomeObject['new_outcome_id']
                     // TODO- validar los otros 3 valores
                 ),
                 array(
@@ -385,9 +383,9 @@ class OutcomesController extends \BaseController
                     'definition' => 'required',
                     'expected_outcome' => 'required|numeric',
                     'activation_date' => 'required|date',
-//                     'deactivation_date' => 'sometimes|required|date',
+                    //                     'deactivation_date' => 'sometimes|required|date',
                     'level' => 'required|numeric'
-//                     'new_outcome_id' => 'required|numeric'
+                    //                     'new_outcome_id' => 'required|numeric'
                     // TODO- los requisitos de los otros 3 valores
                 )
             );
@@ -401,18 +399,15 @@ class OutcomesController extends \BaseController
                     $outcome->definition = $outcomeObject['definition'];
                     $outcome->expected_outcome = $outcomeObject['expected_outcome'];
                     $outcome->activation_date = $outcomeObject['activation_date'];
-                    if($outcomeObject['deactivation_date']!="")
-                    {
-                    	$outcome->deactivation_date = $outcomeObject['deactivation_date'];
-	                    if(isset($outcomeObject['new_outcome_id']))$outcome->new_outcome_id = $outcomeObject['new_outcome_id'];
-                    }
-                    else 
-                    {
-                    	$outcome->deactivation_date = NULL;
-                    	$outcome->new_outcome_id=NULL;
+                    if ($outcomeObject['deactivation_date'] != "") {
+                        $outcome->deactivation_date = $outcomeObject['deactivation_date'];
+                        if (isset($outcomeObject['new_outcome_id'])) $outcome->new_outcome_id = $outcomeObject['new_outcome_id'];
+                    } else {
+                        $outcome->deactivation_date = NULL;
+                        $outcome->new_outcome_id = NULL;
                     }
                     $outcome->level = $outcomeObject['level'];
-		Log::info("Ahora2".json_encode($outcome));
+                    Log::info("Ahora2" . json_encode($outcome));
 
                     $outcome->save();
 
@@ -448,22 +443,24 @@ class OutcomesController extends \BaseController
 
     public function fetchCriteria()
     {
-        // 		var_dump((Input::get('filter')));
-        // 		exit();
+        $criteria_not_available = DB::table('criterion_objective_outcome')
+            ->where('objective_id', '=', 0)
+            ->lists('criterion_id');
+        $criteria = DB::table('criteria')
+            ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id');
         if (Input::get('filter')) {
             switch (Input::get('filter')) {
                 case 'all':
-                    $criteria = DB::table('criteria')
+                    /*$criteria = DB::table('criteria')
                         ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
                         ->where('criterion_objective_outcome.outcome_id', '=', Input::get('outcome_id'))
                         ->where('criterion_objective_outcome.objective_id', '=', Input::get('objective_id'))
                         ->where('criteria.num_scales', '=', Input::get('num_scales'))
-                        ->where('criteria.max_score', '=', Input::get('maximum'))
-                        ->select('criterion_id as id', 'name')
-                        ->orderBy('name', 'ASC')
-                        ->get();
+                        ->where('criteria.max_score', '=', Input::get('maximum'))*/
+
 
-                    foreach ($criteria as $criterion) {
+
+                    /*foreach ($criteria as $criterion) {
                         $criterion->program_ids = json_encode(DB::table('program_criterion')
                             ->where('criterion_id', $criterion->id)
                             ->lists('program_id'));
@@ -475,6 +472,7 @@ class OutcomesController extends \BaseController
                             ->lists('text');
                     }
                     return $criteria;
+                    break;*/
                     break;
 
                 case 'school':
@@ -483,17 +481,15 @@ class OutcomesController extends \BaseController
 
                         // Fetch all the programs whose school is the user's
                         $program_ids = DB::table('programs')->where('school_id', Auth::user()->school_id)->lists('id');
-                        $criteria = DB::table('criteria')
-                            ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
-                            ->join('program_criterion', 'program_criterion.criterion_id', '=', 'criteria.id')
-                            ->where('criterion_objective_outcome.outcome_id', '=', Input::get('outcome_id'))
-                            ->where('criterion_objective_outcome.objective_id', '=', Input::get('objective_id'))
-                            ->where('criteria.num_scales', '=', Input::get('num_scales'))
-                            ->where('criteria.max_score', '=', Input::get('maximum'))
-                            ->whereIn('program_criterion.program_id', $program_ids)
-                            ->select('criterion_id as id', 'name')
-                            ->orderBy('name', 'ASC')
-                            ->get();
+                    } else {
+                        $program_ids = DB::table('programs')->where('school_id', Auth::user()->programs[0]->school->id)->lists('id');
+                    }
+                    $criteria = $criteria
+                        ->join('program_criterion_objective_outcome as poco', 'poco.cri_obj_out_id', '=', 'criterion_objective_outcome.id')
+
+                        ->whereIn('poco.program_id', $program_ids);
+
+                    /*
                         foreach ($criteria as $criterion) {
                             $criterion->program_ids = json_encode(DB::table('program_criterion')
                                 ->where('criterion_id', $criterion->id)
@@ -506,57 +502,21 @@ class OutcomesController extends \BaseController
                                 ->lists('text'));
                         }
                         // Return all criteria belonging to any of those programs
-                        return $criteria;
-                    }
+                        return $criteria;*/
 
-                    // If pcoord
-                    else {
 
-                        // Fetch all the programs from the user's school;
-                        // Fetch all the programs from the user's school;
-                        $program_ids = DB::table('programs')->where('school_id', Auth::user()->programs[0]->school->id)->lists('id');
 
-                        $criteria = DB::table('criteria')
-                            ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
-                            ->join('program_criterion', 'program_criterion.criterion_id', '=', 'criteria.id')
-                            ->where('criterion_objective_outcome.outcome_id', '=', Input::get('outcome_id'))
-                            ->where('criterion_objective_outcome.objective_id', '=', Input::get('objective_id'))
-                            ->where('criteria.num_scales', '=', Input::get('num_scales'))
-                            ->where('criteria.max_score', '=', Input::get('maximum'))
-                            ->whereIn('program_criterion.program_id', $program_ids)
-                            ->select('criterion_id as id', 'name')
-                            ->orderBy('name', 'ASC')
-                            ->get();
 
-                        foreach ($criteria as $criterion) {
-                            $criterion->program_ids = json_encode(DB::table('program_criterion')
-                                ->where('criterion_id', $criterion->id)
-                                ->lists('program_id'));
-                            $criterion->objectives = json_encode(DB::table('criterion_objective_outcome')
-                                ->join('objectives', 'objectives.id', '=', 'criterion_objective_outcome.objective_id')
-                                ->where('criterion_id', $criterion->id)
-                                ->select('objectives.*')
-                                ->distinct()
-                                ->lists('text'));
-                        }
-                        return $criteria;
-                    }
 
                     break;
 
                 case 'program':
-                    $criteria = DB::table('criteria')
-                        ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
-                        ->join('program_criterion', 'program_criterion.criterion_id', '=', 'criteria.id')
-                        ->where('criterion_objective_outcome.outcome_id', '=', Input::get('outcome_id'))
-                        ->where('criterion_objective_outcome.objective_id', '=', Input::get('objective_id'))
-                        ->where('criteria.num_scales', '=', Input::get('num_scales'))
-                        ->where('criteria.max_score', '=', Input::get('maximum'))
-                        ->whereIn('program_criterion.program_id', Auth::user()->programs->lists('id'))
-                        ->select('criterion_id as id', 'name')
-                        ->orderBy('name', 'ASC')
-                        ->get();
-                    foreach ($criteria as $criterion) {
+
+                    $criteria = $criteria
+                        ->join('program_criterion_objective_outcome as poco', 'poco.cri_obj_out_id', '=', 'criterion_objective_outcome.id')
+
+                        ->whereIn('poco.program_id', Auth::user()->programs->lists('id'));
+                    /*foreach ($criteria as $criterion) {
                         $criterion->program_ids = json_encode(DB::table('program_criterion')
                             ->where('criterion_id', $criterion->id)
                             ->lists('program_id'));
@@ -567,21 +527,13 @@ class OutcomesController extends \BaseController
                             ->distinct()
                             ->lists('text'));
                     }
-                    return $criteria;
+                    return $criteria;*/
                     break;
 
                 default:
-                    $criteria = DB::table('criteria')
-                        ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
-                        ->where('criterion_objective_outcome.outcome_id', '=', Input::get('outcome_id'))
-                        ->where('criterion_objective_outcome.objective_id', '=', Input::get('objective_id'))
-                        ->where('criteria.num_scales', '=', Input::get('num_scales'))
-                        ->where('criteria.max_score', '=', Input::get('maximum'))
-                        ->select('criterion_id as id', 'name')
-                        ->orderBy('name', 'ASC')
-                        ->get();
 
-                    foreach ($criteria as $criterion) {
+
+                    /*foreach ($criteria as $criterion) {
                         $criterion->program_ids = json_encode(DB::table('program_criterion')
                             ->where('criterion_id', $criterion->id)
                             ->lists('program_id'));
@@ -592,33 +544,21 @@ class OutcomesController extends \BaseController
                             ->distinct()
                             ->lists('text'));
                     }
-                    return $criteria;
+                    return $criteria;*/
                     break;
             }
-        } else {
-            $criteria = DB::table('criteria')
-                ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
-                ->where('criterion_objective_outcome.outcome_id', '=', Input::get('outcome_id'))
-                ->where('criterion_objective_outcome.objective_id', '=', Input::get('objective_id'))
-                ->where('criteria.num_scales', '=', Input::get('num_scales'))
-                ->where('criteria.max_score', '=', Input::get('maximum'))
-                ->select('criterion_id as id', 'name')
-                ->orderBy('name', 'ASC')
-                ->get();
-
-            foreach ($criteria as $criterion) {
-                $criterion->program_ids = json_encode(DB::table('program_criterion')
-                    ->where('criterion_id', $criterion->id)
-                    ->lists('program_id'));
-                $criterion->objectives = json_encode(DB::table('criterion_objective_outcome')
-                    ->join('objectives', 'objectives.id', '=', 'criterion_objective_outcome.objective_id')
-                    ->where('criterion_id', $criterion->id)
-                    ->select('objectives.*')
-                    ->distinct()
-                    ->lists('text'));
-            }
-            return $criteria;
         }
+
+        $criteria = $criteria
+            ->where('criterion_objective_outcome.outcome_id', '=', Input::get('outcome_id'))
+            ->where('criterion_objective_outcome.objective_id', '=', Input::get('objective_id'))
+            ->where('criteria.num_scales', '=', Input::get('num_scales'))
+            ->where('criteria.max_score', '=', Input::get('maximum'))
+            ->whereNotIn('criteria.id', $criteria_not_available)
+            ->select('criterion_id as id', 'name')
+            ->orderBy('name', 'ASC')
+            ->get();
+        return $criteria;
     }
 
     /**
@@ -715,7 +655,7 @@ class OutcomesController extends \BaseController
         $diferent_levels = DB::table('criterion_objective_outcome')
             ->join('criteria', 'criteria.id', '=', 'criterion_objective_outcome.criterion_id')
             // GASP, añadí programa, para que solo muestre niveles de criterios del programa
-            ->join('program_criterion', 'criteria.id', '=', 'program_criterion.criterion_id')
+            ->join('program_criterion_objective_outcome', 'criterion_objective_outcome.id', '=', 'program_criterion_objective_outcome.cri_obj_out_id')
             ->whereIn('program_id', $program_ids)
             ->where('criterion_objective_outcome.outcome_id', $id)
             ->distinct('criteria.num_scales')
@@ -739,8 +679,8 @@ class OutcomesController extends \BaseController
             //                 ->get();
             $outcome_criterias = DB::table('criterion_objective_outcome')
                 ->join('criteria', 'criteria.id', '=', 'criterion_objective_outcome.criterion_id')
-                ->join('program_criterion', 'program_criterion.criterion_id', '=', 'criteria.id')
-                ->whereIn('program_criterion.program_id', $program_ids)
+                ->join('program_criterion_objective_outcome', 'criterion_objective_outcome.id', '=', 'program_criterion_objective_outcome.cri_obj_out_id')
+                ->whereIn('program_criterion_objective_outcome.program_id', $program_ids)
                 ->where('criterion_objective_outcome.outcome_id', $id)
                 ->where('criteria.num_scales', $level)
                 ->select('criteria.id', 'criteria.name', 'criteria.deleted_at')
@@ -753,10 +693,14 @@ class OutcomesController extends \BaseController
                 $scales = DB::select("select * FROM scales INNER join `criterion_scale` on `criterion_scale`.`scale_id` = `scales`.`id` where criterion_scale.criterion_id ={$criteria_id->id} ORDER BY position");
 
                 $programs = DB::table('programs')
-                    ->join('program_criterion', 'program_criterion.program_id', '=', 'programs.id')
+                    ->join('program_criterion_objective_outcome', 'programs.id', '=', 'program_criterion_objective_outcome.program_id')
+                    ->join('criterion_objective_outcome as cobo', 'cobo.id', '=', 'program_criterion_objective_outcome.cri_obj_out_id')
+                    //->join('program_criterion', 'program_criterion.program_id', '=', 'programs.id')
                     ->where('criterion_id', $criteria_id->id)
+                    ->select('programs.*')
+                    ->distinct()
                     ->lists('programs.name');
-                Log::info($scales);
+                // Log::info($scales);
 
                 /* $scales =
                     DB::select(

app/controllers/ProgramsController.php

@@ -282,9 +282,9 @@ class ProgramsController extends \BaseController
       $domains = DB::table('outcomes')
         ->join('criterion_objective_outcome as cobo', 'cobo.outcome_id', '=', 'outcomes.id')
         ->join('criteria', 'criteria.id', '=', 'cobo.criterion_id')
-        ->join('program_criterion', 'criteria.id', '=', 'program_criterion.criterion_id')
-        ->join('courses', 'courses.program_id', '=', 'program_criterion.program_id')
-        ->where('program_criterion.program_id', $program->id)
+        ->join('program_criterion_objective_outcome', 'cobo.id', '=', 'program_criterion_objective_outcome.cri_obj_out_id')
+        ->join('courses', 'courses.program_id', '=', 'program_criterion_objective_outcome.program_id')
+        ->where('program_criterion_objective_outcome.program_id', $program->id)
         ->select('outcomes.name', 'outcomes.activation_date')
         ->distinct()
         ->orderBy('outcomes.name', 'asc')
@@ -306,9 +306,9 @@ class ProgramsController extends \BaseController
       $courses_used =  DB::table('outcomes')
         ->join('criterion_objective_outcome as cobo', 'cobo.outcome_id', '=', 'outcomes.id')
         ->join('criteria', 'criteria.id', '=', 'cobo.criterion_id')
-        ->join('program_criterion', 'criteria.id', '=', 'program_criterion.criterion_id')
-        ->join('courses', 'courses.program_id', '=', 'program_criterion.program_id')
-        ->where('program_criterion.program_id', $program->id)
+        ->join('program_criterion_objective_outcome', 'cobo.id', '=', 'program_criterion_objective_outcome.cri_obj_out_id')
+        ->join('courses', 'courses.program_id', '=', 'program_criterion_objective_outcome.program_id')
+        ->where('program_criterion_objective_outcome.program_id', $program->id)
         ->select('courses.number', 'outcomes.name as domain_name', 'courses.code')
         ->distinct()
         ->orderBy('courses.name', 'asc')
@@ -328,14 +328,14 @@ class ProgramsController extends \BaseController
       $transformative_actions = DB::table('outcomes')
         ->join('criterion_objective_outcome as cobo', 'cobo.outcome_id', '=', 'outcomes.id')
         ->join('criteria', 'criteria.id', '=', 'cobo.criterion_id')
-        ->join('program_criterion', 'criteria.id', '=', 'program_criterion.criterion_id')
-        ->join('courses', 'courses.program_id', '=', 'program_criterion.program_id')
+        ->join('program_criterion_objective_outcome', 'cobo.id', '=', 'program_criterion_objective_outcome.cri_obj_out_id')
+        ->join('courses', 'courses.program_id', '=', 'program_criterion_objective_outcome.program_id')
 
         ->join('activities', 'activities.course_id', '=', 'courses.id')
         ->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
         ->join('transformative_activity_criterion as taa', 'taa.activity_criterion_id', '=', 'activity_criterion.id')
         ->join('transformative_actions', 'transformative_actions.id', '=', 'taa.trans_action_id')
-        ->where('program_criterion.program_id', $program->id)
+        ->where('program_criterion_objective_outcome.program_id', $program->id)
         ->select('transformative_actions.description', 'outcomes.name as domain_name')
         ->distinct()
         ->orderBy('transformative_actions.description', 'asc')

app/controllers/TemplatesController.php

@@ -252,6 +252,8 @@ class TemplatesController extends \BaseController
 		// 			Log::info("aqui".(count($criteria)));
 		// 			Log::info(json_encode(count($criteria)));
 
+
+
 		$templates = Template::where('school_id', '=', $school_id_user)->orWhere('school_id', '=', NULL)
 			->orderBy('name', 'ASC')->get();
 		$criteria_ids = array();
@@ -274,6 +276,22 @@ class TemplatesController extends \BaseController
 		$templates_dentro = Template::whereNotIn('id', $templates_fuera_ids)
 			->orderBy('name', 'ASC')->get();
 
+		/*$templates_dentro = Template::join('template_criterion', 'template_criterion.template_id', '=', 'templates.id')
+			->join('criterion_objective_outcome as cobo', 'cobo.criterion_id', '=', 'template_criterion.criterion_id')
+			->where('objective_id', '<>', '0')
+
+			->where(function ($query) use ($school_id_user) {
+				$query->where('school_id', $school_id_user)
+					->orWhere('school_id', '=', NULL);
+			})
+
+			//			->orWhere('school_id', '=', NULL)
+
+			->orderBy('name', 'ASC')
+			->groupBy('templates.id')
+			->select("templates.*")
+			->get();*/
+
 		// 			if(!isset($templates_dentro))$templates_dentro=
 
 		// 			var_dump(json_encode($templates_dentro));
@@ -296,7 +314,7 @@ class TemplatesController extends \BaseController
 				return "NO pa";
 			}
 
-			$crit->all_objectives = Objective::join("criterion_objective_outcome", 'objectives.id', '=', 'criterion_objective_outcome.objective_id')
+			$crit->all_objectives = DB::table("objectives")->join("criterion_objective_outcome", 'objectives.id', '=', 'criterion_objective_outcome.objective_id')
 				->where('criterion_id', $crit->id)
 				->select('objectives.*')
 				->groupBy('objectives.id')
@@ -452,9 +470,12 @@ class TemplatesController extends \BaseController
 				->orderBy('position', 'ASC')
 				->get();
 
-			$temp_crit->program_ids = json_encode(DB::table('program_criterion')
-				->where('criterion_id', $temp_crit->id)
-				->lists('program_id'));
+			$temp_crit->program_ids = json_encode(DB::table('program_criterion_objective_outcome')
+				->join('criterion_objective_outcome', 'criterion_objective_outcome.id', '=', 'program_criterion_objective_outcome.cri_obj_out_id')
+				->where('criterion_objective_outcome.criterion_id', $temp_crit->id)
+				->select('program_criterion_objective_outcome.program_id')
+				->distinct()
+				->lists('program_criterion_objective_outcome.program_id'));
 
 			Log::info("ee" . json_encode($temp_crit->program_ids));
 

app/controllers/ThreeYearPlanController.php

@@ -321,8 +321,8 @@ class ThreeYearPlanController extends \BaseController
     $program_id = Input::get('program_id');
 
     // get program_id
-    $user_id = auth::user()->id;
-    Log::info(Input::all());
+    //$user_id = auth::user()->id;
+    //Log::info(Input::all());
 
     // get typ_program_id
     $result = DB::table('typ_program')
@@ -1070,4 +1070,90 @@ class ThreeYearPlanController extends \BaseController
       return $pdf->stream(basename($queryToPath->path_to_pdf));
   }
   */
+
+  ///////////////////
+  //
+  //Pair everything
+  //
+  ////////////////////
+
+  public function pairEveryObjective()
+  {
+    Log::info(Input::all());
+    $selected_objectives = Input::get('selected_objectives');
+    $typ_id = Input::get('typ_id');
+    $program_id = Input::get('program_id');
+    for ($i = 0; $i < count($selected_objectives); $i += 3) {
+      Input::replace([
+        'program_id' => $program_id,
+        'new_objective_id' => $selected_objectives[$i + 2],
+        'outcome_id' => $selected_objectives[$i],
+        'semester_id' => $selected_objectives[$i + 1],
+        'typ_id' => $typ_id,
+        'previous_objective_id' => 'nothing_selected'
+
+
+      ]);
+      if ($this->section2_on_change() != 'update was succes')
+        return 0;
+    }
+    return 200;
+  }
+
+  public function pairEveryCourse()
+  {
+    Log::info(Input::all());
+    $typ_id = Input::get('typ_id');
+    $program_id = Input::get('program_id');
+    $pairing_array = Input::get('pairing_array');
+    $type_of_work = Input::get("type_of_work");
+
+    //$typ_id = Input::get('typ_id');
+    //$outcome_id = Input::get('outcome_id');
+    //$semester_id = Input::get('semester_id');
+    //$objective_id = Input::get('objective_id');
+    //$previous_course_id = Input::get('previous_course_id');
+    //$new_course_id = Input::get('new_course_id');
+
+    // get program_id
+    //$program_id = Input::get('program_id');
+
+
+    if ($type_of_work == 'este_semestre') {
+      foreach ($pairing_array as $course_array) {
+        Input::replace([
+          'outcome_id' => $course_array[0],
+          'semester_id' => $course_array[1],
+          'objective_id' => $course_array[2],
+          'new_course_id' => $course_array[3],
+          'typ_id' => $typ_id,
+          'previous_course_id' => 'nothing_selected',
+          'program_id' => $program_id,
+
+
+        ]);
+        if ($this->section3_on_change() != 'update succes?')
+          return 0;
+      }
+    } else {
+      foreach ($pairing_array as $semester_array) {
+        foreach ($semester_array as $course_array) {
+          Input::replace([
+            'outcome_id' => $course_array[0],
+            'semester_id' => $course_array[1],
+            'objective_id' => $course_array[2],
+            'new_course_id' => $course_array[3],
+            'typ_id' => $typ_id,
+            'previous_course_id' => 'nothing_selected',
+            'program_id' => $program_id,
+
+
+          ]);
+          if ($this->section3_on_change() != 'update succes?')
+            return 0;
+        }
+      }
+    }
+    return 200;
+  }
 }

app/models/Criterion.php

@@ -39,13 +39,13 @@ class Criterion extends Eloquent
 	}
 
 
-	public function scopeFromProgram($query, $programs)
+	/*public function scopeFromProgram($query, $programs)
 	{
 
 		return $query->join('program_criterion', 'program_criterion.criterion_id', '=', 'criteria.id')
 			->whereIn("program_id", "programs")
 			->select('criteria.*');
-	}
+	}*/
 
 	/**
 	 * Return the program that the criterion belongs to

app/routes.php

@@ -246,6 +246,15 @@ Route::group(array('before' => 'auth|has_access'), function () {
     Route::get("downloadThreeYearPlanPDF/{path_id}", "ThreeYearPlanController@showHTML");
     Route::get("findHTMLlinksTYP/{path_id}", 'ThreeYearPlanController@findHTML');
 
+    /////////////////////////////////////////
+    // 
+    //  pairing everything in three year
+    //
+    /////////////////////////////////////////
+
+
+    Route::post('pairEveryObjective', "ThreeYearPlanController@pairEveryObjective");
+    Route::post('pairEveryCourse', "ThreeYearPlanController@pairEveryCourse");
     //View annual plans and report
 
     Route::get('{annual_report_or_plan}/show/{program_id}', "AnnualPlansController@annualPlansShow");

app/views/global/view-three-year-plan.blade.php

@@ -252,16 +252,19 @@
                                 <div class="select-course-selection-0" style="margin-left:30px;">
                                     <div class="objective-selector-0">
                                         <label for="">OBJECTIVE TEMP</label>
-                                        <select class="select-0" name="" style="width:100%;max-width:55%;">
+                                        <select class="select-0"  name="" style="width:100%;max-width:55%;">
                                             <option class="default-option" value="nothing_selected">Select a course</option>
                                         </select>
                                         <button class="btn btn-md btn-primary delete-selection-0"
                                             style="margin:5px; "><span></span> X</button>
                                     </div>
                                     <div class="clone-objective-course-select-0">
+                                        <div class = 'btn-group'>
                                         <button class="btn btn-md btn-secondary add-objective-course"
                                             style="margin:5px;"><span class="glyphicon glyphicon-plus"></span> Choose more
                                             Courses</button>
+                                        <button class = 'btn btn-md btn-secondary copy-objective-button'  onclick="showParingObjectiveModal(this)" style="margin:5px;">Copy Courses to each Objective</button>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
@@ -326,9 +329,206 @@
                 </div>
             </div>
         </div>
+        <div id="pairingModal" class="modal fade" tabindex="-1" data-criterion-id="0">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header" >
+                        <h5 class="modal-title" id = "pairingModalTitle">Would you like to pair this </h5>
+                        <button type="button" class="close" data-dismiss="modal">&times;</button>
+                    </div>
+                    <div class="modal-body"  id = 'pairingModalBody'>
+                    
+
+                    </div>
+                    <div class="modal-footer">
+                       
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal" >cancel</button>
+                        <button type="button" id='pairingModalSubmitButton' class="btn btn-primary" data-dismiss="modal" onclick = 'pairEverything()' >Ok</button>
+                        
+                    </div>
+                </div>
+            </div>
+        </div>
 
     </div>
+
     <script>
+
+        function fetchPairingArraysForCourses(select_semester_selector, out_sem_obj_course_array, course_ids, outcome_id){
+
+            dict_to_send = {};
+            //always the same
+            
+
+            
+
+            dict_to_send['este_semestre']=  returnArrayReadyPerSelector(select_semester_selector, outcome_id, course_ids);
+
+            //array_por_semestre = [];
+            dict_to_send['por_semestre'] =[];
+
+
+            select_semester_selector.parent().children('.semester-course-selection').each(function(ind, div){
+                dict_to_send['por_semestre'].push(returnArrayReadyPerSelector(div, outcome_id, course_ids));
+            });
+
+            //dict_to_send['por_semestre'] = array_por_semestre;
+            return JSON.stringify(dict_to_send) ;
+
+        }
+        function returnArrayReadyPerSelector(selector, outcome_id, course_ids){
+                array_to_return =[];
+                semester_id = $(selector).data('semester-id');
+                $(selector).children("div.select-course-selection").each(function(ind, div){
+                    var objective_id = $(div).data('objective-id');
+                    $.each(course_ids, function(ind, course_id){
+                        array_to_return.push([outcome_id,semester_id,objective_id, course_id ])
+                    })
+                });
+            
+                return array_to_return;
+            }
+  
+        
+
+        function showParingObjectiveModal(button){
+            modal = "#pairingModal"
+
+            
+
+ 
+            is_obj = false;
+            if($(button).html()=="Copy Courses to each Objective"){
+                $(modal+'Title').html("Would you like to pair these Courses to each Objective in this Outcome");
+                $(modal+'Body').html(
+                "<label> Please select if you would like to pair these courses on this semester only or on each semester of this Outcome</label>"
+                );
+                select_semester = $("<select>",{
+                    'class':'selectpicker form-control',
+                    'id':'selectPorSemestre'
+                });
+                option = $("<option>", {
+                    'value': 'por_semestre'
+                }).html("For each Semester and Objective in this Outcome")
+
+                select_semester.append(option);
+                option = $("<option>", {
+                    'value': 'este_semestre'
+                }).html("For each Objective in this Semester and Outcome");
+                select_semester.append(option);
+                
+                $(modal+'Body').append(select_semester);
+                $('.selectpicker').selectpicker('refresh');
+               
+                }
+            else{
+                $(modal+'Title').html("Would you like to pair these Objective to each Semester in this Outcome");
+                $(modal+'Body').html("This action will pair these Objectives to each Semester of this Outcome.<br> This action is reversable")
+
+                is_obj = true;
+
+            }
+            select_course_selector = $(button).parent().parent().parent();
+            objective_selectors= select_course_selector.find("div:not([style*='display: none'])");
+            selects = objective_selectors.find('select');
+            
+
+            array_to_send = [];
+
+            var semester_id;
+            var outcome_id;
+            var objectives_ids = [];
+            var course_ids = [];
+            $.each(selects, function(ind, select){
+                splited = $(select).val().split('-');
+                semester_id = splited[1];
+                outcome_id = splited[0];
+                objectives_ids.push(splited[2]);
+                if(!is_obj){
+                    course_ids.push(splited[3]);
+                }
+
+                array_to_send.push(splited);
+            })
+
+            if(!is_obj){
+
+                two_possible_arrays = fetchPairingArraysForCourses(select_course_selector.parent(), array_to_send, course_ids, outcome_id);
+
+
+            }
+
+            else{
+                whole_outcome_div = select_course_selector.parent().parent();
+            whole_outcome_div.children('div.semester-course-selection').each(function(ind, div){
+                if($(div).data('semester-id')== semester_id){
+                    return;
+                }
+                
+                    div_semester = $(div).data('semester-id');
+                $.each(objectives_ids, function(ind, obj){
+                    array_to_send.push([outcome_id, div_semester, obj]);
+                })
+                
+                
+            })
+
+            }
+
+            if($(button).html()=="Copy Courses to each Objective"){
+                $(modal+"SubmitButton").attr('onclick', 'pairEveryCourse('+two_possible_arrays+')');
+       
+            }
+            else{
+                $(modal+"SubmitButton").attr('onclick', 'pairEveryObjective(['+array_to_send.toString()+'])')
+       
+            }
+
+            
+
+
+            $(modal).modal('show');
+
+        }
+
+        function pairEveryCourse(two_possible_arrays){
+           // two_possible_arrays = JSON.parse(two_possible_arrays);
+
+            pair_array = two_possible_arrays[$('#selectPorSemestre').val()];
+
+            var typ_id = $('#table-cycles').data('typ-id');
+            $.post(
+                "{{URL::action('ThreeYearPlanController@pairEveryCourse')}}", {
+                    pairing_array:pair_array,
+                    typ_id:typ_id,
+                    program_id:{{$program_id}},
+                    type_of_work: $('#selectPorSemestre').val()
+                },
+                function(data){
+                    if(data==200)
+                    $(".go-to-3").trigger('click');
+                }
+            )
+        }
+        function pairEveryObjective(selected_objectives){
+
+            var typ_id = $('#table-cycles').data('typ-id');
+            $.post(
+                "{{URL::action('ThreeYearPlanController@pairEveryObjective')}}",
+                {
+                    selected_objectives:selected_objectives,
+                    typ_id: typ_id,
+                    program_id:{{$program_id}}
+                },
+                function(data){
+                    if(data ==200){
+                        $(".go-to-2").trigger('click');
+                    }
+                   
+
+                }
+            )
+        }
         $(document).ready(function() {
             // --------------------------------------------------------------------------
             // Page load
@@ -656,6 +856,7 @@
             window.scrollTo(0, 0);
             $(".panel-body").hide();
             $("#section2").show();
+            
         });
 
 
@@ -716,6 +917,7 @@
 
                             var select_area = $('.semester-course-selection-0').clone(true);
                             select_area.attr('class', 'semester-course-selection');
+                            select_area.attr('data-semester-id', semester_id);
                             select_area.attr('style', ' ');
                             select_area.find('.semester-label-course-selection-0').html(
                                 semester_name + "'s Objectives");
@@ -725,6 +927,8 @@
                             select_area.find('.add-objective-course').html(
                                 '<span class="glyphicon glyphicon-plus"></span> Choose more Objectives'
                             );
+                            select_area.find('.copy-objective-button').html('Copy Objectives to each Semester in Outcome');
+
 
                             if (semester.available_objectives.length != 0) {
                                 select_area.find('.objective-selector-0 label').hide();
@@ -807,16 +1011,17 @@
 
         // in section 2 and 3, add selects for choosing more objectives and courses, respectively
         $('.add-objective-course').on('click', function(e) {
-            var new_select = $(this).parent().parent().find('.objective-selector-0').clone(true);
+            var new_select = $(this).parent().parent().parent().find('.objective-selector-0').clone(true);
             new_select.attr('class', 'objective-selector');
             new_select.show();
             $(this).parent().before(new_select);
+            //$('.selectpicker').selectpicker('refresh')
         });
 
 
         // go to section 3
         $('.go-to-3').on('click', function(e) {
-            window.scrollTo(0, 0);
+            //window.scrollTo(0, 0);
             $(".panel-body").hide();;
             $("#section3").show();;
 
@@ -853,6 +1058,7 @@
 
                             var select_area = $('.semester-course-selection-0').clone(true);
                             select_area.attr('class', 'semester-course-selection');
+                            select_area.attr('data-semester-id', semester_id);
                             select_area.attr('style', ' ');
                             select_area.find('.semester-label-course-selection-0').html(
                                 semester_name);
@@ -864,6 +1070,7 @@
                                 var new_select = select_area.find(
                                     '.select-course-selection-0').clone(true);
                                 new_select.attr('class', 'select-course-selection');
+                                new_select.attr('data-objective-id', objective_id);
                                 new_select.find('label').html('');
                                 new_select.find('.objective-selector-0').before(
                                     '<p>Objective: <b>' + objective_text +
@@ -945,6 +1152,7 @@
                         $('.courses-section').append(area);
 
                     });
+                    //$('.selectpicker').selectpicker('refresh');
                     //$('.objective-selector').children('.delete-selection-0').css("margin:5px; display:block;");
                 }
             );