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

debugging assessment, rubrics y activities

app/controllers/CriteriaController.php

@@ -160,7 +160,35 @@ class CriteriaController extends \BaseController
             $json['objectives_assoc'][$outId] = DB::select("select objectives.id, objectives.text, outcomes.name from objectives, objective_outcome, outcomes where  objective_outcome.outcome_id ={$outId} and objective_outcome.objective_id = objectives.id and objectives.active=1 and outcomes.id = objective_outcome.outcome_id");
         }*/
 
-        return json_encode($json);
+        $criterion =  DB::table('criteria')->where('id', Input::get('id'))->first();
+        $criterion->outcomes = DB::table('criterion_objective_outcome')
+            ->join('outcomes', 'outcomes.id', '=', 'criterion_objective_outcome.outcome_id')
+            ->where('criterion_id', $criterion->id)
+            ->distinct()
+            ->get();
+
+        foreach ($criterion->outcomes as $outcome) {
+            $outcome->assoc_objectives = DB::table('objective_outcome')
+                ->join('objectives', 'objectives.id', '=', 'objective_outcome.objective_id')
+                ->where('outcome_id', $outcome->outcome_id)
+                ->get();
+            $outcome->objectives_criteria = DB::table('criterion_objective_outcome')
+                ->join('objectives', 'objectives.id', '=', 'criterion_objective_outcome.objective_id')
+                ->where('criterion_id', $criterion->id)
+                ->where('outcome_id', $outcome->id)
+                ->get();
+        }
+        $criterion->scales = DB::table('criterion_scale')
+            ->join('scales', 'criterion_scale.scale_id', '=', 'scales.id')
+            ->where('criterion_id', $criteria_id)
+            ->orderBy('position')
+            ->get();
+        $criterion->program =  DB::table('program_criterion')->where('criterion_id', $criteria_id)->get();
+        $criterion->activity_criterion = DB::table('assessments')
+            ->join('activity_criterion', 'activity_criterion.id', '=', 'assessments.activity_criterion_id')
+            ->where('activity_criterion.criterion_id', $criteria_id)
+            ->get();
+        return array($criterion);
     }
 
     public function delete()

app/controllers/Objective2Controller.php

@@ -370,17 +370,21 @@ class Objective2Controller extends \BaseController
 			$message .= '</ul>';
 
 			/** Send error message and old data */
-			Session::flash('status', 'danger');
-			Session::flash('message', $message);
+			//Session::flash('status', 'danger');
+			//Session::flash('message', $message);
+			$MessageArray = array('status' => 'danger', 'message' => $message);
 			$role = Auth::user()['role'];
 			switch ($role) {
 				case 1:
+					return $MessageArray;
 					return Redirect::to('objective')->withInput();
 
 				case 2:
+					return $MessageArray;
 					return Redirect::to('school-objective')->withInput();
 
 				case 3:
+					return $MessageArray;
 					return Redirect::to('program-objective')->withInput();
 			}
 		} else {
@@ -396,10 +400,10 @@ class Objective2Controller extends \BaseController
 
 			// Set status
 
-			Log::info("dimelo papi");
+
 			/** If Objective is updated, send success message */
 			if ($Objective->save()) {
-				Log::info("dimelo papi2");
+
 				$objectiveId = $Objective->id;
 				DB::delete("delete from `objective_outcome` where objective_id ={$objectiveId}");
 				DB::delete("delete from objective_program where objective_id = {$objectiveId}");
@@ -411,34 +415,43 @@ class Objective2Controller extends \BaseController
 					DB::insert("insert into `objective_outcome` (objective_id, outcome_id) values ({$objectiveId}, {$outcome_id})");
 				}
 
-				Session::flash('status', 'success');
-				Session::flash('message', 'Updated Objective: "' . $Objective->text . '"');
+				//Session::flash('status', 'success');
+				//Session::flash('message', 'Updated Objective: "' . $Objective->text . '"');
+				$MessageArray = array('status' => 'success', 'message' => 'Updated Objective: "' . $Objective->text . '"');
 				$role = Auth::user()['role'];
+
 				switch ($role) {
 					case 1:
+						return $MessageArray;
 						return Redirect::to('objective')->withInput();
 
 					case 2:
+						return $MessageArray;
 						return Redirect::to('school-objective')->withInput();
 
 					case 3:
+						return $MessageArray;
 						return Redirect::to('program-objective')->withInput();
 				}
 			}
 
 			/** If saving fails, send error message and old data */
 			else {
-				Session::flash('status', 'danger');
-				Session::flash('message', 'Error updating the Objective. Please try again later.');
+				//Session::flash('status', 'danger');
+				////Session::flash('message', 'Error updating the Objective. Please try again later.');
+				$MessageArray = array('status' => 'danger', 'message' => 'Error updating the Objective. Please try again later.');
 				$role = Auth::user()['role'];
 				switch ($role) {
 					case 1:
+						return $MessageArray;
 						return Redirect::to('objective')->withInput();
 
 					case 2:
+						return $MessageArray;
 						return Redirect::to('school-objective')->withInput();
 
 					case 3:
+						return $MessageArray;
 						return Redirect::to('program-objective')->withInput();
 				}
 			}

app/controllers/OutcomesController.php

