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

verificar route

app/controllers/AnnualPlansController.php

@@ -129,14 +129,45 @@ class AnnualPlansController extends \BaseController
   }*/
   public function adminIndex()
   {
-    Log::info("Entre" . json_encode($this));
+    //Log::info("Entre" . json_encode($this));
 
     $title = "Annual Plans";
-    $programs = Program::get();
+    $programs = Program::orderBy('name', "ASC")->get();
+    $annual_cycle = DB::table('annual_cycle')
+      ->orderBy('academic_year', "DESC")
+      ->get();
+    $report = 0;
+
+    return View::make('local.managers.admins.appraisal-program', compact('title', 'programs', 'annual_cycle', 'report'));
+  }
 
-    return View::make('local.managers.admins.appraisal-program', compact('title', 'programs'));
+  public function adminReportIndex()
+  {
+    $title = "Annual Reports";
+    $programs = Program::orderBy('name', "ASC")->get();
+    $annual_cycle = DB::table('annual_cycle')
+      ->orderBy('academic_year', "DESC")
+      ->get();
+    $report = 1;
+
+    return View::make('local.managers.admins.appraisal-program', compact('title', 'programs', 'annual_cycle', 'report'));
+  }
+
+  //fetch submitted
+
+  public function  fetchSubmitted()
+  {
+    $annual_cycle = Input::get('annual_cycle');
+    $report = Input::get('report');
+    return DB::table("annual_plans")
+      ->join('paths_for_annual_plans as pa', 'pa.annual_plan_id', '=', 'annual_plans.id')
+      ->where('report', $report)
+      ->where('annual_cycle_id', $annual_cycle)
+      ->get();
   }
 
+
+
   public function showPlan($program_id, $typ_id = null)
   {
     $program = Program::find($program_id);
@@ -1128,9 +1159,6 @@ class AnnualPlansController extends \BaseController
     return Redirect::back();
   }
 
-  public function adminReportIndex()
-  {
-  }
 
 
   public function downloadPDF($download, $path_id)
@@ -1342,6 +1370,14 @@ class AnnualPlansController extends \BaseController
         'last' => 0
       ));
 
+    DB::table('annual_plans')
+      ->where('id', $annual_id)
+      ->update(array(
+        'is_submitted' => 1,
+        'submitted_on' => date('Y-m-d H:i:s')
+
+      ));
+
     DB::table('paths_for_annual_plans')->insert(array(
       "path_to_pdf" => $path,
       'annual_plan_id' => $annual_id,

app/controllers/ProgramsController.php

@@ -124,6 +124,83 @@ class ProgramsController extends \BaseController
   }
 
 
+  // manage course index
+
+  public function assignOtherProgramIndex()
+  {
+
+    $title = 'Assign courses to other Programs';
+    $programs = Program::orderBy("name")->get();
+
+    return View::make('local.managers.admins.assign_other_programs', compact('title', 'programs'));
+  }
+
+  //create other course pairing
+
+  public function addToOtherProgramTYP()
+  {
+    $clean_input = Input::all();
+    Log::info($clean_input);
+    DB::beginTransaction();
+    foreach ($clean_input['other_program'] as $index => $program_id) {
+      $id = DB::table('other_programs_courses_typ')->insertGetId(array(
+        'program_id' => $clean_input['program'],
+        'other_program_id' => $program_id
+      ));
+
+      if (!isset($id)) {
+        Session::flash('status', 'danger');
+        Session::flash('message', 'Error saving Program. Try again later.');
+
+        return Redirect::back();
+      }
+    }
+    DB::commit();
+
+    Session::flash('status', 'success');
+    Session::flash('message', 'Pairing created.');
+
+    return Redirect::action('ProgramsController@assignOtherProgramIndex');
+  }
+
+  public function updatePairingInfo()
+  {
+    $clean_input = Input::all();
+    Log::info($clean_input);
+    DB::beginTransaction();
+    DB::table("other_programs_courses_typ")->where('program_id', $clean_input['program'])
+      ->delete();
+    foreach ($clean_input['other_program'] as $index => $program_id) {
+      $id = DB::table('other_programs_courses_typ')->insertGetId(array(
+        'program_id' => $clean_input['program'],
+        'other_program_id' => $program_id
+      ));
+
+      if (!isset($id)) {
+        Session::flash('status', 'danger');
+        Session::flash('message', 'Error saving Program. Try again later.');
+
+        return Redirect::back();
+      }
+    }
+    DB::commit();
+
+    Session::flash('status', 'success');
+    Session::flash('message', 'Pairing created.');
+
+    return Redirect::action('ProgramsController@assignOtherProgramIndex');
+  }
+
+  public function fetchPairingInfo()
+  {
+
+    return DB::table("other_programs_courses_typ")->where('program_id', Input::get('program_id'))
+      ->lists("other_program_id");
+  }
+
+
+
+
   public function showReport()
   {
 
@@ -246,302 +323,254 @@ class ProgramsController extends \BaseController
     return View::make('local.managers.shared.program_report', compact('title', 'programs_info', 'selected_divulgaciones', 'selected_semesters', 'tables_names'));
   }
 
-	private function cmp($a, $b) 
-	{
-		return strcmp($a->name, $b->name);
-	}
-
-    public function studentProgramAssessmentReport($program_id)
-    {
-		$id=$program_id;
-		ini_set('memory_limit', -1);
-		ini_set('max_execution_time', 300);
-
-
-		$program = Program::find($program_id);
-		$title= $program->school->name.': '.$program->name;
-		$outcomes = Outcome::orderBy('name', 'asc')->get();
-		$schools = School::all();
-		$outcomeCount = Outcome::all()->count();
-		
-// 		var_dump(json_encode($outcomes));
-		$role=Auth::user()->role;
-
-		$programs_ids=array($program->id);
-
-	   $users = User::
-        select('users.*')
-        ->leftJoin('program_user', 'users.id', '=', 'program_user.user_id')
-        ->where(function($query) use($program)
-        {
-            $query
-                ->where('school_id', $program->school_id)
-                ->where('role', 2);
-        })
-        ->orWhere(function($query) use($program)
-        {
-            $query
-                ->where('role', 3)
-                ->where('program_id', $program->id);
-        })
-        ->orWhere(function($query) use($program)
-        {
-            $query
-                ->where('role', 4)
-                ->where('program_id', $program->id);
-        })
-        ->get();
-	
-// 		$outcomes = Outcome::orderBy('name', 'asc')->get();
-// 		$school = School::find($school_id);
-// 		$title= $school->name;
-// 		$outcomeCount = Outcome::all()->count();
-// 		$programs=Program::where('school_id','=',$school_id)->get();
-// 		$programs_ids=array();
-// // 				var_dump($programs);exit();
-// 		$programs_name=array();
-// 		foreach($programs as $program)
-// 		{
-// // 			var_dump($program);
-// 			$programs_ids[]=$program->id;
-// 			$programs_name[$program->id]=$program->name;
-// 		}
-
-        $grouped_courses = Course::
-            //             select(DB::raw('courses.name, courses.code, courses.number, max(courses.outcomes_attempted) as outcomes_attempted, courses.semester_id, courses.program_id'))
-            select(DB::raw('courses.name, courses.code, courses.number, courses.semester_id, courses.program_id'))
-            ->with('semester')
-            ->with('program')
-            ->whereIn('courses.program_id', $programs_ids)
-            ->whereIn('courses.semester_id', Session::get('semesters_ids'))
-            ->leftJoin('programs', 'courses.program_id', '=', 'programs.id')
-            ->groupBy(array('courses.code', 'courses.number', 'courses.semester_id'))
-            ->orderBy('courses.code')
-            ->orderBy('courses.number')
-            ->orderBy('courses.semester_id')
-            ->get();
-
-
-		$role=Auth::user()->role;
-
-		$users =array();
-
-
-		$resultados_todos_obj = DB::table('assessments')
-         						->join('activity_criterion', 'activity_criterion.id', '=', 'assessments.activity_criterion_id')
-         						->join('activities', 'activities.id', '=', 'activity_criterion.activity_id')
-         						->join('courses', 'courses.id', '=', 'activities.course_id')
-         						->join('students', 'students.id', '=', 'assessments.student_id')
-         						->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'activity_criterion.criterion_id')
-         						->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
-         						->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
-         						->join('semesters', 'semesters.id', '=', 'courses.semester_id')
-          						->whereIn('students.program_id',$programs_ids)
-                   			   	->whereIn('semester_id', Session::get('semesters_ids'))
-                   			   	->where('semesters.is_visible','=',1)
-                    			->select('student_id', 'students.program_id', 'semesters.code', 'outcome_id', 'criterion_objective_outcome.criterion_id','score','expected_points')
-								->distinct()
-                    			->get();
-
-		foreach($resultados_todos_obj as $resultado)
-		{
-			if(!isset($resultados_todos[$resultado->program_id][$resultado->outcome_id]['semesters']))
-			{
-				$resultados_todos[$resultado->program_id][$resultado->outcome_id]['semesters']=array();
-			}
-			$resultados_todos[$resultado->program_id][$resultado->outcome_id]['semesters'][]=$resultado->code;
-			$resultados_todos[$resultado->program_id][$resultado->outcome_id]['semesters']=array_unique($resultados_todos[$resultado->program_id][$resultado->outcome_id]['semesters']);
-			if(!isset($resultados_todos[$resultado->program_id][$resultado->outcome_id][$resultado->student_id]['attempted']))
-			{
-				$resultados_todos[$resultado->program_id][$resultado->outcome_id][$resultado->student_id]['attempted']=0;
-			}
-			$resultados_todos[$resultado->program_id][$resultado->outcome_id][$resultado->student_id]['attempted']++;
-
-			if(!isset($resultados_todos[$resultado->program_id][$resultado->outcome_id][$resultado->student_id]['achieved']))
-			{
-				$resultados_todos[$resultado->program_id][$resultado->outcome_id][$resultado->student_id]['achieved']=0;
-			}
-			if($resultado->score>=$resultado->expected_points)
-			{
-				$resultados_todos[$resultado->program_id][$resultado->outcome_id][$resultado->student_id]['achieved']++;
-			}
-		}
-
-		$outcomes_colap=array();
-		$programs=array();
-// 			$outcomes_colap=array();
-		$i=0;
-		$outcomes_attempted=array();
-		$outcomes_attempted_colap=array();
-		$outcomes_achieved_colap=array();
-		$outcomes_attempted_semesters=array();
-		foreach($resultados_todos as $program_id => $resultados_prog)
-		{
-	     	$outcomes_attempted_semesters[$program_id]=array();
-			foreach($resultados_prog as $out=>$datos_out)
-			{
-				$outcomes_achieved[$program_id][$out] = 0;
-				$outcomes_attempted[$program_id][$out] = 0;
-// 				var_dump($datos_out);outcomes_attempted_semesters
-				$outcomes_attempted_semesters[$program_id][$out]=$datos_out['semesters'];
-				unset($datos_out['semesters']);
-// 				var_dump($outcomes_attempted_semesters[$program_id][$out]);
-// 				var_dump($datos_out);
-// 				exit();
-				foreach($datos_out as $res)
-				{
-					$outcomes_attempted[$program_id][$out]++;
-					if(3*$res['achieved']>=2*$res['attempted'])
-						$outcomes_achieved[$program_id][$out]++;
-				}		
-			}
-			$programs[]=Program::find($program_id);
-			if(Program::find($program_id)->is_graduate)
-			{
-				$colapso=array(1=>array(),3=>array(),2=>array(11),12=>array(7,14),10=>array(),4=>array(6,15));
-			}
-			else
-			{
-				$colapso=array(10=>array(),1=>array(),12=>array(7),3=>array(9,8,14),2=>array(11),5=>array(),4=>array(6,13),16=>array());
-			}	
-		
-			$resultados_todos_colap[$program_id]=array();
-			foreach($colapso as $out=>$pares)
-			{
-				$resultados_todos_colap[$program_id][$out]["semesters"]=array();
-				if(isset($resultados_todos[$program_id][$out]))
-					$resultados_todos_colap[$program_id][$out]=$resultados_todos[$program_id][$out];
-					else $resultados_todos_colap[$program_id][$out]=array();
-				foreach($pares as $par)
-				{
-					if(isset($resultados_todos[$program_id][$par]))
-					{	
-// 						unset($resultados_todos[$program_id][$par]['semesters']);
-						
-						foreach($resultados_todos[$program_id][$par] as $estu => $resus)
-						{
-							if($estu!="semesters")
-							{
-								if(!isset($resultados_todos_colap[$program_id][$out][$estu]))
-								{
-									$resultados_todos_colap[$program_id][$out][$estu]['attempted']=0;
-									$resultados_todos_colap[$program_id][$out][$estu]['achieved']=0;
-
-								}
-	// 							print $program_id." ".$par." ".$estu."<br>";
-	// 							var_dump($resultados_todos[$program_id][$par][$estu]); 
-								$resultados_todos_colap[$program_id][$out][$estu]['attempted']+=$resultados_todos[$program_id][$par][$estu]['attempted'];
-								$resultados_todos_colap[$program_id][$out][$estu]['achieved']+=$resultados_todos[$program_id][$par][$estu]['achieved'];
-							}
-							else if(isset($resultados_todos[$program_id][$par]["semesters"]))
-							{
-								if(isset($resultados_todos_colap[$program_id][$out]["semesters"]))
-								{
-									$tmp=array_merge($resultados_todos_colap[$program_id][$out]["semesters"],$resultados_todos[$program_id][$par]["semesters"]);
-// 									var_dump(($tmp));
-// 									var_dump(array_unique($tmp));
-// 									exit();
-
-									$resultados_todos_colap[$program_id][$out]["semesters"]=array_unique($tmp);
-								}
-								else 
-									$resultados_todos_colap[$program_id][$out]["semesters"]=array_unique($resultados_todos[$program_id][$par]["semesters"]);
-							}
-						}
-					}
-				}
-		
-			}
-// 			var_dump($resultados_todos_colap);
-			
-			$outcomes_attempted_colap[$program_id]=array();
-			$outcomes_achieved_colap[$program_id]=array();
-			$outcomes_attempted_colap_semesters[$program_id]=array();
-// 			print $program_id."<br>";
-// 				var_dump($resultados_todos_colap[$program_id]);
-// 			print "<br>";
-			foreach($resultados_todos_colap[$program_id] as $out=>$datos_out)
-			{
-				if(!$i)$outcomes_colap[]=Outcome::find($out);
-// 				$outcomes_attempted_colap_semesters[$program_id][$out]=array();
-				if(isset($datos_out['semesters']))
-				{
-					$outcomes_attempted_colap_semesters[$program_id][$out]=$datos_out['semesters'];
-					unset($datos_out['semesters']);
-				}
-				foreach($datos_out as $res)
-				{
-					if(!isset($outcomes_attempted_colap[$program_id][$out]))
-					{
-						$outcomes_attempted_colap[$program_id][$out]=0;
-						$outcomes_achieved_colap[$program_id][$out]=0;
-					
-					}
-					$outcomes_attempted_colap[$program_id][$out]++;
-					if(3*$res['achieved']>=2*$res['attempted'])
-						$outcomes_achieved_colap[$program_id][$out]++;
-				}
-				if(empty($datos_out))
-				{
-					$outcomes_attempted_colap[$program_id][$out]=0;
-					$outcomes_achieved_colap[$program_id][$out]=0;
-				}
-
-			}
-			$i++;
-		}		
-		usort($outcomes_colap, array($this, "cmp"));
-	// 		var_dump($outcomes_attempted_colap); print "<br>";
-	// 		var_dump($outcomes_achieved_colap); print "<br>";
-	// 	exit();
-		$outcomes_attempted_colap_todo=array();
-		$outcomes_achieved_colap_todo=array();
-		foreach($outcomes_attempted_colap as $program_id => $out_res)
-		{
-			foreach($out_res as $out=>$res)
-			{
-				if(!isset($outcomes_attempted_colap_todo[$out]))
-				{
-					$outcomes_attempted_colap_todo[$out]=0;
-					$outcomes_achieved_colap_todo[$out]=0;
-			
-				}
-				$outcomes_attempted_colap_todo[$out]+=$outcomes_attempted_colap[$program_id][$out];
-				$outcomes_achieved_colap_todo[$out]+=$outcomes_achieved_colap[$program_id][$out];
-		
-		
-			}
-	
-		}
-		$outcomes_attempted_todo=array();
-		$outcomes_achieved_todo=array();
-		foreach($outcomes_attempted as $program_id => $out_res)
-		{
-			foreach($out_res as $out=>$res)
-			{
-				if(!isset($outcomes_attempted_todo[$out]))
-				{
-					$outcomes_attempted_todo[$out]=0;
-					$outcomes_achieved_todo[$out]=0;
-			
-				}
-				$outcomes_attempted_todo[$out]+=$outcomes_attempted[$program_id][$out];
-				$outcomes_achieved_todo[$out]+=$outcomes_achieved[$program_id][$out];
-		
-		
-			}
-	
-		}
-	$outcomes_attempted_colap=$outcomes_attempted_colap_todo;
-	$outcomes_achieved_colap=$outcomes_achieved_colap_todo;
-	$outcomes_attempted=$outcomes_attempted_todo;
-	$outcomes_achieved=$outcomes_achieved_todo;
-// 	var_dump($outcomes_attempted_colap);
-// 	var_dump($outcomes_attempted_colap);
-// 	    return View::make('local.managers.shared.school_student_result', compact('title','outcomes_attempted_colap_semesters','outcomes_attempted_semesters','outcomes_attempted_colap_todo','outcomes_achieved_colap_todo','outcomes_attempted_todo','outcomes_achieved_todo','school','programs_name','role','outcomes','outcomes_colap', 'outcomes_attempted', 'outcomes_achieved', 'outcomes_attempted_colap', 'outcomes_achieved_colap', 'programs', 'users','program_courses','grouped_courses'));
-
-    return View::make('local.managers.shared.program_student_result', compact('title','role','outcomes','outcomes_colap', 'outcomes_attempted', 'outcomes_achieved', 'outcomes_attempted_colap', 'outcomes_achieved_colap', 'program', 'users','program_courses','grouped_courses'));
+  private function cmp($a, $b)
+  {
+    return strcmp($a->name, $b->name);
+  }
+
+  public function studentProgramAssessmentReport($program_id)
+  {
+    $id = $program_id;
+    ini_set('memory_limit', -1);
+    ini_set('max_execution_time', 300);
+
+
+    $program = Program::find($program_id);
+    $title = $program->school->name . ': ' . $program->name;
+    $outcomes = Outcome::orderBy('name', 'asc')->get();
+    $schools = School::all();
+    $outcomeCount = Outcome::all()->count();
+
+    // 		var_dump(json_encode($outcomes));
+    $role = Auth::user()->role;
+
+    $programs_ids = array($program->id);
+
+    $users = User::select('users.*')
+      ->leftJoin('program_user', 'users.id', '=', 'program_user.user_id')
+      ->where(function ($query) use ($program) {
+        $query
+          ->where('school_id', $program->school_id)
+          ->where('role', 2);
+      })
+      ->orWhere(function ($query) use ($program) {
+        $query
+          ->where('role', 3)
+          ->where('program_id', $program->id);
+      })
+      ->orWhere(function ($query) use ($program) {
+        $query
+          ->where('role', 4)
+          ->where('program_id', $program->id);
+      })
+      ->get();
+
+    // 		$outcomes = Outcome::orderBy('name', 'asc')->get();
+    // 		$school = School::find($school_id);
+    // 		$title= $school->name;
+    // 		$outcomeCount = Outcome::all()->count();
+    // 		$programs=Program::where('school_id','=',$school_id)->get();
+    // 		$programs_ids=array();
+    // // 				var_dump($programs);exit();
+    // 		$programs_name=array();
+    // 		foreach($programs as $program)
+    // 		{
+    // // 			var_dump($program);
+    // 			$programs_ids[]=$program->id;
+    // 			$programs_name[$program->id]=$program->name;
+    // 		}
+
+    $grouped_courses = Course::
+      //             select(DB::raw('courses.name, courses.code, courses.number, max(courses.outcomes_attempted) as outcomes_attempted, courses.semester_id, courses.program_id'))
+      select(DB::raw('courses.name, courses.code, courses.number, courses.semester_id, courses.program_id'))
+      ->with('semester')
+      ->with('program')
+      ->whereIn('courses.program_id', $programs_ids)
+      ->whereIn('courses.semester_id', Session::get('semesters_ids'))
+      ->leftJoin('programs', 'courses.program_id', '=', 'programs.id')
+      ->groupBy(array('courses.code', 'courses.number', 'courses.semester_id'))
+      ->orderBy('courses.code')
+      ->orderBy('courses.number')
+      ->orderBy('courses.semester_id')
+      ->get();
+
+
+    $role = Auth::user()->role;
+
+    $users = array();
+
+
+    $resultados_todos_obj = DB::table('assessments')
+      ->join('activity_criterion', 'activity_criterion.id', '=', 'assessments.activity_criterion_id')
+      ->join('activities', 'activities.id', '=', 'activity_criterion.activity_id')
+      ->join('courses', 'courses.id', '=', 'activities.course_id')
+      ->join('students', 'students.id', '=', 'assessments.student_id')
+      ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'activity_criterion.criterion_id')
+      ->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
+      ->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
+      ->join('semesters', 'semesters.id', '=', 'courses.semester_id')
+      ->whereIn('students.program_id', $programs_ids)
+      ->whereIn('semester_id', Session::get('semesters_ids'))
+      ->where('semesters.is_visible', '=', 1)
+      ->select('student_id', 'students.program_id', 'semesters.code', 'outcome_id', 'criterion_objective_outcome.criterion_id', 'score', 'expected_points')
+      ->distinct()
+      ->get();
+
+    foreach ($resultados_todos_obj as $resultado) {
+      if (!isset($resultados_todos[$resultado->program_id][$resultado->outcome_id]['semesters'])) {
+        $resultados_todos[$resultado->program_id][$resultado->outcome_id]['semesters'] = array();
+      }
+      $resultados_todos[$resultado->program_id][$resultado->outcome_id]['semesters'][] = $resultado->code;
+      $resultados_todos[$resultado->program_id][$resultado->outcome_id]['semesters'] = array_unique($resultados_todos[$resultado->program_id][$resultado->outcome_id]['semesters']);
+      if (!isset($resultados_todos[$resultado->program_id][$resultado->outcome_id][$resultado->student_id]['attempted'])) {
+        $resultados_todos[$resultado->program_id][$resultado->outcome_id][$resultado->student_id]['attempted'] = 0;
+      }
+      $resultados_todos[$resultado->program_id][$resultado->outcome_id][$resultado->student_id]['attempted']++;
+
+      if (!isset($resultados_todos[$resultado->program_id][$resultado->outcome_id][$resultado->student_id]['achieved'])) {
+        $resultados_todos[$resultado->program_id][$resultado->outcome_id][$resultado->student_id]['achieved'] = 0;
+      }
+      if ($resultado->score >= $resultado->expected_points) {
+        $resultados_todos[$resultado->program_id][$resultado->outcome_id][$resultado->student_id]['achieved']++;
+      }
+    }
+
+    $outcomes_colap = array();
+    $programs = array();
+    // 			$outcomes_colap=array();
+    $i = 0;
+    $outcomes_attempted = array();
+    $outcomes_attempted_colap = array();
+    $outcomes_achieved_colap = array();
+    $outcomes_attempted_semesters = array();
+    foreach ($resultados_todos as $program_id => $resultados_prog) {
+      $outcomes_attempted_semesters[$program_id] = array();
+      foreach ($resultados_prog as $out => $datos_out) {
+        $outcomes_achieved[$program_id][$out] = 0;
+        $outcomes_attempted[$program_id][$out] = 0;
+        // 				var_dump($datos_out);outcomes_attempted_semesters
+        $outcomes_attempted_semesters[$program_id][$out] = $datos_out['semesters'];
+        unset($datos_out['semesters']);
+        // 				var_dump($outcomes_attempted_semesters[$program_id][$out]);
+        // 				var_dump($datos_out);
+        // 				exit();
+        foreach ($datos_out as $res) {
+          $outcomes_attempted[$program_id][$out]++;
+          if (3 * $res['achieved'] >= 2 * $res['attempted'])
+            $outcomes_achieved[$program_id][$out]++;
+        }
+      }
+      $programs[] = Program::find($program_id);
+      if (Program::find($program_id)->is_graduate) {
+        $colapso = array(1 => array(), 3 => array(), 2 => array(11), 12 => array(7, 14), 10 => array(), 4 => array(6, 15));
+      } else {
+        $colapso = array(10 => array(), 1 => array(), 12 => array(7), 3 => array(9, 8, 14), 2 => array(11), 5 => array(), 4 => array(6, 13), 16 => array());
+      }
+
+      $resultados_todos_colap[$program_id] = array();
+      foreach ($colapso as $out => $pares) {
+        $resultados_todos_colap[$program_id][$out]["semesters"] = array();
+        if (isset($resultados_todos[$program_id][$out]))
+          $resultados_todos_colap[$program_id][$out] = $resultados_todos[$program_id][$out];
+        else $resultados_todos_colap[$program_id][$out] = array();
+        foreach ($pares as $par) {
+          if (isset($resultados_todos[$program_id][$par])) {
+            // 						unset($resultados_todos[$program_id][$par]['semesters']);
+
+            foreach ($resultados_todos[$program_id][$par] as $estu => $resus) {
+              if ($estu != "semesters") {
+                if (!isset($resultados_todos_colap[$program_id][$out][$estu])) {
+                  $resultados_todos_colap[$program_id][$out][$estu]['attempted'] = 0;
+                  $resultados_todos_colap[$program_id][$out][$estu]['achieved'] = 0;
+                }
+                // 							print $program_id." ".$par." ".$estu."<br>";
+                // 							var_dump($resultados_todos[$program_id][$par][$estu]); 
+                $resultados_todos_colap[$program_id][$out][$estu]['attempted'] += $resultados_todos[$program_id][$par][$estu]['attempted'];
+                $resultados_todos_colap[$program_id][$out][$estu]['achieved'] += $resultados_todos[$program_id][$par][$estu]['achieved'];
+              } else if (isset($resultados_todos[$program_id][$par]["semesters"])) {
+                if (isset($resultados_todos_colap[$program_id][$out]["semesters"])) {
+                  $tmp = array_merge($resultados_todos_colap[$program_id][$out]["semesters"], $resultados_todos[$program_id][$par]["semesters"]);
+                  // 									var_dump(($tmp));
+                  // 									var_dump(array_unique($tmp));
+                  // 									exit();
+
+                  $resultados_todos_colap[$program_id][$out]["semesters"] = array_unique($tmp);
+                } else
+                  $resultados_todos_colap[$program_id][$out]["semesters"] = array_unique($resultados_todos[$program_id][$par]["semesters"]);
+              }
+            }
+          }
+        }
+      }
+      // 			var_dump($resultados_todos_colap);
+
+      $outcomes_attempted_colap[$program_id] = array();
+      $outcomes_achieved_colap[$program_id] = array();
+      $outcomes_attempted_colap_semesters[$program_id] = array();
+      // 			print $program_id."<br>";
+      // 				var_dump($resultados_todos_colap[$program_id]);
+      // 			print "<br>";
+      foreach ($resultados_todos_colap[$program_id] as $out => $datos_out) {
+        if (!$i) $outcomes_colap[] = Outcome::find($out);
+        // 				$outcomes_attempted_colap_semesters[$program_id][$out]=array();
+        if (isset($datos_out['semesters'])) {
+          $outcomes_attempted_colap_semesters[$program_id][$out] = $datos_out['semesters'];
+          unset($datos_out['semesters']);
+        }
+        foreach ($datos_out as $res) {
+          if (!isset($outcomes_attempted_colap[$program_id][$out])) {
+            $outcomes_attempted_colap[$program_id][$out] = 0;
+            $outcomes_achieved_colap[$program_id][$out] = 0;
+          }
+          $outcomes_attempted_colap[$program_id][$out]++;
+          if (3 * $res['achieved'] >= 2 * $res['attempted'])
+            $outcomes_achieved_colap[$program_id][$out]++;
+        }
+        if (empty($datos_out)) {
+          $outcomes_attempted_colap[$program_id][$out] = 0;
+          $outcomes_achieved_colap[$program_id][$out] = 0;
+        }
+      }
+      $i++;
+    }
+    usort($outcomes_colap, array($this, "cmp"));
+    // 		var_dump($outcomes_attempted_colap); print "<br>";
+    // 		var_dump($outcomes_achieved_colap); print "<br>";
+    // 	exit();
+    $outcomes_attempted_colap_todo = array();
+    $outcomes_achieved_colap_todo = array();
+    foreach ($outcomes_attempted_colap as $program_id => $out_res) {
+      foreach ($out_res as $out => $res) {
+        if (!isset($outcomes_attempted_colap_todo[$out])) {
+          $outcomes_attempted_colap_todo[$out] = 0;
+          $outcomes_achieved_colap_todo[$out] = 0;
+        }
+        $outcomes_attempted_colap_todo[$out] += $outcomes_attempted_colap[$program_id][$out];
+        $outcomes_achieved_colap_todo[$out] += $outcomes_achieved_colap[$program_id][$out];
+      }
     }
+    $outcomes_attempted_todo = array();
+    $outcomes_achieved_todo = array();
+    foreach ($outcomes_attempted as $program_id => $out_res) {
+      foreach ($out_res as $out => $res) {
+        if (!isset($outcomes_attempted_todo[$out])) {
+          $outcomes_attempted_todo[$out] = 0;
+          $outcomes_achieved_todo[$out] = 0;
+        }
+        $outcomes_attempted_todo[$out] += $outcomes_attempted[$program_id][$out];
+        $outcomes_achieved_todo[$out] += $outcomes_achieved[$program_id][$out];
+      }
+    }
+    $outcomes_attempted_colap = $outcomes_attempted_colap_todo;
+    $outcomes_achieved_colap = $outcomes_achieved_colap_todo;
+    $outcomes_attempted = $outcomes_attempted_todo;
+    $outcomes_achieved = $outcomes_achieved_todo;
+    // 	var_dump($outcomes_attempted_colap);
+    // 	var_dump($outcomes_attempted_colap);
+    // 	    return View::make('local.managers.shared.school_student_result', compact('title','outcomes_attempted_colap_semesters','outcomes_attempted_semesters','outcomes_attempted_colap_todo','outcomes_achieved_colap_todo','outcomes_attempted_todo','outcomes_achieved_todo','school','programs_name','role','outcomes','outcomes_colap', 'outcomes_attempted', 'outcomes_achieved', 'outcomes_attempted_colap', 'outcomes_achieved_colap', 'programs', 'users','program_courses','grouped_courses'));
+
+    return View::make('local.managers.shared.program_student_result', compact('title', 'role', 'outcomes', 'outcomes_colap', 'outcomes_attempted', 'outcomes_achieved', 'outcomes_attempted_colap', 'outcomes_achieved_colap', 'program', 'users', 'program_courses', 'grouped_courses'));
+  }
 
   //   public function show($id)
   //   {
