rubricas y objetivos, queries de school, dominios admin

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/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
 
@@ -325,7 +329,10 @@ Route::group(array('before' => 'auth|has_access'), function () {
         'uses' => 'CriteriaController@fetchCriterionWithTrashed'
     ));
 
-    Route::get('learning-outcomes/show/{id}', 'OutcomesController@show');
+    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',

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/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/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: {