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

app/controllers/ProfessorsController.php

@@ -163,6 +163,11 @@ class ProfessorsController extends \BaseController
                 }
             }
         }*/
+        //Log::info($program->courses_students_score_per_outcome);
+
+        $outcomes_achieved = $program->courses_students_score_per_outcome['program_info']['outcomes_achieved_combined'];
+        $outcomes_attempted = $program->courses_students_score_per_outcome['program_info']['outcomes_attempted_combined'];
+        /*
 
         foreach ($program_courses as $course) {
 
@@ -192,8 +197,8 @@ class ProfessorsController extends \BaseController
                 if (array_key_exists($outcome, $program_outcomes_attempted))
                     $program_outcomes_attempted[$outcome] += $outcome_score['calculations']['student_attempted'];
                 else $program_outcomes_attempted[$outcome] = $outcome_score['calculations']['student_attempted'];
-            }*/
-        }
+            }
+        }*/
 
 
 

app/controllers/ProgramCoordinatorsController.php

@@ -77,139 +77,31 @@ class ProgramCoordinatorsController extends \BaseController
       $program_array['outcomes_achieved'] = [];
       $program_array['outcomes_attempted'] = [];
 
-      $program_array['program_outcomes_achieved'] = [];
-      $program_array['program_outcomes_attempted'] = [];
+      //$program_array['program_outcomes_achieved'] = [];
+      //$program_array['program_outcomes_attempted'] = [];
       //Log::info($program_array);
 
       foreach ($outcomes as $outcome) {
         $program_array['outcomes_achieved'][$outcome->id] = 0;
         $program_array['outcomes_attempted'][$outcome->id] = 0;
-        $program_array['program_outcomes_achieved'][$outcome->id] = 0;
-        $program_array['program_outcomes_attempted'][$outcome->id] = 0;
+        //$program_array['program_outcomes_achieved'][$outcome->id] = 0;
+        //$program_array['program_outcomes_attempted'][$outcome->id] = 0;
       }
 
-      $program_array['program_outcomes_achieved']  = $program->program_students_per_outcome['program_info']['outcomes_achieved_combined'];
-      $program_array['program_outcomes_attempted'] = $program->program_students_per_outcome['program_info']['outcomes_attempted_combined'];
+      //$program_array['program_outcomes_achieved']  = $program->program_students_per_outcome['program_info']['outcomes_achieved_combined'];
+      //$program_array['program_outcomes_attempted'] = $program->program_students_per_outcome['program_info']['outcomes_attempted_combined'];
 
 
 
       $program_array['program_courses'] = $program->courses;
 
+      $program_array['assessed_courses_count'] = $program->courses_with_assessment_count->courses_assessed;
 
-      $program_array['assessed_courses_count'] = 0;
-      foreach ($program->courses as $course) {
-
-        $student_report = $course->student_report_for_outcome;
-
-        if ($student_report) {
-
-          foreach ($student_report as $outcome_id => $score) {
-            if (array_key_exists($outcome_id, $program_array['outcomes_attempted']))  $program_array['outcomes_attempted'][$outcome_id] += $student_report[$outcome_id]['calculations']['student_attempted'];
-            else $program_array['outcomes_attempted'][$outcome_id] = $student_report[$outcome_id]['calculations']['student_attempted'];
-
-            if (array_key_exists($outcome_id, $program_array['outcomes_achieved']))  $program_array['outcomes_achieved'][$outcome_id] += $student_report[$outcome_id]['calculations']['student_achieved'];
-            else $program_array['outcomes_achieved'][$outcome_id] = $student_report[$outcome_id]['calculations']['student_achieved'];
-          }
-          /*
-
-          $course->with_program_report = 1;
-
-          $program_student_report = $course->student_report_for_outcome;
+      $program_info = $program->courses_students_score_per_outcome['program_info'];
+      $program_array['outcomes_attempted'] = $program_info['outcomes_attempted_combined'];
+      $program_array['outcomes_achieved'] = $program_info['outcomes_achieved_combined'];
 
-          foreach ($program_student_report as $outcome_id => $score) {
-            if (array_key_exists($outcome_id, $program_array['program_outcomes_attempted']))  $program_array['program_outcomes_attempted'][$outcome_id] += $program_student_report[$outcome_id]['calculations']['student_attempted'];
-            else $program_array['program_outcomes_attempted'][$outcome_id] = $program_student_report[$outcome_id]['calculations']['student_attempted'];
-
-            if (array_key_exists($outcome_id, $program_array['program_outcomes_achieved']))  $program_array['program_outcomes_achieved'][$outcome_id] += $program_student_report[$outcome_id]['calculations']['student_achieved'];
-            else $program_array['program_outcomes_achieved'][$outcome_id] = $program_student_report[$outcome_id]['calculations']['student_achieved'];
-          } */
-
-
-
-          $program_array['assessed_courses_count'] += 1;
-        }
-      }
 
-
-
-
-      /*foreach ($programs as $program) {
-      //Log::info($program);
-      $program_array = array();
-      $program_object = new \stdClass();
-      $program_object->name = $program->name;
-      $program_object->school = $program->school->name;
-      $program_object->id = $program->id;
-      $program_array['program'] = $program_object;
-      //Log::info($program_array);
-
-      $program_array['outcomes_achieved'] = [];
-      $program_array['outcomes_attempted'] = [];
-      //Log::info($program_array);
-
-      $program_array['program_courses'] = $program->courses;
-
-
-      $program_array['assessed_courses_count'] = 0;
-
-
-      foreach ($program_array['program_courses'] as $course) {
-
-        //$student_report = $course->student_report_for_outcome;
-        //Log::info($program_array);
-
-        $program_array['course_outcomes_achieved'] = $course->outcomes_ach();
-
-        //Log::info("course_outcomes_achieved");
-        //Log::info($program_array['course_outcomes_achieved']);
-        //Log::info($program_array);
-        if ($program_array['course_outcomes_achieved']) {
-          //(($program_array['course_outcomes_achieved'])) {
-          $program_array['course_outcomes_achieved'] = $course->outcomes_ach();
-          $program_array['course_outcomes_attempted'] = $course->outcomes_att();
-          //Log::info('course_outcomes_achieved');
-          //Log::info($program_array['course_outcomes_achieved']);
-          //Log::info($program_array);
-
-          foreach ($program_array['course_outcomes_achieved'] as $outcome_id => $score) {
-            if (array_key_exists($outcome_id, $program_array['outcomes_achieved']))  $program_array['outcomes_achieved'][$outcome_id] += $score;
-            else $program_array['outcomes_achieved'][$outcome_id] = $score;
-            //Log::info('program["outcomes_achieved"]');
-            //Log::info($program_array['outcomes_achieved'][$i]);
-            //Log::info($program_array);
-            Log::info("outcomes_achieved");
-            Log::info($program_array['outcomes_achieved']);
-          }
-          foreach ($program_array['course_outcomes_attempted'] as $i => $score) {
-
-            if (array_key_exists($i, $program_array['outcomes_attempted']))  $program_array['outcomes_attempted'][$i] += $program_array['course_outcomes_attempted'][$i];
-            else $program_array['outcomes_attempted'][$i] = $program_array['course_outcomes_attempted'][$i];
-            //Log::info('program["outcomes_achieved"]');
-            //Log::info($program_array['outcomes_attempted'][$i]);
-            //Log::info($program_array);
-          }
-
-          $program_array['assessed_courses_count'] += 1;
-        }
-      }*/
-
-
-      /**
-       * List of grouped courses (grouped sections)
-       */
-
-      //old code
-      /* $program_array['grouped_courses'] = Course::select(DB::raw('name, code, number, max(outcomes_attempted) as outcomes_attempted, semester_id, program_id'))
-        ->with('semester')
-        ->with('program')
-        ->where('program_id', $program->id)
-        ->whereIn('semester_id', Session::get('semesters_ids'))
-        ->groupBy(array('code', 'number', 'semester_id'))
-        ->orderBy('code')
-        ->orderBy('number')
-        ->orderBy('semester_id')
-        ->get(); */
-      //Log::info($program_array);
       $program_array['grouped_courses'] = Course::select(DB::raw('name, code, number, semester_id, program_id'))
         ->with('semester')
         ->with('program')

app/controllers/ProgramsController.php

@@ -58,7 +58,7 @@ class ProgramsController extends \BaseController
     $outcomes_attempted = [];
     $outcomes_achieved = [];
 
-    $program_info = $program->program_students_per_outcome;
+    $program_info = $program->courses_students_score_per_outcome;
 
     $outcomes_attempted = $program_info['program_info']['outcomes_attempted_combined'];
     $outcomes_achieved = $program_info['program_info']['outcomes_achieved_combined'];
@@ -352,6 +352,10 @@ class ProgramsController extends \BaseController
   {
     return strcmp($a->name, $b->name);
   }
+  public function studentsProgramAssessmentReportForProfessors($program_id)
+  {
+    return $this->studentProgramAssessmentReport($program_id);
+  }
 
   public function studentProgramAssessmentReport($program_id)
   {
@@ -407,7 +411,7 @@ class ProgramsController extends \BaseController
 
     $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'))
+      select(DB::raw('courses.name, courses.code, courses.number, courses.semester_id, courses.program_id, 1 as grouped'))
       ->with('semester')
       ->with('program')
       ->whereIn('courses.program_id', $programs_ids)
@@ -423,6 +427,7 @@ class ProgramsController extends \BaseController
     $role = Auth::user()->role;
 
     $users = array();
+    /*
 
 
     $resultados_todos_obj = DB::table('assessments')
@@ -458,7 +463,7 @@ class ProgramsController extends \BaseController
       if ($resultado->score >= $resultado->expected_points) {
         $resultados_todos[$resultado->program_id][$resultado->outcome_id][$resultado->student_id]['achieved']++;
       }
-    }
+    }*//*
 
     $outcomes_colap = array();
     $programs = array();
@@ -557,7 +562,7 @@ class ProgramsController extends \BaseController
         }
       }
       $i++;
-    }
+    }/*
     usort($outcomes_colap, array($this, "cmp"));
     // 		var_dump($outcomes_attempted_colap); print "<br>";
     // 		var_dump($outcomes_achieved_colap); print "<br>";
@@ -574,6 +579,7 @@ class ProgramsController extends \BaseController
         $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) {
@@ -585,11 +591,16 @@ class ProgramsController extends \BaseController
         $outcomes_attempted_todo[$out] += $outcomes_attempted[$program_id][$out];
         $outcomes_achieved_todo[$out] += $outcomes_achieved[$program_id][$out];
       }
-    }
-    $outcomes_attempted_colap = $outcomes_attempted_colap_todo;
-    $outcomes_achieved_colap = $outcomes_achieved_colap_todo;
-    $outcomes_attempted = $outcomes_attempted_todo;
-    $outcomes_achieved = $outcomes_achieved_todo;
+    }*/
+    $program_info = $program->program_students_per_outcome['program_info'];
+
+    $outcomes_attempted_colap = $program_info['outcomes_attempted_combined']; // $outcomes_attempted_colap_todo;
+    $outcomes_achieved_colap = $program_info['outcomes_achieved_combined']; //$outcomes_achieved_colap_todo;
+    $outcomes_attempted = $program_info['outcomes_attempted_uncombined'];
+    //$outcomes_attempted_todo;
+    $outcomes_achieved = $program_info['outcomes_achieved_uncombined'];
+    $outcomes_colap = Outcome::whereNull('new_outcome_id')->get();
+    //$outcomes_achieved_todo;
     // 	var_dump($outcomes_attempted_colap);
     // 	var_dump($outcomes_attempted_colap);
     // 	    return View::make('local.managers.shared.school_student_result', compact('title','outcomes_attempted_colap_semesters','outcomes_attempted_semesters','outcomes_attempted_colap_todo','outcomes_achieved_colap_todo','outcomes_attempted_todo','outcomes_achieved_todo','school','programs_name','role','outcomes','outcomes_colap', 'outcomes_attempted', 'outcomes_achieved', 'outcomes_attempted_colap', 'outcomes_achieved_colap', 'programs', 'users','program_courses','grouped_courses'));
@@ -671,6 +682,78 @@ class ProgramsController extends \BaseController
   //
   // }
 
+  public function print_program_students($program_id)
+  {
+    $id = $program_id;
+    ini_set('memory_limit', -1);
+    ini_set('max_execution_time', 300);
+
+
+    $program = Program::find($program_id);
+    $title = $program->school->name . ': ' . $program->name;
+    $outcomes = Outcome::orderBy('name', 'asc')->get();
+    $schools = School::all();
+    $outcomeCount = Outcome::all()->count();
+
+    // 		var_dump(json_encode($outcomes));
+    $role = Auth::user()->role;
+
+    $programs_ids = array($program->id);
+
+    $users = User::select('users.*')
+      ->leftJoin('program_user', 'users.id', '=', 'program_user.user_id')
+      ->where(function ($query) use ($program) {
+        $query
+          ->where('school_id', $program->school_id)
+          ->where('role', 2);
+      })
+      ->orWhere(function ($query) use ($program) {
+        $query
+          ->where('role', 3)
+          ->where('program_id', $program->id);
+      })
+      ->orWhere(function ($query) use ($program) {
+        $query
+          ->where('role', 4)
+          ->where('program_id', $program->id);
+      })
+      ->get();
+
+
+    $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, 1 as grouped'))
+      ->with('semester')
+      ->with('program')
+      ->whereIn('courses.program_id', $programs_ids)
+      ->whereIn('courses.semester_id', Session::get('semesters_ids'))
+      ->leftJoin('programs', 'courses.program_id', '=', 'programs.id')
+      ->groupBy(array('courses.code', 'courses.number', 'courses.semester_id'))
+      ->orderBy('courses.code')
+      ->orderBy('courses.number')
+      ->orderBy('courses.semester_id')
+      ->get();
+
+
+    $role = Auth::user()->role;
+
+    $users = array();
+
+    $program_info = $program->program_students_per_outcome['program_info'];
+
+    $outcomes_attempted_colap = $program_info['outcomes_attempted_combined']; // $outcomes_attempted_colap_todo;
+    $outcomes_achieved_colap = $program_info['outcomes_achieved_combined']; //$outcomes_achieved_colap_todo;
+    $outcomes_attempted = $program_info['outcomes_attempted_uncombined'];
+    //$outcomes_attempted_todo;
+    $outcomes_achieved = $program_info['outcomes_achieved_uncombined'];
+    $outcomes_colap = Outcome::whereNull('new_outcome_id')->get();
+    //$outcomes_achieved_todo;
+    // 	var_dump($outcomes_attempted_colap);
+    // 	var_dump($outcomes_attempted_colap);
+    // 	    return View::make('local.managers.shared.school_student_result', compact('title','outcomes_attempted_colap_semesters','outcomes_attempted_semesters','outcomes_attempted_colap_todo','outcomes_achieved_colap_todo','outcomes_attempted_todo','outcomes_achieved_todo','school','programs_name','role','outcomes','outcomes_colap', 'outcomes_attempted', 'outcomes_achieved', 'outcomes_attempted_colap', 'outcomes_achieved_colap', 'programs', 'users','program_courses','grouped_courses'));
+
+    return View::make('local.managers.shared.print_program_students', compact('title', 'role', 'outcomes', 'outcomes_colap', 'outcomes_attempted', 'outcomes_achieved', 'outcomes_attempted_colap', 'outcomes_achieved_colap', 'program', 'users', 'program_courses', 'grouped_courses'));
+  }
 
   /**
    * Info to print a program
@@ -706,10 +789,20 @@ class ProgramsController extends \BaseController
 
     $assessed_courses_count = 0;
 
-    $program_outcomes_attempted = $program->program_students_per_outcomes['program_info']['outcomes_attempted_combined'];
-    $program_outcomes_achieved = $program->program_students_per_outcomes['program_info']['outcomes_achieved_combined'];
+    //Log::info("Aqui");
+    //Log::info($program->program_students_per_outcomes);
+    //$program_info =  $program->program_students_per_outcome['program_info'];
 
+    //$program_outcomes_attempted = $program_info['outcomes_attempted_combined'];
+    //$program_outcomes_achieved = $program_info['outcomes_achieved_combined'];
 
+    $course_info =  $program->courses_students_score_per_outcome['program_info'];
+
+
+    $outcomes_attempted =  $course_info['outcomes_attempted_combined'];
+    $outcomes_achieved = $course_info['outcomes_achieved_combined'];
+    $assessed_courses_count = $program->courses_with_assessment_count->courses_assessed;
+    /*
     foreach ($program_courses as $course) {
 
 
@@ -742,7 +835,7 @@ class ProgramsController extends \BaseController
 
 */
 
-      /*
+    /*
       if ($course->outcomes_att()) {
         $course_outcomes_attempted = $course->outcomes_att();
         foreach ($course_outcomes_attempted as $outcome => $score) {
@@ -762,8 +855,9 @@ class ProgramsController extends \BaseController
           else $outcomes_achieved[$outcome] = $score;
         }
       }
-      */
+      
     }
+    */
 
 
 
@@ -841,7 +935,7 @@ class ProgramsController extends \BaseController
 
     $program_array['program_courses'] = $program->courses;
     // $program_array['grouped_objectives'] = $program->objectives();
-
+    /*
     $program_array['assessed_courses_count'] = 0;
     foreach ($program_array['program_courses'] as $course) {
       if (!$program_array['course_outcomes_achieved'] = $course->outcomes_ach()) {
@@ -860,7 +954,7 @@ class ProgramsController extends \BaseController
 
         $program_array['assessed_courses_count'] += 1;
       }
-    }
+    }*/
 
     /**
      * List of grouped courses (grouped sections)

app/controllers/SchoolsController.php

@@ -39,6 +39,9 @@ class SchoolsController extends \BaseController
 
         $outcomes_grad = Outcome::active_by_semesters($semesters, 1);
         $outcomes_undergrad = Outcome::active_by_semesters($semesters, 0);
+        //$school->school_courses_per_outcome;
+
+
 
         //$undergrad_stu_outcome_attempted = [];
         //$grad_stu_outcome_attempted = [];
@@ -151,14 +154,14 @@ class SchoolsController extends \BaseController
             ->addSelect('outcome_id')
             ->groupBy(array('students.id', 'outcome_id'))
             ->get();
-*/
+        */
         //school
 
 
 
 
 
