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

app/controllers/ActivitiesController.php

@@ -140,11 +140,23 @@ class ActivitiesController extends \BaseController
         Log::info($active_semesters);
         // Added the function htmlspecialchars to activity name string because it was corrupting Jquery code while using quotes on page rendering. - Carlos R Caraballo 1/18/2019
         $title = $course->code . $course->number . '-' . $course->section . ': ' . htmlspecialchars($activity->name, ENT_QUOTES) . ' <span class="small attention">(' . $course->semester->code . ')</span>';
+
         $semesters = DB::table('semesters')->where('id', $course->semester_id)->orderBy('start', 'ASC')->first();
-        $outcomes = Outcome::select(array('id', 'name', 'expected_outcome'))
+        /*$outcomes = Outcome::select(array('id', 'name', 'expected_outcome'))
             ->whereNull('deleted_at')
             ->whereRaw("(deactivation_date IS NULL or deactivation_date >= '{$semesters->start}')")
-            ->orderBy('name', 'ASC')->get();
+            ->orderBy('name', 'ASC')->get();*/
+
+//         $outcomes = Outcome::orderBy('name', 'asc')->get();
+		 $level = DB::table('courses')
+            ->join('programs', 'programs.id', '=', 'courses.program_id')
+            ->where('courses.id', $activity->course_id)
+//             ->where('courses.number', $number)
+//             ->where('courses.semester_id', $semester->id)
+            ->select('programs.is_graduate')
+            ->first();
+            $outcomes = Outcome::active_by_semesters(array($course->semester), $level->is_graduate);
+
         $assessment = DB::table('assessments')
             ->join('activity_criterion', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
             ->join('activities', 'activities.id', '=', 'activity_criterion.activity_id')
@@ -988,4 +1000,4 @@ class ActivitiesController extends \BaseController
 
         return View::make('local.professors.compare_activities', compact('activity_1', 'activity_2', 'activity_criterion_1', 'activity_criterion_2', 'title', 'outcomes', 'outcomes_achieved_1', 'outcomes_attempted_1', 'outcomes_achieved_2', 'outcomes_attempted_2', 'course', 'student_count', 'active_semesters'));
     }
-}
+}

app/controllers/SchoolCoordinatorsController.php

