Merge branch 'Merge_gabriel_mayo' of https://git.ccom.uprrp.edu/CDCC/OLAS into Merge_gabriel_mayo

varios

app/config/app.php

@@ -15,8 +15,8 @@ return array(
 
 	//'debug' => $_ENV['APP_DEBUG'] ?: false,
 
-	//'debug' => true,
-	'debug' => false,
+	'debug' => true,
+	//'debug' => false,
 	/*
 	|--------------------------------------------------------------------------
 	| Application URL

app/controllers/AnnualPlansController.php

@@ -1506,4 +1506,62 @@ class AnnualPlansController extends \BaseController
     }
     return 200;
   }
+
+  function fetchOutcomesFromPlan()
+  {
+    $annual_plan = Input::get('annual_plan_id');
+    $annual_plan = AnnualPlan::where('id', $annual_plan)->first();
+
+    return $annual_plan->outcomes;
+  }
+  function fetchObjectivesFromPlan()
+  {
+    $program_id = Input::get('program_id');
+    $typ_semester_outcome_id = Input::get('typ_semester_outcome_id');
+
+    $outcome_id = Input::get('outcome_id');
+    $semester_id = Input::get("semester_id");
+    $outcome = Outcome::where('id', $outcome_id)
+      ->select('outcomes.*', DB::raw("{$semester_id} as semester_id, {$typ_semester_outcome_id} as typ_semester_outcome_id, {$program_id} as program_id"))
+      ->first();
+    Log::info(array($outcome));
+    return $outcome->annual_objectives;
+  }
+
+  function fetchSemestersFromPlan()
+  {
+    $annual_plan = Input::get('annual_plan_id');
+    $annual_plan = AnnualPlan::where('id', $annual_plan)->first();
+    return $annual_plan->semesters;
+  }
+
+  function fetchCoursesFromPlanForTemplate()
+  {
+    $annual_plan = Input::get('annual_plan_id');
+    $semester = Input::get('semester_id');
+    $annual_plan = AnnualPlan::select('annual_plans.*', DB::raw("{$semester} as for_template"))
+      ->where('id', $annual_plan)->first();
+    return $annual_plan->courses;
+  }
+  function fetchCriteriaFromPlan()
+  {
+    $course_id = Input::get('course_id');
+    $annual_plan_id = Input::get('annual_plan');
+    $max_score = Input::get('max_score');
+    $number_of_scales = Input::get('number_of_scales');
+
+    $criteria = DB::table('criteria')
+      ->join('annual_plan_objective', 'annual_plan_objective.criteria_id', '=', 'criteria.id')
+      ->join('typ_semester_courses', 'typ_semester_course_id', '=', 'typ_semester_courses.id')
+      ->where('typ_semester_courses.course_id', $course_id)
+      ->where('annual_plan_objective.annual_plan_id', $annual_plan_id)
+      ->where('criteria.max_score', $max_score)
+      ->where('criteria.num_scales', $number_of_scales)
+      ->groupBy('criteria.id')
+      ->select('criteria.*')
+      ->get();
+
+
+    return $criteria;
+  }
 }

app/controllers/AuthController.php

@@ -28,9 +28,9 @@ class AuthController extends \BaseController
 
 		if (!$validator->fails()) {
 			//			TODO: Remove this for production environment
-			//if (App::environment('local', 'staging')) {
-			//	return $this->processLogin();
-			//}
+			if (App::environment('local', 'staging')) {
+				return $this->processLogin();
+			}
 			try {
 				// User input
 				$username = str_replace('@upr.edu', '', Input::get('email'));

app/controllers/CriteriaController.php

@@ -206,33 +206,38 @@ class CriteriaController extends \BaseController
             $json['outcomes_assoc'][$outId] = DB::select("select name from outcomes where id = {$outId}");
             $json['objectives_assoc'][$outId] = DB::select("select objectives.id, objectives.text, outcomes.name from objectives, objective_outcome, outcomes where  objective_outcome.outcome_id ={$outId} and objective_outcome.objective_id = objectives.id and objectives.active=1 and outcomes.id = objective_outcome.outcome_id");
         }*/
+        $userRole = Auth::user()['role'];
+        switch ($userRole) {
+            case 1:
+                $program_ids = DB::table('programs')->lists('id');
+                break;
+            case 2:
+                $program_ids = DB::table('programs')
+                    ->where('school_id', Auth::user()->school_id)
+                    ->lists('id');
+                break;
+            case 3:
+            case 4:
+                $program_ids = DB::table('program_user')
+                    ->where('user_id', Auth::user()->id)
+                    ->lists('program_id');
+                break;
+        }
         $criteria_id = Input::get('id');
         $criterion =  DB::table('criteria')->where('id', Input::get('id'))->first();
         if (!$criterion) return $criterion;
         $criterion->outcomes = DB::table('criterion_objective_outcome')
             ->join('outcomes', 'outcomes.id', '=', 'criterion_objective_outcome.outcome_id')
+            ->join('program_criterion_objective_outcome as poco', 'poco.cri_obj_out_id', '=', 'criterion_objective_outcome.id')
+            ->whereIn("program_id", $program_ids)
             ->where('criterion_id', $criterion->id)
             ->select('outcomes.*')
             ->distinct()
             ->get();
-        $userRole = Auth::user()['role'];
+
 
         foreach ($criterion->outcomes as $outcome) {
-            switch ($userRole) {
-                case 1:
-                    $program_ids = DB::table('programs')->lists('id');
-                    break;
-                case 2:
-                    $program_ids = DB::table('programs')
-                        ->where('school_id', Auth::user()->school_id)
-                        ->lists('id');
-                    break;
-                case 3:
-                    $program_ids = DB::table('program_user')
-                        ->where('user_id', Auth::user()->id)
-                        ->lists('program_id');
-                    break;
-            }
+
             $outcome->assoc_objectives = DB::table('objective_outcome')
                 ->join('objectives', 'objectives.id', '=', 'objective_outcome.objective_id')
                 ->join('objective_program', 'objective_program.objective_id', '=', 'objectives.id')
@@ -242,10 +247,15 @@ class CriteriaController extends \BaseController
                 ->distinct()
                 ->get();
             $outcome->objectives_criteria = DB::table('criterion_objective_outcome')
+                ->join("program_criterion_objective_outcome as poco", 'poco.cri_obj_out_id', '=', 'criterion_objective_outcome.id')
                 ->join('objectives', 'objectives.id', '=', 'criterion_objective_outcome.objective_id')
                 ->where('criterion_id', $criterion->id)
+                ->whereIn("poco.program_id", $program_ids)
                 ->where('outcome_id', $outcome->id)
+                ->select('objectives.*', 'objectives.id as objective_id')
+                ->distinct()
                 ->get();
+
             foreach ($outcome->assoc_objectives as $objective) {
                 $objective->program_ids = json_encode(DB::table('objective_program')
                     ->where('objective_id', $objective->id)
@@ -540,6 +550,7 @@ class CriteriaController extends \BaseController
 
 
             /** If criterion is saved, send success message */
+            Log::info(Input::all());
             if ($criterion->save()) {
 
                 $criterionId = $criterion->id;
@@ -557,6 +568,7 @@ class CriteriaController extends \BaseController
                             "criterion_id" => $criterionId
                         ));
 
+
                     foreach ($clean_input['program_id'] as $program_id) {
                         DB::table('program_criterion_objective_outcome')
                             ->insert(array(
@@ -1185,4 +1197,65 @@ class CriteriaController extends \BaseController
                 break;
         }
     }
+
+    public function fetchFromTemplate()
+    {
+
+        $role = Auth::user()->role;
+
+        $criterion_id = Input::get('criterion_id');
+
+        switch ($role) {
+            case 1:
+                $program_ids = Program::select('programs.*')->lists('id');
+                break;
+            case 2:
+                $program_ids = Program::where("school_id", Auth::user()->school_id)->lists('id');
+                break;
+
+            case 3:
+            case 4:
+                $program_ids = Program::whereIn('id', Auth::user()->programs->lists('id'));
+                break;
+        }
+        $outcomes_paired_ids = DB::table('criterion_objective_outcome as cobo')
+            ->join('program_criterion_objective_outcome as poco', 'poco.cri_obj_out_id', '=', 'cobo.id')
+            ->whereIn("program_id", $program_ids)
+            ->where('criterion_id', $criterion_id)
+            ->select('cobo.outcome_id')
+            ->distinct()
+            ->lists('cobo.outcome_id');
+
+
+        $json = [];
+        $json['outcomes'] = $outcomes_paired_ids;
+        $json['objectives_available'] = DB::table('objectives')
+            ->join('objective_outcome', 'objective_outcome.objective_id', '=', 'objectives.id')
+            ->join('outcomes', 'outcomes.id', '=', 'outcome_id')
+            ->join('objective_program', 'objective_program.objective_id', '=', 'objectives.id')
+            ->whereIn("outcome_id", $outcomes_paired_ids)
+            ->whereIn("program_id", $program_ids)
+            ->where('objectives.id', '<>', 0)
+            ->select('objectives.*')
+            ->distinct()
+
+            ->get();
+        $json['objectives_selected'] = DB::table('objectives')
+            ->join('criterion_objective_outcome as cobo', 'cobo.objective_id', '=', 'objectives.id')
+            ->join('outcomes', 'outcomes.id', '=', 'outcome_id')
+
+            ->join('program_criterion_objective_outcome as poco', 'poco.cri_obj_out_id', '=', 'cobo.id')
+            ->whereIn('outcome_id', $outcomes_paired_ids)
+            ->whereIn("program_id", $program_ids)
+            ->where('criterion_id', $criterion_id)
+            ->where('objective_id', '<>', 0)
+            ->select('objectives.*')
+            //->groupBy('objectives.id', 'outcome_id')
+            ->distinct()
+            ->get();
+
+
+
+        return $json;
+    }
 }

app/controllers/Objective2Controller.php

@@ -64,6 +64,11 @@ class Objective2Controller extends \BaseController
 		$program_id = Input::get('program_id');
 		$old_cobo_id = Input::get('cobo_id');
 
+
+
+		//Log::info("Input de");
+		//Log::info(Input::all());
+
 		//criterio de holder. 
 
 
@@ -95,7 +100,7 @@ class Objective2Controller extends \BaseController
 			->where('cri_obj_out_id', $cri_obj_out_id)
 			->first();
 
-		if (isset($exists_pair)) {
+		if (isset($exists_pair) && $pcobo_id != $exists_pair->id) {
 			//se puede borrar la entrada
 			//porque el pareo de programa-criterio-dominio-holder ya existe, so borrar esta entrada borra duplicados. 
 
@@ -435,6 +440,7 @@ class Objective2Controller extends \BaseController
 
 	}
 
+
 	public function insertPCOBO()
 	{
 		//aqui entra si  le da a add criterio, y escoje uno nuevo
@@ -1090,4 +1096,174 @@ class Objective2Controller extends \BaseController
 	{
 		//
 	}
+
+	public function insertPCOBOFromTemplate()
+	{
+		$template_id = Input::get('template_id');
+		$criterion_id = Input::get('criterion_id');
+		$old_objective = Input::get("old_objective");
+		$objective_id = Input::get('new_objective');
+
+		$template = Template::find($template_id);
+		Log::info(Input::all());
+		//admin
+		if ($template->school_id == NULL) {
+			$program_ids = DB::table('programs')->lists('id');
+		}
+		//school
+		else if ($template->program_id == NULL) {
+			$program_ids = DB::table('programs')
+				->where('school_id', $template->school_id)
+				->lists('id');
+		}
+		//program
+		else {
+			$program_ids = DB::table('programs')
+				->where('id', $template->program_id)
+				->lists('id');
+		}
+		$outcome_ids = DB::table('criterion_objective_outcome as cobo')
+			->join('program_criterion_objective_outcome as poco', 'poco.cri_obj_out_id', '=', 'cobo.id')
+			->whereIn('program_id', $program_ids)
+			->where('criterion_id', $criterion_id)
+			->select('cobo.outcome_id')
+			->distinct()
+			->lists('outcome_id');
+
+		foreach ($program_ids as $program_id) {
+			foreach ($outcome_ids as $outcome_id) {
+				Input::replace([
+					'criterion_id' => $criterion_id,
+					'objective_id' => $objective_id,
+					'outcome_id' => $outcome_id,
+					'program_id' => $program_id
+				]);
+				$this->insertPCOBO();
+			}
+		}
+	}
+
+	public function updatePCOBOFromTemplate()
+	{
+		$template_id = Input::get('template_id');
+		$criterion_id = Input::get('criterion_id');
+		$old_objective = Input::get("old_objective");
+		$new_objective_id = Input::get('new_objective');
+		$template = Template::find($template_id);
+
+		if ($template->school_id == NULL) {
+			$program_ids = DB::table('programs')->lists('id');
+		} else if ($template->program_id == NULL) {
+			$program_ids = DB::table('programs')
+				->where('school_id', $template->school_id)
+				->lists('id');
+		} else {
+			$program_ids = DB::table('programs')
+				->where('id', $template->program_id)
+				->lists('id');
+		}
+		$cobo_ids = DB::table('criterion_objective_outcome as cobo')
+			->join('program_criterion_objective_outcome as poco', 'poco.cri_obj_out_id', '=', 'cobo.id')
+			->whereIn('program_id', $program_ids)
+			->where('criterion_id', $criterion_id)
+			->where('objective_id', $old_objective)
+			->select('cobo.*', 'poco.*', 'poco.id as poco_id')
+			//->distinct()
+			->get();
+		Log::info($cobo_ids);
+		foreach ($cobo_ids as $cobo_id) {
+
+
+
+
+			Input::replace([
+				'criterion_id' => $criterion_id,
+				'objective_id' => $new_objective_id,
+				'outcome_id' => $cobo_id->outcome_id,
+				'program_id' => $cobo_id->program_id,
+				'cobo_id' => $cobo_id->cri_obj_out_id,
+				'pcobo_id' => $cobo_id->poco_id,
+				'old_crit' => $criterion_id,
+				'old_outcome' => $cobo_id->outcome_id,
+				'old_cobo' => $cobo_id->cri_obj_out_id
+
+			]);
+			$this->updatePCOBO();
+		}
+	}
+
+
+	public function deletePCOBOFromTemplate()
+	{
+		$template_id = Input::get('template_id');
+		$criterion_id = Input::get('criterion_id');
+		$objective_id = Input::get('objective_id');
+		$template = Template::find($template_id);
+
+		if ($template->school_id == NULL) {
+			$program_ids = DB::table('programs')->lists('id');
+		} else if ($template->program_id == NULL) {
+			$program_ids = DB::table('programs')
+				->where('school_id', $template->school_id)
+				->lists('id');
+		} else {
+			$program_ids = DB::table('programs')
+				->where('id', $template->program_id)
+				->lists('id');
+		}
+		$cobo_ids = DB::table('criterion_objective_outcome as cobo')
+			->join('program_criterion_objective_outcome as poco', 'poco.cri_obj_out_id', '=', 'cobo.id')
+			->whereIn('program_id', $program_ids)
+			->where('criterion_id', $criterion_id)
+			->where('objective_id', $objective_id)
+			->select('poco.*', 'cobo.*', 'poco.id as poco_id')
+			->get();
+
+		Log::info($cobo_ids);
+		/*$outcome_ids = DB::table('criterion_objective_outcome as cobo')
+			->join('program_criterion_objective_outcome as poco', 'poco.cri_obj_out_id', '=', 'cobo.id')
+			->whereIn('program_id', $program_ids)
+			->where('criterion_id', $criterion_id)
+			->select('cobo.outcome_id')
+			->distinct()
+			->lists('outcome_id');
+		*/
+		foreach ($cobo_ids as $cobo_id) {
+			Input::replace([
+				'criterion_id' => $criterion_id,
+				'objective_id' => $objective_id,
+				'outcome_id' => $cobo_id->outcome_id,
+				'program_id' => $cobo_id->program_id,
+				'cobo_id' => $cobo_id->cri_obj_out_id,
+				'pcobo_id' => $cobo_id->poco_id
+
+			]);
+			$this->deletePCOBO();
+		}
+		/*
+		foreach ($program_ids as $program_id) {
+			foreach ($outcome_ids as $outcome_id) {
+				$old_cobo_id = DB::table('criterion_objective_outcome')
+					->where('criterion_id', $criterion_id)
+					->where('objective_id', $objective_id)
+					->where('outcome_id', $outcome_id)
+					->first();
+				$pcobo_id = DB::table('program_criterion_objective_outcome')
+					->where('program_id', $program_id)
+					->where('cri_obj_out_id', $old_cobo_id->id)
+					->first();
+
+				Input::replace([
+					'criterion_id' => $criterion_id,
+					'objective_id' => $objective_id,
+					'outcome_id' => $outcome_id,
+					'program_id' => $program_id,
+					'cobo_id' => $old_cobo_id->id,
+					'pcobo_id' => $pcobo_id
+
+				]);
+				$this->deletePCOBO();
+			}
+		}*/
+	}
 }

app/controllers/TemplatesController.php

@@ -147,7 +147,33 @@ class TemplatesController extends \BaseController
 				->get();
 		}
 
-		return View::make('local.managers.admins.view_template', compact('template', 'title'));
+		$can_edit = false;
+		$user = Auth::user();
+
+		switch ($user->role) {
+			case 1:
+				$can_edit = true;
+
+				break;
+			case 2:
+				if ($template->school_id != NULL && $user->school_id == $template->school_id)
+					$can_edit = true;
+				break;
+
+			case 3:
+				if ($template->program_id != NULL && in_array($template->program_id, $user->programs->lists('id')))
+					$can_edit = true;
+				break;
+
+			default:
+
+				if ($template->user_id ==  $user->id)
+					$can_edit = true;
+				break;
+		}
+
+
+		return View::make('local.managers.admins.view_template', compact('template', 'title', 'can_edit'));
 	}
 
 	public function onLoadFetch()
@@ -186,14 +212,32 @@ class TemplatesController extends \BaseController
 		if ($role == 1) {
 			$templates = Template::orderBy('name', 'ASC')->get();
 			$programs = Program::orderBy('name', 'ASC')->get();
+			$program_ids =  Program::orderBy('name', 'ASC')->lists('id');
 		} elseif ($role == 2) {
 			$templates = Template::where('school_id', '=', Auth::user()->school->id)->orWhere('school_id', '=', NULL)->orderBy('name', 'ASC')->get();
 			$programs = Auth::user()->school->programs;
+			$program_ids = Auth::user()->school->programs->lists('id');
 		} elseif ($role == 3) {
 			$templates = Template::where('school_id', '=', Auth::user()->programs[0]->school->id)->orWhere('school_id', '=', NULL)->orderBy('name', 'ASC')->get();
 			$programs = Auth::user()->programs()->get();
+			$program_ids = Auth::user()->programs()->lists('id');
+		} else {
+			$templates = Template::where('user_id', Auth::user()->id);
+			$programs = Auth::user()->programs()->get();
+			$program_ids = Auth::user()->programs()->lists('id');
 		}
 
+		$annual_plans = DB::table('annual_plans')
+			->join('programs', 'programs.id', '=', 'program_id')
+			->join('annual_cycles', 'annual_cycle_id', '=', 'annual_cycles.id')
+			->select("programs.*", "annual_cycles.*", 'annual_plans.id as annual_plan_id')
+			->whereIn("program_id", $program_ids)
+			->orderBy('annual_cycle_id', 'DESC')
+			->orderBy('programs.name', 'ASC')
+			->get();
+		Log::info("NOus avons");
+		Log::info($annual_plans);
+
 		return View::make('local.managers.shared.rubrics', compact('title', 'templates', 'outcomes', 'criteria', 'schools', 'programs'));
 	}
 
@@ -212,22 +256,23 @@ class TemplatesController extends \BaseController
 
 		$templates = NULL;
 		$programs = NULL;
+
+
 		// Returns templates depending on the type of user
 		if ($role == 1) {
 			$templates = Template::orderBy('name', 'ASC')->get();
 			$programs = Program::orderBy('name', 'ASC')->get();
-			$criteria = Criterion::orderBy('name', 'ASC')->get();
+			$criteria_ids = Criterion::orderBy('name', 'ASC')->lists('id');
 			$school_id_user = NULL;
+			$program_ids =  Program::orderBy('name', 'ASC')->lists('id');
 		} else {
 			if ($role == 2) {
 				$programs = Auth::user()->school->programs;
 				$school_id_user = Auth::user()->school_id;
-			}
-			if ($role == 3) {
+			} else if ($role == 3) {
 				$programs = Auth::user()->programs()->get();
 				$school_id_user = Auth::user()->programs[0]->school->id;
-			}
-			if ($role == 4) {
+			} else if ($role == 4) {
 				$programs = Auth::user()->programs()->get();
 				$school_id_user = Auth::user()->programs[0]->school->id;
 			}
@@ -236,6 +281,7 @@ class TemplatesController extends \BaseController
 			foreach ($programs as $program) {
 				$program_ids[] = $program->id;
 			}
+			/*
 			$criteria = Criterion::whereHas(
 				'programs',
 				function ($q) use ($program_ids) {
@@ -248,7 +294,14 @@ class TemplatesController extends \BaseController
 						$q->where('objective_id', '!=', 0);
 					}
 				)
-				->orderBy('name', 'ASC')->get();
+				->orderBy('name', 'ASC')->get(); */
+			$criteria_ids = Criterion::join('criterion_objective_outcome as cobo', 'cobo.criterion_id', '=', 'criteria.id')
+				->join('program_criterion_objective_outcome as poco', 'poco.cri_obj_out_id', '=', 'cobo.id')
+				->whereIn('program_id', $program_ids)
+				->where('objective_id', '<>', 0)
+				->select('criteria.*')
+				->distinct()
+				->lists('criteria.id');
 		}
 		// 			Log::info("aqui".(count($criteria)));
 					Log::info(json_encode(($criteria)));
@@ -257,11 +310,11 @@ class TemplatesController extends \BaseController
 
 		$templates = Template::where('school_id', '=', $school_id_user)->orWhere('school_id', '=', NULL)
 			->orderBy('name', 'ASC')->get();
-		$criteria_ids = array();
+		/*$criteria_ids = array();
 
 		foreach ($criteria as $criterion) {
 			$criteria_ids[] = $criterion->id;
-		}
+		}*/
 		$templates_fuera = Template::whereHas('criteria', function ($q) use ($criteria_ids) {
 			$q->whereNotIn('criterion_id', $criteria_ids);
 		})
@@ -277,6 +330,35 @@ class TemplatesController extends \BaseController
 		$templates_dentro = Template::whereNotIn('id', $templates_fuera_ids)
 			->orderBy('name', 'ASC')->get();
 
+
+		$annual_plans = DB::table('annual_cycle')
+			->join('annual_plans', 'annual_cycle_id', '=', 'annual_cycle.id')
+			->join('programs', 'programs.id', '=', 'annual_plans.program_id')
+			->join('typ_semester_outcome', function ($j) {
+				$j->on('typ_semester_outcome.semester_id', '=', 'annual_cycle.semester_start')
+					->orOn('typ_semester_outcome.semester_id', '=', 'annual_cycle.semester_end');
+			})
+			->join('typ_program', function ($j) {
+				$j->on('typ_program.program_id', '=', 'annual_plans.program_id')
+					->on('typ_program.id', '=', 'typ_semester_outcome.typ_program_id');
+			})
+			->whereIn('annual_plans.program_id', $program_ids)
+			->orderBy('annual_cycle_id', 'DESC')
+			->orderBy('programs.name', 'ASC')
+			->select("programs.*", 'programs.name as program_name', "annual_cycle.*", 'annual_plans.id as annual_plan_id')
+			->distinct()
+			->get();
+		/*$annual_plans = DB::table('annual_plans')
+			->join('programs', 'programs.id', '=', 'program_id')
+			->join('annual_cycle', 'annual_cycle_id', '=', 'annual_cycle.id')
+			->select("programs.*", 'programs.name as program_name', "annual_cycle.*", 'annual_plans.id as annual_plan_id')
+			->whereIn("program_id", $program_ids)
+			->orderBy('annual_cycle_id', 'DESC')
+			->orderBy('programs.name', 'ASC')
+			->get();
+		Log::info("NOus avons");
+		Log::info($annual_plans);*/
+
 		/*$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')
@@ -299,24 +381,65 @@ class TemplatesController extends \BaseController
 		// 		}
 
 		$templates_fuera = array();
-		return View::make('local.managers.shared.rubrics_new', compact('title', 'templates_dentro', 'templates_fuera', 'outcomes', 'criteria', 'schools', 'programs', 'criteria_ids'));
+		return View::make('local.managers.shared.rubrics_new', compact('annual_plans', 'title', 'templates_dentro', 'templates_fuera', 'outcomes', 'criteria', 'schools', 'programs', 'criteria_ids'));
 	}
 
 
 	public function fetchObjectivesForTemplate()
 	{
 		$criteria_ids = Input::get("allCriteria");
+		//program_id  only to solve for the rubric builder
+		$template_id = Input::get('template_id');
+
+		if (isset($template_id)) {
+			$template = Template::find($template_id);
+
+			if ($template->school_id == null) {
+				$program_ids = DB::table('programs')
+					->lists('programs.id');
+			} else if ($template->program_id == null) {
+				$program_ids = DB::table('programs')
+					->where('school_id', $template->school_id)->lists('programs.id');
+			} else {
+				$program_ids = DB::table('programs')
+					->where('program_id', $template->program_id)->lists('programs.id');
+			}
+		} else {
+			$role = Auth::user()->role;
+
+			switch ($role) {
+				case 1:
+					$program_ids = DB::table('programs')
+
+						->lists('programs.id');
+					break;
+				case 2:
+					$program_ids = DB::table('programs')
+						->where('school_id', Auth::user()->school_id)
+						->lists('programs.id');
+					break;
+				case 3:
+				case 4:
+					$program_ids = Auth::user()->programs->lists('id');
+					break;
+				default:
+					# code...
+					break;
+			}
+		}
+
 
-		$criteria = [];
-		//Acho im sorry pero no tengo idea porque sale un error que haría eso más eficiente.
 		foreach ($criteria_ids as $crit_id) {
 			$crit = Criterion::where('id', $crit_id)->first();
 			if (!isset($crit)) {
 				return "NO pa";
 			}
 
-			$crit->all_objectives = DB::table("objectives")->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')
+				->join('program_criterion_objective_outcome as poco', 'poco.cri_obj_out_id', '=', 'criterion_objective_outcome.id')
 				->where('criterion_id', $crit->id)
+				->whereIn("program_id", $program_ids)
 				->select('objectives.*')
 				->groupBy('objectives.id')
 				->get();

app/models/AnnualPlan.php

@@ -21,6 +21,19 @@ class AnnualPlan extends \Eloquent
 
 	//
 
+	public function getSemestersAttribute()
+	{
+		$semester_ids = Semester::join('annual_cycle', function ($j) {
+			$j->on('semesters.id', '=', 'annual_cycle.semester_start')
+				->orOn('semesters.id', '=', 'annual_cycle.semester_end');
+		})
+			->where('annual_cycle.id', $this->annual_cycle_id)
+			->select('semesters.*')
+			->distinct()
+			->get();
+		return $semester_ids;
+	}
+
 	public function getCoursesAttribute()
 	{
 		/*
@@ -42,10 +55,12 @@ class AnnualPlan extends \Eloquent
 		Log::info("Aqui sql");
 
 		*/
-		return Course::join('typ_semester_courses', 'typ_semester_courses.course_id', '=', 'courses.id')
+		$courses = Course::join('typ_semester_courses', 'typ_semester_courses.course_id', '=', 'courses.id')
 			->join('typ_semester_objectives', 'typ_semester_courses.typ_semester_objective_id', '=', 'typ_semester_objectives.id')
 			->join("typ_semester_outcome", 'typ_semester_outcome.id', '=', 'typ_semester_objectives.typ_semester_outcome_id')
+
 			->join("annual_cycle", function ($join) {
+
 				$join->on('typ_semester_outcome.semester_id', '=', 'annual_cycle.semester_start')
 					->orOn('typ_semester_outcome.semester_id', '=', 'annual_cycle.semester_end');
 			})
@@ -55,11 +70,18 @@ class AnnualPlan extends \Eloquent
 				$join->on('typ_program.program_id', '=', 'annual_plans.program_id')
 					->on('typ_program.id', '=', 'typ_semester_outcome.typ_program_id');
 			})
