Push a cosas

app/controllers/CoursesController.php

         $program = $all_input['program'];
         $professor_id = $all_input['professor_id'];
         $semester_id = $all_input['semester_id'];
+        $modality = $all_input['modality'];
         //Input::file('students')//->move('course_student/', 'test.txt');
 
 
         $course->program_id = $program;
         $course->user_id = $professor_id;
         $course->semester_id = $semester_id;
+        $course->modality = $modality;
 
 
 

app/controllers/RubricsController.php

         $title = 'Rubric for <em>' . $activity->name . '</em>';
 
         // Select templates that belong to everyone or belong to the activity's course's school
-        $usable_templates = DB::table('templates')->join('template_criterion', 'template_criterion.template_id', '=', 'templates.id')
+        $usable_templates = DB::table('templates')
+            ->join('template_criterion', 'template_criterion.template_id', '=', 'templates.id')
             ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'template_criterion.criterion_id')
             ->join('program_criterion_objective_outcome', 'criterion_objective_outcome.id', '=', 'program_criterion_objective_outcome.cri_obj_out_id')
             ->where('objective_id', '<>', 0)
                 if (Auth::user()->role != 1) {
                     $query
                         ->where('school_id', $activity->course->program->school->id)
-                        ->orWhere('school_id', '=', NULL);
+                        ->orWhere('school_id', '=', NULL)
+                        ->orWhere('program_id', '=', $activity->course->program->id);
                 }
             })
-            ->whereIn('templates.id', $usable_templates)
+            ->join('template_criterion', 'template_criterion.template_id', '=', 'templates.id')
+            ->join('criterion_objective_outcome', 'template_criterion.criterion_id', '=', 'criterion_objective_outcome.criterion_id')
+            ->where('objective_id', '<>', 0)
+            ->groupBy("templates.id")
+            ->select('templates.*')
+            //->join('program_criterion_objective_outcome_id','')
+            //->whereIn('templates.id', $usable_templates)
 
             ->orderBy('name', 'ASC')->get();
 