-        $school_info = $school->school_students_per_outcome;
+        $school_info = $school->school_courses_per_outcome;
         $grad_outcomes_attempted = $school_info['graduate_info']['outcomes_attempted_combined'];
         $grad_outcomes_achieved = $school_info['graduate_info']['outcomes_achieved_combined'];
 
@@ -167,7 +170,7 @@ class SchoolsController extends \BaseController
 
         $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'))
+            select(DB::raw('courses.name, courses.code, courses.number, courses.semester_id, courses.program_id, 1 as grouped'))
             ->with('semester')
             ->with('program')
             ->whereIn('courses.program_id', $program_ids)
@@ -182,7 +185,7 @@ class SchoolsController extends \BaseController
 
         $undergrad_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'))
+            select(DB::raw('courses.name, courses.code, courses.number, courses.semester_id, courses.program_id, 1 as grouped'))
             ->with('semester')
             ->with('program')
             ->whereIn('courses.program_id', $program_ids)
@@ -242,12 +245,25 @@ class SchoolsController extends \BaseController
         }
 
 
+        //Aqui estan los resultados divididos en outcomes y programs
+
+
+
+        $attemptedUndergradProgramsPerOutcome = $school_info['undergraduate_info']['programs_attempted_combined'];
+        $achievedUndergradProgramsPerOutcome = $school_info['undergraduate_info']['programs_achieved_combined'];
+        $attemptedGradProgramsPerOutcome = $school_info['graduate_info']['programs_attempted_combined'];
+        $achievedGradProgramsPerOutcome = $school_info['graduate_info']['programs_achieved_combined'];
+
+
+
+
+
         //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")
@@ -461,7 +477,7 @@ class SchoolsController extends \BaseController
             ->groupBy("expected_target")
             ->orderBy("expected_target", "DESC")
             ->first();
-        Log::info($linea_grad);
+        //Log::info($linea_grad);
         if (!isset($linea_grad)) {
             $default_grad = 70;
         } elseif ($linea_grad->count_semester_id > 1) {
@@ -479,17 +495,24 @@ class SchoolsController extends \BaseController
                 ->first();
         }
 
-        Log::info($default_grad);
+        $expected_target_for_undergradprograms = !isset($linea_undergrad) ? $default_undergrad : $linea_undergrad->expected_target;
+        $expected_target_for_gradprograms = !isset($linea_grad) ? $default_grad : $linea_grad->expected_target;
+
+
+        //Log::info($default_grad);
+
+        $undergrad_programs = $school->undergraduate_programs->get();
+        $grad_programs = $school->graduate_programs->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', 'default_undergrad', 'default_grad', 'linea_undergrad', 'linea_grad', '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'));
+            return View::make('local.managers.shared.school-uhs', compact('title', 'expected_target_for_undergradprograms', 'expected_target_for_gradprograms', 'undergrad_programs', 'grad_programs', 'default_undergrad', 'default_grad', 'linea_undergrad', 'linea_grad', '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'));
         } else {
             //             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',  'default_undergrad', 'default_grad', 'linea_undergrad', 'linea_grad', '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'));
+            return View::make('local.managers.shared.school', compact('title', 'expected_target_for_undergradprograms', 'expected_target_for_gradprograms', 'undergrad_programs', 'grad_programs', 'default_undergrad', 'default_grad', 'linea_undergrad', 'linea_grad', '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'));
         }
     }
 
@@ -498,7 +521,7 @@ class SchoolsController extends \BaseController
         return strcmp($a->name, $b->name);
     }
 
-    public function studentSchoolAssessmentReport($school_id)
+    public function print_school_students_report($school_id)
     {
         $id = $school_id;
         ini_set('memory_limit', -1);
@@ -506,7 +529,7 @@ class SchoolsController extends \BaseController
 
         $outcomes = Outcome::orderBy('name', 'asc')->get();
         $school = School::find($school_id);
-        $title = $school->name;
+        $title = $school->name . ' Assessment Report - ' . date('m/d/Y');
         $outcomeCount = Outcome::all()->count();
         $programs = Program::where('school_id', '=', $school_id)->get();
         $programs_ids = array();
@@ -518,12 +541,104 @@ class SchoolsController extends \BaseController
             $programs_name[$program->id] = $program->name;
         }
 
-        $school->school_students_per_outcome;
+        $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, 1 as grouped'))
+            ->with('semester')
+            ->with('program')
+            ->whereIn('courses.program_id', $programs_ids)
+            ->whereIn('courses.semester_id', Session::get('semesters_ids'))
+            ->leftJoin('programs', 'courses.program_id', '=', 'programs.id')
+            ->groupBy(array('courses.code', 'courses.number', 'courses.semester_id'))
+            ->orderBy('courses.code')
+            ->orderBy('courses.number')
+            ->orderBy('courses.semester_id')
+            ->get();
+
 
+        $role = Auth::user()->role;
+
+        $users = array();
+        $outcomes_colap = Outcome::whereNull("new_outcome_id")->get();
+
+        $info = $school->school_students_per_outcome;
+
+        $outcomes_undergraduate_achieved_colap_todo = $info['undergraduate_info']['outcomes_achieved_combined'];
+        $outcomes_undergraduate_attempted_colap_todo = $info['undergraduate_info']['outcomes_attempted_combined'];
+
+        $outcomes_graduate_achieved_colap_todo = $info['graduate_info']['outcomes_achieved_combined'];
+        $outcomes_graduate_attempted_colap_todo = $info['graduate_info']['outcomes_attempted_combined'];
+
+
+        $outcomes_undergrad_program_attempted_colap = $info['undergraduate_info']['programs_attempted_combined'];
+        $outcomes_undergrad_program_achieved_colap = $info['undergraduate_info']['programs_achieved_combined'];
+        $outcomes_grad_program_attempted_colap = $info['graduate_info']['programs_attempted_combined'];
+        $outcomes_grad_program_achieved_colap = $info['graduate_info']['programs_achieved_combined'];
+
+
+        $undergraduate_programs = $school->undergraduate_programs->get();
+        $graduate_programs = $school->graduate_programs->get();
+
+
+
+
+
+
+
+        return View::make('local.managers.shared.print_school_students_report', compact(
+            'title', #'outcomes_attempted_colap_semesters', 'outcomes_attempted_semesters', 
+            'outcomes_undergraduate_attempted_colap_todo',
+            'outcomes_undergraduate_achieved_colap_todo',
+
+            'outcomes_graduate_attempted_colap_todo',
+            'outcomes_graduate_achieved_colap_todo',
+
+            'outcomes_undergrad_program_attempted_colap',
+            'outcomes_undergrad_program_achieved_colap',
+            'outcomes_grad_program_attempted_colap',
+            'outcomes_grad_program_achieved_colap',
+
+            'undergraduate_programs',
+            'graduate_programs',
+            '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 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;
+        }
 
         $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'))
+            select(DB::raw('courses.name, courses.code, courses.number, courses.semester_id, courses.program_id, 1 as grouped'))
             ->with('semester')
             ->with('program')
             ->whereIn('courses.program_id', $programs_ids)
@@ -539,6 +654,8 @@ class SchoolsController extends \BaseController
         $role = Auth::user()->role;
 
         $users = array();
+        $outcomes_colap = Outcome::whereNull("new_outcome_id")->get();
+        /*
 
 
         $resultados_todos_obj = DB::table('assessments')
@@ -645,7 +762,7 @@ $resultados_todos=array();
                 }
             }
             // 			var_dump($resultados_todos_colap);
-
+        /*
             $outcomes_attempted_colap[$program_id] = array();
             $outcomes_achieved_colap[$program_id] = array();
             $outcomes_attempted_colap_semesters[$program_id] = array();
@@ -675,10 +792,12 @@ $resultados_todos=array();
             }
             $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) {
@@ -691,6 +810,7 @@ $resultados_todos=array();
                 $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) {
@@ -702,10 +822,79 @@ $resultados_todos=array();
                 $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'));
+        $info = $school->school_students_per_outcome;
+        Log::info("BRR");
+        Log::info($info);
+
+        $outcomes_undergraduate_achieved_colap_todo = $info['undergraduate_info']['outcomes_achieved_combined'];
+        $outcomes_undergraduate_attempted_colap_todo = $info['undergraduate_info']['outcomes_attempted_combined'];
+        $outcomes_undergraduate_achieved_todo = $info['undergraduate_info']['outcomes_achieved_uncombined'];
+        $outcomes_undergraduate_attempted_todo = $info['undergraduate_info']['outcomes_attempted_uncombined'];
+
+        $outcomes_graduate_achieved_colap_todo = $info['graduate_info']['outcomes_achieved_combined'];
+        $outcomes_graduate_attempted_colap_todo = $info['graduate_info']['outcomes_attempted_combined'];
+        $outcomes_graduate_achieved_todo = $info['graduate_info']['outcomes_achieved_uncombined'];
+        $outcomes_graduate_attempted_todo = $info['graduate_info']['outcomes_attempted_uncombined'];
+
+        $outcomes_undergrad_program_attempted_colap = $info['undergraduate_info']['programs_attempted_combined'];
+        $outcomes_undergrad_program_achieved_colap = $info['undergraduate_info']['programs_achieved_combined'];
+        $outcomes_grad_program_attempted_colap = $info['graduate_info']['programs_attempted_combined'];
+        $outcomes_grad_program_achieved_colap = $info['graduate_info']['programs_achieved_combined'];
+        Log::info("mera");
+        Log::info($outcomes_grad_program_attempted_colap);
+        $outcomes_undergrad_program_attempted_todo = $info['undergraduate_info']['programs_attempted_uncombined'];
+
+        $outcomes_undergrad_program_achieved_todo = $info['undergraduate_info']['programs_achieved_uncombined'];
+
+
+        $outcomes_grad_program_attempted_todo = $info['graduate_info']['programs_attempted_uncombined'];
+        $outcomes_grad_program_achieved_todo = $info['graduate_info']['programs_achieved_uncombined'];
+
+        $undergraduate_programs = $school->undergraduate_programs->get();
+        $graduate_programs = $school->graduate_programs->get();
+
+
+
+
+
+
+
+        return View::make('local.managers.shared.school_student_result', compact(
+            'title', #'outcomes_attempted_colap_semesters', 'outcomes_attempted_semesters', 
+            'outcomes_undergraduate_attempted_colap_todo',
+            'outcomes_undergraduate_achieved_colap_todo',
+            'outcomes_undergraduate_attempted_todo',
+            'outcomes_undergraduate_achieved_todo',
+            'outcomes_graduate_attempted_colap_todo',
+            'outcomes_graduate_achieved_colap_todo',
+            'outcomes_graduate_attempted_todo',
+            'outcomes_graduate_achieved_todo',
+            'outcomes_undergrad_program_attempted_colap',
+            'outcomes_undergrad_program_achieved_colap',
+            'outcomes_grad_program_attempted_colap',
+            'outcomes_grad_program_achieved_colap',
+            'outcomes_undergrad_program_attempted_todo',
+            'outcomes_undergrad_program_achieved_todo',
+            'outcomes_grad_program_attempted_todo',
+            'outcomes_grad_program_achieved_todo',
+            'undergraduate_programs',
+            'graduate_programs',
+            '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)
@@ -1194,7 +1383,7 @@ $resultados_todos=array();
         $undergrad_outcomes_achieved = [];
 
 
-        $school_info = $school->school_students_per_outcome;
+        $school_info = $school->school_courses_per_outcome;
         $grad_outcomes_attempted = $school_info['graduate_info']['outcomes_attempted_combined'];
         $grad_outcomes_achieved = $school_info['graduate_info']['outcomes_achieved_combined'];
 
@@ -1205,60 +1394,7 @@ $resultados_todos=array();
 
 
 
-        /*
-
-
-        $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'))
@@ -1336,10 +1472,19 @@ $resultados_todos=array();
             }
         }
 
+        $attemptedUndergradProgramsPerOutcome = $school_info['undergraduate_info']['programs_attempted_combined'];
+        $achievedUndergradProgramsPerOutcome = $school_info['undergraduate_info']['programs_achieved_combined'];
+        $attemptedGradProgramsPerOutcome = $school_info['graduate_info']['programs_attempted_combined'];
+        $achievedGradProgramsPerOutcome = $school_info['graduate_info']['programs_achieved_combined'];
+
+
+
+
 
-        //como resuelvo programsAttempted y eso
 
+        //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
 
@@ -1434,7 +1579,7 @@ $resultados_todos=array();
                     $achievedGradProgramsPerOutcome[$outcome_id][$program_id] = 0;
                 $achievedGradProgramsPerOutcome[$outcome_id][$program_id]++;
             }
-        }
+        }*/
         //La linea negra de proposed.
 
         //
@@ -1494,15 +1639,24 @@ $resultados_todos=array();
                 ->first();
         }
 
+        $expected_target_for_undergradprograms = !isset($linea_undergrad) ? $default_undergrad : $linea_undergrad->expected_target;
+        $expected_target_for_gradprograms = !isset($linea_grad) ? $default_grad : $linea_grad->expected_target;
+
+
+        //Log::info($default_grad);
+
+        $undergrad_programs = $school->undergraduate_programs->get();
+        $grad_programs = $school->graduate_programs->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.print_school', compact('title', 'default_undergrad', 'default_grad', 'linea_undergrad', 'linea_grad', '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'));
+            return View::make('local.managers.shared.print_school', compact('title',  'expected_target_for_undergradprograms', 'expected_target_for_gradprograms', 'undergrad_programs', 'grad_programs', 'default_undergrad', 'default_grad', 'linea_undergrad', 'linea_grad', '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'));
         } else {
             //             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.print_school', compact('title',  'default_undergrad', 'default_grad', 'linea_undergrad', 'linea_grad', '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'));
+            return View::make('local.managers.shared.print_school', compact('title',  'expected_target_for_undergradprograms', 'expected_target_for_gradprograms', 'undergrad_programs', 'grad_programs', 'default_undergrad', 'default_grad', 'linea_undergrad', 'linea_grad', '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'));
         }
 
 

app/models/Course.php

@@ -480,6 +480,34 @@ class Course extends Eloquent
     return $this->getStudentReportForOutcome($this);
   }
 
+  //cuantos estudiantes tiene este cursos que son del programa
+
+  public function getQuantityAttribute()
+  {
+    $query = DB::table('courses')
+      ->join('course_student', 'course_student.course_id', '=', 'courses.id')
+      ->join('program_student_semester as pcs', function ($j) {
+        $j->on('courses.program_id', '=', 'pcs.program_id')
+          ->on('course_student.student_id', '=', 'pcs.student_id')
+          ->on('courses.semester_id', '=', 'pcs.semester_id');
+      });
+    if ($this->grouped) {
+      $query = $query->where('courses.name', $this->name)
+        ->where('courses.code', $this->code)
+        ->where('courses.number', $this->number)
+        ->where('courses.semester_id', $this->semester_id);
+    } else {
+      $query = $query->where("courses.id", $this->id);
+    }
+    $query = $query->select(DB::raw("count( distinct pcs.student_id) as quantity"));
+
+    $query =  $query->first();
+    if (isset($query)) {
+      return $query->quantity;
+    }
+    return 0;
+  }
+
 
   //user id is for groupped professor sections. so el query es  code, number, semester y user_id
   public static function getStudentReportForOutcome($course_code = null, $user_id = null)

app/models/Program.php

@@ -38,149 +38,148 @@ class Program extends Eloquent
 	}
 
 	public function getProgramStudentsPerOutcomeAttribute()