-
 			->where('annual_plans.program_id', $this->program_id)
 			->where('annual_plans.id', $this->id)
-			->select('courses.*', 'typ_semester_courses.id as typ_semester_course_id', 'annual_plans.program_id', 'typ_semester_outcome.semester_id as semester_id')
-			->get();
+			->select('courses.*', 'typ_semester_courses.id as typ_semester_course_id', 'annual_plans.program_id', 'typ_semester_outcome.semester_id as semester_id');
+
+		//En templateController, for_template lo defino como el semestre que estoy buscando
+		if (isset($this->for_template)) {
+			$courses = $courses->where('typ_semester_outcome.semester_id', $this->for_template)
+				->groupBy("courses.id")
+				->orderBy("courses.number");
+		}
+
+		return $courses->get();
 	}
 
 	//Aprendi luego que se puede hacer esto smh
@@ -113,6 +135,7 @@ class AnnualPlan extends \Eloquent
 			->where('annual_plans.id', $this->id)
 			->groupBy('outcomes.id', 'semester_id')
 			->orderBy('typ_semester_outcome.semester_id')
+			->orderBy("outcomes.name", 'ASC')
 			->select(
 				'outcomes.*',
 				'outcomes.id as outcome_id',

app/models/Objective.php

@@ -25,11 +25,12 @@ class Objective extends Eloquent
 
     public function getPairedOutcomeAttribute()
     {
-        return Outcome::join('typ_semester_outcome', 'typ_semester_outcome.outcome_id', '=', 'outcomes.id')
-            ->join('typ_semester_objectives', 'typ_semester_objectives.typ_semester_outcome_id', '=', 'typ_semester_outcome.id')
-            ->where('typ_semester_objectives.id', $this->typ_semester_objective_id)
-            ->select('typ_semester_outcome.id as typ_semester_outcome_id', 'outcomes.*')
-            ->first();
+        if (isset($this->typ_semester_objective_id))
+            return Outcome::join('typ_semester_outcome', 'typ_semester_outcome.outcome_id', '=', 'outcomes.id')
+                ->join('typ_semester_objectives', 'typ_semester_objectives.typ_semester_outcome_id', '=', 'typ_semester_outcome.id')
+                ->where('typ_semester_objectives.id', $this->typ_semester_objective_id)
+                ->select('typ_semester_outcome.id as typ_semester_outcome_id', 'outcomes.*')
+                ->first();
     }
 
 

app/models/Outcome.php

@@ -19,10 +19,9 @@ class Outcome extends Eloquent
 				->where('program_id', $this->program_id)
 				->where('semester_id', $this->semester_id)
 				->first();
-			//Log::info("PApi que hayy chabau");
-			//Log::info(array($expected_target));
+
 			if ($expected_target != null) {
-				//Log::info("PApi no chabau");
+
 				return $expected_target->expected_target;
 			} else return "Go to Annual Plan and define a target for learning outcome";
 		}