@@ -621,6 +621,7 @@ class OutcomesController extends \BaseController
                 ->where('criterion_objective_outcome.outcome_id', $id)
                 ->where('criteria.num_scales', $level)
                 ->select('criteria.id', 'criteria.name', 'criteria.deleted_at')
+                ->distinct()
                 ->orderBy('criteria.name', 'asc')
                 ->get();
             // $outcome_criterias = $outcome_criterias;
@@ -726,75 +727,75 @@ class OutcomesController extends \BaseController
 
     public function totalAssessmentReport()
     {
-    	//SELECT sm.name, s.name, p.name, p.code, a.outcomes_attempted, stu.number, ass.scores, c.code, c.number, r.expected_points 
-//     	FROM students stu, schools s, programs p, courses c, activities a, assessments ass, rubrics r, semesters sm 
-//     	where stu.id=ass.student_id and sm.id=c.semester_id and s.id=p.school_id and p.id=c.program_id and a.course_id=c.id and ass.activity_id=a.id and a.rubric_id=r.id 
-//     	and c.semester_id in (12,13) and a.outcomes_attempted is not null
-    ini_set('memory_limit', -1);
-	ini_set('max_execution_time', 300);
-// 		$total_assessments_temp = DB::table('assessments')
-//          						->join('students', 'students.id', '=', 'assessments.student_id')
-//          						->join('activities', 'activities.id', '=', 'assessments.activity_id')
-//          						->join('rubrics', 'rubrics.id', '=', 'activities.rubric_id')
-//          						->join('courses', 'courses.id', '=', 'activities.course_id')
-//          						->join('programs', 'programs.id', '=', 'courses.program_id')
-//          						->join('schools', 'schools.id', '=', 'programs.school_id')
-//           						->join('semesters', 'semesters.id', '=', 'courses.semester_id')
-//                    			   	->whereIn('courses.semester_id', Session::get('semesters_ids'))
-//                     			->whereRaw('activities.outcomes_attempted is not null')
-//                     			->select('activities.id as activity_id','semesters.name as semester','schools.name as school','programs.name as program','programs.id as program_id','programs.code as program_code','students.number as student_number','students.conc_code as student_conc_code','assessments.scores as results','courses.name as course','courses.code as course_code','courses.number as course_number','rubrics.expected_points as expected_result')
-//                     			->orderBy('semesters.id','school','program','course','student_number')
-// 								->distinct()
-//                     			->get();
-//                     			    
-//         $total_assessments=array();
-// 		foreach($total_assessments_temp as $total_assessment)
-// 		{
-// 			$results=json_decode($total_assessment->results, TRUE);
-// 			$total_assessment->course=$total_assessment->course_code.$total_assessment->course_number." ".$total_assessment->course;
-// 			foreach($results as $criterion_id => $result)
-// 			{	
-// 				if($result and $result!="N/A")
-// 				{
-// 					$trans_temp=clone $total_assessment;
-// 					$criterion=Criterion::find($criterion_id);
-// 					if($criterion)
-// 					{
-// 	// 					var_dump($total_assessment->activity_id);
-// 	// 					var_dump($criterion_id);
-// 						if($criterion_id==1398)var_dump($criterion);
-// 	// 					exit();
-// 						$trans_temp->result=$result;
-// 						$trans_temp->criterion=$criterion->name;
-// 						$trans_temp->outcome=Outcome::find($criterion->outcome_id)->name;
-// 						$total_assessments[]=$trans_temp;
-// 					}
-// 				}
-// 			}
-// 		
-// 		}
-		$total_assessments = DB::table('assessments')
-         						->join('students', 'students.id', '=', 'assessments.student_id')
-         						->join('activity_criterion', 'activity_criterion.id', '=', 'assessments.activity_criterion_id')
-         						->join('activities', 'activities.id', '=', 'activity_criterion.activity_id')
-         						->join('criteria', 'criteria.id', '=', 'activity_criterion.criterion_id')
-         						->join('criterion_objective_outcome', 'criteria.id', '=', 'criterion_objective_outcome.criterion_id')
-         						->join('outcomes', 'outcomes.id', '=', 'criterion_objective_outcome.outcome_id')
-         						->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
-         						->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
-         						->join('courses', 'courses.id', '=', 'activities.course_id')
-         						->join('programs', 'programs.id', '=', 'courses.program_id')
-         						->join('schools', 'schools.id', '=', 'programs.school_id')
-          						->join('semesters', 'semesters.id', '=', 'courses.semester_id')
-                   			   	->whereIn('courses.semester_id', Session::get('semesters_ids'))
-                    			->select('criteria.name as criterion','outcomes.name as outcome','activities.id as activity_id','semesters.name as semester','schools.name as school','programs.name as program','programs.id as program_id','programs.code as program_code','students.number as student_number','students.conc_code as student_conc_code','assessments.score as result','courses.name as course','courses.code as course_code','courses.number as course_number','rubrics.expected_points as expected_result')
-                    			->orderBy('semesters.id','school','program','course','student_number')
-								->distinct()
-                    			->get();
-
-
-       $title = "Total Assessment Report";
-		
+        //SELECT sm.name, s.name, p.name, p.code, a.outcomes_attempted, stu.number, ass.scores, c.code, c.number, r.expected_points 
+        //     	FROM students stu, schools s, programs p, courses c, activities a, assessments ass, rubrics r, semesters sm 
+        //     	where stu.id=ass.student_id and sm.id=c.semester_id and s.id=p.school_id and p.id=c.program_id and a.course_id=c.id and ass.activity_id=a.id and a.rubric_id=r.id 
+        //     	and c.semester_id in (12,13) and a.outcomes_attempted is not null
+        ini_set('memory_limit', -1);
+        ini_set('max_execution_time', 300);
+        // 		$total_assessments_temp = DB::table('assessments')
+        //          						->join('students', 'students.id', '=', 'assessments.student_id')
+        //          						->join('activities', 'activities.id', '=', 'assessments.activity_id')
+        //          						->join('rubrics', 'rubrics.id', '=', 'activities.rubric_id')
+        //          						->join('courses', 'courses.id', '=', 'activities.course_id')
+        //          						->join('programs', 'programs.id', '=', 'courses.program_id')
+        //          						->join('schools', 'schools.id', '=', 'programs.school_id')
+        //           						->join('semesters', 'semesters.id', '=', 'courses.semester_id')
+        //                    			   	->whereIn('courses.semester_id', Session::get('semesters_ids'))
+        //                     			->whereRaw('activities.outcomes_attempted is not null')
+        //                     			->select('activities.id as activity_id','semesters.name as semester','schools.name as school','programs.name as program','programs.id as program_id','programs.code as program_code','students.number as student_number','students.conc_code as student_conc_code','assessments.scores as results','courses.name as course','courses.code as course_code','courses.number as course_number','rubrics.expected_points as expected_result')
+        //                     			->orderBy('semesters.id','school','program','course','student_number')
+        // 								->distinct()
+        //                     			->get();
+        //                     			    
+        //         $total_assessments=array();
+        // 		foreach($total_assessments_temp as $total_assessment)
+        // 		{
+        // 			$results=json_decode($total_assessment->results, TRUE);
+        // 			$total_assessment->course=$total_assessment->course_code.$total_assessment->course_number." ".$total_assessment->course;
+        // 			foreach($results as $criterion_id => $result)
+        // 			{	
+        // 				if($result and $result!="N/A")
+        // 				{
+        // 					$trans_temp=clone $total_assessment;
+        // 					$criterion=Criterion::find($criterion_id);
+        // 					if($criterion)
+        // 					{
+        // 	// 					var_dump($total_assessment->activity_id);
+        // 	// 					var_dump($criterion_id);
+        // 						if($criterion_id==1398)var_dump($criterion);
+        // 	// 					exit();
+        // 						$trans_temp->result=$result;
+        // 						$trans_temp->criterion=$criterion->name;
+        // 						$trans_temp->outcome=Outcome::find($criterion->outcome_id)->name;
+        // 						$total_assessments[]=$trans_temp;
+        // 					}
+        // 				}
+        // 			}
+        // 		
+        // 		}
+        $total_assessments = DB::table('assessments')
+            ->join('students', 'students.id', '=', 'assessments.student_id')
+            ->join('activity_criterion', 'activity_criterion.id', '=', 'assessments.activity_criterion_id')
+            ->join('activities', 'activities.id', '=', 'activity_criterion.activity_id')
+            ->join('criteria', 'criteria.id', '=', 'activity_criterion.criterion_id')
+            ->join('criterion_objective_outcome', 'criteria.id', '=', 'criterion_objective_outcome.criterion_id')
+            ->join('outcomes', 'outcomes.id', '=', 'criterion_objective_outcome.outcome_id')
+            ->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
+            ->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
+            ->join('courses', 'courses.id', '=', 'activities.course_id')
+            ->join('programs', 'programs.id', '=', 'courses.program_id')
+            ->join('schools', 'schools.id', '=', 'programs.school_id')
+            ->join('semesters', 'semesters.id', '=', 'courses.semester_id')
+            ->whereIn('courses.semester_id', Session::get('semesters_ids'))
+            ->select('criteria.name as criterion', 'outcomes.name as outcome', 'activities.id as activity_id', 'semesters.name as semester', 'schools.name as school', 'programs.name as program', 'programs.id as program_id', 'programs.code as program_code', 'students.number as student_number', 'students.conc_code as student_conc_code', 'assessments.score as result', 'courses.name as course', 'courses.code as course_code', 'courses.number as course_number', 'rubrics.expected_points as expected_result')
+            ->orderBy('semesters.id', 'school', 'program', 'course', 'student_number')
+            ->distinct()
+            ->get();
+
+
+        $title = "Total Assessment Report";
+
         return View::make('local.managers.admins.total_assessment', compact('title', 'total_assessments'));
     }
 