@@ -627,84 +656,81 @@ class ProgramsController extends \BaseController
     $program = Program::find($id);
     $title = $program->name . ' Assessment Report - ' . date('m/d/Y');
     $schools = School::all();
-   // $outcomeCount = Outcome::all()->count();
+    // $outcomeCount = Outcome::all()->count();
     $semesters = Session::get('semesters_ids');
-//     $semesters = DB::table('semesters')->where('id', $course->semester_id)->orderBy('start', 'ASC')->first();
-        $semesters2 = Semester::whereIn('id',Session::get('semesters_ids'))->get();
+    //     $semesters = DB::table('semesters')->where('id', $course->semester_id)->orderBy('start', 'ASC')->first();
+    $semesters2 = Semester::whereIn('id', Session::get('semesters_ids'))->get();
 
     $program_courses = $program->courses;
-     //$outcomes = Outcome::orderBy('name', 'asc')->get();
-	$outcomes = Outcome::active_by_semesters($semesters2, $program->is_graduate);
-	$outcomeCount = count($outcomes);
-	$outcomes_achieved = [];
-	$outcomes_attempted = [];
-
-// 	Log::info($program_courses);
-	foreach($outcomes as $outcome)
-	{
-			$outcomes_attempted[$outcome->id]=0;
-			$outcomes_achieved[$outcome->id]=0;
-	}
-
-    $assessed_courses_count=0;
-	foreach ($program_courses as $course) {
-
-		if ($course->outcomes_att()) {
-			$course_outcomes_attempted = $course->outcomes_att();
-			foreach ($course_outcomes_attempted as $outcome => $score) {
-				if (array_key_exists($outcome, $outcomes_attempted))
-					$outcomes_attempted[$outcome] += $score;
-				else $outcomes_attempted[$outcome] = $score;
-			}
-	        $assessed_courses_count+=1;
-		}
-
-		if ($course->outcomes_ach()) {
-
-			$course_outcomes_achieved = $course->outcomes_ach();
-			foreach ($course_outcomes_achieved as $outcome => $score) {
-				if (array_key_exists($outcome, $outcomes_achieved))
-					$outcomes_achieved[$outcome] += $score;
-				else $outcomes_achieved[$outcome] = $score;
-			}
-			}
-			
-	}
-
-    
-    
-
-//     $outcomes = Outcome::select(array('id', 'name', 'expected_outcome'))
-//         ->whereNull('deleted_at')
-//         ->whereRaw("(deactivation_date IS NULL or deactivation_date >= '{$semesters->start}')")
-//         ->orderBy('name', 'ASC')->get();
-// 
-//     $outcomes_achieved = array_fill(1, $outcomeCount, 0);
-//     $outcomes_attempted = array_fill(1, $outcomeCount, 0);
-
-//     $assessed_courses_count=0;
-//     foreach ($program_courses as $course)
-//     {
-//       if($course->outcomes_achieved!=NULL)
-//       {
-//         $course_outcomes_achieved =json_decode($course->outcomes_achieved, true);
-//         $course_outcomes_attempted =json_decode($course->outcomes_attempted, true);
-//         for($i=1; $i<=count($outcomes_attempted); $i++)
-//         {
-//           $outcomes_achieved[$i]+=$course_outcomes_achieved[$i];
-//           $outcomes_attempted[$i]+=$course_outcomes_attempted[$i];
-//         }
-//         $assessed_courses_count+=1;
-//       }
-//     }
+    //$outcomes = Outcome::orderBy('name', 'asc')->get();
+    $outcomes = Outcome::active_by_semesters($semesters2, $program->is_graduate);
+    $outcomeCount = count($outcomes);
+    $outcomes_achieved = [];
+    $outcomes_attempted = [];
+
+    // 	Log::info($program_courses);
+    foreach ($outcomes as $outcome) {
+      $outcomes_attempted[$outcome->id] = 0;
+      $outcomes_achieved[$outcome->id] = 0;
+    }
+
+    $assessed_courses_count = 0;
+    foreach ($program_courses as $course) {
+
+      if ($course->outcomes_att()) {
+        $course_outcomes_attempted = $course->outcomes_att();
+        foreach ($course_outcomes_attempted as $outcome => $score) {
+          if (array_key_exists($outcome, $outcomes_attempted))
+            $outcomes_attempted[$outcome] += $score;
+          else $outcomes_attempted[$outcome] = $score;
+        }
+        $assessed_courses_count += 1;
+      }
+
+      if ($course->outcomes_ach()) {
+
+        $course_outcomes_achieved = $course->outcomes_ach();
+        foreach ($course_outcomes_achieved as $outcome => $score) {
+          if (array_key_exists($outcome, $outcomes_achieved))
+            $outcomes_achieved[$outcome] += $score;
+          else $outcomes_achieved[$outcome] = $score;
+        }
+      }
+    }
+
+
+
+
+    //     $outcomes = Outcome::select(array('id', 'name', 'expected_outcome'))
+    //         ->whereNull('deleted_at')
+    //         ->whereRaw("(deactivation_date IS NULL or deactivation_date >= '{$semesters->start}')")
+    //         ->orderBy('name', 'ASC')->get();
+    // 
+    //     $outcomes_achieved = array_fill(1, $outcomeCount, 0);
+    //     $outcomes_attempted = array_fill(1, $outcomeCount, 0);
+
+    //     $assessed_courses_count=0;
+    //     foreach ($program_courses as $course)
+    //     {
+    //       if($course->outcomes_achieved!=NULL)
+    //       {
+    //         $course_outcomes_achieved =json_decode($course->outcomes_achieved, true);
+    //         $course_outcomes_attempted =json_decode($course->outcomes_attempted, true);
+    //         for($i=1; $i<=count($outcomes_attempted); $i++)
+    //         {
+    //           $outcomes_achieved[$i]+=$course_outcomes_achieved[$i];
+    //           $outcomes_attempted[$i]+=$course_outcomes_attempted[$i];
+    //         }
+    //         $assessed_courses_count+=1;
+    //       }
+    //     }
 
     /**
      * List of grouped courses (grouped sections)
      */
 
-//       select(DB::raw('name, code, number, max(outcomes_attempted) as outcomes_attempted, semester_id, program_id'))
-    $grouped_courses = Course::
-      select(DB::raw('id, name, code, number, semester_id, program_id'))
+    //       select(DB::raw('name, code, number, max(outcomes_attempted) as outcomes_attempted, semester_id, program_id'))
+    $grouped_courses = Course::select(DB::raw('id, name, code, number, semester_id, program_id'))
       ->with('semester')
       ->with('program')
       ->where('program_id', $program->id)
@@ -715,18 +741,15 @@ class ProgramsController extends \BaseController
       ->orderBy('semester_id')
       ->get();
 
-	foreach($grouped_courses as &$course)
-	{
-		$course->outcomes_attempted=null;
-		if(count($course->assessedActivities) and count($course->publishedActivities))
-		{
-			$course->outcomes_attempted=true;
-		}
-	
-	}
-
-// 	Log::info($grouped_courses);
-// exit();
+    foreach ($grouped_courses as &$course) {
+      $course->outcomes_attempted = null;
+      if (count($course->assessedActivities) and count($course->publishedActivities)) {
+        $course->outcomes_attempted = true;
+      }
+    }
+
+    // 	Log::info($grouped_courses);
+    // exit();
     $semesters = Session::get('semesters_ids');
     $semesters = DB::table('semesters')->whereIn('id', $semesters)->orderBy('start', 'ASC')->first();
     Log::info($semesters->start);
@@ -850,4 +873,4 @@ class ProgramsController extends \BaseController
     Log::info('id:' . Input::get('id'));
     return School::find(Input::get('id'))->programs;
   }
-}
+}