app/routes.php

@@ -255,8 +255,13 @@ Route::group(array('before' => 'auth|has_access'), function () {
 
     Route::post('pairEveryObjective', "ThreeYearPlanController@pairEveryObjective");
     Route::post('pairEveryCourse', "ThreeYearPlanController@pairEveryCourse");
-    //View annual plans and report
 
+
+    //////////////////////////////////////
+    //
+    //View annual plans and report
+    //
+    ///////////////////////////////////
     Route::get('{annual_report_or_plan}/show/{program_id}', "AnnualPlansController@annualPlansShow");
     Route::get("findHTMLlinksAP/{type_of_annual}/{path_id}", "AnnualPlansController@findHTML");
 
@@ -326,9 +331,35 @@ Route::group(array('before' => 'auth|has_access'), function () {
         'uses' => 'CriteriaController@fetchAllCriterion'
     ));
 
+    ///////////////////////////
+    //
+    //  pair criteria from template
+    //
+    ///////////////////////////
+
+    Route::post('fetchFromTemplate', 'CriteriaController@fetchFromTemplate');
+    Route::post('insertPCOBOFromTemplate', 'Objective2Controller@insertPCOBOFromTemplate');
+    Route::post('deletePCOBOFromTemplate', 'Objective2Controller@deletePCOBOFromTemplate');
+    Route::post('updatePCOBOFromTemplate', 'Objective2Controller@updatePCOBOFromTemplate');
+
     Route::post('insertPCOBO', 'Objective2Controller@insertPCOBO');
 
 
+    /*//////////////////
+
+    Export criteria from annual plans, rubrics
+
+    */ ////////////////
+
+    Route::post('fetchOutcomesFromPlan', "AnnualPlansController@fetchOutcomesFromPlan");
+    Route::post('fetchObjectivesFromPlan', 'AnnualPlansController@fetchObjectivesFromPlan');
+    Route::post("fetchSemestersFromPlan", 'AnnualPlansController@fetchSemestersFromPlan');
+    Route::post('fetchCoursesFromPlanForTemplates', 'AnnualPlansController@fetchCoursesFromPlanForTemplate');
+    Route::post('fetchCriteriaFromPlan', 'AnnualPlansController@fetchCriteriaFromPlan');
+
+
+    ///////////////////////////////////////////////////////
+
     Route::get('viewFormative', array(
         'as' => 'viewFormative',
         'uses' => 'TransformativeActionsController@viewFormativeActions'
@@ -412,6 +443,8 @@ Route::group(array('before' => 'auth|has_access'), function () {
     Route::post('transformativeAction/updateTA', array('before' => 'csrf', 'uses' => 'TransformativeActionsController@updateTA'));
     Route::post('transformativeAction/filterTA', array('before' => 'csrf', 'uses' => 'TransformativeActionsController@filterTA'));
     Route::post('transformativeAction/objectivesFromOutcome', array('before' => 'csrf', 'uses' => 'TransformativeActionsController@objectivesFromOutcome'));
+    Route::post('criteria/update', array('before' => 'csrf', 'uses' => 'CriteriaController@update'));
+    Route::delete('critteria/delete', array('before' => 'csrf', 'uses' => 'CriteriaController@destroy'));
 
 
     //shared print_program and school
@@ -468,8 +501,6 @@ Route::group(array('before' => 'auth|has_access'), function () {
 
         Route::post('learning-outcomes/update', array('before' => 'csrf', 'uses' => 'OutcomesController@updateMore'));
         Route::post('learning-outcomes/delete', array('before' => 'csrf', 'uses' => 'OutcomesController@delete'));
-        Route::post('criteria/update', array('before' => 'csrf', 'uses' => 'CriteriaController@update'));
-        Route::delete('critteria/delete', array('before' => 'csrf', 'uses' => 'CriteriaController@destroy'));
 
         Route::get('administrator/users/{query?}', 'UsersController@index');
 

app/views/global/view-objectives-criteria.blade.php

@@ -374,7 +374,12 @@
 
                 url= "{{URL::action('Objective2Controller@updatePCOBO')}}";
 
-
+                //
+                //
+                //  old-* son del select, guardan la informacion del criterio anterior
+                
+                //
+                //
                 old_crit = $(select).data('old-criterion')
                 old_outcome= $(select).data('old-outcome')
                 old_cobo = $(select).data('old-cobo')
@@ -490,6 +495,12 @@
             )
         }
 
+        //Leyenda, 
+        /*
+        
+
+        */
+
     
 
         function fetchCriteria(a){

app/views/local/managers/admins/view_template.blade.php

@@ -40,6 +40,10 @@
             @endfor
             
             <th>Learning Outcome</th>
+            @if($can_edit)
+
+            <th>Show Objectives</th>
+            @endif
           </tr>
         </thead>
       <tbody id ="bodyRubric">
@@ -49,13 +53,13 @@
 
         @if($criterion->notes)
             
-          <td><span><em data-toggle="tooltip" data-placement="top" title="{{$criterion->notes}}">{{$criterion->name}}</em></span><sup></sup></td>
+          <td id='criterion-name'><span><em data-toggle="tooltip" data-placement="top" title="{{$criterion->notes}}">{{$criterion->name}}</em></span><sup></sup></td>
           
 
         
         @else
           
-          <td><span>{{$criterion->name}}</span><sup></sup></td>
+          <td id='criterion-name'><span>{{$criterion->name}}</span><sup></sup></td>
 
         
 @endif
@@ -69,8 +73,16 @@
     <p>{{$outcome->name}}</p>
 @endforeach
 </ol></td>
+@if($can_edit)
+  <td>
+          <a data-criterion-id = '{{$criterion->id}}' onclick = 'pairObjectivesModal(this)'>Show or pair objectives to Criteria</a>
+
+  </td>
+  @endif
+</tr>
         @endforeach
 
+
       </tbody>
     </table>
 
@@ -117,7 +129,220 @@
     </div><!-- /.modal-content -->
   </div><!-- /.modal-dialog -->
 </div>
-<script> 
+
+
+<div class="modal fade" id="pair-objectives">
+  <div class="modal-dialog modal-md">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+        <h4 class="modal-title text-center" id ="pair-objectives-title">Select objectives you want to pair</h4>
+      </div>
+        <div class="modal-body" id ="pair-objectives-body">
+          
+
+          
+          
+        </div>
+      <div class="modal-footer">
+            <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+
+      </div>
+    </div><!-- /.modal-content -->
+  </div><!-- /.modal-dialog -->
+</div>
+<script>
+function pairObjectivesModal(a){
+  criterion_id = $(a).data('criterion-id')
+  $.post(
+    "{{URL::action('CriteriaController@fetchFromTemplate')}}",
+    {
+      criterion_id: criterion_id
+    },
+    function(objectives){
+      $("#pair-objectives-body").html('<label>Objectives Paired to '+$('#criterion-name').html()+'</label>');
+      options = makeOptions(objectives.objectives_available);
+
+      if(objectives.objectives_selected.length == 0){
+        $("#pair-objectives-body").append(createObjectiveSelect('', options,criterion_id));
+      }
+      else{
+        $.each(objectives.objectives_selected, function (ind, obj){
+          $("#pair-objectives-body").append(createObjectiveSelect(obj, options,criterion_id));
+        })
+      }
+
+      $("#pair-objectives-body").append(addObjectiveButton(criterion_id));
+      $("#pair-objectives-body").attr('data-outcome-ids', JSON.stringify(objectives.outcomes));
+
+      $("#pair-objectives").modal('show');
+      $('.selectpicker').selectpicker('refresh');
+
+
+    }
+  )
+}
+options = '';
+
+function makeOptions(objectives){
+  options = "<option value = '0'>Nothing Selected</option>";
+  $.each(objectives, function(ind, obj){
+    //objective_outcome_array = [obj.objective_id,obj.outcome_id];
+    options += "<option value = '"+obj.id+"'><p>" +obj.text+"</p></option>";
+ 
+  });
+  return options;
+}
+
+function addObjectiveButton(criterion_id){
+  div_row = $("<div>",{
+    "class":'row',
+    'id':"objective_button"  
+  }
+    );
+  div_col = $("<div>", {
+    'id':'objective_button',
+    'class':'col-md-12'
+  });
+
+  button = $("<button>", {
+    'class':"btn btn-md btn-secondary pull-right",
+    'onclick':'addObjectives("#objective_button", '+criterion_id+')'
+  }).html('<span class ="glyphicon glyphicon-plus" aria-hidden="true"></span> Add Objective');
+
+  div_col.append(button);
+  div_row.append(div_col);
+  return div_row;
+  
+  
+  }
+
+  function addObjectives(div, criterion_id){
+
+    $(div).before(createObjectiveSelect('',options, criterion_id));
+    $(".selectpicker").selectpicker('refresh');
+  }
+
+function createObjectiveSelect(objective = '', options, criterion_id){
+
+  
+            
+            div_master = $('<div>',{
+                'class':'removable_div'
+            })
+            div_select = $("<div>",{
+                'class':'form-group col-md-11',
+
+            })
+            select = $('<select>',{
+              'name':'objectives[]',
+              'class':'selectpicker form-control removable',
+              'data-live-search':'true',
+              "data-old-objective": ((objective == '') ? 'none': objective.id),
+              'data-criterion-id':criterion_id,
+              'onchange':'postObjective(this)'
+
+            }).html(options);
+
+            if(objective != ''){
+              select.val(objective.id);
+            }
+            div_rem_button = $('<div>',
+                {
+                    'class':'col-md-1 remove-btn'
+                    
+                })
+            rem_button = $('<button>',{
+                'type':'button',
+                'class':'btn btn-primary',
+                'onclick':'deleteCriterion(this);'
+            }).html("<span class='glyphicon glyphicon-remove'></span>")
+
+            div_select.append(select);
+            div_rem_button.append(rem_button);
+            div_master.append(div_select);
+            div_master.append(div_rem_button);
+
+            return div_master;
+
+
+
+}
+
+function postObjective(select){
+  old_objective = $(select).data('old-objective');
+  criterion_id = $(select).data('criterion-id');
+  new_objective = $(select).val();
+
+
+
+  if(old_objective == 'none'){
+    url = "{{URL::action('Objective2Controller@insertPCOBOFromTemplate')}}";
+  }
+  else{
+    url = "{{URL::action('Objective2Controller@updatePCOBOFromTemplate')}}";
+  }
+
+  $.post(
+    url,
+    {
+
+      old_objective: old_objective,
+      template_id: {{$template->id}},
+      criterion_id: criterion_id ,
+      new_objective:new_objective
+    },
+    function(){
+      $(select).data('old-objective', new_objective);
+
+    }
+
+  )
+}
+
+function deleteCriterion(button){
+  removable_div = $(button).parent().parent();
+
+  select = removable_div.find('select.removable');
+
+  if(select.data('old-objective')== 'none'){
+    modal_body = removable_div.parent();
+
+    removable_div.remove();
+    if(modal_body.children('.removable_div').length == 0){
+      addObjectives("#objective_button");
+     
+    }
+    return;
+
+  }
+  
+
+  $.post(
+    "{{URL::action('Objective2Controller@deletePCOBOFromTemplate')}}",
+    {
+      template_id: {{$template->id}},
+      objective_id:select.val(),
+      criterion_id:select.data('criterion-id'),
+
+
+
+    },
+    function (){
+      modal_body = removable_div.parent();
+
+      removable_div.remove();
+      if(modal_body.children('.removable_div').length == 0){
+        addObjectives("#objective_button");
+      
+      }
+      return;
+
+
+    }
+  )
+  
+}
 
 function fetchObjectivesForTemplate(tbody){
   
@@ -128,7 +353,8 @@ function fetchObjectivesForTemplate(tbody){
         $.post(
             "{{URL::action('TemplatesController@fetchObjectivesForTemplate')}}",
             {
-                allCriteria:allCriteria
+                allCriteria:allCriteria,
+                template_id:{{$template->id}}
             },
 
             function(crit){

app/views/local/managers/shared/annual-plans.blade.php

@@ -200,7 +200,7 @@
                 <div class="modal-header">
                     <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
                             aria-hidden="true">&times;</span></button>
-                    <h3 class="modal-title">Select Rubric/Template to export it's criteria</h3>
+                    <h3 class="modal-title">Select Rubric/Template to import it's criteria</h3>
                 </div>
                 <div class="modal-body" id = 'modal-template-criteria-body'>
 
@@ -208,7 +208,7 @@
 
                 </div>
                 <div class="modal-footer">
-                    <button type="button" id ='exportButton' class="btn btn-primary" onclick='exportCriteriaFromTemplate()'>Export Criteria</button>
+                    <button type="button" id ='importButton' class="btn btn-primary" onclick='importCriteriaFromTemplate()'>Import Criteria</button>
                     <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
 
 
@@ -221,7 +221,7 @@
 
 
     <script>
-        //Export functionality begin///////////////////////////////////////////////////////////
+        //import functionality begin///////////////////////////////////////////////////////////
         
         function selectRubricForCriteria(objective_id,outcome_id,program_id, typ_objective_id){
             $.post(
@@ -237,7 +237,7 @@
                     select = $('<select>', {
                         'class':'selectpicker form-control',
                         'data-live-search':'true',
-                        'id':'templateToExport'
+                        'id':'templateToimport'
                     });
 
                     options = "<option value ='0'>Nothing selected</option>";
@@ -247,13 +247,13 @@
 
                     select.html(options);
                     label = $("<label>", {
-                        'for':'templateToExport'
+                        'for':'templateToimport'
                     }).html("Select a Rubric or Template");
 
                     $(modal+'-body').append(label);
                     $(modal+'-body').append(select);
                     $(".selectpicker").selectpicker('refresh');
-                    $('#exportButton').attr('onclick', 'exportCriteriaFromTemplate('+typ_objective_id+', '+objective_id+', '+outcome_id+', '+program_id+')')
+                    $('#importButton').attr('onclick', 'importCriteriaFromTemplate('+typ_objective_id+', '+objective_id+', '+outcome_id+', '+program_id+')')
                     $(modal).modal('show');
                     
 
@@ -262,9 +262,9 @@
             )
         } 
 
-        function exportCriteriaFromTemplate(typ_objective_id, objective_id, outcome_id, program_id){
+        function importCriteriaFromTemplate(typ_objective_id, objective_id, outcome_id, program_id){
 
-            template_id = $('#templateToExport').val();
+            template_id = $('#templateToimport').val();
             $.post(
                 "{{URL::action('AnnualPlansController@pairCriteriaFromTemplate')}}",
                 {
@@ -285,7 +285,7 @@
 
         }
 
-        //export function END
+        //import function END
         //
         /////////////////////////////////////////////////////////////////////////////////////////////
 

app/views/local/managers/shared/criteria.blade.php

@@ -67,7 +67,7 @@
 
                     <!-- Associated Program -->
                     <div class="form-group form_validation program_form" id='program-checkboxes'>
-                        {{ Form::label('program_id', 'Associated Program2') }}<br>
+                        {{ Form::label('program_id', 'Associated Program') }}<br>
                         <br>
                         @if (count($programs) == 1)
                             <input type="checkbox" id="program-{{ $programs[0]->name }}" name="program_id[]"

app/views/local/managers/shared/rubrics_new.blade.php

@@ -64,7 +64,7 @@
 <div class="row">
     <div class="col-md-12">
 
-        <div class="panel panel-default">
+        <div class="panel panel-default ">
             <div class="panel-heading">
                 <span class="glyphicon glyphicon-triangle-bottom"></span>
                 General Information
@@ -117,10 +117,10 @@
 
                             @endforeach
                         </select>
-<!-- 
-					<span style="color: red;">Rubrics with "##" at the beginning contain criteria that are not associated with your program or school. You will not be able to use them until your criteria is matched with your program or school.
-                    </span>
- -->
+            <!-- 
+                                <span style="color: red;">Rubrics with "##" at the beginning contain criteria that are not associated with your program or school. You will not be able to use them until your criteria is matched with your program or school.
+                                </span>
+            -->
 					</div>
 
                     <!-- If user is admin s/he can pick which schools can view the rubric -->
@@ -195,6 +195,43 @@
                     </div>
                 </form>
                 <br>
+                <form>
+                
+                <div class="form-group">
+                    <label>Select the Maximum Score</label>
+                <select id="max_score" class="form-control selectpicker" data-live-search='true'>
+                    @for($i = 1; $i <= 100; $i++)
+                        @if($i==8)
+                            <option selected="selected" value="{{ $i }}">{{ $i }}</option>
+                        @else
+                            <option value="{{ $i }}">{{ $i }}</option>
+                        @endif
+                    @endfor
+                    
+                </select>
+                
+            </div>
+            <div class="form-group">
+                <label>Select the Type of Rubric</label>
+            <select id="number_of_scales" class="form-control selectpicker" data-live-search='true' >
+                @for($i = 1; $i <= 20; $i++)
+                @if(8%$i == 0)
+                @if($i==1)
+                <option value="{{ $i }}">Cuantitative Rubric</option>
+                
+                    @elseif($i==4)
+                    <option selected="selected" value="{{ $i }}">{{ $i }}-Scale Rubric</option>
+                    @else
+                    <option value="{{ $i }}">{{ $i }}-Scale Rubric</option>
+                @endif
+                @endif
+                @endfor
+                
+            </select>
+
+        </div>
+            </form>
+                <br>
 
                 <form>
                     <div class="form-group">
@@ -219,6 +256,97 @@
             </div>
         </div>
 
+        <div class="panel panel-default">
+            <div class="panel-heading panel-annual-plans">
+                <span class="glyphicon glyphicon-triangle-bottom"></span>
+                Import Criteria From Annual Plans
+            </div>
+            <div class="panel-body">
+                <form>
+                    <div class="form-group">
+                        <label>Select Annual Plan to Import From</label>
+                        <select id="select-annual-plans" class="form-control selectpicker" onchange="fetchSemesters(this)" data-live-search='true' data-live-search='true'>
+                            <option value = '0'>Nothing Selected</option>
+                        @foreach($annual_plans as $annual_plan)
+                            <option value = "{{$annual_plan->annual_plan_id}}">Annual Plan for {{$annual_plan->program_name}} on {{$annual_plan->academic_year}}</option>
+
+
+                        @endforeach
+                        </select>
+          
+					</div>
+
+                    <!-- If user is admin s/he can pick which schools can view the rubric -->
+                    
+
+
+                </form>
+          
+               
+
+                <label for="">Select a Semester</label>
+                <form >
+                    <div class="form-group">
+                        <!-- Select percentage. If there is a rubric, select the saved value -->
+
+                        <select id="select-semester-plans" class="form-control selectpicker" onchange = "fetchCourses('#select-annual-plans', '#select-semester-plans')" data-live-search='true'>
+                          
+                        </select>
+                      
+
+
+
+                        
+                    </div>
+                </form>
+                <br>
+
+                <form>
+                    <div class="form-group">
+                        <label>Select Course</label>
+                        <select id="select-courses-plans" class="form-control selectpicker" onchange = "  fetchCriteriaFromPlan('#select-courses-plans','#select-annual-plans', '#max_score', '#number_of_scales');" data-live-search='true'>
+                          
+                        </select>
+                      
+
+
+
+                        
+                    </div>
+                    
+                </form>
+                <form>
+                    <div class="form-group">
+                        <label>Select Criteria</label>
+                        <select id="select-criteria-plans" class="form-control selectpicker" onchange = "" data-live-search='true'>
+                          
+                        </select>
+                      
+
+
+
+                        
+                    </div>
+                    
+                </form>
+                <div class="text-center">
+                    <div class="btn-group" role="group" aria-label="...">
+                        <button id="button-add-criterion-plan" onclick = 'putToTemplateSingle("#select-criteria-plans")'class="btn btn-md btn-primary add-criterion-plan">
+                            <span class="glyphicon glyphicon-plus"></span>
+                            Add Criterion
+                        </button>
+                        <button id="button-add-all-criterion-plan" onclick = 'putToTemplateMultiple("#select-criteria-plans")'class="btn btn-md btn-primary add-criterion-plan">
+                            <span class="glyphicon glyphicon-plus"></span>
+                            Add All Criterion From Course
+                        </button>
+                        
+                    </div>
+                </div>
+                
+              
+            </div>
+        </div>
+
 
 
         <div class="well">
@@ -238,39 +366,6 @@
                     </select>
                 </div>
 
-                    <div class="form-group">
-                        <label>Select the Maximum Score</label>
-                    <select id="max_score" class="form-control selectpicker" data-live-search='true'>
-                        @for($i = 1; $i <= 100; $i++)
-                            @if($i==8)
-                                <option selected="selected" value="{{ $i }}">{{ $i }}</option>
-                            @else
-                                <option value="{{ $i }}">{{ $i }}</option>
-                            @endif
-                        @endfor
-                        
-                    </select>
-                    
-                </div>
-                <div class="form-group">
-                    <label>Select the Type of Rubric</label>
-                <select id="number_of_scales" class="form-control selectpicker" data-live-search='true' >
-                    @for($i = 1; $i <= 20; $i++)
-                    @if(8%$i == 0)
-                    @if($i==1)
-                    <option value="{{ $i }}">Cuantitative Rubric</option>
-                    
-                        @elseif($i==4)
-                        <option selected="selected" value="{{ $i }}">{{ $i }}-Scale Rubric</option>
-                        @else
-                        <option value="{{ $i }}">{{ $i }}-Scale Rubric</option>
-                    @endif
-                    @endif
-                    @endfor
-                    
-                </select>
-
-                <div>
                 @if(Auth::user()->role != '1')
 
                     <label>Filter Criteria</label>
@@ -404,19 +499,133 @@
 @section('included-js')
 
 <!-- jQuery Sortable Tables -->
-<script src="{{ asset('vendor/jQuerySortable/jquery-sortable-min.js') }}"></script>
+
 <script>
 
+    function putToTemplateSingle(select){
+        addCriterion(select);
+        
+
+    }
+    function putToTemplateMultiple(select){
+
+        options = $(select).children('option');
+        $.each(options, function(ind, opt){
+            $(select).val($(opt).data('criterion-id'))
+            $('.selectpicker').selectpicker('refresh');
+            putToTemplateSingle(select);
+        })
+    }
+
+    function fetchSemesters(select){
+
+        $.post("{{URL::action('AnnualPlansController@fetchSemestersFromPlan')}}",
+        {
+            annual_plan_id:$(select).val()
+        },
+        function(semesters){
+            console.log(semesters);
+
+            options_for_semesters = makeOptionsForSemesters(semesters);
+            $("#select-semester-plans").html(options_for_semesters);
+            $('.selectpicker').selectpicker('refresh');
+            fetchCourses('#select-annual-plans', '#select-semester-plans')
+        }
+        )
+    }
+
+    function makeOptionsForSemesters(semesters){
+        options = '';
+        $.each(semesters, function(ind, semesters){
+            options += "<option value = '"+semesters.id+"'>"+semesters.name+" ("+semesters.code+")</option>";
+        })
+        return options;
+    }
+
+    function fetchCourses(annual_plan, semesters){
+        annual_plan_id= $(annual_plan).val(),
+                semester_id= $(semesters).val()
+        $.post(
+            "{{URL::action('AnnualPlansController@fetchCoursesFromPlanForTemplate')}}",
+            {
+                annual_plan_id:$(annual_plan).val(),
+                semester_id:$(semesters).val()
+            },
+            function(courses){
+                console.log(courses);
+                options = makeOptionsForCourses(courses);
+                $("#select-courses-plans").html(options);
+                $('.selectpicker').selectpicker('refresh');
+                fetchCriteriaFromPlan("#select-courses-plans","#select-annual-plans", '#max_score', '#number_of_scales');
+
+
+            }
+        )
+    }
+
+    function makeOptionsForCourses(courses){
+        options = '';
+        $.each(courses, function(ind, courses){
+            options += "<option value= '"+courses.id+"'>"+courses.code+"["+courses.number+"] "+courses.name+"</option>";
+        })
+        return options;
+    }
+
+    function fetchCriteriaFromPlan(courses, annual_plan, max_score, number_of_scales){
+
+        $.post(
+            "{{URL::action('AnnualPlansController@fetchCriteriaFromPlan')}}",
+            {
+                course_id: $(courses).val(),
+                annual_plan:$(annual_plan).val(),
+                max_score:$(max_score).val(),
+                number_of_scales:$(number_of_scales).val()
+            },
+            function(criteria){
+                console.log(criteria);
+                options_criteria = makeOptionsForCriteria(criteria)
+                
+                $('#select-criteria-plans').html(options);
+                $('.selectpicker').selectpicker('refresh');
+                //if options is empty, disable add button
+                if(options == ''){
+                    $('.add-criterion-plan').prop('disabled',true)
+
+                }
+                //if options is empty, disable add button
+                else{
+                    $('.add-criterion-plan').prop('disabled',false)
+
+                }
+
+            }
+        )
+
+    }
+
+    function makeOptionsForCriteria(criteria){
+        options = '';
+
+        $.each(criteria, function (ind, cri){
+            options +='<option value = "'+cri.id+'" data-criterion-id ="'+cri.id+'">'+cri.name+'</option>';
+        })
+        return options;
+    }
+
+
+
     function fetchObjectivesForTemplate(tbody){
 
         allCriteria = [];
         $(tbody).children('tr').each(function (index){
             allCriteria.push($(this).data('criterion-id'));
         })
+        program_id = $("#select-program").val();
         $.post(
             "{{URL::action('TemplatesController@fetchObjectivesForTemplate')}}",
             {
-                allCriteria:allCriteria
+                allCriteria:allCriteria,
+                program_id:program_id
             },
 
             function(crit){
@@ -446,8 +655,71 @@
             }
         )
     }
-function saveTemplate()
-{
+    options_for_select = '';
+
+    function fetchOutcomes(annual_plan_id){
+    
+
+    $.post(
+        "{{URL::action('AnnualPlansController@fetchOutcomesFromPlan')}}",
+        {
+            annual_plan_id:annual_plan_id
+        },
+        function(outcomes){
+            console.log(outcomes);
+
+            options_for_select = makeOptionsForOutcomes(outcomes);
+            $("#select-outcomes-plans").html(options_for_select);
+            $('.selectpicker').selectpicker('refresh');
+            $("#select-outcomes-plans").trigger('change');
+
+        }
+    );
+}
+
+
+function fetchObjectives(select_outcome){
+    console.log($(select_outcome).find('option:selected').html())
+    option_selected = $(select_outcome).find('option:selected');
+    console.log($(select_outcome).find('option:selected').data('objectives'))
+    console.log($(select_outcome).val())
+    console.log(option_selected.val())
+    $.post(
+        "{{URL::action('AnnualPlansController@fetchObjectivesFromPlan')}}",
+        {
+            program_id: option_selected.data('program-id'),
+            typ_semester_outcome_id: option_selected.data('typ-semester-outcome-id'),
+            semester_id:option_selected.data('semester-id'),
+            outcome_id: $(select_outcome).val()
+        },
+        function(objectives){
+            options_for_objective = makeOptionsForObjectives(objectives)
+
+        }
+    )
+    }
+
+    function makeOptionsForObjectives(objectives){
+        console.log(objectives);
+
+        option_selected = '';
+        
+    }
+
+function makeOptionsForOutcomes(outcomes){
+    
+    options_for_select = '<optgroup label ="First Semester">';
+    semester_id = outcomes[0].semester_id
+    $.each(outcomes, function(ind, out){
+        if(semester_id != out.semester_id){
+            semester_id = out.semester_id
+            options_for_select += '<optgroup label ="Second Semester">';
+        }
+        options_for_select +="<option value= '"+out.id+"' data-typ-semester-outcome-id ='"+out.typ_semester_outcome_id+"' data-program-id= '"+out.program_id+"' data-semester-id = '"+out.semester_id+"'>"+out.name+"</option>";
+    });
+    return options_for_select;
+}
+function saveTemplate(){
     //Prevent page refresh
     
 
@@ -546,96 +818,8 @@ function saveTemplate()
     }
 
 }
-    </script>
-<!-- X-Editable js -->
-<script src="{{ asset('vendor/xeditable/bootstrap-editable.min.js') }}"></script>
-
-@stop
-
-@section('javascript')
-$('#select-outcome').on('change',function(){
-    fetchObjective(this);
-})
-// --------------------------------------------------------------------------
-// Functions
-// --------------------------------------------------------------------------
-
-function fetchObjective(outcome){
-    $.post(
-        "{{URL::route('fetchObjectivesForSelect')}}",
-        {
-            outcomeID:$(outcome).find(':selected').data('outcome-id'),
-        },
-        function(data){
-            options = '';
-            for(objective_index in data){
-                options += '<option value = "'+data[objective_index].objective_id+'">'+data[objective_index].text+'</option>';
-
-            }
-            $('#select-objective').html(options);
-            $('#select-objective').selectpicker('refresh');
-            fetchCriteria($('#select-outcome'), $('#select-objective'));
-
-        }, 'json',
-    );
-
-}
-// Fetch criteria associated to a specific learning outcome 
-
-function fetchCriteria(outcome, objective)
-{
-    amount_of_scales = parseInt($('#number_of_scales').find(':selected').val());
-            
-    maximum = parseInt($('#max_score').find(":selected").val());
-    $.post
-    (
-        "{{ URL::route('fetchCriteria') }}",
-        {
-            outcome_id: outcome.find(':selected').data('outcome-id'),
-            objective_id: objective.find(':selected').val(),
-            num_scales: amount_of_scales,
-            maximum: maximum,
-            filter: $('input[name=criteria-filter]:checked').val()
-        },
-        function(data)
-        {
-            $('#select-criterion').empty();
-		console.log(data);
-            // Append criteria
-            data.forEach( function (arrayItem)
-            {
-                objectives = JSON.stringify(arrayItem.objectives);
-                $('#select-criterion')
-                    .append('<option data-criterion-id="'+arrayItem.id+'" data-program-ids = '+"'"+arrayItem.program_ids+"'"+' data-assoc-objectives= '+"'"+objectives+"'"+'>'+arrayItem.name+'</option>');
-            });
-
-            // If there are no criteria assigned to the selected outcome, disable the
-            // input and the button used to add criteria.
-            if(!$('#select-criterion').children().length)
-            {
-
-                $('#select-criterion').prop('disabled', true);
-                $('#button-add-criterion').prop('disabled', true);
-            }
-
-            // Otherwise, enable both the input and the button
-            else
-            {
-                $('#select-criterion').prop('disabled', false);
-                $('#button-add-criterion').prop('disabled', false);
-            }
-
-            $('#updated-text').fadeIn('slow').fadeOut('slow');
-
-            refreshSelects();
-
-
-        }
-    );
-}
-
 // Add a new criterion to the rubric
-function addCriterion()
+function addCriterion(select)
 {
 
     // Show the rubric container
@@ -645,9 +829,9 @@ function addCriterion()
     }
 
     // Get the selected criterion's id
-    var id= parseInt($('#select-criterion').find(':selected').data('criterion-id'));
-    var program_ids = $('#select-criterion').find(':selected').data('program-ids');
-    var objectives = $('#select-criterion').find(':selected').data('assoc-objectives');
+    var id= parseInt($(select).find(':selected').data('criterion-id'));
+    var program_ids = $(select).find(':selected').data('program-ids');
+    //var objectives = $(select).find(':selected').data('assoc-objectives');
     // Check for duplicates
     var duplicates=false;
     numberOfScale = $('#number_of_scales').find(':selected').val();
@@ -691,9 +875,9 @@ function addCriterion()
             if(data.criterion.notes){
                 notes = data.criterion.notes;
             }
-            objectives = JSON.stringify(objectives);
-            var str ='<tr data-criterion-name ="'+data.criterion.name+'" data-program-ids = "['+program_ids+']" data-assoc-objectives = '+"'"+objectives+"'"+' data-criterion-id="'+data.criterion.id+'" data-criterion-copyright="'+copyright+'" data-criterion-notes="'+notes+'" data-outcomes = "'+data.outcomes+'"><th><span class="glyphicon glyphicon-move"></span></th><td>';
-//	console.log(str);
+            //objectives = JSON.stringify(objectives);
+            var str ='<tr data-criterion-name ="'+data.criterion.name+'" data-program-ids = "['+program_ids+']"  data-criterion-id="'+data.criterion.id+'" data-criterion-copyright="'+copyright+'" data-criterion-notes="'+notes+'" data-outcomes = "'+data.outcomes+'"><th><span class="glyphicon glyphicon-move"></span></th><td>';
+    //	console.log(str);
             var subcriteria = '';
             if(data.criterion.subcriteria){
 
@@ -755,32 +939,6 @@ function addCriterion()
         'json',
     );
 }
-
-// Fetch single criterion
-function fetchCriterion(criterion)
-{
-    $.post
-    (
-        "{{ URL::route('fetchCriterion') }}",
-        { id: outcome.find(':selected').data('outcome-id')},
-        function(data)
-        {
-            $('#select-criterion').empty();
-
-            data.forEach( function (arrayItem)
-            {
-                $('#select-criterion')
-                    .append('<option data-criterion-id="'+arrayItem.id+'" >'+arrayItem.name+'</option>');
-            });
-
-            $('#select-criterion').append('<option data-criterion-id="0">Custom</option>');
-
-            refreshSelects();
-
-        }
-    );
-}
-
 // Build list from copyright info in rubric
 function buildCopyrightList()
 {
@@ -842,7 +1000,126 @@ function buildCopyrightList()
     else
     {
        $('#copyright-info').hide();
-}}
+    }
+}
+    </script>
+<!-- X-Editable js -->
+<script src="{{ asset('vendor/xeditable/bootstrap-editable.min.js') }}"></script>
+
+<script src="{{app_path().'/scripts/rubric_scripts/scripts_for_annual_plan_export.js'}}"></script>
+
+@stop
+
+@section('javascript')
+$('#select-outcome').on('change',function(){
+    fetchObjective(this);
+})
+// --------------------------------------------------------------------------
+// Functions
+// --------------------------------------------------------------------------
+
+function fetchObjective(outcome){
+    $.post(
+        "{{URL::route('fetchObjectivesForSelect')}}",
+        {
+            outcomeID:$(outcome).find(':selected').data('outcome-id'),
+        },
+        function(data){
+            options = '';
+            for(objective_index in data){
+                options += '<option value = "'+data[objective_index].objective_id+'">'+data[objective_index].text+'</option>';
+
+            }
+            $('#select-objective').html(options);
+            $('#select-objective').selectpicker('refresh');
+            fetchCriteria($('#select-outcome'), $('#select-objective'));
+
+        }, 'json',
+    );
+
+}
+// Fetch criteria associated to a specific learning outcome 
+
+function fetchCriteria(outcome, objective)
+{
+    amount_of_scales = parseInt($('#number_of_scales').find(':selected').val());
+            
+    maximum = parseInt($('#max_score').find(":selected").val());
+    $.post
+    (
+        "{{ URL::route('fetchCriteria') }}",
+        {
+            outcome_id: outcome.find(':selected').data('outcome-id'),
+            objective_id: objective.find(':selected').val(),
+            num_scales: amount_of_scales,
+            maximum: maximum,
+            filter: $('input[name=criteria-filter]:checked').val()
+        },
+        function(data)
+        {
+            $('#select-criterion').empty();
+		console.log(data);
+            // Append criteria
+            data.forEach( function (arrayItem)
+            {
+                objectives = JSON.stringify(arrayItem.objectives);
+                $('#select-criterion')
+                    .append('<option data-criterion-id="'+arrayItem.id+'" data-program-ids = '+"'"+arrayItem.program_ids+"'"+' data-assoc-objectives= '+"'"+objectives+"'"+'>'+arrayItem.name+'</option>');
+            });
+
+            // If there are no criteria assigned to the selected outcome, disable the
+            // input and the button used to add criteria.
+            if(!$('#select-criterion').children().length)
+            {
+
+                $('#select-criterion').prop('disabled', true);
+                $('#button-add-criterion').prop('disabled', true);
+            }
+
+            // Otherwise, enable both the input and the button
+            else
+            {
+                $('#select-criterion').prop('disabled', false);
+                $('#button-add-criterion').prop('disabled', false);
+            }
+
+            $('#updated-text').fadeIn('slow').fadeOut('slow');
+
+            refreshSelects();
+
+
+        }
+    );
+}
+
+
+
+// Fetch single criterion
+function fetchCriterion(criterion)
+{
+    $.post
+    (
+        "{{ URL::route('fetchCriterion') }}",
+        { id: outcome.find(':selected').data('outcome-id')},
+        function(data)
+        {
+            $('#select-criterion').empty();
+
+            data.forEach( function (arrayItem)
+            {
+                $('#select-criterion')
+                    .append('<option data-criterion-id="'+arrayItem.id+'" >'+arrayItem.name+'</option>');
+            });
+
+            $('#select-criterion').append('<option data-criterion-id="0">Custom</option>');
+
+            refreshSelects();
+
+        }
+    );
+}
+
+
     /*        if(criterion.data('criterion-copyright')!=null)
         {
             var copyright = criterion.data('criterion-copyright');
@@ -1014,7 +1291,7 @@ console.log($('#select-school'));
                console.log(current_criterion.program_ids);
                 objectives = JSON.stringify(current_criterion.objectives);
                 //var str = '<tr data-assoc-objectives= '+"'"+objectives+"'"+' data-program_ids = "'+current_criterion.program_ids+'" data-criterion-name = "'+current_criterion.name+'" data-criterion-id="'+temp_criterion[temp_c].criterion_id+'" data-criterion-copyright="'+temp_criterion[temp_c].copyright+'" data-criterion-notes="'+temp_criterion[temp_c].notes+'" data-outcomes = "'+temp_criterion[temp_c].outcomes+'"><th><span class="glyphicon glyphicon-move"></span></th><td>';
-                var str = "<tr data-assoc-objectives= "+"'"+objectives+"'"+" data-program_ids = '"+current_criterion.program_ids+"' data-criterion-name = '"+current_criterion.name+"' data-criterion-id='"+temp_criterion[temp_c].criterion_id+"' data-criterion-copyright='"+temp_criterion[temp_c].copyright+"' data-criterion-notes='"+temp_criterion[temp_c].notes+"' data-outcomes = '"+temp_criterion[temp_c].outcomes+"'><th><span class='glyphicon glyphicon-move'></span></th><td>";
+                var str = "<tr  data-program_ids = '"+current_criterion.program_ids+"' data-criterion-name = '"+current_criterion.name+"' data-criterion-id='"+temp_criterion[temp_c].criterion_id+"' data-criterion-copyright='"+temp_criterion[temp_c].copyright+"' data-criterion-notes='"+temp_criterion[temp_c].notes+"' data-outcomes = '"+temp_criterion[temp_c].outcomes+"'><th><span class='glyphicon glyphicon-move'></span></th><td>";
                 console.log(str);
 
                 var subcriteria ='';
@@ -1237,6 +1514,9 @@ $('.panel-heading').on('click', function()
     $(this).siblings('.panel-body').stop().slideToggle();
 });
 
+$('.panel-annual-plans').trigger('click');
+$('.add-criterion-plan').prop('disabled',true)
+
 // Fetch criteria everytime something changes 
 $('#select-objective').on('change', function(){
     fetchCriteria($('#select-outcome'), $('#select-objective'));
@@ -1396,9 +1676,13 @@ $('#max_score').on('change', function(){
     refreshSelects();
     changeTable();
     fetchCriteria($('#select-outcome'), $('#select-objective'))
+    fetchCriteriaFromPlan('#select-courses-plans','#select-annual-plans', '#max_score', '#number_of_scales');
 })
 $('#number_of_scales').on('change', function(){
     changeTable();
+    fetchCriteria($('#select-outcome'), $('#select-objective'))
+    fetchCriteriaFromPlan('#select-courses-plans','#select-annual-plans', '#max_score', '#number_of_scales');
+
     $('#rubric-container').hide();
     $('#rubric-name').val('');
     $('tbody').empty();
@@ -1417,7 +1701,7 @@ $('#button-add-criterion').on('click', function(e)
     e.preventDefault();
 
     //Add new criterion
-    addCriterion();
+    addCriterion("#select-criterion");
 });
 
 // When the create or update buttons are clicked (.save)

app/views/three_year_plan_htmls/08-12-2022-for-1044-by-5478.blade.php

@@ -0,0 +1,729 @@
+<html><head></head><body id="theDocument"><style type="text/css">
+    body
+    {
+        font-family: "Arial", sans-serif;
+        width:90%;
+        margin: 0 auto;
+    }
+    .header-text
+    {
+        text-align:center;
+        font-weight: bold;
+        margin:0;
+    }
+
+    h1.header-text
+    {
+      margin: 15px auto;
+      width:75%;
+      font-size: 25px;
+    }
+
+    table
+    {
+        border-collapse: collapse;
+        border: 1px solid black;
+        width: 100%;
+        margin: 30px auto;
+        font-size:1.5vw;
+    }
+    td, th
+    {
+        border: 1px solid black;
+        padding: 5px;
+    }
+
+    .activity-name-row
+    {
+      background:black;
+      color:white;
+    }
+
+    .activity-headers-row
+    {
+      background:lightgrey;
+      font-weight:bold;
+    }
+
+    .report-info
+    {
+      margin:5px 0;
+      font-size: 16px;
+    }
+
+    .criterion-field
+    {
+      text-align:left;
+    }
+
+    .score-field, .total, .percentage
+    {
+      text-align:center;
+    }
+
+    .header
+    {
+      margin: 30px 0;
+    }
+
+    .content
+    {
+      font-size: 12px;
+    }
+
+    .logo
+    {
+      position:absolute;
+      right:0;
+      top: 30px;
+      width: 100px;
+    }
+
+    ol{
+      list-style-type:none;
+    }
+
+    @media print{@page {size: landscape}}
+</style><style type="text/css" media="print">
+	  @page { size: landscape; }
+	</style><img class="logo" src="http://localhost:8000/images/logo_uprrp_bw.png" alt="UPRRP Logo">
+
+<div class="header">
+    <p class="header-text">University of Puerto Rico, Río Piedras Campus</p>
+    <p class="header-text">Online Learning Assessment System</p>
+
+    <h1 class="header-text">Three Year Plan for Avaluo del Componente General from 2022 to
+        2025</h1>
+</div>
+
+
+
+    <br>
+    <br>
+    <h2 class='header-text'>First Semester 2022-2023</h2>
+    <br>
+                  <span>
+            <h3>Content Knowledge, Skills or Dispositions in the academic program learning outcomes</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. mera
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[CIBI3002] FUND BIOL: II</li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                                    <tr>
+
+                        <td>
+                            2. QUien esta interesado?
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[CIBI3006] CIBI ENFASIS CONS AMB I   </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                              <span>
+            <h3>Critical Thinking</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. QUien esta interesado?
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[CIBI3006] LABORATORIO               </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                                    <tr>
+
+                        <td>
+                            2. Esto 'es' la "prueba" de Julio's
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[CIBI3006] LABORATORIO               </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                              <span>
+            <h3>Effective Communication Skills</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. QUien esta interesado?
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[CIBI4105] CULTIVOS TRANSGENICOS     </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                              <span>
+            <h3>Information Literacy</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. QUien esta interesado?
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[CIBI3027] CAMB CLIM Y SIST ECO CARIB</li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                              <span>
+            <h3>Research and Creation</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. Tambien esto, a dos programas
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[CIBI3026] FUND BIOL ORGAN Y HOMEOTAS</li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                              <span>
+            <h3>Social Responsibility</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. QUien esta interesado?
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[CIBI3025] INV BIOL CULT CIENT       </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                              <span>
+            <h3>Technology</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. QUien esta interesado?
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[CIBI3015] INV BIOL CUL CIENT        </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                    <br>
+    <br>
+    <h2 class='header-text'>Second Semester 2022-2023</h2>
+    <br>
+                  <span>
+            <h3>Critical Thinking</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. QUien esta interesado?
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[CIBI4006] ANALISIS FORENSE DE ADN   </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                              <span>
+            <h3>Content Knowledge, Skills or Dispositions in the academic program learning outcomes</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. QUien esta interesado?
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[CIBI3007] CIBI ENFASIS CONS AMB II  </li>
+                                                                    <li>[CIBI3026] FUND BIOL ORGAN Y HOMEOTAS</li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                                    <tr>
+
+                        <td>
+                            2. mera
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[CIBI4105] CULTIVOS TRANSGENICOS     </li>
+                                                                    <li>[CIBI4105] SEM:MIRAD INTERD REPR ASIS</li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                              <span>
+            <h3>Effective Communication Skills</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. QUien esta interesado?
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[CIBI3007] CIBI ENFASIS CONS AMB II  </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                                    <tr>
+
+                        <td>
+                            2. mera
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[CIBI3018] ORIGEN Y EVOLUCION VIDA   </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                              <span>
+            <h3>Information Literacy</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. Tambien esto, a dos programas
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[CIBI3028] CIENCIA BIOTECN Y SOCIEDAD</li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                                    <tr>
+
+                        <td>
+                            2. mera
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[CIBI3028] CIENCIA BIOTECN Y SOCIEDAD</li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                              <span>
+            <h3>Logical-mathematical reasoning </h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. QUien esta interesado?
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[CIBI4006] ANALISIS FORENSE DE ADN   </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                              <span>
+            <h3>Research and Creation</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. Tambien esto, a dos programas
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[CIBI3018] ORIGEN Y EVOLUCION VIDA   </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                              <span>
+            <h3>Social Responsibility</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. Tambien esto, a dos programas
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[CIBI3018] ORIGEN Y EVOLUCION VIDA   </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                              <span>
+            <h3>Technology</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. QUien esta interesado?
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[CISO5995] ESTDS AFRODESC PR Y CARIBE</li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                    <br>
+    <br>
+    <h2 class='header-text'>First Semester 2023-2024</h2>
+    <br>
+                  <span>
+            <h3>Logical-mathematical reasoning </h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. QUien esta interesado?
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[CIBI3035] ECOSISTEMA Y BIODIVERSIDAD</li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                              <span>
+            <h3>Research and Creation</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. Tambien esto, a dos programas
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[CIBI3028] CIENCIA BIOTECN Y SOCIEDAD</li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                    <br>
+    <br>
+    <h2 class='header-text'>Second Semester 2023-2024</h2>
+    <br>
+        <br>
+    <br>
+    <h2 class='header-text'>First Semester 2024-2025</h2>
+    <br>
+        <br>
+    <br>
+    <h2 class='header-text'>Second Semester 2024-2025</h2>
+    <br>
+     
+
+
+</body></html>
+
+
+<script>
+
+  
+    
+  
+
+
+  </script>
+
+