-	{ {
+	{
 
-			$semesters = Semester::whereIn('id', Session::get('semesters_ids'))->get();
+		$semesters = Semester::whereIn('id', Session::get('semesters_ids'))->get();
 
-			//if ($this->is_graduate == 1) {
-			//	$outcomes = Outcome::active_by_semesters($semesters, 1);
-			//} else {
-			//	$outcomes = Outcome::active_by_semesters($semesters, 0);
-			//}
+		//if ($this->is_graduate == 1) {
+		//	$outcomes = Outcome::active_by_semesters($semesters, 1);
+		//} else {
+		//	$outcomes = Outcome::active_by_semesters($semesters, 0);
+		//}
 
-			$outcomes = Outcome::orderBy('name', 'asc')->get();
+		$outcomes = Outcome::orderBy('name', 'asc')->get();
 
-			$outcome_ids = DB::table("outcomes")
-				->whereNotNull('new_outcome_id')
-				->get();
+		$outcome_ids = DB::table("outcomes")
+			->whereNotNull('new_outcome_id')
+			->get();
 
-			$combined_outcomes = [];
-			foreach ($outcome_ids as $outcome) {
-				$combined_outcomes[$outcome->id] = $outcome->new_outcome_id;
-			}
+		$combined_outcomes = [];
+		foreach ($outcome_ids as $outcome) {
+			$combined_outcomes[$outcome->id] = $outcome->new_outcome_id;
+		}
 
-			$array_to_send = [];
+		$array_to_send = [];
 
 
 
-			$students =
-				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')
-				->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')
-				->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"))
+		$students =
+			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')
+			->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')
+			->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"))
 
-				->groupBy('students.id', 'outcome_id')
-				->get();
+			->groupBy('students.id', 'outcome_id')
+			->get();
 
 
 
 
-			$array_to_send['program_info'] = [];
+		$array_to_send['program_info'] = [];
 
-			$array_to_send['program_info']['outcomes_attempted'] = [];
-			$out_att = [];
-			$out_ach = [];
+		$array_to_send['program_info']['outcomes_attempted'] = [];
+		$out_att = [];
+		$out_ach = [];
 
-			foreach ($outcomes as $outcome) {
-				$out_att[$outcome->id] = 0;
-				$out_ach[$outcome->id] = 0;
-			}
+		foreach ($outcomes as $outcome) {
+			$out_att[$outcome->id] = 0;
+			$out_ach[$outcome->id] = 0;
+		}
 
 
-			//las filas son , estudiante, outcome que intentó, criterios_attempted, criterion_achieved, 
-			foreach ($students as $result) {
-				$crit_att = $result->criteria_attempted;
-				$crit_ach = $result->criteria_achieved;
+		//las filas son , estudiante, outcome que intentó, criterios_attempted, criterion_achieved, 
+		foreach ($students as $result) {
+			$crit_att = $result->criteria_attempted;
+			$crit_ach = $result->criteria_achieved;
 
 
-				$out_att[$result->outcome_id] += 1;
+			$out_att[$result->outcome_id] += 1;
 
-				if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
-					$out_ach[$result->outcome_id] += 1;
-				}
+			if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
+				$out_ach[$result->outcome_id] += 1;
 			}
+		}
 
 
-			$array_to_send['program_info']['outcomes_attempted_uncombined'] = $out_att;
-			$array_to_send['program_info']['outcomes_achieved_uncombined'] = $out_ach;
+		$array_to_send['program_info']['outcomes_attempted_uncombined'] = $out_att;
+		$array_to_send['program_info']['outcomes_achieved_uncombined'] = $out_ach;
 
 
-			$the_processed_table = [];
-			foreach ($students as $result) {
-				$student_id = $result->student_id;
-				$outcome_id = $result->outcome_id;
-				if (isset($combined_outcomes[$outcome_id]))
-					$outcome_id = $combined_outcomes[$outcome_id];
+		$the_processed_table = [];
+		foreach ($students as $result) {
+			$student_id = $result->student_id;
+			$outcome_id = $result->outcome_id;
+			if (isset($combined_outcomes[$outcome_id]))
+				$outcome_id = $combined_outcomes[$outcome_id];
 
 
 
-				if (!isset($the_processed_table[$student_id])) {
-					$the_processed_table[$student_id] = [];
-				}
+			if (!isset($the_processed_table[$student_id])) {
+				$the_processed_table[$student_id] = [];
+			}
 
 
-				//si en esta tabla, el estudiante no está pareado con este dominio, entonces registra
-				// los criterios, achieved y attempted
-				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
-					);
-				}
-				//si este estudiante está pareado a este dominio, significa que ahora estoy en los
-				//deprecated outcomes.
-				else {
-					$the_processed_table[$student_id][$outcome_id]['criteria_attempted'] += $result->criteria_attempted;
-					$the_processed_table[$student_id][$outcome_id]['criteria_achieved'] += $result->criteria_achieved;
-				}
+			//si en esta tabla, el estudiante no está pareado con este dominio, entonces registra
+			// los criterios, achieved y attempted
+			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
+				);
 			}
-			//Log::info("ESTOY LOCO POR TI");
-			//Log::info($the_processed_table);
+			//si este estudiante está pareado a este dominio, significa que ahora estoy en los
+			//deprecated outcomes.
+			else {
+				$the_processed_table[$student_id][$outcome_id]['criteria_attempted'] += $result->criteria_attempted;
+				$the_processed_table[$student_id][$outcome_id]['criteria_achieved'] += $result->criteria_achieved;
+			}
+		}
+		//Log::info("ESTOY LOCO POR TI");
+		//Log::info($the_processed_table);
 
-			$out_att = [];
-			$out_ach = [];
+		$out_att = [];
+		$out_ach = [];
 
-			foreach ($outcomes as $outcome) {
-				$out_att[$outcome->id] = 0;
-				$out_ach[$outcome->id] = 0;
-			}
+		foreach ($outcomes as $outcome) {
+			$out_att[$outcome->id] = 0;
+			$out_ach[$outcome->id] = 0;
+		}
 
-			foreach ($the_processed_table as $student_id => $outcome_ids) {
-				//Log::info("AQUI");
-				//Log::info($outcome_ids);
-				foreach ($outcome_ids as $outcome_id => $crit_information) {
-					Log::info($crit_information);
-					$crit_att = $crit_information['criteria_attempted'];
-					$crit_ach = $crit_information['criteria_achieved'];
+		foreach ($the_processed_table as $student_id => $outcome_ids) {
+			//Log::info("AQUI");
+			//Log::info($outcome_ids);
+			foreach ($outcome_ids as $outcome_id => $crit_information) {
+				//Log::info($crit_information);
+				$crit_att = $crit_information['criteria_attempted'];
+				$crit_ach = $crit_information['criteria_achieved'];
 
 
-					$out_att[$outcome_id] += 1;
+				$out_att[$outcome_id] += 1;
 
-					if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
-						$out_ach[$outcome_id] += 1;
-					}
+				if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
+					$out_ach[$outcome_id] += 1;
 				}
 			}
+		}
 
-			$array_to_send['program_info']['outcomes_attempted_combined'] = $out_att;
-			$array_to_send['program_info']['outcomes_achieved_combined'] = $out_ach;
+		$array_to_send['program_info']['outcomes_attempted_combined'] = $out_att;
+		$array_to_send['program_info']['outcomes_achieved_combined'] = $out_ach;
 
 
 
 
-			return $array_to_send;
-		}
+		return $array_to_send;
 	}
 
 	public function getCriteriaAttribute()
@@ -203,6 +202,147 @@ class Program extends Eloquent
 				->get();
 		}
 	}
+
+	public function getCoursesWithAssessmentCountAttribute()
+	{
+		return DB::table('courses')
+			->join(DB::raw("(SELECT distinct courses.* from courses join activities on activities.course_id = courses.id join activity_criterion on activity_criterion.activity_id = activities.id join assessments on activity_criterion.id = assessments.activity_criterion_id) as q"), function ($j) {
+				$j->on('q.semester_id', '=', 'courses.semester_id')
+					->on('q.program_id', '=', 'courses.program_id');
+			})
+			->where('courses.program_id', $this->id)
+			->whereIn('courses.semester_id', Session::get('semesters_ids'))
+			->select(DB::raw('count(DISTINCT courses.id) as courses_program, count(DISTINCT q.id) as courses_assessed'))
+			->first();
+	}
+
+	public function getCoursesStudentsScorePerOutcomeAttribute()
+	{
+		$outcomes = Outcome::orderBy('name', 'asc')->get();
+
+		$outcome_ids = DB::table("outcomes")
+			->whereNotNull('new_outcome_id')
+			->get();
+
+		$combined_outcomes = [];
+		foreach ($outcome_ids as $outcome) {
+			$combined_outcomes[$outcome->id] = $outcome->new_outcome_id;
+		}
+
+		$array_to_send = [];
+		$students = 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')
+			->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')
+			->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"))
+
+			->groupBy('students.id', 'outcome_id')
+			->get();
+		$array_to_send['program_info'] = [];
+
+		$array_to_send['program_info']['outcomes_attempted'] = [];
+		$out_att = [];
+		$out_ach = [];
+
+		foreach ($outcomes as $outcome) {
+			$out_att[$outcome->id] = 0;
+			$out_ach[$outcome->id] = 0;
+		}
+
+
+		//las filas son , estudiante, outcome que intentó, criterios_attempted, criterion_achieved, 
+		foreach ($students as $result) {
+			$crit_att = $result->criteria_attempted;
+			$crit_ach = $result->criteria_achieved;
+
+
+			$out_att[$result->outcome_id] += 1;
+
+			if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
+				$out_ach[$result->outcome_id] += 1;
+			}
+		}
+
+
+		$array_to_send['program_info']['outcomes_attempted_uncombined'] = $out_att;
+		$array_to_send['program_info']['outcomes_achieved_uncombined'] = $out_ach;
+
+
+		$the_processed_table = [];
+		foreach ($students as $result) {
+			$student_id = $result->student_id;
+			$outcome_id = $result->outcome_id;
+			if (isset($combined_outcomes[$outcome_id]))
+				$outcome_id = $combined_outcomes[$outcome_id];
+
+
+
+			if (!isset($the_processed_table[$student_id])) {
+				$the_processed_table[$student_id] = [];
+			}
+
+
+			//si en esta tabla, el estudiante no está pareado con este dominio, entonces registra
+			// los criterios, achieved y attempted
+			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
+				);
+			}
+			//si este estudiante está pareado a este dominio, significa que ahora estoy en los
+			//deprecated outcomes.
+			else {
+				$the_processed_table[$student_id][$outcome_id]['criteria_attempted'] += $result->criteria_attempted;
+				$the_processed_table[$student_id][$outcome_id]['criteria_achieved'] += $result->criteria_achieved;
+			}
+		}
+		//Log::info("ESTOY LOCO POR TI");
+		//Log::info($the_processed_table);
+
+		$out_att = [];
+		$out_ach = [];
+
+		foreach ($outcomes as $outcome) {
+			$out_att[$outcome->id] = 0;
+			$out_ach[$outcome->id] = 0;
+		}
+
+		foreach ($the_processed_table as $student_id => $outcome_ids) {
+			//Log::info("AQUI");
+			//Log::info($outcome_ids);
+			foreach ($outcome_ids as $outcome_id => $crit_information) {
+				//Log::info($crit_information);
+				$crit_att = $crit_information['criteria_attempted'];
+				$crit_ach = $crit_information['criteria_achieved'];
+
+
+				$out_att[$outcome_id] += 1;
+
+				if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
+					$out_ach[$outcome_id] += 1;
+				}
+			}
+		}
+
+		$array_to_send['program_info']['outcomes_attempted_combined'] = $out_att;
+		$array_to_send['program_info']['outcomes_achieved_combined'] = $out_ach;
+
+
+
+
+		return $array_to_send;
+	}
 	public function templates()
 	{
 		return $this->hasMany('Template');
@@ -353,7 +493,7 @@ class Program extends Eloquent
 			->whereIn('courses.semester_id', $semesters_array)
 			->count(DB::raw('DISTINCT criterion_objective_outcome.outcome_id'));
 
-
+		/*
 		Log::info(DB::table('activity_criterion')
 			->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
 			->join('courses', 'activities.course_id', '=', 'courses.id')
@@ -363,6 +503,7 @@ class Program extends Eloquent
 			->where('programs.id', '=', $this->id)
 			->whereIn('courses.semester_id', $semesters_array)
 			->toSql());
+			*/
 		return $conteo;
 	}
 

app/models/School.php

@@ -59,6 +59,342 @@ class School extends Eloquent
 
 */
 
+	public function getSchoolCoursesPerOutcomeAttribute()
+	{
+		$semesters = Semester::whereIn('id', Session::get('semesters_ids'))->get();
+
+		$outcomes_grad = Outcome::active_by_semesters($semesters, 1);
+		$outcomes_undergrad = Outcome::active_by_semesters($semesters, 0);
+
+		$outcomes = Outcome::orderBy('name', 'asc')->get();
+		$array_to_send = [];
+
+
+
+		$undergraduate_students =
+			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('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')
+			->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"))
+
+			->groupBy('students.id', 'outcome_id');
+
+		//->get();
+
+
+
+		$undergraduate_students = $undergraduate_students->get();
+
+		//$array_to_send["undergraduate_students"] = $undergraduate_students;
+
+		$graduate_students = 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('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')
+			->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"))
+
+			->groupBy('students.id', 'outcome_id', 'courses.program_id')
+			->get();
+
+		//$array_to_send["graduate_students"] = $graduate_students;
+
+		//Log::info(count($graduate_students));
+		//Log::info(count($undergraduate_students));
+
+		$outcome_ids = DB::table("outcomes")
+			->whereNotNull('new_outcome_id')
+			->get();
+
+		$combined_outcomes = [];
+		foreach ($outcome_ids as $outcome) {
+			$combined_outcomes[$outcome->id] = $outcome->new_outcome_id;
+		}
+
+		//Necesito undergraduateCombined, undergraduateUncombined, 
+		//lo mismo pa graduate 
+
+		$array_to_send['undergraduate_info'] = [];
+		$array_to_send['graduate_info'] = [];
+
+		$array_to_send['undergraduate_info']['outcomes_attempted_uncombined'] = [];
+		$array_to_send['undergraduate_info']['outcomes_achieved_uncombined'] = [];
+		$array_to_send['graduate_info']['outcomes_attempted_uncombined']  = [];
+		$array_to_send['graduate_info']['outcomes_achieved_uncombined'] = [];
+
+		$under_out_att = [];
+		$under_out_ach = [];
+		$program_out_att = [];
+		$program_out_ach = [];
+
+		foreach ($outcomes as $outcome) {
+			$under_out_att[$outcome->id] = 0;
+			$under_out_ach[$outcome->id] = 0;
+			$program_out_att[$outcome->id] = [];
+			$program_out_ach[$outcome->id] = [];
+		}
+
+		//Para los programas attempted, voy a tener, un arreglo por dominio, y cada dominio tendra
+		//indices por cada programa, y cada programa tendrá conteo del estudiantes que intentaron y 
+		// estudiantes que fallaron. 
+
+		//las filas son , estudiante, outcome que intentó, criterios_attempted, criterion_achieved, 
+		foreach ($undergraduate_students as $result) {
+			$crit_att = $result->criteria_attempted;
+			$crit_ach = $result->criteria_achieved;
+
+			$program_id = $result->program_id;
+
+			if (!isset($program_out_att[$result->outcome_id][$program_id])) {
+				$program_out_att[$result->outcome_id][$program_id] = 0;
+			}
+
+			$program_out_att[$result->outcome_id][$program_id] += 1;
+
+			$under_out_att[$result->outcome_id] += 1;
+
+
+
+			if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
+				if (!isset($program_out_ach[$result->outcome_id][$program_id])) {
+					$program_out_ach[$result->outcome_id][$program_id] = 0;
+				}
+				$program_out_ach[$result->outcome_id][$program_id] += 1;
+				$under_out_ach[$result->outcome_id] += 1;
+			}
+		}
+
+		$array_to_send['undergraduate_info']['programs_attempted_uncombined'] = $program_out_att;
+		$array_to_send['undergraduate_info']['programs_achieved_uncombined'] = $program_out_ach;
+
+		$array_to_send['undergraduate_info']['outcomes_attempted_uncombined'] = $under_out_att;
+		$array_to_send['undergraduate_info']['outcomes_achieved_uncombined'] = $under_out_ach;
+
+		$grad_out_att = [];
+		$grad_out_ach = [];
+
+		foreach ($outcomes as $outcome) {
+			$grad_out_att[$outcome->id] = 0;
+			$grad_out_ach[$outcome->id] = 0;
+			$program_out_att[$outcome->id] = [];
+			$program_out_ach[$outcome->id] = [];
+		}
+
+
+		//las filas son , estudiante, outcome que intentó, criterios_attempted, criterion_achieved, 
+		foreach ($graduate_students as $result) {
+			$crit_att = $result->criteria_attempted;
+			$crit_ach = $result->criteria_achieved;
+
+			$program_id = $result->program_id;
+
+			if (!isset($program_out_att[$result->outcome_id][$program_id])) {
+				$program_out_att[$result->outcome_id][$program_id] = 0;
+			}
+			$program_out_att[$result->outcome_id][$program_id] += 1;
+
+
+			$grad_out_att[$result->outcome_id] += 1;
+
+			if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
+				if (!isset($program_out_ach[$result->outcome_id][$program_id])) {
+					$program_out_ach[$result->outcome_id][$program_id] = 0;
+				}
+				$program_out_ach[$result->outcome_id][$program_id] += 1;
+				$grad_out_ach[$result->outcome_id] += 1;
+			}
+		}
+
+		$array_to_send['graduate_info']['outcomes_attempted_uncombined'] = $grad_out_att;
+		$array_to_send['graduate_info']['outcomes_achieved_uncombined'] = $grad_out_ach;
+		$array_to_send['graduate_info']['programs_attempted_uncombined'] = $program_out_att;
+		$array_to_send['graduate_info']['programs_achieved_uncombined'] = $program_out_ach;
+
+
+
+
+		$array_to_send['undergraduate_info']['outcomes_attempted_combined'] = [];
+		$array_to_send['undergraduate_info']['outcomes_achieved_combined'] = [];
+		$array_to_send['graduate_info']['outcomes_attempted_combined']  = [];
+		$array_to_send['graduate_info']['outcomes_achieved_combined'] = [];
+
+		$under_out_att = [];
+		$under_out_ach = [];
+
+		foreach ($outcomes as $outcome) {
+			$under_out_att[$outcome->id] = 0;
+			$under_out_ach[$outcome->id] = 0;
+			$program_out_att[$outcome->id] = [];
+			$program_out_ach[$outcome->id] = [];
+		}
+
+		//preprocess para combined_students
+
+		$the_processed_table = [];
+		foreach ($undergraduate_students as $result) {
+			$student_id = $result->student_id;
+			$outcome_id = $result->outcome_id;
+			if (isset($combined_outcomes[$outcome_id]))
+				$outcome_id = $combined_outcomes[$outcome_id];
+
+
+
+			if (!isset($the_processed_table[$student_id])) {
+				$the_processed_table[$student_id] = [];
+			}
+
+
+			//si en esta tabla, el estudiante no está pareado con este dominio, entonces registra
+			// los criterios, achieved y attempted
+			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,
+					"program_id" => $result->program_id
+				);
+			}
+			//si este estudiante está pareado a este dominio, significa que ahora estoy en los
+			//deprecated outcomes.
+			else {
+				$the_processed_table[$student_id][$outcome_id]['criteria_attempted'] += $result->criteria_attempted;
+				$the_processed_table[$student_id][$outcome_id]['criteria_achieved'] += $result->criteria_achieved;
+			}
+		}
+
+
+		foreach ($the_processed_table as $student_id => $outcome_ids) {
+			foreach ($outcome_ids as $outcome_id => $crit_information) {
+				$crit_att = $crit_information['criteria_attempted'];
+				$crit_ach = $crit_information['criteria_achieved'];
+				$program_id = $crit_information['program_id'];
+
+
+				$under_out_att[$outcome_id] += 1;
+
+
+				if (!isset($program_out_att[$outcome_id][$program_id])) {
+					$program_out_att[$outcome_id][$program_id] = 0;
+				}
+
+				$program_out_att[$outcome_id][$program_id] += 1;
+
+				if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
+					if (!isset($program_out_ach[$outcome_id][$program_id])) {
+						$program_out_ach[$outcome_id][$program_id] = 0;
+					}
+					$program_out_ach[$outcome_id][$program_id] += 1;
+					$under_out_ach[$outcome_id] += 1;
+				}
+			}
+		}
+
+		$array_to_send['undergraduate_info']['outcomes_attempted_combined'] = $under_out_att;
+		$array_to_send['undergraduate_info']['outcomes_achieved_combined'] = $under_out_ach;
+		$array_to_send['undergraduate_info']['programs_attempted_combined'] = $program_out_att;
+		$array_to_send['undergraduate_info']['programs_achieved_combined'] = $program_out_ach;
+
+
+		$grad_out_att = [];
+		$grad_out_ach = [];
+
+		foreach ($outcomes as $outcome) {
+			$grad_out_att[$outcome->id] = 0;
+			$grad_out_ach[$outcome->id] = 0;
+			$program_out_att[$outcome->id] = [];
+			$program_out_ach[$outcome->id] = [];
+		}
+
+		//preprocess para combined_students
+
+		$the_processed_table = [];
+		foreach ($graduate_students as $result) {
+			$student_id = $result->student_id;
+			$outcome_id = $result->outcome_id;
+			if (isset($combined_outcomes[$outcome_id]))
+				$outcome_id = $combined_outcomes[$outcome_id];
+
+
+
+			if (!isset($the_processed_table[$student_id])) {
+				$the_processed_table[$student_id] = [];
+			}
+
+
+			//si en esta tabla, el estudiante no está pareado con este dominio, entonces registra
+			// los criterios, achieved y attempted
+			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,
+					'program_id' => $result->program_id
+				);
+			}
+			//si este estudiante está pareado a este dominio, significa que ahora estoy en los
+			//deprecated outcomes.
+			else {
+				$the_processed_table[$student_id][$outcome_id]['criteria_attempted'] += $result->criteria_attempted;
+				$the_processed_table[$student_id][$outcome_id]['criteria_achieved'] += $result->criteria_achieved;
+			}
+		}
+
+
+
+
+		foreach ($the_processed_table as $student_id => $outcome_ids) {
+			foreach ($outcome_ids as $out_id => $crit_information) {
+				$crit_att = $crit_information['criteria_attempted'];
+				$crit_ach = $crit_information['criteria_achieved'];
+				$program_id = $crit_information['program_id'];
+
+
+				$grad_out_att[$out_id] += 1;
+
+				if (!isset($program_out_att[$out_id][$program_id])) {
+					$program_out_att[$out_id][$program_id] = 0;
+				}
+
+				$program_out_att[$out_id][$program_id] += 1;
+
+				if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
+					if (!isset($program_out_ach[$out_id][$program_id])) {
+						$program_out_ach[$out_id][$program_id] = 0;
+					}
+					$program_out_ach[$out_id][$program_id] += 1;
+					$grad_out_ach[$out_id] += 1;
+				}
+			}
+		}
+
+		$array_to_send['graduate_info']['outcomes_attempted_combined'] = $grad_out_att;
+		$array_to_send['graduate_info']['outcomes_achieved_combined'] = $grad_out_ach;
+		$array_to_send['graduate_info']['programs_attempted_combined'] = $program_out_att;
+		$array_to_send['graduate_info']['programs_achieved_combined'] = $program_out_ach;
+
+		Log::info($array_to_send);
+		return $array_to_send;
+	}
+
+
 	public function getSchoolStudentsPerOutcomeAttribute()
 	{
 
@@ -89,8 +425,13 @@ class School extends Eloquent
 			->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"))
 
-			->groupBy('students.id', 'outcome_id')
-			->get();
+			->groupBy('students.id', 'outcome_id');
+
+		//->get();
+
+
+
+		$undergraduate_students = $undergraduate_students->get();
 
 		//$array_to_send["undergraduate_students"] = $undergraduate_students;
 
@@ -140,32 +481,60 @@ class School extends Eloquent
 
 		$under_out_att = [];
 		$under_out_ach = [];
+		$program_out_att = [];
+		$program_out_ach = [];
 
 		foreach ($outcomes as $outcome) {
 			$under_out_att[$outcome->id] = 0;
 			$under_out_ach[$outcome->id] = 0;
+			$program_out_att[$outcome->id] = [];
+			$program_out_ach[$outcome->id] = [];
 		}
 
+		//Para los programas attempted, voy a tener, un arreglo por dominio, y cada dominio tendra
+		//indices por cada programa, y cada programa tendrá conteo del estudiantes que intentaron y 
+		// estudiantes que fallaron. 
 
 		//las filas son , estudiante, outcome que intentó, criterios_attempted, criterion_achieved, 
 		foreach ($undergraduate_students as $result) {
 			$crit_att = $result->criteria_attempted;
 			$crit_ach = $result->criteria_achieved;
 
+			$program_id = $result->program_id;
+
+			if (!isset($program_out_att[$result->outcome_id][$program_id])) {
+				$program_out_att[$result->outcome_id][$program_id] = 0;
+			}
+
+			$program_out_att[$result->outcome_id][$program_id] += 1;
 
 			$under_out_att[$result->outcome_id] += 1;
 
+
+
 			if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
+				if (!isset($program_out_ach[$result->outcome_id][$program_id])) {
+					$program_out_ach[$result->outcome_id][$program_id] = 0;
+				}
+				$program_out_ach[$result->outcome_id][$program_id] += 1;
 				$under_out_ach[$result->outcome_id] += 1;
 			}
 		}
 