app/controllers/SchoolsController.php

 
             $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 ($criteria_attempted_by_stu != 0 && $criteria_achieved_by_stu / $criteria_attempted_by_stu * 100 >= 66.66) {
 
                 if (!isset($achievedUndergradProgramsPerOutcome[$outcome_id][$program_id]))
                     $achievedUndergradProgramsPerOutcome[$outcome_id][$program_id] = 0;
 
             $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 ($criteria_attempted_by_stu != 0 && $criteria_achieved_by_stu / $criteria_attempted_by_stu * 100 >= 66.66) {
                 if (!isset($achievedGradProgramsPerOutcome[$outcome_id][$program_id]))
                     $achievedGradProgramsPerOutcome[$outcome_id][$program_id] = 0;
                 $achievedGradProgramsPerOutcome[$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 ($criteria_attempted_by_stu != 0 && $criteria_achieved_by_stu / $criteria_attempted_by_stu * 100 >= 66.66) {
 
                 if (!isset($achievedUndergradProgramsPerOutcome[$outcome_id][$program_id]))
                     $achievedUndergradProgramsPerOutcome[$outcome_id][$program_id] = 0;
 
             $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 ($criteria_attempted_by_stu != 0 && $criteria_achieved_by_stu / $criteria_attempted_by_stu * 100 >= 66.66) {
                 if (!isset($achievedGradProgramsPerOutcome[$outcome_id][$program_id]))
                     $achievedGradProgramsPerOutcome[$outcome_id][$program_id] = 0;
                 $achievedGradProgramsPerOutcome[$outcome_id][$program_id]++;
 
         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/models/Activity.php

       ->get();
     Log::info(json_encode($this));
 
-    if(isset($this->rubric[0]))$rubric = $this->rubric[0]; else $rubric=new stdClass();
+    if (isset($this->rubric[0])) $rubric = $this->rubric[0];
+    else $rubric = new stdClass();
     $outcomes_dict = [];
     foreach ($outcomes as $outcome) {
       $outcomes_dict[$outcome->id] = $outcome;
 
 
     foreach ($outcomes_dict as $outcome) {
+
+      // dame los criterios que son de este dominio, y de esta actividad.
+
       $ac_criteria = DB::table('criterion_objective_outcome as cobo')
         ->join('activity_criterion as ac', 'ac.criterion_id', '=', 'cobo.criterion_id')
         ->where("outcome_id", $outcome->id)
         })
         ->select('a.student_id', DB::raw('count(`a`.`activity_criterion_id`) attempted'), DB::raw('count(`b`.`activity_criterion_id`) achieved'));
       Log::info($students_attempted->get());*/
+
       $students_attempted = DB::table('assessments as a')
         ->whereIn('a.activity_criterion_id', $ac_criteria)
         ->groupBy('a.student_id')
           $conteo_outcome_achieved++;
         }
       }
-    Log::info(json_encode($outcome));
+      Log::info(json_encode($outcome));
 
       $outcome->achieved = $conteo_outcome_achieved;
-      if(isset($outcome->attempted) and $outcome->attempted!=0)$outcome->percentage = round(($outcome->achieved / $outcome->attempted * 100), 2);
+      if (isset($outcome->attempted) && $outcome->attempted != 0) $outcome->percentage = round(($outcome->achieved / $outcome->attempted * 100), 2);
 
       /*foreach ($students_attempted as $student) {
         $student_criteria[$student];

app/models/Course.php

         ->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
         ->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
         ->join('semesters', 'semesters.id', '=', 'courses.semester_id')
+        ->join('outcomes', 'criterion_objective_outcome.outcome_id', '=', 'outcomes.id')
         ->whereIn('students.program_id', $program_ids)
         ->where('semester_id', $course_code->semester_id)
         ->where('semesters.is_visible', '=', 1)
         ->where('activities.draft', 0)
         ->where('activities.diagnostic', 0)
 
-        ->select('student_id', 'students.program_id', 'semesters.code', 'outcome_id', 'criterion_objective_outcome.criterion_id', 'score', 'expected_points')
+        ->select('student_id', 'students.program_id', 'semesters.code', 'outcome_id', 'outcomes.expected_outcome', 'criterion_objective_outcome.criterion_id', 'score', 'expected_points')
         ->distinct()
         ->get();
 
       //si entra aqui, no especifica dominio, y hay que join todos los dominios
       if (!isset($course_code->typ_semester_course_id)) {
 
-        $table_per_student = $table_per_student->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'activity_criterion.criterion_id');
+        $table_per_student = $table_per_student->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'activity_criterion.criterion_id')
+          ->join('outcomes', 'criterion_objective_outcome.outcome_id', '=', 'outcomes.id');
       }
 
       //si estan grouped
         $table_per_student = $table_per_student->groupBy('students.id');
         $students = $table_per_student->get();
       } else {
-        $table_per_student = $table_per_student->addSelect('outcome_id')
+        $table_per_student = $table_per_student->addSelect('outcome_id', 'outcomes.expected_outcome')
           ->groupBy(array('students.id', 'outcome_id'));
 
         Log::info($table_per_student->toSql());
 
           $criteria_attempted = $q->criteria_attempted;
           $criteria_achieved = $q->criteria_achieved;
+          $expected_outcome = $q->expected_outcome;
 
-          //PREGUNTA??? ES 66.67??????
+          //PREGUNTA??? ES 66.66??????
 
           $achieved = 0;
-          if ($criteria_attempted != 0 && $criteria_achieved / $criteria_attempted * 100 >= 66.67) {
+          if ($criteria_attempted != 0 && $criteria_achieved / $criteria_attempted * 100 >= $expected_outcome) {
             $achieved = 1;
           }
 

app/models/Program.php

 			->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
 			->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
 			->join('semesters', 'semesters.id', '=', 'courses.semester_id')
+			->join('outcomes', 'criterion_objective_outcome.outcome_id', '=', 'outcomes.id')
 			->where('students.program_id', $this->id)
 			->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')
+			->select('student_id', 'students.program_id', 'semesters.code', 'outcome_id', 'outcomes.expected_outcome', 'criterion_objective_outcome.criterion_id', 'score', 'expected_points')
 			->addSelect(DB::raw("count(activity_criterion.criterion_id) as criteria_attempted"))
 			->addSelect(DB::raw("count(CASE WHEN score>= expected_points then 1 else null END) as criteria_achieved"))
 
 		foreach ($students as $result) {
 			$crit_att = $result->criteria_attempted;
 			$crit_ach = $result->criteria_achieved;
+			$expected_outcome = $result->expected_outcome;
 
 
 			$out_att[$result->outcome_id] += 1;
 
-			if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
+			if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= $expected_outcome) {
 				$out_ach[$result->outcome_id] += 1;
 			}
 		}
 		foreach ($students as $result) {
 			$student_id = $result->student_id;
 			$outcome_id = $result->outcome_id;
+			$expected_outcome = $result->expected_outcome;
 			if (isset($combined_outcomes[$outcome_id]))
 				$outcome_id = $combined_outcomes[$outcome_id];
 
 			if (!isset($the_processed_table[$student_id][$outcome_id])) {
 				$the_processed_table[$student_id][$outcome_id] = array(
 					"criteria_attempted" => $result->criteria_attempted,
-					"criteria_achieved" => $result->criteria_achieved
+					"criteria_achieved" => $result->criteria_achieved,
+					"expected_outcome" => $expected_outcome
 				);
 			}
 			//si este estudiante está pareado a este dominio, significa que ahora estoy en los
 				//Log::info($crit_information);
 				$crit_att = $crit_information['criteria_attempted'];
 				$crit_ach = $crit_information['criteria_achieved'];
+				$expected_outcome = $crit_information['expected_outcome'];
 
 
 				$out_att[$outcome_id] += 1;
 
-				if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
+				if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= $expected_outcome) {
 					$out_ach[$outcome_id] += 1;
 				}
 			}
 			->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
 			->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
 			->join('semesters', 'semesters.id', '=', 'courses.semester_id')
+			->join('outcomes', 'criterion_objective_outcome.outcome_id', '=', 'outcomes.id')
 			->where('courses.program_id', $this->id)
 			->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')
+			->select('student_id', 'students.program_id', 'semesters.code', 'outcome_id', 'outcomes.expected_outcome', 'criterion_objective_outcome.criterion_id', 'score', 'expected_points')
 			->addSelect(DB::raw("count(activity_criterion.criterion_id) as criteria_attempted"))
 			->addSelect(DB::raw("count(CASE WHEN score>= expected_points then 1 else null END) as criteria_achieved"))
 
 		foreach ($students as $result) {
 			$crit_att = $result->criteria_attempted;
 			$crit_ach = $result->criteria_achieved;
+			$expected_outcome = $result->expected_outcome;
 
 
 			$out_att[$result->outcome_id] += 1;
 
-			if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
+			if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= $expected_outcome) {
 				$out_ach[$result->outcome_id] += 1;
 			}
 		}
 			if (!isset($the_processed_table[$student_id][$outcome_id])) {
 				$the_processed_table[$student_id][$outcome_id] = array(
 					"criteria_attempted" => $result->criteria_attempted,
-					"criteria_achieved" => $result->criteria_achieved
+					"criteria_achieved" => $result->criteria_achieved,
+					"expected_outcome" => $result->expected_outcome
 				);
 			}
 			//si este estudiante está pareado a este dominio, significa que ahora estoy en los
 				//Log::info($crit_information);
 				$crit_att = $crit_information['criteria_attempted'];
 				$crit_ach = $crit_information['criteria_achieved'];
+				$expected_outcome = $crit_information['expected_outcome'];
 
 
 				$out_att[$outcome_id] += 1;
 
-				if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
+				if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= $expected_outcome) {
 					$out_ach[$outcome_id] += 1;
 				}
 			}

app/models/School.php

 			->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('outcomes', 'criterion_objective_outcome.outcome_id', '=', 'outcomes.id')
 			->join('semesters', 'semesters.id', '=', 'courses.semester_id')
 			->whereIn('courses.program_id', $this->undergraduate_programs->lists('id'))
 			->whereIn('semester_id', Session::get('semesters_ids'))
 			->where('semesters.is_visible', '=', 1)
-			->select('student_id', 'courses.program_id', 'semesters.code', 'outcome_id', 'criterion_objective_outcome.criterion_id', 'score', 'expected_points')
+			->select('student_id', 'courses.program_id', 'semesters.code', 'outcome_id', 'outcomes.expected_outcome', 'criterion_objective_outcome.criterion_id', 'score', 'expected_points')
 			->addSelect(DB::raw("count(activity_criterion.criterion_id) as criteria_attempted"))
 			->addSelect(DB::raw("count(CASE WHEN score>= expected_points then 1 else null END) as criteria_achieved"))
 
 			->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
 			->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
 			->join('semesters', 'semesters.id', '=', 'courses.semester_id')
+			->join('outcomes', 'criterion_objective_outcome.outcome_id', '=', 'outcomes.id')
 			->whereIn('courses.program_id', $this->graduate_programs->lists('id'))
 			->whereIn('semester_id', Session::get('semesters_ids'))
 			->where('semesters.is_visible', '=', 1)
-			->select('student_id', 'courses.program_id', 'semesters.code', 'outcome_id', 'criterion_objective_outcome.criterion_id', 'score', 'expected_points')
+			->select('student_id', 'courses.program_id', 'semesters.code', 'outcome_id', 'outcomes.expected_outcome', 'criterion_objective_outcome.criterion_id', 'score', 'expected_points')
 			->addSelect(DB::raw("count(activity_criterion.criterion_id) as criteria_attempted"))
 			->addSelect(DB::raw("count(CASE WHEN score>= expected_points then 1 else null END) as criteria_achieved"))
 
 		foreach ($undergraduate_students as $result) {
 			$crit_att = $result->criteria_attempted;
 			$crit_ach = $result->criteria_achieved;
+			$expected_outcome = $result->expected_outcome;
 
 			$program_id = $result->program_id;
 
 
 
 
-			if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
+			if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= $expected_outcome) {
 				if (!isset($program_out_ach[$result->outcome_id][$program_id])) {
 					$program_out_ach[$result->outcome_id][$program_id] = 0;
 				}
 		foreach ($graduate_students as $result) {
 			$crit_att = $result->criteria_attempted;
 			$crit_ach = $result->criteria_achieved;
+			$expected_outcome = $result->expected_outcome;
 
 			$program_id = $result->program_id;
 
 
 			$grad_out_att[$result->outcome_id] += 1;
 
-			if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
+			if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= $expected_outcome) {
 				if (!isset($program_out_ach[$result->outcome_id][$program_id])) {
 					$program_out_ach[$result->outcome_id][$program_id] = 0;
 				}
 		foreach ($undergraduate_students as $result) {
 			$student_id = $result->student_id;
 			$outcome_id = $result->outcome_id;
+			$expected_outcome = $result->expected_outcome;
 			if (isset($combined_outcomes[$outcome_id]))
 				$outcome_id = $combined_outcomes[$outcome_id];
 
 				$the_processed_table[$student_id][$outcome_id] = array(
 					"criteria_attempted" => $result->criteria_attempted,
 					"criteria_achieved" => $result->criteria_achieved,
+					'expected_outcome' => $expected_outcome,
 					"program_id" => $result->program_id
 				);
 			}
 				$crit_att = $crit_information['criteria_attempted'];
 				$crit_ach = $crit_information['criteria_achieved'];
 				$program_id = $crit_information['program_id'];
+				$expected_outcome = $crit_information['expected_outcome'];
 
 
 				$under_out_att[$outcome_id] += 1;
 
 				$program_out_att[$outcome_id][$program_id] += 1;
 
-				if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
+				if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= $expected_outcome) {
 					if (!isset($program_out_ach[$outcome_id][$program_id])) {
 						$program_out_ach[$outcome_id][$program_id] = 0;
 					}
 		foreach ($graduate_students as $result) {
 			$student_id = $result->student_id;
 			$outcome_id = $result->outcome_id;
+			$expected_outcome = $result->expected_outcome;
 			if (isset($combined_outcomes[$outcome_id]))
 				$outcome_id = $combined_outcomes[$outcome_id];
 
 				$the_processed_table[$student_id][$outcome_id] = array(
 					"criteria_attempted" => $result->criteria_attempted,
 					"criteria_achieved" => $result->criteria_achieved,
+					'expected_outcome' => $expected_outcome,
 					'program_id' => $result->program_id
 				);
 			}
 				$crit_att = $crit_information['criteria_attempted'];
 				$crit_ach = $crit_information['criteria_achieved'];
 				$program_id = $crit_information['program_id'];
+				$expected_outcome = $crit_information['expected_outcome'];
 
 
 				$grad_out_att[$out_id] += 1;
 
 				$program_out_att[$out_id][$program_id] += 1;
 
-				if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
+				if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= $expected_outcome) {
 					if (!isset($program_out_ach[$out_id][$program_id])) {
 						$program_out_ach[$out_id][$program_id] = 0;
 					}
 			->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
 			->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
 			->join('semesters', 'semesters.id', '=', 'courses.semester_id')
+			->join('outcomes', 'criterion_objective_outcome.outcome_id', '=', 'outcomes.id')
 			->whereIn('students.program_id', $this->undergraduate_programs->lists('id'))
 			->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')
+			->select('student_id', 'students.program_id', 'semesters.code', 'outcome_id', 'outcomes.expected_outcome', 'criterion_objective_outcome.criterion_id', 'score', 'expected_points')
 			->addSelect(DB::raw("count(activity_criterion.criterion_id) as criteria_attempted"))
 			->addSelect(DB::raw("count(CASE WHEN score>= expected_points then 1 else null END) as criteria_achieved"))
 
 			->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
 			->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
 			->join('semesters', 'semesters.id', '=', 'courses.semester_id')
+			->join('outcomes', 'criterion_objective_outcome.outcome_id', '=', 'outcomes.id')
 			->whereIn('students.program_id', $this->graduate_programs->lists('id'))
 			->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')
+			->select('student_id', 'students.program_id', 'semesters.code', 'outcome_id', 'outcomes.expected_outcome', 'criterion_objective_outcome.criterion_id', 'score', 'expected_points')
 			->addSelect(DB::raw("count(activity_criterion.criterion_id) as criteria_attempted"))
 			->addSelect(DB::raw("count(CASE WHEN score>= expected_points then 1 else null END) as criteria_achieved"))
 
 		foreach ($undergraduate_students as $result) {
 			$crit_att = $result->criteria_attempted;
 			$crit_ach = $result->criteria_achieved;
+			$expected_outcome = $result->expected_outcome;
+
 
 			$program_id = $result->program_id;
 
 
 
 
-			if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
+			if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= $expected_outcome) {
 				if (!isset($program_out_ach[$result->outcome_id][$program_id])) {
 					$program_out_ach[$result->outcome_id][$program_id] = 0;
 				}
 		foreach ($graduate_students as $result) {
 			$crit_att = $result->criteria_attempted;
 			$crit_ach = $result->criteria_achieved;
+			$expected_outcome = $result->expected_outcome;
 
 			$program_id = $result->program_id;
 
 
 			$grad_out_att[$result->outcome_id] += 1;
 
-			if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
+			if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= $expected_outcome) {
 				if (!isset($program_out_ach[$result->outcome_id][$program_id])) {
 					$program_out_ach[$result->outcome_id][$program_id] = 0;
 				}
 		foreach ($undergraduate_students as $result) {
 			$student_id = $result->student_id;
 			$outcome_id = $result->outcome_id;
+			$expected_outcome = $result->expected_outcome;
 			if (isset($combined_outcomes[$outcome_id]))
 				$outcome_id = $combined_outcomes[$outcome_id];
 
 				$the_processed_table[$student_id][$outcome_id] = array(
 					"criteria_attempted" => $result->criteria_attempted,
 					"criteria_achieved" => $result->criteria_achieved,
-					"program_id" => $result->program_id
+					"program_id" => $result->program_id,
+					'expected_outcome' => $expected_outcome
 				);
 			}
 			//si este estudiante está pareado a este dominio, significa que ahora estoy en los
 				$crit_att = $crit_information['criteria_attempted'];
 				$crit_ach = $crit_information['criteria_achieved'];
 				$program_id = $crit_information['program_id'];
+				$expected_outcome = $crit_information['expected_outcome'];
 
 
 				$under_out_att[$outcome_id] += 1;
 
 				$program_out_att[$outcome_id][$program_id] += 1;
 
-				if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
+				if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= $expected_outcome) {
 					if (!isset($program_out_ach[$outcome_id][$program_id])) {
 						$program_out_ach[$outcome_id][$program_id] = 0;
 					}
 		foreach ($graduate_students as $result) {
 			$student_id = $result->student_id;
 			$outcome_id = $result->outcome_id;
+			$expected_outcome = $result->expected_outcome;
 			if (isset($combined_outcomes[$outcome_id]))
 				$outcome_id = $combined_outcomes[$outcome_id];
 
 				$the_processed_table[$student_id][$outcome_id] = array(
 					"criteria_attempted" => $result->criteria_attempted,
 					"criteria_achieved" => $result->criteria_achieved,
-					'program_id' => $result->program_id
+					'program_id' => $result->program_id,
+					'expected_outcome' => $expected_outcome
 				);
 			}
 			//si este estudiante está pareado a este dominio, significa que ahora estoy en los
 				$crit_att = $crit_information['criteria_attempted'];
 				$crit_ach = $crit_information['criteria_achieved'];
 				$program_id = $crit_information['program_id'];
-
-
+				$expected_outcome = $crit_information['expected_outcome'];
 				$grad_out_att[$out_id] += 1;
 
 				if (!isset($program_out_att[$out_id][$program_id])) {
 
 				$program_out_att[$out_id][$program_id] += 1;
 
-				if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
+				if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= $expected_outcome) {
 					if (!isset($program_out_ach[$out_id][$program_id])) {
 						$program_out_ach[$out_id][$program_id] = 0;
 					}

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

                 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>
+                                    <em style="color: red">66.66% </em>
                 
             </p>
             <hr>

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

                                                 <br>
 
                                                 <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
-                                                <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
+                                                <p style="display: inline;"> <i>>= 66.66% of the attempts</i>
                                                 </p>
                                                 <br>
                                                 <h5 style="display: inline; margin:30px;">Expected percent of students
                                                 <br>
 
                                                 <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
-                                                <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
+                                                <p style="display: inline;"> <i>>= 66.66% of the attempts</i>
                                                 </p>
                                                 <br>
                                                 <h5 style="display: inline; margin:30px;">Expected percent of students

app/views/local/managers/pCoords/new_assessment_report.blade.php

                                     <br>
                                     <br>
                                     <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
-                                    <p style="display: inline; margin:-30px;"> <i>>= 66.67% of the attempts</i>
+                                    <p style="display: inline; margin:-30px;"> <i>>= 66.66% of the attempts</i>
                                     </p>
                                     <br>
                                     <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
                                     <br>
                                     <br>
                                     <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
-                                    <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
+                                    <p style="display: inline;"> <i>>= 66.66% of the attempts</i>
                                     </p>
                                     <br>
                                     <h5 style="display: inline; margin:30px;">Expected percent of students achieving the

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

                                                 <br>
                                                 <br>
                                                 <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
-                                                <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
+                                                <p style="display: inline;"> <i>>= 66.66% of the attempts</i>
                                                 </p>
                                                 <br>
                                                 <h5 style="display: inline; margin:30px;">Expected percent of students
                                                 <br>
                                                 <br>
                                                 <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
-                                                <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
+                                                <p style="display: inline;"> <i>>= 66.66% of the attempts</i>
                                                 </p>
                                                 <br>
                                                 <h5 style="display: inline; margin:30px;">Expected percent of students

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

             
         @if(isset($default_grad))
             plotLines:[{
-        value:66.67,
+        value:70,
         color: '#000',
         width:3,
         zIndex:4,
             }, 
         @if(isset($default_undergrad))
             plotLines:[{
-        value:66.67,
+        value:70,
         color: '#000',
         width:3,
         zIndex:4,

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

 },
 @if($program->expected_outcome_target == null)
                 plotLines:[{
-            value:66.67,
+            value:70,
             color: '#000',
             width:3,
             zIndex:4,

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

                 }, 
             @if(isset($default_undergrad))
                 plotLines:[{
-            value:66.67,
+            value:70,
             color: '#000',
             width:3,
             zIndex:4,
                 }, 
                 @if(isset($default_undergrad))
                     plotLines:[{
-                value:66.67,
+                value:70,
                 color: '#000',
                 width:3,
                 zIndex:4,

app/views/local/professors/compare_activities.blade.php

 
                 <h5 style="text-align: center;">{{ $activity_1->name }} </h5>
                 <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
-                <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
+                <p style="display: inline;"> <i>>= 66.66% of the attempts</i>
                 </p>
                 <br>
                 <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
 
                 <h4>Performance of Students by Learning Outcome</h4>
                 <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
-                <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
+                <p style="display: inline;"> <i>>= 66.66% of the attempts</i>
                 </p>
                 <br>
                 <h5 style="display: inline; margin:30px;">Expected percent of students achieving the

app/views/local/professors/new_assessment_report.blade.php

                                 <br>
                                 <br>
                                 <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
-                                <p style="display: inline; margin:-30px;"> <i>>= 66.67% of the attempts</i>
+                                <p style="display: inline; margin:-30px;"> <i>>= 66.66% of the attempts</i>
                                 </p>
                                 <br>
                                 <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
                                 <!--                                 <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5> -->
                                 <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
                                 <!--                                 <p style="display: inline;">  -->
-                                <i>>= 66.67% of the attempts</i>
+                                <i>>= 66.66% of the attempts</i>
                                 <!--                                 </p> -->
                                 <br>
                                 <h5 style="display: inline; margin:30px;">Expected percent of students achieving the

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

+<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 Programa general de Prueba from 2022 to
+        2025</h1>
+</div>
+
+
+
+    <br>
+    <br>
+    <h2 class='header-text'>First Semester 2022-2023</h2>
+    <br>
+                  <span>
+            <h3>Content Knowledge, Skills or Dispositions in the academic program learning outcomes</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. MEra wo vamos a ver
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[TEST5998] Curso de Pruba pa general</li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                                    <tr>
+
+                        <td>
+                            2. Pero te la saco
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[TEST5998] Curso de Pruba pa general</li>
+                                                                    <li>[INGL3135] VIAJE EN LA LITERATURA    </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                    <br>
+    <br>
+    <h2 class='header-text'>Second Semester 2022-2023</h2>
+    <br>
+                  <span>
+            <h3>Critical Thinking</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. MEra wo vamos a ver
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[INGL3151] CONDIC HUMANA EN LITE I   </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. MEra wo vamos a ver
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[INGL3211] INGLES AVANZADO I         </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                                    <tr>
+
+                        <td>
+                            2. Pero te la saco
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[INGL3135] VIAJE EN LA LITERATURA    </li>
+                                                                    <li>[INGL3211] INGLES AVANZADO I         </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                    <br>
+    <br>
+    <h2 class='header-text'>First Semester 2023-2024</h2>
+    <br>
+                  <span>
+            <h3>Critical Thinking</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. MEra wo vamos a ver
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[INGL3297] LIT DE MUJE MINO ETNI E.U.</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. MEra wo vamos a ver
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[INGL3212] INGLES AVANZADO II</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. MEra wo vamos a ver
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[INGL3152] CONDIC HUMANA EN LITE II</li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                                    <tr>
+
+                        <td>
+                            2. Pero te la saco
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[INGL3012] INGLES DE HONOR II</li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                    <br>
+    <br>
+    <h2 class='header-text'>Second Semester 2023-2024</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. MEra wo vamos a ver
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[INGL3152] CONDIC HUMANA EN LITE II</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. MEra wo vamos a ver
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[INGL3297] LIT DE MUJE MINO ETNI E.U.</li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                                    <tr>
+
+                        <td>
+                            2. Pero te la saco
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[INGL3211] INGLES AVANZADO I         </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. MEra wo vamos a ver
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[INGL3297] LIT DE MUJE MINO ETNI E.U.</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. MEra wo vamos a ver
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[INGL3151] CONDIC HUMANA EN LITE I   </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                                    <tr>
+
+                        <td>
+                            2. Pero te la saco
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[INGL3297] LIT DE MUJE MINO ETNI E.U.</li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                    <br>
+    <br>
+    <h2 class='header-text'>First Semester 2024-2025</h2>
+    <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. MEra wo vamos a ver
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[INGL3151] CONDIC HUMANA EN LITE I   </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                                    <tr>
+
+                        <td>
+                            2. Pero te la saco
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[INGL3151] CONDIC HUMANA EN LITE I   </li>
+                                                                    <li>[INGL3135] VIAJE EN LA LITERATURA    </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. MEra wo vamos a ver
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[TEST5998] Curso de Pruba pa general</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. MEra wo vamos a ver
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[INGL3212] INGLES AVANZADO II</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. MEra wo vamos a ver
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[INGL3152] CONDIC HUMANA EN LITE II</li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                    <br>
+    <br>
+    <h2 class='header-text'>Second Semester 2024-2025</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. MEra wo vamos a ver
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[INGL3212] INGLES AVANZADO II</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. MEra wo vamos a ver
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[INGL3135] VIAJE EN LA LITERATURA    </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                 
+
+
+</body></html>
+
+
+<script>
+
+  
+    
+  
+
+
+  </script>
+
+