@@ -5,17 +5,234 @@ class SchoolCoordinatorsController extends \BaseController
 
     private function participatingPrograms($school)
     {
-        return DB::table('programs')
+         return DB::table('programs')
             ->join('courses', 'courses.program_id', '=', 'programs.id')
+            ->join('activities', 'activities.course_id', '=', 'courses.id')
+            ->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
+            ->join('assessments', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
             ->select('programs.id', 'programs.name', 'programs.is_graduate', 'programs.school_id')
             ->addSelect('courses.semester_id')
             ->where('school_id', $school->id)
             ->whereIn('semester_id', Session::get('semesters_ids'))
             ->lists('id');
+
+//        return DB::table('programs')
+//             ->join('courses', 'courses.program_id', '=', 'programs.id')
+//             ->select('programs.id', 'programs.name', 'programs.is_graduate', 'programs.school_id')
+//             ->addSelect('courses.semester_id')
+//             ->where('school_id', $school->id)
+//             ->whereIn('semester_id', Session::get('semesters_ids'))
+//             ->lists('id');
     }
 
     public function overview()
     {
+        ini_set('memory_limit', '256M');
+        DB::connection()->disableQueryLog();
+//         $school = School::find($id);
+        $school = Auth::user()->school;
+        $id = $school->id;
+
+        $title = $school->name;
+        $schools = School::all();
+
+        $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);
+
+        /**
+         * List of grouped courses (grouped sections)
+         */
+
+        $program_ids = $school->programs->lists('id');
+
+        $undergrad_programs = DB::table('programs')
+            ->select('id', 'name', 'school_id', 'is_graduate')
+            ->where('is_graduate', '=', 0)
+            ->where('school_id', '=', $id)
+            ->orderBy('name', 'ASC')
+            ->get();
+
+        $grad_programs = DB::table('programs')
+            ->select('id', 'name', 'school_id', 'is_graduate')
+            ->where('is_graduate', '=', 1)
+            ->where('school_id', '=', $id)
+            ->orderBy('name', 'ASC')
+            ->get();
+
+
+        $grad_grouped_courses = Course::
+            //             select(DB::raw('courses.name, courses.code, courses.number, max(courses.outcomes_attempted) as outcomes_attempted, courses.semester_id, courses.program_id'))
+            select(DB::raw('courses.name, courses.code, courses.number, courses.semester_id, courses.program_id'))
+            ->with('semester')
+            ->with('program')
+            ->whereIn('courses.program_id', $program_ids)
+            ->whereIn('courses.semester_id', Session::get('semesters_ids'))
+            ->leftJoin('programs', 'courses.program_id', '=', 'programs.id')
+            ->where('programs.is_graduate', '=', 1)
+            ->groupBy(array('courses.code', 'courses.number', 'courses.semester_id'))
+            ->orderBy('courses.code')
+            ->orderBy('courses.number')
+            ->orderBy('courses.semester_id')
+            ->get();
+
+        $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'))
+            ->with('semester')
+            ->with('program')
+            ->whereIn('courses.program_id', $program_ids)
+            ->whereIn('courses.semester_id', Session::get('semesters_ids'))
+            ->leftJoin('programs', 'courses.program_id', '=', 'programs.id')
+            ->where('programs.is_graduate', '=', 0)
+            ->groupBy(array('courses.code', 'courses.number', 'courses.semester_id'))
+            ->orderBy('courses.code')
+            ->orderBy('courses.number')
+            ->orderBy('courses.semester_id')
+            ->get();
+
+		foreach($undergrad_grouped_courses as $key=>$courses)
+		{
+			$undergrad_grouped_courses[$key]->outcomes_attempted=NULL;	
+			$coursesT=Course::where('courses.code',$courses->code)->where('courses.number',$courses->number)->where('courses.semester_id',$courses->semester_id)->get();
+			foreach($coursesT as $course)
+    		{
+				if($course->isAssessed())
+				{
+					$undergrad_grouped_courses[$key]->outcomes_attempted=true;
+				}
+			}
+    	}
+
+		foreach($grad_grouped_courses as $key=>$courses)
+		{
+			$grad_grouped_courses[$key]->outcomes_attempted=NULL;	
+			$coursesT=Course::where('courses.code',$courses->code)->where('courses.number',$courses->number)->where('courses.semester_id',$courses->semester_id)->get();
+			foreach($coursesT as $course)
+    		{
+				if($course->isAssessed())
+				{
+					$grad_grouped_courses[$key]->outcomes_attempted=true;
+				}
+			}
+    	}
+
+        // Fetch programs with participation
+        $participating_programs = $this->participatingPrograms($school);
+
+
+        /**
+         * Calculate how many sections are doing assessment
+         */
+
+        $undergrad_assessed_sections_count = 0;
+        $undergrad_school_sections_count = 0;
+
+        $grad_assessed_sections_count = 0;
+        $grad_school_sections_count = 0;
+
+        foreach ($school->programs as $program) {
+            foreach ($program->courses as $course) {
+
+	            if (!$course->program->is_graduate){
+    	            $undergrad_school_sections_count += 1;
+    	        	if($course->isAssessed())$undergrad_assessed_sections_count += 1;
+    	        }
+        	    else {
+            	    $grad_school_sections_count += 1;
+            		if($course->isAssessed())$grad_assessed_sections_count += 1;
+           		}
+            }
+        }
+
+        /**
+         * Calculate how many programs achieved and attempted each outcome in this school
+         */
+
+        // For each outcome 
+        foreach ($outcomes_undergrad as $outcome) {
+//         	$attempted_outcomes_per_undergrad_program[$outcome->id]=0;
+//         	$achieved_outcomes_per_undergrad_program[$outcome->id]=0;
+        	$attemptedUndergradProgramsPerOutcome[$outcome->id]=0;
+        	$achievedUndergradProgramsPerOutcome[$outcome->id]=0;
+        	$programs_attempted_in_school[$outcome->id]=$outcome->programs_attempted_in_school($semesters, $school->id);
+//         	var_dump($programs_attempted_in_school);exit();
+        	foreach($programs_attempted_in_school[$outcome->id] as $program_id)
+        	{
+//         		var_dump($program_id->id);exit();
+				$program = DB::table('programs')->where('id', '=', $program_id->id)->first();
+
+        		if(!$program->is_graduate)
+        		{
+        			$attemptedUndergradProgramsPerOutcome[$outcome->id]++;
+        			$programC=Program::where('id', '=', $program_id->id)->first();
+//         			var_dump($programC);exit();
+					if($programC->achieved_outcome($outcome->id,$semesters))
+					{
+						$achievedUndergradProgramsPerOutcome[$outcome->id]++;
+					}
+        		}
+        	}
+ 			$undergrad_outcomes_attempted[$outcome->id]=$outcome->attempted_by_school($semesters, $school->id,0);
+ 			$undergrad_outcomes_achieved[$outcome->id]=$outcome->achieved_by_school($semesters, $school->id,0);
+ 			
+            // For each program with courses that do assessment
+            $programs_with_courses = Program::with(array('courses' => function ($query) {
+                //                 $query->whereNotNull('outcomes_attempted');
+                $query->whereIn('semester_id', Session::get('semesters_ids'));
+            }))->where('is_graduate', 0)->where('school_id', $school->id)->orderBy('name', 'asc')->get();
+
+        }
+
+        /**
+         * Calculate how many programs achieved and attempted each outcome in this school
+         */
+
+        // For each outcome 
+        foreach ($outcomes_grad as $outcome) {
+//         	$attempted_outcomes_per_grad_program[$outcome->id]=0;
+        	$achieved_outcomes_per_grad_program[$outcome->id]=0;
+        	$attemptedGradProgramsPerOutcome[$outcome->id]=0;
+        	$achievedGradProgramsPerOutcome[$outcome->id]=0;
+ 			$grad_outcomes_attempted[$outcome->id]=$outcome->attempted_by_school($semesters, $school->id,1);
+ 			$grad_outcomes_achieved[$outcome->id]=$outcome->achieved_by_school($semesters, $school->id,1);
+           // For each program with courses that do assessment
+        	foreach($programs_attempted_in_school[$outcome->id] as $program_id)
+        	{
+//         		var_dump($program_id->id);exit();
+				$program = DB::table('programs')
+                        ->where('id', '=', $program_id->id)
+                        ->first();
+//         		$program=Program::where('id', $program_id->id);
+//         		var_dump($program);exit();
+        		if($program->is_graduate)
+        		{
+        			$attemptedGradProgramsPerOutcome[$outcome->id]++;
+        			$programC=Program::where('id', '=', $program_id->id)->first();
+//         			var_dump($programC);exit();
+					if($programC->achieved_outcome($outcome->id,$semesters))
+					{
+						$achievedGradProgramsPerOutcome[$outcome->id]++;
+					}
+        		}
+        	}
+            $programs_with_courses = Program::with(array('courses' => function ($query) {
+                //                 $query->whereNotNull('outcomes_attempted');
+                $query->whereIn('semester_id', Session::get('semesters_ids'));
+            }))->where('is_graduate', 1)->where('school_id', $school->id)->orderBy('name', 'asc')->get();
+
+        }
+        if ($school->id == 13) {
+//             return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
+            return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
+        } 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', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
+        }
+    }
+    public function overviewOri()
+    {
         DB::disableQueryLog();
         Log::debug('user' . Auth::user()->id);
 
@@ -160,35 +377,48 @@ class SchoolCoordinatorsController extends \BaseController
 
         foreach ($school->programs as $program) {
             foreach ($program->courses as $course) {
-                if (!$course->program->is_graduate) {
-                    if ($course_outcomes_achieved = $course->outcomes_ach()) {
-                        //$course_outcomes_achieved = $course->outcomes_ach();
-                        $course_outcomes_attempted = $course->outcomes_att();
-                        foreach ($course_outcomes_attempted as $i => $score) {
+                        if (!$course->program->is_graduate){
+                $undergrad_school_sections_count += 1;
+            	if($course->isAssessed())$undergrad_assessed_sections_count += 1;
+//             	            Log::info("aqui".$course);
 
-                            $undergrad_outcomes_attempted[$i] += $score;
-                        }
-                        foreach ($course_outcomes_achieved as $i => $score) {
-                            $undergrad_outcomes_achieved[$i] += $score;
-                        }
-                        $undergrad_assessed_sections_count += 1;
-                    }
-                    $undergrad_school_sections_count += 1;
-                } else {
-                    if ($course_outcomes_achieved = $course->outcomes_ach()) {
-                        //$course_outcomes_achieved = $course->outcomes_ach();
-                        $course_outcomes_attempted = $course->outcomes_att();
-                        foreach ($course_outcomes_attempted as $i => $score) {
+            }
+            else {
+                $grad_school_sections_count += 1;
+            	if($course->isAssessed())$grad_assessed_sections_count += 1;
+//             	            	            Log::info("aqui".$course);
 
-                            $grad_outcomes_attempted[$i] += $score;
-                        }
-                        foreach ($course_outcomes_achieved as $i => $score) {
-                            $grad_outcomes_achieved[$i] += $score;
-                        }
-                        $grad_assessed_sections_count += 1;
-                    }
-                    $grad_school_sections_count += 1;
-                }
+            }
+// 
+//                 if (!$course->program->is_graduate) {
+//                     if ($course_outcomes_achieved = $course->outcomes_ach()) {
+//                         //$course_outcomes_achieved = $course->outcomes_ach();
+//                         $course_outcomes_attempted = $course->outcomes_att();
+//                         foreach ($course_outcomes_attempted as $i => $score) {
+// 
+//                             $undergrad_outcomes_attempted[$i] += $score;
+//                         }
+//                         foreach ($course_outcomes_achieved as $i => $score) {
+//                             $undergrad_outcomes_achieved[$i] += $score;
+//                         }
+//                         $undergrad_assessed_sections_count += 1;
+//                     }
+//                     $undergrad_school_sections_count += 1;
+//                 } else {
+//                     if ($course_outcomes_achieved = $course->outcomes_ach()) {
+//                         //$course_outcomes_achieved = $course->outcomes_ach();
+//                         $course_outcomes_attempted = $course->outcomes_att();
+//                         foreach ($course_outcomes_attempted as $i => $score) {
+// 
+//                             $grad_outcomes_attempted[$i] += $score;
+//                         }
+//                         foreach ($course_outcomes_achieved as $i => $score) {
+//                             $grad_outcomes_achieved[$i] += $score;
+//                         }
+//                         $grad_assessed_sections_count += 1;
+//                     }
+//                     $grad_school_sections_count += 1;
+//                 }
             }
         }
 
@@ -203,15 +433,16 @@ class SchoolCoordinatorsController extends \BaseController
         $attemptedUndergradProgramsPerOutcome = array_fill(1, $outcomeCount, 0);
 
         // Fetch programs with participation for the school
-        $participating_undergrad_programs = DB::table('programs')
-            ->join('courses', 'courses.program_id', '=', 'programs.id')
-            ->select('programs.id', 'programs.name', 'programs.is_graduate', 'programs.school_id')
-            ->addSelect('courses.semester_id')
-            ->whereIn('semester_id', Session::get('semesters_ids'))
-            ->where('is_graduate', 0)
-            ->where('school_id', $school->id)
-            ->groupBy('id')
-            ->get();
+        
+//         $participating_undergrad_programs = DB::table('programs')
+//             ->join('courses', 'courses.program_id', '=', 'programs.id')
+//             ->select('programs.id', 'programs.name', 'programs.is_graduate', 'programs.school_id')
+//             ->addSelect('courses.semester_id')
+//             ->whereIn('semester_id', Session::get('semesters_ids'))
+//             ->where('is_graduate', 0)
+//             ->where('school_id', $school->id)
+//             ->groupBy('id')
+//             ->get();
 
         $output = array();
 
@@ -232,7 +463,8 @@ class SchoolCoordinatorsController extends \BaseController
             }))->where('is_graduate', 0)->where('school_id', $school->id)->orderBy('name', 'asc')->get();
 
             foreach ($programs_with_courses as $program) {
-                // To acummulate all criteria for one program
+              if(in_array($program->id,$participating_programs)){
+               // To acummulate all criteria for one program
                 $achieved_outcomes_per_undergrad_program = array_fill(1, $outcomeCount, 0);
                 $attempted_outcomes_per_undergrad_program = array_fill(1, $outcomeCount, 0);
 
@@ -268,6 +500,7 @@ class SchoolCoordinatorsController extends \BaseController
                     // $output[]= 'END OF PROGRAM: '.$program->name.'-'.json_encode($achievedProgramsPerOutcome);
                 }
             }