app/controllers/SchoolCoordinatorsController.php

@@ -62,6 +62,7 @@ class SchoolCoordinatorsController extends \BaseController
             ->get();
 
 
+
         $grad_grouped_courses = Course::
             //             select(DB::raw('courses.name, courses.code, courses.number, max(courses.outcomes_attempted) as outcomes_attempted, courses.semester_id, courses.program_id'))
             select(DB::raw('courses.name, courses.code, courses.number, courses.semester_id, courses.program_id'))
@@ -216,7 +217,7 @@ class SchoolCoordinatorsController extends \BaseController
             return View::make('local.managers.shared.schoolTest', compact('title', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
         }
     }
-     public function overview()
+    public function overview()
     {
         ini_set('memory_limit', '256M');
         DB::connection()->disableQueryLog();
@@ -760,4 +761,4 @@ class SchoolCoordinatorsController extends \BaseController
         //         return View::make('local.managers.shared.school', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
         return View::make('local.managers.shared.school', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
     }
-}
+}

app/controllers/SchoolsController.php

@@ -38,6 +38,30 @@ class SchoolsController extends \BaseController
         $outcomes_grad = Outcome::active_by_semesters($semesters, 1);
         $outcomes_undergrad = Outcome::active_by_semesters($semesters, 0);
 
+        $undergrad_stu_outcome_attempted = [];
+        $grad_stu_outcome_attempted = [];
+        $undergrad_stu_outcome_achieved = [];
+        $grad_stu_outcome_achieved = [];
+
+        $attemptedUndergradProgramsPerOutcome = [];
+        $achievedUndergradProgramsPerOutcome = [];
+        $attemptedGradProgramsPerOutcome = [];
+        $achievedGradProgramsPerOutcome = [];
+
+        foreach ($outcomes_undergrad as $outcome) {
+            $undergrad_stu_outcome_attempted[$outcome->id] = 0;
+            $undergrad_stu_outcome_achieved[$outcome->id] = 0;
+            $attemptedUndergradProgramsPerOutcome[$outcome->id] = [];
+            $achievedUndergradProgramsPerOutcome[$outcome->id] = [];
+        }
+
+        foreach ($outcomes_grad as $outcome) {
+            $grad_stu_outcome_attempted[$outcome->id] = 0;
+            $grad_stu_outcome_achieved[$outcome->id] = 0;
+            $attemptedGradProgramsPerOutcome[$outcome->id] = [];
+            $achievedGradProgramsPerOutcome[$outcome->id] = [];
+        }
+
         /**
          * List of grouped courses (grouped sections)
          */
@@ -51,6 +75,8 @@ class SchoolsController extends \BaseController
             ->orderBy('name', 'ASC')
             ->get();
 
+
+
         $grad_programs = DB::table('programs')
             ->select('id', 'name', 'school_id', 'is_graduate')
             ->where('is_graduate', '=', 1)
@@ -59,6 +85,139 @@ class SchoolsController extends \BaseController
             ->get();
 
 
+        //quiero ver si monto el query tm aqui
+
+        $undergrad_programs_list = DB::table('programs')
+            ->select('id', 'name', 'school_id', 'is_graduate')
+            ->where('is_graduate', '=', 0)
+            ->where('school_id', '=', $id)
+            ->orderBy('name', 'ASC')
+            ->lists('id');
+
+        $grad_programs_list = DB::table('programs')
+            ->select('id', 'name', 'school_id', 'is_graduate')
+            ->where('is_graduate', '=', 1)
+            ->where('school_id', '=', $id)
+            ->orderBy('name', 'ASC')
+            ->lists('id');
+
+
+        $undergraduate_student_query = DB::table("courses")
+            ->join('activities', 'activities.course_id', '=', 'courses.id')
+            ->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
+            ->join('assessments', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
+            ->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
+            ->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
+            ->join('criterion_objective_outcome as cobo', 'cobo.criterion_id', '=', 'activity_criterion.criterion_id')
+            ->join('program_criterion_objective_outcome as poco', function ($q) {
+                $q->on('courses.program_id', '=', 'poco.program_id')
+                    ->on('cobo.id', '=', 'poco.cri_obj_out_id');
+            })
+            ->join('students', 'students.id', '=', 'assessments.student_id')
+            ->whereIn('poco.program_id',  $undergrad_programs_list)
+            ->whereIn("courses.semester_id", Session::get('semesters_ids'))
+            ->whereIn('courses.program_id',  $undergrad_programs_list)
+            ->select('students.number as student_id')
+            ->addSelect(DB::raw('count(assessments.activity_criterion_id) as criteria_attempted'))
+            ->addSelect(DB::raw('count(case when assessments.score>=rubrics.expected_points then 1 else NULL end) as criteria_achieved'))
+            ->addSelect('outcome_id')
+            ->groupBy(array('students.id', 'outcome_id'))
+            ->get();
+
+
+        Log::info($undergraduate_student_query);
+
+        $grad_student_query = DB::table("courses")
+            ->join('activities', 'activities.course_id', '=', 'courses.id')
+            ->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
+            ->join('assessments', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
+            ->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
+            ->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
+            ->join('criterion_objective_outcome as cobo', 'cobo.criterion_id', '=', 'activity_criterion.criterion_id')
+            ->join('program_criterion_objective_outcome as poco', function ($q) {
+                $q->on('courses.program_id', '=', 'poco.program_id')
+                    ->on('cobo.id', '=', 'poco.cri_obj_out_id');
+            })
+            ->join('students', 'students.id', '=', 'assessments.student_id')
+            ->whereIn('poco.program_id',  $grad_programs_list)
+            ->whereIn("courses.semester_id", Session::get('semesters_ids'))
+            ->whereIn('courses.program_id',  $grad_programs_list)
+            ->select('students.number as student_id')
+            ->addSelect(DB::raw('count(assessments.activity_criterion_id) as criteria_attempted'))
+            ->addSelect(DB::raw('count(case when assessments.score>=rubrics.expected_points then 1 else NULL end) as criteria_achieved'))
+            ->addSelect('outcome_id')
+            ->groupBy(array('students.id', 'outcome_id'))
+            ->get();
+
+        //school
+
+
+
+        /*
+            student x, crit achieved, crit attempted, outcome 1
+            student x, crit achieved, crit attempted, outcome 2
+            student x, crit achieved, crit attempted, outcome 3
+            student x, crit achieved, crit attempted, outcome 4
+            student y, crit achieved, crit attempted, outcome 1
+            student y, crit achieved, crit attempted, outcome 2
+            student y, crit achieved, crit attempted, outcome 3
+            ....
+            
+
+            */
+
+        $grad_outcomes_attempted = [];
+        $grad_outcomes_achieved = [];
+        $undergrad_outcomes_attempted = [];
+        $undergrad_outcomes_achieved = [];
+
+        foreach ($outcomes_grad as $outcome) {
+            $grad_outcomes_attempted[$outcome->id] = 0;
+            $grad_outcomes_achieved[$outcome->id] = 0;
+        }
+
+        foreach ($outcomes_undergrad as $outcome) {
+            $undergrad_outcomes_attempted[$outcome->id] = 0;
+            $undergrad_outcomes_achieved[$outcome->id] = 0;
+        }
+
+        foreach ($grad_student_query as $result) {
+            if ($result->criteria_attempted != 0) {
+                if (!isset($grad_outcomes_attempted[$result->outcome_id]))
+                    continue;
+
+                $grad_outcomes_attempted[$result->outcome_id]++;
+
+                $percent = $result->criteria_achieved / $result->criteria_attempted * 100;
+
+                if ($percent >= 66.66) {
+
+
+                    $grad_outcomes_achieved[$result->outcome_id]++;
+                }
+            }
+        }
+
+
+
+
+        foreach ($undergraduate_student_query as $result) {
+            if ($result->criteria_attempted != 0) {
+                if (!isset($undergrad_outcomes_attempted[$result->outcome_id]))
+                    continue;
+
+                $undergrad_outcomes_attempted[$result->outcome_id]++;
+
+                $percent = $result->criteria_achieved / $result->criteria_attempted * 100;
+
+                if ($percent >= 66.66) {
+
+
+                    $undergrad_outcomes_achieved[$result->outcome_id]++;
+                }
+            }
+        }
+
         $grad_grouped_courses = Course::
             //             select(DB::raw('courses.name, courses.code, courses.number, max(courses.outcomes_attempted) as outcomes_attempted, courses.semester_id, courses.program_id'))
             select(DB::raw('courses.name, courses.code, courses.number, courses.semester_id, courses.program_id'))
@@ -135,11 +294,116 @@ class SchoolsController extends \BaseController
             }
         }
 