app/controllers/SchoolCoordinatorsController.php

@@ -5,7 +5,10 @@ class SchoolCoordinatorsController extends \BaseController
 
     private function participatingPrograms($school)
     {
-        return DB::table('VIEW_participating_programs')
+        return DB::table('programs')
+            ->join('courses', 'courses.program_id', '=', 'programs.id')
+            ->select('programs.id', 'programs.name', 'programs.is_graduate', 'programs.school_id')
+            ->addSelect('courses.semester_id')
             ->where('school_id', $school->id)
             ->whereIn('semester_id', Session::get('semesters_ids'))
             ->lists('id');
@@ -158,8 +161,8 @@ class SchoolCoordinatorsController extends \BaseController
         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();
+                    if ($course_outcomes_achieved = $course->outcomes_ach()) {
+                        //$course_outcomes_achieved = $course->outcomes_ach();
                         $course_outcomes_attempted = $course->outcomes_att();
                         foreach ($course_outcomes_attempted as $i => $score) {
 
@@ -172,8 +175,8 @@ class SchoolCoordinatorsController extends \BaseController
                     }
                     $undergrad_school_sections_count += 1;
                 } else {
-                    if ($course->outcomes_achieved != NULL) {
-                        $course_outcomes_achieved = $course->outcomes_ach();
+                    if ($course_outcomes_achieved = $course->outcomes_ach()) {
+                        //$course_outcomes_achieved = $course->outcomes_ach();
                         $course_outcomes_attempted = $course->outcomes_att();
                         foreach ($course_outcomes_attempted as $i => $score) {
 
@@ -200,7 +203,10 @@ class SchoolCoordinatorsController extends \BaseController
         $attemptedUndergradProgramsPerOutcome = array_fill(1, $outcomeCount, 0);
 
         // Fetch programs with participation for the school
-        $participating_undergrad_programs = DB::table('VIEW_participating_programs')
+        $participating_undergrad_programs = DB::table('programs')
+            ->join('courses', 'courses.program_id', '=', 'programs.id')
+            ->select('programs.id', 'programs.name', 'programs.is_graduate', 'programs.school_id')
+            ->addSelect('courses.semester_id')
             ->whereIn('semester_id', Session::get('semesters_ids'))
             ->where('is_graduate', 0)
             ->where('school_id', $school->id)
@@ -274,7 +280,10 @@ class SchoolCoordinatorsController extends \BaseController
         $attemptedGradProgramsPerOutcome = array_fill(1, $outcomeCount, 0);
 
         // Fetch programs with participation for the school
-        $participating_grad_programs = DB::table('VIEW_participating_programs')
+        $participating_grad_programs = DB::table('programs')
+            ->join('courses', 'courses.program_id', '=', 'programs.id')
+            ->select('programs.id', 'programs.name', 'programs.is_graduate', 'programs.school_id')
+            ->addSelect('courses.semester_id')
             ->whereIn('semester_id', Session::get('semesters_ids'))
             ->where('is_graduate', 1)
             ->where('school_id', $school->id)

app/controllers/SchoolsController.php

@@ -5,18 +5,21 @@ class SchoolsController extends \BaseController
 
     private function participatingPrograms($school)
     {
-        return DB::table('VIEW_participating_programs')
+        return DB::table('programs')
+            ->join('courses', 'courses.program_id', '=', 'programs.id')
+            ->select('programs.id', 'programs.name', 'programs.is_graduate', 'programs.school_id')
+            ->addSelect('courses.semester_id')
             ->where('school_id', $school->id)
             ->whereIn('semester_id', Session::get('semesters_ids'))
             ->lists('id');
     }
 
-	public function show($id)
-	{
+    public function show($id)
+    {
         ini_set('memory_limit', '256M');
         DB::connection()->disableQueryLog();
         $school = School::find($id);
-        $title= $school->name;
+        $title = $school->name;
         $schools = School::all();
 
         $outcomes = Outcome::orderBy('name', 'asc')->get();
@@ -27,25 +30,25 @@ class SchoolsController extends \BaseController
          * List of grouped courses (grouped sections)
          */
 
-        $program_ids= $school->programs->lists('id');
+        $program_ids = $school->programs->lists('id');
 
         $undergrad_programs = DB::table('programs')
-        ->select('id', 'name', 'school_id', 'is_graduate')
-        ->where('is_graduate', '=', 0)
-        ->where('school_id', '=', $id)
-        ->orderBy('name', 'ASC')
-        ->get();
+            ->select('id', 'name', 'school_id', 'is_graduate')
+            ->where('is_graduate', '=', 0)
+            ->where('school_id', '=', $id)
+            ->orderBy('name', 'ASC')
+            ->get();
 
         $grad_programs = DB::table('programs')
-        ->select('id', 'name', 'school_id', 'is_graduate')
-        ->where('is_graduate', '=', 1)
-        ->where('school_id', '=', $id)
-        ->orderBy('name', 'ASC')
-        ->get();
-   
+            ->select('id', 'name', 'school_id', 'is_graduate')
+            ->where('is_graduate', '=', 1)
+            ->where('school_id', '=', $id)
+            ->orderBy('name', 'ASC')
+            ->get();
+
 
         $grad_grouped_courses = Course::
-//             select(DB::raw('courses.name, courses.code, courses.number, max(courses.outcomes_attempted) as outcomes_attempted, courses.semester_id, courses.program_id'))
+            //             select(DB::raw('courses.name, courses.code, courses.number, max(courses.outcomes_attempted) as outcomes_attempted, courses.semester_id, courses.program_id'))
             select(DB::raw('courses.name, courses.code, courses.number, courses.semester_id, courses.program_id'))
             ->with('semester')
             ->with('program')
@@ -60,7 +63,7 @@ class SchoolsController extends \BaseController
             ->get();
 
         $undergrad_grouped_courses = Course::
-//             select(DB::raw('courses.name, courses.code, courses.number, max(courses.outcomes_attempted) as outcomes_attempted, courses.semester_id, courses.program_id'))
+            //             select(DB::raw('courses.name, courses.code, courses.number, max(courses.outcomes_attempted) as outcomes_attempted, courses.semester_id, courses.program_id'))
             select(DB::raw('courses.name, courses.code, courses.number, courses.semester_id, courses.program_id'))
             ->with('semester')
             ->with('program')
@@ -92,41 +95,32 @@ class SchoolsController extends \BaseController
         $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];
+        foreach ($school->programs as $program) {
+            foreach ($program->courses as $course) {
+                if (!$course->program->is_graduate) {
+                    if ($course->outcomes_achieved != NULL) {
+                        $course_outcomes_achieved = json_decode($course->outcomes_achieved, true);
+                        $course_outcomes_attempted = json_decode($course->outcomes_attempted, true);
+                        for ($i = 1; $i <= count($undergrad_outcomes_attempted); $i++) {
+                            $undergrad_outcomes_achieved[$i] += $course_outcomes_achieved[$i];
+                            $undergrad_outcomes_attempted[$i] += $course_outcomes_attempted[$i];
                         }
-                        $undergrad_assessed_sections_count+=1;
+                        $undergrad_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];
+                    $undergrad_school_sections_count += 1;
+                } else {
+                    if ($course->outcomes_achieved != NULL) {
+                        $course_outcomes_achieved = json_decode($course->outcomes_achieved, true);
+                        $course_outcomes_attempted = json_decode($course->outcomes_attempted, true);
+                        for ($i = 1; $i <= count($grad_outcomes_attempted); $i++) {
+                            $grad_outcomes_achieved[$i] += $course_outcomes_achieved[$i];
+                            $grad_outcomes_attempted[$i] += $course_outcomes_attempted[$i];
                         }
-                        $grad_assessed_sections_count+=1;
+                        $grad_assessed_sections_count += 1;
                     }
-                    $grad_school_sections_count+=1;
+                    $grad_school_sections_count += 1;
                 }
-            }    
+            }
         }
 
         /**
@@ -140,7 +134,10 @@ class SchoolsController extends \BaseController
         $attemptedUndergradProgramsPerOutcome = array_fill(1, $outcomeCount, 0);
 
         // Fetch programs with participation for the school
-        $participating_undergrad_programs = DB::table('VIEW_participating_programs')
+        $participating_undergrad_programs = DB::table('programs')
+            ->join('courses', 'courses.program_id', '=', 'programs.id')
+            ->select('programs.id', 'programs.name', 'programs.is_graduate', 'programs.school_id')
+            ->addSelect('courses.semester_id')
             ->whereIn('semester_id', Session::get('semesters_ids'))
             ->where('is_graduate', 0)
             ->where('school_id', $school->id)
@@ -151,42 +148,39 @@ class SchoolsController extends \BaseController
 
 
         // For each outcome 
-        foreach ($outcomes as $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');
+            $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)
-            {
+            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;
+                $flag = false;
 
                 // For each course in the program
-                foreach ($program->courses as $course)
-                {
+                foreach ($program->courses as $course) {
                     // If the outcome in question is being evaluated
                     $course_outcomes_attempted2 = $course->outcomes_att();
-//                     $course_outcomes_attempted2 = json_decode($course->outcomes_attempted, true);
-//                     $course_outcomes_achieved2 = json_decode($course->outcomes_achieved, true);
+                    //                     $course_outcomes_attempted2 = json_decode($course->outcomes_attempted, true);
+                    //                     $course_outcomes_achieved2 = json_decode($course->outcomes_achieved, true);
                     $course_outcomes_achieved2 = $course->outcomes_ach();
-                    if(array_key_exists($outcome->id, $course_outcomes_attempted2 ) && array_key_exists($outcome->id, $course_outcomes_achieved2 )
-                        && $course_outcomes_attempted2[$outcome->id]>0)
-                    {
-                        $achieved_outcomes_per_undergrad_program[$outcome->id]+=$course_outcomes_achieved2[$outcome->id];
-                        $attempted_outcomes_per_undergrad_program[$outcome->id]+=$course_outcomes_attempted2[$outcome->id];
+                    if (
+                        array_key_exists($outcome->id, $course_outcomes_attempted2) && array_key_exists($outcome->id, $course_outcomes_achieved2)
+                        && $course_outcomes_attempted2[$outcome->id] > 0
+                    ) {
+                        $achieved_outcomes_per_undergrad_program[$outcome->id] += $course_outcomes_achieved2[$outcome->id];
+                        $attempted_outcomes_per_undergrad_program[$outcome->id] += $course_outcomes_attempted2[$outcome->id];
 
                         // Add one to the programs assessing, if it wasn't added before
-                        if(!$flag)
-                        {
-                            $attemptedUndergradProgramsPerOutcome[$outcome->id]+=1;
-                            $flag= true;
+                        if (!$flag) {
+                            $attemptedUndergradProgramsPerOutcome[$outcome->id] += 1;
+                            $flag = true;
                         }
                     }
 
@@ -195,9 +189,8 @@ class SchoolsController extends \BaseController
 
                 }
                 //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;
+                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);
                 }
             }
@@ -214,7 +207,10 @@ class SchoolsController extends \BaseController
         $attemptedGradProgramsPerOutcome = array_fill(1, $outcomeCount, 0);
 
         // Fetch programs with participation for the school
-        $participating_grad_programs = DB::table('VIEW_participating_programs')
+        $participating_grad_programs = DB::table('programs')
+            ->join('courses', 'courses.program_id', '=', 'programs.id')
+            ->select('programs.id', 'programs.name', 'programs.is_graduate', 'programs.school_id')
+            ->addSelect('courses.semester_id')
             ->whereIn('semester_id', Session::get('semesters_ids'))
             ->where('is_graduate', 1)
             ->where('school_id', $school->id)
@@ -225,42 +221,39 @@ class SchoolsController extends \BaseController
 
 
         // For each outcome 
-        foreach ($outcomes as $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');
+            $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)
-            {
+            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;
+                $flag = false;
 
                 // For each course in the program
-                foreach ($program->courses as $course)
-                {
+                foreach ($program->courses as $course) {
                     // If the outcome in question is being evaluated
-//                     $course_outcomes_attempted2 = json_decode($course->outcomes_attempted, true);
+                    //                     $course_outcomes_attempted2 = json_decode($course->outcomes_attempted, true);
                     $course_outcomes_attempted2 = ($course->outcomes_att());
                     $course_outcomes_achieved2 = ($course->outcomes_ach());
-//                     $course_outcomes_achieved2 = json_decode($course->outcomes_achieved, true);
-                    if(array_key_exists($outcome->id, $course_outcomes_attempted2 ) && array_key_exists($outcome->id, $course_outcomes_achieved2 )
-                        && $course_outcomes_attempted2[$outcome->id]>0)
-                    {
-                        $achieved_outcomes_per_grad_program[$outcome->id]+=$course_outcomes_achieved2[$outcome->id];
-                        $attempted_outcomes_per_grad_program[$outcome->id]+=$course_outcomes_attempted2[$outcome->id];
+                    //                     $course_outcomes_achieved2 = json_decode($course->outcomes_achieved, true);
+                    if (
+                        array_key_exists($outcome->id, $course_outcomes_attempted2) && array_key_exists($outcome->id, $course_outcomes_achieved2)
+                        && $course_outcomes_attempted2[$outcome->id] > 0
+                    ) {
+                        $achieved_outcomes_per_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;
+                        if (!$flag) {
+                            $attemptedGradProgramsPerOutcome[$outcome->id] += 1;
+                            $flag = true;
                         }
                     }
 
@@ -269,17 +262,16 @@ class SchoolsController extends \BaseController
 
                 }
                 //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;
+                if ($attempted_outcomes_per_grad_program[$outcome->id] != 0 && (float)$achieved_outcomes_per_grad_program[$outcome->id] / $attempted_outcomes_per_grad_program[$outcome->id] * 100 >= $outcome->expected_outcome) {
+                    $achievedGradProgramsPerOutcome[$outcome->id] += 1;
                     // $output[]= 'END OF PROGRAM: '.$program->name.'-'.json_encode($achievedProgramsPerOutcome);
                 }
             }
         }
-        if($school->id == 13){
-            return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes','undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
-        }else{
-            return View::make('local.managers.shared.school', compact('title', 'outcomes','undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
+        if ($school->id == 13) {
+            return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
+        } else {
+            return View::make('local.managers.shared.school', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
         }
     }
 
@@ -289,7 +281,7 @@ class SchoolsController extends \BaseController
         DB::connection()->disableQueryLog();
 
         $school = School::find($id);
-        $title= $school->name.' Assessment Report - '.date('m/d/Y');
+        $title = $school->name . ' Assessment Report - ' . date('m/d/Y');
 
         $outcomes = Outcome::orderBy('name', 'asc')->get();
         $outcomeCount = Outcome::all()->count();
@@ -301,10 +293,10 @@ class SchoolsController extends \BaseController
          * List of courses (grouped sections)
          */
 
-        $program_ids= $school->programs->lists('id');
+        $program_ids = $school->programs->lists('id');
 
         $grouped_courses = Course::
-//             select(DB::raw('name, code, number, max(outcomes_attempted) as outcomes_attempted, semester_id, program_id'))
+            //             select(DB::raw('name, code, number, max(outcomes_attempted) as outcomes_attempted, semester_id, program_id'))
             select(DB::raw('name, code, number, semester_id, program_id'))
             ->with('semester')
             ->with('program')
@@ -328,23 +320,19 @@ class SchoolsController extends \BaseController
         $assessed_sections_count = 0;
         $school_sections_count = 0;
 
-        foreach($school->programs as $program)
-        {
-            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];
-                }
+        foreach ($school->programs as $program) {
+            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_sections_count+=1;
-              }
-              $school_sections_count+=1;
+                    $assessed_sections_count += 1;
+                }
+                $school_sections_count += 1;
             }
         }
 
@@ -362,38 +350,35 @@ class SchoolsController extends \BaseController
 
 
         // For each outcome
-        foreach ($outcomes as $outcome)
-        {
+        foreach ($outcomes as $outcome) {
             // For each program with courses that do assessment
-            foreach (Program::with(array('courses' => function($query){
-//                 $query->whereNotNull('outcomes_attempted');
+            foreach (Program::with(array('courses' => function ($query) {
+                //                 $query->whereNotNull('outcomes_attempted');
                 $query->whereIn('semester_id', Session::get('semesters_ids'));
-            }))->where('school_id', $school->id)->orderBy('name', 'asc')->get() as $program)
-            {
+            }))->where('school_id', $school->id)->orderBy('name', 'asc')->get() as $program) {
                 // To acummulate all criteria for one program
                 $achieved_outcomes_per_program = array_fill(1, $outcomeCount, 0);
                 $attempted_outcomes_per_program = array_fill(1, $outcomeCount, 0);
 
                 //Flag for counting programs
-                $flag =false;
+                $flag = false;
 
                 // For each course in the program
-                foreach ($program->courses as $course)
-                {
+                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_program[$outcome->id]+=$course_outcomes_achieved2[$outcome->id];
-                        $attempted_outcomes_per_program[$outcome->id]+=$course_outcomes_attempted2[$outcome->id];
+                    if (
+                        array_key_exists($outcome->id, $course_outcomes_attempted2)
+                        && $course_outcomes_attempted2[$outcome->id] > 0
+                    ) {
+                        $achieved_outcomes_per_program[$outcome->id] += $course_outcomes_achieved2[$outcome->id];
+                        $attempted_outcomes_per_program[$outcome->id] += $course_outcomes_attempted2[$outcome->id];
 
                         // Add one to the programs assessing, if it wasn't added before
-                        if(!$flag)
-                        {
-                            $attemptedProgramsPerOutcome[$outcome->id]+=1;
-                            $flag= true;
+                        if (!$flag) {
+                            $attemptedProgramsPerOutcome[$outcome->id] += 1;
+                            $flag = true;
                         }
                     }
 
@@ -402,15 +387,13 @@ class SchoolsController extends \BaseController
 
                 }
                 //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_program[$outcome->id]!=0 && (float)$achieved_outcomes_per_program[$outcome->id]/$attempted_outcomes_per_program[$outcome->id]*100 >= $outcome->expected_outcome)
-                {
-                    $achievedProgramsPerOutcome[$outcome->id]+=1;
+                if ($attempted_outcomes_per_program[$outcome->id] != 0 && (float)$achieved_outcomes_per_program[$outcome->id] / $attempted_outcomes_per_program[$outcome->id] * 100 >= $outcome->expected_outcome) {
+                    $achievedProgramsPerOutcome[$outcome->id] += 1;
                     // $output[]= 'END OF PROGRAM: '.$program->name.'-'.json_encode($achievedProgramsPerOutcome);
                 }
             }
         }
 
-       return View::make('local.managers.shared.print_school', compact('title', 'outcomes', 'outcomes_attempted', 'outcomes_achieved', 'school', 'assessed_sections_count', 'school_sections_count', 'achievedProgramsPerOutcome', 'attemptedProgramsPerOutcome', 'grouped_courses', 'participating_programs'));
+        return View::make('local.managers.shared.print_school', compact('title', 'outcomes', 'outcomes_attempted', 'outcomes_achieved', 'school', 'assessed_sections_count', 'school_sections_count', 'achievedProgramsPerOutcome', 'attemptedProgramsPerOutcome', 'grouped_courses', 'participating_programs'));
     }
-
 }

app/models/Activity.php

@@ -198,7 +198,7 @@ class Activity extends Eloquent
     return $outcomes_achieved;
   }
 
-  // o_att_array
+
   public function is_assessed()
   {
     $all_criterion = DB::table('activity_criterion')
@@ -236,6 +236,7 @@ class Activity extends Eloquent
     else return '';
   }
 
+  // o_att_array
 
   public function getOAttArrayAttribute()
   {

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

@@ -4,7 +4,11 @@
 @include('local.managers.admins._navigation')
 @stop
 @section('main')
+<div class="row">
+    <div class="col-md-12" id = 'message'>
 
+    </div>
+    </div>
 <div class="row">
     <div class="col-md-6">
         <!-- Form to add a new objective -->
@@ -524,8 +528,32 @@ $('#counterAssoc').val(counterAssoc);
                 text:text,
                 id:id
             },
-   function(){
-       location.reload(true);
+            function($array){
+       div = $('<div/>', {
+           'class':'alert alert-dismissible alert-'+$array.status,
+           'role':'alert'
+       })
+       button = $('<button/>', {
+           'class':'close',
+           'type':'button',
+           'data-dismiss':'alert',
+           'aria-label':'Close'
+
+       }).html('<span aria-hidden="true">&times;</span>');
+       div.append(button);
+       if($array.status == 'danger'){
+       span = $('<span/>',{
+           'class':'glyphicon glyphicon-remove-sign'
+       });
+       }
+       else{
+        span = $('<span/>',{
+           'class':'glyphicon glyphicon-ok-sign'
+       });
+       }
+       div.append(span);
+    div.append($array.message);
+    div.appendTo('#message');
    }
         )
     })

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