+            }
         }
 
         /**
@@ -281,15 +514,15 @@ class SchoolCoordinatorsController extends \BaseController
         $attemptedGradProgramsPerOutcome = array_fill(1, $outcomeCount, 0);
 
         // Fetch programs with participation for the school
-        $participating_grad_programs = DB::table('programs')
-            ->join('courses', 'courses.program_id', '=', 'programs.id')
-            ->select('programs.id', 'programs.name', 'programs.is_graduate', 'programs.school_id')
-            ->addSelect('courses.semester_id')
-            ->whereIn('semester_id', Session::get('semesters_ids'))
-            ->where('is_graduate', 1)
-            ->where('school_id', $school->id)
-            ->groupBy('id')
-            ->get();
+//         $participating_grad_programs = DB::table('programs')
+//             ->join('courses', 'courses.program_id', '=', 'programs.id')
+//             ->select('programs.id', 'programs.name', 'programs.is_graduate', 'programs.school_id')
+//             ->addSelect('courses.semester_id')
+//             ->whereIn('semester_id', Session::get('semesters_ids'))
+//             ->where('is_graduate', 1)
+//             ->where('school_id', $school->id)
+//             ->groupBy('id')
+//             ->get();
 
         $output = array();
 
@@ -310,6 +543,7 @@ class SchoolCoordinatorsController extends \BaseController
             }))->where('is_graduate', 1)->where('school_id', $school->id)->orderBy('name', 'asc')->get();
 
             foreach ($programs_with_courses as $program) {
+             if(in_array($program->id,$participating_programs)){
                 // To acummulate all criteria for one program
                 $achieved_outcomes_per_grad_program = array_fill(1, $outcomeCount, 0);
                 $attempted_outcomes_per_grad_program = array_fill(1, $outcomeCount, 0);
@@ -346,7 +580,10 @@ class SchoolCoordinatorsController extends \BaseController
                     // $output[]= 'END OF PROGRAM: '.$program->name.'-'.json_encode($achievedProgramsPerOutcome);
                 }
             }
+ }
         }
-        return View::make('local.managers.shared.school', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
+//         return View::make('local.managers.shared.school', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
+        return View::make('local.managers.shared.school', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
     }
+
 }

app/controllers/SchoolsController.php

@@ -7,11 +7,22 @@ class SchoolsController extends \BaseController
     {
         return DB::table('programs')
             ->join('courses', 'courses.program_id', '=', 'programs.id')
+            ->join('activities', 'activities.course_id', '=', 'courses.id')
+            ->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
+            ->join('assessments', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
             ->select('programs.id', 'programs.name', 'programs.is_graduate', 'programs.school_id')
             ->addSelect('courses.semester_id')
             ->where('school_id', $school->id)
             ->whereIn('semester_id', Session::get('semesters_ids'))
             ->lists('id');
+
+//         return DB::table('programs')
+//             ->join('courses', 'courses.program_id', '=', 'programs.id')
+//             ->select('programs.id', 'programs.name', 'programs.is_graduate', 'programs.school_id')
+//             ->addSelect('courses.semester_id')
+//             ->where('school_id', $school->id)
+//             ->whereIn('semester_id', Session::get('semesters_ids'))
+//             ->lists('id');
     }
 
     public function show($id)
@@ -22,8 +33,216 @@ class SchoolsController extends \BaseController
         $title = $school->name;
         $schools = School::all();
 
-        $outcomes = Outcome::orderBy('name', 'asc')->get();
-        $outcomeCount = Outcome::all()->count();
+        $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);
+
+        /**
+         * List of grouped courses (grouped sections)
+         */
+
+        $program_ids = $school->programs->lists('id');
+
+        $undergrad_programs = DB::table('programs')
+            ->select('id', 'name', 'school_id', 'is_graduate')
+            ->where('is_graduate', '=', 0)
+            ->where('school_id', '=', $id)
+            ->orderBy('name', 'ASC')
+            ->get();
+
+        $grad_programs = DB::table('programs')
+            ->select('id', 'name', 'school_id', 'is_graduate')
+            ->where('is_graduate', '=', 1)
+            ->where('school_id', '=', $id)
+            ->orderBy('name', 'ASC')
+            ->get();
+
+
+        $grad_grouped_courses = Course::
+            //             select(DB::raw('courses.name, courses.code, courses.number, max(courses.outcomes_attempted) as outcomes_attempted, courses.semester_id, courses.program_id'))
+            select(DB::raw('courses.name, courses.code, courses.number, courses.semester_id, courses.program_id'))
+            ->with('semester')
+            ->with('program')
+            ->whereIn('courses.program_id', $program_ids)
+            ->whereIn('courses.semester_id', Session::get('semesters_ids'))
+            ->leftJoin('programs', 'courses.program_id', '=', 'programs.id')
+            ->where('programs.is_graduate', '=', 1)
+            ->groupBy(array('courses.code', 'courses.number', 'courses.semester_id'))
+            ->orderBy('courses.code')
+            ->orderBy('courses.number')
+            ->orderBy('courses.semester_id')
+            ->get();
+
+        $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'))
+            ->with('semester')
+            ->with('program')
+            ->whereIn('courses.program_id', $program_ids)
+            ->whereIn('courses.semester_id', Session::get('semesters_ids'))
+            ->leftJoin('programs', 'courses.program_id', '=', 'programs.id')
+            ->where('programs.is_graduate', '=', 0)
+            ->groupBy(array('courses.code', 'courses.number', 'courses.semester_id'))
+            ->orderBy('courses.code')
+            ->orderBy('courses.number')
+            ->orderBy('courses.semester_id')
+            ->get();
+            
+		foreach($undergrad_grouped_courses as $key=>$courses)
+		{
+			$undergrad_grouped_courses[$key]->outcomes_attempted=NULL;	
+			$coursesT=Course::where('courses.code',$courses->code)->where('courses.number',$courses->number)->where('courses.semester_id',$courses->semester_id)->get();
+			foreach($coursesT as $course)
+    		{
+				if($course->isAssessed())
+				{
+					$undergrad_grouped_courses[$key]->outcomes_attempted=true;
+				}
+			}
+    	}
+
+		foreach($grad_grouped_courses as $key=>$courses)
+		{
+			$grad_grouped_courses[$key]->outcomes_attempted=NULL;	
+			$coursesT=Course::where('courses.code',$courses->code)->where('courses.number',$courses->number)->where('courses.semester_id',$courses->semester_id)->get();
+			foreach($coursesT as $course)
+    		{
+				if($course->isAssessed())
+				{
+					$grad_grouped_courses[$key]->outcomes_attempted=true;
+				}
+			}
+    	}
+
+        // Fetch programs with participation
+        $participating_programs = $this->participatingPrograms($school);
+
+        /**
+         * Calculate how many sections are doing assessment
+         */
+
+        $undergrad_assessed_sections_count = 0;
+        $undergrad_school_sections_count = 0;
+
+        $grad_assessed_sections_count = 0;
+        $grad_school_sections_count = 0;
+
+        foreach ($school->programs as $program) {
+            foreach ($program->courses as $course) {
+
+	            if (!$course->program->is_graduate){
+    	            $undergrad_school_sections_count += 1;
+    	        	if($course->isAssessed())$undergrad_assessed_sections_count += 1;
+    	        }
+        	    else {
+            	    $grad_school_sections_count += 1;
+            		if($course->isAssessed())$grad_assessed_sections_count += 1;
+           		}
+            }
+        }
+
+        /**
+         * Calculate how many programs achieved and attempted each outcome in this school
+         */
+
+        // For each outcome 
+        foreach ($outcomes_undergrad as $outcome) {
+//         	$attempted_outcomes_per_undergrad_program[$outcome->id]=0;
+//         	$achieved_outcomes_per_undergrad_program[$outcome->id]=0;
+        	$attemptedUndergradProgramsPerOutcome[$outcome->id]=0;
+        	$achievedUndergradProgramsPerOutcome[$outcome->id]=0;
+        	$programs_attempted_in_school[$outcome->id]=$outcome->programs_attempted_in_school($semesters, $school->id);
+//         	var_dump($programs_attempted_in_school);exit();
+        	foreach($programs_attempted_in_school[$outcome->id] as $program_id)
+        	{
+//         		var_dump($program_id->id);exit();
+				$program = DB::table('programs')->where('id', '=', $program_id->id)->first();
+
+        		if(!$program->is_graduate)
+        		{
+        			$attemptedUndergradProgramsPerOutcome[$outcome->id]++;
+        			$programC=Program::where('id', '=', $program_id->id)->first();
+//         			var_dump($programC);exit();
+					if($programC->achieved_outcome($outcome->id,$semesters))
+					{
+						$achievedUndergradProgramsPerOutcome[$outcome->id]++;
+					}
+        		}
+        	}
+ 			$undergrad_outcomes_attempted[$outcome->id]=$outcome->attempted_by_school($semesters, $school->id,0);
+ 			$undergrad_outcomes_achieved[$outcome->id]=$outcome->achieved_by_school($semesters, $school->id,0);
+ 			
+            // For each program with courses that do assessment
+            $programs_with_courses = Program::with(array('courses' => function ($query) {
+                //                 $query->whereNotNull('outcomes_attempted');
+                $query->whereIn('semester_id', Session::get('semesters_ids'));
+            }))->where('is_graduate', 0)->where('school_id', $school->id)->orderBy('name', 'asc')->get();
+
+        }
+
+        /**
+         * Calculate how many Graduate programs achieved and attempted each outcome in this school
+         */
+
+        // For each outcome 
+        foreach ($outcomes_grad as $outcome) {
+//         	$attempted_outcomes_per_grad_program[$outcome->id]=0;
+        	$achieved_outcomes_per_grad_program[$outcome->id]=0;
+        	$attemptedGradProgramsPerOutcome[$outcome->id]=0;
+        	$achievedGradProgramsPerOutcome[$outcome->id]=0;
+ 			$grad_outcomes_attempted[$outcome->id]=$outcome->attempted_by_school($semesters, $school->id,1);
+ 			$grad_outcomes_achieved[$outcome->id]=$outcome->achieved_by_school($semesters, $school->id,1);
+           // For each program with courses that do assessment
+        	foreach($programs_attempted_in_school[$outcome->id] as $program_id)
+        	{
+//         		var_dump($program_id->id);exit();
+				$program = DB::table('programs')
+                        ->where('id', '=', $program_id->id)
+                        ->first();
+//         		$program=Program::where('id', $program_id->id);
+//         		var_dump($program);exit();
+        		if($program->is_graduate)
+        		{
+        			$attemptedGradProgramsPerOutcome[$outcome->id]++;
+        			$programC=Program::where('id', '=', $program_id->id)->first();
+//         			var_dump($programC);exit();
+					if($programC->achieved_outcome($outcome->id,$semesters))
+					{
+						$achievedGradProgramsPerOutcome[$outcome->id]++;
+					}
+        		}
+        	}
+            $programs_with_courses = Program::with(array('courses' => function ($query) {
+                //                 $query->whereNotNull('outcomes_attempted');
+                $query->whereIn('semester_id', Session::get('semesters_ids'));
+            }))->where('is_graduate', 1)->where('school_id', $school->id)->orderBy('name', 'asc')->get();
+
+        }
+        if ($school->id == 13) {
+//             return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
+            return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
+        } 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', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
+        }
+    }
+
+    public function showQuasiOri($id)
+    {
+        ini_set('memory_limit', '256M');
+        DB::connection()->disableQueryLog();
+        $school = School::find($id);
+        $title = $school->name;
+        $schools = School::all();
+
+//         $outcomes = Outcome::orderBy('name', 'asc')->get();
+//         $outcomeCount = Outcome::all()->count();
+        $semesters = Semester::whereIn('id',Session::get('semesters_ids'))->get();
+// var_dump($semesters);
+// exit();
+        $outcomes_grad = Outcome::active_by_semesters($semesters, 1);
+        $outcomes_undergrad = Outcome::active_by_semesters($semesters, 0);
 
 
         /**
@@ -85,41 +304,57 @@ class SchoolsController extends \BaseController
          * Calculate how many sections are doing assessment
          */
 
-        $undergrad_outcomes_achieved = array_fill(1, $outcomeCount, 0);
-        $undergrad_outcomes_attempted = array_fill(1, $outcomeCount, 0);
+//         $undergrad_outcomes_achieved = array_fill(1, $outcomeCount, 0);
+//         $undergrad_outcomes_attempted = array_fill(1, $outcomeCount, 0);
         $undergrad_assessed_sections_count = 0;
         $undergrad_school_sections_count = 0;
 
-        $grad_outcomes_achieved = array_fill(1, $outcomeCount, 0);
-        $grad_outcomes_attempted = array_fill(1, $outcomeCount, 0);
+//         $grad_outcomes_achieved = array_fill(1, $outcomeCount, 0);
+//         $grad_outcomes_attempted = array_fill(1, $outcomeCount, 0);
         $grad_assessed_sections_count = 0;
         $grad_school_sections_count = 0;
 
         foreach ($school->programs as $program) {
             foreach ($program->courses as $course) {
-                if (!$course->program->is_graduate) {
-                    if ($course->outcomes_achieved != NULL) {
-                        $course_outcomes_achieved = json_decode($course->outcomes_achieved, true);
-                        $course_outcomes_attempted = json_decode($course->outcomes_attempted, true);
-                        for ($i = 1; $i <= count($undergrad_outcomes_attempted); $i++) {
-                            $undergrad_outcomes_achieved[$i] += $course_outcomes_achieved[$i];
-                            $undergrad_outcomes_attempted[$i] += $course_outcomes_attempted[$i];
-                        }
-                        $undergrad_assessed_sections_count += 1;
-                    }
-                    $undergrad_school_sections_count += 1;
-                } else {
-                    if ($course->outcomes_achieved != NULL) {
-                        $course_outcomes_achieved = json_decode($course->outcomes_achieved, true);
-                        $course_outcomes_attempted = json_decode($course->outcomes_attempted, true);
-                        for ($i = 1; $i <= count($grad_outcomes_attempted); $i++) {
-                            $grad_outcomes_achieved[$i] += $course_outcomes_achieved[$i];
-                            $grad_outcomes_attempted[$i] += $course_outcomes_attempted[$i];
-                        }
-                        $grad_assessed_sections_count += 1;
-                    }
-                    $grad_school_sections_count += 1;
-                }
+//             	            Log::info("aqui".$course);
+
+            if (!$course->program->is_graduate){
+                $undergrad_school_sections_count += 1;
+            	if($course->isAssessed())$undergrad_assessed_sections_count += 1;
+//             	            Log::info("aqui".$course);
+
+            }
+            else {
+                $grad_school_sections_count += 1;
+            	if($course->isAssessed())$grad_assessed_sections_count += 1;
+//             	            	            Log::info("aqui".$course);
+
+            }
+
+//                 if (!$course->program->is_graduate) {
+//                     if ($course->outcomes_achieved != NULL) {
+//                         $course_outcomes_achieved = json_decode($course->outcomes_achieved, true);
+//                         $course_outcomes_attempted = json_decode($course->outcomes_attempted, true);
+//                         for ($i = 1; $i <= count($undergrad_outcomes_attempted); $i++) {
+//                             $undergrad_outcomes_achieved[$i] += $course_outcomes_achieved[$i];
+//                             $undergrad_outcomes_attempted[$i] += $course_outcomes_attempted[$i];
+//                         }
+//                         $undergrad_assessed_sections_count += 1;
+//                     }
+//                     $undergrad_school_sections_count += 1;
+//                 } else {
+//                     if ($course->outcomes_achieved != NULL) {
+//                         $course_outcomes_achieved = json_decode($course->outcomes_achieved, true);
+//                         $course_outcomes_attempted = json_decode($course->outcomes_attempted, true);
+//                         for ($i = 1; $i <= count($grad_outcomes_attempted); $i++) {
+//                             $grad_outcomes_achieved[$i] += $course_outcomes_achieved[$i];
+//                             $grad_outcomes_attempted[$i] += $course_outcomes_attempted[$i];
+//                         }
+//                         $grad_assessed_sections_count += 1;
+//                     }
+//                     $grad_school_sections_count += 1;
+//                 }
+                
             }
         }
 
@@ -128,27 +363,50 @@ class SchoolsController extends \BaseController
          */
 
         // Number of programs that achieved a particular learning outcome
-        $achievedUndergradProgramsPerOutcome = array_fill(1, $outcomeCount, 0);
+//         $achievedUndergradProgramsPerOutcome = array_fill(1, $outcomeCount, 0);
 
         // Number of programs that attempted a particular learning outcome
-        $attemptedUndergradProgramsPerOutcome = array_fill(1, $outcomeCount, 0);
+//         $attemptedUndergradProgramsPerOutcome = array_fill(1, $outcomeCount, 0);
 
         // Fetch programs with participation for the school
-        $participating_undergrad_programs = DB::table('programs')
-            ->join('courses', 'courses.program_id', '=', 'programs.id')
-            ->select('programs.id', 'programs.name', 'programs.is_graduate', 'programs.school_id')
-            ->addSelect('courses.semester_id')
-            ->whereIn('semester_id', Session::get('semesters_ids'))
-            ->where('is_graduate', 0)
-            ->where('school_id', $school->id)
-            ->groupBy('id')
-            ->get();
+//         $participating_undergrad_programs = DB::table('programs')
+//             ->join('courses', 'courses.program_id', '=', 'programs.id')
+//             ->select('programs.id', 'programs.name', 'programs.is_graduate', 'programs.school_id')
+//             ->addSelect('courses.semester_id')
+//             ->whereIn('semester_id', Session::get('semesters_ids'))
+//             ->where('is_graduate', 0)
+//             ->where('school_id', $school->id)
+//             ->groupBy('id')
+//             ->get();
 
         $output = array();
 
 
         // For each outcome 
-        foreach ($outcomes as $outcome) {
+        foreach ($outcomes_undergrad as $outcome) {
+//         	$attempted_outcomes_per_undergrad_program[$outcome->id]=0;
+        	$achieved_outcomes_per_undergrad_program[$outcome->id]=0;
+        	$attemptedUndergradProgramsPerOutcome[$outcome->id]=0;
+        	$achievedUndergradProgramsPerOutcome[$outcome->id]=0;
+        	$programs_attempted_in_school[$outcome->id]=$outcome->programs_attempted_in_school($semesters, $school->id);
+//         	var_dump($programs_attempted_in_school);exit();
+        	foreach($programs_attempted_in_school[$outcome->id] as $program_id)
+        	{
+//         		var_dump($program_id->id);exit();
+				$program = DB::table('programs')
+                        ->where('id', '=', $program_id->id)
+                        ->first();
+//         		$program=Program::where('id', $program_id->id);
+//         		var_dump($program);exit();
+        		if(!$program->is_graduate)
+        		{
+        			$attemptedUndergradProgramsPerOutcome[$outcome->id]++;
+        			
+        		}
+        	}
+ 			$undergrad_outcomes_attempted[$outcome->id]=$outcome->attempted_by_school($semesters, $school->id,0);
+ 			$undergrad_outcomes_achieved[$outcome->id]=$outcome->achieved_by_school($semesters, $school->id,0);
+ 			
             // For each program with courses that do assessment
             $programs_with_courses = Program::with(array('courses' => function ($query) {
                 //                 $query->whereNotNull('outcomes_attempted');
@@ -156,43 +414,46 @@ class SchoolsController extends \BaseController
             }))->where('is_graduate', 0)->where('school_id', $school->id)->orderBy('name', 'asc')->get();
 
             foreach ($programs_with_courses as $program) {
+            if(in_array($program->id,$participating_programs)){
                 // To acummulate all criteria for one program
-                $achieved_outcomes_per_undergrad_program = array_fill(1, $outcomeCount, 0);
-                $attempted_outcomes_per_undergrad_program = array_fill(1, $outcomeCount, 0);
+//                 $achieved_outcomes_per_undergrad_program = array_fill(1, $outcomeCount, 0);
+//                 $attempted_outcomes_per_undergrad_program = array_fill(1, $outcomeCount, 0);
 
                 //Flag for counting programs
                 $flag = false;
 
                 // For each course in the program
-                foreach ($program->courses as $course) {
-                    // If the outcome in question is being evaluated
-                    $course_outcomes_attempted2 = $course->outcomes_att();
-                    //                     $course_outcomes_attempted2 = json_decode($course->outcomes_attempted, true);
-                    //                     $course_outcomes_achieved2 = json_decode($course->outcomes_achieved, true);
-                    $course_outcomes_achieved2 = $course->outcomes_ach();
-                    if (
-                        array_key_exists($outcome->id, $course_outcomes_attempted2) && array_key_exists($outcome->id, $course_outcomes_achieved2)
-                        && $course_outcomes_attempted2[$outcome->id] > 0
-                    ) {
-                        $achieved_outcomes_per_undergrad_program[$outcome->id] += $course_outcomes_achieved2[$outcome->id];
-                        $attempted_outcomes_per_undergrad_program[$outcome->id] += $course_outcomes_attempted2[$outcome->id];
-
-                        // Add one to the programs assessing, if it wasn't added before
-                        if (!$flag) {
-                            $attemptedUndergradProgramsPerOutcome[$outcome->id] += 1;
-                            $flag = true;
-                        }
-                    }
-
-                    // $output[] = 'ACHIEVED: '.$program->name.'-'.json_encode($achieved_outcomes_per_undergrad_program);
-                    // $output[] = 'ATTEMPTED: '.$program->name.'-'.json_encode($attempted_outcomes_per_program);
-
-                }
+ //                foreach ($program->courses as $course) {
+//                 if($course->isAssessed()){
+//                     // If the outcome in question is being evaluated
+//                     $course_outcomes_attempted2 = $course->outcomes_att();
+//                     //                     $course_outcomes_attempted2 = json_decode($course->outcomes_attempted, true);
+//                     //                     $course_outcomes_achieved2 = json_decode($course->outcomes_achieved, true);
+//                     $course_outcomes_achieved2 = $course->outcomes_ach();
+//                     if (
+//                         array_key_exists($outcome->id, $course_outcomes_attempted2) && array_key_exists($outcome->id, $course_outcomes_achieved2)
+//                         && $course_outcomes_attempted2[$outcome->id] > 0
+//                     ) {
+//                         $achieved_outcomes_per_undergrad_program[$outcome->id] += $course_outcomes_achieved2[$outcome->id];
+// //                         $attempted_outcomes_per_undergrad_program[$outcome->id] += $course_outcomes_attempted2[$outcome->id];
+// 
+//                         // Add one to the programs assessing, if it wasn't added before
+//                         if (!$flag) {
+//                             $attemptedUndergradProgramsPerOutcome[$outcome->id] += 1;
+//                             $flag = true;
+//                         }
+//                     }
+// 
+//                     // $output[] = 'ACHIEVED: '.$program->name.'-'.json_encode($achieved_outcomes_per_undergrad_program);
+//                     // $output[] = 'ATTEMPTED: '.$program->name.'-'.json_encode($attempted_outcomes_per_program);
+// 				}
+//                 }
                 //If the accumulated achieved criteria for a specific outcome in a program divided by the accumulated attempted criteria for a specific outcome in a program is greated than the expected outcome
-                if ($attempted_outcomes_per_undergrad_program[$outcome->id] != 0 && (float)$achieved_outcomes_per_undergrad_program[$outcome->id] / $attempted_outcomes_per_undergrad_program[$outcome->id] * 100 >= $outcome->expected_outcome) {
-                    $achievedUndergradProgramsPerOutcome[$outcome->id] += 1;
-                    // $output[]= 'END OF PROGRAM: '.$program->name.'-'.json_encode($achievedProgramsPerOutcome);
-                }
+//                 if ($attempted_outcomes_per_undergrad_program[$outcome->id] != 0 && (float)$achieved_outcomes_per_undergrad_program[$outcome->id] / $attempted_outcomes_per_undergrad_program[$outcome->id] * 100 >= $outcome->expected_outcome) {
+//                     $achievedUndergradProgramsPerOutcome[$outcome->id] += 1;
+//                     // $output[]= 'END OF PROGRAM: '.$program->name.'-'.json_encode($achievedProgramsPerOutcome);
+//                 }
+            }
             }
         }
 
@@ -201,43 +462,65 @@ class SchoolsController extends \BaseController
          */
 
         // Number of programs that achieved a particular learning outcome
-        $achievedGradProgramsPerOutcome = array_fill(1, $outcomeCount, 0);
+//         $achievedGradProgramsPerOutcome = array_fill(1, $outcomeCount, 0);
 
         // Number of programs that attempted a particular learning outcome
-        $attemptedGradProgramsPerOutcome = array_fill(1, $outcomeCount, 0);
-
+//         $attemptedGradProgramsPerOutcome = array_fill(1, $outcomeCount, 0);
+// 
         // Fetch programs with participation for the school
-        $participating_grad_programs = DB::table('programs')
-            ->join('courses', 'courses.program_id', '=', 'programs.id')
-            ->select('programs.id', 'programs.name', 'programs.is_graduate', 'programs.school_id')
-            ->addSelect('courses.semester_id')
-            ->whereIn('semester_id', Session::get('semesters_ids'))
-            ->where('is_graduate', 1)
-            ->where('school_id', $school->id)
-            ->groupBy('id')
-            ->get();
+//         $participating_grad_programs = DB::table('programs')
+//             ->join('courses', 'courses.program_id', '=', 'programs.id')
+//             ->select('programs.id', 'programs.name', 'programs.is_graduate', 'programs.school_id')
+//             ->addSelect('courses.semester_id')
+//             ->whereIn('semester_id', Session::get('semesters_ids'))
+//             ->where('is_graduate', 1)
+//             ->where('school_id', $school->id)
+//             ->groupBy('id')
+//             ->get();
 
         $output = array();
 
 
         // For each outcome 
-        foreach ($outcomes as $outcome) {
-            // For each program with courses that do assessment
+        foreach ($outcomes_grad as $outcome) {
+//         	$attempted_outcomes_per_grad_program[$outcome->id]=0;
+        	$achieved_outcomes_per_grad_program[$outcome->id]=0;
+        	$attemptedGradProgramsPerOutcome[$outcome->id]=0;
+        	$achievedGradProgramsPerOutcome[$outcome->id]=0;
+ 			$grad_outcomes_attempted[$outcome->id]=$outcome->attempted_by_school($semesters, $school->id,1);
+ 			$grad_outcomes_achieved[$outcome->id]=$outcome->achieved_by_school($semesters, $school->id,1);
+           // For each program with courses that do assessment
+        	foreach($programs_attempted_in_school[$outcome->id] as $program_id)
+        	{
+//         		var_dump($program_id->id);exit();
+				$program = DB::table('programs')
+                        ->where('id', '=', $program_id->id)
+                        ->first();
+//         		$program=Program::where('id', $program_id->id);
+//         		var_dump($program);exit();
+        		if($program->is_graduate)
+        		{
+        			$attemptedGradProgramsPerOutcome[$outcome->id]++;
+        			
+        		}
+        	}
             $programs_with_courses = Program::with(array('courses' => function ($query) {
                 //                 $query->whereNotNull('outcomes_attempted');
                 $query->whereIn('semester_id', Session::get('semesters_ids'));
             }))->where('is_graduate', 1)->where('school_id', $school->id)->orderBy('name', 'asc')->get();
 
             foreach ($programs_with_courses as $program) {
-                // To acummulate all criteria for one program
-                $achieved_outcomes_per_grad_program = array_fill(1, $outcomeCount, 0);
-                $attempted_outcomes_per_grad_program = array_fill(1, $outcomeCount, 0);
+             if(in_array($program->id,$participating_programs)){
+               // To acummulate all criteria for one program
+//                 $achieved_outcomes_per_grad_program = array_fill(1, $outcomeCount, 0);
+//                 $attempted_outcomes_per_grad_program = array_fill(1, $outcomeCount, 0);
 
                 //Flag for counting programs
                 $flag = false;
 
                 // For each course in the program
                 foreach ($program->courses as $course) {
+                if($course->isAssessed()){
                     // If the outcome in question is being evaluated
                     //                     $course_outcomes_attempted2 = json_decode($course->outcomes_attempted, true);
                     $course_outcomes_attempted2 = ($course->outcomes_att());
@@ -259,19 +542,22 @@ class SchoolsController extends \BaseController
 
                     // $output[] = 'ACHIEVED: '.$program->name.'-'.json_encode($achieved_outcomes_per_grad_program);
                     // $output[] = 'ATTEMPTED: '.$program->name.'-'.json_encode($attempted_outcomes_per_program);
-
+			}
                 }
                 //If the accumulated achieved criteria for a specific outcome in a program divided by the accumulated attempted criteria for a specific outcome in a program is greated than the expected outcome
                 if ($attempted_outcomes_per_grad_program[$outcome->id] != 0 && (float)$achieved_outcomes_per_grad_program[$outcome->id] / $attempted_outcomes_per_grad_program[$outcome->id] * 100 >= $outcome->expected_outcome) {
                     $achievedGradProgramsPerOutcome[$outcome->id] += 1;
                     // $output[]= 'END OF PROGRAM: '.$program->name.'-'.json_encode($achievedProgramsPerOutcome);
                 }
+           }
             }
         }
         if ($school->id == 13) {
-            return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
+//             return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
+            return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
         } 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', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
+            return View::make('local.managers.shared.school', compact('title', 'outcomes_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

@@ -361,6 +361,18 @@ class Course extends Eloquent
     return $all_sections;
   }
 
+    public function isAssessed()
+    {
+         $assessed = DB::table('assessments')
+            ->join('activity_criterion', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
+            ->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+             ->where('activities.course_id', $this->id)
+            ->count();
+//             Log::info("aqui".$assessed);
+
+   		if($assessed)return true;
+   		else return false;
+    }
 
 
   public function outcomes_achieved()

app/models/Outcome.php

@@ -154,6 +154,40 @@ class Outcome extends Eloquent
 		return $programs;
 	}
 
+	public function programs_attempted_in_school($semesters, $school_id)
+	{
+		$semesters_array = [];
+		foreach ($semesters as $semester) {
+			$semesters_array[] = $semester->id;
+		}
+		// 		 $programs=DB::table('programs')
+		// 	    	->join('courses', 'programs.id', '=', 'courses.program_id')
+		// 	    	->join('activities', 'activities.course_id', '=', 'courses.id')
+		// 	    	->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
+		// 	    	->join('new_criteria', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
+		// 	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
+		// 	    	->where('criterion_objective_outcome.outcome_id','=',$this->id)
+		// 	    	->whereIn('courses.semester_id',$semesters_array)
+		// 	    	->distinct()
+		// 	    	->select('programs.id')
+		// 	    	->get()
+		// 			;
+		$programs = DB::table('programs')
+			->join('courses', 'programs.id', '=', 'courses.program_id')
+			->join('activities', 'activities.course_id', '=', 'courses.id')
+			->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
+			->join('criteria', 'activity_criterion.criterion_id', '=', 'criteria.id')
+			->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
+			->where('criterion_objective_outcome.outcome_id', '=', $this->id)
+			->where('programs.school_id', '=', $school_id)
+			->whereIn('courses.semester_id', $semesters_array)
+			->distinct()
+			->select('programs.id')
+			->get();
+
+		return $programs;
+	}
+
 	public function attempted($semesters, $is_grad)
 	{
 		$semesters_array = [];
@@ -187,6 +221,101 @@ class Outcome extends Eloquent
 			->select('criteria.id', 'expected_percentage', 'activity_criterion.activity_id')
 			->distinct()
 			->get();
+			
+		$conteo = 0;
+		foreach ($criteria as $criterion) {
+			$students_attempted = Criterion::students_attempted($criterion->id, $criterion->activity_id);
+			if ($students_attempted) {
+				$conteo++;
+			}
+		}
+		// 		var_dump($conteo);
+		// 		exit();
+		return $conteo;
+	}
+
+	public function attempted_by_school($semesters, $school_id, $is_grad)
+	{
+		$semesters_array = [];
+		foreach ($semesters as $semester) {
+			$semesters_array[] = $semester->id;
+		}
+		// 		 $criteria=DB::table('new_criteria')
+		// 	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
+		// 	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+		// 	    	->join('courses', 'activities.course_id', '=', 'courses.id')
+		// 	    	->join('programs', 'programs.id', '=', 'courses.program_id')
+		// 	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
+		// 	    	->where('criterion_objective_outcome.outcome_id','=',$this->id)
+		// 	    	->where('programs.is_graduate','=',$is_grad)
+		// 	    	->whereIn('courses.semester_id',$semesters_array)
+		// 	    	->select('new_criteria.id','expected_percentage_students_achieving','activity_criterion.activity_id')
+		// 	    	->distinct()
+		// 	    	->get()
+		// 			;
+		$criteria = DB::table('criteria')
+			->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'criteria.id')
+			->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+			->join('courses', 'activities.course_id', '=', 'courses.id')
+			->join('programs', 'programs.id', '=', 'courses.program_id')
+			->join('rubric_activity', 'activities.id', '=', 'rubric_activity.activity_id')
+			->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
+			->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
+			->where('criterion_objective_outcome.outcome_id', '=', $this->id)
+			->where('programs.is_graduate', '=', $is_grad)
+			->where('programs.school_id', '=', $school_id)
+			->whereIn('courses.semester_id', $semesters_array)
+			->select('criteria.id', 'expected_percentage', 'activity_criterion.activity_id')
+			->distinct()
+			->get();
+			
+		$conteo = 0;
+		foreach ($criteria as $criterion) {
+			$students_attempted = Criterion::students_attempted($criterion->id, $criterion->activity_id);
+			if ($students_attempted) {
+				$conteo++;
+			}
+		}
+		// 		var_dump($conteo);
+		// 		exit();
+		return $conteo;
+	}
+
+	public function attempted_by_program($semesters, $program_id, $is_grad)
+	{
+		$semesters_array = [];
+		foreach ($semesters as $semester) {
+			$semesters_array[] = $semester->id;
+		}
+		// 		 $criteria=DB::table('new_criteria')
+		// 	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
+		// 	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+		// 	    	->join('courses', 'activities.course_id', '=', 'courses.id')
+		// 	    	->join('programs', 'programs.id', '=', 'courses.program_id')
+		// 	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
+		// 	    	->where('criterion_objective_outcome.outcome_id','=',$this->id)
+		// 	    	->where('programs.is_graduate','=',$is_grad)
+		// 	    	->whereIn('courses.semester_id',$semesters_array)
+		// 	    	->select('new_criteria.id','expected_percentage_students_achieving','activity_criterion.activity_id')
+		// 	    	->distinct()
+		// 	    	->get()
+		// 			;
+		$criteria = DB::table('criteria')
+			->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'criteria.id')
+			->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+			->join('courses', 'activities.course_id', '=', 'courses.id')
+			->join('programs', 'programs.id', '=', 'courses.program_id')
+			->join('rubric_activity', 'activities.id', '=', 'rubric_activity.activity_id')
+			->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
+			->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
+			->where('criterion_objective_outcome.outcome_id', '=', $this->id)
+			->where('programs.is_graduate', '=', $is_grad)
+			->where('programs.id', '=', $program_id)
+			->whereIn('courses.semester_id', $semesters_array)
+			->select('criteria.id', 'expected_percentage', 'activity_criterion.activity_id')
+			->distinct()
+			->get();
+			
 		$conteo = 0;
 		foreach ($criteria as $criterion) {
 			$students_attempted = Criterion::students_attempted($criterion->id, $criterion->activity_id);
@@ -348,6 +477,115 @@ class Outcome extends Eloquent
 		return $conteo;
 	}
 
+	public function achieved_by_school($semesters, $school_id, $is_grad)
+	{
+		$semesters_array = [];
+		foreach ($semesters as $semester) {
+			$semesters_array[] = $semester->id;
+		}
+
+		//   DB::enableQueryLog();
+		// 		 $criteria=DB::table('new_criteria')
+		// 	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
+		// 	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+		// 	    	->join('courses', 'activities.course_id', '=', 'courses.id')
+		// 	    	->join('programs', 'programs.id', '=', 'courses.program_id')
+		// 	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
+		// 	    	->where('criterion_objective_outcome.outcome_id','=',$this->id)
+		// 	    	->where('programs.is_graduate','=',$is_grad)
+		// 	    	->whereIn('courses.semester_id',$semesters_array)
+		// 	    	->select('new_criteria.id','expected_percentage_students_achieving','activity_criterion.activity_id')
+		// 	    	->distinct()
+		// 	    	->get()
+		// 			;
+		$criteria = DB::table('criteria')
+			->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'criteria.id')
+			->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+			->join('courses', 'activities.course_id', '=', 'courses.id')
+			->join('programs', 'programs.id', '=', 'courses.program_id')
+			->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
+			->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
+			->join('rubrics', 'rubric_activity.rubric_id', '=', 'rubrics.id')
+			->where('criterion_objective_outcome.outcome_id', '=', $this->id)
+			->where('programs.is_graduate', '=', $is_grad)
+			->where('programs.school_id', '=', $school_id)
+			->whereIn('courses.semester_id', $semesters_array)
+			->select('criteria.id', 'expected_percentage', 'activity_criterion.activity_id')
+			->distinct()
+			->get();
+		// 		dd(DB::getQueryLog());
+
+		$conteo = 0;
+		foreach ($criteria as $criterion) {
+			$students_attempted = Criterion::students_attempted($criterion->id, $criterion->activity_id);
+			$students_achieved = Criterion::students_achieved($criterion->id, $criterion->activity_id);
+
+			if ($students_attempted) {
+				$percentage_students_who_achieved = 100.0 * $students_achieved / $students_attempted;
+			} else {
+				$percentage_students_who_achieved = 0;
+			}
+			if ($percentage_students_who_achieved >= $criterion->expected_percentage) {
+				$conteo++;
+			}
+		}
+		return $conteo;
+	}
+
+	public function achieved_by_program($semesters, $program_id, $is_grad)
+	{
+		$semesters_array = [];
+		foreach ($semesters as $semester) {
+			$semesters_array[] = $semester->id;
+		}
+
+		//   DB::enableQueryLog();
+		// 		 $criteria=DB::table('new_criteria')
+		// 	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
+		// 	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+		// 	    	->join('courses', 'activities.course_id', '=', 'courses.id')
+		// 	    	->join('programs', 'programs.id', '=', 'courses.program_id')
+		// 	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
+		// 	    	->where('criterion_objective_outcome.outcome_id','=',$this->id)
+		// 	    	->where('programs.is_graduate','=',$is_grad)
+		// 	    	->whereIn('courses.semester_id',$semesters_array)
+		// 	    	->select('new_criteria.id','expected_percentage_students_achieving','activity_criterion.activity_id')
+		// 	    	->distinct()
+		// 	    	->get()
+		// 			;
+		$criteria = DB::table('criteria')
+			->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'criteria.id')
+			->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+			->join('courses', 'activities.course_id', '=', 'courses.id')
+			->join('programs', 'programs.id', '=', 'courses.program_id')
+			->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
+			->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
+			->join('rubrics', 'rubric_activity.rubric_id', '=', 'rubrics.id')
+			->where('criterion_objective_outcome.outcome_id', '=', $this->id)
+			->where('programs.is_graduate', '=', $is_grad)
+			->where('programs.school_.semester_id', $semesters_array)
+			->select('criteria.id', 'expected_percentage', 'activity_criterion.activity_id')
+			->distinct()
+			->get();
+		// 		dd(DB::getQueryLog());
+
+		$conteo = 0;
+		foreach ($criteria as $criterion) {
+			$students_attempted = Criterion::students_attempted($criterion->id, $criterion->activity_id);
+			$students_achieved = Criterion::students_achieved($criterion->id, $criterion->activity_id);
+
+			if ($students_attempted) {
+				$percentage_students_who_achieved = 100.0 * $students_achieved / $students_attempted;
+			} else {
+				$percentage_students_who_achieved = 0;
+			}
+			if ($percentage_students_who_achieved >= $criterion->expected_percentage) {
+				$conteo++;
+			}
+		}
+		return $conteo;
+	}
+
 
 	// 	public function achieved($semester, $is_grad)
 	// 	{

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

@@ -577,7 +577,8 @@ $('.go-to-temp').on('click', function(){
             var area = $('.courses-section-0').clone(true);
             area.attr('class','');
 
-            var title = 'Outcome: ' + outcome_name;
+            var title = outcome_name;
+<!--             var title = 'Outcome: ' + outcome_name; -->
             var title_area = $('.title-course-selection-0').clone(true);
             title_area.attr('class','title-course-selection h3');
             title_area.find('p').html(title);
@@ -704,7 +705,8 @@ $('.go-to-temp').on('click', function(){
             var area = $('.courses-section-0').clone(true);
             area.attr('class','');
 
-            var title = 'Outcome: ' + outcome_name;
+<!--             var title = 'Outcome: ' + outcome_name; -->
+            var title = outcome_name;
             var title_area = $('.title-course-selection-0').clone(true);
             title_area.attr('class','title-course-selection h3');
             title_area.find('p').html(title);

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

@@ -61,7 +61,7 @@
                     <li>{{ HTML::linkAction('OutcomesController@totalAssessmentReport', 'Total Assessment Reports') }}
                     </li>
                     @if (count(Auth::user()->courses))
-                        <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReports', 'My Courses\' Reports') }}
+                        <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReport', 'My Courses\' Reports') }}
                         </li>
 
                     @endif

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