+
+        //como resuelvo programsAttempted y eso
+
+
+        //El query es el mismo de students, lo unico que dividido con programas,
+        //asi que lo que esta haciendo es, prog 1, y coge los dominios y estudiantes que evaluason
+
+
+        $undergrad_prog_attempted =  DB::table("courses")
+            ->join('activities', 'activities.course_id', '=', 'courses.id')
+            ->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
+            ->join('assessments', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
+            ->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
+            ->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
+            ->join('criterion_objective_outcome as cobo', 'cobo.criterion_id', '=', 'activity_criterion.criterion_id')
+            ->join('program_criterion_objective_outcome as poco', function ($q) {
+                $q->on('courses.program_id', '=', 'poco.program_id')
+                    ->on('cobo.id', '=', 'poco.cri_obj_out_id');
+            })
+            ->join('students', 'students.id', '=', 'assessments.student_id')
+            ->whereIn("courses.semester_id", Session::get('semesters_ids'))
+            ->whereIn('poco.program_id',  $undergrad_programs_list)
+
+            ->whereIn('courses.program_id',  $undergrad_programs_list)
+            ->select('students.number as student_id')
+            ->addSelect(DB::raw('count(assessments.activity_criterion_id) as criteria_attempted'))
+            ->addSelect(DB::raw('count(case when assessments.score>=rubrics.expected_points then 1 else NULL end) as criteria_achieved'))
+            ->addSelect('outcome_id')
+            ->addSelect("courses.program_id")
+            ->groupBy(array('students.id', 'outcome_id', 'program_id'))
+            ->get();
+
+        $grad_prog_attempted =  DB::table("courses")
+            ->join('activities', 'activities.course_id', '=', 'courses.id')
+            ->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
+            ->join('assessments', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
+            ->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
+            ->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
+            ->join('criterion_objective_outcome as cobo', 'cobo.criterion_id', '=', 'activity_criterion.criterion_id')
+            ->join('program_criterion_objective_outcome as poco', function ($q) {
+                $q->on('courses.program_id', '=', 'poco.program_id')
+                    ->on('cobo.id', '=', 'poco.cri_obj_out_id');
+            })
+            ->join('students', 'students.id', '=', 'assessments.student_id')
+            ->whereIn("courses.semester_id", Session::get('semesters_ids'))
+            ->whereIn('poco.program_id',  $grad_programs_list)
+
+            ->whereIn('courses.program_id',  $grad_programs_list)
+            ->select('students.number as student_id')
+            ->addSelect(DB::raw('count(assessments.activity_criterion_id) as criteria_attempted'))
+            ->addSelect(DB::raw('count(case when assessments.score>=rubrics.expected_points then 1 else NULL end) as criteria_achieved'))
+            ->addSelect('outcome_id')
+            ->addSelect("courses.program_id")
+            ->groupBy(array('students.id', 'outcome_id', 'program_id'))
+            ->get();
+
+        //este arreglo va a tener attempted[outcome->id][program->id]
+
+        //so la cardinalidad de attempted[outcome->id] dice cuantos programas intentaron, achieved[outcome->id], va 
+        //a decir cuantos pasaron y attempted[outcome->id][program->id] la suma de estudiantes que intentaron
+        // 
+
+
+        foreach ($undergrad_prog_attempted as $row) {
+            $program_id = $row->program_id;
+            $outcome_id = $row->outcome_id;
+            if (!isset($attemptedUndergradProgramsPerOutcome[$outcome_id][$program_id]))
+                $attemptedUndergradProgramsPerOutcome[$outcome_id][$program_id] = 0;
+
+
+            $attemptedUndergradProgramsPerOutcome[$outcome_id][$program_id]++;
+
+            $criteria_attempted_by_stu = $row->criteria_attempted;
+            $criteria_achieved_by_stu = $row->criteria_achieved;
+            if ($criteria_attempted_by_stu != 0 && $criteria_achieved_by_stu / $criteria_attempted_by_stu * 100 >= 66.67) {
+
+                if (!isset($achievedUndergradProgramsPerOutcome[$outcome_id][$program_id]))
+                    $achievedUndergradProgramsPerOutcome[$outcome_id][$program_id] = 0;
+                $achievedUndergradProgramsPerOutcome[$outcome_id][$program_id]++;
+            }
+        }
+
+        foreach ($grad_prog_attempted as $row) {
+            $program_id = $row->program_id;
+            $outcome_id = $row->outcome_id;
+            if (!isset($attemptedGradProgramsPerOutcome[$outcome_id][$program_id]))
+                $attemptedGradProgramsPerOutcome[$outcome_id][$program_id] = 0;
+
+
+            $attemptedGradProgramsPerOutcome[$outcome_id][$program_id]++;
+
+            $criteria_attempted_by_stu = $row->criteria_attempted;
+            $criteria_achieved_by_stu = $row->criteria_achieved;
+            if ($criteria_attempted_by_stu != 0 && $criteria_achieved_by_stu / $criteria_attempted_by_stu * 100 >= 66.67) {
+                if (!isset($achievedGradProgramsPerOutcome[$outcome_id][$program_id]))
+                    $achievedGradProgramsPerOutcome[$outcome_id][$program_id] = 0;
+                $achievedGradProgramsPerOutcome[$outcome_id][$program_id]++;
+            }
+        }
+
+
+
+
+
         /**
          * Calculate how many programs achieved and attempted each outcome in this school
          */
 
         // For each outcome 
+        /*
         foreach ($outcomes_undergrad as $outcome) {
             //         	$attempted_outcomes_per_undergrad_program[$outcome->id]=0;
             //         	$achieved_outcomes_per_undergrad_program[$outcome->id]=0;
@@ -168,12 +432,12 @@ class SchoolsController extends \BaseController
                 //                 $query->whereNotNull('outcomes_attempted');
                 $query->whereIn('semester_id', Session::get('semesters_ids'));
             }))->where('is_graduate', 0)->where('school_id', $school->id)->orderBy('name', 'asc')->get();
-        }
+        }*/
 
         /**
          * Calculate how many Graduate programs achieved and attempted each outcome in this school
          */
-
+        /*
         // For each outcome 
         foreach ($outcomes_grad as $outcome) {
             //         	$attempted_outcomes_per_grad_program[$outcome->id]=0;
@@ -203,7 +467,7 @@ class SchoolsController extends \BaseController
                 //                 $query->whereNotNull('outcomes_attempted');
                 $query->whereIn('semester_id', Session::get('semesters_ids'));
             }))->where('is_graduate', 1)->where('school_id', $school->id)->orderBy('name', 'asc')->get();
-        }
+        }*/
         if ($school->id == 13) {
             //             return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
             return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
@@ -213,31 +477,30 @@ class SchoolsController extends \BaseController
         }
     }
 
-	private function cmp($a, $b) 
-	{
-		return strcmp($a->name, $b->name);
-	}
+    private function cmp($a, $b)
+    {
+        return strcmp($a->name, $b->name);
+    }
 
     public function studentSchoolAssessmentReport($school_id)
     {
-		$id=$school_id;
-		ini_set('memory_limit', -1);
-		ini_set('max_execution_time', 300);
-	
-		$outcomes = Outcome::orderBy('name', 'asc')->get();
-		$school = School::find($school_id);
-		$title= $school->name;
-		$outcomeCount = Outcome::all()->count();
-		$programs=Program::where('school_id','=',$school_id)->get();
-		$programs_ids=array();
-// 				var_dump($programs);exit();
-		$programs_name=array();
-		foreach($programs as $program)
-		{
-// 			var_dump($program);
-			$programs_ids[]=$program->id;
-			$programs_name[$program->id]=$program->name;
-		}
+        $id = $school_id;
+        ini_set('memory_limit', -1);
+        ini_set('max_execution_time', 300);
+
+        $outcomes = Outcome::orderBy('name', 'asc')->get();
+        $school = School::find($school_id);
+        $title = $school->name;
+        $outcomeCount = Outcome::all()->count();
+        $programs = Program::where('school_id', '=', $school_id)->get();
+        $programs_ids = array();
+        // 				var_dump($programs);exit();
+        $programs_name = array();
+        foreach ($programs as $program) {
+            // 			var_dump($program);
+            $programs_ids[] = $program->id;
+            $programs_name[$program->id] = $program->name;
+        }
 
         $grouped_courses = Course::
             //             select(DB::raw('courses.name, courses.code, courses.number, max(courses.outcomes_attempted) as outcomes_attempted, courses.semester_id, courses.program_id'))
@@ -254,219 +517,175 @@ class SchoolsController extends \BaseController
             ->get();
 
 
-		$role=Auth::user()->role;
-
-		$users =array();
-
-
-		$resultados_todos_obj = DB::table('assessments')
-         						->join('activity_criterion', 'activity_criterion.id', '=', 'assessments.activity_criterion_id')
-         						->join('activities', 'activities.id', '=', 'activity_criterion.activity_id')
-         						->join('courses', 'courses.id', '=', 'activities.course_id')
-         						->join('students', 'students.id', '=', 'assessments.student_id')
-         						->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'activity_criterion.criterion_id')
-         						->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
-         						->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
-         						->join('semesters', 'semesters.id', '=', 'courses.semester_id')
-          						->whereIn('students.program_id',$programs_ids)
-                   			   	->whereIn('semester_id', Session::get('semesters_ids'))
-                   			   	->where('semesters.is_visible','=',1)
-                    			->select('student_id', 'students.program_id', 'semesters.code', 'outcome_id', 'criterion_objective_outcome.criterion_id','score','expected_points')
-								->distinct()
-                    			->get();
-
-		foreach($resultados_todos_obj as $resultado)
-		{
-			if(!isset($resultados_todos[$resultado->program_id][$resultado->outcome_id]['semesters']))
-			{
-				$resultados_todos[$resultado->program_id][$resultado->outcome_id]['semesters']=array();
-			}
-			$resultados_todos[$resultado->program_id][$resultado->outcome_id]['semesters'][]=$resultado->code;
-			$resultados_todos[$resultado->program_id][$resultado->outcome_id]['semesters']=array_unique($resultados_todos[$resultado->program_id][$resultado->outcome_id]['semesters']);
-			if(!isset($resultados_todos[$resultado->program_id][$resultado->outcome_id][$resultado->student_id]['attempted']))
-			{
-				$resultados_todos[$resultado->program_id][$resultado->outcome_id][$resultado->student_id]['attempted']=0;
-			}
-			$resultados_todos[$resultado->program_id][$resultado->outcome_id][$resultado->student_id]['attempted']++;
-
-			if(!isset($resultados_todos[$resultado->program_id][$resultado->outcome_id][$resultado->student_id]['achieved']))
-			{
-				$resultados_todos[$resultado->program_id][$resultado->outcome_id][$resultado->student_id]['achieved']=0;
-			}
-			if($resultado->score>=$resultado->expected_points)
-			{
-				$resultados_todos[$resultado->program_id][$resultado->outcome_id][$resultado->student_id]['achieved']++;
-			}
-		}
-
-		$outcomes_colap=array();
-		$programs=array();
-// 			$outcomes_colap=array();
-		$i=0;
-		$outcomes_attempted=array();
-		$outcomes_attempted_colap=array();
-		$outcomes_achieved_colap=array();
-		$outcomes_attempted_semesters=array();
-		foreach($resultados_todos as $program_id => $resultados_prog)
-		{
-	     	$outcomes_attempted_semesters[$program_id]=array();
-			foreach($resultados_prog as $out=>$datos_out)
-			{
-				$outcomes_achieved[$program_id][$out] = 0;
-				$outcomes_attempted[$program_id][$out] = 0;
-// 				var_dump($datos_out);outcomes_attempted_semesters
-				$outcomes_attempted_semesters[$program_id][$out]=$datos_out['semesters'];
-				unset($datos_out['semesters']);
-// 				var_dump($outcomes_attempted_semesters[$program_id][$out]);
-// 				var_dump($datos_out);
-// 				exit();
-				foreach($datos_out as $res)
-				{
-					$outcomes_attempted[$program_id][$out]++;
-					if(3*$res['achieved']>=2*$res['attempted'])
-						$outcomes_achieved[$program_id][$out]++;
-				}		
-			}
-			$programs[]=Program::find($program_id);
-			if(Program::find($program_id)->is_graduate)
-			{
-				$colapso=array(1=>array(),3=>array(),2=>array(11),12=>array(7,14),10=>array(),4=>array(6,15));
-			}
-			else
-			{
-				$colapso=array(10=>array(),1=>array(),12=>array(7),3=>array(9,8,14),2=>array(11),5=>array(),4=>array(6,13),16=>array());
-			}	
-		
-			$resultados_todos_colap[$program_id]=array();
-			foreach($colapso as $out=>$pares)
-			{
-				$resultados_todos_colap[$program_id][$out]["semesters"]=array();
-				if(isset($resultados_todos[$program_id][$out]))
-					$resultados_todos_colap[$program_id][$out]=$resultados_todos[$program_id][$out];
-					else $resultados_todos_colap[$program_id][$out]=array();
-				foreach($pares as $par)
-				{
-					if(isset($resultados_todos[$program_id][$par]))
-					{	
-// 						unset($resultados_todos[$program_id][$par]['semesters']);
-						
-						foreach($resultados_todos[$program_id][$par] as $estu => $resus)
-						{
-							if($estu!="semesters")
-							{
-								if(!isset($resultados_todos_colap[$program_id][$out][$estu]))
-								{
-									$resultados_todos_colap[$program_id][$out][$estu]['attempted']=0;
-									$resultados_todos_colap[$program_id][$out][$estu]['achieved']=0;
-
-								}
-	// 							print $program_id." ".$par." ".$estu."<br>";
-	// 							var_dump($resultados_todos[$program_id][$par][$estu]); 
-								$resultados_todos_colap[$program_id][$out][$estu]['attempted']+=$resultados_todos[$program_id][$par][$estu]['attempted'];
-								$resultados_todos_colap[$program_id][$out][$estu]['achieved']+=$resultados_todos[$program_id][$par][$estu]['achieved'];
-							}
-							else if(isset($resultados_todos[$program_id][$par]["semesters"]))
-							{
-								if(isset($resultados_todos_colap[$program_id][$out]["semesters"]))
-								{
-									$tmp=array_merge($resultados_todos_colap[$program_id][$out]["semesters"],$resultados_todos[$program_id][$par]["semesters"]);
-// 									var_dump(($tmp));
-// 									var_dump(array_unique($tmp));
-// 									exit();
-
-									$resultados_todos_colap[$program_id][$out]["semesters"]=array_unique($tmp);
-								}
-								else 
-									$resultados_todos_colap[$program_id][$out]["semesters"]=array_unique($resultados_todos[$program_id][$par]["semesters"]);
-							}
-						}
-					}
-				}
-		
-			}
-// 			var_dump($resultados_todos_colap);
-			
-			$outcomes_attempted_colap[$program_id]=array();
-			$outcomes_achieved_colap[$program_id]=array();
-			$outcomes_attempted_colap_semesters[$program_id]=array();
-// 			print $program_id."<br>";
-// 				var_dump($resultados_todos_colap[$program_id]);
-// 			print "<br>";
-			foreach($resultados_todos_colap[$program_id] as $out=>$datos_out)
-			{
-				if(!$i)$outcomes_colap[]=Outcome::find($out);
-// 				$outcomes_attempted_colap_semesters[$program_id][$out]=array();
-				if(isset($datos_out['semesters']))
-				{
-					$outcomes_attempted_colap_semesters[$program_id][$out]=$datos_out['semesters'];
-					unset($datos_out['semesters']);
-				}
-				foreach($datos_out as $res)
-				{
-					if(!isset($outcomes_attempted_colap[$program_id][$out]))
-					{
-						$outcomes_attempted_colap[$program_id][$out]=0;
-						$outcomes_achieved_colap[$program_id][$out]=0;
-					
-					}
-					$outcomes_attempted_colap[$program_id][$out]++;
-					if(3*$res['achieved']>=2*$res['attempted'])
-						$outcomes_achieved_colap[$program_id][$out]++;
-				}
-				if(empty($datos_out))
-				{
-					$outcomes_attempted_colap[$program_id][$out]=0;
-					$outcomes_achieved_colap[$program_id][$out]=0;
-				}
-
-			}
-			$i++;
-		}		
-		usort($outcomes_colap, array($this, "cmp"));
-	// 		var_dump($outcomes_attempted_colap); print "<br>";
-	// 		var_dump($outcomes_achieved_colap); print "<br>";
-	// 	exit();
-		$outcomes_attempted_colap_todo=array();
-		$outcomes_achieved_colap_todo=array();
-		foreach($outcomes_attempted_colap as $program_id => $out_res)
-		{
-			foreach($out_res as $out=>$res)
-			{
-				if(!isset($outcomes_attempted_colap_todo[$out]))
-				{
-					$outcomes_attempted_colap_todo[$out]=0;
-					$outcomes_achieved_colap_todo[$out]=0;
-			
-				}
-				$outcomes_attempted_colap_todo[$out]+=$outcomes_attempted_colap[$program_id][$out];
-				$outcomes_achieved_colap_todo[$out]+=$outcomes_achieved_colap[$program_id][$out];
-		
-		
-			}
-	
-		}
-		$outcomes_attempted_todo=array();
-		$outcomes_achieved_todo=array();
-		foreach($outcomes_attempted as $program_id => $out_res)
-		{
-			foreach($out_res as $out=>$res)
-			{
-				if(!isset($outcomes_attempted_todo[$out]))
-				{
-					$outcomes_attempted_todo[$out]=0;
-					$outcomes_achieved_todo[$out]=0;
-			
-				}
-				$outcomes_attempted_todo[$out]+=$outcomes_attempted[$program_id][$out];
-				$outcomes_achieved_todo[$out]+=$outcomes_achieved[$program_id][$out];
-		
-		
-			}
-	
-		}
-	
-
-	    return View::make('local.managers.shared.school_student_result', compact('title','outcomes_attempted_colap_semesters','outcomes_attempted_semesters','outcomes_attempted_colap_todo','outcomes_achieved_colap_todo','outcomes_attempted_todo','outcomes_achieved_todo','school','programs_name','role','outcomes','outcomes_colap', 'outcomes_attempted', 'outcomes_achieved', 'outcomes_attempted_colap', 'outcomes_achieved_colap', 'programs', 'users','program_courses','grouped_courses'));
+        $role = Auth::user()->role;
+
+        $users = array();
+
+
+        $resultados_todos_obj = DB::table('assessments')
+            ->join('activity_criterion', 'activity_criterion.id', '=', 'assessments.activity_criterion_id')
+            ->join('activities', 'activities.id', '=', 'activity_criterion.activity_id')
+            ->join('courses', 'courses.id', '=', 'activities.course_id')
+            ->join('students', 'students.id', '=', 'assessments.student_id')
+            ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'activity_criterion.criterion_id')
+            ->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
+            ->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
+            ->join('semesters', 'semesters.id', '=', 'courses.semester_id')
+            ->whereIn('students.program_id', $programs_ids)
+            ->whereIn('semester_id', Session::get('semesters_ids'))
+            ->where('semesters.is_visible', '=', 1)
+            ->select('student_id', 'students.program_id', 'semesters.code', 'outcome_id', 'criterion_objective_outcome.criterion_id', 'score', 'expected_points')
+            ->distinct()
+            ->get();
+
+        foreach ($resultados_todos_obj as $resultado) {
+            if (!isset($resultados_todos[$resultado->program_id][$resultado->outcome_id]['semesters'])) {
+                $resultados_todos[$resultado->program_id][$resultado->outcome_id]['semesters'] = array();
+            }
+            $resultados_todos[$resultado->program_id][$resultado->outcome_id]['semesters'][] = $resultado->code;
+            $resultados_todos[$resultado->program_id][$resultado->outcome_id]['semesters'] = array_unique($resultados_todos[$resultado->program_id][$resultado->outcome_id]['semesters']);
+            if (!isset($resultados_todos[$resultado->program_id][$resultado->outcome_id][$resultado->student_id]['attempted'])) {
+                $resultados_todos[$resultado->program_id][$resultado->outcome_id][$resultado->student_id]['attempted'] = 0;
+            }
+            $resultados_todos[$resultado->program_id][$resultado->outcome_id][$resultado->student_id]['attempted']++;
+
+            if (!isset($resultados_todos[$resultado->program_id][$resultado->outcome_id][$resultado->student_id]['achieved'])) {
+                $resultados_todos[$resultado->program_id][$resultado->outcome_id][$resultado->student_id]['achieved'] = 0;
+            }
+            if ($resultado->score >= $resultado->expected_points) {
+                $resultados_todos[$resultado->program_id][$resultado->outcome_id][$resultado->student_id]['achieved']++;
+            }
+        }
+
+        $outcomes_colap = array();
+        $programs = array();
+        // 			$outcomes_colap=array();
+        $i = 0;
+        $outcomes_attempted = array();
+        $outcomes_attempted_colap = array();
+        $outcomes_achieved_colap = array();
+        $outcomes_attempted_semesters = array();
+        foreach ($resultados_todos as $program_id => $resultados_prog) {
+            $outcomes_attempted_semesters[$program_id] = array();
+            foreach ($resultados_prog as $out => $datos_out) {
+                $outcomes_achieved[$program_id][$out] = 0;
+                $outcomes_attempted[$program_id][$out] = 0;
+                // 				var_dump($datos_out);outcomes_attempted_semesters
+                $outcomes_attempted_semesters[$program_id][$out] = $datos_out['semesters'];
+                unset($datos_out['semesters']);
+                // 				var_dump($outcomes_attempted_semesters[$program_id][$out]);
+                // 				var_dump($datos_out);
+                // 				exit();
+                foreach ($datos_out as $res) {
+                    $outcomes_attempted[$program_id][$out]++;
+                    if (3 * $res['achieved'] >= 2 * $res['attempted'])
+                        $outcomes_achieved[$program_id][$out]++;
+                }
+            }
+            $programs[] = Program::find($program_id);
+            if (Program::find($program_id)->is_graduate) {
+                $colapso = array(1 => array(), 3 => array(), 2 => array(11), 12 => array(7, 14), 10 => array(), 4 => array(6, 15));
+            } else {
+                $colapso = array(10 => array(), 1 => array(), 12 => array(7), 3 => array(9, 8, 14), 2 => array(11), 5 => array(), 4 => array(6, 13), 16 => array());
+            }
+
+            $resultados_todos_colap[$program_id] = array();
+            foreach ($colapso as $out => $pares) {
+                $resultados_todos_colap[$program_id][$out]["semesters"] = array();
+                if (isset($resultados_todos[$program_id][$out]))
+                    $resultados_todos_colap[$program_id][$out] = $resultados_todos[$program_id][$out];
+                else $resultados_todos_colap[$program_id][$out] = array();
+                foreach ($pares as $par) {
+                    if (isset($resultados_todos[$program_id][$par])) {
+                        // 						unset($resultados_todos[$program_id][$par]['semesters']);
+
+                        foreach ($resultados_todos[$program_id][$par] as $estu => $resus) {
+                            if ($estu != "semesters") {
+                                if (!isset($resultados_todos_colap[$program_id][$out][$estu])) {
+                                    $resultados_todos_colap[$program_id][$out][$estu]['attempted'] = 0;
+                                    $resultados_todos_colap[$program_id][$out][$estu]['achieved'] = 0;
+                                }
+                                // 							print $program_id." ".$par." ".$estu."<br>";
+                                // 							var_dump($resultados_todos[$program_id][$par][$estu]); 
+                                $resultados_todos_colap[$program_id][$out][$estu]['attempted'] += $resultados_todos[$program_id][$par][$estu]['attempted'];
+                                $resultados_todos_colap[$program_id][$out][$estu]['achieved'] += $resultados_todos[$program_id][$par][$estu]['achieved'];
+                            } else if (isset($resultados_todos[$program_id][$par]["semesters"])) {
+                                if (isset($resultados_todos_colap[$program_id][$out]["semesters"])) {
+                                    $tmp = array_merge($resultados_todos_colap[$program_id][$out]["semesters"], $resultados_todos[$program_id][$par]["semesters"]);
+                                    // 									var_dump(($tmp));
+                                    // 									var_dump(array_unique($tmp));
+                                    // 									exit();
+
+                                    $resultados_todos_colap[$program_id][$out]["semesters"] = array_unique($tmp);
+                                } else
+                                    $resultados_todos_colap[$program_id][$out]["semesters"] = array_unique($resultados_todos[$program_id][$par]["semesters"]);
+                            }
+                        }
+                    }
+                }
+            }
+            // 			var_dump($resultados_todos_colap);
+
+            $outcomes_attempted_colap[$program_id] = array();
+            $outcomes_achieved_colap[$program_id] = array();
+            $outcomes_attempted_colap_semesters[$program_id] = array();
+            // 			print $program_id."<br>";
+            // 				var_dump($resultados_todos_colap[$program_id]);
+            // 			print "<br>";
+            foreach ($resultados_todos_colap[$program_id] as $out => $datos_out) {
+                if (!$i) $outcomes_colap[] = Outcome::find($out);
+                // 				$outcomes_attempted_colap_semesters[$program_id][$out]=array();
+                if (isset($datos_out['semesters'])) {
+                    $outcomes_attempted_colap_semesters[$program_id][$out] = $datos_out['semesters'];
+                    unset($datos_out['semesters']);
+                }
+                foreach ($datos_out as $res) {
+                    if (!isset($outcomes_attempted_colap[$program_id][$out])) {
+                        $outcomes_attempted_colap[$program_id][$out] = 0;
+                        $outcomes_achieved_colap[$program_id][$out] = 0;
+                    }
+                    $outcomes_attempted_colap[$program_id][$out]++;
+                    if (3 * $res['achieved'] >= 2 * $res['attempted'])
+                        $outcomes_achieved_colap[$program_id][$out]++;
+                }
+                if (empty($datos_out)) {
+                    $outcomes_attempted_colap[$program_id][$out] = 0;
+                    $outcomes_achieved_colap[$program_id][$out] = 0;
+                }
+            }
+            $i++;
+        }
+        usort($outcomes_colap, array($this, "cmp"));
+        // 		var_dump($outcomes_attempted_colap); print "<br>";
+        // 		var_dump($outcomes_achieved_colap); print "<br>";
+        // 	exit();
+        $outcomes_attempted_colap_todo = array();
+        $outcomes_achieved_colap_todo = array();
+        foreach ($outcomes_attempted_colap as $program_id => $out_res) {
+            foreach ($out_res as $out => $res) {
+                if (!isset($outcomes_attempted_colap_todo[$out])) {
+                    $outcomes_attempted_colap_todo[$out] = 0;
+                    $outcomes_achieved_colap_todo[$out] = 0;
+                }
+                $outcomes_attempted_colap_todo[$out] += $outcomes_attempted_colap[$program_id][$out];
+                $outcomes_achieved_colap_todo[$out] += $outcomes_achieved_colap[$program_id][$out];
+            }
+        }
+        $outcomes_attempted_todo = array();
+        $outcomes_achieved_todo = array();
+        foreach ($outcomes_attempted as $program_id => $out_res) {
+            foreach ($out_res as $out => $res) {
+                if (!isset($outcomes_attempted_todo[$out])) {
+                    $outcomes_attempted_todo[$out] = 0;
+                    $outcomes_achieved_todo[$out] = 0;
+                }
+                $outcomes_attempted_todo[$out] += $outcomes_attempted[$program_id][$out];
+                $outcomes_achieved_todo[$out] += $outcomes_achieved[$program_id][$out];
+            }
+        }
+
+
+        return View::make('local.managers.shared.school_student_result', compact('title', 'outcomes_attempted_colap_semesters', 'outcomes_attempted_semesters', 'outcomes_attempted_colap_todo', 'outcomes_achieved_colap_todo', 'outcomes_attempted_todo', 'outcomes_achieved_todo', 'school', 'programs_name', 'role', 'outcomes', 'outcomes_colap', 'outcomes_attempted', 'outcomes_achieved', 'outcomes_attempted_colap', 'outcomes_achieved_colap', 'programs', 'users', 'program_courses', 'grouped_courses'));
     }
 
     public function showQuasiOri($id)
@@ -916,4 +1135,4 @@ class SchoolsController extends \BaseController
 
         return View::make('local.managers.shared.print_school', compact('title', 'outcomes', 'outcomes_attempted', 'outcomes_achieved', 'school', 'assessed_sections_count', 'school_sections_count', 'achievedProgramsPerOutcome', 'attemptedProgramsPerOutcome', 'grouped_courses', 'participating_programs'));
     }
-}
+}

app/controllers/TemplatesController.php

@@ -125,7 +125,10 @@ class TemplatesController extends \BaseController
 
 		$template->criteria = DB::table('criteria')
 			->join('template_criterion', 'template_criterion.criterion_id', '=', 'criteria.id')
+
 			->where('template_id', $template->id)
+			->select('criteria.*', 'criteria.id as criterion_id', 'template_criterion.id as template_criterion_id')
+
 			->orderBy('position')
 			->get();
 
@@ -196,7 +199,6 @@ class TemplatesController extends \BaseController
 	public function newTemplateProf()
 	{
 		return $this->newTemplate_new();
-			
 	}
 	public function newTemplate_new()
 	{
@@ -214,19 +216,19 @@ class TemplatesController extends \BaseController
 			$templates = Template::orderBy('name', 'ASC')->get();
 			$programs = Program::orderBy('name', 'ASC')->get();
 			$criteria = Criterion::orderBy('name', 'ASC')->get();
-			$school_id_user=NULL;
+			$school_id_user = NULL;
 		} else {
 			if ($role == 2) {
 				$programs = Auth::user()->school->programs;
-				$school_id_user=Auth::user()->school_id;
+				$school_id_user = Auth::user()->school_id;
 			}
 			if ($role == 3) {
 				$programs = Auth::user()->programs()->get();
-				$school_id_user=Auth::user()->programs[0]->school->id;
+				$school_id_user = Auth::user()->programs[0]->school->id;
 			}
 			if ($role == 4) {
 				$programs = Auth::user()->programs()->get();
-				$school_id_user=Auth::user()->programs[0]->school->id;
+				$school_id_user = Auth::user()->programs[0]->school->id;
 			}
 			Log::info(json_encode($school_id_user));
 			$program_ids = array();
@@ -239,52 +241,79 @@ class TemplatesController extends \BaseController
 					$q->whereIn('program_id', $program_ids);
 				}
 			)