@@ -4,7 +4,11 @@
 @include('local.managers.pCoords._navigation')
 @stop
 @section('main')
+<div class="row">
+    <div class="col-md-12" id = 'message'>
 
+    </div>
+    </div>
 <div class="row">
     <div class="col-md-6">
         <!-- Form to add a new objective -->
@@ -16,7 +20,7 @@
                 {{ Form::open(array('action' => 'Objective2Controller@create' )) }}
                 <div id='outcomeGroup'>
                     <label> Associated Outcome</label>
-                    <div class="form-group col-md-11" id='outcomeForm='>
+                    <div class="form-group col-md-11" id='outcomeForm'>
 
 
                         <select id="outcome[0]" name="outcome[0]" class="form-control selectpicker">
@@ -549,8 +553,32 @@
                 text:text,
                 id:id
             },
-   function(){
-       location.reload(true);
+            function($array){
+       div = $('<div/>', {
+           'class':'alert alert-dismissible alert-'+$array.status,
+           'role':'alert'
+       })
+       button = $('<button/>', {
+           'class':'close',
+           'type':'button',
+           'data-dismiss':'alert',
+           'aria-label':'Close'
+
+       }).html('<span aria-hidden="true">&times;</span>');
+       div.append(button);
+       if($array.status == 'danger'){
+       span = $('<span/>',{
+           'class':'glyphicon glyphicon-remove-sign'
+       });
+       }
+       else{
+        span = $('<span/>',{
+           'class':'glyphicon glyphicon-ok-sign'
+       });
+       }
+       div.append(span);
+    div.append($array.message);
+    div.appendTo('#message');
    }
         )
     })

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