@@ -178,7 +178,7 @@ Log::info($activity->rubric[0]);
                                                             @endif
                                                         </p>
 
-                                                        <h5><strong>Transforming Actions</strong></h5>
+                                                        <h5><strong>Transformative Actions</strong></h5>
                                                         @if($activity->transforming_actions)
                                                             {{ $activity->transforming_actions }}
                                                         @else

app/views/local/managers/admins/new-activity-create.blade.php

@@ -104,7 +104,7 @@
                         <button type="button" data-toggle="modal" data-target="#newRubricModal" class="btn btn-sm btn-default">New Instrument</button>
                     </div>
                     <div class="form-group">
-                        {{ Form::label('transforming_action', 'Transforming Actions') }}
+                        {{ Form::label('transforming_action', 'Transformative Actions') }}
                         <select id="transforming_action" name="transforming_action[]" class="form-control" multiple>
                             @foreach ($transforming_actions as $transforming_action)
 {{--                                @if(Input::old('transforming_action')!=$transforming_action->id)--}}

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

@@ -1,4 +1,4 @@
-@extends('layouts.master')
+@extends('layouts.master_sin_semesterbar')
 
 @section('navigation')
 @include('local.managers.admins._navigation')

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

@@ -136,7 +136,7 @@
                                                         @endif
                                                         </p>
 