-			->whereHas('getObjectivesAttribute', function ($q)
-				{
-					$q->where('objective_id','!=',0);
-				}
-			)
-			->orderBy('name', 'ASC')->get();
-			}
-// 			Log::info("aqui".(count($criteria)));
-// 			Log::info(json_encode(count($criteria)));
-			
-			$templates = Template::where('school_id', '=', $school_id_user)->orWhere('school_id', '=', NULL)
-				->orderBy('name', 'ASC')->get();
-			$criteria_ids = array();
-			
-			foreach ($criteria as $criterion) {
-				$criteria_ids[] = $criterion->id;
-			}
-			$templates_fuera = Template::whereHas('criteria', function ($q) use ($criteria_ids) {
-				$q->whereNotIn('criterion_id', $criteria_ids);
-			})
-				->orderBy('name', 'ASC')->get();
-				
-				
-			$templates_fuera_ids = array();
-			foreach ($templates_fuera as $tf) {
-				$templates_fuera_ids[] = $tf->id;
-			}
-// 			Log::info(json_encode($templates_fuera_ids));
-// exit();
-			$templates_dentro = Template::whereNotIn('id', $templates_fuera_ids)
+				->whereHas(
+					'getObjectivesAttribute',
+					function ($q) {
+						$q->where('objective_id', '!=', 0);
+					}
+				)
 				->orderBy('name', 'ASC')->get();
+		}
+		// 			Log::info("aqui".(count($criteria)));
+		// 			Log::info(json_encode(count($criteria)));
+
+		$templates = Template::where('school_id', '=', $school_id_user)->orWhere('school_id', '=', NULL)
+			->orderBy('name', 'ASC')->get();
+		$criteria_ids = array();
+
+		foreach ($criteria as $criterion) {
+			$criteria_ids[] = $criterion->id;
+		}
+		$templates_fuera = Template::whereHas('criteria', function ($q) use ($criteria_ids) {
+			$q->whereNotIn('criterion_id', $criteria_ids);
+		})
+			->orderBy('name', 'ASC')->get();
+
+
+		$templates_fuera_ids = array();
+		foreach ($templates_fuera as $tf) {
+			$templates_fuera_ids[] = $tf->id;
+		}
+		// 			Log::info(json_encode($templates_fuera_ids));
+		// exit();
+		$templates_dentro = Template::whereNotIn('id', $templates_fuera_ids)
+			->orderBy('name', 'ASC')->get();
 
-// 			if(!isset($templates_dentro))$templates_dentro=
+		// 			if(!isset($templates_dentro))$templates_dentro=
 
-			// 			var_dump(json_encode($templates_dentro));
-// 		}
+		// 			var_dump(json_encode($templates_dentro));
+		// 		}
 
-	$templates_fuera=array();
+		$templates_fuera = array();
 		return View::make('local.managers.shared.rubrics_new', compact('title', 'templates_dentro', 'templates_fuera', 'outcomes', 'criteria', 'schools', 'programs', 'criteria_ids'));
 	}
 
+
+	public function fetchObjectivesForTemplate()
+	{
+		$criteria_ids = Input::get("allCriteria");
+
+		$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 = Objective::join("criterion_objective_outcome", 'objectives.id', '=', 'criterion_objective_outcome.objective_id')
+				->where('criterion_id', $crit->id)
+				->select('objectives.*')
+				->groupBy('objectives.id')
+				->get();
+			$criteria[] = $crit;
+		}
+
+		return $criteria;
+	}
+
 	/**
 	 * Save a new rubric
 	 *
 	 * @return Response
 	 */
+
+
 	public function create()
 	{
 		DB::beginTransaction();

app/controllers/ThreeYearPlanController.php

@@ -47,9 +47,23 @@ class ThreeYearPlanController extends \BaseController
     Log::info("Entre" . json_encode($this));
 
     $title = "Three Years Plans";
-    $programs = Program::get();
+    $programs = Program::orderBy('name', "ASC")->get();
+    $typ = DB::table("three_year_plan")
+      ->orderBy('year_start', "DESC")
+      ->get();
+
+    return View::make('local.managers.admins.show-typ-program', compact('title', 'programs', 'typ'));
+  }
+
+  public function fetchSubmitted()
+  {
+    $typ = Input::get('typ');
 
-    return View::make('local.managers.admins.show-typ-program', compact('title', 'programs'));
+    return DB::table('typ_program')
+
+
+      ->where('three_year_plan_id', $typ)
+      ->get();
   }
 
   public function manageSemesterCycle()
@@ -63,6 +77,25 @@ class ThreeYearPlanController extends \BaseController
     //     return View::make('local.managers.admins.show-typ-program', compact('title', 'programs'));
   }
 
+  //submit
+
+  public function submit($program_id)
+  {
+    $typ_id = Input::get('typ_id');
+    $rows = DB::table('typ_program')
+      ->where('three_year_plan_id', $typ_id)
+      ->where('program_id', $program_id)
+      ->update(array(
+        "is_submitted" => 1
+      ));
+
+    if (isset($rows)) {
+      return "estamos ready";
+    } else {
+      return 500;
+    }
+  }
+
   //busca los links de public y los loadea
   public function findHTML($path_id)
   {

app/models/Course.php

@@ -558,7 +558,9 @@ class Course extends Eloquent
         ->join('assessments', function ($join) {
           $join->on("assessments.student_id", '=', 'course_student.student_id')
             ->on('assessments.activity_criterion_id', '=', 'activity_criterion.id');
-        });
+        })
+        ->where('activities.draft', 0)
+        ->where('activities.diagnostic', 0);
 
 
       // si typ_semester_course esta prendido, then significa que es de los estudiantes del programa
@@ -613,9 +615,9 @@ class Course extends Eloquent
         $table_per_student = $table_per_student->addSelect('outcome_id')
           ->groupBy(array('students.id', 'outcome_id'));
 
-        Log::info($table_per_student->toSql());
-        Log::info($criteria_id);
-        Log::info("Amiga ponle a br");
+        // Log::info($table_per_student->toSql());
+        //Log::info($criteria_id);
+        //Log::info("Amiga ponle a br");
 
         $query = $table_per_student->get();
 

app/models/Criterion.php

@@ -29,7 +29,7 @@ class Criterion extends Eloquent
 
 	public function getObjectivesAttribute()
 	{
-		return $this->belongsToMany('Objective','criterion_objective_outcome');
+		return $this->belongsToMany('Objective', 'criterion_objective_outcome');
 	}
 
 	public function rubrics()

app/routes.php

