9/17/2021, arreglos a cosas previamente hechas

app/controllers/ActivitiesController.php

@@ -48,6 +48,10 @@ class ActivitiesController extends \BaseController
             $activity->name = Input::get('name');
             $activity->description = Input::get('description');
             $activity->course_id = $id;
+
+            // Gabriel añadió aquí
+            $activity->draft = 1;
+            //
             $activity->date = date('Y-m-d');
 
             /** If activity is saved, send success message */

app/controllers/CoursesController.php

@@ -1,268 +1,272 @@
 <?php
 
 class
-CoursesController extends \BaseController {
-
-	/**
-	 * Display the specified resource.
-	 *
-	 * @param  int  $id
-	 * @return Response
-	 */
-	public function show($id)
-	{
-
-		$course = Course::with('semester')->where('id', $id)->first();
-		$title=$course->code.$course->number.'-'.$course->section.' <span class="small attention">('.$course->semester->code.')</span>';
-
-		// If course does not exist, display 404
-		if(!$course)
+CoursesController extends \BaseController
+{
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  int  $id
+     * @return Response
+     */
+    public function show($id)
+    {
+
+        $course = Course::with('semester')->where('id', $id)->first();
+        $title = $course->code . $course->number . '-' . $course->section . ' <span class="small attention">(' . $course->semester->code . ')</span>';
+
+        // If course does not exist, display 404
+        if (!$course)
             App::abort('404');
 
         // If course does not belong to the person
         if ($course->user_id != Auth::id())
-        	App::abort('403', 'Access forbidden.');
+            App::abort('403', 'Access forbidden.');
+
+        $activities = $course->activities;
+        $students = $course->students;
 
-		$activities = $course->activities;
-		$students = $course->students;
+        //$outcomes = Outcome::orderBy('name', 'asc')->get();
+        $semesters = Session::get('semesters_ids');
+        $semesters = DB::table('semesters')->where('id', $course->semester_id)->orderBy('start', 'ASC')->first();
 
-		$outcomes = Outcome::orderBy('name', 'asc')->get();
-		$outcomes_achieved = json_decode($course->outcomes_achieved, true);
-        $outcomes_attempted = json_decode($course->outcomes_attempted, true);
+        $outcomes = Outcome::select(array('id', 'name', 'expected_outcome'))
+            ->whereNull('deleted_at')
+            ->whereRaw("(deactivation_date IS NULL or deactivation_date >= '{$semesters->start}')")
+            ->orderBy('name', 'ASC')->get();
+        $outcomes_achieved = $course->outcomes_ach();
+        // $outcomes_attempted = json_decode($course->outcomes_attempted, true);
 
+        $outcomes_attempted = $course->outcomes_att();
         // Get active semesters
-        $active_semesters= array();
+        $active_semesters = array();
         $active_semesters_collection = Semester::select('id')->where('is_visible', 1)->where('start', '<=', date('Y-m-d H:i:s'))->where('end', '>=', date('Y-m-d H:i:s'))->get();
-        foreach ($active_semesters_collection as $active_semester)
-        {
-        	$active_semesters[]=$active_semester->id;
+        foreach ($active_semesters_collection as $active_semester) {
+            $active_semesters[] = $active_semester->id;
         }
 
-		return View::make('local.professors.course', compact('title', 'course', 'activities', 'students', 'outcomes', 'outcomes_achieved', 'outcomes_attempted', 'active_semesters'));
-	}
+        return View::make('local.professors.course', compact('title', 'course', 'activities', 'students', 'outcomes', 'outcomes_achieved', 'outcomes_attempted', 'active_semesters'));
+    }
 
-	public function newShow($id)
+    public function newShow($id)
     {
         $course = Course::findOrFail($id);
         $title = $course->name;
         $semesters = Semester::where('is_visible', '1')->orderBy('start', 'asc')->get();
-        $is_active_semester = $semesters->filter(function($semester) {
+        $is_active_semester = $semesters->filter(function ($semester) {
             return Semester::where('is_visible', 1)->where('start', '<=', date('Y-m-d H:i:s'))->where('end', '>=', date('Y-m-d H:i:s'))->get()->has($semester->id);
         });
-//        $active_semesters = Semester::select('id')->where('is_visible', 1)->where('start', '<=', date('Y-m-d H:i:s'))->where('end', '>=', date('Y-m-d H:i:s'))->get()->toArray()[0];
+        //        $active_semesters = Semester::select('id')->where('is_visible', 1)->where('start', '<=', date('Y-m-d H:i:s'))->where('end', '>=', date('Y-m-d H:i:s'))->get()->toArray()[0];
         $activities = $course->activities;
 
-//        var_dump($active_semesters);
-//        var_dump($course->semester->id);
+        //        var_dump($active_semesters);
+        //        var_dump($course->semester->id);
 
-        return View::make('local.managers.admins.new-course-show', compact('title','course', 'semesters', 'activities', 'is_active_semester'));
+        return View::make('local.managers.admins.new-course-show', compact('title', 'course', 'semesters', 'activities', 'is_active_semester'));
     }
 
-	/**
-	 * Display the specified course, but with limited information.
-	 *
-	 * @param  int  $id
-	 * @return Response
-	 */
-	public function showLimited($id)
-	{
-		$course = Course::with('semester')->where('id', $id)->first();
-		$students = $course->students;
-		$title=$course->code.$course->number.'-'.$course->section.' <span class="small attention">('.$course->semester->code.')</span>';
-
-		// If course does not exist, display 404
-		if(!$course)
+    /**
+     * Display the specified course, but with limited information.
+     *
+     * @param  int  $id
+     * @return Response
+     */
+    public function showLimited($id)
+    {
+        $course = Course::with('semester')->where('id', $id)->first();
+        $students = $course->students;
+        $title = $course->code . $course->number . '-' . $course->section . ' <span class="small attention">(' . $course->semester->code . ')</span>';
+
+        // If course does not exist, display 404
+        if (!$course)
             App::abort('404');
 
-		$activities = $course->activities;
-		$students = $course->students;
-
-		$level=DB::table('courses')
-			->join('programs','programs.id','=','courses.program_id')
-			->where('courses.id', $id)
-        	->select('programs.is_graduate')
-        	->first();
-
-		$outcomes = Outcome::active_by_semesters(array($course->semester),$level->is_graduate);
-// 		$outcomeCount = count((array)$outcomes);
-		
-		$course = Course::where('id', $id)->first();
-		foreach($outcomes as $outcome)
-		{
-			$outcomes_attempted[$outcome->id]=$outcome->courses_attempted(array($course));
-			$outcomes_achieved[$outcome->id]=$outcome->courses_achieved(array($course));
-		}
-
-// 		$outcomes = Outcome::orderBy('name', 'asc')->get();
-// 		$outcomes_achieved = json_decode($course->outcomes_achieved, true);
-//         $outcomes_attempted = json_decode($course->outcomes_attempted, true);
+        $activities = $course->activities;
+        $students = $course->students;
+
+        $level = DB::table('courses')
+            ->join('programs', 'programs.id', '=', 'courses.program_id')
+            ->where('courses.id', $id)
+            ->select('programs.is_graduate')
+            ->first();
+
+        $outcomes = Outcome::active_by_semesters(array($course->semester), $level->is_graduate);
+        // 		$outcomeCount = count((array)$outcomes);
+
+        $course = Course::where('id', $id)->first();
+        foreach ($outcomes as $outcome) {
+            $outcomes_attempted[$outcome->id] = $outcome->courses_attempted(array($course));
+            $outcomes_achieved[$outcome->id] = $outcome->courses_achieved(array($course));
+        }
+
+        // 		$outcomes = Outcome::orderBy('name', 'asc')->get();
+        // 		$outcomes_achieved = json_decode($course->outcomes_achieved, true);
+        //         $outcomes_attempted = json_decode($course->outcomes_attempted, true);
 
         $schools = School::all();
 
         $rubrics = array();
-        foreach ($activities as $activity )
-        {
-        	if($activity->rubric_id!=NULL)
-    		{
-    			$rubrics[]=$activity->rubric;
-    		}
+        Log::info($activities);
+        foreach ($activities as $activity) {
+
+            if (!empty($activity->rubric)) {
+                $rubrics[] = $activity->rubric[0];
+            }
         }
 
-		return View::make('local.managers.shared.limited-course', compact('title', 'course', 'activities', 'students', 'outcomes', 'outcomes_achieved', 'outcomes_attempted', 'schools', 'rubrics', 'students'));
-	}
+        return View::make('local.managers.shared.limited-course', compact('title', 'course', 'activities', 'students', 'outcomes', 'outcomes_achieved', 'outcomes_attempted', 'schools', 'rubrics', 'students'));
+    }
 
 
-	/**
-	 * Show grouped sections of a course
-	 */
+    /**
+     * Show grouped sections of a course
+     */
 
-	public function showGrouped($code, $number, $semester_code)
-	{
-        $title=$code.$number.' ('.$semester_code.')';
+    public function showGrouped($code, $number, $semester_code)
+    {
+        $title = $code . $number . ' (' . $semester_code . ')';
         $semester = Semester::where('code', $semester_code)->first();
-//         $selected_semesters = Semester::find(Session::get('semesters_ids'));
+        //         $selected_semesters = Semester::find(Session::get('semesters_ids'));
         $role = Auth::user()->role;
-		$level=DB::table('courses')
-			->join('programs','programs.id','=','courses.program_id')
-			->where('courses.code', $code)
-        	->where('courses.number', $number)
-        	->where('courses.semester_id', $semester->id)
-        	->select('programs.is_graduate')
-        	->first();
-//         var_dump($level);
-//         exit();
-        $grouped_courses = Course::
-        	where('code', $code)
-        	->where('number', $number)
-        	->where('semester_id', $semester->id)
-        	->groupBy(array('code', 'number'))->get();
-
-//         $outcomes = Outcome::orderBy('name', 'asc')->get();
-//         $outcomeCount = Outcome::all()->count();
-		$outcomes = Outcome::active_by_semesters(array($semester),$level->is_graduate);
-		$outcomeCount = count((array)$outcomes);
-		
-		foreach($outcomes as $outcome)
-		{
-			$outcomes_attempted[$outcome->id]=$outcome->courses_attempted($grouped_courses);
-			$outcomes_achieved[$outcome->id]=$outcome->courses_achieved($grouped_courses);
-		}
-		
-		var_dump($outcomes_attempted);
-		print "<br>";
-		var_dump($outcomes_achieved);
-		print "<br>";
-        foreach ($grouped_courses as $index => $grouped_course)
-        {
-//             // Blank outcomes for one course
-//             $outcomes_achieved = array_fill(1, $outcomeCount, 0);
-//             $outcomes_attempted = array_fill(1, $outcomeCount, 0);
-// 
-//             // Find sections for this course
-            $sections = Course::
-            	where('code', $grouped_course->code)
-            	->where('number', $grouped_course->number)
-            	->where('semester_id', $grouped_course->semester_id)
-            	->get();
-// 
-//             // For each of the sections, add the attempted and achieved criteria per outcome
-//             foreach ($sections as $section)
-//             {
-//                 if($section->outcomes_achieved!=NULL)
-//                 {
-//                     $section_outcomes_achieved =count($section->outcomes_attempted());
-// //                     var_dump($section_outcomes_achieved);
-// //                     exit();
-//                     $section_outcomes_attempted =count($section->outcomes_achieved());
-// //                     $section_outcomes_achieved =json_decode($section->outcomes_achieved, true);
-// //                     $section_outcomes_attempted =json_decode($section->outcomes_attempted, true);
-// 					foreach($outcomes as $outcome)
-// 					{
-// 						if(!isset($outcomes_achieved[$outcome->id]))$outcomes_achieved[$outcome->id]=0;
-// 						if(!isset($outcomes_attempted[$outcome->id]))$outcomes_attempted[$outcome->id]=0;
-//                         $outcomes_achieved[$outcome->id]+=$section_outcomes_achieved[$i];
-//                         $outcomes_attempted[$outcome->id]+=$section_outcomes_attempted[$i];					
-// 					
-// 					}
-// //                     for($i=1; $i<=count($outcomes_attempted); $i++)
-// //                     {
-// //                         $outcomes_achieved[$i]+=$section_outcomes_achieved[$i];
-// //                         $outcomes_attempted[$i]+=$section_outcomes_attempted[$i];
-// //                     }
-//                 }
-//             }
+        $level = DB::table('courses')
+            ->join('programs', 'programs.id', '=', 'courses.program_id')
+            ->where('courses.code', $code)
+            ->where('courses.number', $number)
+            ->where('courses.semester_id', $semester->id)
+            ->select('programs.is_graduate')
+            ->first();
+        //         var_dump($level);
+        //         exit();
+        $grouped_courses = Course::where('code', $code)
+            ->where('number', $number)
+            ->where('semester_id', $semester->id)
+            ->groupBy(array('code', 'number'))->get();
+
+        //         $outcomes = Outcome::orderBy('name', 'asc')->get();
+        //         $outcomeCount = Outcome::all()->count();
+        $outcomes = Outcome::active_by_semesters(array($semester), $level->is_graduate);
+        $outcomeCount = count((array)$outcomes);
+
+        foreach ($outcomes as $outcome) {
+            $outcomes_attempted[$outcome->id] = $outcome->courses_attempted($grouped_courses);
+            $outcomes_achieved[$outcome->id] = $outcome->courses_achieved($grouped_courses);
         }
 
-        $section_ids = Course::
-        	where('code', $code)
-        	->where('number', $number)
-        	->where('semester_id', $semester->id)
-        	->lists('id');
+        // var_dump($outcomes_attempted);
+        // print "<br>";
+        // var_dump($outcomes_achieved);
+        // print "<br>";
+        foreach ($grouped_courses as $index => $grouped_course) {
+            //             // Blank outcomes for one course
+            //             $outcomes_achieved = array_fill(1, $outcomeCount, 0);
+            //             $outcomes_attempted = array_fill(1, $outcomeCount, 0);
+            // 
+            //             // Find sections for this course
+            $sections = Course::where('code', $grouped_course->code)
+                ->where('number', $grouped_course->number)
+                ->where('semester_id', $grouped_course->semester_id)
+                ->get();
+            // 
+            //             // For each of the sections, add the attempted and achieved criteria per outcome
+            //             foreach ($sections as $section)
+            //             {
+            //                 if($section->outcomes_achieved!=NULL)
+            //                 {
+            //                     $section_outcomes_achieved =count($section->outcomes_attempted());
+            // //                     var_dump($section_outcomes_achieved);
+            // //                     exit();
+            //                     $section_outcomes_attempted =count($section->outcomes_achieved());
+            // //                     $section_outcomes_achieved =json_decode($section->outcomes_achieved, true);
+            // //                     $section_outcomes_attempted =json_decode($section->outcomes_attempted, true);
+            // 					foreach($outcomes as $outcome)
+            // 					{
+            // 						if(!isset($outcomes_achieved[$outcome->id]))$outcomes_achieved[$outcome->id]=0;
+            // 						if(!isset($outcomes_attempted[$outcome->id]))$outcomes_attempted[$outcome->id]=0;
+            //                         $outcomes_achieved[$outcome->id]+=$section_outcomes_achieved[$i];
+            //                         $outcomes_attempted[$outcome->id]+=$section_outcomes_attempted[$i];					
+            // 					
+            // 					}
+            // //                     for($i=1; $i<=count($outcomes_attempted); $i++)
+            // //                     {
+            // //                         $outcomes_achieved[$i]+=$section_outcomes_achieved[$i];
+            // //                         $outcomes_attempted[$i]+=$section_outcomes_attempted[$i];
+            // //                     }
+            //                 }
+            //             }
+        }
+
+        $section_ids = Course::where('code', $code)
+            ->where('number', $number)
+            ->where('semester_id', $semester->id)
+            ->lists('id');
 
-            $activities = Activity::with('course')->whereNotNull('transforming_actions')->whereIn('course_id', $section_ids)->orderBy('name')->groupBy('transforming_actions')->get();
+        //$activities = Activity::with('course')->whereNotNull('transforming_actions')->whereIn('course_id', $section_ids)->orderBy('name')->groupBy('transforming_actions')->get();
 
-		return View::make('local.managers.shared.grouped_course', compact('role', 'title', 'grouped_courses', 'outcomes', 'outcomes_attempted', 'outcomes_achieved', 'sections', 'transforming_actions', 'activities'));
-	}
+        $activities = Activity::with('course')->whereIn('course_id', $section_ids)
+            ->join('activity_criterion as ac', 'ac.activity_id', '=', 'activities.id')
+            ->join('transformative_activity_criterion as tac', 'ac.id', '=', 'tac.activity_criterion_id')
+            ->join('transformative_actions as ta', 'ta.id', '=', 'tac.trans_action_id')
+            ->select('activities.*')
+            ->addSelect('ta.description as transforming_actions')
+            ->distinct()
+            ->orderBy('name')->get();
 
-	/**
-	 * Printable version for a course (grouped sections)
-	 */
+        return View::make('local.managers.shared.grouped_course', compact('role', 'title', 'grouped_courses', 'outcomes', 'outcomes_attempted', 'outcomes_achieved', 'sections', 'transforming_actions', 'activities'));
+    }
 
-	public function print_course($code, $number, $semester_code)
-	{
-        $title=$code.$number.' ('.$semester_code.')';
+    /**
+     * Printable version for a course (grouped sections)
+     */
+
+    public function print_course($code, $number, $semester_code)
+    {
+        $title = $code . $number . ' (' . $semester_code . ')';
         $semester = Semester::where('code', $semester_code)->first();
         $role = Auth::user()->role;
 
-        $grouped_courses = Course::
-        	where('code', $code)
-        	->where('number', $number)
-        	->where('semester_id', $semester->id)
-        	->groupBy(array('code', 'number'))->get();
+        $grouped_courses = Course::where('code', $code)
+            ->where('number', $number)
+            ->where('semester_id', $semester->id)
+            ->groupBy(array('code', 'number'))->get();
 
         $outcomes = Outcome::orderBy('name', 'asc')->get();
         $outcomeCount = Outcome::all()->count();
 
-        foreach ($grouped_courses as $index => $grouped_course)
-        {
+        foreach ($grouped_courses as $index => $grouped_course) {
             // Blank outcomes for one course
             $outcomes_achieved = array_fill(1, $outcomeCount, 0);
             $outcomes_attempted = array_fill(1, $outcomeCount, 0);
 
             // Find sections for this course
-            $sections = Course::
-            	where('code', $grouped_course->code)
-            	->where('number', $grouped_course->number)
-            	->where('semester_id', $grouped_course->semester_id)
-            	->get();
+            $sections = Course::where('code', $grouped_course->code)
+                ->where('number', $grouped_course->number)
+                ->where('semester_id', $grouped_course->semester_id)
+                ->get();
 
             // For each of the sections, add the attempted and achieved criteria per outcome
-            foreach ($sections as $section)
-            {
-                if($section->outcomes_achieved!=NULL)
-                {
-                    $section_outcomes_achieved =json_decode($section->outcomes_achieved, true);
-                    $section_outcomes_attempted =json_decode($section->outcomes_attempted, true);
-                    for($i=1; $i<=count($outcomes_attempted); $i++)
-                    {
-                        $outcomes_achieved[$i]+=$section_outcomes_achieved[$i];
-                        $outcomes_attempted[$i]+=$section_outcomes_attempted[$i];
+            foreach ($sections as $section) {
+                if ($section->outcomes_achieved != NULL) {
+                    $section_outcomes_achieved = json_decode($section->outcomes_achieved, true);
+                    $section_outcomes_attempted = json_decode($section->outcomes_attempted, true);
+                    for ($i = 1; $i <= count($outcomes_attempted); $i++) {
+                        $outcomes_achieved[$i] += $section_outcomes_achieved[$i];
+                        $outcomes_attempted[$i] += $section_outcomes_attempted[$i];
                     }
                 }
             }
         }
 
-        $section_ids = Course::
-        	where('code', $code)
-        	->where('number', $number)
-        	->where('semester_id', $semester->id)
-        	->lists('id');
+        $section_ids = Course::where('code', $code)
+            ->where('number', $number)
+            ->where('semester_id', $semester->id)
+            ->lists('id');
 
         // Activities with transforming actions
-       	$activities = Activity::with('course')->whereNotNull('transforming_actions')->whereIn('course_id', $section_ids)->orderBy('name')->groupBy('transforming_actions')->get();
+        $activities = Activity::with('course')->whereNotNull('transforming_actions')->whereIn('course_id', $section_ids)->orderBy('name')->groupBy('transforming_actions')->get();
 
-		return View::make('local.managers.shared.print_course', compact('role', 'title', 'grouped_courses', 'outcomes', 'outcomes_attempted', 'outcomes_achieved', 'sections', 'activities'));
-	}
+        return View::make('local.managers.shared.print_course', compact('role', 'title', 'grouped_courses', 'outcomes', 'outcomes_attempted', 'outcomes_achieved', 'sections', 'activities'));
+    }
 
 
     private function excelConv(&$value, $key)
@@ -270,7 +274,6 @@ CoursesController extends \BaseController {
         Log::debug('CoursesController@excelConv');
 
         $value = iconv('UTF-8', 'Windows-1252//IGNORE', $value);
-
     }
 
 
@@ -282,27 +285,27 @@ CoursesController extends \BaseController {
         $course = Course::find($id);
 
         // Set file name and open file
-        $filename = 'olas_student_grades_'.$course->code.$course->number.$course->section.$course->semester->code.'_'.time().'.csv';
-        $file= fopen('exports/'.$filename, 'w');
+        $filename = 'olas_student_grades_' . $course->code . $course->number . $course->section . $course->semester->code . '_' . time() . '.csv';
+        $file = fopen('exports/' . $filename, 'w');
 
         // To add an empty line to the csv
         $empty_line = array(' ');
 
         // Set section name at the top
-        fputcsv($file, array($course->code.$course->number.$course->section.' ('.$course->semester->code.')'));
+        fputcsv($file, array($course->code . $course->number . $course->section . ' (' . $course->semester->code . ')'));
         fputcsv($file, $empty_line);
 
         // Individual activity tables -----------------------------------------
 
         // For each activity
-        foreach($course->assessedActivities as $activity) {
+        foreach ($course->assessedActivities as $activity) {
             // Set name
 
             $activity_name = iconv('UTF-8', 'Windows-1252//IGNORE', $activity->name);
             fputcsv($file, array($activity_name));
 
             // Get assessments
-            $assessments = DB::table('assessments')->join('students', 'assessments.student_id','=','students.id')->where('activity_id', '=', $activity->id)->orderBy('assessments.id', 'asc')->get();
+            $assessments = DB::table('assessments')->join('students', 'assessments.student_id', '=', 'students.id')->where('activity_id', '=', $activity->id)->orderBy('assessments.id', 'asc')->get();
 
             // Get rubric contents
             $rubric_contents = json_decode($activity->rubric->contents);
@@ -317,7 +320,7 @@ CoursesController extends \BaseController {
             $criterion_list[] = 'Comments';
 
             // Change encoding to be compatible with Excel
-            array_walk($criterion_list, array($this,'excelConv'));
+            array_walk($criterion_list, array($this, 'excelConv'));
 
             fputcsv($file, $criterion_list);
 
@@ -328,7 +331,8 @@ CoursesController extends \BaseController {
                 fputcsv($file, array_merge(
                     array($student->number, $student->name, $student->school_code, $student->conc_code),
                     $scores,
-                    array($assessment->percentage, $assessment->comments)));
+                    array($assessment->percentage, $assessment->comments)
+                ));
             }
             fputcsv($file, $empty_line);
         }
@@ -337,8 +341,8 @@ CoursesController extends \BaseController {
 
         // Set headers for table
         $activity_list = array('#', 'Name', 'School', 'Major');
-        foreach($course->assessedActivities as $activity) {
-            $activity_list[]=$activity->name;
+        foreach ($course->assessedActivities as $activity) {
+            $activity_list[] = $activity->name;
         }
         $activity_list[] = 'Average';
 
@@ -346,13 +350,13 @@ CoursesController extends \BaseController {
         fputcsv($file, array('All Activities'));
 
         // Change encoding to be compatible with Excel
-        array_walk($activity_list, array($this,'excelConv'));
+        array_walk($activity_list, array($this, 'excelConv'));
 
         fputcsv($file, $activity_list);
 
         // For each student, set info
         foreach ($activity->course->students as $student) {
-            $student_record= array($student->number, $student->name, $student->school_code, $student->conc_code);
+            $student_record = array($student->number, $student->name, $student->school_code, $student->conc_code);
 
             $assessed_activities = $course->assessedActivities;
             // Iterate over activities, get percentages and add them to the record array
@@ -367,12 +371,12 @@ CoursesController extends \BaseController {
 
             // Average
             $student_record[] = array_sum(
-                                    array_slice(
-                                        $student_record,
-                                        4,
-                                        count($assessed_activities)
-                                    )
-                                )/count($assessed_activities);
+                array_slice(
+                    $student_record,
+                    4,
+                    count($assessed_activities)
+                )
+            ) / count($assessed_activities);
 
             fputcsv($file, $student_record);
         }
@@ -381,7 +385,7 @@ CoursesController extends \BaseController {
         fclose($file);
 
         // Return response for download
-        return Response::download('exports/'.$filename);
+        return Response::download('exports/' . $filename);
     }
 
     public function reassign()
@@ -395,16 +399,14 @@ CoursesController extends \BaseController {
 
     public function update()
     {
-        if(Input::get('reassign_program'))
-        {
+        if (Input::get('reassign_program')) {
             $code = strtoupper(trim(str_replace('*', '%', Input::get('code'))));
             $number = strtoupper(trim(str_replace('*', '%', Input::get('number'))));
             $section = strtoupper(trim(str_replace('*', '%', Input::get('section'))));
 
-            if(!$code && !$number && !$section)
-            {
-                Session::flash('status','danger');
-                Session::flash('message','At least one field is required.');
+            if (!$code && !$number && !$section) {
+                Session::flash('status', 'danger');
+                Session::flash('message', 'At least one field is required.');
 
                 return Redirect::back()->withInput();
             }
@@ -412,63 +414,49 @@ CoursesController extends \BaseController {
             $update_query = Course::orderBy('code', 'asc')->orderBy('number', 'asc')->orderBy('section', 'asc');
             $fetch_query = Course::orderBy('code', 'asc')->orderBy('number', 'asc')->orderBy('section', 'asc');
 
-            if($code)
-            {
+            if ($code) {
                 $update_query->where('code', 'LIKE', $code);
                 $fetch_query->where('code', 'LIKE', $code);
             }
 
-            if($number)
-            {
+            if ($number) {
                 $update_query->where('number', 'LIKE', $number);
                 $fetch_query->where('number', 'LIKE', $number);
             }
 
-            if($section)
-            {
+            if ($section) {
                 $update_query->where('section', 'LIKE', $section);
                 $fetch_query->where('section', 'LIKE', $section);
             }
             // If section is blank, results can be grouped by code and number
-            else
-            {
+            else {
                 $fetch_query->groupBy(array('code', 'number'));
             }
 
             $affected_rows = $fetch_query->get();
 
             // If there are results
-            if(!$affected_rows->isEmpty())
-            {
+            if (!$affected_rows->isEmpty()) {
                 // Try updating and flash success message if successful
-                if($update_query->update(array('program_id'=>Input::get('program'))))
-                {
+                if ($update_query->update(array('program_id' => Input::get('program')))) {
                     Session::flash('courses', json_encode($affected_rows));
                     Session::flash('status', 'success');
                     Session::flash('message', 'Courses succesfully updated.');
 
-                    if($section)
-                    {
+                    if ($section) {
                         Session::flash('show_sections', true);
                     }
-
-                }
-                else
-                {
+                } else {
                     Session::flash('status', 'danger');
                     Session::flash('message', 'Error reassigning courses to a program. Try again later.');
                 }
-            }
-            else
-            {
+            } else {
                 Session::flash('status', 'warning');
                 Session::flash('message', 'No courses matched your criteria. Try to broaden your search.');
             }
 
             return Redirect::back()->withInput();
-        }
-        elseif(Input::get('reassign_professor'))
-        {
+        } elseif (Input::get('reassign_professor')) {
 
             $code = strtoupper(trim(str_replace('*', '%', Input::get('code_prof'))));
             $number = strtoupper(trim(str_replace('*', '%', Input::get('number_prof'))));
@@ -477,21 +465,18 @@ CoursesController extends \BaseController {
             $semester = Input::get('semester_prof');
 
 
-            if(!$code || !$number || !$section)
-            {
-                Session::flash('status','danger');
-                Session::flash('message','Error assigning professor to a course. All fields are required.');
+            if (!$code || !$number || !$section) {
+                Session::flash('status', 'danger');
+                Session::flash('message', 'Error assigning professor to a course. All fields are required.');
 
                 return Redirect::back()->withInput();
             }
 
-            $update_query = Course::
-                where('code', '=', $code)
+            $update_query = Course::where('code', '=', $code)
                 ->where('number', '=', $number)
                 ->where('section', '=', $section)
                 ->where('semester_id', '=', $semester);
-            $fetch_query = Course::
-                where('code', '=', $code)
+            $fetch_query = Course::where('code', '=', $code)
                 ->where('number', '=', $number)
                 ->where('section', '=', $section)
                 ->orderBy('code', 'asc')
@@ -501,35 +486,24 @@ CoursesController extends \BaseController {
             $affected_rows = $fetch_query->get();
 
             // If there are results
-            if(!$affected_rows->isEmpty())
-            {
-                try
-                {
+            if (!$affected_rows->isEmpty()) {
+                try {
                     // Try updating and flash success message if successful
-                    $update_query->update(array('user_id'=>$user));
+                    $update_query->update(array('user_id' => $user));
 
                     Session::flash('status', 'success');
-                    Session::flash('message', 'Successfully changed professor for '.$code.$number.'-'.$section);
-                }
-                catch(Exception $e)
-                {
+                    Session::flash('message', 'Successfully changed professor for ' . $code . $number . '-' . $section);
+                } catch (Exception $e) {
                     Session::flash('status', 'danger');
-                    Session::flash('message', 'An error occurred when changing professor for '.$code.$number.'-'.$section).'.';
+                    Session::flash('message', 'An error occurred when changing professor for ' . $code . $number . '-' . $section) . '.';
                 }
-            }
-            else
-            {
+            } else {
                 Session::flash('status', 'warning');
                 Session::flash('message', 'No course matches your criteria. Try again with different values.');
             }
 
             return Redirect::back()->withInput();
-        }
-        else
-        {
-
+        } else {
         }
     }
-
-
 }

app/controllers/CriteriaController.php

@@ -41,13 +41,13 @@ class CriteriaController extends \BaseController
             $listOfId[] = $program->id;
         }
 
-        $objectives = DB::table('objectives')->whereIn('program_id', $listOfId)->orderBy('text', 'ASC')->lists('text', 'id');
+        //$objectives = DB::table('objectives')->whereIn('program_id', $listOfId)->orderBy('text', 'ASC')->lists('text', 'id');
 
 
 
 
 
-        return View::make('local.managers.sCoords.criteria', compact('title', 'outcomes', 'schools', 'criteria', 'programs', 'objectives'));
+        return View::make('local.managers.sCoords.criteria', compact('title', 'outcomes', 'schools', 'criteria', 'programs' /* 'objectives'*/));
     }
 
     public function fetchCriterionWithTemplate()

app/controllers/OutcomesController.php

@@ -767,7 +767,12 @@ class OutcomesController extends \BaseController
                     ->with(array('courses' => function ($query2) {
                         $query2
                             ->has('activities')
-                            ->whereNotNull('outcomes_attempted')
+                            //->whereNotNull('outcomes_attempted')
+                            ->join('activities', 'activities.course_id', '=', 'courses.id')
+                            ->join('activity_criterion as ac', 'ac.activity_id', '=', 'activities.id')
+                            ->join('assessments', 'assessments.activity_criterion_id', '=', 'ac.id')
+                            ->where('activities.draft', 0)
+                            ->select('courses.*')->distinct()
                             ->whereIn('semester_id', Session::get('semesters_ids'))
                             ->groupBy(array('code', 'number'));
                     }));

app/controllers/ProgramCoordinatorsController.php

@@ -36,7 +36,8 @@ class ProgramCoordinatorsController extends \BaseController
     $programs_array = array();
     $programs_contact = array();
 
-    foreach ($programs as $program) {
+    // old code
+    /*foreach ($programs as $program) {
       $program_array = array();
 
       $program_array['program'] = $program;
@@ -59,12 +60,55 @@ class ProgramCoordinatorsController extends \BaseController
           $program_array['assessed_courses_count'] += 1;
         }
       }
+      */
+
+    foreach ($programs as $program) {
+      $program_array = array();
+
+      $program_array['program'] = $program;
+
+      $program_array['outcomes_achieved'] = [];
+      $program_array['outcomes_attempted'] = [];
+
+      $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 (!empty($course->outcomes_ach())) {
+          $program_array['course_outcomes_achieved'] = $course->outcomes_ach();
+          $program_array['course_outcomes_attempted'] = $course->outcomes_att();
+          Log::info($program_array['course_outcomes_achieved']);
+          foreach ($program_array['course_outcomes_achieved'] as $i => $score) {
+            if (array_key_exists($i, $program_array['outcomes_achieved']))  $program_array['outcomes_achieved'][$i] += $program_array['course_outcomes_achieved'][$i];
+            else $program_array['outcomes_achieved'][$i] = $program_array['course_outcomes_achieved'][$i];
+          }
+          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];
+          }
+
+          $program_array['assessed_courses_count'] += 1;
+        }
+      }
 
       /**
        * List of grouped courses (grouped sections)
        */
 
-      $program_array['grouped_courses'] = Course::select(DB::raw('name, code, number, max(outcomes_attempted) as outcomes_attempted, semester_id, program_id'))
+      //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(); */
+      $program_array['grouped_courses'] = Course::select(DB::raw('name, code, number, semester_id, program_id'))
         ->with('semester')
         ->with('program')
         ->where('program_id', $program->id)
@@ -75,7 +119,6 @@ class ProgramCoordinatorsController extends \BaseController
         ->orderBy('semester_id')
         ->get();
 
-
       $programs_array[] = $program_array;
 
 

app/controllers/ProgramsController.php

@@ -11,80 +11,69 @@ class ProgramsController extends \BaseController
   {
 
     $program = Program::find($id);
-    $title= $program->school->name.': '.$program->name;
+    $title = $program->school->name . ': ' . $program->name;
     $program_courses = $program->courses;
-//     $outcomes = Outcome::orderBy('name', 'asc')->get();
+    //     $outcomes = Outcome::orderBy('name', 'asc')->get();
     $schools = School::all();
-//     $outcomeCount = Outcome::all()->count();
+    //     $outcomeCount = Outcome::all()->count();
 
     $selected_semesters = Semester::find(Session::get('semesters_ids'));
 
-	$level=$program->is_graduate;
-	$min_start="9000-01-01 00:00:00";
-	$max_end="1000-01-01 00:00:00";
-	foreach($selected_semesters as $semester)
-	{
-		if($min_start>$semester->start)
-		{
-			$min_start=$semester->start;
-		}
-		if($max_end<$semester->end)
-		{
-			$max_end=$semester->end;
-		}
-	}
-	$outcomes = Outcome::where(function($query) use ($min_start)
-							   {
-									$query->where('deactivation_date', '>=', $min_start)
-										  ->orWhere('deactivation_date', null);
-							   })
-						->where('activation_date', '<=', $max_end)
-						->where(function($query2) use ($level)
-								{
-									$query2->where("level", $level+1)
-										   ->orWhere("level",3);
-								})
-						->orderBy('name', 'ASC')
-						->get();
-	$outcomeCount = Outcome::where(function($query) use ($min_start)
-								   {
-										$query->where('deactivation_date', '>=', $min_start)
-											  ->orWhere('deactivation_date', null);
-									})
-						->where('activation_date', '<=', $max_end)
-						->where(function($query2) use ($level)
-									{
-										$query2->where("level",$level+1)
-											   ->orWhere("level",3);
-									})
-							->count();
-
-	foreach($outcomes as $outcome)
-	{
-		$outcomes_attempted[$outcome->id]=$program->attempted_outcome($outcome->id, $selected_semesters);
-		if($outcomes_attempted[$outcome->id])$outcomes_achieved[$outcome->id]=$program->achieved_outcome($outcome->id, $selected_semesters);
-	}
-
-	foreach($outcomes as $outcome)
-	{
-		$assessed_courses[$outcome->id]=DB::table('activity_criterion')
-	    	->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', '=', 'activity_criterion.criterion_id')
-	    	->where('criterion_objective_outcome.outcome_id','=',$outcome->id)
-	    	->where('programs.id','=',$program->id)
-	    	->where('courses.semester_id','=',$semester)
-	    	->count(DB::raw('DISTINCT courses.id'))
-			;
-	}
-	$assessed_courses_count=array_sum($assessed_courses);
+    $level = $program->is_graduate;
+    $min_start = "9000-01-01 00:00:00";
+    $max_end = "1000-01-01 00:00:00";
+    foreach ($selected_semesters as $semester) {
+      if ($min_start > $semester->start) {
+        $min_start = $semester->start;
+      }
+      if ($max_end < $semester->end) {
+        $max_end = $semester->end;
+      }
+    }
+    $outcomes = Outcome::where(function ($query) use ($min_start) {
+      $query->where('deactivation_date', '>=', $min_start)
+        ->orWhere('deactivation_date', null);
+    })
+      ->where('activation_date', '<=', $max_end)
+      ->where(function ($query2) use ($level) {
+        $query2->where("level", $level + 1)
+          ->orWhere("level", 3);
+      })
+      ->orderBy('name', 'ASC')
+      ->get();
+    $outcomeCount = Outcome::where(function ($query) use ($min_start) {
+      $query->where('deactivation_date', '>=', $min_start)
+        ->orWhere('deactivation_date', null);
+    })
+      ->where('activation_date', '<=', $max_end)
+      ->where(function ($query2) use ($level) {
+        $query2->where("level", $level + 1)
+          ->orWhere("level", 3);
+      })
+      ->count();
+
+    foreach ($outcomes as $outcome) {
+      $outcomes_attempted[$outcome->id] = $program->attempted_outcome($outcome->id, $selected_semesters);
+      if ($outcomes_attempted[$outcome->id]) $outcomes_achieved[$outcome->id] = $program->achieved_outcome($outcome->id, $selected_semesters);
+    }
+
+    foreach ($outcomes as $outcome) {
+      $assessed_courses[$outcome->id] = DB::table('activity_criterion')
+        ->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', '=', 'activity_criterion.criterion_id')
+        ->where('criterion_objective_outcome.outcome_id', '=', $outcome->id)
+        ->where('programs.id', '=', $program->id)
+        ->where('courses.semester_id', '=', $semester)
+        ->count(DB::raw('DISTINCT courses.id'));
+    }
+    $assessed_courses_count = array_sum($assessed_courses);
     /**
      * List of grouped courses (grouped sections)
      */
 
-    $grouped_courses = Course::
-      select(DB::raw('name, code, number, max(outcomes_attempted) as outcomes_attempted, semester_id, program_id'))
+    $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)
@@ -96,202 +85,199 @@ class ProgramsController extends \BaseController
       ->get();
 
     // Program contact information
-    $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();
+    $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();
 
-// 	var_dump($outcomes_attempted);
-// 	print "<br>";
-// 	var_dump($outcomes_achieved);
-// 	print "<br>";
+    // 	var_dump($outcomes_attempted);
+    // 	print "<br>";
+    // 	var_dump($outcomes_achieved);
+    // 	print "<br>";
     return View::make('local.managers.shared.program', compact('title', 'outcomes', 'outcomes_attempted', 'outcomes_achieved', 'schools', 'program_courses', 'assessed_courses_count', 'grouped_courses', 'program', 'users'));
+  }
 
-}
 
+  public function showReport()
+  {
 
-public function showReport()
-{
 
+    // create an array with the ID of Semesters selected in the form
+    $selected_semesters_id = array();
+    $semesters = Semester::all();
+    foreach ($semesters as $semester) {
+      if ($semester->is_visible) {
+        if (Input::get('semester' . $semester->id) != null) {
+          array_push($selected_semesters_id, $semester->id);
+        }
+      }
+    }
+    $selected_semesters = DB::table('semesters')
+      ->wherein('semesters.id', $selected_semesters_id)
+      ->get();
 
-  // create an array with the ID of Semesters selected in the form
-  $selected_semesters_id = array();
-  $semesters = Semester::all();
-  foreach ($semesters as $semester) {
-    if ($semester->is_visible){
-      if (Input::get('semester'.$semester->id)!=null){
-        array_push($selected_semesters_id, $semester->id);
+    // create a srting with the selected metodos de divulgfacion
+    $selected_divulgaciones = '';
+    $divulgaciones = array(
+      'profesores', 'comiteDepartamental', 'comiteFacultadEscuela',
+      'pleno', 'estudiantes', 'administrativos', 'senado', 'comunidadWeb',
+      'otros'
+    );
+    foreach ($divulgaciones as $divulgacion) {
+      if (Input::get($divulgacion) != null) {
+        $selected_divulgaciones = $selected_divulgaciones . '\n' . Input::get($divulgacion);
       }
     }
-  }
-  $selected_semesters = DB::table('semesters')
-                        ->wherein('semesters.id',$selected_semesters_id)
-                        ->get();
-
-  // create a srting with the selected metodos de divulgfacion
-  $selected_divulgaciones = '';
-  $divulgaciones = array('profesores','comiteDepartamental','comiteFacultadEscuela',
-                      'pleno','estudiantes','administrativos','senado','comunidadWeb',
-                      'otros');
-  foreach ($divulgaciones as $divulgacion) {
-    if (Input::get($divulgacion)!=null){
-      $selected_divulgaciones = $selected_divulgaciones.'\n'.Input::get($divulgacion);
+
+    //OUTCOMES Join criteria join program
+    $programs = DB::table('programs')
+      ->select('id', 'name')
+      ->orderBy('name', 'asc')
+      ->get();
+
+
+
+    // $program
+    $tables_names = '{';
+    foreach ($programs as $program) {
+      $tables_names = $tables_names . '"table' . $program->id . '" : "' . $program->name . '",'; // code...
     }
-  }
+    $tables_names = $tables_names . '}';
+
+    $title = "Programs Reports";
+    // $title = "Program Report: ".$program->name;
+
+    $programs_info = array();
+    //OUTCOMES Join criteria join program
+    foreach ($programs as $program) {
+      $info_by_id = Program::find($program->id);
+
+      $domains = DB::table('outcomes')
+        ->join('criteria', 'criteria.outcome_id', '=', 'outcomes.id')
+        ->join('programs', 'programs.id', '=', 'criteria.program_id')
+        ->join('courses', 'courses.program_id', '=', 'programs.id')
+        ->where('programs.id', $program->id)
+        ->select('outcomes.name', 'outcomes.activation_date')
+        ->distinct()
+        ->orderBy('outcomes.name', 'asc')
+        ->get();
 
-  //OUTCOMES Join criteria join program
-  $programs = DB::table('programs')
-                        ->select('id','name')
-                        ->orderBy('name', 'asc')
-                        ->get();
-
-
-
-   // $program
-   $tables_names = '{';
-   foreach ($programs as $program) {
-     $tables_names = $tables_names.'"table'.$program->id.'" : "'.$program->name.'",';// code...
-   }
-   $tables_names = $tables_names.'}';
-
-   $title = "Programs Reports";
-   // $title = "Program Report: ".$program->name;
-
-   $programs_info = array();
-   //OUTCOMES Join criteria join program
-   foreach ($programs as $program) {
-     $info_by_id = Program::find($program->id);
-
-     $domains = DB::table('outcomes')
-                           ->join('criteria','criteria.outcome_id','=','outcomes.id')
-                           ->join('programs','programs.id','=','criteria.program_id')
-                           ->join('courses','courses.program_id','=','programs.id')
-                           ->where('programs.id',$program->id)
-                           ->select('outcomes.name','outcomes.activation_date')
-                           ->distinct()
-                           ->orderBy('outcomes.name', 'asc')
-                           ->get();
-
-     $courses_used = DB::table('outcomes')
-                           ->join('criteria','criteria.outcome_id','=','outcomes.id')
-                           ->join('programs','programs.id','=','criteria.program_id')
-                           ->join('courses','courses.program_id','=','programs.id')
-                           ->where('programs.id',$program->id)
-                           ->select('courses.number', 'outcomes.name as domain_name', 'courses.code')
-                           ->distinct()
-                           ->orderBy('courses.name', 'asc')
-                           ->get();
-
-     $transformative_actions = DB::table('outcomes')
-                           ->join('criteria','criteria.outcome_id','=','outcomes.id')
-                           ->join('programs','programs.id','=','criteria.program_id')
-                           ->join('courses','courses.program_id','=','programs.id')
-                           ->join('activities','activities.course_id','=','courses.id')
-                           ->join('activity_criterion','activity_criterion.activity_id','=','activities.id')
-                           ->where('programs.id',$program->id)
-                           ->select('activity_criterion.transformative_actions', 'outcomes.name as domain_name')
-                           ->distinct()
-                           ->orderBy('activity_criterion.transformative_actions', 'asc')
-                           ->get();
-     $info = array($info_by_id, $domains, $courses_used, $transformative_actions);
-     array_push($programs_info, $info);
-   }
-
-
-   return View::make('local.managers.shared.program_report', compact('title','programs_info','selected_divulgaciones','selected_semesters','tables_names'));
-}
+      $courses_used = DB::table('outcomes')
+        ->join('criteria', 'criteria.outcome_id', '=', 'outcomes.id')
+        ->join('programs', 'programs.id', '=', 'criteria.program_id')
+        ->join('courses', 'courses.program_id', '=', 'programs.id')
+        ->where('programs.id', $program->id)
+        ->select('courses.number', 'outcomes.name as domain_name', 'courses.code')
+        ->distinct()
+        ->orderBy('courses.name', 'asc')
+        ->get();
 
-//   public function show($id)
-//   {
-//
-//     $program = Program::find($id);
-//     $title= $program->school->name.': '.$program->name;
-//     $program_courses = $program->courses;
-//     $outcomes = Outcome::orderBy('name', 'asc')->get();
-//     $schools = School::all();
-//     $outcomeCount = Outcome::all()->count();
-//
-//
-//     $outcomes_achieved = array_fill(1, $outcomeCount, 0);
-//     $outcomes_attempted = array_fill(1, $outcomeCount, 0);
-//
-//     $assessed_courses_count=0;
-//     foreach ($program_courses as $course)
-//     {
-//         if($course->outcomes_achieved!=NULL)
-//         {
-//             $course_outcomes_achieved =json_decode($course->outcomes_achieved, true);
-//             $course_outcomes_attempted =json_decode($course->outcomes_attempted, true);
-//             for($i=1; $i<=count($outcomes_attempted); $i++)
-//             {
-//                 $outcomes_achieved[$i]+=$course_outcomes_achieved[$i];
-//                 $outcomes_attempted[$i]+=$course_outcomes_attempted[$i];
-//             }
-//             $assessed_courses_count+=1;
-//         }
-//     }
-//
-//     /**
-//      * List of grouped courses (grouped sections)
-//      */
-//
-//     $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();
-//
-//     // Program contact information
-//     $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();
-//
-//     return View::make('local.managers.shared.program', compact('title', 'outcomes', 'outcomes_attempted', 'outcomes_achieved', 'schools', 'program_courses', 'assessed_courses_count', 'grouped_courses', 'program', 'users'));
-//
-// }
+      $transformative_actions = DB::table('outcomes')
+        ->join('criteria', 'criteria.outcome_id', '=', 'outcomes.id')
+        ->join('programs', 'programs.id', '=', 'criteria.program_id')
+        ->join('courses', 'courses.program_id', '=', 'programs.id')
+        ->join('activities', 'activities.course_id', '=', 'courses.id')
+        ->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
+        ->where('programs.id', $program->id)
+        ->select('activity_criterion.transformative_actions', 'outcomes.name as domain_name')
+        ->distinct()
+        ->orderBy('activity_criterion.transformative_actions', 'asc')
+        ->get();
+      $info = array($info_by_id, $domains, $courses_used, $transformative_actions);
+      array_push($programs_info, $info);
+    }
+
+
+    return View::make('local.managers.shared.program_report', compact('title', 'programs_info', 'selected_divulgaciones', 'selected_semesters', 'tables_names'));
+  }
+
+  //   public function show($id)
+  //   {
+  //
+  //     $program = Program::find($id);
+  //     $title= $program->school->name.': '.$program->name;
+  //     $program_courses = $program->courses;
+  //     $outcomes = Outcome::orderBy('name', 'asc')->get();
+  //     $schools = School::all();
+  //     $outcomeCount = Outcome::all()->count();
+  //
+  //
+  //     $outcomes_achieved = array_fill(1, $outcomeCount, 0);
+  //     $outcomes_attempted = array_fill(1, $outcomeCount, 0);
+  //
+  //     $assessed_courses_count=0;
+  //     foreach ($program_courses as $course)
+  //     {
+  //         if($course->outcomes_achieved!=NULL)
+  //         {
+  //             $course_outcomes_achieved =json_decode($course->outcomes_achieved, true);
+  //             $course_outcomes_attempted =json_decode($course->outcomes_attempted, true);
+  //             for($i=1; $i<=count($outcomes_attempted); $i++)
+  //             {
+  //                 $outcomes_achieved[$i]+=$course_outcomes_achieved[$i];
+  //                 $outcomes_attempted[$i]+=$course_outcomes_attempted[$i];
+  //             }
+  //             $assessed_courses_count+=1;
+  //         }
+  //     }
+  //
+  //     /**
+  //      * List of grouped courses (grouped sections)
+  //      */
+  //
+  //     $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();
+  //
+  //     // Program contact information
+  //     $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();
+  //
+  //     return View::make('local.managers.shared.program', compact('title', 'outcomes', 'outcomes_attempted', 'outcomes_achieved', 'schools', 'program_courses', 'assessed_courses_count', 'grouped_courses', 'program', 'users'));
+  //
+  // }
 
 
   /**
@@ -301,12 +287,18 @@ public function showReport()
   {
 
     $program = Program::find($id);
-    $title= $program->name.' Assessment Report - '.date('m/d/Y');
+    $title = $program->name . ' Assessment Report - ' . date('m/d/Y');
     $program_courses = $program->courses;
-    $outcomes = Outcome::orderBy('name', 'asc')->get();
+    /* //$outcomes = Outcome::orderBy('name', 'asc')->get();
     $schools = School::all();
-    $outcomeCount = Outcome::all()->count();
+   // $outcomeCount = Outcome::all()->count();
+    $semesters = Session::get('semesters_ids');
+    $semesters = DB::table('semesters')->where('id', $course->semester_id)->orderBy('start', 'ASC')->first();
 
+    $outcomes = Outcome::select(array('id', 'name', 'expected_outcome'))
+        ->whereNull('deleted_at')
+        ->whereRaw("(deactivation_date IS NULL or deactivation_date >= '{$semesters->start}')")
+        ->orderBy('name', 'ASC')->get();
 
     $outcomes_achieved = array_fill(1, $outcomeCount, 0);
     $outcomes_attempted = array_fill(1, $outcomeCount, 0);
@@ -331,7 +323,7 @@ public function showReport()
      * List of grouped courses (grouped sections)
      */
 
-    $grouped_courses = Course::
+    /*    $grouped_courses = Course::
       select(DB::raw('name, code, number, max(outcomes_attempted) as outcomes_attempted, semester_id, program_id'))
       ->with('semester')
       ->with('program')
@@ -342,6 +334,105 @@ public function showReport()
       ->orderBy('number')
       ->orderBy('semester_id')
       ->get();
+*/
+
+    $semesters = Session::get('semesters_ids');
+    $semesters = DB::table('semesters')->whereIn('id', $semesters)->orderBy('start', 'ASC')->first();
+    Log::info($semesters->start);
+    $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();
+    $outcomeCount = count($outcomes);
+
+    $programs_array = array();
+    $programs_contact = array();
+
+
+
+    foreach ($programs as $program) {
+      $program_array = array();
+
+      $program_array['program'] = $program;
+
+      $program_array['outcomes_achieved'] = [];
+      $program_array['outcomes_attempted'] = [];
+
+      $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 (!empty($course->outcomes_ach())) {
+          $program_array['course_outcomes_achieved'] = $course->outcomes_ach();
+          $program_array['course_outcomes_attempted'] = $course->outcomes_att();
+          Log::info($program_array['course_outcomes_achieved']);
+          foreach ($program_array['course_outcomes_achieved'] as $i => $score) {
+            if (array_key_exists($i, $program_array['outcomes_achieved']))  $program_array['outcomes_achieved'][$i] += $program_array['course_outcomes_achieved'][$i];
+            else $program_array['outcomes_achieved'][$i] = $program_array['course_outcomes_achieved'][$i];
+          }
+          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];
+          }
+
+          $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(); */
+      $program_array['grouped_courses'] = Course::select(DB::raw('name, code, number, 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();
+
+      $programs_array[] = $program_array;
+
+
+      // Program contact information
+      $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();
+
+
+      $programs_contact[] = $users;
+    }
 
     return View::make('local.managers.shared.print_program', compact('title', 'program', 'outcomes', 'outcomes_attempted', 'outcomes_achieved', 'schools', 'program_courses', 'assessed_courses_count', 'grouped_courses'));
   }
@@ -361,11 +452,11 @@ public function showReport()
   }
 
   /**
-  * Fetch a program
-  */
+   * Fetch a program
+   */
   public function fetch()
   {
-    Log::info('id:'.Input::get('id'));
+    Log::info('id:' . Input::get('id'));
     return School::find(Input::get('id'))->programs;
   }
 }

app/controllers/RubricsController.php

@@ -105,6 +105,8 @@ class RubricsController extends \BaseController
 
             DB::table('rubric_activity')->insert(array('activity_id' => Input::get('activity_id'), 'rubric_id' => $rubric->id));
             DB::commit();
+            $activity_id = Input::get("activity_id");
+
 
             $rubricId = $rubric->id;
             foreach ($criteria as $index => $criterion_id) {
@@ -115,7 +117,7 @@ class RubricsController extends \BaseController
 
 
 
-                $activity_id = Input::get("activity_id");
+
                 DB::insert("insert into `activity_criterion` (`activity_id`,`criterion_id`, `weight`) values ({$activity_id}, {$criterion_id}, {$defaultWeight})");
                 DB::commit();
             }
@@ -263,7 +265,7 @@ class RubricsController extends \BaseController
         foreach ($criteria as $index => $criterion_id) {
 
 
-            $result =  DB::insert("insert into rubric_criterion (`rubric_id`, `criterion_id`) values ({$rubric->id}, {$criterion_id}) ");
+            $result =  DB::insert("insert into rubric_criterion (`rubric_id`, `criterion_id`, `position`) values ({$rubric->id}, {$criterion_id}, {$index}) ");
             $result2 = DB::insert("insert into `activity_criterion` (`activity_id`,`criterion_id`, `weight`) values ({$activity->id}, {$criterion_id}, {$defaultWeight})");
             if (!($result || $result2)) {
                 DB::rollBack();
@@ -365,9 +367,29 @@ class RubricsController extends \BaseController
             App::abort('403', 'Access Forbidden');
 
         $rubric = Rubric::where('id', '=', $rubric_id)->firstOrFail();
+        $rubric_criterion = DB::table('criteria')
+            ->join('rubric_criterion', 'rubric_criterion.criterion_id', '=', 'criteria.id')
+            ->where('rubric_criterion.rubric_id', '=', $rubric->id)
+            ->get();
+        $rubric->titles = DB::table('titles')
+            ->join('rubric_title', 'rubric_title.title_id', '=', 'titles.id')
+            ->where('rubric_title.rubric_id', $rubric->id)
+            ->orderBy('position')
+            ->lists('text');
+
+        foreach ($rubric_criterion as $single_cr) {
+            $single_cr->scales = DB::table('scales')
+                ->join('criterion_scale', 'criterion_scale.scale_id', '=', 'scales.id')
+                ->where('criterion_scale.criterion_id', '=', $single_cr->criterion_id)
+                ->orderBy('position')
+                ->lists('description');
+            $single_cr->outcomes = DB::table('outcomes')
+                ->join('criterion_objective_outcome', 'outcomes.id', '=', 'criterion_objective_outcome.outcome_id')
+                ->where('criterion_objective_outcome.criterion_id', '=', $single_cr->criterion_id)->lists('name');
+        }
         $title = $rubric->name;
         $role = Auth::user()->role;
-        return View::make('local.managers.shared.view_rubric_limited', compact('rubric', 'title', 'role'));
+        return View::make('local.managers.shared.view_rubric_limited', compact('rubric', 'rubric_criterion', 'title', 'role'));
     }
 
     public function download($activity_id, $rubric_id)

app/controllers/SchoolCoordinatorsController.php

@@ -1,7 +1,8 @@
 <?php
 
-class SchoolCoordinatorsController extends \BaseController {
-    
+class SchoolCoordinatorsController extends \BaseController
+{
+
     private function participatingPrograms($school)
     {
         return DB::table('VIEW_participating_programs')
@@ -13,275 +14,328 @@ class SchoolCoordinatorsController extends \BaseController {
     public function overview()
     {
         DB::disableQueryLog();
-        Log::debug('user'.Auth::user()->id);
+        Log::debug('user' . Auth::user()->id);
 
         //TODO Find a better way to prevent non-scoords from reaching the page
-        switch(Auth::user()->role)
-        {
-        case 1:
-            return Redirect::to('administrator');
-            break;
-        case 3:
-            return Redirect::to('program-coordinator');
-            break;
+        switch (Auth::user()->role) {
+            case 1:
+                return Redirect::to('administrator');
+                break;
+            case 3:
+                return Redirect::to('program-coordinator');
+                break;
         }
 
         $schools = School::orderBy('name', 'asc')->get();
         $school = Auth::user()->school;
-        $title = $school->name.' '.'Overview';
+        $title = $school->name . ' ' . 'Overview';
         $id = $school->id;
 
         $outcomes = Outcome::orderBy('name', 'asc')->get();
         $outcomeCount = Outcome::all()->count();
 
-            /**
-             * List of grouped courses (grouped sections)
-             */
+        /** 
+         * List of grouped courses (grouped sections)
+         */
 
-            $program_ids= $school->programs->lists('id');
+        $program_ids = $school->programs->lists('id');
 
-            $undergrad_programs = DB::table('programs')
+        $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')
+        $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'))
-                ->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'))
-                ->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();
-
-            // Fetch programs with participation
-            $participating_programs = $this->participatingPrograms($school);
-
-
-            /**
-             * Calculate how many sections are doing assessment
-             */
-
-            $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_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;
+
+
+        /*$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'))
+            ->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();*/
+
+        $grad_grouped_courses = Course::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'))
+            ->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();*/
+
+        $undergrad_grouped_courses = Course::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();
+
+        // Fetch programs with participation
+        $participating_programs = $this->participatingPrograms($school);
+
+
+        /**
+         * Calculate how many sections are doing assessment
+         */
+
+        $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_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_school_sections_count+=1;
+                        $undergrad_assessed_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;
+                    $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_school_sections_count+=1;
+                        $grad_assessed_sections_count += 1;
                     }
-                }    
+                    $grad_school_sections_count += 1;
+                }
             }
+        }
+*/
 
-            /**
-             * Calculate how many programs achieved and attempted each outcome in this school
-             */
-
-            // Number of programs that achieved a particular learning outcome
-            $achievedUndergradProgramsPerOutcome = array_fill(1, $outcomeCount, 0);
-
-            // Number of programs that attempted a particular learning outcome
-            $attemptedUndergradProgramsPerOutcome = array_fill(1, $outcomeCount, 0);
-
-            // Fetch programs with participation for the school
-            $participating_undergrad_programs = DB::table('VIEW_participating_programs')
-                ->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)
-            {
-                // 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();
-
-                foreach ($programs_with_courses as $program)
-                {
-                    // 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);
-
-                    //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 = json_decode($course->outcomes_attempted, true);
-                        $course_outcomes_achieved2 = json_decode($course->outcomes_achieved, true);
-                        if(array_key_exists($outcome->id, $course_outcomes_attempted2 )
-                            && $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 ($school->programs as $program) {
+            foreach ($program->courses as $course) {
+                if (!$course->program->is_graduate) {
+                    if ($course->outcomes_achieved != NULL) {
+                        $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;
                     }
-                    //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);
+                    $undergrad_school_sections_count += 1;
+                } else {
+                    if ($course->outcomes_achieved != NULL) {
+                        $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;
                 }
             }
+        }
 
-            /**
-             * Calculate how many programs achieved and attempted each outcome in this school
-             */
-
-            // Number of programs that achieved a particular learning outcome
-            $achievedGradProgramsPerOutcome = array_fill(1, $outcomeCount, 0);
-
-            // Number of programs that attempted a particular learning outcome
-            $attemptedGradProgramsPerOutcome = array_fill(1, $outcomeCount, 0);
-
-            // Fetch programs with participation for the school
-            $participating_grad_programs = DB::table('VIEW_participating_programs')
-                ->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
-                $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);
-
-                    //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 = json_decode($course->outcomes_attempted, true);
-                        $course_outcomes_achieved2 = json_decode($course->outcomes_achieved, true);
-                        if(array_key_exists($outcome->id, $course_outcomes_attempted2 )
-                            && $course_outcomes_attempted2[$outcome->id]>0)
-                        {
-                            $achieved_outcomes_per_grad_program[$outcome->id]+=$course_outcomes_achieved2[$outcome->id];
-                            $attempted_outcomes_per_grad_program[$outcome->id]+=$course_outcomes_attempted2[$outcome->id];
-
-                            // Add one to the programs assessing, if it wasn't added before
-                            if(!$flag)
-                            {
-                                $attemptedGradProgramsPerOutcome[$outcome->id]+=1;
-                                $flag= true;
-                            }
-                        }
+        /**
+         * Calculate how many programs achieved and attempted each outcome in this school
+         */
 
-                        // $output[] = 'ACHIEVED: '.$program->name.'-'.json_encode($achieved_outcomes_per_grad_program);
-                        // $output[] = 'ATTEMPTED: '.$program->name.'-'.json_encode($attempted_outcomes_per_program);
+        // Number of programs that achieved a particular learning outcome
+        $achievedUndergradProgramsPerOutcome = array_fill(1, $outcomeCount, 0);
 
+        // Number of programs that attempted a particular learning outcome
+        $attemptedUndergradProgramsPerOutcome = array_fill(1, $outcomeCount, 0);
+
+        // Fetch programs with participation for the school
+        $participating_undergrad_programs = DB::table('VIEW_participating_programs')
+            ->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) {
+            // 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'));
+                $query->join('activities', 'activities.course_id', '=', 'courses.id')
+                    ->join('activity_criterion as ac', 'ac.activity_id', '=', 'activities.id')
+                    ->join('assessments', 'assessments.activity_criterion_id', '=', 'ac.id')
+                    ->where('activities.draft', 0)
+                    ->select('courses.*')->distinct();
+            }))->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
+                $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(); //json_decode($course->outcomes_attempted, true);
+                    $course_outcomes_achieved2 = $course->outcomes_ach(); //json_decode($course->outcomes_achieved, true);
+                    if (
+                        array_key_exists($outcome->id, $course_outcomes_attempted2)
+                        && $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;
+                        }
                     }
-                    //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);
-                    }
+
+                    // $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);
                 }
             }
-            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'));
         }
 
+        /**
+         * Calculate how many programs achieved and attempted each outcome in this school
+         */
+
+        // Number of programs that achieved a particular learning outcome
+        $achievedGradProgramsPerOutcome = array_fill(1, $outcomeCount, 0);
+
+        // Number of programs that attempted a particular learning outcome
+        $attemptedGradProgramsPerOutcome = array_fill(1, $outcomeCount, 0);
+
+        // Fetch programs with participation for the school
+        $participating_grad_programs = DB::table('VIEW_participating_programs')
+            ->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
+            $programs_with_courses = Program::with(array('courses' => function ($query) {
+                //$query->whereNotNull('outcomes_attempted');
+
+                $query->whereIn('semester_id', Session::get('semesters_ids'));
+                $query->join('activities', 'activities.course_id', '=', 'courses.id')
+                    ->join('activity_criterion as ac', 'ac.activity_id', '=', 'activities.id')
+                    ->join('assessments', 'assessments.activity_criterion_id', '=', 'ac.id')
+                    ->where('activities.draft', 0)
+                    ->select('courses.*')->distinct();
+            }))->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);
+
+                //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();  // json_decode($course->outcomes_attempted, true);
+                    $course_outcomes_achieved2 = $course->outcomes_ach(); //json_decode($course->outcomes_achieved, true);
+                    if (
+                        array_key_exists($outcome->id, $course_outcomes_attempted2)
+                        && $course_outcomes_attempted2[$outcome->id] > 0
+                    ) {
+                        $achieved_outcomes_per_grad_program[$outcome->id] += $course_outcomes_achieved2[$outcome->id];
+                        $attempted_outcomes_per_grad_program[$outcome->id] += $course_outcomes_attempted2[$outcome->id];
+
+                        // Add one to the programs assessing, if it wasn't added before
+                        if (!$flag) {
+                            $attemptedGradProgramsPerOutcome[$outcome->id] += 1;
+                            $flag = true;
+                        }
+                    }
+
+                    // $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);
+                }
+            }
+        }
+        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'));
+    }
 }

app/controllers/StudentsController.php

@@ -1,29 +1,94 @@
 <?php
 
-class StudentsController extends \BaseController {
+class StudentsController extends \BaseController
+{
 
   public function show($semester_id, $course_identifier, $number)
   {
 
-  	$student = Student::where('number', '=', $number)->first();
-  	$code = substr($course_identifier, 0, 4);
-  	$number = substr($course_identifier, 4, 4);
-  	$section = substr($course_identifier, 9, 4);
-  	$course = Course::where('code', $code)->where('number', $number)->where('section', $section)->where('semester_id', $semester_id)->first();
-  	$title = $student->name;
+    $student = Student::where('number', '=', $number)->first();
+    $code = substr($course_identifier, 0, 4);
+    $number = substr($course_identifier, 4, 4);
+    $section = substr($course_identifier, 9, 4);
+    $course = Course::where('code', $code)->where('number', $number)->where('section', $section)->where('semester_id', $semester_id)->first();
+    $title = $student->name;
 
-  	$activities = $course->assessedActivities;
-  	$activitiesArray = array();
-  	foreach ($activities as $activity)
-  	{
-  		$activitiesArray[]=$activity->id;
-  	}
+
+    $activities = $course->assessedActivities;
+    //$activitiesArray = array();
+    //	foreach ($activities as $activity)
+    //	{
+    //		$activitiesArray[]=$activity->id;
+    //	}
 
     // If the student has be assessed
-    if(!$activities->isEmpty())
-    {
+    if (!$activities->isEmpty()) {
+
       // Get the assessments
-      $assessments = DB::table('assessments')->whereIn('activity_id', $activitiesArray)->where('student_id', '=', $student->id)->orderBy('created_at')->get();
+      $assessments = [];
+
+      foreach ($activities as $activity) {
+
+        if ($activity->isStudentAssessed($student->id) == 0)
+          continue;
+        $assessments[$activity->id]['activity'] = $activity->name;
+        $activity_criterion = DB::table('activity_criterion')
+          ->join('criteria', 'criteria.id', '=', 'activity_criterion.criterion_id')
+          ->where('activity_id', $activity->id)
+          ->select('activity_criterion.id as ac_id', 'activity_criterion.weight')
+          ->addSelect('criteria.*')
+          ->get();
+
+
+        $activity_comments = DB::table('activity_student')
+          ->where('student_id', $student->id)
+          ->where('activity_id', $activity->id)
+          ->first()->comments;
+        $sum_of_score = 0;
+        $sum_of_weight = 0;
+        $max_score = $activity->rubric[0]->max_score;
+        foreach ($activity_criterion as $ac) {
+
+          $assessment_score = DB::table('assessments')
+            ->where('activity_criterion_id', $ac->ac_id)
+            ->where('student_id', $student->id)
+            ->first();
+
+
+          if ($assessment_score) {
+            Log::info($assessment_score->student_id);
+
+            $assessments[$activity->id]["criteria"][$ac->id] = $ac;
+            $sum_of_score += $ac->weight * $assessment_score->score;
+            $sum_of_weight += $ac->weight;
+
+            $assessments[$activity->id]["score"][$ac->id] = $assessment_score->score;
+            $assessments[$activity->id]['comments'] = $activity_comments;
+
+            $index_scale = ceil($assessment_score->score * $ac->num_scales / $ac->max_score) - 1;
+            if ($index_scale == -1) $index_scale = 0;
+
+            $assessments[$activity->id]["explication"][$ac->id] = DB::table('criterion_scale')
+              ->join('scales', 'scales.id', '=', 'criterion_scale.scale_id')
+              ->where("criterion_id", $ac->id)
+              ->where("position", $index_scale)
+              ->first()
+              ->description;
+          } else {
+            $assessments[$activity->id]["criteria"][$ac->id] = $ac;
+            $assessments[$activity->id]["score"][$ac->id] = "N/A";
+            $assessments[$activity->id]["explication"][$ac->id] = '';
+            $assessments[$activity->id]['comments'] = '';
+          }
+        }
+        if ($sum_of_weight != 0)
+          $assessments[$activity->id]['percentage'] = round((100 * ($sum_of_score / ($max_score * $sum_of_weight))), 2);
+        else
+          $assessments[$activity->id]['percentage'] = 0;
+      }
+
+
+      //$assessments = DB::table('assessments')->whereIn('activity_id', $activitiesArray)->where('student_id', '=', $student->id)->orderBy('created_at')->get();
 
       // foreach ($assessments as $assessed_activity)
       // {
@@ -63,9 +128,9 @@ class StudentsController extends \BaseController {
       //   //Save to activity array
       //   $activitiesArray[]=$outcomes_per_activity;
       // }
-    }
-    else
+    } else
       $assessments = NULL;
+    Log::info($assessments);
 
     return View::make('local.professors.student', compact('student', 'course', 'title', 'assessments'));
   }
@@ -73,7 +138,7 @@ class StudentsController extends \BaseController {
   public function printStudentReport($semester_id, $course_identifier, $number)
   {
 
-    $student = Student::where('number', '=', $number)->first();
+    /*$student = Student::where('number', '=', $number)->first();
     $code = substr($course_identifier, 0, 4);
     $number = substr($course_identifier, 4, 4);
     $section = substr($course_identifier, 9, 4);
@@ -82,57 +147,136 @@ class StudentsController extends \BaseController {
 
     $activities = $course->assessedActivities;
     $activitiesArray = array();
-    foreach ($activities as $activity)
-    {
-      $activitiesArray[]=$activity->id;
+    foreach ($activities as $activity) {
+      $activitiesArray[] = $activity->id;
     }
 
-    if(!$activities->isEmpty())
-    {
+    if (!$activities->isEmpty()) {
       $assessments = DB::table('assessments')->whereIn('activity_id', $activitiesArray)->where('student_id', '=', $student->id)->get();
 
-      foreach ($assessments as $assessed_activity)
-      {
+      foreach ($assessments as $assessed_activity) {
         $outcomes_achieved = array_fill(1, Outcome::all()->count(), 0);
         $outcomes_attempted = array_fill(1, Outcome::all()->count(), 0);
 
         $single_activity_scores = json_decode($assessed_activity->scores);
-        foreach($single_activity_scores as $criterion_id=>$criterion_score)
-        {
-            // Find corresponding learning outcome;
-            $criterion = Criterion::withTrashed()->find($criterion_id);
-            $outcome = Outcome::find($criterion->outcome_id);
-
-            // If criterion is achieved (1), add 1 to all arrays
-            if($criterion_score >= Rubric::find($activity->rubric_id)->expected_points)
-            {
-                $outcomes_attempted[$outcome->id]+=1;
-                $outcomes_achieved[$outcome->id]+=1;;
-            }
-            // Else, only add to the attempted outcomes array
-            else
-            {
-                $outcomes_attempted[$outcome->id]+=1;
-            }
+        foreach ($single_activity_scores as $criterion_id => $criterion_score) {
+          // Find corresponding learning outcome;
+          $criterion = Criterion::withTrashed()->find($criterion_id);
+          $outcome = Outcome::find($criterion->outcome_id);
+
+          // If criterion is achieved (1), add 1 to all arrays
+          if ($criterion_score >= Rubric::find($activity->rubric_id)->expected_points) {
+            $outcomes_attempted[$outcome->id] += 1;
+            $outcomes_achieved[$outcome->id] += 1;;
+          }
+          // Else, only add to the attempted outcomes array
+          else {
+            $outcomes_attempted[$outcome->id] += 1;
+          }
         }
 
         $outcomes_per_activity = array_fill(1, Outcome::all()->count(), 0);
-        foreach ($outcomes_attempted as $index=>$outcome_attempted)
-        {
-          if($outcomes_attempted[$index]!=0)
-          {
+        foreach ($outcomes_attempted as $index => $outcome_attempted) {
+          if ($outcomes_attempted[$index] != 0) {
             // For each outcome in the activity, calculate and save the percentage
-            $outcomes_per_activity[$index] = (float)$outcomes_achieved[$index]/$outcomes_attempted[$index]*100;
+            $outcomes_per_activity[$index] = (float)$outcomes_achieved[$index] / $outcomes_attempted[$index] * 100;
           }
         }
 
         //Save to activity array
-        $activitiesArray[]=$outcomes_per_activity;
+        $activitiesArray[] = $outcomes_per_activity;
       }
-    }
-    else
+    } else
+      $assessments = NULL;
+      */
+    $student = Student::where('number', '=', $number)->first();
+    $code = substr($course_identifier, 0, 4);
+    $number = substr($course_identifier, 4, 4);
+    $section = substr($course_identifier, 9, 4);
+    $course = Course::where('code', $code)->where('number', $number)->where('section', $section)->where('semester_id', $semester_id)->first();
+    $title = $student->name;
+
+
+    $activities = $course->assessedActivities;
+    //$activitiesArray = array();
+    //	foreach ($activities as $activity)
+    //	{
+    //		$activitiesArray[]=$activity->id;
+    //	}
+
+    // If the student has be assessed
+    if (!$activities->isEmpty()) {
+
+      // Get the assessments
+      $assessments = [];
+
+      foreach ($activities as $activity) {
+
+        if ($activity->isStudentAssessed($student->id) == 0)
+          continue;
+        $assessments[$activity->id]['activity'] = $activity->name;
+        $activity_criterion = DB::table('activity_criterion')
+          ->join('criteria', 'criteria.id', '=', 'activity_criterion.criterion_id')
+          ->where('activity_id', $activity->id)
+          ->select('activity_criterion.id as ac_id', 'activity_criterion.weight')
+          ->addSelect('criteria.*')
+          ->get();
+
+
+        $activity_comments = DB::table('activity_student')
+          ->where('student_id', $student->id)
+          ->where('activity_id', $activity->id)
+          ->first()->comments;
+        $sum_of_score = 0;
+        $sum_of_weight = 0;
+        $max_score = $activity->rubric[0]->max_score;
+        foreach ($activity_criterion as $ac) {
+
+          $assessment_score = DB::table('assessments')
+            ->where('activity_criterion_id', $ac->ac_id)
+            ->where('student_id', $student->id)
+            ->first();
+
+
+          if ($assessment_score) {
+            Log::info($assessment_score->student_id);
+
+            $assessments[$activity->id]["criteria"][$ac->id] = $ac;
+            $sum_of_score += $ac->weight * $assessment_score->score;
+            $sum_of_weight += $ac->weight;
+
+            $assessments[$activity->id]["score"][$ac->id] = $assessment_score->score;
+            $assessments[$activity->id]['comments'] = $activity_comments;
+
+            $index_scale = ceil($assessment_score->score * $ac->num_scales / $ac->max_score) - 1;
+            if ($index_scale == -1) $index_scale = 0;
+
+            $assessments[$activity->id]["explication"][$ac->id] = DB::table('criterion_scale')
+              ->join('scales', 'scales.id', '=', 'criterion_scale.scale_id')
+              ->where("criterion_id", $ac->id)
+              ->where("position", $index_scale)
+              ->first()
+              ->description;
+          } else {
+            $assessments[$activity->id]["criteria"][$ac->id] = $ac;
+            $assessments[$activity->id]["score"][$ac->id] = "N/A";
+            $assessments[$activity->id]["explication"][$ac->id] = '';
+            $assessments[$activity->id]['comments'] = '';
+          }
+        }
+        if ($sum_of_weight != 0)
+          $assessments[$activity->id]['percentage'] = round((100 * ($sum_of_score / ($max_score * $sum_of_weight))), 2);
+        else
+          $assessments[$activity->id]['percentage'] = 0;
+      }
+    } else
       $assessments = NULL;
 
-    return View::make('local.professors.print_student_report', compact('student', 'course', 'title', 'assessments', 'activitiesArray'));
+
+    return View::make(
+      'local.professors.print_student_report',
+      // compact('student', 'course', 'title', 'assessments', 'activitiesArray'))
+      compact('student', 'course', 'title', 'assessments')
+    );
   }
 }

app/controllers/ThreeYearPlanController.php

@@ -40,7 +40,7 @@ class ThreeYearPlanController extends \BaseController
     }
   }
   // load the Three year Plan page
-  public function threeYearsReport()
+  public function threeYearsReport($program_id)
   {
     $user_id = Auth::user()->id;
 
@@ -64,11 +64,11 @@ class ThreeYearPlanController extends \BaseController
       ->orderBy('year_start', 'asc')
       ->get();
     $criteria = Criterion::withTrashed()->orderBy('name', 'ASC')->get();
-    $program_id = DB::table('program_user')
+    /*   $program_id = DB::table('program_user')
       ->where('user_id', $user_id)
       ->select('program_id')
       ->get();
-    $program_id = $program_id[0]->program_id;
+    $program_id = $program_id[0]->program_id;*/
     $outcomes = DB::table('outcomes')->where('deactivation_date', '=', null)->orderBy('name', 'ASC')->get();
     // se annadio la nueva variable
     return View::make('global.view-three-year-plan', compact('title', 'last_year', 'outcomes', 'typs', 'criteria', 'semesters', 'program_id'));

app/controllers/TransformativeActionsController.php

@@ -1230,6 +1230,39 @@ class TransformativeActionsController extends \BaseController
       }
     }
 
+    $typ_semester_outcome = DB::table('typ_semester_outcome')
+      ->whereIn('semester_id', $semesters)
+      ->where('outcome_id', $outcome_id)
+      ->lists('id');
+
+
+    //each row has objectives, repeated ta, but distinct activity_criterion_id
+    $objective_ta = DB::table('typ_semester_objectives')
+      ->join('transformative_objective as trob', 'trob.objective_id', '=', 'typ_semester_objectives.objective_id')
+      ->join('objectives', 'trob.objective_id', '=', 'objective_id')
+      ->join('transformative_actions', 'transformative_actions.id', 'trob.ta_id')
+      ->whereIn('typ_semester_objectives.typ_semester_outcome_id', $typ_semester_outcome)
+      ->select('transformative_actions.*')
+      ->addSelect('objectives.*')
+      ->distinct()
+      ->get();
+
+    $objective_ta = DB::table('typ_semester_objectives')
+      ->join('transformative_objective as trob', 'trob.objective_id', '=', 'typ_semester_objectives.objective_id')
+      ->join('objectives', 'trob.objective_id', '=', 'objective_id')
+      ->join('transformative_actions', 'transformative_actions.id', 'trob.ta_id')
+      ->whereIn('typ_semester_objectives.typ_semester_outcome_id', $typ_semester_outcome)
+      ->select('transformative_actions.*')
+      ->addSelect('objectives.*')
+      ->distinct()
+      ->lists();
+
+
+
+
+
+
+
     $grouped_courses = DB::table('courses')
       ->whereIn('program_id', $programs)
       ->whereIn('semester_id', $semesters)
@@ -1240,6 +1273,9 @@ class TransformativeActionsController extends \BaseController
 
 
 
+
+
+
     foreach ($grouped_courses as $course_name) {
       $course_name->sections = DB::table('courses')
         ->where('code', $course_name->code)
@@ -1258,7 +1294,7 @@ class TransformativeActionsController extends \BaseController
           ->where('criterion_objective_outcome.outcome_id', $outcome_id)
           ->select('activities.id as activity_id', 'activities.name')
           ->addSelect('transformative_actions.*', 'transformative_activity_criterion.trans_action_id as trans_action_id')
-          ->groupBy('transformative_actions.id')
+          ->groupBy('transformative_actions.id_')
           ->get();
         foreach ($section->activities as $activity) {
           $activity->objectives = DB::table('transformative_objective')

app/models/Activity.php

@@ -211,6 +211,31 @@ class Activity extends Eloquent
 
     return boolval(count($assessments));
   }
+
+  public function isStudentAssessed($student_id)
+  {
+    return DB::table('activities')
+      ->join('activity_criterion as ac', 'ac.activity_id', '=', 'activities.id')
+      ->join('assessments', 'assessments.activity_criterion_id', '=', 'ac.id')
+      ->where('activity_id', $this->id)
+      ->where('student_id', $student_id)
+      ->count();
+  }
+  public function transforming_actions()
+  {
+    $transformative_action = DB::table('activities')
+      ->join('activity_criterion as ac', 'ac.activity_id', '=', 'activities.id')
+      ->join('transformative_activity_criterion as tac', 'tac.activity_criterion_id', '=', 'ac.id')
+      ->join('transformative_actions as ta', 'ta.id', '=', 'tac.trans_action_id')
+      ->where('activities.id', $this->id)
+      ->select('ta.*')
+      ->first();
+    if ($transformative_action)
+      return $transformative_action->description;
+    else return '';
+  }
+
+
   public function getOAttArrayAttribute()
   {
 

app/models/Course.php

@@ -34,13 +34,32 @@ class Course extends Eloquent
   public function assessedActivities()
   {
     // return $this->hasMany('Activity')->whereNotNull('activities.outcomes_attempted')->orderBy('date', 'asc');
-    return $this->hasMany('Activity')->where('activities.draft', 0)->orderBy('date', 'asc');
+    $activitiesAssessed = DB::table('activities')
+      ->join('activity_criterion as ac', 'ac.activity_id', '=', 'activities.id')
+      ->join('assessments', 'assessments.activity_criterion_id', '=', 'ac.id')
+      ->where('activities.course_id', $this->id)
+      ->select('activities.id')
+      ->distinct()
+      ->lists('activities.id');
+    Log::info($activitiesAssessed);
+
+    return $this->hasMany('Activity')->whereIn('activities.id', $activitiesAssessed)->orderBy('date', 'asc');
+
+    //    return $this->hasMany('Activity')->where('activities.draft', 0)->orderBy('date', 'asc');
   }
 
   public function publishedActivities()
   {
+    $activitiesAssessed = DB::table('activities')
+      ->join('activity_criterion as ac', 'ac.activity_id', '=', 'activities.id')
+      ->join('assessments', 'assessments.activity_criterion_id', '=', 'ac.id')
+      ->where('activities.course_id', $this->id)
+      ->where('activities.draft', 0)
+      ->select('activities.id')
+      ->distinct()
+      ->lists('activities.id');
     //return $this->hasMany('Activity')->whereNotNull('activities.outcomes_attempted')->where('activities.draft', 0)->orderBy('date', 'asc');
-    return $this->hasMany('Activity')->where('activities.draft', 0)->orderBy('date', 'asc');
+    return  $this->hasMany('Activity')->whereIn('activities.id', $activitiesAssessed)->orderBy('date', 'asc');
   }
 
   public function outcomes_attempted()
@@ -136,6 +155,27 @@ class Course extends Eloquent
     return $outcomes_achieved;
   }
 
+  public function someSectionAssessed()
+  {
+    $all_sections = DB::table('courses')
+      ->join('activities', 'activities.course_id', '=', 'courses.id')
+      ->join('activity_criterion as ac', 'ac.activity_id', '=', 'activities.id')
+      ->join('assessments', 'assessments.activity_criterion_id', '=', 'ac.id')
+      ->where('courses.name', $this->name)
+      ->where('code', $this->code)
+      ->where('number', $this->number)
+      ->where('semester_id', $this->semester_id)
+      ->where(
+        'program_id',
+        $this->program_id
+      )
+      ->where('activities.draft', 0)
+      ->groupBy('courses.id')
+      ->count();
+
+    return $all_sections;
+  }
+
 
 
   public function outcomes_achieved()

app/models/Outcome.php

@@ -24,47 +24,47 @@ class Outcome extends Eloquent
 		return $this->hasMany('Objective');
 		//		return $this->belongsToMany('Objective', 'objective_outcome');
 	}
-// 	public function attempted($semester, $is_grad)
-// 	{
-// 		return 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)
-// 	    	->where('courses.semester_id','=',$semester)
-// 	    	->count(DB::raw('DISTINCT new_criteria.id,activity_criterion.activity_id'))
-// 			;
-//
-// 	}
-// 	public function attempted($semester, $is_grad)
-// 	{
-// 		 $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)
-// 	    	->where('courses.semester_id','=',$semester)
-// 	    	->select('new_criteria.id','expected_percentage_students_achieving','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++;
-// 			}
-// 		}
-// 		return $conteo;
-// 	}
+	// 	public function attempted($semester, $is_grad)
+	// 	{
+	// 		return 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)
+	// 	    	->where('courses.semester_id','=',$semester)
+	// 	    	->count(DB::raw('DISTINCT new_criteria.id,activity_criterion.activity_id'))
+	// 			;
+	//
+	// 	}
+	// 	public function attempted($semester, $is_grad)
+	// 	{
+	// 		 $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)
+	// 	    	->where('courses.semester_id','=',$semester)
+	// 	    	->select('new_criteria.id','expected_percentage_students_achieving','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++;
+	// 			}
+	// 		}
+	// 		return $conteo;
+	// 	}
 	public static function active_by_semesters($selected_semesters, $level)
 	{
 		$min_start = "9000-01-01 00:00:00";
@@ -99,30 +99,29 @@ class Outcome extends Eloquent
 		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)
-	    	->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('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)
+			->whereIn('courses.semester_id', $semesters_array)
+			->distinct()
+			->select('programs.id')
+			->get();
 
 		return $programs;
 	}
@@ -133,40 +132,37 @@ class Outcome extends Eloquent
 		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)
-	    	->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)
-			{
+		// 		 $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)
+			->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++;
 			}
 		}
@@ -183,38 +179,35 @@ class Outcome extends Eloquent
 			// 		exit();
 			$courses_array[] = $course->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)
-// 	    	->whereIn('courses.id',$courses_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')
+		// 		 $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)
+		// 	    	->whereIn('courses.id',$courses_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)
-	    	->whereIn('courses.id',$courses_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)
-			{
+			->where('criterion_objective_outcome.outcome_id', '=', $this->id)
+			->whereIn('courses.id', $courses_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++;
 			}
 		}
@@ -230,32 +223,31 @@ class Outcome extends Eloquent
 			$courses_array[] = $course->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)
-// 	    	->whereIn('courses.id',$courses_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')
+		// 		 $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)
+		// 	    	->whereIn('courses.id',$courses_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)
-	    	->whereIn('courses.id',$courses_array)
-	    	->select('criteria.id','expected_percentage','activity_criterion.activity_id')
-	    	->distinct()
-	    	->get()
-			;
+			->where('criterion_objective_outcome.outcome_id', '=', $this->id)
+			->whereIn('courses.id', $courses_array)
+			->select('criteria.id', 'expected_percentage as expected_percentage_students_achieving', 'activity_criterion.activity_id')
+			->distinct()
+			->get();
 
 		$conteo = 0;
 		foreach ($criteria as $criterion) {
@@ -281,36 +273,35 @@ class Outcome extends Eloquent
 			$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')
+		//   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)
-	    	->whereIn('courses.semester_id',$semesters_array)
-	    	->select('criteria.id','expected_percentage','activity_criterion.activity_id')
-	    	->distinct()
-	    	->get()
-			;
-// 		dd(DB::getQueryLog());
+			->where('criterion_objective_outcome.outcome_id', '=', $this->id)
+			->where('programs.is_graduate', '=', $is_grad)
+			->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) {
@@ -319,13 +310,10 @@ class Outcome extends Eloquent
 
 			if ($students_attempted) {
 				$percentage_students_who_achieved = 100.0 * $students_achieved / $students_attempted;
-			} 
-			else
-			{
-				$percentage_students_who_achieved=0;
+			} else {
+				$percentage_students_who_achieved = 0;
 			}
-			if($percentage_students_who_achieved>=$criterion->expected_percentage)
-			{
+			if ($percentage_students_who_achieved >= $criterion->expected_percentage) {
 				$conteo++;
 			}
 		}

app/routes.php

@@ -375,7 +375,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
 
 
         // Show users plan de tres a~nos
-        Route::get('three-years-plan', 'ThreeYearPlanController@threeYearsReport');
+        Route::get('three-years-plan/{program_id}', 'ThreeYearPlanController@threeYearsReport');
         Route::post('fetchThreeYears', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@fetchThreeYears'));
         Route::post('typ/lookUp', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@lookup_typ_semester_outcome'));
         Route::post('section2_arrive', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@section2_arrive'));
@@ -483,7 +483,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
         Route::post('transformativeAction/approveTA', array('before' => 'csrf', 'uses' => 'TransformativeActionsController@approveTA'));
 
         // Show users plan de tres a~nos
-        Route::get('three-years-plan', 'ThreeYearPlanController@threeYearsReport');
+        Route::get('three-years-plan/{program_id}', 'ThreeYearPlanController@threeYearsReport');
         Route::post('fetchThreeYears', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@fetchThreeYears'));
         Route::post('typ/lookUp', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@lookup_typ_semester_outcome'));
         Route::post('section2_arrive', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@section2_arrive'));

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

@@ -67,6 +67,8 @@
                                             ->where('code', $course->code)->where('number',$course->number)
                                             ->whereIn('semester_id', Session::get('semesters_ids'))
                                             ->get();
+
+                                            
                                         ?>
 
                                         @if(count($sections_evaluating_outcome))

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

@@ -15,7 +15,7 @@
 
     
           <li><a href="{{ URL::action('AnnualPlansController@showPlan', Auth::user()->programs[0]->id)}}">Annual Plan</a><li>
-        <li>{{ HTML::linkAction('ThreeYearPlanController@threeYearsReport', 'Three Years Plan') }}</li>
+        <li><a href="{{ URL::action('ThreeYearPlanController@threeYearsReport', Auth::user()->programs[0]->id) }}">Three Years Plan</a></li>
       </ul>
       </li>
      

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

@@ -75,7 +75,7 @@
                                                         <td class="col-md-3">{{{ $grouped_course->name}}}</td>
                                                         <td class="col-md-3">{{{ $grouped_course->program->name }}}</td>
                                                         <td class="col-md-2">
-                                                            @if($grouped_course->outcomes_attempted!=NULL)
+                                                            @if($grouped_course->someSectionAssessed()!=0)
                                                                 Yes
                                                             @else
                                                                 No

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

@@ -43,7 +43,13 @@
           <li><a href ="{{ URL::action('AnnualPlansController@showPlan', array($program->id))}}" >{{$program->name}}</a></li>
           @endforeach
         </ul></li>
-
+        <li class='dropdown'>
+          <a href ='#' class ='dropdown-toggle' data-toggle='dropdown' role='button' aria-expanded="false"> Three year Plans<span class="caret"></span></a>
+          <ul class ='dropdown-menu' role='menu'>
+            @foreach (Auth::user()->school->programs as $program)
+            <li><a href ="{{ URL::action('ThreeYearPlanController@threeYearsReport', array($program->id))}}" >{{$program->name}}</a></li>
+            @endforeach
+          </ul></li>
       <li class="dropdown">
         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Help<span class="caret"></span></a>
         <ul class="dropdown-menu" role="menu">

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

@@ -110,7 +110,7 @@
                 Edit
             </div>
             <div class="panel-body">
-                {{ Form::open(array('action' => 'CriteriaController@update')) }}
+                {{ Form::open(array('action' => 'CriteriaController@update','id'=>'update_criterion')) }}
                 <button class="btn btn-md btn-secondary filterButton">
                     <span class="glyphicon glyphicon-plus">
                     </span>
@@ -256,7 +256,7 @@
             </div>
         </div>
     </div>
-</div>
+</div> 
 <script>
 
     var selectOptions = document.getElementById('outcome0').innerHTML;
@@ -974,8 +974,8 @@ alert("The criterion is already used in assessments. Editting the criterion will
                         $('#status').val(0);
                     else
                         $('#status').val(1);
-                    $('#assoc_maximum_score').val(json.criteria[0].maximum_score);
-                    var maximum = json.criteria[0].maximum_score;
+                    $('#assoc_maximum_score').val(json.criteria[0].max_score);
+                    var maximum = json.criteria[0].max_score;
 
                     addOptions("Num_assoc_scale", "assoc_maximum_score", "Assoc_Scales");
                     $('#Num_assoc_scale').val(json.criteria[0].num_scales)

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

@@ -91,14 +91,21 @@
                     <tbody>
                         @foreach($course->activities as $activity)
                         <tr>
+                            <?php
+                                Log::info($activity);
+                                Log::info($activity->rubric);
+                                $bool = empty($activity->rubric);
+                                Log::info($bool);
+                                
+                                ?>
                             <td>{{{ $activity->name }}}</td>
                             <td>{{{ date('m/d/y', strtotime($activity->updated_at))  }}}</td>
                             <td>
-                                @if($activity->rubric !=NULL)
-                                    {{ HTML::linkAction('RubricsController@show_limited', $activity->rubric->name, array($activity->rubric->id)) }}
+                                @if(isset($activity->rubric[0]))
+                                    {{ HTML::linkAction('RubricsController@show_limited', $activity->rubric[0]->name, array($activity->rubric[0]->id)) }}
                                 @endif
                             </td>
-                            <td>{{{ $activity->transforming_actions }}}</td>
+                            <td>{{{ $activity->transforming_actions() }}}</td>
                         </tr>
                         @endforeach
                     </tbody>

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

@@ -27,33 +27,42 @@
           <th></th>
           <th>Learning Outcome</th>
           <th>Criterion</th>
-          <th>Beginning (1-2)</th>
-          <th>In Progress (3-4)</th>
-          <th>Good (5-6)</th>
-          <th>Excellent (7-8)</th>
+          @foreach ($rubric->titles as $i=> $title)
+              <th>{{$title}} ({{1+($i*($rubric->max_score/$rubric->num_scales))}} - {{(1+$i)*($rubric->max_score/$rubric->num_scales)}})
+          @endforeach
         </tr>
       </thead>
       <tbody>
-      @foreach(json_decode($rubric->contents) as $index => $criterion)
+      @foreach($rubric_criterion as $index => $criterion)
         <tr data-criterion-copyright="{{ $criterion->copyright }}" data-criterion-notes="{{ $criterion->notes }}">
           @if(isset($criterion->notes))
           <td>{{ $index + 1 }}.</td>
-          <td>{{ Outcome::find($criterion->outcome_id)->name }} </td>
+          <td>@foreach($criterion->outcomes as $index => $outcome)
+        
+            <li>{{$outcome}}</li>
+                    
+                    @endforeach
+                   </td>
           <td>
             <span><em data-toggle="tooltip" data-placement="top" title="{{ $criterion->notes }}">{{{ $criterion->name }}}</em></span>
             <sup></sup>
           </td>
           @else
           <td>{{ $index + 1 }}.</td>
-          <td>{{ Outcome::find($criterion->outcome_id)->name }} </td>
-          <td>
+          <td>@foreach($criterion->outcomes as $index => $outcome)
+        
+            <li>{{$outcome}}</li>
+                    
+                    @endforeach
+                   </td>
+                    <td>
             <span>{{{ $criterion->name }}}</span> <sup></sup>
           </td>
           @endif
-          <td>{{{ $criterion->description12 }}}</td>
-          <td>{{{ $criterion->description34 }}}</td>
-          <td>{{{ $criterion->description56 }}}</td>
-          <td>{{{ $criterion->description78 }}}</td>
+          @foreach($criterion->scales as $scale)
+            <td>{{ nl2br($scale) }}</td>
+
+            @endforeach
         </tr>
       @endforeach
       </tbody>

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

@@ -119,17 +119,17 @@ echo
 
 
 @if($assessments!=NULL)
-  @foreach($assessments as $assessment)
+  @foreach($assessments as $activity_id => $activity)
     <?php
-      $activity = Activity::find($assessment->activity_id);
+      //$activity = Activity::find($assessment->activity_id);
 
       // Used to get custom rubric criterion indicators
-      $rubric_contents = json_decode(Rubric::find($activity->rubric_id)->contents, true);
+     // $rubric_contents = json_decode(Rubric::find($activity->rubric_id)->contents, true);
     ?>
 
     <div class="panel panel-default">
         <div class="panel-heading">
-            <h3 class="panel-title">{{ $activity->name }}</h3>
+            <h3 class="panel-title">{{ $assessments[$activity_id]['activity'] }}</h3>
         </div>
         <div class="panel-body">
             <table class="table table-striped table-condensed">
@@ -143,37 +143,32 @@ echo
                 <tbody>
                     <?php
 
-                    $scores = json_decode($assessment->scores, true);
+                    //$scores = json_decode($assessment->scores, true);
 
                     ?>
 
-                    @foreach($rubric_contents as $row)
-
-                    <?php $real_score = $scores[$row['id']]; ?>
-
-                    <tr>
-                        <td>{{{ $row['name'] }}}</td>
-                        <td>{{{ $real_score }}}</td>
-                        <td>
-                            @if($real_score == 1 || $real_score == 2)
-                                {{ nl2br($row['description12']) }}
-                            @elseif ($real_score == 3 || $real_score == 4)
-                                {{ nl2br($row['description34']) }}
-                            @elseif ($real_score == 5 || $real_score == 6)
-                                {{ nl2br($row['description56']) }}
-                            @elseif ($real_score == 7 || $real_score == 8)
-                                {{ nl2br($row['description78']) }}
-                            @else
-                                There is not enough information to assess this criterion, or the student did not complete the required work.
-                            @endif
-                        </td>
-                    </tr>
-                    @endforeach
+                    @foreach($assessments[$activity_id]["criteria"] as $activity_criterion_id => $criteria)
+
+                        
+
+                        <tr>
+                            <td>{{{ $criteria->name }}}</td>
+                            <td>{{{$assessments[$activity_id]["score"][$activity_criterion_id]}}}</td>
+                            <td>
+                                @if($assessments[$activity_id]['score'][$activity_criterion_id] != 0 || $assessments[$activity_id]['score'][$activity_criterion_id] !="N/A")
+                                    {{ $assessments[$activity_id]['explication'][$activity_criterion_id] }}
+  
+                                @else
+                                    There is not enough information to assess this criterion, or the student did not complete the required work.
+                                @endif
+                            </td>
+                        </tr>
+                        @endforeach
                 </tbody>
             </table>
 
-            <p class="lead"><strong>Percentage:</strong> {{ $assessment->percentage }}%</p>
-            <p class="lead"><strong>Comments:</strong> {{ $assessment->comments }}</p>
+            <p class="lead"><strong>Percentage:</strong> {{ $assessments[$activity_id]['percentage'] }}%</p>
+            <p class="lead"><strong>Comments:</strong> {{ $assessments[$activity_id]['comments']}}</p>
         </div>
     </div>
   @endforeach
@@ -182,7 +177,7 @@ echo
 @endif
 
 
-<?
+<?php
 
 echo '</body>';
 echo '</html>';

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

@@ -29,23 +29,23 @@
 
 <!-- <div class="row">
   <div class="col-md-12" id="graph"></div>
-</div> -->
+</div> --> 
 
 @if($assessments!=NULL)
   <div class="row">
     <div class="col-md-12">
       <h3>Assessment Results </h3>
-      @foreach($assessments as $assessment)
+      @foreach($assessments as $activity_id => $activity)
         <?php
-          $activity = Activity::find($assessment->activity_id);
+          //$activity = Activity::find($assessment->activity_id);
 
           // Used to get custom rubric criterion indicators
-          $rubric_contents = json_decode(Rubric::find($activity->rubric_id)->contents, true);
+          //$rubric_contents = json_decode(Rubric::find($activity->rubric_id)->contents, true);
         ?>
 
         <div class="panel panel-default">
             <div class="panel-heading">
-                <h3 class="panel-title">{{ $activity->name }}</h3>
+                <h3 class="panel-title">{{ $assessments[$activity_id]['activity'] }}</h3>
             </div>
             <div class="panel-body">
                 <table class="table table-striped table-condensed">
@@ -59,26 +59,21 @@
                     <tbody>
                         <?php
 
-                        $scores = json_decode($assessment->scores, true);
+                       // $scores = json_decode($assessment->scores, true);
 
                         ?>
 
-                        @foreach($rubric_contents as $row)
+                        @foreach($assessments[$activity_id]["criteria"] as $activity_criterion_id => $criteria)
 
-                        <?php $real_score = $scores[$row['id']]; ?>
+                        
 
                         <tr>
-                            <td>{{{ $row['name'] }}}</td>
-                            <td>{{{ $real_score }}}</td>
+                            <td>{{{ $criteria->name }}}</td>
+                            <td>{{{$assessments[$activity_id]["score"][$activity_criterion_id]}}}</td>
                             <td>
-                                @if($real_score == 1 || $real_score == 2)
-                                    {{ nl2br($row['description12']) }}
-                                @elseif ($real_score == 3 || $real_score == 4)
-                                    {{ nl2br($row['description34']) }}
-                                @elseif ($real_score == 5 || $real_score == 6)
-                                    {{ nl2br($row['description56']) }}
-                                @elseif ($real_score == 7 || $real_score == 8)
-                                    {{ nl2br($row['description78']) }}
+                                @if($assessments[$activity_id]['score'][$activity_criterion_id] != 0 || $assessments[$activity_id]['score'][$activity_criterion_id] !="N/A")
+                                    {{ $assessments[$activity_id]['explication'][$activity_criterion_id] }}
+  
                                 @else
                                     There is not enough information to assess this criterion, or the student did not complete the required work.
                                 @endif
@@ -88,8 +83,8 @@
                     </tbody>
                 </table>
 
-                <p class="lead"><strong>Percentage:</strong> {{ $assessment->percentage }}%</p>
-                <p class="lead"><strong>Comments:</strong> {{ $assessment->comments }}</p>
+                <p class="lead"><strong>Percentage:</strong> {{ $assessments[$activity_id]['percentage'] }}%</p>
+                <p class="lead"><strong>Comments:</strong> {{ $assessments[$activity_id]['comments'] }}</p>
             </div>
         </div>
       @endforeach