-                                                        <h5><strong>Transforming Actions</strong></h5>
+                                                        <h5><strong>Transformative Actions</strong></h5>
                                                         @if($activity->transforming_actions)
                                                             {{ $activity->transforming_actions }}
                                                         @else

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

@@ -170,7 +170,7 @@
                                                                 @endif
                                                             </p>
 
-                                                            <h5><strong>Transforming Actions</strong></h5>
+                                                            <h5><strong>Transformative Actions</strong></h5>
                                                             @if ($activity->transforming_actions)
                                                                 {{ $activity->transforming_actions }}
                                                             @else

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

@@ -119,7 +119,7 @@
                                                 @endif
                                                 </p>
 
-                                                <h5>Transforming Actions</h5>
+                                                <h5>Transformative Actions</h5>
                                                 @if($activity->transforming_actions)
                                                     {{ $activity->transforming_actions }}
                                                 @else

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

@@ -55,13 +55,13 @@
         </table>
     </div>
     <div class="col-md-7">
-        <h3>Transforming Action Overview</h3>
+        <h3>Transformative Action Overview</h3>
         <table class="table table-striped table-condensed">
             <thead>
                 <tr>
                     <th>Activity</th>
                     <th>Section</th>
-                    <th>Transforming Action</th>
+                    <th>Transformative Action</th>
                     <th>Comments</th>
                 </tr>
             </thead>