@@ -223,6 +223,10 @@ Route::group(array('before' => 'auth|has_access'), function () {
     Route::post("fetch_assoc_courses", 'CoursesController@fetchCourses');
 
 
+    //Fetch Objectives for Template
+
+    Route::post("fetchObjectiveForTemplate", 'TemplatesController@fetchObjectivesForTemplate');
+
 
     //shared viewTransformativeActions
 
@@ -269,6 +273,8 @@ Route::group(array('before' => 'auth|has_access'), function () {
         'as' => 'viewThreeYear/{program_id}/{typ}',
         'uses' => 'ThreeYearPlanController@viewPlan'
     ));
+
+    Route::post('submitTYP/{program_id}', 'ThreeYearPlanController@submit');
     // Fetch all criteria associated to an outcome
     Route::post('fetchInfo', array(
         'as' => 'fetchInfo',
@@ -322,6 +328,11 @@ Route::group(array('before' => 'auth|has_access'), function () {
         'as' => 'fetchCriterionWithTrashed',
         'uses' => 'CriteriaController@fetchCriterionWithTrashed'
     ));
+
+    Route::get('learning-outcomes/show/{id}', array(
+        'as' => "learning-outcomes/show/{id}",
+        'uses' => 'OutcomesController@show'
+    ));
     //Fetch objectives for criteria when outcome is chosen
     Route::post('fetchObjectivesForSelect', array(
         'as' => 'fetchObjectivesForSelect',
@@ -399,6 +410,13 @@ Route::group(array('before' => 'auth|has_access'), function () {
             'uses' => 'CriteriaController@fetch'
         ));
 
+        // manage courses permissions. 
+
+        Route::get('manageCoursesPermissions', 'ProgramsController@assignOtherProgramIndex');
+        Route::post('addToOtherProgramTYP', 'ProgramsController@addToOtherProgramTYP');
+        Route::post("fetchPairingInfo", 'ProgramsController@fetchPairingInfo');
+        Route::post("updatePairingInfo", 'ProgramsController@updatePairingInfo');
+
 
         //New navigation routes
 
@@ -409,7 +427,11 @@ Route::group(array('before' => 'auth|has_access'), function () {
 
         //Plans routes
         Route::get('showThreeYearPlans', 'ThreeYearPlanController@adminIndex');
+        Route::post('fetchSubmit', 'ThreeYearPlanController@fetchSubmitted');
         Route::get('showAnnualPlans', 'AnnualPlansController@adminIndex');
+        Route::get("showAnnualReports", "AnnualPlansController@adminReportIndex");
+        Route::post('fetchSubmitAn', 'AnnualPlansController@fetchSubmitted');
+
 
 
         //endhere
@@ -480,6 +502,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
         Route::post('createCriterion', array('before' => 'csrf', 'uses' => 'CriteriaController@create'));
         //Route::get('school-objective', 'Objective2Controller@edit');
         //Route::get('school-criteria', 'CriteriaController@edit');
+
         Route::post('crtiteria/update', array('before' => 'csrf', 'uses' => 'CriteriaController@update'));
 
         //Show users annual plan

app/views/annual_htmls/plan-on-10-10-2022-for-15-by-5478.blade.php

@@ -0,0 +1,653 @@
+<html><body><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;
+    }
+    .outcome-text
+    {
+        text-align:left;
+        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;
+    }
+
+    ul{
+      list-style-type:none;
+    }
+
+    @media print{@page {size: landscape}}
+
+    .outcome-header{
+        text-align:left
+    }
+    hr{
+        border-block-color: black
+    }
+
+    .course-title {
+      text-align:center;
+      font-weight:bold;
+    }
+</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>
+    <p class="header-text">Audiovisual Communication Program Report</p>
+
+    <h1 class="header-text">Academic Year 2021-2022 </h1>
+</div>
+
+    <h1 class="outcome-header">Content Knowledge, Skills or Dispositions in the academic program learning outcomes <sub>(Semester
+            C11)</sub></h1>
+    <hr>
+    <p class="outcome-text">Target to achieve the learning outcome: 66.66 or more of
+        the
+        attempts</p>
+    <p class="outcome-text">Expected percent of students achieving the target by learning outcome:
+        70.00%
+
+        <hr>
+    <table class="table table-striped table-condensed">
+        <thead>
+            <tr>
+                <th>
+                    Objectives for Courses
+                </th>
+
+                <th>
+                    Courses and Criteria
+                </th>
+                <th>
+                    Transformative Actions to be Implemented
+                </th>
+            </tr>
+        </thead>
+        <tbody>
+                            <tr>
+                    <td>
+                        
+                        A. Este es un objetivo para todos los demás
+                    </td>
+                    <td>
+                        <ol type="1">
+
+
+                                                            <li>
+                                    <p>TEST-3002</p>
+
+                                    <ol type="a">
+                                                                                    <li>
+                                                ENVIRONMENT - The student is able to identify and/or analyze environmental factors (external and internal)
+                                            </li>
+                                                                                    <li>
+                                                Criterio 1
+                                            </li>
+                                                                                    <li>
+                                                Criterio 2
+                                            </li>
+                                                                                    <li>
+                                                Criterio 3
+                                            </li>
+                                                                            </ol>
+
+                                                                            <hr style="margin-left:-40px">
+                                    
+
+                                </li>
+                                                            <li>
+                                    <p>TEST-3001</p>
+
+                                    <ol type="a">
+                                                                                    <li>
+                                                Criterio 1
+                                            </li>
+                                                                                    <li>
+                                                Criterio 2
+                                            </li>
+                                                                                    <li>
+                                                Criterio 3
+                                            </li>
+                                                                            </ol>
+
+                                    
+
+                                </li>
+                                                    </ol>
+                    </td>
+                    <td>
+                        <ol type="1">
+                                                                                                <li>
+                                        <p>TEST-3002</p>
+
+                                        <ol type="a">
+                                                                                            <li>
+                                                    <p><strong>QUE acaba de pasar:
+                                                        </strong>uuuuuuuuuuuuuuhhhhhhhhh</p>
+
+                                                </li>
+                                                                                            <li>
+                                                    <p><strong>Members of the vibe:
+                                                        </strong>BUUTUTUTUTUUTUTUT</p>
+
+                                                </li>
+                                                                                    </ol>
+                                        <hr style="margin-left:-40px">
+
+                                                                                    <hr style="margin-left:-40px">
+                                                                                                                                                                        <li>
+                                        <p>TEST-3001</p>
+
+                                        <ol type="a">
+                                                                                            <li>
+                                                    <p><strong>Quiero atar esta:
+                                                        </strong>accion transformadora a</p>
+
+                                                </li>
+                                                                                            <li>
+                                                    <p><strong>Escape reality:
+                                                        </strong>it doesnt face you i need a breakthrough</p>
+
+                                                </li>
+                                                                                    </ol>
+                                        <hr style="margin-left:-40px">
+
+                                                                                                                            </ol>
+
+
+                    </td>
+
+
+                </tr>
+            
+        </tbody>
+
+    </table>
+
+        
+            <h2>Program Transformative Actions</h2>
+            <hr>
+
+            <table class="table table-striped table-condensed">
+                <thead>
+                    <tr>
+                        <th></th>
+                        <th>Transformative Action</th>
+                        <th>Category</th>
+
+
+                    </tr>
+                </thead>
+                <tbody>
+                                            <tr>
+                            <td>1.</td>
+                            <td>
+                                <strong>We lift our voices: </strong>For all the things that we have done
+
+
+                            </td>
+                            <td>
+                                To god
+                            </td>
+
+
+
+
+                        </tr>
+                                            <tr>
+                            <td>2.</td>
+                            <td>
+                                <strong>walk away: </strong>around and around
+
+
+                            </td>
+                            <td>
+                                Cosa guapa
+                            </td>
+
+
+
+
+                        </tr>
+                                            <tr>
+                            <td>3.</td>
+                            <td>
+                                <strong>After aAAAlll: </strong>MmmmHHmmmMM
+
+
+                            </td>
+                            <td>
+                                Cosa guapa
+                            </td>
+
+
+
+
+                        </tr>
+                                            <tr>
+                            <td>4.</td>
+                            <td>
+                                <strong>Parapara : </strong>Paa pa paaa pa pa pa
+
+
+                            </td>
+                            <td>
+                                Cosa guapa
+                            </td>
+
+
+
+
+                        </tr>
+                    
+                </tbody>
+            </table>
+            <hr>
+        
+        <h1 class="outcome-header">Information Literacy <sub>(Semester
+            C11)</sub></h1>
+    <hr>
+    <p class="outcome-text">Target to achieve the learning outcome: 66.66 or more of
+        the
+        attempts</p>
+    <p class="outcome-text">Expected percent of students achieving the target by learning outcome:
+        70.00%
+
+        <hr>
+    <table class="table table-striped table-condensed">
+        <thead>
+            <tr>
+                <th>
+                    Objectives for Courses
+                </th>
+
+                <th>
+                    Courses and Criteria
+                </th>
+                <th>
+                    Transformative Actions to be Implemented
+                </th>
+            </tr>
+        </thead>
+        <tbody>
+                            <tr>
+                    <td>
+                        
+                        A. Este es un objetivo para todos los demás
+                    </td>
+                    <td>
+                        <ol type="1">
+
+
+                                                            <li>
+                                    <p>TEST-3002</p>
+
+                                    <ol type="a">
+                                                                                    <li>
+                                                Criterio 2 para CE y IL
+                                            </li>
+                                                                                    <li>
+                                                Criterio 2 para CE y IL
+                                            </li>
+                                                                                    <li>
+                                                Criterio 4
+                                            </li>
+                                                                                    <li>
+                                                ENVIRONMENT - The student is able to identify and/or analyze environmental factors (external and internal)
+                                            </li>
+                                                                            </ol>
+
+                                    
+
+                                </li>
+                                                    </ol>
+                    </td>
+                    <td>
+                        <ol type="1">
+                                                                                                                </ol>
+
+
+                    </td>
+
+
+                </tr>
+            
+        </tbody>
+
+    </table>
+
+        
+            <h2>Program Transformative Actions</h2>
+            <hr>
+
+            <table class="table table-striped table-condensed">
+                <thead>
+                    <tr>
+                        <th></th>
+                        <th>Transformative Action</th>
+                        <th>Category</th>
+
+
+                    </tr>
+                </thead>
+                <tbody>
+                                            <tr>
+                            <td>1.</td>
+                            <td>
+                                <strong>Paa: </strong>nananaaaaaa
+
+
+                            </td>
+                            <td>
+                                De todo lo que
+                            </td>
+
+
+
+
+                        </tr>
+                    
+                </tbody>
+            </table>
+            <hr>
+        
+        <h1 class="outcome-header">Effective Communication Skills <sub>(Semester
+            C12)</sub></h1>
+    <hr>
+    <p class="outcome-text">Target to achieve the learning outcome: 66.66 or more of
+        the
+        attempts</p>
+    <p class="outcome-text">Expected percent of students achieving the target by learning outcome:
+        70.00%
+
+        <hr>
+    <table class="table table-striped table-condensed">
+        <thead>
+            <tr>
+                <th>
+                    Objectives for Courses
+                </th>
+
+                <th>
+                    Courses and Criteria
+                </th>
+                <th>
+                    Transformative Actions to be Implemented
+                </th>
+            </tr>
+        </thead>
+        <tbody>
+                            <tr>
+                    <td>
+                        
+                        A. Esto es un objetivo para Comunicación Efectiva.
+                    </td>
+                    <td>
+                        <ol type="1">
+
+
+                                                            <li>
+                                    <p>TEST-3002</p>
+
+                                    <ol type="a">
+                                                                                    <li>
+                                                ENVIRONMENT - The student is able to identify and/or analyze environmental factors (external and internal)
+                                            </li>
+                                                                            </ol>
+
+                                    
+
+                                </li>
+                                                    </ol>
+                    </td>
+                    <td>
+                        <ol type="1">
+                                                                                                                </ol>
+
+
+                    </td>
+
+
+                </tr>
+            
+        </tbody>
+
+    </table>
+
+        <h1 class="outcome-header">Critical Thinking <sub>(Semester
+            C12)</sub></h1>
+    <hr>
+    <p class="outcome-text">Target to achieve the learning outcome: 66.66 or more of
+        the
+        attempts</p>
+    <p class="outcome-text">Expected percent of students achieving the target by learning outcome:
+        70.00%
+
+        <hr>
+    <table class="table table-striped table-condensed">
+        <thead>
+            <tr>
+                <th>
+                    Objectives for Courses
+                </th>
+
+                <th>
+                    Courses and Criteria
+                </th>
+                <th>
+                    Transformative Actions to be Implemented
+                </th>
+            </tr>
+        </thead>
+        <tbody>
+                            <tr>
+                    <td>
+                        
+                        A. Este es un objetivo para critical thinking.
+                    </td>
+                    <td>
+                        <ol type="1">
+
+
+                                                            <li>
+                                    <p>TEST-3002</p>
+
+                                    <ol type="a">
+                                                                                    <li>
+                                                Criterio 1 para CT
+                                            </li>
+                                                                                    <li>
+                                                ENVIRONMENT - The student is able to identify and/or analyze environmental factors (external and internal)
+                                            </li>
+                                                                            </ol>
+
+                                                                            <hr style="margin-left:-40px">
+                                    
+
+                                </li>
+                                                            <li>
+                                    <p>TEST-3001</p>
+
+                                    <ol type="a">
+                                                                                    <li>
+                                                Criterio 3
+                                            </li>
+                                                                            </ol>
+
+                                    
+
+                                </li>
+                                                    </ol>
+                    </td>
+                    <td>
+                        <ol type="1">
+                                                                                                                                                                            </ol>
+
+
+                    </td>
+
+
+                </tr>
+            
+        </tbody>
+
+    </table>
+
+        <h1 class="outcome-header">Social Responsibility <sub>(Semester
+            C12)</sub></h1>
+    <hr>
+    <p class="outcome-text">Target to achieve the learning outcome: 66.66 or more of
+        the
+        attempts</p>
+    <p class="outcome-text">Expected percent of students achieving the target by learning outcome:
+        70.00%
+
+        <hr>
+    <table class="table table-striped table-condensed">
+        <thead>
+            <tr>
+                <th>
+                    Objectives for Courses
+                </th>
+
+                <th>
+                    Courses and Criteria
+                </th>
+                <th>
+                    Transformative Actions to be Implemented
+                </th>
+            </tr>
+        </thead>
+        <tbody>
+                            <tr>
+                    <td>
+                        
+                        A. Este es un objetivo para todos los demás
+                    </td>
+                    <td>
+                        <ol type="1">
+
+
+                                                            <li>
+                                    <p>COMA-4317</p>
+
+                                    <ol type="a">
+                                                                                    <li>
+                                                Estamos aquoi
+                                            </li>
+                                                                            </ol>
+
+                                                                            <hr style="margin-left:-40px">
+                                    
+
+                                </li>
+                                                            <li>
+                                    <p>TEST-3002</p>
+
+                                    <ol type="a">
+                                                                                    <li>
+                                                Estamos aquoi
+                                            </li>
+                                                                            </ol>
+
+                                    
+
+                                </li>
+                                                    </ol>
+                    </td>
+                    <td>
+                        <ol type="1">
+                                                                                                                                                                            </ol>
+
+
+                    </td>
+
+
+                </tr>
+            
+        </tbody>
+
+    </table>
+
+    
+
+</body></html>
+<script type="text/javascript">
+
+
+</script>

app/views/annual_htmls/report-on-10-10-2022-for-15-by-5478.blade.php

@@ -0,0 +1,948 @@
+<html><head><script src="https://cdnjs.cloudflare.com/ajax/libs/jspdf/1.3.2/jspdf.debug.js"></script></head><body><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;
+    }
+    .outcome-text
+    {
+        text-align:left;
+        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;
+    }
+
+    ul{
+      list-style-type:none;
+    }
+
+    @media print{@page {size: landscape}}
+
+    .outcome-header{
+        text-align:left
+    }
+    hr{
+        border-block-color: black
+    }
+
+    .course-title {
+      text-align:center;
+      font-weight:bold;
+    }
+</style><style type="text/css" media="print">
+  @page { size: landscape; }
+</style><div id="theEntireDoc">
+    <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>
+        <p class="header-text">Audiovisual Communication Program Report</p>
+
+        <h1 class="header-text">Academic Year 2021-2022 </h1>
+    </div>
+
+                        <h1 class="outcome-header">Content Knowledge, Skills or Dispositions in the academic program learning outcomes <sub>(Semester
+                    C11)</sub></h1>
+            <hr>
+            <p class="outcome-text">Target to achieve the learning outcome: 66.66 or more
+                of
+                the
+                attempts</p>
+            <p class="outcome-text">Expected percent of students achieving the target by learning outcome:
+                70.00%
+            <p class="outcome-text">Results for Content Knowledge, Skills or Dispositions in the academic program learning outcomes
+
+                                    <em style="color: red">66.67% </em>
+                
+            </p>
+            <hr>
+            <ol type="I">
+                <li>
+                    <h2>Courses Assessment</h2>
+                    <hr style="border-block-color: black">
+
+                    <ol type="A">
+                                                    <li>
+
+                                <h2>Este es un objetivo para todos los demás: </h2>
+
+                                                                    <h2 class="course-title">
+                                        TEST-3002
+                                    </h2>
+                                    <h2 class="outcome-text">Performance of Students by Learning Outcome Criteria</h2>
+                                    <table class="table table-striped table-condensed">
+                                        <thead>
+                                            <tr>
+                                                <th></th>
+                                                <th>Criteria</th>
+
+                                                <th>Number of Students Assessed</th>
+
+
+                                                <th>Number of Students that Achieved the Target</th>
+                                                <th>Percentage</th>
+
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                                                                            <tr>
+                                                    <td>1.</td>
+                                                    <td>
+                                                        Criterio 1
+
+                                                                                                            </td>
+                                                    <td>
+                                                        3
+                                                    </td>
+                                                    <td>
+                                                        3
+                                                    </td>
+
+                                                    <td>
+                                                        100%
+                                                    </td>
+
+
+                                                </tr>
+                                                                                            <tr>
+                                                    <td>2.</td>
+                                                    <td>
+                                                        Criterio 2
+
+                                                                                                            </td>
+                                                    <td>
+                                                        5
+                                                    </td>
+                                                    <td>
+                                                        4
+                                                    </td>
+
+                                                    <td>
+                                                        80%
+                                                    </td>
+
+
+                                                </tr>
+                                                                                            <tr>
+                                                    <td>3.</td>
+                                                    <td>
+                                                        Criterio 3
+
+                                                                                                            </td>
+                                                    <td>
+                                                        4
+                                                    </td>
+                                                    <td>
+                                                        2
+                                                    </td>
+
+                                                    <td>
+                                                        50%
+                                                    </td>
+
+
+                                                </tr>
+                                            
+                                        </tbody>
+                                    </table>
+                                                                            <h2 class="outcome-text">Follow up on Course's Proposed Transformative Actions
+                                        </h2>
+                                        <table class="table table-striped table-condensed">
+                                            <thead>
+                                                <tr>
+                                                    <th></th>
+                                                    <th>Transformative Actions</th>
+
+                                                    <th>Was it Implemented on Semester
+                                                        C11 ?</th>
+
+
+                                                    <th>Was this transformative action helpful to achieve the learning
+                                                        expectation?</th>
+                                                    <th>Explain briefly about the implementation of this transformative
+                                                        action
+                                                        or why was it not implemented</th>
+
+                                                </tr>
+                                            </thead>
+                                            <tbody>
+                                                                                                                                                    <tr>
+                                                        <td>1.</td>
+                                                        <td>
+                                                            <strong>QUE acaba de pasar: </strong>
+                                                            uuuuuuuuuuuuuuhhhhhhhhh
+
+
+                                                        </td>
+                                                                                                                    <td>
+                                                                                                                                    Yes
+                                                                                                                            </td>
+                                                            <td>
+                                                                                                                                                                                                            No
+                                                                                                                                    
+                                                            </td>
+
+                                                            <td>
+
+                                                                Acho yya im tired
+                                                            </td>
+                                                        
+
+                                                    </tr>
+                                                                                                    <tr>
+                                                        <td>2.</td>
+                                                        <td>
+                                                            <strong>Members of the vibe: </strong>
+                                                            BUUTUTUTUTUUTUTUT
+
+
+                                                        </td>
+                                                                                                                    <td>
+                                                                                                                                    Yes
+                                                                                                                            </td>
+                                                            <td>
+                                                                                                                                                                                                            Yes
+                                                                                                                                    
+                                                            </td>
+
+                                                            <td>
+
+                                                                En medio de un conflicto
+                                                            </td>
+                                                        
+
+                                                    </tr>
+                                                
+                                            </tbody>
+                                        </table>
+                                                                                                                <h2 class="outcome-text">Future Transformative Actions for Course
+                                        </h2>
+                                        <table class="table table-striped table-condensed">
+                                            <thead>
+                                                <tr>
+                                                    <th></th>
+                                                    <th>Transformative Actions to be Implemented</th>
+
+                                                    <th>Semesters where the Transformative Action will be Implemented
+                                                    </th>
+
+
+
+
+                                                </tr>
+                                            </thead>
+                                            <tbody>
+
+                                                                                                    <tr>
+                                                        <td>1.</td>
+                                                        <td>
+                                                            <strong>al no verte ni tenerte: </strong>
+                                                            El silencio me atormenta
+
+
+                                                        </td>
+                                                        <td>
+                                                                                                                            <p style="display:inline">C21, </p>
+                                                                                                                            <p style="display:inline">C41, </p>
+                                                                                                                    </td>
+
+
+                                                    </tr>
+                                                                                                    <tr>
+                                                        <td>2.</td>
+                                                        <td>
+                                                            <strong>Que quiero escuchar tu voz: </strong>
+                                                            que estoy muy triste
+
+
+                                                        </td>
+                                                        <td>
+                                                                                                                            <p style="display:inline">C21, </p>
+                                                                                                                            <p style="display:inline">C32, </p>
+                                                                                                                    </td>
+
+
+                                                    </tr>
+                                                                                                    <tr>
+                                                        <td>3.</td>
+                                                        <td>
+                                                            <strong>No es una novela: </strong>
+                                                            este amor
+
+
+                                                        </td>
+                                                        <td>
+                                                                                                                            <p style="display:inline">C21, </p>
+                                                                                                                            <p style="display:inline">C22, </p>
+                                                                                                                            <p style="display:inline">C31, </p>
+                                                                                                                            <p style="display:inline">C41, </p>
+                                                                                                                    </td>
+
+
+                                                    </tr>
+                                                                                                    <tr>
+                                                        <td>4.</td>
+                                                        <td>
+                                                            <strong>Una nueva: </strong>
+                                                            Una nueva accion transformadora
+
+
+                                                        </td>
+                                                        <td>
+                                                                                                                            <p style="display:inline">C22, </p>
+                                                                                                                    </td>
+
+
+                                                    </tr>
+                                                                                                    <tr>
+                                                        <td>5.</td>
+                                                        <td>
+                                                            <strong>Ojala que borracha: </strong>
+                                                            tu amiga ponga esta cancion
+
+
+                                                        </td>
+                                                        <td>
+                                                                                                                            <p style="display:inline">C22, </p>
+                                                                                                                            <p style="display:inline">C41, </p>
+                                                                                                                    </td>
+
+
+                                                    </tr>
+                                                
+                                            </tbody>
+                                        </table>
+                                                                        <hr>
+                                                                    <h2 class="course-title">
+                                        TEST-3001
+                                    </h2>
+                                    <h2 class="outcome-text">Performance of Students by Learning Outcome Criteria</h2>
+                                    <table class="table table-striped table-condensed">
+                                        <thead>
+                                            <tr>
+                                                <th></th>
+                                                <th>Criteria</th>
+
+                                                <th>Number of Students Assessed</th>
+
+
+                                                <th>Number of Students that Achieved the Target</th>
+                                                <th>Percentage</th>
+
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                                                                            <tr>
+                                                    <td>1.</td>
+                                                    <td>
+                                                        Criterio 1
+
+                                                                                                            </td>
+                                                    <td>
+                                                        18
+                                                    </td>
+                                                    <td>
+                                                        13
+                                                    </td>
+
+                                                    <td>
+                                                        72.22%
+                                                    </td>
+
+
+                                                </tr>
+                                                                                            <tr>
+                                                    <td>2.</td>
+                                                    <td>
+                                                        Criterio 2
+
+                                                                                                            </td>
+                                                    <td>
+                                                        18
+                                                    </td>
+                                                    <td>
+                                                        14
+                                                    </td>
+
+                                                    <td>
+                                                        77.78%
+                                                    </td>
+
+
+                                                </tr>
+                                                                                            <tr>
+                                                    <td>3.</td>
+                                                    <td>
+                                                        Criterio 3
+
+                                                                                                            </td>
+                                                    <td>
+                                                        17
+                                                    </td>
+                                                    <td>
+                                                        13
+                                                    </td>
+
+                                                    <td>
+                                                        76.47%
+                                                    </td>
+
+
+                                                </tr>
+                                            
+                                        </tbody>
+                                    </table>
+                                                                            <h2 class="outcome-text">Follow up on Course's Proposed Transformative Actions
+                                        </h2>
+                                        <table class="table table-striped table-condensed">
+                                            <thead>
+                                                <tr>
+                                                    <th></th>
+                                                    <th>Transformative Actions</th>
+
+                                                    <th>Was it Implemented on Semester
+                                                        C11 ?</th>
+
+
+                                                    <th>Was this transformative action helpful to achieve the learning
+                                                        expectation?</th>
+                                                    <th>Explain briefly about the implementation of this transformative
+                                                        action
+                                                        or why was it not implemented</th>
+
+                                                </tr>
+                                            </thead>
+                                            <tbody>
+                                                                                                                                                    <tr>
+                                                        <td>1.</td>
+                                                        <td>
+                                                            <strong>Quiero atar esta: </strong>
+                                                            accion transformadora a
+
+
+                                                        </td>
+                                                                                                                    <td>
+                                                                                                                                    No
+                                                                                                                            </td>
+                                                            <td>
+                                                                                                                                    N/A
+                                                                
+                                                            </td>
+
+                                                            <td>
+
+                                                                 No fue implementado porque mi existencia fue media barata
+
+                                                            </td>
+                                                        
+
+                                                    </tr>
+                                                                                                    <tr>
+                                                        <td>2.</td>
+                                                        <td>
+                                                            <strong>Escape reality: </strong>
+                                                            it doesnt face you i need a breakthrough
+
+
+                                                        </td>
+                                                                                                                    <td>
+                                                                                                                                    Yes
+                                                                                                                            </td>
+                                                            <td>
+                                                                                                                                                                                                            No
+                                                                                                                                    
+                                                            </td>
+
+                                                            <td>
+
+                                                                 Env no se que paso pero just no bregó por alguna razon
+                                                            </td>
+                                                        
+
+                                                    </tr>
+                                                
+                                            </tbody>
+                                        </table>
+                                                                                                                <h2 class="outcome-text">Future Transformative Actions for Course
+                                        </h2>
+                                        <table class="table table-striped table-condensed">
+                                            <thead>
+                                                <tr>
+                                                    <th></th>
+                                                    <th>Transformative Actions to be Implemented</th>
+
+                                                    <th>Semesters where the Transformative Action will be Implemented
+                                                    </th>
+
+
+
+
+                                                </tr>
+                                            </thead>
+                                            <tbody>
+
+                                                                                                    <tr>
+                                                        <td>1.</td>
+                                                        <td>
+                                                            <strong>Termine bacchilerrato: </strong>
+                                                            aisoufh9sdfh9usdhf9usdf
+
+
+                                                        </td>
+                                                        <td>
+                                                                                                                            <p style="display:inline">C21, </p>
+                                                                                                                            <p style="display:inline">C32, </p>
+                                                                                                                            <p style="display:inline">C42, </p>
+                                                                                                                    </td>
+
+
+                                                    </tr>
+                                                                                                    <tr>
+                                                        <td>2.</td>
+                                                        <td>
+                                                            <strong>que es la que hay: </strong>
+                                                            skjdbfuosdhfosdf
+
+
+                                                        </td>
+                                                        <td>
+                                                                                                                            <p style="display:inline">C21, </p>
+                                                                                                                            <p style="display:inline">C31, </p>
+                                                                                                                            <p style="display:inline">C32, </p>
+                                                                                                                    </td>
+
+
+                                                    </tr>
+                                                
+                                            </tbody>
+                                        </table>
+                                                                        <hr>
+                                
+
+
+
+                            </li>
+                        
+
+                    </ol>
+
+
+                </li>
+
+
+
+                                    <li>
+                        <h2>Program Transformative Actions</h2>
+                        <hr>
+
+                        <table class="table table-striped table-condensed">
+                            <thead>
+                                <tr>
+                                    <th></th>
+                                    <th>Transformative Action</th>
+                                    <th>Category</th>
+                                    <th>Results</th>
+
+                                    <th>Was this helpful to achieve the learning expectation?</th>
+                                    <th>Explain briefly details about the implementation</th>
+
+                                </tr>
+                            </thead>
+                            <tbody>
+                                                                    <tr>
+                                        <td>1.</td>
+                                        <td>
+                                            <strong>We lift our voices: </strong>For all the things that we have done
+
+
+                                        </td>
+                                        <td>
+                                            To god
+                                        </td>
+
+                                                                                    <td>
+                                                Que empieza con flores y termina con baina
+                                            </td>
+
+                                            <td>
+                                                                                                    Yes
+                                                                                            </td>
+                                            <td>
+                                                Mal de amooore
+                                            </td>
+                                        
+
+                                    </tr>
+                                                                    <tr>
+                                        <td>2.</td>
+                                        <td>
+                                            <strong>walk away: </strong>around and around
+
+
+                                        </td>
+                                        <td>
+                                            Cosa guapa
+                                        </td>
+
+                                                                                    <td>
+                                                Por favor
+                                            </td>
+
+                                            <td>
+                                                                                                    No
+                                                                                            </td>
+                                            <td>
+                                                asdouhasdo
+                                            </td>
+                                        
+
+                                    </tr>
+                                                                    <tr>
+                                        <td>3.</td>
+                                        <td>
+                                            <strong>After aAAAlll: </strong>MmmmHHmmmMM
+
+
+                                        </td>
+                                        <td>
+                                            Cosa guapa
+                                        </td>
+
+                                                                                    <td>
+                                                BRRR
+                                            </td>
+
+                                            <td>
+                                                                                                    Yes
+                                                                                            </td>
+                                            <td>
+                                                Quiero encontrarte almenos
+                                            </td>
+                                        
+
+                                    </tr>
+                                                                    <tr>
+                                        <td>4.</td>
+                                        <td>
+                                            <strong>Parapara : </strong>Paa pa paaa pa pa pa
+
+
+                                        </td>
+                                        <td>
+                                            Cosa guapa
+                                        </td>
+
+                                                                                    <td>
+                                                Y que hay de mi
+                                            </td>
+
+                                            <td>
+                                                                                                    No
+                                                                                            </td>
+                                            <td>
+                                                Y que hay de tiii
+                                            </td>
+                                        
+
+                                    </tr>
+                                
+                            </tbody>
+                        </table>
+                        <hr>
+                    </li>
+                
+                                    <li>
+                        <h2>Comments</h2>
+                        <hr>
+                        <table class='table table-striped table-condensed'>
+                            <tbody>
+                                                                    <tr>
+                                        <td>
+                                            1.
+                                        </td>
+                                        <td>
+                                            Myyy little love
+                                        </td>
+                                    </tr>
+                                                                    <tr>
+                                        <td>
+                                            2.
+                                        </td>
+                                        <td>
+                                            BAAAAAAAARely
+                                        </td>
+                                    </tr>
+                                                            </tbody>
+                        </table>
+
+                    </li>
+                            </ol>
+                                <h1 class="outcome-header">Information Literacy <sub>(Semester
+                    C11)</sub></h1>
+            <hr>
+            <p class="outcome-text">Target to achieve the learning outcome: 66.66 or more
+                of
+                the
+                attempts</p>
+            <p class="outcome-text">Expected percent of students achieving the target by learning outcome:
+                70.00%
+            <p class="outcome-text">Results for Information Literacy
+
+                                    <em style="color: green">80% </em>
+                
+            </p>
+            <hr>
+            <ol type="I">
+                <li>
+                    <h2>Courses Assessment</h2>
+                    <hr style="border-block-color: black">
+
+                    <ol type="A">
+                                                    <li>
+
+                                <h2>Este es un objetivo para todos los demás: </h2>
+
+                                                                    <h2 class="course-title">
+                                        TEST-3002
+                                    </h2>
+                                    <h2 class="outcome-text">Performance of Students by Learning Outcome Criteria</h2>
+                                    <table class="table table-striped table-condensed">
+                                        <thead>
+                                            <tr>
+                                                <th></th>
+                                                <th>Criteria</th>
+
+                                                <th>Number of Students Assessed</th>
+
+
+                                                <th>Number of Students that Achieved the Target</th>
+                                                <th>Percentage</th>
+
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                                                                            <tr>
+                                                    <td>1.</td>
+                                                    <td>
+                                                        Criterio 2 para CE y IL
+
+                                                                                                                    <ul class="list-unstyled">
+                                                                                                                                    <li>Subcriterio 2</li>
+                                                                                                                            </ul>
+                                                                                                            </td>
+                                                    <td>
+                                                        5
+                                                    </td>
+                                                    <td>
+                                                        4
+                                                    </td>
+
+                                                    <td>
+                                                        80%
+                                                    </td>
+
+
+                                                </tr>
+                                            
+                                        </tbody>
+                                    </table>
+                                                                                                            <hr>
+                                
+
+
+
+                            </li>
+                        
+
+                    </ol>
+
+
+                </li>
+
+
+
+                                    <li>
+                        <h2>Program Transformative Actions</h2>
+                        <hr>
+
+                        <table class="table table-striped table-condensed">
+                            <thead>
+                                <tr>
+                                    <th></th>
+                                    <th>Transformative Action</th>
+                                    <th>Category</th>
+                                    <th>Results</th>
+
+                                    <th>Was this helpful to achieve the learning expectation?</th>
+                                    <th>Explain briefly details about the implementation</th>
+
+                                </tr>
+                            </thead>
+                            <tbody>
+                                                                    <tr>
+                                        <td>1.</td>
+                                        <td>
+                                            <strong>Paa: </strong>nananaaaaaa
+
+
+                                        </td>
+                                        <td>
+                                            De todo lo que
+                                        </td>
+
+                                                                                    <td>
+                                                Miro tus fotos
+                                            </td>
+
+                                            <td>
+                                                                                                    Yes
+                                                                                            </td>
+                                            <td>
+                                                ni leo tus cartas
+                                            </td>
+                                        
+
+                                    </tr>
+                                
+                            </tbody>
+                        </table>
+                        <hr>
+                    </li>
+                
+                            </ol>
+                                <h1 class="outcome-header">Effective Communication Skills <sub>(Semester
+                    C12)</sub></h1>
+            <hr>
+            <p class="outcome-text">Target to achieve the learning outcome: 66.66 or
+                more of
+                the
+                attempts</p>
+            <p class="outcome-text">Expected percent of students achieving the target by learning outcome:
+                70.00%
+            <p class="outcome-text">Results for Effective Communication Skills
+
+
+                <em style="color: red">N/A </em>
+
+
+            </p>
+            <p class="outcome-text" style="color: red">No student has been assessed in this outcome</p>
+            <hr>
+                                <h1 class="outcome-header">Critical Thinking <sub>(Semester
+                    C12)</sub></h1>
+            <hr>
+            <p class="outcome-text">Target to achieve the learning outcome: 66.66 or
+                more of
+                the
+                attempts</p>
+            <p class="outcome-text">Expected percent of students achieving the target by learning outcome:
+                70.00%
+            <p class="outcome-text">Results for Critical Thinking
+
+
+                <em style="color: red">N/A </em>
+
+
+            </p>
+            <p class="outcome-text" style="color: red">No student has been assessed in this outcome</p>
+            <hr>
+                                <h1 class="outcome-header">Social Responsibility <sub>(Semester
+                    C12)</sub></h1>
+            <hr>
+            <p class="outcome-text">Target to achieve the learning outcome: 66.66 or
+                more of
+                the
+                attempts</p>
+            <p class="outcome-text">Expected percent of students achieving the target by learning outcome:
+                70.00%
+            <p class="outcome-text">Results for Social Responsibility
+
+
+                <em style="color: red">N/A </em>
+
+
+            </p>
+            <p class="outcome-text" style="color: red">No student has been assessed in this outcome</p>
+            <hr>
+            </div>
+
+
+</body></html>
+<script type="text/javascript">
+
+
+
+</script>

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

@@ -107,7 +107,7 @@
         </div>
 
         <!-- Modal -->
-        <div id="three_year" class="modal fade" role="dialog">
+        <div id="three_year_modal" class="modal fade" role="dialog">
             <div class="modal-dialog">
                 <!-- Modal content-->
                 <div class="modal-content">
@@ -290,6 +290,25 @@
             </div>
         </div>
 
+        <div id="SubmitModal" class="modal fade" tabindex="-1" data-criterion-id="0">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header" style="background-color: rgba(109, 223, 59, 0.8)">
+                        <h5 class="modal-title">Three Year Plan has been submitted</h5>
+                        <button type="button" class="close" data-dismiss="modal">&times;</button>
+                    </div>
+                    <div class="modal-body" id = "modalBody">
+                        <h5>Would you like to submit this Three Year Plan to the administration now?</h5>
+                        <p>You can later submit other changes in another time, but you may have to explain</p>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal" >Not yet</button>
+                        <button type="button" class="btn btn-primary" onclick = 'submitTYP()'>Submit & go to Annual Plans</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+
     </div>
     <script>
         $(document).ready(function() {
@@ -412,7 +431,8 @@
                     function() {
                         
                         window.open("{{ URL::action('ThreeYearPlanController@printPlan', [$program_id]) }}"+"/"+typ_id+"/1", '_blank');
-                        window.location.href = "{{ URL::action('AnnualPlansController@showPlan', [$program_id]) }}";
+                        $('#SubmitModal').modal('show');
+                       // window.location.href = "{{ URL::action('AnnualPlansController@showPlan', [$program_id]) }}";
                             
 
                     });
@@ -541,6 +561,20 @@
         });
 
 
+        function submitTYP(){
+                typ_id =$('#table-cycles').data('typ-id');
+                $.post(
+                    "{{URL::action('ThreeYearPlanController@submit', [$program_id])}}",{
+                        typ_id:typ_id
+                    },
+                    function(code){
+                        if(code!=500)
+                        window.location.href = "{{ URL::action('AnnualPlansController@showPlan', [$program_id]) }}";
+                      
+                    }
+                )
+            }
+
         // go back to section 1
         $('.back-to-1').on('click', function(e) {
             window.scrollTo(0, 0);

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

@@ -74,6 +74,7 @@
                 <ul class="dropdown-menu dropdown-menu-left" role="menu">
                     <li>{{ HTML::linkAction('CoursesController@editView','Create Courses')}}</li>
                     <li>{{ HTML::linkAction('CoursesController@reassign', 'Reassign Courses') }}</li>
+                    <li>{{ HTML::linkAction('ProgramsController@assignOtherProgramIndex', 'Manage Program Courses Permissions')}}
 
                     <li>{{ HTML::linkAction('OutcomesController@index', 'Learning Outcomes') }}</li>
 

app/views/local/managers/admins/appraisal-program.blade.php

@@ -14,17 +14,74 @@
     <div class="row">
         <div class="col-md-12">
             <p>Click the links below to see annual appraisal plans for a specific program with assessed courses:</p>
+        </div>
+
+            
+        <div class='col-md-12'>
+            <select id ='annual_cycle' class="form-control selectpicker" onchange="fetchSubmit('#annual_cycle')">
+                @foreach($annual_cycle as $a)
+                <option value = {{$a->id}}> Cycle {{$a->academic_year}}  </option>
+                @endforeach
+
+            </select>
+        </div>
+
 
+        <table class='table table-striped table-condensed '>
+            <thead>
+                <tr>
+                    <th>Program</th>
+                    <th>Submitted this cycle</th>
+                </tr>
+            </thead>
+            <tbody>
+            @foreach ($programs as $program)
 
-            <ol id="table-of-contents">
-                @foreach ($programs as $program)
-                    <li>
+                <tr>
+                    <td>
+                        @if($report ==0)
                         <a href="{{ URL::action('AnnualPlansController@annualPlansShow', ['plan',$program->id]) }}">
                             {{ $program->name }}
-                        </a>
-                    </li>
-                @endforeach
-            </ol>
+                        @else
+                        <a href="{{ URL::action('AnnualPlansController@annualPlansShow', ['report',$program->id]) }}">
+                            {{ $program->name }}
+
+                        @endif
+                    </td>
+                    <td id = "is_submit-{{$program->id}}" class='submitted'>
+
+                    </td>
+                </tr>
+            @endforeach
+            </tbody>
+            </table>
+
+            
         </div>
-    </div>
+    <script>
+
+function fetchSubmit(annual_cycle){
+            $.post(
+                "{{URL::action('AnnualPlansController@fetchSubmitted')}}",
+                {
+                    annual_cycle:$(annual_cycle).val(),
+                    report:{{$report}}
+
+                },
+                function(programs){
+                    $(".submitted").html(' ');
+                    $.each(programs, function(ind, program){
+                        if(program.is_submitted){
+                            $('#is_submit-'+program.program_id).html(
+                                '<span class="glyphicon glyphicon-ok-sign"></span>'
+                            )
+                        }
+                    })
+                }
+            )
+        }
+
+        fetchSubmit("#typ");
+
+        </script>
 @stop

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

@@ -0,0 +1,277 @@
+@extends('layouts.master')
+
+@section('navigation')
+    @include('local.managers.admins._new_navigation')
+@stop
+@section('main')
+
+    <div class="row">
+        <div class="col-md-6">
+            <div class="panel panel-default panel-button">
+                <div class="panel-heading">
+                    Create a Course
+                </div>
+                <div class="panel-body">
+
+                    {{ Form::open(['action' => 'ProgramsController@addToOtherProgramTYP','enctype'=>"multipart/form-data"]) }}
+
+
+                    <!-- Program -->
+                    <div class="form-group">
+                        {{ Form::label('program', 'Select Program to pair other Program Courses\'') }}
+                        <select id="program" name="program" class="form-control selectpicker">
+                            
+                            @foreach ($programs as $program)
+                                @if (Input::old('program') != $program->id)
+                                    <option value="{{ $program->id }}">{{ $program->name }}
+                                        ({{ $program->school->name }})</option>
+                                @else
+                                    <option selected value="{{ $program->id }}">{{ $program->name }}
+                                        ({{ $program->school->name }})</option>
+                                @endif
+                            @endforeach
+                        </select>
+                    </div>
+
+                    <div class="form-group" id = "other_program_div">
+                        {{ Form::label('program', 'Choose other program') }}
+                        <select id="other_program_0" name="other_program[]" class="form-control selectpicker">
+                            
+                            @foreach ($programs as $program)
+                                @if (Input::old('program') != $program->id)
+                                    <option value="{{ $program->id }}">{{ $program->name }}
+                                        ({{ $program->school->name }})</option>
+                                @else
+                                    <option selected value="{{ $program->id }}">{{ $program->name }}
+                                        ({{ $program->school->name }})</option>
+                                @endif
+                            @endforeach
+                        </select>
+
+    
+                    </div>
+
+                    <hr>
+                    <div class ='form-group'>
+                        <button id='add-other-program' class='btn btn-md btn-secondary'
+                        onclick='addOtherProgram("#add-other-program", "#other_program_div")'>
+                        <span class='glyphicon glyphicon-plus'>
+    
+                        </span>
+                        Add another Program
+                    </button>
+                    </div>
+
+
+                    
+
+
+              
+
+
+                    <br>
+
+                    {{ Form::submit('Pair Other Program Courses', ['class' => 'btn btn-primary btn-block', 'name' => 'pair_other_courses']) }}
+                    {{ Form::close() }}
+
+                    <br>
+
+                </div>
+            </div>
+        </div>
+
+        <div class="col-md-6">
+            <div class="panel panel-default panel-button">
+                <div class="panel-heading">
+                    Edit pairing
+                </div>
+                <div class="panel-body">
+
+
+
+                    <p>You can enroll students in this setting, by choosing the course and uploading a .txt file with the students numbers</p>
+
+                    {{ Form::open(['action' => 'ProgramsController@updatePairingInfo', 'enctype'=>"multipart/form-data"]) }}
+
+
+                    <div class = "form-group">
+                        {{Form::label('select-program-edit', "Edit Program Courses' Pairing")}}
+                        <select id = "select-program-edit" name = "program" class ='form-control selectpicker'
+                        onchange = "fetchProgramPairing('#select-program-edit')">
+                        @foreach ($programs as $program)
+                        @if (Input::old('program') != $program->id)
+                            <option value="{{ $program->id }}">{{ $program->name }}
+                                ({{ $program->school->name }})</option>
+                        @else
+                            <option selected value="{{ $program->id }}">{{ $program->name }}
+                                ({{ $program->school->name }})</option>
+                        @endif
+                    @endforeach
+
+                        </select>
+                    </div>
+
+                    <div class="form-group" id = "other_program_div_edit">
+                        {{ Form::label('program', 'Choose other program') }}
+                        <select id="program-edit" name="other_program[]" class="form-control selectpicker">
+                            
+                            @foreach ($programs as $program)
+                                @if (Input::old('program') != $program->id)
+                                    <option value="{{ $program->id }}">{{ $program->name }}
+                                        ({{ $program->school->name }})</option>
+                                @else
+                                    <option selected value="{{ $program->id }}">{{ $program->name }}
+                                        ({{ $program->school->name }})</option>
+                                @endif
+                            @endforeach
+                        </select>
+
+                    </div>
+                    <hr>
+
+                    <div class ='form-group'>
+                        <button id='add-other-program-edit' class='btn btn-md btn-secondary'
+                        onclick='addOtherProgram("#add-other-program-edit", "#other_program_div_edit")'>
+                        <span class='glyphicon glyphicon-plus'>
+    
+                        </span>
+                        Add another Program
+                    </button>
+                    </div>
+
+
+
+                    <br>
+
+                    {{ Form::submit("Edit Program Courses' Pairing", ['class' => 'btn btn-primary btn-block', 'name' => 'edit_pair_other_courses']) }}
+                    {{ Form::close() }}
+
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script>
+        $('.filterSection').show();
+        $('.filterButton').on('click', function() {
+            var span = $(this).find('span');
+            if (span.attr('class') == 'glyphicon glyphicon-plus') {
+                span.attr('class', 'glyphicon glyphicon-minus');
+            } else {
+                span.attr('class', 'glyphicon glyphicon-plus');
+            }
+            $('.filterSection').toggle(533);
+        });
+        $('.filterButton').on('click', function(e) {
+        // Prevent the default action of the clicked item. In this case that is submit
+            e.preventDefault();
+
+
+        return false;
+        });
+
+        
+        options = $('#other_program_0').html();
+
+        function addOtherProgram(button, div, removable = ''){
+
+            master_div = $("<div>",{
+
+                'class':removable
+                
+            })
+            div_select = $("<div>", {
+                'class':'col-md-11'
+            })
+            select = $("<select>", {
+                'name': "other_program[]",
+                'class':'form-control selectpicker ' 
+            }).html(options);
+
+            select.appendTo(div_select)
+
+            div_button = $("<div>", {
+                'class':'col-md-1'
+            })
+
+            rem_button = $('<button>',{
+                'type':'button',
+                'class':'btn btn-primary',
+                'onclick':'$(this).parent().parent().remove();'
+            }).html("<span class='glyphicon glyphicon-remove'></span>")
+
+            div_button.append(rem_button);
+
+            master_div.append(div_select);
+            master_div.append(div_button);
+            master_div.prepend("<br>")
+            master_div.append("<br>");
+
+
+
+          
+
+            master_div.appendTo($(div));
+            $('.selectpicker').selectpicker('refresh');
+            
+
+        }
+        
+
+        function fetchProgramPairing(select){
+            $.post(
+                "{{URL::action('ProgramsController@fetchPairingInfo')}}", {
+                    program_id: $(select).val()
+                },
+                function(paired_programs){
+
+                    $('.removable').remove();
+
+                    $.each(paired_programs, function(index, program_id){
+
+                       selectPick=   $('#other_program_div_edit').find('select.selectpicker').eq(index).val(program_id);
+                       selectPick.val(program_id);
+
+                        if(paired_programs[index+1]){
+                            addOtherProgram("#add-other-program-edit", "#other_program_div_edit", 'removable')
+                        }
+
+                        $('.selectpicker').selectpicker('refresh');
+                    })
+                }
+            )
+        }
+
+        
+    </script>
+
+    
+@stop
+
+@section('javascript')
+
+    // --------------------------------------------------------------------------
+    // Page load
+    // --------------------------------------------------------------------------
+$("#add-other-program").on("click", function(e){
+    e.preventDefault();
+});
+
+$("#add-other-program-edit").on('click', function(e){
+    e.preventDefault();
+})
+
+
+fetchProgramPairing('#select-program-edit')
+
+    // --------------------------------------------------------------------------
+    // Functions
+    // --------------------------------------------------------------------------
+
+
+
+    // --------------------------------------------------------------------------
+    // Events
+    // --------------------------------------------------------------------------
+
+@stop

app/views/local/managers/admins/learning-outcome_new.blade.php

@@ -31,7 +31,7 @@
                         <th>School</th>
                         <th>Criteria attempted for the outcome</th>
                         <th>Criteria achieved for the outcome </th>
-                        <th>Success rate</th>
+                        <th>Success rate</th> 
                     </thead>
                     <tbody>
                         @foreach($undergradResults["names"] as $id=>$undergradProgramName)

app/views/local/managers/admins/learning-outcomes.blade.php

@@ -110,42 +110,77 @@
 
         <hr>
     </div>
+
+    
+<div class="modal fade" id="delete-outcome-modal">
+    <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 ="modal-title-rubric">Are you sure you want to delete this Learning Outcome?</h4>
+        </div>
+          <div class="modal-body" id ="delete-outcome-modal-body">
+              <p>You won't be able to retrieve it</p>
+  
+  
+  
+                 
+                  
+                  
+          </div>
+        <div class="modal-footer">
+              <button type="button" class="btn btn-default modal-but" data-dismiss="modal">Close</button>
+              <button type="button" class="btn btn-primary modal-but" id='modal-delete-button' data-dismiss="modal" onclick ="">Delete Outcome</button>
+            
+        </div>
+      </div><!-- /.modal-content -->
+    </div><!-- /.modal-dialog -->
+  </div>
+
+  <script>
+function deleteOutcome(outcome_id){
+    var outcomeObject = new Object();
+
+    outcomeObject.id= outcome_id;
+    outcomeObject.delete=1;
+    console.log("algo"+JSON.stringify(outcome_id));
+    console.log("algo"+JSON.stringify(outcomeObject));
+    var clone = jQuery.extend({}, outcomeObject);
+    //	outcomeArray.push(clone);
+    //	console.log("algo"+JSON.stringify(outcomeArray));
+    $.post(
+        "{{ URL::action('OutcomesController@delete') }}",
+        {    outcomeArray: JSON.stringify(outcomeObject)},
+    function(data)
+        {
+            location.reload();
+        }
+    );
+}
+    </script>
 @stop
 
 @section('javascript')
+
+$(".modal-but").on('click',function(e){
+    e.preventDefault();
+})
+
+
 @foreach ($outcomes as $outcome)
      $('#del{{ $outcome->id }}').on('click', function(e)
     {
     	e.preventDefault();
     	//outcomeObject.id= $(this).data('id');
-    	if(confirm("Are you sure you want to delete the outcome with id {{ $outcome->id }}"))
-    	{
-    		console.log("si");
-			var outcomeObject = new Object();
-
-			outcomeObject.id= {{ $outcome->id }};
-	    	outcomeObject.delete=1;
-	    	console.log("algo"+JSON.stringify({{ $outcome->id }}));
-	    	console.log("algo"+JSON.stringify(outcomeObject));
-			var clone = jQuery.extend({}, outcomeObject);
-		//	outcomeArray.push(clone);
-	    //	console.log("algo"+JSON.stringify(outcomeArray));
-			$.post(
-			"{{ URL::action('OutcomesController@delete') }}",
-			{ outcomeArray: JSON.stringify(outcomeObject)},
-			function(data)
-			{
-				location.reload();
-			}
-			);
-			
-   		}
-    	else 
-    	{
-	    	console.log("no");
-//			outcomeObject.delete=0;
-		}
-	});
+
+        $("#delete-outcome-modal").modal("show");
+        $("#modal-delete-button").attr('onclick', 'deleteOutcome({{$outcome->id}})')
+
+    }
+     );
+
+
+
 @endforeach
 
     $('#new_outcome_form').hide();

app/views/local/managers/admins/show-typ-program.blade.php

@@ -15,16 +15,66 @@
         <div class="col-md-12">
             <p>Click the links below to see annual appraisal plans for a specific program with assessed courses:</p>
 
+        </div>
+
+        <div class='col-md-12'>
+            <select id ='typ' class="form-control selectpicker" onchange="fetchSubmit('#typ')">
+                @foreach($typ as $t)
+                <option value = {{$t->id}}> Cycle {{$t->year_start}}-{{$t->year_end}}  </option>
+                @endforeach
 
-            <ol id="table-of-contents">
+            </select>
+        </div>
+
+
+            <table class='table table-striped table-condensed '>
+                <thead>
+                    <tr>
+                        <th>Program</th>
+                        <th>Submitted this cycle</th>
+                    </tr>
+                </thead>
+                <tbody>
                 @foreach ($programs as $program)
-                    <li>
-                        <a href="{{ URL::action('ThreeYearPlanController@showPDFs', [$program->id]) }}">
+
+                    <tr>
+                        <td>
+                            <a href="{{ URL::action('ThreeYearPlanController@showPDFs', [$program->id]) }}">
                             {{ $program->name }}
-                        </a>
-                    </li>
+                        </td>
+                        <td id = "is_submit-{{$program->id}}" class='submitted'>
+
+                        </td>
+                    </tr>
                 @endforeach
-            </ol>
+                </tbody>
+                </table>
         </div>
-    </div>
+   
+
+    <script>
+
+        function fetchSubmit(typ){
+            $.post(
+                "{{URL::action('ThreeYearPlanController@fetchSubmitted')}}",
+                {
+                    typ:$(typ).val()
+                },
+                function(programs){
+                    $(".submitted").html(' ');
+                    $.each(programs, function(ind, program){
+                        if(program.is_submitted){
+                            $('#is_submit-'+program.program_id).html(
+                                '<span class="glyphicon glyphicon-ok-sign"></span>'
+                            )
+                        }
+                    })
+                }
+            )
+        }
+
+        fetchSubmit("#typ");
+
+
+</script>
 @stop

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

@@ -18,6 +18,8 @@
   <div class="col-md-12">
     <div class="btn-group pull-right">
       {{ HTML::linkAction('TemplatesController@printview', 'Print', array($template->id), array('class'=>'btn btn-default')) }}
+      <button class= 'btn btn-default' onclick ='fetchObjectivesForTemplate("#bodyRubric")'>View Objectives</button>
+   
     </div>
 
     <p>Passing Criteria:
@@ -42,7 +44,7 @@
         </thead>
       <tbody id ="bodyRubric">
         @foreach($template->criteria as $index=> $criterion)
-      <tr data-criterion-copyright="{{$criterion->copyright}}" data-criterion-notes="{{$criterion->notes}}">
+      <tr data-criterion-id = "{{$criterion->id}}" data-criterion-copyright="{{$criterion->copyright}}" data-criterion-notes="{{$criterion->notes}}">
         <td>{{$index+1}}.</td>
 
         @if($criterion->notes)
@@ -91,7 +93,72 @@
   </div>
 </div>
 
+
+<div class="modal fade" id="objectives-crit-modal">
+  <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 ="modal-title-rubric">These are the objectives in each Criterion in this Rubric</h4>
+      </div>
+        <div class="modal-body" id ="objectives-crit-modal-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 fetchObjectivesForTemplate(tbody){
+  
+  allCriteria = [];
+        $(tbody).children('tr').each(function (index){
+            allCriteria.push($(this).data('criterion-id'));
+        })
+        $.post(
+            "{{URL::action('TemplatesController@fetchObjectivesForTemplate')}}",
+            {
+                allCriteria:allCriteria
+            },
+
+            function(crit){
+                
+                modal_name = '#objectives-crit-modal';
+                $(modal_name+'-body').html(' ');
+                ol_crit = $("<ol>")
+                $(modal_name+'-body').append(ol_crit);
+                $.each(crit, function(index, cri){
+
+                    
+                    li = $("<li>").html("<strong>"+cri.name+"</strong>");
+                    
+                    ul_for_ob = $("<ul>");
+                    
+                        $.each(cri.all_objectives, function(ind, obj){
+                            li2 = $("<li>").html(obj.text)
+                            ul_for_ob.append(li2);
+                        })
+                        li.append(ul_for_ob);
+                    ol_crit.append(li);
+
+                    
+                })
+                $(modal_name).modal('show');
+
+            }
+        )
+    }
+
 /*
   function createTable(){
     $.post("{{URL::action('TemplatesController@onLoadFetch')}}",

app/views/local/managers/sCoords/_new_navigation.blade.php

@@ -112,7 +112,7 @@
                         </li>
                     @endforeach
                     <h6 class="dropdown-header">View Annual Report from:</h6>
-                    @foreach (Auth::user()->programs as $program)
+                    @foreach (Auth::user()->school->programs as $program)
                         <li><a
                                 href="{{ URL::action('AnnualPlansController@annualPlansShow', ['report', $program->id]) }}">{{ $program->name }}</a>
                         </li>

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

@@ -36,7 +36,11 @@
             <tbody>
                 @foreach ($templates as $template)
                     <tr>
+                        @if($role==4)
                         <td>{{ HTML::linkAction('TemplatesController@profShow', $template->name, [$template->id]) }}</td>
+                        @else
+                        <td>{{ HTML::linkAction('TemplatesController@show', $template->name, [$template->id]) }}</td>
+                        @endif
                         <td>
                             @if ($template->school)
                                 {{ $template->school->name }}

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

@@ -341,6 +341,7 @@
                     Delete
                 </button>
                 <button id="button-print-rubric" class="btn btn-lg btn-primary"><span class="glyphicon glyphicon-print"></span> Print <span class="small">(saved version)</span></button>
+                <button id = "button-get-criteria-objectives" class = "btn btn-lg btn-primary" onclick = 'fetchObjectivesForTemplate("#allCriteria")'><span class='glyphicon glyphicon-eye-open'></span> View Objectives</button>
             </div>
         </div>
     </div>
@@ -370,6 +371,31 @@
       </div><!-- /.modal-content -->
     </div><!-- /.modal-dialog -->
   </div>
+
+
+  <div class="modal fade" id="objectives-crit-modal">
+    <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 ="modal-title-rubric">These are the objectives in each Criterion in this Rubric</h4>
+        </div>
+          <div class="modal-body" id ="objectives-crit-modal-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>
 
     </script>
@@ -380,6 +406,46 @@
 <!-- jQuery Sortable Tables -->
 <script src="{{ asset('vendor/jQuerySortable/jquery-sortable-min.js') }}"></script>
 <script>
+
+    function fetchObjectivesForTemplate(tbody){
+
+        allCriteria = [];
+        $(tbody).children('tr').each(function (index){
+            allCriteria.push($(this).data('criterion-id'));
+        })
+        $.post(
+            "{{URL::action('TemplatesController@fetchObjectivesForTemplate')}}",
+            {
+                allCriteria:allCriteria
+            },
+
+            function(crit){
+                
+                modal_name = '#objectives-crit-modal';
+                $(modal_name+'-body').html(' ');
+                ol_crit = $("<ol>")
+                $(modal_name+'-body').append(ol_crit);
+                $.each(crit, function(index, cri){
+
+                    
+                    li = $("<li>").html("<strong>"+cri.name+"</strong>");
+                    
+                    ul_for_ob = $("<ul>");
+                    
+                        $.each(cri.all_objectives, function(ind, obj){
+                            li2 = $("<li>").html(obj.text)
+                            ul_for_ob.append(li2);
+                        })
+                        li.append(ul_for_ob);
+                    ol_crit.append(li);
+
+                    
+                })
+                $(modal_name).modal('show');
+
+            }
+        )
+    }
 function saveTemplate()
 {
     //Prevent page refresh

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

@@ -79,11 +79,11 @@
                                     @foreach($outcomes_undergrad as $outcome)
                                         <tr>
                                             <td class="col-md-6">{{ link_to_action('OutcomesController@show', $outcome->name, array($outcome->id), $attributes = array()) }}</td>
-                                            <td class="col-md-2">{{{ $attemptedUndergradProgramsPerOutcome[$outcome->id] }}}</td>
-                                            <td class="col-md-2">{{{ $achievedUndergradProgramsPerOutcome[$outcome->id] }}}</td>
+                                            <td class="col-md-2">{{{ count($attemptedUndergradProgramsPerOutcome[$outcome->id]) }}}</td>
+                                            <td class="col-md-2">{{{ count($achievedUndergradProgramsPerOutcome[$outcome->id]) }}}</td>
                                             <td class="col-md-2">
-                                                @if($attemptedUndergradProgramsPerOutcome[$outcome->id]!=0)
-                                                    {{{ round($achievedUndergradProgramsPerOutcome[$outcome->id] / $attemptedUndergradProgramsPerOutcome[$outcome->id]*100, 2) }}}%
+                                                @if(count($attemptedUndergradProgramsPerOutcome[$outcome->id])!=0)
+                                                    {{{ round( count($achievedUndergradProgramsPerOutcome[$outcome->id]) / count($attemptedUndergradProgramsPerOutcome[$outcome->id])*100, 2) }}}%
                                                 @else
                                                     N/M
                                                 @endif
@@ -274,11 +274,11 @@
                                     @foreach($outcomes_grad as $outcome)
                                         <tr>
                                             <td class="col-md-6">{{ link_to_action('OutcomesController@show', $outcome->name, array($outcome->id), $attributes = array()) }}</td>
-                                            <td class="col-md-2">{{{ $attemptedGradProgramsPerOutcome[$outcome->id] }}}</td>
-                                            <td class="col-md-2">{{{ $achievedGradProgramsPerOutcome[$outcome->id] }}}</td>
+                                            <td class="col-md-2">{{{ count($attemptedGradProgramsPerOutcome[$outcome->id]) }}}</td>
+                                            <td class="col-md-2">{{{ count($achievedGradProgramsPerOutcome[$outcome->id]) }}}</td>
                                             <td class="col-md-2">
-                                                @if($attemptedGradProgramsPerOutcome[$outcome->id]!=0)
-                                                    {{{ round($achievedGradProgramsPerOutcome[$outcome->id] / $attemptedGradProgramsPerOutcome[$outcome->id]*100, 2) }}}%
+                                                @if(count($attemptedGradProgramsPerOutcome[$outcome->id])!=0)
+                                                    {{{ round(count($achievedGradProgramsPerOutcome[$outcome->id]) / count($attemptedGradProgramsPerOutcome[$outcome->id])*100, 2) }}}%
                                                 @else
                                                     N/M
                                                 @endif
@@ -457,7 +457,7 @@ $(function () {
             xAxis: {
                 categories: [
                     @foreach($outcomes_undergrad as $outcome)
-                        "{{{ $outcome->name }}}",
+                        "{{{ $outcome->name }}},  <br> (N = {{$undergrad_outcomes_attempted[$outcome->id]}} ,{{$undergrad_outcomes_achieved[$outcome->id]}})",
                     @endforeach
                 ],
                 labels: {
@@ -497,7 +497,7 @@ $(function () {
                 groupPadding: 0.075
                 },
             },
-            series: [{
+            series: [/*{
                 name: 'Expected Value',
                 color: '#555555',
                 dataLabels: {
@@ -508,7 +508,7 @@ $(function () {
                     format: '{y:.1f}%',
                     style: {
                         //fontWeight: 'bold'
-                    },
+                    }, 
                     y:-1
                 },
                 data: [
@@ -524,7 +524,7 @@ $(function () {
                     @endforeach
                 ],
                 pointPadding: 0,
-            }, {
+            },*/ {
                 name: 'Obtained Value',
                 color: '#e70033',
                 dataLabels: {
@@ -544,7 +544,16 @@ $(function () {
                             is_array($undergrad_outcomes_attempted)
                             && array_key_exists($outcome->id, $undergrad_outcomes_attempted)
                             && $undergrad_outcomes_attempted[$outcome->id]!=0)
-                            {{{ ($undergrad_outcomes_achieved[$outcome->id]/$undergrad_outcomes_attempted[$outcome->id])*100 }}},
+                            <?php
+                            
+                            if (isset($undergrad_outcomes_achieved[$outcome->id]))
+                            $achieved = $undergrad_outcomes_achieved[$outcome->id];
+                            else {
+                                $achieved =0;
+                            }
+                            
+                            ?>
+                            {{{ ($achieved/$undergrad_outcomes_attempted[$outcome->id])*100 }}},
                         @else
                             0,
                         @endif
@@ -567,7 +576,7 @@ $(function () {
             xAxis: {
                 categories: [
                     @foreach($outcomes_grad as $outcome)
-                        "{{{ $outcome->name }}}",
+                        "{{{ $outcome->name }}} <br> (N = {{$grad_outcomes_attempted[$outcome->id]}} , {{$grad_outcomes_achieved[$outcome->id]}})",
                     @endforeach
                 ],
                 labels: {
@@ -654,7 +663,14 @@ $(function () {
                             is_array($grad_outcomes_attempted)
                             && array_key_exists($outcome->id, $grad_outcomes_attempted)
                             && $grad_outcomes_attempted[$outcome->id]!=0)
-                            {{{ ($grad_outcomes_achieved[$outcome->id]/$grad_outcomes_attempted[$outcome->id])*100 }}},
+                            <?php
+                             if (isset($grad_outcomes_achieved[$outcome->id]))
+                            $achieved = $grad_outcomes_achieved[$outcome->id];
+                            else {
+                                $achieved =0;
+                            }
+                            ?>
+                            {{{ ($achieved/$grad_outcomes_attempted[$outcome->id])*100 }}},
                         @else
                             0,
                         @endif
@@ -678,7 +694,7 @@ $(function () {
             xAxis: {
                 categories: [
                     @foreach($outcomes_undergrad as $outcome)
-                        "{{{ $outcome->name }}}",
+                        "{{{ $outcome->name }}} <br> (N = {{$undergrad_outcomes_attempted[$outcome->id]}} ,{{$undergrad_outcomes_achieved[$outcome->id]}})",
                     @endforeach
                 ],
                 labels: {
@@ -718,7 +734,7 @@ $(function () {
                 groupPadding: 0.075
                 },
             },
-            series: [{
+            series: [/*{
                 name: 'Expected Value',
                 color: '#555555',
                 dataLabels: {
@@ -745,7 +761,7 @@ $(function () {
                     @endforeach
                 ],
                 pointPadding: 0,
-            }, {
+            },*/ {
                 name: 'Obtained Value',
                 color: '#e70033',
                 dataLabels: {

app/views/three_year_plan_htmls/10-10-2022-for-15-by-5478.blade.php

@@ -0,0 +1,647 @@
+<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 Audiovisual Communication from 2019 to
+        2022</h1>
+</div>
+
+
+
+    <br>
+    <br>
+    <h2 class='header-text'>First Semester 2019-2020</h2>
+    <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. Este es un objetivo para todos los demás
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[TEST3002] TEST COURSE 2</li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                                    <tr>
+
+                        <td>
+                            2. Holder
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[TEST3002] TEST COURSE 2</li>
+                                                                    <li>[COMA4819] VANG EXP CINEMAT DIG INTER</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. Este es un objetivo para todos los demás
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[TEST3002] TEST COURSE 2</li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                                    <tr>
+
+                        <td>
+                            2. Holder
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[TEST3002] TEST COURSE 2</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. Este es un objetivo para critical thinking.
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[TEST3001] TEST COURSE 1</li>
+                                                                    <li>[TEST3002] TEST COURSE 2</li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                    <br>
+    <br>
+    <h2 class='header-text'>Second Semester 2019-2020</h2>
+    <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. Este es un objetivo para todos los demás
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[TEST3002] TEST COURSE 2</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. Este es un objetivo para todos los demás
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[TEST3002] TEST COURSE 2</li>
+                                                                    <li>[TEST3001] TEST COURSE 1</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. Este es un objetivo para todos los demás
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[TEST3002] TEST COURSE 2</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. Esto es un objetivo para Comunicación Efectiva.
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[TEST3002] TEST COURSE 2</li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                                    <tr>
+
+                        <td>
+                            2. Holder
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[TEST3002] TEST COURSE 2</li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                    <br>
+    <br>
+    <h2 class='header-text'>First Semester 2020-2021</h2>
+    <br>
+        <br>
+    <br>
+    <h2 class='header-text'>Second Semester 2020-2021</h2>
+    <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. Este es un objetivo para todos los demás
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[TEST3002] TEST COURSE 2</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. Este es un objetivo para todos los demás
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[TEST3002] TEST COURSE 2</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. Este es un objetivo para todos los demás
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[TEST3002] TEST COURSE 2</li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                    <br>
+    <br>
+    <h2 class='header-text'>First Semester 2021-2022</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. Este es un objetivo para todos los demás
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[TEST3002] TEST COURSE 2</li>
+                                                                    <li>[TEST3001] TEST COURSE 1</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. Este es un objetivo para todos los demás
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[TEST3002] TEST COURSE 2</li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                    <br>
+    <br>
+    <h2 class='header-text'>Second Semester 2021-2022</h2>
+    <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. Esto es un objetivo para Comunicación Efectiva.
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[TEST3002] TEST COURSE 2</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. Este es un objetivo para critical thinking.
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[TEST3002] TEST COURSE 2</li>
+                                                                    <li>[TEST3001] TEST COURSE 1</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. Este es un objetivo para todos los demás
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[COMA4317] DISE</li>
+                                                                    <li>[TEST3002] TEST COURSE 2</li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                 
+
+
+</body></html>
+
+
+<script>
+
+  
+    
+  
+
+
+  </script>
+
+