@@ -1176,8 +1176,7 @@ $('#alert_placeholder').html('<div class="alert alert-danger alert-dismissible"
 
 
 
-            },
-            'json'
+            }
         );
     }
 </script>@stop

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

@@ -4,7 +4,11 @@
 @include('local.managers.sCoords._navigation')
 @stop
 @section('main')
+<div class="row">
+    <div class="col-md-12" id = 'message'>
 
+    </div>
+    </div>
 <div class="row">
     <div class="col-md-6">
         <!-- Form to add a new objective -->
@@ -529,8 +533,32 @@
                 text:text,
                 id:id
             },
-   function(){
-       location.reload(true);
+   function($array){
+       div = $('<div/>', {
+           'class':'alert alert-dismissible alert-'+$array.status,
+           'role':'alert'
+       })
+       button = $('<button/>', {
+           'class':'close',
+           'type':'button',
+           'data-dismiss':'alert',
+           'aria-label':'Close'
+
+       }).html('<span aria-hidden="true">&times;</span>');
+       div.append(button);
+       if($array.status == 'danger'){
+       span = $('<span/>',{
+           'class':'glyphicon glyphicon-remove-sign'
+       });
+       }
+       else{
+        span = $('<span/>',{
+           'class':'glyphicon glyphicon-ok-sign'
+       });
+       }
+       div.append(span);
+    div.append($array.message);
+    div.appendTo('#message');
    }
         )
     })

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