app/views/local/managers/shared/limited-course.blade.php

@@ -85,7 +85,7 @@
                             <th>Name</th>
                             <th>Date</th>
                             <th>Rubric</th>
-                            <th>Transforming Action</th>
+                            <th>Transformative Action</th>
                         </tr>
                     </thead>
                     <tbody>

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

@@ -49,13 +49,13 @@
     </tbody>
 </table>
 
-<h3>Transforming Action Overview</h3>
+<h3>Transformative Action Overview</h3>
 <table>
     <thead>
         <tr>
             <th class="col-md-3">Activity</th>
             <th class="col-md-1">Section</th>
-            <th class="col-md-8">Transforming Action</th>
+            <th class="col-md-8">Transformative Action</th>
         </tr>
     </thead>
     <tbody>

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

@@ -75,7 +75,7 @@
                                     <th>Success Rate</th>
                                 </thead>
                                 <tbody>
-                                    @foreach($outcomes as $outcome)
+                                    @foreach($outcomes_undergrad as $outcome)
                                         <tr>
                                             <td class="col-md-6">{{ link_to_action('OutcomesController@show', $outcome->name, array($outcome->id), $attributes = array()) }}</td>
                                             <td class="col-md-2">{{{ $attemptedUndergradProgramsPerOutcome[$outcome->id] }}}</td>