+		$array_to_send['undergraduate_info']['programs_attempted_uncombined'] = $program_out_att;
+		$array_to_send['undergraduate_info']['programs_achieved_uncombined'] = $program_out_ach;
+
+		$array_to_send['undergraduate_info']['outcomes_attempted_uncombined'] = $under_out_att;
+		$array_to_send['undergraduate_info']['outcomes_achieved_uncombined'] = $under_out_ach;
+
 		$grad_out_att = [];
 		$grad_out_ach = [];
 
 		foreach ($outcomes as $outcome) {
 			$grad_out_att[$outcome->id] = 0;
 			$grad_out_ach[$outcome->id] = 0;
+			$program_out_att[$outcome->id] = [];
+			$program_out_ach[$outcome->id] = [];
 		}
 
 
@@ -174,18 +543,30 @@ class School extends Eloquent
 			$crit_att = $result->criteria_attempted;
 			$crit_ach = $result->criteria_achieved;
 
+			$program_id = $result->program_id;
+
+			if (!isset($program_out_att[$result->outcome_id][$program_id])) {
+				$program_out_att[$result->outcome_id][$program_id] = 0;
+			}
+			$program_out_att[$result->outcome_id][$program_id] += 1;
+
 
 			$grad_out_att[$result->outcome_id] += 1;
 
 			if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
+				if (!isset($program_out_ach[$result->outcome_id][$program_id])) {
+					$program_out_ach[$result->outcome_id][$program_id] = 0;
+				}
+				$program_out_ach[$result->outcome_id][$program_id] += 1;
 				$grad_out_ach[$result->outcome_id] += 1;
 			}
 		}
 
-		$array_to_send['undergraduate_info']['outcomes_attempted_uncombined'] = $under_out_att;
-		$array_to_send['undergraduate_info']['outcomes_achieved_uncombined'] = $under_out_ach;
 		$array_to_send['graduate_info']['outcomes_attempted_uncombined'] = $grad_out_att;
 		$array_to_send['graduate_info']['outcomes_achieved_uncombined'] = $grad_out_ach;
+		$array_to_send['graduate_info']['programs_attempted_uncombined'] = $program_out_att;
+		$array_to_send['graduate_info']['programs_achieved_uncombined'] = $program_out_ach;
+
 
 
 
@@ -200,6 +581,8 @@ class School extends Eloquent
 		foreach ($outcomes as $outcome) {
 			$under_out_att[$outcome->id] = 0;
 			$under_out_ach[$outcome->id] = 0;
+			$program_out_att[$outcome->id] = [];
+			$program_out_ach[$outcome->id] = [];
 		}
 
 		//preprocess para combined_students
@@ -223,7 +606,8 @@ class School extends Eloquent
 			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,
+					"program_id" => $result->program_id
 				);
 			}
 			//si este estudiante está pareado a este dominio, significa que ahora estoy en los
@@ -239,11 +623,23 @@ class School extends Eloquent
 			foreach ($outcome_ids as $outcome_id => $crit_information) {
 				$crit_att = $crit_information['criteria_attempted'];
 				$crit_ach = $crit_information['criteria_achieved'];
+				$program_id = $crit_information['program_id'];
 
 
 				$under_out_att[$outcome_id] += 1;
 
+
+				if (!isset($program_out_att[$outcome_id][$program_id])) {
+					$program_out_att[$outcome_id][$program_id] = 0;
+				}
+
+				$program_out_att[$outcome_id][$program_id] += 1;
+
 				if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
+					if (!isset($program_out_ach[$outcome_id][$program_id])) {
+						$program_out_ach[$outcome_id][$program_id] = 0;
+					}
+					$program_out_ach[$outcome_id][$program_id] += 1;
 					$under_out_ach[$outcome_id] += 1;
 				}
 			}
@@ -251,6 +647,8 @@ class School extends Eloquent
 
 		$array_to_send['undergraduate_info']['outcomes_attempted_combined'] = $under_out_att;
 		$array_to_send['undergraduate_info']['outcomes_achieved_combined'] = $under_out_ach;
+		$array_to_send['undergraduate_info']['programs_attempted_combined'] = $program_out_att;
+		$array_to_send['undergraduate_info']['programs_achieved_combined'] = $program_out_ach;
 
 
 		$grad_out_att = [];
@@ -259,6 +657,8 @@ class School extends Eloquent
 		foreach ($outcomes as $outcome) {
 			$grad_out_att[$outcome->id] = 0;
 			$grad_out_ach[$outcome->id] = 0;
+			$program_out_att[$outcome->id] = [];
+			$program_out_ach[$outcome->id] = [];
 		}
 
 		//preprocess para combined_students
@@ -282,7 +682,8 @@ class School extends Eloquent
 			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,
+					'program_id' => $result->program_id
 				);
 			}
 			//si este estudiante está pareado a este dominio, significa que ahora estoy en los
@@ -300,11 +701,22 @@ class School extends Eloquent
 			foreach ($outcome_ids as $out_id => $crit_information) {
 				$crit_att = $crit_information['criteria_attempted'];
 				$crit_ach = $crit_information['criteria_achieved'];
+				$program_id = $crit_information['program_id'];
 
 
 				$grad_out_att[$out_id] += 1;
 
+				if (!isset($program_out_att[$out_id][$program_id])) {
+					$program_out_att[$out_id][$program_id] = 0;
+				}
+
+				$program_out_att[$out_id][$program_id] += 1;
+
 				if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
+					if (!isset($program_out_ach[$out_id][$program_id])) {
+						$program_out_ach[$out_id][$program_id] = 0;
+					}
+					$program_out_ach[$out_id][$program_id] += 1;
 					$grad_out_ach[$out_id] += 1;
 				}
 			}
@@ -312,6 +724,9 @@ class School extends Eloquent
 
 		$array_to_send['graduate_info']['outcomes_attempted_combined'] = $grad_out_att;
 		$array_to_send['graduate_info']['outcomes_achieved_combined'] = $grad_out_ach;
+		$array_to_send['graduate_info']['programs_attempted_combined'] = $program_out_att;
+		$array_to_send['graduate_info']['programs_achieved_combined'] = $program_out_ach;
+
 		Log::info($array_to_send);
 		return $array_to_send;
 	}

app/routes.php

@@ -182,6 +182,8 @@ Route::group(array('before' => 'auth|has_access'), function () {
     );
 
 
+
+
     Route::post('postAnnualReport/{annual_id?}', 'AnnualPlansController@postAnnualReport');
     Route::get('printAnnualPlan/{annual_plan?}/{submit?}', 'AnnualPlansController@printAnnualPlan');
     Route::post('checkIfPlanReady', 'AnnualPlansController@checkIfPlanReady');
@@ -397,6 +399,12 @@ Route::group(array('before' => 'auth|has_access'), function () {
     Route::post('transformativeAction/objectivesFromOutcome', array('before' => 'csrf', 'uses' => 'TransformativeActionsController@objectivesFromOutcome'));
 
 
+    //shared print_program and school
+
+    Route::get('print_program_students/{program_id}', 'ProgramsController@print_program_students');
+    Route::get('print_school_students_report/{school_id}', 'SchoolsController@print_school_students_report');
+
+
     /**
      * Administrator Routes
      */
@@ -481,7 +489,11 @@ Route::group(array('before' => 'auth|has_access'), function () {
     Route::group(array('before' => 'scoord'), function () {
         Route::get('school-coordinator-test', 'SchoolCoordinatorsController@overview_test');
         Route::get('school-coordinator', 'SchoolCoordinatorsController@overview');
-        Route::get('school/{id}', 'SchoolsController@show');
+        Route::get('school/{id}', array(
+            'as' => 'school-coordinator',
+            'uses' => 'SchoolsController@show'
+        ));
+
         Route::get('program/{id}', 'ProgramsController@show');
         Route::post('programs/report', 'ProgramsController@showReport');
         Route::get('template/{template}', 'TemplatesController@show');
@@ -680,6 +692,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
         Route::post('activities/{id}', array('before' => 'csrf', 'uses' => 'ActivitiesController@create'));
         Route::get('students', 'StudentsController@students');
         Route::get('program', 'ProfessorsController@program');
+        Route::get("program_students/{program_id}", 'ProgramsController@studentsProgramAssessmentReportForProfessors');
         Route::get('personal-information', 'ProfessorsController@personalInformation');
         Route::get('manual', 'ProfessorsController@manual');
         Route::post('loadRubric', array('before' => 'csrf', 'uses' => 'RubricsController@fetch'));

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

@@ -22,10 +22,13 @@
 
                 <br>
                 <br>
+                <div class="btn-group pull-left">
+                    <a href="{{ action('ProgramsController@studentProgramAssessmentReport', array($program_item['program']->id)); }}" class="btn btn-primary pull-left" alt="print">Go to Performance by Program Students</a>
+
+                </div>
                 <div class="btn-group pull-right">
                      <a href="{{ action('ProgramsController@print_program', array($program_item['program']->id)); }}" class="btn btn-primary" alt="print"><span class="glyphicon glyphicon-print"></span></a>
-                <button type='button' class = 'btn btn-primary' id="change-view-btn{{$index}}" onclick="changeView('#allGraph{{$index}}','#programGraph{{$index}}', {{$index}}, 'Show Program Courses')">Show Program Students</button>
-                </div>
+                  </div>
                 <br>
                 <br>
 
@@ -298,7 +301,7 @@
             e.preventDefault()
             $(this).tab('show');
         });
-
+ 
         $('#graph{{$index}}').highcharts({
             chart: {
                 type: 'bar'
@@ -445,7 +448,7 @@
                 ]
             }]
         });
-
+{{--}}
         $('#graph-stu-program{{$index}}').highcharts({
             chart: {
                 type: 'bar'
@@ -563,7 +566,7 @@
                     @endforeach
                 ]
 
-            },--}}{
+            },{
                 name: 'Obtained Value',
                 color: '#e70033',
                 dataLabels: {
@@ -591,7 +594,7 @@
                     @endforeach
                 ]
             }]
-        });
+        });--}}
 
     });
 @endforeach

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

@@ -16,9 +16,9 @@
 @section('main')
 
 <div class = "col-md-8" id="graph"></div>
-<div class = 'col-md-4'></div>
-<div class = "col-md-8" id="graph-stu-program"></div>
-<div class = 'col-md-4'></div>
+
+
+
 
 <h3>Courses</h3>
 @if($program_courses->count()>0)
@@ -239,143 +239,5 @@ $('#graph').highcharts({
     }]
 });
 
-$('#graph-stu-program').highcharts({
-    chart: {
-        type: 'bar'
-    },
-    title: {
-        text: 'Performance by {{ $program->name }}\'s Students in Learning Outcomes '
-    },
-    legend: {
-        reversed: true,
-    },
-    xAxis: {
-        categories: [
-            @foreach($outcomes as $outcome)
-                "{{{ $outcome->name }}} <br>(N = {{$program_outcomes_attempted[$outcome->id]}}, {{$program_outcomes_achieved[$outcome->id]}})",
-            @endforeach
-        ],
-        labels: {
-            style: {
-                fontSize:'11px'
-            },
-            step:1,
-            useHTML:true,
-            formatter: function() {
-                return '<div style="width:100px; word-break:break; text-overflow:ellipsis; overflow:hidden;">'+this.value+'</div>';
-            },
-        }
-    },
-   
-    yAxis: {
-        min: 0,
-        max: 100,
-        title: {
-        text: 'Percentage'
-        }, 
-        @if($program->expected_outcome_target == null)
-                plotLines:[{
-            value:70.00,
-            color: '#000',
-            width:3,
-            zIndex:4,
-            label:{
-                text: 'Goal (70.00%)',
-                style: {
-                    color: '#000',
-                    fontSize: '14px',
-                }
-    
-            }
-        }]
-        @else
-        plotLines:[{
-            value:{{$program->expected_outcome_target->expected_target}},
-            color: '#000',
-            width:3,
-            zIndex:4,
-            label:{
-                text: 'Goal ({{$program->expected_outcome_target->expected_target}}%)',
-                style: {
-                    color: '#000',
-                    fontSize: '14px',
-                }
-    
-            }
-        }]
-
-        @endif
-    },
-    tooltip: {
-        enabled:false
-    },
-    plotOptions: {
-            bar: {
-                //grouping: false,
-                shadow: false,
-                borderWidth: 0,
-            },
-            series: {
-                pointPadding: 0,
-                groupPadding: 0.075,
-                animation: false
-            },
-        },
-    series: [/*{
-        name: 'Expected Value',
-        color: '#555555',
-        dataLabels: {
-            enabled: true,
-            fontSize: 8,
-            color: '#fff',
-            align: 'right',
-            format: '{y:.1f}%',
-            style: {
-                //fontWeight: 'bold'
-            },
-            y:-1
-        },
-        data: [
-            @foreach($outcomes as $index => $outcome)
-                @if(
-                    is_array($outcomes_attempted)
-                    && array_key_exists($outcome->id, $outcomes_attempted)
-                    && $outcomes_attempted[$outcome->id]!=0)
-                    {{{ $outcome->expected_outcome }}},
-                @else
-                    0,
-                @endif
-            @endforeach
-        ]
-
-    },*/{
-        name: 'Obtained Value',
-        color: '#e70033',
-        dataLabels: {
-            enabled: true,
-            fontSize: 8,
-            color: '#fff',
-            align: 'right',
-            format: '{y:.1f}%',
-            style: {
-                //fontWeight: 'bold'
-            },
-            y:-1
-        },
-        data:[
-            @foreach($outcomes as $index => $outcome)
-                @if(
-                    is_array($program_outcomes_attempted)
-                    && array_key_exists($outcome->id, $program_outcomes_attempted)
-                    && $program_outcomes_attempted[$outcome->id]!=0)
-                    {{{ ($program_outcomes_achieved[$outcome->id]/$program_outcomes_attempted[$outcome->id])*100 }}},
-                @else
-                    0,
-                @endif
-            @endforeach
-
-        ]
-    }]
-});
 
 @stop

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