@@ -376,7 +376,7 @@ $('#button-submit-assessment, #button-draft-assessment').on('click', function(e)
 
 
 // Enable fixed headers
-$('#assessment-table').stickyTableHeaders();
+//$('#assessment-table').stickyTableHeaders();
 
 
 // Hide spanish instructions by default

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

@@ -86,12 +86,12 @@
                         <td>{{ date('M d, Y', strtotime($activity->date)) }}</td>
                         <td>{{ date('M d, Y', strtotime($activity->updated_at)) }}</td>
                         <td>
-                            @if($activity->outcomes_attempted!=NULL)
+                            @if($activity->o_att_array)
                                 <span class="glyphicon glyphicon-ok"></span>
                             @endif
                         </td>
                         <td>
-                            @if($activity->outcomes_attempted!=NULL && !$activity->draft)
+                            @if($activity->o_att_array && !$activity->draft)
                                 <span class="glyphicon glyphicon-ok"></span>
                             @endif
                         </td>

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

@@ -134,7 +134,7 @@ echo '<style type="text/css" media="print">
       <td>
         {{{ $criterion->name }}}
 
-        @if(property_exists($criterion, 'subcriteria'))
+        @if($criterion->subcriteria)
           <ul class="list-unstyled">
             @foreach(json_decode($criterion->subcriteria) as $subcriterion)
                 <li>{{ $subcriterion }}</li>

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

@@ -46,8 +46,9 @@
             <td>
               <span><em data-toggle="tooltip" data-placement="top" title="{{ $criterion->notes }}">{{{ $criterion->name }}}</em></span>
               <sup></sup>
-              @if(property_exists($criterion, 'subcriteria'))
+              @if($criterion->subcriteria)
                 <ul class="list-unstyled">
+                 
                   @foreach(json_decode($criterion->subcriteria) as $subcriterion)
                       <li>{{ $subcriterion }}</li>
                   @endforeach
@@ -57,7 +58,7 @@
             @else
             <td>
               <span>{{{ $criterion->name }}}</span><sup></sup>
-              @if(property_exists($criterion, 'subcriteria'))
+              @if($criterion->subcriteria)
                 <ul class="list-unstyled">
                   @foreach(json_decode($criterion->subcriteria) as $subcriterion)
                       <li>{{ $subcriterion }}</li>