@@ -180,6 +180,7 @@
                                     <tbody>
                                         @foreach($school->programs as $program)
                                             @foreach($program->courses as $course)
+                                            	@if(!$course->program->is_graduate)
                                             <tr>
                                                 <td class="col-md-2">{{ HTML::linkAction('CoursesController@showLimited', $course->code.$course->number.'-'.$course->section.' ('.$course->semester->code.')', array('id'=>$course->id)) }}</td>
                                                 <td class="col-md-3">{{{ $course->name}}}</td>
@@ -200,6 +201,7 @@
                                                     @endif
                                                 </td>
                                             </tr>
+                                            @endif
                                             @endforeach
                                         @endforeach
                                     </tbody>
@@ -268,7 +270,7 @@
                                     <th>Success Rate</th>
                                 </thead>
                                 <tbody>
-                                    @foreach($outcomes as $outcome)
+                                    @foreach($outcomes_grad as $outcome)
                                         <tr>
                                             <td class="col-md-6">{{ link_to_action('OutcomesController@show', $outcome->name, array($outcome->id), $attributes = array()) }}</td>
                                             <td class="col-md-2">{{{ $attemptedGradProgramsPerOutcome[$outcome->id] }}}</td>
@@ -373,6 +375,7 @@
                                     <tbody>
                                         @foreach($school->programs as $program)
                                             @foreach($program->courses as $course)