@@ -0,0 +1,255 @@
+@extends('layouts.print')
+
+@section('header')
+<p class="header-text">
+    @foreach (Session::get('semesters_info') as $index => $semester_info)
+        {{ $semester_info }}
+        @if($index+1 != count(Session::get('semesters_info')))
+        <strong>&#183;</strong>
+        @endif
+    @endforeach
+</p>
+<p class="header-text">Program Assessment Results</p>
+<h1 class="header-text">{{{ $program->name}}}</h1>
+@stop
+
+@section('main')
+
+
+<div class="row">
+    <div class="col-md-8" id="graph_undergrad_combined"></div>
+</div>
+
+        <div class="row">
+            <div class="col-md-8">
+                <h3>Performance of {{ $program->name }} Students by Learning Outcome</h3>
+                @if($outcomes->count()>0)
+                    <table class="table table-striped table-condensed">
+                        <thead>
+                            <tr>
+                                <th>Program Id</th>
+                                <th>Program Is Graduate</th>
+                                <th>Learning Outcome</th>
+                                <th>Number Students</th>
+                                <th>Number Students that Achieved the Target</th>
+                                <th>Percentage of Students that Achieved the Target</th>
+                            </tr>
+                        </thead>
+                        
+                        <tbody>
+                            @foreach($outcomes_colap as $outcome)
+                                @if(isset($outcomes_attempted_colap[$outcome->id]))
+                              <tr>
+                                    <td>{{{ $program->id }}}</td>
+                                    <td>{{{ $program->is_graduate }}}</td>
+                                    <td>{{  $outcome->name }}</td>
+                                    <td>{{{ $outcomes_attempted_colap[$outcome->id] }}}</td>
+                                    <td>{{{ $outcomes_achieved_colap[$outcome->id] }}}</td>
+                                    <td>
+                                        @if($outcomes_attempted_colap[$outcome->id]!=0)
+                                            {{{ round($outcomes_achieved_colap[$outcome->id] / $outcomes_attempted_colap[$outcome->id]*100, 2) }}}%
+                                        @else
+                                            N/M
+                                        @endif
+                                    </td>
+                                </tr>
+                                @endif
+                            @endforeach
+                        </tbody>
+                    </table>
+                @else
+                    <p class="lead"> No courses assigned.</p>
+                @endif
+            </div>
+        </div>
+
+        <div class="row">
+            <div class="col-md-8">
+                <h3>Courses in this program</h3>
+                @if(count($grouped_courses)>0)
+                    <table class="table table-striped table-condensed">
+                        <thead>
+                            <tr>
+                                <th>Identifier</th>
+                                <th>Name</th>
+                                <th>Course Program</th>
+                                <th>Number of Students</th>
+                            </tr>
+                        </thead>
+                        
+                        <tbody>
+                            @foreach($grouped_courses as $grouped_course)
+                                <tr>
+                                    <td class="col-md-2">{{  $grouped_course->code.$grouped_course->number.' ('.$grouped_course->semester->code.')' }}</td>
+                                    <td class="col-md-4">{{{ $grouped_course->name}}}</td>
+                                    <td class="col-md-2">{{{ $grouped_course->program->code}}}</td>
+                                    <td class="col-md-3">{{{ $grouped_course->quantity }}}</td>
+                                </tr>
+                            @endforeach
+                        </tbody>
+                    </table>
+                @else
+                    <p class="lead"> No courses assigned.</p>
+                @endif
+            </div>
+        </div>
+
+
+
+
+<!-- =================== end tabs =================== -->
+
+@stop
+
+@section('included-js')
+
+<!-- HighCharts -->
+<script src="{{ asset('vendor/highcharts/highcharts.js') }}"></script>
+<!--script src="http://code.highcharts.com/modules/exporting.js"></script -->
+
+@stop
+
+@section('javascript')
+
+$('#graph_undergrad_combined').highcharts({
+    chart: {
+        type: 'bar'
+    },
+    title: {
+        text: 'Performance of {{ $program->name }} Students by Learning Outcome'
+    },
+    legend: {
+                reversed: true,
+            },
+    xAxis: {
+        categories: [
+            @foreach($outcomes_colap as $outcome)
+                "{{{ $outcome->name }}}<br>(N = {{{ $outcomes_attempted_colap[$outcome->id] }}}, {{{ $outcomes_achieved_colap[$outcome->id] }}})",
+            @endforeach
+        ],
+        labels: {
+            style: {
+                fontSize:'11px'
+            },
+            step:1,
+            useHTML:true,
+            formatter: function() {
+                return '<div style="width:200px; word-break:break; text-overflow:ellipsis; overflow:hidden;">'+this.value+'</div>';
+            },
+        }
+    },
+    yAxis: {
+        min: 0,
+        max: 100,
+        title: {
+            text: 'Percentage'
+        },        @if($program->expected_outcome_target == null)
+        plotLines:[{
+    value:70,
+    color: '#000',
+    width:3,
+    zIndex:4,
+    label:{
+        text: 'Goal (70%)',
+        style: {
+            color: '#000',
+            fontSize: '14px',
+        }
+
+    }
+}]
+@else
+plotLines:[{
+    value:{{$program->expected_outcome_target->expected_target}},
+    color: '#000',
+    width:3,
+    zIndex:4,
+    label:{
+        text: 'Goal ({{$program->expected_outcome_target->expected_target}}%)',
+        style: {
+            color: '#000',
+            fontSize: '14px',
+        }
+
+    }
+}]
+@endif
+
+    },
+    tooltip: {
+        headerFormat: '<span style="font-size:10px">{point.key}</span><table>',
+        pointFormat: '<tr><td style="color:{series.color};padding:0">{series.name}: </td>' +
+            '<td style="padding:0"><b>{point.y:.2f}</b></td></tr>',
+        footerFormat: '</table>',
+        shared: true,
+        useHTML: true
+    },
+    plotOptions: {
+        bar: {
+            //grouping: false,
+            shadow: false,
+            borderWidth: 0,
+        },
+        series: {
+        pointPadding: 0,
+        groupPadding: 0.075
+        },
+    },
+    series: [/*{
+        name: 'Expected Value',
+        color: '#555555',
+        dataLabels: {
+            enabled: true,
+            fontSize: 8,
+            color: '#fff',
+            align: 'right',
+            format: '{y:.1f}%',
+            style: {
+                //fontWeight: 'bold'
+            },
+            y:-1
+        },
+        data: [
+            @foreach($outcomes_colap as $index => $outcome)
+                @if(
+                    is_array($outcomes_attempted_colap)
+                    && array_key_exists($outcome->id, $outcomes_attempted_colap)
+                    && $outcomes_attempted_colap[$outcome->id]!=0)
+                @else
+                    0,
+                @endif
+            @endforeach
+        ]
+
+    },*/{
+        name: 'Obtained Value',
+        color: '#e70033',
+        dataLabels: {
+            enabled: true,
+            fontSize: 8,
+            color: '#fff',
+            align: 'right',
+            format: '{y:.1f}%',
+            style: {
+                //fontWeight: 'bold'
+            },
+            y:-1
+        },
+        data:[
+            @foreach($outcomes_colap as $index => $outcome)
+                @if(
+                    is_array($outcomes_attempted_colap)
+                    && array_key_exists($outcome->id, $outcomes_attempted_colap)
+                    && $outcomes_attempted_colap[$outcome->id]!=0)
+                    {{{ ($outcomes_achieved_colap[$outcome->id]/$outcomes_attempted_colap[$outcome->id])*100 }}},
+                @else
+                    0,
+                @endif
+            @endforeach
+        ]
+    }]
+});
+
+
+
+@stop

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

@@ -15,7 +15,7 @@
 
 @section('main')
 
-
+ 
 <h3>Programs</h3>
 <table class="tabletable-condensed">
     <tr>
@@ -51,16 +51,29 @@
     </thead>
     <tbody>
         @foreach($outcomes_undergrad as $outcome)
+        <?php $count = 0;?>
             <tr>
                 <td class="col-md-6">{{ $outcome->name }}</td>
                 <td class="col-md-2">{{{ count($attemptedUndergradProgramsPerOutcome[$outcome->id]) }}}</td>
-                <td class="col-md-2">{{{ count($achievedUndergradProgramsPerOutcome[$outcome->id]) }}}</td>
+                @foreach($undergrad_programs as $program)
+                    <?php
+                        if(isset($achievedUndergradProgramsPerOutcome[$outcome->id][$program->id])
+                            && $achievedUndergradProgramsPerOutcome[$outcome->id][$program->id] / $attemptedUndergradProgramsPerOutcome[$outcome->id][$program->id] * 100 >= $expected_target_for_undergradprograms)
+                        $count++;
+                                                
+
+                                                
+                            ?>
+
+                @endforeach
+
+                <td class="col-md-2">{{{ $count }}}</td>
                 <td class="col-md-2">
-                    @if(count($attemptedUndergradProgramsPerOutcome[$outcome->id])!=0)
-                        {{{ round( count($achievedUndergradProgramsPerOutcome[$outcome->id]) / count($attemptedUndergradProgramsPerOutcome[$outcome->id])*100, 2) }}}%
-                    @else
-                        N/M
-                    @endif
+                @if(count($attemptedUndergradProgramsPerOutcome[$outcome->id])!=0)
+                    {{{ round( $count / count($attemptedUndergradProgramsPerOutcome[$outcome->id])*100, 2) }}}%
+                @else
+                    N/M
+                @endif
                 </td>
             </tr>
         @endforeach
@@ -168,19 +181,30 @@
     </thead>
     <tbody>
         @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">{{{ count($attemptedGradProgramsPerOutcome[$outcome->id]) }}}</td>
-            <td class="col-md-2">{{{ count($achievedGradProgramsPerOutcome[$outcome->id]) }}}</td>
-            <td class="col-md-2">
-                @if(count($attemptedGradProgramsPerOutcome[$outcome->id])!=0)
-                    {{{ round(count($achievedGradProgramsPerOutcome[$outcome->id]) / count($attemptedGradProgramsPerOutcome[$outcome->id])*100, 2) }}}%
-                @else
-                    N/M
-                @endif
-            </td>
-        </tr>
-        @endforeach
+        <?php $count = 0;?>
+            <tr>
+                <td class="col-md-6">{{ link_to_action('OutcomesController@show', $outcome->name, array($outcome->id), $attributes = array()) }}</td>
+                <td class="col-md-2">{{{ count($attemptedGradProgramsPerOutcome[$outcome->id]) }}}</td>
+                @foreach($grad_programs as $program)
+                <?php
+                if(isset($achievedGradProgramsPerOutcome[$outcome->id][$program->id])
+                    && $achievedGradProgramsPerOutcome[$outcome->id][$program->id] / $attemptedGradProgramsPerOutcome[$outcome->id][$program->id] * 100 >= $expected_target_for_gradprograms)
+                $count++;
+                
+
+                
+                    ?>
+
+            @endforeach
+                <td class="col-md-2">{{{ $count }}}</td>
+                <td class="col-md-2">
+                    @if(count($attemptedGradProgramsPerOutcome[$outcome->id])!=0)
+                        {{{ round($count / count($attemptedGradProgramsPerOutcome[$outcome->id])*100, 2) }}}%
+                    @else
+                        N/M
+                    @endif
+                </td></tr>
+                @endforeach
     </tbody>
     <tfoot></tfoot>
     <caption>N/M: Not Measured</caption>

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

@@ -0,0 +1,489 @@
+@extends('layouts.print')
+
+@section('header')
+<p class="header-text">
+    @foreach (Session::get('semesters_info') as $index => $semester_info)
+        {{ $semester_info }}
+        @if($index+1 != count(Session::get('semesters_info')))
+        <strong>&#183;</strong>
+        @endif
+    @endforeach
+</p>
+
+<p class="header-text">Assessment Results</p>
+<h1 class="header-text">School of {{{ $school->name}}}</h1>
+@stop
+
+@section('main')
+
+
+
+<br>
+<div class="row">
+    <div class="col-md-8" id="graph2"></div>
+</div>
+
+<div class="row">
+    <div class="col-md-8">
+        <h3>Performance of {{ $school->name }} Undergrad Students by Learning Outcome</h3>
+        @if($outcomes->count()>0)
+            <table class="table table-striped table-condensed datatable">
+                <thead>
+                    <tr>
+                        <th>Learning Outcome</th>
+                        <th>Program</th>
+                        <th>Program Id</th>
+                        <th>Program Is Graduate</th>
+                        <th>Number Students</th>
+                        <th>Number Students that Achieved the Target</th>
+                        <th>Percentage of Students that Achieved the Target</th>
+                        <!--<th>Semesters</th>-->
+                    </tr>
+                </thead>
+                
+                <tbody>
+                    @foreach($undergraduate_programs as $program)
+                      @foreach($outcomes_colap as $outcome)
+                        @if(isset($outcomes_undergrad_program_attempted_colap[$outcome->id][$program->id]))
+                        <tr>
+                            <td>{{  $outcome->name }}</td>
+                            <td>{{{ $program->name }}}</td>
+                            <td>{{{ $program->id }}}</td>
+                            <td>{{{ $program->is_graduate }}}</td>
+                            <td>{{{ $outcomes_undergrad_program_attempted_colap[$outcome->id][$program->id] }}}</td>
+                            @if(isset($outcomes_undergrad_program_achieved_colap[$outcome->id][$program->id]))
+            
+                                <td>{{{ $outcomes_undergrad_program_achieved_colap[$outcome->id][$program->id] }}}</td>
+                                <td>
+                                    @if($outcomes_undergrad_program_attempted_colap[$outcome->id][$program->id]!=0)
+                                        
+                                        {{{ round($outcomes_undergrad_program_achieved_colap[$outcome->id][$program->id] / $outcomes_undergrad_program_attempted_colap[$outcome->id][$program->id]*100, 2) }}}%
+                                    
+                                        
+                                @else
+                                    N/M
+                                @endif
+                                </td>
+                            @else
+                                <td>0</td><td>0%</td>
+                                @endif
+                                {{--}}
+                                
+                            <td>
+                            @if(isset($outcomes_undergraduate_attempted_colap_semesters[$program->id][$outcome->id]))
+                                {{{ str_replace('"','',json_encode($outcomes_undergraduate_attempted_colap_semesters[$program->id][$outcome->id])) }}}
+                            @else
+                                N/M
+                            @endif
+                            
+                            </td>--}}
+                        </tr>
+                           @endif
+                      @endforeach
+                    @endforeach
+                </tbody>
+            </table>
+        @else
+            <p class="lead"> No courses assigned.</p>
+        @endif
+    </div>
+</div>
+
+<div class="row">
+    <div class="col-md-8" id="graph3"></div>
+</div>
+<div class="row">
+    <div class="col-md-8">
+        <h3>Performance of {{ $school->name }} Graduate Students by Learning Outcome</h3>
+        @if($outcomes->count()>0)
+            <table class="table table-striped table-condensed datatable">
+                <thead>
+                    <tr>
+                        <th>Learning Outcome</th>
+                        <th>Program</th>
+                        <th>Program Id</th>
+                        <th>Program Is Graduate</th>
+                        <th>Number Students</th>
+                        <th>Number Students that Achieved the Target</th>
+                        <th>Percentage of Students that Achieved the Target</th>
+                        
+                    </tr>
+                </thead>
+                
+                <tbody>
+                    @foreach($graduate_programs as $program)
+                      @foreach($outcomes_colap as $outcome)
+                        @if(isset($outcomes_grad_program_attempted_colap[$outcome->id][$program->id]))
+                        <tr>
+                            <td>{{  $outcome->name }}</td>
+                            <td>{{{ $program->name }}}</td>
+                            <td>{{{ $program->id }}}</td>
+                            <td>{{{ $program->is_graduate }}}</td>
+                            <td>{{{ $outcomes_grad_program_attempted_colap[$outcome->id][$program->id] }}}</td>
+                            @if((isset($outcomes_grad_program_achieved_colap[$outcome->id][$program->id])))
+                                <td>{{{ $outcomes_grad_program_achieved_colap[$outcome->id][$program->id] }}}</td>
+                                <td>
+                                    @if($outcomes_grad_program_attempted_colap[$outcome->id][$program->id]!=0)
+                                        
+                                    {{{ round($outcomes_grad_program_achieved_colap[$outcome->id][$program->id] / $outcomes_grad_program_attempted_colap[$outcome->id][$program->id]*100, 2) }}}%
+                                
+                                        
+                                @else
+                                        N/M
+                                    @endif
+                                </td>
+                                @else
+                                <td>
+                                    0</td>
+                                    <td>0%</td>
+                                @endif
+                            
+                        </tr>
+                           @endif
+                      @endforeach
+                    @endforeach
+                </tbody>
+            </table>
+        @else
+            <p class="lead"> No courses assigned.</p>
+        @endif
+    </div>
+</div>
+
+<div class="row">
+    <div class="col-md-12">
+        <h3>Courses in this School</h3>
+        @if(count($grouped_courses)>0)
+            <table class="table table-striped table-condensed datatable">
+                <thead>
+                    <tr>
+                        <th>Identifier</th>
+                        <th>Name</th>
+                        <th>Course Program</th>
+                        <th>Number of Students</th>
+                    </tr>
+                </thead>
+                <tfoot>
+                    <tr class="column-search">
+                        <th><input class="column-search-bar form-control" type="text" placeholder="Search"/></th>
+                        <th><input class="column-search-bar form-control" type="text" placeholder="Search"/></th>
+                    <th><select class="column-search-select form-control"><option value=""></option></select></th>
+                        <th><input class="column-search-bar form-control" type="text" placeholder="Search"/></th>
+                    </tr>
+                </tfoot>
+                <tbody>
+                    @foreach($grouped_courses as $grouped_course)
+                        <tr>
+                            <td class="col-md-2">{{  $grouped_course->code.$grouped_course->number.' ('.$grouped_course->semester->code.')' }}</td>
+                            <td class="col-md-4">{{{ $grouped_course->name}}}</td>
+                            <td class="col-md-2">{{{ $grouped_course->program->code}}}</td>
+                            <td class="col-md-3">{{{ $grouped_course->quantity }}}</td>
+                        </tr>
+                    @endforeach
+                </tbody>
+            </table>
+        @else
+            <p class="lead"> No courses assigned.</p>
+        @endif
+    </div>
+</div>
+
+@stop
+
+
+
+
+
+
+
+
+@section('included-js')
+
+<!-- HighCharts -->
+<script src="{{ asset('vendor/highcharts/highcharts.js') }}"></script>
+<!--script src="http://code.highcharts.com/modules/exporting.js"></script -->
+
+@stop
+
+@section('javascript')
+$(function () {
+
+    $('#schoolTabs a').click(function (e) {
+        e.preventDefault()
+        $(this).tab('show');
+    });
+   
+$('#graph2').highcharts({
+    chart: {
+        type: 'bar'
+    }, 
+    title: {
+        text: 'Performance of {{ $school->name }} Undergraduate Students by Learning Outcome'
+    },
+    legend: {
+                reversed: true,
+            },
+    xAxis: {
+        categories: [
+            @foreach($outcomes_colap as $outcome)
+            @if(isset($outcomes_undergraduate_attempted_colap_todo[$outcome->id]) &&
+                    isset($outcomes_undergraduate_achieved_colap_todo[$outcome->id]))
+                    "{{{ $outcome->name }}}<br>(N = {{{ $outcomes_undergraduate_attempted_colap_todo[$outcome->id] }}}, {{{ $outcomes_undergraduate_achieved_colap_todo[$outcome->id] }}})",
+                    @elseif(isset($outcomes_undergraduate_attempted_colap_todo[$outcome->id]))
+                    "{{{ $outcome->name }}}<br>(N = {{{ $outcomes_undergraduate_attempted_colap_todo[$outcome->id] }}}, 0)",
+                    
+                    @else
+                        "{{{ $outcome->name }}}<br>(N = 0, 0)",         	
+                    @endif
+               @endforeach
+        ],
+        labels: {
+            style: {
+                fontSize:'11px'
+            },
+            step:1,
+            useHTML:true,
+            formatter: function() {
+                return '<div style="width:200px; word-break:break; text-overflow:ellipsis; overflow:hidden;">'+this.value+'</div>';
+            },
+        }
+    },
+    yAxis: {
+        min: 0,
+        max: 100,
+        title: {
+            text: 'Percentage'
+        },
+        			plotLines:[{
+		value:70,
+		color: '#000',
+		width:3,
+		zIndex:4,
+		label:{
+			text: 'Goal (70%)',
+			style: {
+				color: '#000',
+				fontSize: '14px',
+			}
+
+		}
+	}]
+
+    },
+    tooltip: {
+        headerFormat: '<span style="font-size:10px">{point.key}</span><table>',
+        pointFormat: '<tr><td style="color:{series.color};padding:0">{series.name}: </td>' +
+            '<td style="padding:0"><b>{point.y:.2f}</b></td></tr>',
+        footerFormat: '</table>',
+        shared: true,
+        useHTML: true
+    },
+    plotOptions: {
+        bar: {
+            //grouping: false,
+            shadow: false,
+            borderWidth: 0,
+        },
+        series: {
+        pointPadding: 0,
+        groupPadding: 0.075
+        },
+    },
+    series: [/*{
+        name: 'Expected Value',
+        color: '#555555',
+        dataLabels: {
+            enabled: true,
+            fontSize: 8,
+            color: '#fff',
+            align: 'right',
+            format: '{y:.1f}%',
+            style: {
+                //fontWeight: 'bold'
+            },
+            y:-1
+        },
+        data: [
+            @foreach($outcomes_colap as $index => $outcome)
+                @if(
+                    is_array($outcomes_undergraduate_attempted_colap_todo)
+                    && array_key_exists($outcome->id, $outcomes_undergraduate_attempted_colap_todo)
+                    && $outcomes_undergraduate_attempted_colap_todo[$outcome->id]!=0)
+                @else
+                    0,
+                @endif
+            @endforeach
+        ]
+
+    },*/{
+        name: 'Obtained Value',
+        color: '#e70033',
+        dataLabels: {
+            enabled: true,
+            fontSize: 8,
+            color: '#fff',
+            align: 'right',
+            format: '{y:.1f}%',
+            style: {
+                //fontWeight: 'bold'
+            },
+            y:-1
+        },
+        data:[
+            @foreach($outcomes_colap as $index => $outcome)
+                @if(
+                    is_array($outcomes_undergraduate_attempted_colap_todo)
+                    && array_key_exists($outcome->id, $outcomes_undergraduate_attempted_colap_todo)
+                    && $outcomes_undergraduate_attempted_colap_todo[$outcome->id]!=0
+                    && isset($outcomes_undergraduate_achieved_colap_todo[$outcome->id]))
+                    {{{ ($outcomes_undergraduate_achieved_colap_todo[$outcome->id]/$outcomes_undergraduate_attempted_colap_todo[$outcome->id])*100 }}},
+                @else
+                    0,
+                @endif
+            @endforeach
+        ]
+    }]
+}); 
+
+
+$('#graph3').highcharts({
+    chart: {
+        type: 'bar'
+    }, 
+    title: {
+        text: 'Performance of {{ $school->name }} Graduate Students by Learning Outcome'
+    },
+    legend: {
+                reversed: true,
+            },
+    xAxis: {
+        categories: [
+            @foreach($outcomes_colap as $outcome)
+            @if(isset($outcomes_graduate_attempted_colap_todo[$outcome->id])
+            && isset($outcomes_graduate_achieved_colap_todo[$outcome->id]))
+                "{{{ $outcome->name }}}<br>(N = {{{ $outcomes_graduate_attempted_colap_todo[$outcome->id] }}}, {{{ $outcomes_graduate_achieved_colap_todo[$outcome->id] }}})",
+            @elseif(isset($outcomes_graduate_attempted_colap_todo[$outcome->id]))
+            "{{{ $outcome->name }}}<br>(N = {{{ $outcomes_graduate_attempted_colap_todo[$outcome->id] }}}, 0)",
+          @else
+          "{{{ $outcome->name }}}<br>(N = 0, 0)",
+          @endif
+                @endforeach
+        ],
+        labels: {
+            style: {
+                fontSize:'11px'
+            },
+            step:1,
+            useHTML:true,
+            formatter: function() {
+                return '<div style="width:200px; word-break:break; text-overflow:ellipsis; overflow:hidden;">'+this.value+'</div>';
+            },
+        }
+    },
+    yAxis: {
+        min: 0,
+        max: 100,
+        title: {
+            text: 'Percentage'
+        },
+        			plotLines:[{
+		value:70,
+		color: '#000',
+		width:3,
+		zIndex:4,
+		label:{
+			text: 'Goal (70%)',
+			style: {
+				color: '#000',
+				fontSize: '14px',
+			}
+
+		}
+	}]
+
+    },
+    tooltip: {
+        headerFormat: '<span style="font-size:10px">{point.key}</span><table>',
+        pointFormat: '<tr><td style="color:{series.color};padding:0">{series.name}: </td>' +
+            '<td style="padding:0"><b>{point.y:.2f}</b></td></tr>',
+        footerFormat: '</table>',
+        shared: true,
+        useHTML: true
+    },
+    plotOptions: {
+        bar: {
+            //grouping: false,
+            shadow: false,
+            borderWidth: 0,
+        },
+        series: {
+        pointPadding: 0,
+        groupPadding: 0.075
+        },
+    },
+    series: [/*{
+        name: 'Expected Value',
+        color: '#555555',
+        dataLabels: {
+            enabled: true,
+            fontSize: 8,
+            color: '#fff',
+            align: 'right',
+            format: '{y:.1f}%',
+            style: {
+                //fontWeight: 'bold'
+            },
+            y:-1
+        },
+        data: [
+            @foreach($outcomes_colap as $index => $outcome)
+                @if(
+                    is_array($outcomes_graduate_attempted_colap_todo)
+                    && array_key_exists($outcome->id, $outcomes_graduate_attempted_colap_todo)
+                    && $outcomes_graduate_attempted_colap_todo[$outcome->id]!=0
+                    )
+                @else
+                    0,
+                @endif
+            @endforeach
+        ]
+
+    },*/{
+        name: 'Obtained Value',
+        color: '#e70033',
+        dataLabels: {
+            enabled: true,
+            fontSize: 8,
+            color: '#fff',
+            align: 'right',
+            format: '{y:.1f}%',
+            style: {
+                //fontWeight: 'bold'
+            },
+            y:-1
+        },
+        data:[
+            @foreach($outcomes_colap as $index => $outcome)
+                @if(
+                    is_array($outcomes_graduate_attempted_colap_todo)
+                    && array_key_exists($outcome->id, $outcomes_graduate_attempted_colap_todo)
+                    && $outcomes_graduate_attempted_colap_todo[$outcome->id]!=0
+                    && isset($outcomes_graduate_achieved_colap_todo[$outcome->id]))
+                    {{{ ($outcomes_graduate_achieved_colap_todo[$outcome->id]/$outcomes_graduate_attempted_colap_todo[$outcome->id])*100 }}},
+                @else
+                    0,
+                @endif
+            @endforeach
+        ]
+    }]
+});
+});
+
+
+   
+
+    // Include dummy graph for outcomes
+    @include('global.dummy-outcomes')
+
+
+@stop

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

@@ -6,13 +6,24 @@
         @include('local.managers.admins._new_navigation')
     @elseif($role==2)
         @include('local.managers.sCoords._new_navigation')
+    @elseif($role==3)
+    @include('local.managers.pCoords._new_navigation')
+    @else
+    @include('local.professors._navigation')
+
      @endif
-@stop
+
+@stop 
 
 @section('main')
+@if($role!=4)
 <a href="{{ action('ProgramsController@show', array($program->id)); }}" class="btn btn-primary pull-left" alt="print">Go to Performance by Program Courses</a>
+@else
 
-<a href="{{ action('ProgramsController@print_program', array($program->id)); }}" class="btn btn-primary pull-right" alt="print"><span class="glyphicon glyphicon-print"></span></a>
+<a href="{{ action('ProfessorsController@program') }}" class="btn btn-primary pull-left" alt="print">Go to Performance by Program Courses</a>
+@endif
+
+<a href="{{ action('ProgramsController@print_program_students', array($program->id)); }}" class="btn btn-primary pull-right" alt="print"><span class="glyphicon glyphicon-print"></span></a>
 <br>
 <br>
 <div class="row">
@@ -52,10 +63,10 @@
                                     <th><input class="column-search-bar form-control" type="text" placeholder="Search"/></th>
                                     <th><select class="column-search-select form-control"><option value=""></option></select></th>
                                 </tr>
-                            </tfoot>
+                            </tfoot> 
                             <tbody>
                                 @foreach($outcomes_colap as $outcome)
-                                    @if(isset($outcomes_attempted_colap[$program->id][$outcome->id]))
+                                    @if(isset($outcomes_attempted_colap[$outcome->id]))
               					<tr>
 										<td>{{{ $program->id }}}</td>
 										<td>{{{ $program->is_graduate }}}</td>
@@ -63,7 +74,7 @@
 										<td>{{{ $outcomes_attempted_colap[$outcome->id] }}}</td>
 										<td>{{{ $outcomes_achieved_colap[$outcome->id] }}}</td>
 										<td>
-											@if($outcomes_attempted[$outcome->id]!=0)
+											@if($outcomes_attempted_colap[$outcome->id]!=0)
 												{{{ round($outcomes_achieved_colap[$outcome->id] / $outcomes_attempted_colap[$outcome->id]*100, 2) }}}%
 											@else
 												N/M
@@ -112,7 +123,7 @@
                             </tfoot>
                             <tbody>
                                 @foreach($outcomes as $outcome)
-                                     @if(isset($outcomes_attempted[$program->id][$outcome->id]))
+                                     @if(isset($outcomes_attempted[$outcome->id]))
                                    <tr>
 										<td>{{{ $program->id }}}</td>
 										<td>{{{ $program->is_graduate }}}</td>
@@ -176,7 +187,7 @@
                                     <tr>
                                         <td class="col-md-2">{{ HTML::linkAction('CoursesController@showGrouped', $grouped_course->code.$grouped_course->number.' ('.$grouped_course->semester->code.')', array($grouped_course->code, $grouped_course->number, $grouped_course->semester->code)) }}</td>
                                         <td class="col-md-4">{{{ $grouped_course->name}}}</td>
-                                        <td class="col-md-2">{{{ $grouped_course->program_code}}}</td>
+                                        <td class="col-md-2">{{{ $grouped_course->program->code}}}</td>
                                         <td class="col-md-3">{{{ $grouped_course->quantity }}}</td>
                                     </tr>
                                 @endforeach
@@ -373,7 +384,7 @@ $('#graph').highcharts({
         groupPadding: 0.075
         },
     },