+                                            	@if($course->program->is_graduate)
                                             <tr>
                                                 <td class="col-md-2">{{ HTML::linkAction('CoursesController@showLimited', $course->code.$course->number.'-'.$course->section.' ('.$course->semester->code.')', array('id'=>$course->id)) }}</td>
                                                 <td class="col-md-3">{{{ $course->name}}}</td>
@@ -393,6 +396,7 @@
                                                     @endif
                                                 </td>
                                             </tr>
+                                            @endif
                                             @endforeach
                                         @endforeach
                                     </tbody>
@@ -451,7 +455,7 @@ $(function () {
             },
             xAxis: {
                 categories: [
-                    @foreach($outcomes as $outcome)
+                    @foreach($outcomes_undergrad as $outcome)
                         "{{{ $outcome->name }}}",
                     @endforeach
                 ],
@@ -507,7 +511,7 @@ $(function () {
                     y:-1
                 },
                 data: [
-                    @foreach($outcomes as $index => $outcome)
+                    @foreach($outcomes_undergrad as $index => $outcome)
                         @if(
                             is_array($undergrad_outcomes_attempted)
                             && array_key_exists($outcome->id, $undergrad_outcomes_attempted)
@@ -534,7 +538,7 @@ $(function () {
                     y:-1
                 },
                 data:[
-                    @foreach($outcomes as $index => $outcome)
+                    @foreach($outcomes_undergrad as $index => $outcome)
                         @if(
                             is_array($undergrad_outcomes_attempted)
                             && array_key_exists($outcome->id, $undergrad_outcomes_attempted)
@@ -561,7 +565,7 @@ $(function () {
             },
             xAxis: {
                 categories: [
-                    @foreach($outcomes as $outcome)
+                    @foreach($outcomes_grad as $outcome)
                         "{{{ $outcome->name }}}",
                     @endforeach
                 ],
@@ -617,7 +621,7 @@ $(function () {
                     y:-1
                 },
                 data: [
-                    @foreach($outcomes as $index => $outcome)
+                    @foreach($outcomes_grad as $index => $outcome)
                         @if(
                             is_array($grad_outcomes_attempted)
                             && array_key_exists($outcome->id, $grad_outcomes_attempted)
@@ -644,7 +648,7 @@ $(function () {
                     y:-1
                 },
                 data:[
-                    @foreach($outcomes as $index => $outcome)
+                    @foreach($outcomes_grad as $index => $outcome)
                         @if(
                             is_array($grad_outcomes_attempted)
                             && array_key_exists($outcome->id, $grad_outcomes_attempted)
@@ -672,7 +676,7 @@ $(function () {
             },
             xAxis: {
                 categories: [
-                    @foreach($outcomes as $outcome)
+                    @foreach($outcomes_undergrad as $outcome)
                         "{{{ $outcome->name }}}",
                     @endforeach
                 ],
@@ -728,7 +732,7 @@ $(function () {
                     y:-1
                 },
                 data: [
-                    @foreach($outcomes as $index => $outcome)
+                    @foreach($outcomes_undergrad as $index => $outcome)
                         @if(
                             is_array($undergrad_outcomes_attempted)
                             && array_key_exists($outcome->id, $undergrad_outcomes_attempted)
@@ -755,7 +759,7 @@ $(function () {
                     y:-1
                 },
                 data:[
-                    @foreach($outcomes as $index => $outcome)
+                    @foreach($outcomes_undergrad as $index => $outcome)
                         @if(
                             is_array($undergrad_outcomes_attempted)
                             && array_key_exists($outcome->id, $undergrad_outcomes_attempted)

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

@@ -58,13 +58,13 @@
     <div class="modal-content">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <h4 class="modal-title">Edit Transforming Actions</h4>
+        <h4 class="modal-title">Edit Formative Actions</h4>
       </div>
         <div class="modal-body">
             {{ Form::open(array('action' => array('TransformativeActionsController@postActivityCriterion', $activity->id))) }}
                                   
 
-                <p>A Transforming Action is the educational action to be taken to address the criteria of an unachieved Learning Outcome.</p>
+                <p>A Formative Action is the educational action to be taken to address the criteria of an unachieved Learning Outcome.</p>
                 <p>Una acción transformadora es una acción educativa a tomarse para atender el o los criterios de un dominio dado que no se alcanzaron.</p>
 
                 <h5>Choose criteria for the transforming action <br>
@@ -93,12 +93,12 @@
                 <hr>
                 
                 <div class ="form-group">
-                    {{ Form::label('name_trans', 'Name of Transforming Actions')}}
+                    {{ Form::label('name_trans', 'Name of Formative Actions')}}
                     {{ Form::text('name_trans', '', array('class' => 'form-control')) }}
                 </div>
                 
                 <div class="form-group">
-                    {{ Form::label('transforming_actions', 'Transforming Actions') }}
+                    {{ Form::label('transforming_actions', 'Formative Actions') }}
                     {{ Form::textarea('transforming_actions', $activity->transforming_actions, array('class' => 'form-control', 'rows'=> 4, 'placeholder'=>'Actions to improve student performance after assessment (optional)')) }}
                 </div>
         </div>
@@ -219,7 +219,7 @@
                     
                         {{ HTML::linkAction('ActivitiesController@assess', 'Edit Assessment', array($activity->id), array('class'=>'btn btn-primary btn-sm btn-block')) }}
                         <button class="btn btn-primary btn-sm btn-block" btn-block data-toggle="modal" data-target="#modal-confirm-delete-assessment">Delete Assessment</button>
-                        <button class="btn btn-primary btn-sm btn-block" btn-block data-toggle="modal" data-target="#modal-edit-transforming-actions">Transforming Actions</button>
+                        <button class="btn btn-primary btn-sm btn-block" btn-block data-toggle="modal" data-target="#modal-edit-transforming-actions">Formative Actions</button>
                         <button class="btn btn-primary btn-sm btn-block" btn-block data-toggle="modal" data-target="#modal-edit-assessment-comments">Assessment Comments</button>
 
                     @endif