-    series: [{
+    series: [/*{
         name: 'Expected Value',
         color: '#555555',
         dataLabels: {
@@ -399,7 +410,7 @@ $('#graph').highcharts({
             @endforeach
         ]
 
-    },{
+    },*/{
         name: 'Obtained Value',
         color: '#e70033',
         dataLabels: {
@@ -512,7 +523,7 @@ plotLines:[{
         groupPadding: 0.075
         },
     },
-    series: [{
+    series: [/*{
         name: 'Expected Value',
         color: '#555555',
         dataLabels: {
@@ -538,7 +549,7 @@ plotLines:[{
             @endforeach
         ]
 
-    },{
+    },*/{
         name: 'Obtained Value',
         color: '#e70033',
         dataLabels: {
@@ -556,7 +567,7 @@ plotLines:[{
             @foreach($outcomes_colap as $index => $outcome)
                 @if(
                     is_array($outcomes_attempted_colap)
-                    && array_key_exists($outcome->id, $outcomes_attempted)
+                    && array_key_exists($outcome->id, $outcomes_attempted_colap)
                     && $outcomes_attempted_colap[$outcome->id]!=0)
                     {{{ ($outcomes_achieved_colap[$outcome->id]/$outcomes_attempted_colap[$outcome->id])*100 }}},
                 @else

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

@@ -63,7 +63,7 @@
             @endif
                 </div>
 
-                        </div>
+        </div>
 
         <div>
             <!-- Nav tabs -->
@@ -90,13 +90,26 @@
                                 </thead>
                                 <tbody>
                                     @foreach($outcomes_undergrad as $outcome)
+                                    <?php $count = 0;?>
                                         <tr>
                                             <td class="col-md-6">{{ link_to_action('OutcomesController@show', $outcome->name, array($outcome->id), $attributes = array()) }}</td>
                                             <td class="col-md-2">{{{ count($attemptedUndergradProgramsPerOutcome[$outcome->id]) }}}</td>
-                                            <td class="col-md-2">{{{ count($achievedUndergradProgramsPerOutcome[$outcome->id]) }}}</td>
+                                            @foreach($undergrad_programs as $program)
+                                                <?php
+                                                if(isset($achievedUndergradProgramsPerOutcome[$outcome->id][$program->id])
+                                                    && $achievedUndergradProgramsPerOutcome[$outcome->id][$program->id] / $attemptedUndergradProgramsPerOutcome[$outcome->id][$program->id] * 100 >= $expected_target_for_undergradprograms)
+                                                $count++;
+                                                
+
+                                                
+                                                    ?>
+
+                                            @endforeach
+
+                                            <td class="col-md-2">{{{ $count }}}</td>
                                             <td class="col-md-2">
                                                 @if(count($attemptedUndergradProgramsPerOutcome[$outcome->id])!=0)
-                                                    {{{ round( count($achievedUndergradProgramsPerOutcome[$outcome->id]) / count($attemptedUndergradProgramsPerOutcome[$outcome->id])*100, 2) }}}%
+                                                    {{{ round( $count / count($attemptedUndergradProgramsPerOutcome[$outcome->id])*100, 2) }}}%
                                                 @else
                                                     N/M
                                                 @endif
@@ -296,13 +309,25 @@
                                 </thead>
                                 <tbody>
                                     @foreach($outcomes_grad as $outcome)
+                                    <?php $count = 0;?>
                                         <tr>
                                             <td class="col-md-6">{{ link_to_action('OutcomesController@show', $outcome->name, array($outcome->id), $attributes = array()) }}</td>
                                             <td class="col-md-2">{{{ count($attemptedGradProgramsPerOutcome[$outcome->id]) }}}</td>
-                                            <td class="col-md-2">{{{ count($achievedGradProgramsPerOutcome[$outcome->id]) }}}</td>
+                                            @foreach($grad_programs as $program)
+                                            <?php
+                                            if(isset($achievedGradProgramsPerOutcome[$outcome->id][$program->id])
+                                                && $achievedGradProgramsPerOutcome[$outcome->id][$program->id] / $attemptedGradProgramsPerOutcome[$outcome->id][$program->id] * 100 >= $expected_target_for_gradprograms)
+                                            $count++;
+                                            
+
+                                            
+                                                ?>
+
+                                        @endforeach
+                                            <td class="col-md-2">{{{ $count }}}</td>
                                             <td class="col-md-2">
                                                 @if(count($attemptedGradProgramsPerOutcome[$outcome->id])!=0)
-                                                    {{{ round(count($achievedGradProgramsPerOutcome[$outcome->id]) / count($attemptedGradProgramsPerOutcome[$outcome->id])*100, 2) }}}%
+                                                    {{{ round($count / count($attemptedGradProgramsPerOutcome[$outcome->id])*100, 2) }}}%
                                                 @else
                                                     N/M
                                                 @endif

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

@@ -12,25 +12,28 @@
 @section('main')
 <a href="{{ action('SchoolsController@show', array($school->id)); }}" class="btn btn-primary pull-left" alt="print">Go to Performance by School Courses</a>
 
-<a href="{{ action('ProgramsController@print_program', array($school->id)); }}" class="btn btn-primary pull-right" alt="print"><span class="glyphicon glyphicon-print"></span></a>
+<a href="{{ action('SchoolsController@print_school_students_report', array($school->id)); }}" class="btn btn-primary pull-right" alt="print"><span class="glyphicon glyphicon-print"></span></a>
 <br>
 <br>
-<div class="row">
+
     <ul id="resultsTabs" class="nav nav-tabs" role="tablist">
-        <li role="presentation" class="active"><a href="#combined" aria-controls="combined" role="tab">Combined</a></li>
-        <li role="presentation"><a href="#uncombined" aria-controls="uncombined" role="tab">Uncombined</a></li>
+        <li role="presentation" class="active"><a href="#undergraduate_combined"  aria-controls="undergraduate_combined" role="tab">Undergraduate Combined</a></li>
+        <li role="presentation"><a href="#undergraduate_uncombined"  aria-controls="undergraduate_uncombined" role="tab">Undergraduate Uncombined</a></li>
+        <li role="presentation"><a href="#graduate_combined"  aria-controls="graduate_combined" role="tab">Graduate Combined</a></li>
+        <li role="presentation"><a href="#graduate_uncombined"  aria-controls="graduate_uncombined" role="tab">Graduate Uncombined</a></li>
+    
     </ul>
-	<div>
+<!--<div class="tab-content">-->
 <!-- 	<div class="tab-content"> -->
 
-	<div role="tabpanel" class="tab-pane active" id="combined">
-	<div class="row">
-		<div class="col-md-12" id="graph2"></div>
-	</div>
+	<div role="tabpanel" class="tab-pane active" id="undergraduate_combined">
+        <div class="row">
+            <div class="col-md-12" id="graph2"></div>
+        </div>
 
-            <div class="row">
+        <div class="row">
                 <div class="col-md-12">
-                    <h3>Performance of {{ $school->name }} Students by Combined Learning Outcome</h3>
+                    <h3>Performance of {{ $school->name }} Undergrad Students by Combined Learning Outcome</h3>
                     @if($outcomes->count()>0)
                         <table class="table table-striped table-condensed datatable">
                             <thead>
@@ -42,7 +45,7 @@
                                     <th>Number Students</th>
                                     <th>Number Students that Achieved the Target</th>
                                     <th>Percentage of Students that Achieved the Target</th>
-                                    <th>Semesters</th>
+                                    <!--<th>Semesters</th>-->
                                 </tr>
                             </thead>
                             <tfoot>
@@ -54,35 +57,45 @@
                                     <th><input class="column-search-bar form-control" type="text" placeholder="Search"/></th>
                                     <th><input class="column-search-bar form-control" type="text" placeholder="Search"/></th>
                                     <th><select class="column-search-select form-control"><option value=""></option></select></th>
-                                    <th><input class="column-search-bar form-control" type="text" placeholder="Search"/></th>
+                                   <!-- <th><input class="column-search-bar form-control" type="text" placeholder="Search"/></th>-->
                                 </tr>
                             </tfoot>
                             <tbody>
-                                @foreach($programs as $program)
+                                @foreach($undergraduate_programs as $program)
                                   @foreach($outcomes_colap as $outcome)
-                                	@if(isset($outcomes_attempted_colap[$program->id][$outcome->id]))
+                                	@if(isset($outcomes_undergrad_program_attempted_colap[$outcome->id][$program->id]))
                                     <tr>
 										<td>{{ link_to_action('OutcomesController@show', $outcome->name, array($outcome->id), $attributes = array()) }}</td>
 										<td>{{{ $program->name }}}</td>
 										<td>{{{ $program->id }}}</td>
 										<td>{{{ $program->is_graduate }}}</td>
-										<td>{{{ $outcomes_attempted_colap[$program->id][$outcome->id] }}}</td>
-										<td>{{{ $outcomes_achieved_colap[$program->id][$outcome->id] }}}</td>
-										<td>
-											@if($outcomes_attempted_colap[$program->id][$outcome->id]!=0)
-												{{{ round($outcomes_achieved_colap[$program->id][$outcome->id] / $outcomes_attempted_colap[$program->id][$outcome->id]*100, 2) }}}%
-											@else
-												N/M
-											@endif
-										</td>
+										<td>{{{ $outcomes_undergrad_program_attempted_colap[$outcome->id][$program->id] }}}</td>
+										@if(isset($outcomes_undergrad_program_achieved_colap[$outcome->id][$program->id]))
+                        
+                                            <td>{{{ $outcomes_undergrad_program_achieved_colap[$outcome->id][$program->id] }}}</td>
+                                            <td>
+                                                @if($outcomes_undergrad_program_attempted_colap[$outcome->id][$program->id]!=0)
+                                                    
+                                                    {{{ round($outcomes_undergrad_program_achieved_colap[$outcome->id][$program->id] / $outcomes_undergrad_program_attempted_colap[$outcome->id][$program->id]*100, 2) }}}%
+                                                
+                                                    
+                                            @else
+                                                N/M
+                                            @endif
+                                            </td>
+                                        @else
+                                            <td>0</td><td>0%</td>
+                                            @endif
+                                            {{--}}
+                                            
 										<td>
-										@if(isset($outcomes_attempted_colap_semesters[$program->id][$outcome->id]))
-											{{{ str_replace('"','',json_encode($outcomes_attempted_colap_semesters[$program->id][$outcome->id])) }}}
+										@if(isset($outcomes_undergraduate_attempted_colap_semesters[$program->id][$outcome->id]))
+											{{{ str_replace('"','',json_encode($outcomes_undergraduate_attempted_colap_semesters[$program->id][$outcome->id])) }}}
 										@else
 											N/M
 										@endif
 										
-										</td>
+										</td>--}}
                                     </tr>
                        				@endif
                                   @endforeach
@@ -93,16 +106,16 @@
                         <p class="lead"> No courses assigned.</p>
                     @endif
                 </div>
+        </div>
+    </div>
+		<div role="tabpanel" class="tab-pane" id="undergraduate_uncombined">
+            <div class="row">
+                <div class="col-md-12" id="graph"></div>
             </div>
-            </div>
-		<div role="tabpanel" class="tab-pane" id="uncombined">
-	<div class="row">
-		<div class="col-md-12" id="graph"></div>
-	</div>
 
             <div class="row">
                 <div class="col-md-12">
-                    <h3>Performance of {{ $school->name }} Students by Uncombined Learning Outcome</h3>
+                    <h3>Performance of {{ $school->name }} Undergrad Students by Uncombined Learning Outcome</h3>
                     @if($outcomes->count()>0)
                         <table class="table table-striped table-condensed datatable">
                             <thead>
@@ -114,7 +127,7 @@
                                     <th>Number Students</th>
                                     <th>Number Students that Achieved the Target</th>
                                     <th>Percentage of Students that Achieved the Target</th>
-                                    <th>Semesters</th>
+                                    <!--<th>Semesters</th>-->
                                 </tr>
                             </thead>
                             <tfoot>
@@ -126,35 +139,44 @@
                                     <th><input class="column-search-bar form-control" type="text" placeholder="Search"/></th>
                                     <th><input class="column-search-bar form-control" type="text" placeholder="Search"/></th>
                                     <th><select class="column-search-select form-control"><option value=""></option></select></th>
-                                    <th><input class="column-search-bar form-control" type="text" placeholder="Search"/></th>
+                                     <!--<th><input class="column-search-bar form-control" type="text" placeholder="Search"/></th>-->
                                 </tr>
                             </tfoot>
                             <tbody>
-                                @foreach($programs as $program)
+                                
                                	   @foreach($outcomes as $outcome)
-  											@if(isset($outcomes_attempted[$program->id][$outcome->id]))
+                                      @foreach($undergraduate_programs as $program)
+  											@if(isset($outcomes_undergrad_program_attempted_todo[$outcome->id][$program->id]))
                                   <tr>
 										<td>{{ link_to_action('OutcomesController@show', $outcome->name, array($outcome->id), $attributes = array()) }}</td>
 										<td>{{{ $program->name }}}</td>
 										<td>{{{ $program->id }}}</td>
 										<td>{{{ $program->is_graduate }}}</td>
-										<td>{{{ $outcomes_attempted[$program->id][$outcome->id] }}}</td>
-										<td>{{{ $outcomes_achieved[$program->id][$outcome->id] }}}</td>
+										
+                                        <td>{{{ $outcomes_undergrad_program_attempted_todo[$outcome->id][$program->id] }}}</td>
+									@if((isset($outcomes_undergrad_program_achieved_todo[$outcome->id][$program->id])))
+                                        <td>{{{ $outcomes_undergrad_program_achieved_todo[$outcome->id][$program->id] }}}</td>
 										<td>
-											@if($outcomes_attempted[$program->id][$outcome->id]!=0)
-												{{{ round($outcomes_achieved[$program->id][$outcome->id] / $outcomes_attempted[$program->id][$outcome->id]*100, 2) }}}%
+											@if($outcomes_undergrad_program_attempted_todo[$outcome->id][$program->id]!=0)
+                                            	{{{ round($outcomes_undergrad_program_achieved_todo[$outcome->id][$program->id] / $outcomes_undergrad_program_attempted_todo[$outcome->id][$program->id]*100, 2) }}}%
 											@else
+                                            
 												N/M
 											@endif
 										</td>
+                                        @else
+                                            <td>0</td>
+                                            <td>0%</td>
+                                        @endif
+                                        {{--}}
 										<td>
-											@if(isset($outcomes_attempted_semesters[$program->id][$outcome->id]))
-												{{{ str_replace('"','',json_encode($outcomes_attempted_semesters[$program->id][$outcome->id])) }}}
+											@if(isset($outcomes_undergraduate_attempted_semesters[$program->id][$outcome->id]))
+												{{{ str_replace('"','',json_encode($outcomes_undergraduate_attempted_semesters[$program->id][$outcome->id])) }}}
 											@else
 												N/M
 											@endif
 										
-										</td>
+										</td>--}}
                                     </tr>
 											@endif
                                    @endforeach
@@ -166,9 +188,180 @@
                     @endif
                 </div>
             </div>
-</div>
-	</div>
-</div>
+        </div>
+	
+    <div role="tabpanel" class="tab-pane" id="graduate_combined">
+        <div class="row">
+            <div class="col-md-12" id="graph3"></div>
+        </div>
+
+        <div class="row">
+                <div class="col-md-12">
+                    <h3>Performance of {{ $school->name }} Graduate Students by Combined Learning Outcome</h3>
+                    @if($outcomes->count()>0)
+                        <table class="table table-striped table-condensed datatable">
+                            <thead>
+                                <tr>
+                                    <th>Learning Outcome</th>
+                                    <th>Program</th>
+                                    <th>Program Id</th>
+                                    <th>Program Is Graduate</th>
+                                    <th>Number Students</th>
+                                    <th>Number Students that Achieved the Target</th>
+                                    <th>Percentage of Students that Achieved the Target</th>
+                                    <!--<th>Semesters</th>-->
+                                </tr>
+                            </thead>
+                            <tfoot>
+                                <tr class="column-search">
+                                    <th><input class="column-search-bar form-control" type="text" placeholder="Search"/></th>
+                                    <th><select class="column-search-select form-control"><option value=""></option></select></th>
+                                    <th><select class="column-search-select form-control"><option value=""></option></select></th>
+                                    <th><select class="column-search-select form-control"><option value=""></option></select></th>
+                                    <th><input class="column-search-bar form-control" type="text" placeholder="Search"/></th>
+                                    <th><input class="column-search-bar form-control" type="text" placeholder="Search"/></th>
+                                    <th><select class="column-search-select form-control"><option value=""></option></select></th>
+                                    <!--<th><input class="column-search-bar form-control" type="text" placeholder="Search"/></th>-->
+                                </tr>
+                            </tfoot>
+                            <tbody>
+                                @foreach($graduate_programs as $program)
+                                  @foreach($outcomes_colap as $outcome)
+                                	@if(isset($outcomes_grad_program_attempted_colap[$outcome->id][$program->id]))
+                                    <tr>
+										<td>{{ link_to_action('OutcomesController@show', $outcome->name, array($outcome->id), $attributes = array()) }}</td>
+										<td>{{{ $program->name }}}</td>
+										<td>{{{ $program->id }}}</td>
+										<td>{{{ $program->is_graduate }}}</td>
+										<td>{{{ $outcomes_grad_program_attempted_colap[$outcome->id][$program->id] }}}</td>
+										@if((isset($outcomes_grad_program_achieved_colap[$outcome->id][$program->id])))
+                                            <td>{{{ $outcomes_grad_program_achieved_colap[$outcome->id][$program->id] }}}</td>
+                                            <td>
+                                                @if($outcomes_grad_program_attempted_colap[$outcome->id][$program->id]!=0)
+                                                    
+                                                {{{ round($outcomes_grad_program_achieved_colap[$outcome->id][$program->id] / $outcomes_grad_program_attempted_colap[$outcome->id][$program->id]*100, 2) }}}%
+                                            
+                                                    
+                                            @else
+                                                    N/M
+                                                @endif
+                                            </td>
+                                            @else
+                                            <td>
+                                                0</td>
+                                                <td>0%</td>
+                                            @endif
+                                        {{--}}
+										<td>
+										@if(isset($outcomes_undergraduate_attempted_colap_semesters[$program->id][$outcome->id]))
+											{{{ str_replace('"','',json_encode($outcomes_undergraduate_attempted_colap_semesters[$program->id][$outcome->id])) }}}
+										@else
+											N/M
+										@endif
+										
+										</td>--}}
+                                    </tr>
+                       				@endif
+                                  @endforeach
+                                @endforeach
+                            </tbody>
+                        </table>
+                    @else
+                        <p class="lead"> No courses assigned.</p>
+                    @endif
+                </div>
+        </div>
+    </div>
+
+    <div role="tabpanel" class="tab-pane" id="graduate_uncombined">
+        <div class="row">
+            <div class="col-md-12" id="graph4"></div>
+        </div>
+
+        <div class="row">
+                <div class="col-md-12">
+                    <h3>Performance of {{ $school->name }} Graduate Students by Uncombined Learning Outcome</h3>
+                    @if($outcomes->count()>0)
+                        <table class="table table-striped table-condensed datatable">
+                            <thead>
+                                <tr>
+                                    <th>Learning Outcome</th>
+                                    <th>Program</th>
+                                    <th>Program Id</th>
+                                    <th>Program Is Graduate</th>
+                                    <th>Number Students</th>
+                                    <th>Number Students that Achieved the Target</th>
+                                    <th>Percentage of Students that Achieved the Target</th>
+                                    <!--<th>Semesters</th>-->
+                                </tr>
+                            </thead>
+                            <tfoot>
+                                <tr class="column-search">
+                                    <th><input class="column-search-bar form-control" type="text" placeholder="Search"/></th>
+                                    <th><select class="column-search-select form-control"><option value=""></option></select></th>
+                                    <th><select class="column-search-select form-control"><option value=""></option></select></th>
+                                    <th><select class="column-search-select form-control"><option value=""></option></select></th>
+                                    <th><input class="column-search-bar form-control" type="text" placeholder="Search"/></th>
+                                    <th><input class="column-search-bar form-control" type="text" placeholder="Search"/></th>
+                                    <th><select class="column-search-select form-control"><option value=""></option></select></th>
+                                    <!--<th><input class="column-search-bar form-control" type="text" placeholder="Search"/></th>-->
+                                </tr>
+                            </tfoot>
+                            <tbody>
+                                @foreach($graduate_programs as $program)
+                                  @foreach($outcomes as $outcome)
+                                	@if(isset($outcomes_grad_program_attempted_colap[$outcome->id][$program->id]))
+                                    <tr>
+										<td>{{ link_to_action('OutcomesController@show', $outcome->name, array($outcome->id), $attributes = array()) }}</td>
+										<td>{{{ $program->name }}}</td>
+										<td>{{{ $program->id }}}</td>
+										<td>{{{ $program->is_graduate }}}</td>
+										<td>{{{ $outcomes_grad_program_attempted_colap[$outcome->id][$program->id] }}}</td>
+                                        @if(isset($outcomes_grad_program_achieved_colap[$outcome->id][$program->id]))
+										<td>{{{ $outcomes_grad_program_achieved_colap[$outcome->id][$program->id] }}}</td>
+										<td>
+											@if($outcomes_grad_program_attempted_colap[$outcome->id][$program->id]!=0)
+												
+                                            
+
+                                            {{{ round($outcomes_grad_program_achieved_colap[$outcome->id][$program->id] / $outcomes_grad_program_attempted_colap[$outcome->id][$program->id]*100, 2) }}}%
+										
+                                            @else
+												N/M
+											@endif
+										</td>
+                                        @else
+                                        <td>0</td>
+										<td>
+											0%
+										</td>
+                         
+                                        @endif
+                                        
+                                        {{--}}
+										<td>
+                                            
+										@if(isset($outcomes_undergraduate_attempted_colap_semesters[$program->id][$outcome->id]))
+											{{{ str_replace('"','',json_encode($outcomes_undergraduate_attempted_colap_semesters[$program->id][$outcome->id])) }}}
+										@else
+											N/M
+										@endif
+										
+										</td>--}}
+                                    </tr>
+                       				@endif
+                                  @endforeach
+                                @endforeach
+                            </tbody>
+                        </table>
+                    @else
+                        <p class="lead"> No courses assigned.</p>
+                    @endif
+                </div>
+        </div>
+    </div>
+<!--</div>-->
+
  <!-- ===== tabs ===== -->
 <div class="row">
     <!-- Nav tabs -->
@@ -182,7 +375,7 @@
        <div role="tabpanel" class="tab-pane active" id="courses">
             <div class="row">
                 <div class="col-md-12">
-                    <h3>Courses in this program</h3>
+                    <h3>Courses in this School</h3>
                     @if(count($grouped_courses)>0)
                         <table class="table table-striped table-condensed datatable">
                             <thead>
@@ -206,7 +399,7 @@
                                     <tr>
                                         <td class="col-md-2">{{ HTML::linkAction('CoursesController@showGrouped', $grouped_course->code.$grouped_course->number.' ('.$grouped_course->semester->code.')', array($grouped_course->code, $grouped_course->number, $grouped_course->semester->code)) }}</td>
                                         <td class="col-md-4">{{{ $grouped_course->name}}}</td>
-                                        <td class="col-md-2">{{{ $grouped_course->program_code}}}</td>
+                                        <td class="col-md-2">{{{ $grouped_course->program->code}}}</td>
                                         <td class="col-md-3">{{{ $grouped_course->quantity }}}</td>
                                     </tr>
                                 @endforeach
@@ -319,7 +512,7 @@ $('#graph').highcharts({
         type: 'bar'
     },
     title: {
-        text: 'Performance of {{ $school->name }} Students by Uncombined Learning Outcome'
+        text: 'Performance of {{ $school->name }} Undergraduate Students by Uncombined Learning Outcome'
     },
     legend: {
                 reversed: true,
@@ -327,13 +520,17 @@ $('#graph').highcharts({
     xAxis: {
         categories: [
             @foreach($outcomes as $outcome)
-            	@if(isset($outcomes_attempted_todo[$outcome->id]))
-                 "{{{ $outcome->name }}}<br>(N = {{{ $outcomes_attempted_todo[$outcome->id] }}}, {{{ $outcomes_achieved_todo[$outcome->id] }}})",
-            	@else
+            	@if(isset($outcomes_undergraduate_attempted_todo[$outcome->id]) &&
+                isset($outcomes_undergraduate_achieved_todo[$outcome->id]))
+                 "{{{ $outcome->name }}}<br>(N = {{{ $outcomes_undergraduate_attempted_todo[$outcome->id] }}}, {{{ $outcomes_undergraduate_achieved_todo[$outcome->id] }}})",
+            	@elseif(isset($outcomes_undergraduate_attempted_todo[$outcome->id]))
+                "{{{ $outcome->name }}}<br>(N = {{{ $outcomes_undergraduate_attempted_todo[$outcome->id] }}}, 0)",
+            	
+                 @else
                     "{{{ $outcome->name }}}<br>(N = 0, 0)",         	
             	@endif
             @endforeach
-        ],
+        ], 
         labels: {
             style: {
                 fontSize:'11px'
@@ -386,7 +583,7 @@ $('#graph').highcharts({
         groupPadding: 0.075
         },
     },
-    series: [{
+    series: [/*{
         name: 'Expected Value',
         color: '#555555',
         dataLabels: {
@@ -403,16 +600,16 @@ $('#graph').highcharts({
         data: [
             @foreach($outcomes as $index => $outcome)
                 @if(
-                    is_array($outcomes_attempted_todo)
-                    && array_key_exists($outcome->id, $outcomes_attempted_todo)
-                    && $outcomes_attempted_todo[$outcome->id]!=0)
+                    is_array($outcomes_undergraduate_attempted_todo)
+                    && array_key_exists($outcome->id, $outcomes_undergraduate_attempted_todo)
+                    && $outcomes_undergraduate_attempted_todo[$outcome->id]!=0)
                 @else
                     0,
                 @endif
             @endforeach
         ]
 
-    },{
+    },*/{
         name: 'Obtained Value',
         color: '#e70033',
         dataLabels: {
@@ -429,11 +626,14 @@ $('#graph').highcharts({
         data:[
             @foreach($outcomes as $index => $outcome)
                 @if(
-                    is_array($outcomes_attempted_todo)
-                    && array_key_exists($outcome->id, $outcomes_attempted_todo)
-                    && $outcomes_attempted_todo[$outcome->id]!=0)
-                    {{{ ($outcomes_achieved_todo[$outcome->id]/$outcomes_attempted_todo[$outcome->id])*100 }}},
-                @else
+                    is_array($outcomes_undergraduate_attempted_todo)
+                    && array_key_exists($outcome->id, $outcomes_undergraduate_attempted_todo)
+                    && $outcomes_undergraduate_attempted_todo[$outcome->id]!=0
+                    && isset($outcomes_undergraduate_achieved_todo[$outcome->id]))
+
+                    {{{ ($outcomes_undergraduate_achieved_todo[$outcome->id]/$outcomes_undergraduate_attempted_todo[$outcome->id])*100 }}},
+                    @else
+                
                     0,
                 @endif
             @endforeach
@@ -446,7 +646,7 @@ $('#graph2').highcharts({
         type: 'bar'
     }, 
     title: {
-        text: 'Performance of {{ $school->name }} Students by Combined Learning Outcome'
+        text: 'Performance of {{ $school->name }} Undergraduate Students by Combined Learning Outcome'
     },
     legend: {
                 reversed: true,
@@ -454,8 +654,146 @@ $('#graph2').highcharts({
     xAxis: {
         categories: [
             @foreach($outcomes_colap as $outcome)
-                "{{{ $outcome->name }}}<br>(N = {{{ $outcomes_attempted_colap_todo[$outcome->id] }}}, {{{ $outcomes_achieved_colap_todo[$outcome->id] }}})",
+            @if(isset($outcomes_undergraduate_attempted_colap_todo[$outcome->id]) &&
+                    isset($outcomes_undergraduate_achieved_colap_todo[$outcome->id]))
+                    "{{{ $outcome->name }}}<br>(N = {{{ $outcomes_undergraduate_attempted_colap_todo[$outcome->id] }}}, {{{ $outcomes_undergraduate_achieved_colap_todo[$outcome->id] }}})",
+                    @elseif(isset($outcomes_undergraduate_attempted_colap_todo[$outcome->id]))
+                    "{{{ $outcome->name }}}<br>(N = {{{ $outcomes_undergraduate_attempted_colap_todo[$outcome->id] }}}, 0)",
+                    
+                    @else
+                        "{{{ $outcome->name }}}<br>(N = 0, 0)",         	
+                    @endif
+               @endforeach
+        ],
+        labels: {
+            style: {
+                fontSize:'11px'
+            },
+            step:1,
+            useHTML:true,
+            formatter: function() {
+                return '<div style="width:200px; word-break:break; text-overflow:ellipsis; overflow:hidden;">'+this.value+'</div>';
+            },
+        }
+    },
+    yAxis: {
+        min: 0,
+        max: 100,
+        title: {
+            text: 'Percentage'
+        },
+        			plotLines:[{
+		value:70,
+		color: '#000',
+		width:3,
+		zIndex:4,
+		label:{
+			text: 'Goal (70%)',
+			style: {
+				color: '#000',
+				fontSize: '14px',
+			}
+
+		}
+	}]
+
+    },
+    tooltip: {
+        headerFormat: '<span style="font-size:10px">{point.key}</span><table>',
+        pointFormat: '<tr><td style="color:{series.color};padding:0">{series.name}: </td>' +
+            '<td style="padding:0"><b>{point.y:.2f}</b></td></tr>',
+        footerFormat: '</table>',
+        shared: true,
+        useHTML: true
+    },
+    plotOptions: {
+        bar: {
+            //grouping: false,
+            shadow: false,
+            borderWidth: 0,
+        },
+        series: {
+        pointPadding: 0,
+        groupPadding: 0.075
+        },
+    },
+    series: [/*{
+        name: 'Expected Value',
+        color: '#555555',
+        dataLabels: {
+            enabled: true,
+            fontSize: 8,
+            color: '#fff',
+            align: 'right',
+            format: '{y:.1f}%',
+            style: {
+                //fontWeight: 'bold'
+            },
+            y:-1
+        },
+        data: [
+            @foreach($outcomes_colap as $index => $outcome)
+                @if(
+                    is_array($outcomes_undergraduate_attempted_colap_todo)
+                    && array_key_exists($outcome->id, $outcomes_undergraduate_attempted_colap_todo)
+                    && $outcomes_undergraduate_attempted_colap_todo[$outcome->id]!=0)
+                @else
+                    0,
+                @endif
+            @endforeach
+        ]
+
+    },*/{
+        name: 'Obtained Value',
+        color: '#e70033',
+        dataLabels: {
+            enabled: true,
+            fontSize: 8,
+            color: '#fff',
+            align: 'right',
+            format: '{y:.1f}%',
+            style: {
+                //fontWeight: 'bold'
+            },
+            y:-1
+        },
+        data:[
+            @foreach($outcomes_colap as $index => $outcome)
+                @if(
+                    is_array($outcomes_undergraduate_attempted_colap_todo)
+                    && array_key_exists($outcome->id, $outcomes_undergraduate_attempted_colap_todo)
+                    && $outcomes_undergraduate_attempted_colap_todo[$outcome->id]!=0
+                    && isset($outcomes_undergraduate_achieved_colap_todo[$outcome->id]))
+                    {{{ ($outcomes_undergraduate_achieved_colap_todo[$outcome->id]/$outcomes_undergraduate_attempted_colap_todo[$outcome->id])*100 }}},
+                @else
+                    0,
+                @endif
             @endforeach
+        ]
+    }]
+});
+$('#graph3').highcharts({
+    chart: {
+        type: 'bar'
+    }, 
+    title: {
+        text: 'Performance of {{ $school->name }} Graduate Students by Combined Learning Outcome'
+    },
+    legend: {
+                reversed: true,
+            },
+    xAxis: {
+        categories: [
+            @foreach($outcomes_colap as $outcome)
+            @if(isset($outcomes_graduate_attempted_colap_todo[$outcome->id])
+            && isset($outcomes_graduate_achieved_colap_todo[$outcome->id]))
+                "{{{ $outcome->name }}}<br>(N = {{{ $outcomes_graduate_attempted_colap_todo[$outcome->id] }}}, {{{ $outcomes_graduate_achieved_colap_todo[$outcome->id] }}})",
+            @elseif(isset($outcomes_graduate_attempted_colap_todo[$outcome->id]))
+            "{{{ $outcome->name }}}<br>(N = {{{ $outcomes_graduate_attempted_colap_todo[$outcome->id] }}}, 0)",
+          @else
+          "{{{ $outcome->name }}}<br>(N = 0, 0)",
+          @endif
+                @endforeach
         ],
         labels: {
             style: {
@@ -509,7 +847,7 @@ $('#graph2').highcharts({
         groupPadding: 0.075
         },
     },
-    series: [{
+    series: [/*{
         name: 'Expected Value',
         color: '#555555',
         dataLabels: {
@@ -526,16 +864,17 @@ $('#graph2').highcharts({
         data: [
             @foreach($outcomes_colap as $index => $outcome)
                 @if(
-                    is_array($outcomes_attempted_colap_todo)
-                    && array_key_exists($outcome->id, $outcomes_attempted_colap_todo)
-                    && $outcomes_attempted_colap_todo[$outcome->id]!=0)
+                    is_array($outcomes_graduate_attempted_colap_todo)
+                    && array_key_exists($outcome->id, $outcomes_graduate_attempted_colap_todo)
+                    && $outcomes_graduate_attempted_colap_todo[$outcome->id]!=0
+                    )
                 @else
                     0,
                 @endif
             @endforeach
         ]
 
-    },{
+    },*/{
         name: 'Obtained Value',
         color: '#e70033',
         dataLabels: {
@@ -552,10 +891,133 @@ $('#graph2').highcharts({
         data:[
             @foreach($outcomes_colap as $index => $outcome)
                 @if(
-                    is_array($outcomes_attempted_colap_todo)
-                    && array_key_exists($outcome->id, $outcomes_attempted_todo)
-                    && $outcomes_attempted_colap_todo[$outcome->id]!=0)
-                    {{{ ($outcomes_achieved_colap_todo[$outcome->id]/$outcomes_attempted_colap_todo[$outcome->id])*100 }}},
+                    is_array($outcomes_graduate_attempted_colap_todo)
+                    && array_key_exists($outcome->id, $outcomes_graduate_attempted_colap_todo)
+                    && $outcomes_graduate_attempted_colap_todo[$outcome->id]!=0
+                    && isset($outcomes_graduate_achieved_colap_todo[$outcome->id]))
+                    {{{ ($outcomes_graduate_achieved_colap_todo[$outcome->id]/$outcomes_graduate_attempted_colap_todo[$outcome->id])*100 }}},
+                @else
+                    0,
+                @endif
+            @endforeach
+        ]
+    }]
+});
+
+$('#graph4').highcharts({
+    chart: {
+        type: 'bar'
+    }, 
+    title: {
+        text: 'Performance of {{ $school->name }} Graduate Students by Uncombined Learning Outcome'
+    },
+    legend: {
+                reversed: true,
+            },
+    xAxis: {
+        categories: [
+            @foreach($outcomes as $outcome)
+                @if(isset($outcomes_graduate_attempted_todo[$outcome->id])
+                && isset($outcomes_graduate_achieved_todo[$outcome->id]))
+                    "{{{ $outcome->name }}}<br>(N = {{{ $outcomes_graduate_attempted_todo[$outcome->id] }}}, {{{ $outcomes_graduate_achieved_todo[$outcome->id] }}})",
+                @elseif(isset($outcomes_graduate_attempted_todo[$outcome->id]))
+                "{{{ $outcome->name }}}<br>(N = {{{ $outcomes_graduate_attempted_todo[$outcome->id] }}}, 0)",
+            @else
+            "{{{ $outcome->name }}}<br>(N = 0, 0)",
+          @endif  @endforeach
+        ],
+        labels: {
+            style: {
+                fontSize:'11px'
+            },
+            step:1,
+            useHTML:true,
+            formatter: function() {
+                return '<div style="width:200px; word-break:break; text-overflow:ellipsis; overflow:hidden;">'+this.value+'</div>';
+            },
+        }
+    },
+    yAxis: {
+        min: 0,
+        max: 100,
+        title: {
+            text: 'Percentage'
+        },
+        			plotLines:[{
+		value:70,
+		color: '#000',
+		width:3,
+		zIndex:4,
+		label:{
+			text: 'Goal (70%)',
+			style: {
+				color: '#000',
+				fontSize: '14px',
+			}
+
+		}
+	}]
+
+    },
+    tooltip: {
+        headerFormat: '<span style="font-size:10px">{point.key}</span><table>',
+        pointFormat: '<tr><td style="color:{series.color};padding:0">{series.name}: </td>' +
+            '<td style="padding:0"><b>{point.y:.2f}</b></td></tr>',
+        footerFormat: '</table>',
+        shared: true,
+        useHTML: true
+    },
+    plotOptions: {
+        bar: {
+            //grouping: false,
+            shadow: false,
+            borderWidth: 0,
+        },
+        series: {
+        pointPadding: 0,
+        groupPadding: 0.075
+        },
+    },
+    series: [/*{
+        name: 'Expected Value',
+        color: '#555555',
+        dataLabels: {
+            enabled: true,
+            fontSize: 8,
+            color: '#fff',
+            align: 'right',
+            format: '{y:.1f}%',
+            style: {
+                //fontWeight: 'bold'
+            },
+            y:-1
+        },
+        data: [
+            
+        ]
+
+    },*/{
+        name: 'Obtained Value',
+        color: '#e70033',
+        dataLabels: {
+            enabled: true,
+            fontSize: 8,
+            color: '#fff',
+            align: 'right',
+            format: '{y:.1f}%',
+            style: {
+                //fontWeight: 'bold'
+            },
+            y:-1
+        },
+        data:[
+            @foreach($outcomes as $index => $outcome)
+                @if(
+                    is_array($outcomes_graduate_attempted_todo)
+                    && array_key_exists($outcome->id, $outcomes_graduate_attempted_todo)
+                    && $outcomes_graduate_attempted_todo[$outcome->id]!=0
+                    && isset($outcomes_graduate_achieved_todo[$outcome->id]))
+                    {{{ ($outcomes_graduate_achieved_todo[$outcome->id]/$outcomes_graduate_attempted_todo[$outcome->id])*100 }}},
                 @else
                     0,
                 @endif

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

@@ -110,7 +110,7 @@ function loadGraphs() {
         <?php
 
             $student_in_course = $grouped_course->getStudentReportForOutcome($grouped_course, Auth::user()->id);
-            Log::info($student_in_course);
+            //Log::info($student_in_course);
         ?>
         // Load grad charts after clicking tab, so they are sized correctly.  
         $('#graph-{{ $index }}').highcharts({

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

@@ -13,8 +13,7 @@
 @stop
 
 @section('main')
-
-<button type='button' class = 'btn btn-primary' id="change-view-btn" onclick="changeView('#allGraph','#programGraph', '', 'Show All Students')">Show Program Students</button>
+<a href="{{ action('ProgramsController@studentsProgramAssessmentReportForProfessors', array($program->id)); }}" class="btn btn-primary pull-left" alt="print">Go to Performance by Program Students</a>
 <div class="row" id = "allGraph">
     <div class="col-md-12" id="graph"></div>
 </div>