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

Corrigiendo bugs

app/controllers/ActivitiesController.php

@@ -1002,4 +1002,4 @@ class ActivitiesController extends \BaseController
 
         return View::make('local.professors.compare_activities', compact('activity_1', 'activity_2', 'activity_criterion_1', 'activity_criterion_2', 'title', 'outcomes', 'outcomes_achieved_1', 'outcomes_attempted_1', 'outcomes_achieved_2', 'outcomes_attempted_2', 'course', 'student_count', 'active_semesters'));
     }
-}
+}

app/controllers/AnnualPlansController.php

@@ -42,8 +42,10 @@ class AnnualPlansController extends \BaseController
 
   public function viewAllPlans($program_id)
   {
-    $title = "Annual Plans";
-    $annual_plans = DB::select("select semester_start, semester_end, program_id, annual_plans.id, academic_year from annual_plans, annual_cycle   where annual_plans.annual_cycle_id = annual_cycle.id and program_id ={$program_id} order by id desc");
+    $program = Program::find($program_id);
+    $title = "Annual Plans for " . $program->name;
+
+    $annual_plans = DB::select("select semester_start, semester_end, program_id, annual_plans.id, academic_year from annual_plans, annual_cycle   where annual_plans.annual_cycle_id = annual_cycle.id and program_id ={$program_id} order by semester_start desc");
 
 
     return View::make('local.managers.shared.view-annual-plans', compact('title', 'program_id', 'annual_plans'));
@@ -132,7 +134,8 @@ class AnnualPlansController extends \BaseController
 
   public function showPlan($program_id, $typ_id = null)
   {
-    $title = "Annual Plans";
+    $program = Program::find($program_id);
+    $title = "Annual Plans for " . $program->name;
     //$typ_parts = DB::select("select * from typ_parts");
 
     //     $current_typ = DB::select("select * from three_year_plan where year_start <=" . date('Y') . " and year_end >=" . date('Y'))[0];
@@ -145,7 +148,7 @@ class AnnualPlansController extends \BaseController
     }
 
 
-    $program = Program::where('id', '=', $program_id)->first();
+    //$program = Program::where('id', '=', $program_id)->first();
 
     //Dame los annual plans que esten dentro del three year plan
 
@@ -153,7 +156,7 @@ class AnnualPlansController extends \BaseController
     $annual_plans = DB::table('annual_cycle')
       ->join('annual_plans', 'annual_cycle_id', '=', 'annual_cycle.id')
       ->where('program_id', $program_id)
-      ->orderBy('semester_start')
+      ->orderBy('semester_start', 'desc')
       ->get();
     /*$annual_plans = DB::select("
     
@@ -193,6 +196,7 @@ class AnnualPlansController extends \BaseController
     }*/
     //$alltyp = DB::select('select * from three_year_plan order by id desc');
     //$current_typ = $current_typ->id;
+
     return View::make('local.managers.shared.annual-plans', compact('title', 'annual_plans', 'current_typ', 'program', 'outcomes', 'allSemesterOrder', 'alltyp'));
   }
 
@@ -211,7 +215,10 @@ class AnnualPlansController extends \BaseController
 
 
       ->where('program_id', $an_plan->program_id)
-      ->where('semester_id', $an_plan->semester_start)
+      ->where(function ($query) use (&$an_plan) {
+        $query->where('semester_id', $an_plan->semester_start)
+          ->orWhere('semester_id', $an_plan->semester_end);
+      })
       ->select('typ_program.*')
       ->first();
     Log::info(array($an_plan));
@@ -222,9 +229,27 @@ class AnnualPlansController extends \BaseController
 
     $json_to_send = [];
     $json_to_send["annual_plans"] = $an_plan;
-    $json_to_send["outcomes"]["first"] = DB::select("select * from outcomes where id in (select outcome_id from typ_semester_outcome where semester_id = {$an_plan->semester_start} and typ_program_id = {$current_typ_program->id})");
+
+    $json_to_send["outcomes"]["first"] = DB::table('outcomes')
+      ->join('typ_semester_outcome', 'typ_semester_outcome.outcome_id', '=', 'outcomes.id')
+      ->where('semester_id', $an_plan->semester_start)
+      ->where('typ_program_id', $current_typ_program->id)
+      ->select('outcomes.*', 'typ_semester_outcome.id as typ_semester_outcome_id')
+      ->get();
+
+    //DB::select("select * from outcomes where id in (select outcome_id from typ_semester_outcome where semester_id = {$an_plan->semester_start} and typ_program_id = {$current_typ_program->id})");
     $json_to_send["allSemesterOrder"]["first"] = DB::select("select * from semesters where id = {$an_plan->semester_start}")[0];
-    $json_to_send["outcomes"]["second"] = DB::select("select * from outcomes where id in (select outcome_id from typ_semester_outcome where semester_id ={$an_plan->semester_end} and typ_program_id  = {$current_typ_program->id})");
+    $json_to_send["outcomes"]["second"] = DB::table('outcomes')
+      ->join('typ_semester_outcome', 'typ_semester_outcome.outcome_id', '=', 'outcomes.id')
+      ->where('semester_id', $an_plan->semester_end)
+      ->where('typ_program_id', $current_typ_program->id)
+      ->select('outcomes.*', 'typ_semester_outcome.id as typ_semester_outcome_id')
+      ->get();
+
+    //DB::select("select * from outcomes where id in (select outcome_id from typ_semester_outcome where semester_id ={$an_plan->semester_end} and typ_program_id  = {$current_typ_program->id})");
+
+
+
     $json_to_send["allSemesterOrder"]["second"] = DB::select("select * from semesters where id = {$an_plan->semester_end}")[0];
     return json_encode($json_to_send);
   }
@@ -241,7 +266,7 @@ class AnnualPlansController extends \BaseController
     $typ_info = array();
     $semester = DB::select("select * from semesters where id=?", array(Input::get('semester')))[0];
 
-
+    $typ_semester_outcome_id = Input::get('typ_semester_outcome_id');
     //$typ_info['courses'] = DB::select("select * from courses where id in (select course_id from typ_semester_courses where typ_semester_outcome_id in (select id from typ_semester_outcome where semester_id ={$semester->id} and typ_program_id in (select id from typ_program where program_id ={$program_id} )and outcome_id = ?))", array(Input::get('id')));
     //foreach ($typ_info['courses'] as $course) {
     //  $typ_info['courses_objective'][$course->id] = DB::select("select * from objectives where id in (select objective_id from typ_semester_objectives where typ_semester_course_id in (select id from typ_semester_courses where typ_semester_outcome_id in (select id from typ_semester_outcome where semester_id = {$semester->id} and typ_program_id in (select id from typ_program where program_id ={$program_id}))and course_id ={$course->id}))");
@@ -256,7 +281,28 @@ class AnnualPlansController extends \BaseController
     //  $typ_info['criteria'][$objective->id] = DB::select("select * from criteria where id in (select criterion_id from criterion_objective_outcome where outcome_id = ? and objective_id = {$objective->id})", array(Input::get('id')));
     //}
     $annual_plan = DB::select("select annual_plans.id from annual_plans, annual_cycle where annual_plans.annual_cycle_id = annual_cycle.id and (semester_start = {$semester->id} or semester_end ={$semester->id}) and program_id ={$program_id}")[0];
-    $typ_info['expected_target'] = DB::select("select * from target_outcomes_program where program_id = {$program_id} and semester_id = {$semester->id}");
+    //$typ_info['expected_target'] = DB::select("select * from target_outcomes_program where program_id = {$program_id} and semester_id = {$semester->id}");
+    $typ_info['expected_target'] = DB::table('target_outcomes_program')
+      ->where('program_id', $program_id)
+      ->where('semester_id', $semester->id)
+      ->first();
+    if (!$typ_info['expected_target']) {
+      DB::beginTransaction();
+
+      DB::table('target_outcomes_program')->insert(
+        array(
+          'program_id' => $program_id,
+          'semester_id' => $semester->id,
+          'expected_target' => 70.00
+        )
+      );
+      DB::commit();
+      $typ_info['expected_target'] = DB::table('target_outcomes_program')
+        ->where('program_id', $program_id)
+        ->where('semester_id', $semester->id)
+        ->first();
+    }
+
     $typ_info['objectives'] = DB::select("select * from objectives where id in (select objective_id from typ_semester_objectives where typ_semester_outcome_id in(select id from typ_semester_outcome where outcome_id = ? and semester_id = {$semester->id} and typ_program_id in (select id from typ_program where program_id ={$program_id})))", array(Input::get('id')));
     $typ_info['transformative_actions'] = DB::select("select * from transformative_actions where by_professor =0 and is_custom=0");
     foreach ($typ_info['objectives'] as $objective) {
@@ -297,6 +343,21 @@ class AnnualPlansController extends \BaseController
     $typ_info['annual_plan'] = $annual_plan;
     Log::info($typ_info);
 
+    $typ_info['transformative_actions_for_outcome'] = DB::table('transformative_actions')
+      ->join('transformative_typ_outcome', 'transformative_typ_outcome.trans_id', '=', 'transformative_actions.id')
+      ->where('transformative_typ_outcome.typ_semester_outcome_id', $typ_semester_outcome_id)
+      ->get();
+    $typ_info['categories'] = "<option value='0'>Nothing Selected</option>";
+
+    $types = DB::table('transformative_actions')
+      ->select('type_of_TA')
+      ->where('type_of_TA', '<>', '')
+      ->distinct()
+      ->get();
+    foreach ($types as $type) {
+      $typ_info['categories'] .= "<option value = '" . $type->type_of_TA . "'>" . $type->type_of_TA . "</option>";
+    }
+    $typ_info['categories'] .= '<option value ="new"> New Type of Transformative Action</option>';
     return json_encode($typ_info);
   }
   public function deleteTA()
@@ -615,7 +676,7 @@ class AnnualPlansController extends \BaseController
     $outcome->outcome_program_goal = DB::table('target_outcomes_program')
       ->where('program_id', $program_id)
       ->where('semester_id', $semester_id)
-      ->first()->expected_target;
+      ->first();
 
     foreach ($outcome->objectives as $index => $objective) {
       $objective->courses = Objective::getPlanReport($objective);
@@ -623,4 +684,41 @@ class AnnualPlansController extends \BaseController
 
     return $outcome;
   }
+
+  public function fetchObjectiveInfo()
+  {
+    $typ_objective_id = Input::get('typ_objective_id');
+    $courses = DB::table('typ_semester_courses')
+      ->join('courses', 'courses.id', '=', 'typ_semester_courses.course_id')
+
+      ->select('courses.code', 'courses.number', 'courses.name', 'typ_semester_courses.id as typ_semester_course_id')
+      ->where('typ_semester_objective_id', $typ_objective_id)
+      ->distinct()
+      ->get();
+    foreach ($courses as $course) {
+      /*$course->criteria_scale = DB::table('annual_plan_objective')
+        ->join('criteria', 'criteria.id', '=', 'annual_plan_objective.criteria_id')
+        ->join('criterion_scale', 'criterion_scale.criterion_id', '=', 'criteria.id')
+        ->join('scales', 'scales.id', '=', 'criterion_scale.scale_id')
+        ->select('criterion_scale.*', 'scales.*')
+        ->where('typ_semester_course_id', $course->typ_semester_course_id)
+        ->orderBy('position', 'ASC')
+        ->get();*/
+      $course->criteria = DB::table('annual_plan_objective')
+        ->join('criteria', 'criteria.id', '=', 'annual_plan_objective.criteria_id')
+        ->where('typ_semester_course_id', $course->typ_semester_course_id)
+        ->select('criteria.*')
+        ->get();
+      foreach ($course->criteria as $criterion) {
+        $criterion->scales = DB::table('criteria')
+          ->join('criterion_scale', 'criterion_scale.criterion_id', '=', 'criteria.id')
+          ->join('scales', 'scales.id', '=', 'criterion_scale.scale_id')
+          ->select('criterion_scale.*', 'scales.*')
+          ->where('criteria.id', $criterion->id)
+          ->orderBy('position', 'ASC')
+          ->get();
+      }
+    }
+    return $courses;
+  }
 }

app/controllers/CoursesController.php

@@ -535,4 +535,4 @@ CoursesController extends \BaseController
         } else {
         }
     }
-}
+}

app/controllers/CriteriaController.php

@@ -1073,4 +1073,4 @@ class CriteriaController extends \BaseController
                 break;
         }
     }
-}
+}

app/controllers/Objective2Controller.php

@@ -129,7 +129,11 @@ class Objective2Controller extends \BaseController
 		$program_id = Input::get('program_fetch');
 		$outcome_id = Input::get('outcome_fetch');
 		$json = array();
+
+
 		$json['objective'] = DB::select("SELECT * FROM `objectives` where id in (select objective_id from objective_outcome where outcome_id ={$outcome_id}) and id in (select objective_id from objective_program where program_id = {$program_id})");
+		Log::info('En mi sueño');
+		Log::info($json);
 		return json_encode($json);
 	}
 	public function delete()

app/controllers/OutcomesController.php

@@ -1053,10 +1053,10 @@ class OutcomesController extends \BaseController
 
     public function annualReport($program_id)
     {
-        $title = "Program Courses Report";
+        $title = "Program Annual Report";
 
 
-        $annual_plans = $annual_plans = DB::select("
+        $annual_plans = DB::select("
     
         select 
           academic_year, 
@@ -1067,19 +1067,9 @@ class OutcomesController extends \BaseController
           annual_cycle.*
         from annual_plans 
         join annual_cycle on annual_cycle_id = annual_cycle.id 
-        where program_id = 110 
-        and(
-          semester_start in(
-            select semester_id 
-            from typ_semester_outcome 
-            join typ_program on typ_semester_outcome.typ_program_id = typ_program.id 
-            where program_id = {$program_id} )
-          or semester_end in(
-            select semester_id 
-            from typ_semester_outcome 
-            join typ_program on typ_semester_outcome.typ_program_id = typ_program.id 
-            where program_id = {$program_id} )
-          )
+        where program_id = {$program_id} 
+        and
+        annual_plans.is_submitted =1
           order by semester_start desc");
         $program = DB::table('programs')
             ->where('id', $program_id)

app/controllers/ProfessorsController.php

@@ -23,7 +23,7 @@ class ProfessorsController extends \BaseController
             ->orderBy('name', 'ASC')->get();
         $outcomeCount = count($outcomes);
 
-Log::info($grouped_courses);
+        Log::info($grouped_courses);
         $grouped_outcomes_achieved_results = array();
         $grouped_outcomes_attempted_results = array();
         $grouped_sections = array();
@@ -39,15 +39,15 @@ Log::info($grouped_courses);
 
             // Find sections belonging to user with identifier of one course
             $sections = Course::with('program')
-            	->where('user_id', Auth::user()->id)
+                ->where('user_id', Auth::user()->id)
                 ->where('code', $grouped_course->code)
                 ->whereIn('semester_id', Session::get('semesters_ids'))
                 ->where('number', $grouped_course->number)
                 ->where('semester_id', $grouped_course->semester_id)
                 ->get();
 
-// 			        Log::info($sections);
-			        
+            // 			        Log::info($sections);
+
             // For each of the professor's course sections, add the attempted and achieved criteria per outcome
             foreach ($sections as $section) {
 
@@ -97,15 +97,15 @@ Log::info($grouped_courses);
         $program_courses = Course::where('program_id', '=', $program->id)->whereIn('semester_id', Session::get('semesters_ids'))->get();
         $semesters = Session::get('semesters_ids');
         $semesters = DB::table('semesters')->whereIn('id', $semesters)->orderBy('start', 'ASC')->first();
-        $semesters2 = Semester::whereIn('id',Session::get('semesters_ids'))->get();
+        $semesters2 = Semester::whereIn('id', Session::get('semesters_ids'))->get();
 
-//         $outcomes = Outcome::select(array('id', 'name', 'expected_outcome'))
-//         	->where('level','=',)
-//             ->whereNull('deleted_at')
-//             ->whereRaw("(deactivation_date IS NULL or deactivation_date >= '{$semesters->start}')")
-//             ->orderBy('name', 'ASC')->get();
+        //         $outcomes = Outcome::select(array('id', 'name', 'expected_outcome'))
+        //         	->where('level','=',)
+        //             ->whereNull('deleted_at')
+        //             ->whereRaw("(deactivation_date IS NULL or deactivation_date >= '{$semesters->start}')")
+        //             ->orderBy('name', 'ASC')->get();
         $outcomes = Outcome::active_by_semesters($semesters2, $program->is_graduate);
-	    $outcomeCount = count($outcomes);
+        $outcomeCount = count($outcomes);
         $outcomes_achieved = [];
         $outcomes_attempted = [];
 
@@ -169,4 +169,4 @@ Log::info($grouped_courses);
 
         return View::make('local.managers.shared.general_studies_overview', compact('title', 'outcomes', 'schools', 'program_packs'));
     }
-}
+}

app/controllers/ProgramsController.php

@@ -552,4 +552,4 @@ class ProgramsController extends \BaseController
     //Log::info('id:' . Input::get('id'));
     return School::find(Input::get('id'))->programs;
   }
-}
+}

app/controllers/RubricsController.php

@@ -33,8 +33,8 @@ class RubricsController extends \BaseController
         $outcomes = Outcome::orderBy('name', 'ASC')->get();
         $criteria = Criterion::orderBy('name', 'ASC')->get();
         $rubric = $activity->rubric;
-//         $draft=$activity->draft;
-//         Log::info("*****".$activity);
+        //         $draft=$activity->draft;
+        //         Log::info("*****".$activity);
 
 
 
@@ -319,15 +319,15 @@ class RubricsController extends \BaseController
     {
         $activity = Activity::find($activity_id);
         // Get activity's course
-//         Log::info("actv".$activity);
+        //         Log::info("actv".$activity);
         $course = Course::where('id', '=', $activity->course_id)->firstOrFail();
-//         Log::info("user".$course->user_id);
+        //         Log::info("user".$course->user_id);
 
         // If activity does not belong to the requesting user, display 403
         if ($course->user_id != Auth::id())
             App::abort('403', 'Access Forbidden');
-//         Log::info("rubric".$activity->rubric);
-// exit();
+        //         Log::info("rubric".$activity->rubric);
+        // exit();
         $rubric = Rubric::where('id', '=', $activity->rubric[0]->id)->firstOrFail();
         $rubric_criterion = DB::table('criteria')
             ->join('rubric_criterion', 'rubric_criterion.criterion_id', '=', 'criteria.id')

app/controllers/SchoolCoordinatorsController.php

@@ -5,7 +5,7 @@ class SchoolCoordinatorsController extends \BaseController
 
     private function participatingPrograms($school)
     {
-         return DB::table('programs')
+        return DB::table('programs')
             ->join('courses', 'courses.program_id', '=', 'programs.id')
             ->join('activities', 'activities.course_id', '=', 'courses.id')
             ->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
@@ -16,27 +16,27 @@ class SchoolCoordinatorsController extends \BaseController
             ->whereIn('semester_id', Session::get('semesters_ids'))
             ->lists('id');
 
-//        return DB::table('programs')
-//             ->join('courses', 'courses.program_id', '=', 'programs.id')
-//             ->select('programs.id', 'programs.name', 'programs.is_graduate', 'programs.school_id')
-//             ->addSelect('courses.semester_id')
-//             ->where('school_id', $school->id)
-//             ->whereIn('semester_id', Session::get('semesters_ids'))
-//             ->lists('id');
+        //        return DB::table('programs')
+        //             ->join('courses', 'courses.program_id', '=', 'programs.id')
+        //             ->select('programs.id', 'programs.name', 'programs.is_graduate', 'programs.school_id')
+        //             ->addSelect('courses.semester_id')
+        //             ->where('school_id', $school->id)
+        //             ->whereIn('semester_id', Session::get('semesters_ids'))
+        //             ->lists('id');
     }
 
     public function overview()
     {
         ini_set('memory_limit', '256M');
         DB::connection()->disableQueryLog();
-//         $school = School::find($id);
+        //         $school = School::find($id);
         $school = Auth::user()->school;
         $id = $school->id;
 
         $title = $school->name;
         $schools = School::all();
 
-        $semesters = Semester::whereIn('id',Session::get('semesters_ids'))->get();
+        $semesters = Semester::whereIn('id', Session::get('semesters_ids'))->get();
 
         $outcomes_grad = Outcome::active_by_semesters($semesters, 1);
         $outcomes_undergrad = Outcome::active_by_semesters($semesters, 0);
@@ -92,31 +92,25 @@ class SchoolCoordinatorsController extends \BaseController
             ->orderBy('courses.semester_id')
             ->get();
 
-		foreach($undergrad_grouped_courses as $key=>$courses)
-		{
-			$undergrad_grouped_courses[$key]->outcomes_attempted=NULL;	
-			$coursesT=Course::where('courses.code',$courses->code)->where('courses.number',$courses->number)->where('courses.semester_id',$courses->semester_id)->get();
-			foreach($coursesT as $course)
-    		{
-				if($course->isAssessed())
-				{
-					$undergrad_grouped_courses[$key]->outcomes_attempted=true;
-				}
-			}
-    	}
-
-		foreach($grad_grouped_courses as $key=>$courses)
-		{
-			$grad_grouped_courses[$key]->outcomes_attempted=NULL;	
-			$coursesT=Course::where('courses.code',$courses->code)->where('courses.number',$courses->number)->where('courses.semester_id',$courses->semester_id)->get();
-			foreach($coursesT as $course)
-    		{
-				if($course->isAssessed())
-				{
-					$grad_grouped_courses[$key]->outcomes_attempted=true;
-				}
-			}
-    	}
+        foreach ($undergrad_grouped_courses as $key => $courses) {
+            $undergrad_grouped_courses[$key]->outcomes_attempted = NULL;
+            $coursesT = Course::where('courses.code', $courses->code)->where('courses.number', $courses->number)->where('courses.semester_id', $courses->semester_id)->get();
+            foreach ($coursesT as $course) {
+                if ($course->isAssessed()) {
+                    $undergrad_grouped_courses[$key]->outcomes_attempted = true;
+                }
+            }
+        }
+
+        foreach ($grad_grouped_courses as $key => $courses) {
+            $grad_grouped_courses[$key]->outcomes_attempted = NULL;
+            $coursesT = Course::where('courses.code', $courses->code)->where('courses.number', $courses->number)->where('courses.semester_id', $courses->semester_id)->get();
+            foreach ($coursesT as $course) {
+                if ($course->isAssessed()) {
+                    $grad_grouped_courses[$key]->outcomes_attempted = true;
+                }
+            }
+        }
 
         // Fetch programs with participation
         $participating_programs = $this->participatingPrograms($school);
@@ -135,14 +129,13 @@ class SchoolCoordinatorsController extends \BaseController
         foreach ($school->programs as $program) {
             foreach ($program->courses as $course) {
 
-	            if (!$course->program->is_graduate){
-    	            $undergrad_school_sections_count += 1;
-    	        	if($course->isAssessed())$undergrad_assessed_sections_count += 1;
-    	        }
-        	    else {
-            	    $grad_school_sections_count += 1;
-            		if($course->isAssessed())$grad_assessed_sections_count += 1;
-           		}
+                if (!$course->program->is_graduate) {
+                    $undergrad_school_sections_count += 1;
+                    if ($course->isAssessed()) $undergrad_assessed_sections_count += 1;
+                } else {
+                    $grad_school_sections_count += 1;
+                    if ($course->isAssessed()) $grad_assessed_sections_count += 1;
+                }
             }
         }
 
@@ -152,37 +145,33 @@ class SchoolCoordinatorsController extends \BaseController
 
         // For each outcome 
         foreach ($outcomes_undergrad as $outcome) {
-//         	$attempted_outcomes_per_undergrad_program[$outcome->id]=0;
-//         	$achieved_outcomes_per_undergrad_program[$outcome->id]=0;
-        	$attemptedUndergradProgramsPerOutcome[$outcome->id]=0;
-        	$achievedUndergradProgramsPerOutcome[$outcome->id]=0;
-        	$programs_attempted_in_school[$outcome->id]=$outcome->programs_attempted_in_school($semesters, $school->id);
-//         	var_dump($programs_attempted_in_school);exit();
-        	foreach($programs_attempted_in_school[$outcome->id] as $program_id)
-        	{
-//         		var_dump($program_id->id);exit();
-				$program = DB::table('programs')->where('id', '=', $program_id->id)->first();
-
-        		if(!$program->is_graduate)
-        		{
-        			$attemptedUndergradProgramsPerOutcome[$outcome->id]++;
-        			$programC=Program::where('id', '=', $program_id->id)->first();
-//         			var_dump($programC);exit();
-					if($programC->achieved_outcome($outcome->id,$semesters))
-					{
-						$achievedUndergradProgramsPerOutcome[$outcome->id]++;
-					}
-        		}
-        	}
- 			$undergrad_outcomes_attempted[$outcome->id]=$outcome->attempted_by_school($semesters, $school->id,0);
- 			$undergrad_outcomes_achieved[$outcome->id]=$outcome->achieved_by_school($semesters, $school->id,0);
- 			
+            //         	$attempted_outcomes_per_undergrad_program[$outcome->id]=0;
+            //         	$achieved_outcomes_per_undergrad_program[$outcome->id]=0;
+            $attemptedUndergradProgramsPerOutcome[$outcome->id] = 0;
+            $achievedUndergradProgramsPerOutcome[$outcome->id] = 0;
+            $programs_attempted_in_school[$outcome->id] = $outcome->programs_attempted_in_school($semesters, $school->id);
+            //         	var_dump($programs_attempted_in_school);exit();
+            foreach ($programs_attempted_in_school[$outcome->id] as $program_id) {
+                //         		var_dump($program_id->id);exit();
+                $program = DB::table('programs')->where('id', '=', $program_id->id)->first();
+
+                if (!$program->is_graduate) {
+                    $attemptedUndergradProgramsPerOutcome[$outcome->id]++;
+                    $programC = Program::where('id', '=', $program_id->id)->first();
+                    //         			var_dump($programC);exit();
+                    if ($programC->achieved_outcome($outcome->id, $semesters)) {
+                        $achievedUndergradProgramsPerOutcome[$outcome->id]++;
+                    }
+                }
+            }
+            $undergrad_outcomes_attempted[$outcome->id] = $outcome->attempted_by_school($semesters, $school->id, 0);
+            $undergrad_outcomes_achieved[$outcome->id] = $outcome->achieved_by_school($semesters, $school->id, 0);
+
             // For each program with courses that do assessment
             $programs_with_courses = Program::with(array('courses' => function ($query) {
                 //                 $query->whereNotNull('outcomes_attempted');
                 $query->whereIn('semester_id', Session::get('semesters_ids'));
             }))->where('is_graduate', 0)->where('school_id', $school->id)->orderBy('name', 'asc')->get();
-
         }
 
         /**
@@ -191,43 +180,39 @@ class SchoolCoordinatorsController extends \BaseController
 
         // For each outcome 
         foreach ($outcomes_grad as $outcome) {
-//         	$attempted_outcomes_per_grad_program[$outcome->id]=0;
-        	$achieved_outcomes_per_grad_program[$outcome->id]=0;
-        	$attemptedGradProgramsPerOutcome[$outcome->id]=0;
-        	$achievedGradProgramsPerOutcome[$outcome->id]=0;
- 			$grad_outcomes_attempted[$outcome->id]=$outcome->attempted_by_school($semesters, $school->id,1);
- 			$grad_outcomes_achieved[$outcome->id]=$outcome->achieved_by_school($semesters, $school->id,1);
-           // For each program with courses that do assessment
-        	foreach($programs_attempted_in_school[$outcome->id] as $program_id)
-        	{
-//         		var_dump($program_id->id);exit();
-				$program = DB::table('programs')
-                        ->where('id', '=', $program_id->id)
-                        ->first();
-//         		$program=Program::where('id', $program_id->id);
-//         		var_dump($program);exit();
-        		if($program->is_graduate)
-        		{
-        			$attemptedGradProgramsPerOutcome[$outcome->id]++;
-        			$programC=Program::where('id', '=', $program_id->id)->first();
-//         			var_dump($programC);exit();
-					if($programC->achieved_outcome($outcome->id,$semesters))
-					{
-						$achievedGradProgramsPerOutcome[$outcome->id]++;
-					}
-        		}
-        	}
+            //         	$attempted_outcomes_per_grad_program[$outcome->id]=0;
+            $achieved_outcomes_per_grad_program[$outcome->id] = 0;
+            $attemptedGradProgramsPerOutcome[$outcome->id] = 0;
+            $achievedGradProgramsPerOutcome[$outcome->id] = 0;
+            $grad_outcomes_attempted[$outcome->id] = $outcome->attempted_by_school($semesters, $school->id, 1);
+            $grad_outcomes_achieved[$outcome->id] = $outcome->achieved_by_school($semesters, $school->id, 1);
+            // For each program with courses that do assessment
+            foreach ($programs_attempted_in_school[$outcome->id] as $program_id) {
+                //         		var_dump($program_id->id);exit();
+                $program = DB::table('programs')
+                    ->where('id', '=', $program_id->id)
+                    ->first();
+                //         		$program=Program::where('id', $program_id->id);
+                //         		var_dump($program);exit();
+                if ($program->is_graduate) {
+                    $attemptedGradProgramsPerOutcome[$outcome->id]++;
+                    $programC = Program::where('id', '=', $program_id->id)->first();
+                    //         			var_dump($programC);exit();
+                    if ($programC->achieved_outcome($outcome->id, $semesters)) {
+                        $achievedGradProgramsPerOutcome[$outcome->id]++;
+                    }
+                }
+            }
             $programs_with_courses = Program::with(array('courses' => function ($query) {
                 //                 $query->whereNotNull('outcomes_attempted');
                 $query->whereIn('semester_id', Session::get('semesters_ids'));
             }))->where('is_graduate', 1)->where('school_id', $school->id)->orderBy('name', 'asc')->get();
-
         }
         if ($school->id == 13) {
-//             return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
+            //             return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
             return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
         } else {
-//             return View::make('local.managers.shared.school', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
+            //             return View::make('local.managers.shared.school', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
             return View::make('local.managers.shared.school', compact('title', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
         }
     }
@@ -377,48 +362,47 @@ class SchoolCoordinatorsController extends \BaseController
 
         foreach ($school->programs as $program) {
             foreach ($program->courses as $course) {
-                        if (!$course->program->is_graduate){
-                $undergrad_school_sections_count += 1;
-            	if($course->isAssessed())$undergrad_assessed_sections_count += 1;
-//             	            Log::info("aqui".$course);
+                if (!$course->program->is_graduate) {
+                    $undergrad_school_sections_count += 1;
+                    if ($course->isAssessed()) $undergrad_assessed_sections_count += 1;
+                    //             	            Log::info("aqui".$course);
 
-            }
-            else {
-                $grad_school_sections_count += 1;
-            	if($course->isAssessed())$grad_assessed_sections_count += 1;
-//             	            	            Log::info("aqui".$course);
+                } else {
+                    $grad_school_sections_count += 1;
+                    if ($course->isAssessed()) $grad_assessed_sections_count += 1;
+                    //             	            	            Log::info("aqui".$course);
 
-            }
-// 
-//                 if (!$course->program->is_graduate) {
-//                     if ($course_outcomes_achieved = $course->outcomes_ach()) {
-//                         //$course_outcomes_achieved = $course->outcomes_ach();
-//                         $course_outcomes_attempted = $course->outcomes_att();
-//                         foreach ($course_outcomes_attempted as $i => $score) {
-// 
-//                             $undergrad_outcomes_attempted[$i] += $score;
-//                         }
-//                         foreach ($course_outcomes_achieved as $i => $score) {
-//                             $undergrad_outcomes_achieved[$i] += $score;
-//                         }
-//                         $undergrad_assessed_sections_count += 1;
-//                     }
-//                     $undergrad_school_sections_count += 1;
-//                 } else {
-//                     if ($course_outcomes_achieved = $course->outcomes_ach()) {
-//                         //$course_outcomes_achieved = $course->outcomes_ach();
-//                         $course_outcomes_attempted = $course->outcomes_att();
-//                         foreach ($course_outcomes_attempted as $i => $score) {
-// 
-//                             $grad_outcomes_attempted[$i] += $score;
-//                         }
-//                         foreach ($course_outcomes_achieved as $i => $score) {
-//                             $grad_outcomes_achieved[$i] += $score;
-//                         }
-//                         $grad_assessed_sections_count += 1;
-//                     }
-//                     $grad_school_sections_count += 1;
-//                 }
+                }
+                // 
+                //                 if (!$course->program->is_graduate) {
+                //                     if ($course_outcomes_achieved = $course->outcomes_ach()) {
+                //                         //$course_outcomes_achieved = $course->outcomes_ach();
+                //                         $course_outcomes_attempted = $course->outcomes_att();
+                //                         foreach ($course_outcomes_attempted as $i => $score) {
+                // 
+                //                             $undergrad_outcomes_attempted[$i] += $score;
+                //                         }
+                //                         foreach ($course_outcomes_achieved as $i => $score) {
+                //                             $undergrad_outcomes_achieved[$i] += $score;
+                //                         }
+                //                         $undergrad_assessed_sections_count += 1;
+                //                     }
+                //                     $undergrad_school_sections_count += 1;
+                //                 } else {
+                //                     if ($course_outcomes_achieved = $course->outcomes_ach()) {
+                //                         //$course_outcomes_achieved = $course->outcomes_ach();
+                //                         $course_outcomes_attempted = $course->outcomes_att();
+                //                         foreach ($course_outcomes_attempted as $i => $score) {
+                // 
+                //                             $grad_outcomes_attempted[$i] += $score;
+                //                         }
+                //                         foreach ($course_outcomes_achieved as $i => $score) {
+                //                             $grad_outcomes_achieved[$i] += $score;
+                //                         }
+                //                         $grad_assessed_sections_count += 1;
+                //                     }
+                //                     $grad_school_sections_count += 1;
+                //                 }
             }
         }
 
@@ -433,16 +417,16 @@ class SchoolCoordinatorsController extends \BaseController
         $attemptedUndergradProgramsPerOutcome = array_fill(1, $outcomeCount, 0);
 
         // Fetch programs with participation for the school
-        
-//         $participating_undergrad_programs = DB::table('programs')
-//             ->join('courses', 'courses.program_id', '=', 'programs.id')
-//             ->select('programs.id', 'programs.name', 'programs.is_graduate', 'programs.school_id')
-//             ->addSelect('courses.semester_id')
-//             ->whereIn('semester_id', Session::get('semesters_ids'))
-//             ->where('is_graduate', 0)
-//             ->where('school_id', $school->id)
-//             ->groupBy('id')
-//             ->get();
+
+        //         $participating_undergrad_programs = DB::table('programs')
+        //             ->join('courses', 'courses.program_id', '=', 'programs.id')
+        //             ->select('programs.id', 'programs.name', 'programs.is_graduate', 'programs.school_id')
+        //             ->addSelect('courses.semester_id')
+        //             ->whereIn('semester_id', Session::get('semesters_ids'))
+        //             ->where('is_graduate', 0)
+        //             ->where('school_id', $school->id)
+        //             ->groupBy('id')
+        //             ->get();
 
         $output = array();
 
@@ -463,43 +447,43 @@ class SchoolCoordinatorsController extends \BaseController
             }))->where('is_graduate', 0)->where('school_id', $school->id)->orderBy('name', 'asc')->get();
 
             foreach ($programs_with_courses as $program) {
-              if(in_array($program->id,$participating_programs)){
-               // To acummulate all criteria for one program
-                $achieved_outcomes_per_undergrad_program = array_fill(1, $outcomeCount, 0);
-                $attempted_outcomes_per_undergrad_program = array_fill(1, $outcomeCount, 0);
-
-                //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) && 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 (in_array($program->id, $participating_programs)) {
+                    // To acummulate all criteria for one program
+                    $achieved_outcomes_per_undergrad_program = array_fill(1, $outcomeCount, 0);
+                    $attempted_outcomes_per_undergrad_program = array_fill(1, $outcomeCount, 0);
+
+                    //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) && array_key_exists($outcome->id, $course_outcomes_achieved2)
+                            && $course_outcomes_attempted2[$outcome->id] > 0
+                        ) {
+                            $achieved_outcomes_per_undergrad_program[$outcome->id] += $course_outcomes_achieved2[$outcome->id];
+                            $attempted_outcomes_per_undergrad_program[$outcome->id] += $course_outcomes_attempted2[$outcome->id];
+
+                            // Add one to the programs assessing, if it wasn't added before
+                            if (!$flag) {
+                                $attemptedUndergradProgramsPerOutcome[$outcome->id] += 1;
+                                $flag = true;
+                            }
                         }
-                    }
 
-                    // $output[] = 'ACHIEVED: '.$program->name.'-'.json_encode($achieved_outcomes_per_undergrad_program);
-                    // $output[] = 'ATTEMPTED: '.$program->name.'-'.json_encode($attempted_outcomes_per_program);
+                        // $output[] = 'ACHIEVED: '.$program->name.'-'.json_encode($achieved_outcomes_per_undergrad_program);
+                        // $output[] = 'ATTEMPTED: '.$program->name.'-'.json_encode($attempted_outcomes_per_program);
 
+                    }
+                    //If the accumulated achieved criteria for a specific outcome in a program divided by the accumulated attempted criteria for a specific outcome in a program is greated than the expected outcome
+                    if ($attempted_outcomes_per_undergrad_program[$outcome->id] != 0 && (float)$achieved_outcomes_per_undergrad_program[$outcome->id] / $attempted_outcomes_per_undergrad_program[$outcome->id] * 100 >= $outcome->expected_outcome) {
+                        $achievedUndergradProgramsPerOutcome[$outcome->id] += 1;
+                        // $output[]= 'END OF PROGRAM: '.$program->name.'-'.json_encode($achievedProgramsPerOutcome);
+                    }
                 }
-                //If 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);
-                }
-            }
             }
         }
 
@@ -514,15 +498,15 @@ class SchoolCoordinatorsController extends \BaseController
         $attemptedGradProgramsPerOutcome = array_fill(1, $outcomeCount, 0);
 
         // Fetch programs with participation for the school
-//         $participating_grad_programs = DB::table('programs')
-//             ->join('courses', 'courses.program_id', '=', 'programs.id')
-//             ->select('programs.id', 'programs.name', 'programs.is_graduate', 'programs.school_id')
-//             ->addSelect('courses.semester_id')
-//             ->whereIn('semester_id', Session::get('semesters_ids'))
-//             ->where('is_graduate', 1)
-//             ->where('school_id', $school->id)
-//             ->groupBy('id')
-//             ->get();
+        //         $participating_grad_programs = DB::table('programs')
+        //             ->join('courses', 'courses.program_id', '=', 'programs.id')
+        //             ->select('programs.id', 'programs.name', 'programs.is_graduate', 'programs.school_id')
+        //             ->addSelect('courses.semester_id')
+        //             ->whereIn('semester_id', Session::get('semesters_ids'))
+        //             ->where('is_graduate', 1)
+        //             ->where('school_id', $school->id)
+        //             ->groupBy('id')
+        //             ->get();
 
         $output = array();
 
@@ -543,47 +527,46 @@ class SchoolCoordinatorsController extends \BaseController
             }))->where('is_graduate', 1)->where('school_id', $school->id)->orderBy('name', 'asc')->get();
 
             foreach ($programs_with_courses as $program) {
-             if(in_array($program->id,$participating_programs)){
-                // To acummulate all criteria for one program
-                $achieved_outcomes_per_grad_program = array_fill(1, $outcomeCount, 0);
-                $attempted_outcomes_per_grad_program = array_fill(1, $outcomeCount, 0);
-
-                //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) && 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 (in_array($program->id, $participating_programs)) {
+                    // To acummulate all criteria for one program
+                    $achieved_outcomes_per_grad_program = array_fill(1, $outcomeCount, 0);
+                    $attempted_outcomes_per_grad_program = array_fill(1, $outcomeCount, 0);
+
+                    //Flag for counting programs
+                    $flag = false;
+
+                    // For each course in the program
+                    foreach ($program->courses as $course) {
+                        // If 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) && 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;
+                            }
                         }
-                    }
 
-                    // $output[] = 'ACHIEVED: '.$program->name.'-'.json_encode($achieved_outcomes_per_grad_program);
-                    // $output[] = 'ATTEMPTED: '.$program->name.'-'.json_encode($attempted_outcomes_per_program);
+                        // $output[] = 'ACHIEVED: '.$program->name.'-'.json_encode($achieved_outcomes_per_grad_program);
+                        // $output[] = 'ATTEMPTED: '.$program->name.'-'.json_encode($attempted_outcomes_per_program);
 
-                }
-                //If the accumulated achieved criteria for a specific outcome in a program divided by the accumulated attempted criteria for a specific outcome in a program is greated than the expected outcome
-                if ($attempted_outcomes_per_grad_program[$outcome->id] != 0 && (float)$achieved_outcomes_per_grad_program[$outcome->id] / $attempted_outcomes_per_grad_program[$outcome->id] * 100 >= $outcome->expected_outcome) {
-                    $achievedGradProgramsPerOutcome[$outcome->id] += 1;
-                    // $output[]= 'END OF PROGRAM: '.$program->name.'-'.json_encode($achievedProgramsPerOutcome);
+                    }
+                    //If 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'));
+        //         return View::make('local.managers.shared.school', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
         return View::make('local.managers.shared.school', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
     }
-
 }

app/controllers/SchoolsController.php

@@ -16,13 +16,13 @@ class SchoolsController extends \BaseController
             ->whereIn('semester_id', Session::get('semesters_ids'))
             ->lists('id');
 
-//         return DB::table('programs')
-//             ->join('courses', 'courses.program_id', '=', 'programs.id')
-//             ->select('programs.id', 'programs.name', 'programs.is_graduate', 'programs.school_id')
-//             ->addSelect('courses.semester_id')
-//             ->where('school_id', $school->id)
-//             ->whereIn('semester_id', Session::get('semesters_ids'))
-//             ->lists('id');
+        //         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)
@@ -33,7 +33,7 @@ class SchoolsController extends \BaseController
         $title = $school->name;
         $schools = School::all();
 
-        $semesters = Semester::whereIn('id',Session::get('semesters_ids'))->get();
+        $semesters = Semester::whereIn('id', Session::get('semesters_ids'))->get();
 
         $outcomes_grad = Outcome::active_by_semesters($semesters, 1);
         $outcomes_undergrad = Outcome::active_by_semesters($semesters, 0);
@@ -88,32 +88,26 @@ class SchoolsController extends \BaseController
             ->orderBy('courses.number')
             ->orderBy('courses.semester_id')
             ->get();
-            
-		foreach($undergrad_grouped_courses as $key=>$courses)
-		{
-			$undergrad_grouped_courses[$key]->outcomes_attempted=NULL;	
-			$coursesT=Course::where('courses.code',$courses->code)->where('courses.number',$courses->number)->where('courses.semester_id',$courses->semester_id)->get();
-			foreach($coursesT as $course)
-    		{
-				if($course->isAssessed())
-				{
-					$undergrad_grouped_courses[$key]->outcomes_attempted=true;
-				}
-			}
-    	}
-
-		foreach($grad_grouped_courses as $key=>$courses)
-		{
-			$grad_grouped_courses[$key]->outcomes_attempted=NULL;	
-			$coursesT=Course::where('courses.code',$courses->code)->where('courses.number',$courses->number)->where('courses.semester_id',$courses->semester_id)->get();
-			foreach($coursesT as $course)
-    		{
-				if($course->isAssessed())
-				{
-					$grad_grouped_courses[$key]->outcomes_attempted=true;
-				}
-			}
-    	}
+
+        foreach ($undergrad_grouped_courses as $key => $courses) {
+            $undergrad_grouped_courses[$key]->outcomes_attempted = NULL;
+            $coursesT = Course::where('courses.code', $courses->code)->where('courses.number', $courses->number)->where('courses.semester_id', $courses->semester_id)->get();
+            foreach ($coursesT as $course) {
+                if ($course->isAssessed()) {
+                    $undergrad_grouped_courses[$key]->outcomes_attempted = true;
+                }
+            }
+        }
+
+        foreach ($grad_grouped_courses as $key => $courses) {
+            $grad_grouped_courses[$key]->outcomes_attempted = NULL;
+            $coursesT = Course::where('courses.code', $courses->code)->where('courses.number', $courses->number)->where('courses.semester_id', $courses->semester_id)->get();
+            foreach ($coursesT as $course) {
+                if ($course->isAssessed()) {
+                    $grad_grouped_courses[$key]->outcomes_attempted = true;
+                }
+            }
+        }
 
         // Fetch programs with participation
         $participating_programs = $this->participatingPrograms($school);
@@ -131,14 +125,13 @@ class SchoolsController extends \BaseController
         foreach ($school->programs as $program) {
             foreach ($program->courses as $course) {
 
-	            if (!$course->program->is_graduate){
-    	            $undergrad_school_sections_count += 1;
-    	        	if($course->isAssessed())$undergrad_assessed_sections_count += 1;
-    	        }
-        	    else {
-            	    $grad_school_sections_count += 1;
-            		if($course->isAssessed())$grad_assessed_sections_count += 1;
-           		}
+                if (!$course->program->is_graduate) {
+                    $undergrad_school_sections_count += 1;
+                    if ($course->isAssessed()) $undergrad_assessed_sections_count += 1;
+                } else {
+                    $grad_school_sections_count += 1;
+                    if ($course->isAssessed()) $grad_assessed_sections_count += 1;
+                }
             }
         }
 
@@ -148,37 +141,33 @@ class SchoolsController extends \BaseController
 
         // For each outcome 
         foreach ($outcomes_undergrad as $outcome) {
-//         	$attempted_outcomes_per_undergrad_program[$outcome->id]=0;
-//         	$achieved_outcomes_per_undergrad_program[$outcome->id]=0;
-        	$attemptedUndergradProgramsPerOutcome[$outcome->id]=0;
-        	$achievedUndergradProgramsPerOutcome[$outcome->id]=0;
-        	$programs_attempted_in_school[$outcome->id]=$outcome->programs_attempted_in_school($semesters, $school->id);
-//         	var_dump($programs_attempted_in_school);exit();
-        	foreach($programs_attempted_in_school[$outcome->id] as $program_id)
-        	{
-//         		var_dump($program_id->id);exit();
-				$program = DB::table('programs')->where('id', '=', $program_id->id)->first();
-
-        		if(!$program->is_graduate)
-        		{
-        			$attemptedUndergradProgramsPerOutcome[$outcome->id]++;
-        			$programC=Program::where('id', '=', $program_id->id)->first();
-//         			var_dump($programC);exit();
-					if($programC->achieved_outcome($outcome->id,$semesters))
-					{
-						$achievedUndergradProgramsPerOutcome[$outcome->id]++;
-					}
-        		}
-        	}
- 			$undergrad_outcomes_attempted[$outcome->id]=$outcome->attempted_by_school($semesters, $school->id,0);
- 			$undergrad_outcomes_achieved[$outcome->id]=$outcome->achieved_by_school($semesters, $school->id,0);
- 			
+            //         	$attempted_outcomes_per_undergrad_program[$outcome->id]=0;
+            //         	$achieved_outcomes_per_undergrad_program[$outcome->id]=0;
+            $attemptedUndergradProgramsPerOutcome[$outcome->id] = 0;
+            $achievedUndergradProgramsPerOutcome[$outcome->id] = 0;
+            $programs_attempted_in_school[$outcome->id] = $outcome->programs_attempted_in_school($semesters, $school->id);
+            //         	var_dump($programs_attempted_in_school);exit();
+            foreach ($programs_attempted_in_school[$outcome->id] as $program_id) {
+                //         		var_dump($program_id->id);exit();
+                $program = DB::table('programs')->where('id', '=', $program_id->id)->first();
+
+                if (!$program->is_graduate) {
+                    $attemptedUndergradProgramsPerOutcome[$outcome->id]++;
+                    $programC = Program::where('id', '=', $program_id->id)->first();
+                    //         			var_dump($programC);exit();
+                    if ($programC->achieved_outcome($outcome->id, $semesters)) {
+                        $achievedUndergradProgramsPerOutcome[$outcome->id]++;
+                    }
+                }
+            }
+            $undergrad_outcomes_attempted[$outcome->id] = $outcome->attempted_by_school($semesters, $school->id, 0);
+            $undergrad_outcomes_achieved[$outcome->id] = $outcome->achieved_by_school($semesters, $school->id, 0);
+
             // For each program with courses that do assessment
             $programs_with_courses = Program::with(array('courses' => function ($query) {
                 //                 $query->whereNotNull('outcomes_attempted');
                 $query->whereIn('semester_id', Session::get('semesters_ids'));
             }))->where('is_graduate', 0)->where('school_id', $school->id)->orderBy('name', 'asc')->get();
-
         }
 
         /**
@@ -187,43 +176,39 @@ class SchoolsController extends \BaseController
 
         // For each outcome 
         foreach ($outcomes_grad as $outcome) {
-//         	$attempted_outcomes_per_grad_program[$outcome->id]=0;
-        	$achieved_outcomes_per_grad_program[$outcome->id]=0;
-        	$attemptedGradProgramsPerOutcome[$outcome->id]=0;
-        	$achievedGradProgramsPerOutcome[$outcome->id]=0;
- 			$grad_outcomes_attempted[$outcome->id]=$outcome->attempted_by_school($semesters, $school->id,1);
- 			$grad_outcomes_achieved[$outcome->id]=$outcome->achieved_by_school($semesters, $school->id,1);
-           // For each program with courses that do assessment
-        	foreach($programs_attempted_in_school[$outcome->id] as $program_id)
-        	{
-//         		var_dump($program_id->id);exit();
-				$program = DB::table('programs')
-                        ->where('id', '=', $program_id->id)
-                        ->first();
-//         		$program=Program::where('id', $program_id->id);
-//         		var_dump($program);exit();
-        		if($program->is_graduate)
-        		{
-        			$attemptedGradProgramsPerOutcome[$outcome->id]++;
-        			$programC=Program::where('id', '=', $program_id->id)->first();
-//         			var_dump($programC);exit();
-					if($programC->achieved_outcome($outcome->id,$semesters))
-					{
-						$achievedGradProgramsPerOutcome[$outcome->id]++;
-					}
-        		}
-        	}
+            //         	$attempted_outcomes_per_grad_program[$outcome->id]=0;
+            $achieved_outcomes_per_grad_program[$outcome->id] = 0;
+            $attemptedGradProgramsPerOutcome[$outcome->id] = 0;
+            $achievedGradProgramsPerOutcome[$outcome->id] = 0;
+            $grad_outcomes_attempted[$outcome->id] = $outcome->attempted_by_school($semesters, $school->id, 1);
+            $grad_outcomes_achieved[$outcome->id] = $outcome->achieved_by_school($semesters, $school->id, 1);
+            // For each program with courses that do assessment
+            foreach ($programs_attempted_in_school[$outcome->id] as $program_id) {
+                //         		var_dump($program_id->id);exit();
+                $program = DB::table('programs')
+                    ->where('id', '=', $program_id->id)
+                    ->first();
+                //         		$program=Program::where('id', $program_id->id);
+                //         		var_dump($program);exit();
+                if ($program->is_graduate) {
+                    $attemptedGradProgramsPerOutcome[$outcome->id]++;
+                    $programC = Program::where('id', '=', $program_id->id)->first();
+                    //         			var_dump($programC);exit();
+                    if ($programC->achieved_outcome($outcome->id, $semesters)) {
+                        $achievedGradProgramsPerOutcome[$outcome->id]++;
+                    }
+                }
+            }
             $programs_with_courses = Program::with(array('courses' => function ($query) {
                 //                 $query->whereNotNull('outcomes_attempted');
                 $query->whereIn('semester_id', Session::get('semesters_ids'));
             }))->where('is_graduate', 1)->where('school_id', $school->id)->orderBy('name', 'asc')->get();
-
         }
         if ($school->id == 13) {
-//             return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
+            //             return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
             return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
         } else {
-//             return View::make('local.managers.shared.school', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
+            //             return View::make('local.managers.shared.school', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
             return View::make('local.managers.shared.school', compact('title', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
         }
     }
@@ -236,11 +221,11 @@ class SchoolsController extends \BaseController
         $title = $school->name;
         $schools = School::all();
 
-//         $outcomes = Outcome::orderBy('name', 'asc')->get();
-//         $outcomeCount = Outcome::all()->count();
-        $semesters = Semester::whereIn('id',Session::get('semesters_ids'))->get();
-// var_dump($semesters);
-// exit();
+        //         $outcomes = Outcome::orderBy('name', 'asc')->get();
+        //         $outcomeCount = Outcome::all()->count();
+        $semesters = Semester::whereIn('id', Session::get('semesters_ids'))->get();
+        // var_dump($semesters);
+        // exit();
         $outcomes_grad = Outcome::active_by_semesters($semesters, 1);
         $outcomes_undergrad = Outcome::active_by_semesters($semesters, 0);
 
@@ -304,57 +289,56 @@ class SchoolsController extends \BaseController
          * Calculate how many sections are doing assessment
          */
 
-//         $undergrad_outcomes_achieved = array_fill(1, $outcomeCount, 0);
-//         $undergrad_outcomes_attempted = array_fill(1, $outcomeCount, 0);
+        //         $undergrad_outcomes_achieved = array_fill(1, $outcomeCount, 0);
+        //         $undergrad_outcomes_attempted = array_fill(1, $outcomeCount, 0);
         $undergrad_assessed_sections_count = 0;
         $undergrad_school_sections_count = 0;
 
-//         $grad_outcomes_achieved = array_fill(1, $outcomeCount, 0);
-//         $grad_outcomes_attempted = array_fill(1, $outcomeCount, 0);
+        //         $grad_outcomes_achieved = array_fill(1, $outcomeCount, 0);
+        //         $grad_outcomes_attempted = array_fill(1, $outcomeCount, 0);
         $grad_assessed_sections_count = 0;
         $grad_school_sections_count = 0;
 
         foreach ($school->programs as $program) {
             foreach ($program->courses as $course) {
-//             	            Log::info("aqui".$course);
+                //             	            Log::info("aqui".$course);
 
-            if (!$course->program->is_graduate){
-                $undergrad_school_sections_count += 1;
-            	if($course->isAssessed())$undergrad_assessed_sections_count += 1;
-//             	            Log::info("aqui".$course);
+                if (!$course->program->is_graduate) {
+                    $undergrad_school_sections_count += 1;
+                    if ($course->isAssessed()) $undergrad_assessed_sections_count += 1;
+                    //             	            Log::info("aqui".$course);
 
-            }
-            else {
-                $grad_school_sections_count += 1;
-            	if($course->isAssessed())$grad_assessed_sections_count += 1;
-//             	            	            Log::info("aqui".$course);
+                } else {
+                    $grad_school_sections_count += 1;
+                    if ($course->isAssessed()) $grad_assessed_sections_count += 1;
+                    //             	            	            Log::info("aqui".$course);
 
-            }
+                }
+
+                //                 if (!$course->program->is_graduate) {
+                //                     if ($course->outcomes_achieved != NULL) {
+                //                         $course_outcomes_achieved = json_decode($course->outcomes_achieved, true);
+                //                         $course_outcomes_attempted = json_decode($course->outcomes_attempted, true);
+                //                         for ($i = 1; $i <= count($undergrad_outcomes_attempted); $i++) {
+                //                             $undergrad_outcomes_achieved[$i] += $course_outcomes_achieved[$i];
+                //                             $undergrad_outcomes_attempted[$i] += $course_outcomes_attempted[$i];
+                //                         }
+                //                         $undergrad_assessed_sections_count += 1;
+                //                     }
+                //                     $undergrad_school_sections_count += 1;
+                //                 } else {
+                //                     if ($course->outcomes_achieved != NULL) {
+                //                         $course_outcomes_achieved = json_decode($course->outcomes_achieved, true);
+                //                         $course_outcomes_attempted = json_decode($course->outcomes_attempted, true);
+                //                         for ($i = 1; $i <= count($grad_outcomes_attempted); $i++) {
+                //                             $grad_outcomes_achieved[$i] += $course_outcomes_achieved[$i];
+                //                             $grad_outcomes_attempted[$i] += $course_outcomes_attempted[$i];
+                //                         }
+                //                         $grad_assessed_sections_count += 1;
+                //                     }
+                //                     $grad_school_sections_count += 1;
+                //                 }
 
-//                 if (!$course->program->is_graduate) {
-//                     if ($course->outcomes_achieved != NULL) {
-//                         $course_outcomes_achieved = json_decode($course->outcomes_achieved, true);
-//                         $course_outcomes_attempted = json_decode($course->outcomes_attempted, true);
-//                         for ($i = 1; $i <= count($undergrad_outcomes_attempted); $i++) {
-//                             $undergrad_outcomes_achieved[$i] += $course_outcomes_achieved[$i];
-//                             $undergrad_outcomes_attempted[$i] += $course_outcomes_attempted[$i];
-//                         }
-//                         $undergrad_assessed_sections_count += 1;
-//                     }
-//                     $undergrad_school_sections_count += 1;
-//                 } else {
-//                     if ($course->outcomes_achieved != NULL) {
-//                         $course_outcomes_achieved = json_decode($course->outcomes_achieved, true);
-//                         $course_outcomes_attempted = json_decode($course->outcomes_attempted, true);
-//                         for ($i = 1; $i <= count($grad_outcomes_attempted); $i++) {
-//                             $grad_outcomes_achieved[$i] += $course_outcomes_achieved[$i];
-//                             $grad_outcomes_attempted[$i] += $course_outcomes_attempted[$i];
-//                         }
-//                         $grad_assessed_sections_count += 1;
-//                     }
-//                     $grad_school_sections_count += 1;
-//                 }
-                
             }
         }
 
@@ -363,50 +347,47 @@ class SchoolsController extends \BaseController
          */
 
         // Number of programs that achieved a particular learning outcome
-//         $achievedUndergradProgramsPerOutcome = array_fill(1, $outcomeCount, 0);
+        //         $achievedUndergradProgramsPerOutcome = array_fill(1, $outcomeCount, 0);
 
         // Number of programs that attempted a particular learning outcome
-//         $attemptedUndergradProgramsPerOutcome = array_fill(1, $outcomeCount, 0);
+        //         $attemptedUndergradProgramsPerOutcome = array_fill(1, $outcomeCount, 0);
 
         // Fetch programs with participation for the school
-//         $participating_undergrad_programs = DB::table('programs')
-//             ->join('courses', 'courses.program_id', '=', 'programs.id')
-//             ->select('programs.id', 'programs.name', 'programs.is_graduate', 'programs.school_id')
-//             ->addSelect('courses.semester_id')
-//             ->whereIn('semester_id', Session::get('semesters_ids'))
-//             ->where('is_graduate', 0)
-//             ->where('school_id', $school->id)
-//             ->groupBy('id')
-//             ->get();
+        //         $participating_undergrad_programs = DB::table('programs')
+        //             ->join('courses', 'courses.program_id', '=', 'programs.id')
+        //             ->select('programs.id', 'programs.name', 'programs.is_graduate', 'programs.school_id')
+        //             ->addSelect('courses.semester_id')
+        //             ->whereIn('semester_id', Session::get('semesters_ids'))
+        //             ->where('is_graduate', 0)
+        //             ->where('school_id', $school->id)
+        //             ->groupBy('id')
+        //             ->get();
 
         $output = array();
 
 
         // For each outcome 
         foreach ($outcomes_undergrad as $outcome) {
-//         	$attempted_outcomes_per_undergrad_program[$outcome->id]=0;
-        	$achieved_outcomes_per_undergrad_program[$outcome->id]=0;
-        	$attemptedUndergradProgramsPerOutcome[$outcome->id]=0;
-        	$achievedUndergradProgramsPerOutcome[$outcome->id]=0;
-        	$programs_attempted_in_school[$outcome->id]=$outcome->programs_attempted_in_school($semesters, $school->id);
-//         	var_dump($programs_attempted_in_school);exit();
-        	foreach($programs_attempted_in_school[$outcome->id] as $program_id)
-        	{
-//         		var_dump($program_id->id);exit();
-				$program = DB::table('programs')
-                        ->where('id', '=', $program_id->id)
-                        ->first();
-//         		$program=Program::where('id', $program_id->id);
-//         		var_dump($program);exit();
-        		if(!$program->is_graduate)
-        		{
-        			$attemptedUndergradProgramsPerOutcome[$outcome->id]++;
-        			
-        		}
-        	}
- 			$undergrad_outcomes_attempted[$outcome->id]=$outcome->attempted_by_school($semesters, $school->id,0);
- 			$undergrad_outcomes_achieved[$outcome->id]=$outcome->achieved_by_school($semesters, $school->id,0);
- 			
+            //         	$attempted_outcomes_per_undergrad_program[$outcome->id]=0;
+            $achieved_outcomes_per_undergrad_program[$outcome->id] = 0;
+            $attemptedUndergradProgramsPerOutcome[$outcome->id] = 0;
+            $achievedUndergradProgramsPerOutcome[$outcome->id] = 0;
+            $programs_attempted_in_school[$outcome->id] = $outcome->programs_attempted_in_school($semesters, $school->id);
+            //         	var_dump($programs_attempted_in_school);exit();
+            foreach ($programs_attempted_in_school[$outcome->id] as $program_id) {
+                //         		var_dump($program_id->id);exit();
+                $program = DB::table('programs')
+                    ->where('id', '=', $program_id->id)
+                    ->first();
+                //         		$program=Program::where('id', $program_id->id);
+                //         		var_dump($program);exit();
+                if (!$program->is_graduate) {
+                    $attemptedUndergradProgramsPerOutcome[$outcome->id]++;
+                }
+            }
+            $undergrad_outcomes_attempted[$outcome->id] = $outcome->attempted_by_school($semesters, $school->id, 0);
+            $undergrad_outcomes_achieved[$outcome->id] = $outcome->achieved_by_school($semesters, $school->id, 0);
+
             // For each program with courses that do assessment
             $programs_with_courses = Program::with(array('courses' => function ($query) {
                 //                 $query->whereNotNull('outcomes_attempted');
@@ -414,46 +395,46 @@ class SchoolsController extends \BaseController
             }))->where('is_graduate', 0)->where('school_id', $school->id)->orderBy('name', 'asc')->get();
 
             foreach ($programs_with_courses as $program) {
-            if(in_array($program->id,$participating_programs)){
-                // To acummulate all criteria for one program
-//                 $achieved_outcomes_per_undergrad_program = array_fill(1, $outcomeCount, 0);
-//                 $attempted_outcomes_per_undergrad_program = array_fill(1, $outcomeCount, 0);
-
-                //Flag for counting programs
-                $flag = false;
-
-                // For each course in the program
- //                foreach ($program->courses as $course) {
-//                 if($course->isAssessed()){
-//                     // If the outcome in question is being evaluated
-//                     $course_outcomes_attempted2 = $course->outcomes_att();
-//                     //                     $course_outcomes_attempted2 = json_decode($course->outcomes_attempted, true);
-//                     //                     $course_outcomes_achieved2 = json_decode($course->outcomes_achieved, true);
-//                     $course_outcomes_achieved2 = $course->outcomes_ach();
-//                     if (
-//                         array_key_exists($outcome->id, $course_outcomes_attempted2) && array_key_exists($outcome->id, $course_outcomes_achieved2)
-//                         && $course_outcomes_attempted2[$outcome->id] > 0
-//                     ) {
-//                         $achieved_outcomes_per_undergrad_program[$outcome->id] += $course_outcomes_achieved2[$outcome->id];
-// //                         $attempted_outcomes_per_undergrad_program[$outcome->id] += $course_outcomes_attempted2[$outcome->id];
-// 
-//                         // Add one to the programs assessing, if it wasn't added before
-//                         if (!$flag) {
-//                             $attemptedUndergradProgramsPerOutcome[$outcome->id] += 1;
-//                             $flag = true;
-//                         }
-//                     }
-// 
-//                     // $output[] = 'ACHIEVED: '.$program->name.'-'.json_encode($achieved_outcomes_per_undergrad_program);
-//                     // $output[] = 'ATTEMPTED: '.$program->name.'-'.json_encode($attempted_outcomes_per_program);
-// 				}
-//                 }
-                //If the accumulated achieved criteria for a specific outcome in a program divided by the accumulated attempted criteria for a specific outcome in a program is greated than the expected outcome
-//                 if ($attempted_outcomes_per_undergrad_program[$outcome->id] != 0 && (float)$achieved_outcomes_per_undergrad_program[$outcome->id] / $attempted_outcomes_per_undergrad_program[$outcome->id] * 100 >= $outcome->expected_outcome) {
-//                     $achievedUndergradProgramsPerOutcome[$outcome->id] += 1;
-//                     // $output[]= 'END OF PROGRAM: '.$program->name.'-'.json_encode($achievedProgramsPerOutcome);
-//                 }
-            }
+                if (in_array($program->id, $participating_programs)) {
+                    // To acummulate all criteria for one program
+                    //                 $achieved_outcomes_per_undergrad_program = array_fill(1, $outcomeCount, 0);
+                    //                 $attempted_outcomes_per_undergrad_program = array_fill(1, $outcomeCount, 0);
+
+                    //Flag for counting programs
+                    $flag = false;
+
+                    // For each course in the program
+                    //                foreach ($program->courses as $course) {
+                    //                 if($course->isAssessed()){
+                    //                     // If the outcome in question is being evaluated
+                    //                     $course_outcomes_attempted2 = $course->outcomes_att();
+                    //                     //                     $course_outcomes_attempted2 = json_decode($course->outcomes_attempted, true);
+                    //                     //                     $course_outcomes_achieved2 = json_decode($course->outcomes_achieved, true);
+                    //                     $course_outcomes_achieved2 = $course->outcomes_ach();
+                    //                     if (
+                    //                         array_key_exists($outcome->id, $course_outcomes_attempted2) && array_key_exists($outcome->id, $course_outcomes_achieved2)
+                    //                         && $course_outcomes_attempted2[$outcome->id] > 0
+                    //                     ) {
+                    //                         $achieved_outcomes_per_undergrad_program[$outcome->id] += $course_outcomes_achieved2[$outcome->id];
+                    // //                         $attempted_outcomes_per_undergrad_program[$outcome->id] += $course_outcomes_attempted2[$outcome->id];
+                    // 
+                    //                         // Add one to the programs assessing, if it wasn't added before
+                    //                         if (!$flag) {
+                    //                             $attemptedUndergradProgramsPerOutcome[$outcome->id] += 1;
+                    //                             $flag = true;
+                    //                         }
+                    //                     }
+                    // 
+                    //                     // $output[] = 'ACHIEVED: '.$program->name.'-'.json_encode($achieved_outcomes_per_undergrad_program);
+                    //                     // $output[] = 'ATTEMPTED: '.$program->name.'-'.json_encode($attempted_outcomes_per_program);
+                    // 				}
+                    //                 }
+                    //If the accumulated achieved criteria for a specific outcome in a program divided by the accumulated attempted criteria for a specific outcome in a program is greated than the expected outcome
+                    //                 if ($attempted_outcomes_per_undergrad_program[$outcome->id] != 0 && (float)$achieved_outcomes_per_undergrad_program[$outcome->id] / $attempted_outcomes_per_undergrad_program[$outcome->id] * 100 >= $outcome->expected_outcome) {
+                    //                     $achievedUndergradProgramsPerOutcome[$outcome->id] += 1;
+                    //                     // $output[]= 'END OF PROGRAM: '.$program->name.'-'.json_encode($achievedProgramsPerOutcome);
+                    //                 }
+                }
             }
         }
 
@@ -462,101 +443,98 @@ class SchoolsController extends \BaseController
          */
 
         // Number of programs that achieved a particular learning outcome
-//         $achievedGradProgramsPerOutcome = array_fill(1, $outcomeCount, 0);
+        //         $achievedGradProgramsPerOutcome = array_fill(1, $outcomeCount, 0);
 
         // Number of programs that attempted a particular learning outcome
-//         $attemptedGradProgramsPerOutcome = array_fill(1, $outcomeCount, 0);
-// 
+        //         $attemptedGradProgramsPerOutcome = array_fill(1, $outcomeCount, 0);
+        // 
         // Fetch programs with participation for the school
-//         $participating_grad_programs = DB::table('programs')
-//             ->join('courses', 'courses.program_id', '=', 'programs.id')
-//             ->select('programs.id', 'programs.name', 'programs.is_graduate', 'programs.school_id')
-//             ->addSelect('courses.semester_id')
-//             ->whereIn('semester_id', Session::get('semesters_ids'))
-//             ->where('is_graduate', 1)
-//             ->where('school_id', $school->id)
-//             ->groupBy('id')
-//             ->get();
+        //         $participating_grad_programs = DB::table('programs')
+        //             ->join('courses', 'courses.program_id', '=', 'programs.id')
+        //             ->select('programs.id', 'programs.name', 'programs.is_graduate', 'programs.school_id')
+        //             ->addSelect('courses.semester_id')
+        //             ->whereIn('semester_id', Session::get('semesters_ids'))
+        //             ->where('is_graduate', 1)
+        //             ->where('school_id', $school->id)
+        //             ->groupBy('id')
+        //             ->get();
 
         $output = array();
 
 
         // For each outcome 
         foreach ($outcomes_grad as $outcome) {
-//         	$attempted_outcomes_per_grad_program[$outcome->id]=0;
-        	$achieved_outcomes_per_grad_program[$outcome->id]=0;
-        	$attemptedGradProgramsPerOutcome[$outcome->id]=0;
-        	$achievedGradProgramsPerOutcome[$outcome->id]=0;
- 			$grad_outcomes_attempted[$outcome->id]=$outcome->attempted_by_school($semesters, $school->id,1);
- 			$grad_outcomes_achieved[$outcome->id]=$outcome->achieved_by_school($semesters, $school->id,1);
-           // For each program with courses that do assessment
-        	foreach($programs_attempted_in_school[$outcome->id] as $program_id)
-        	{
-//         		var_dump($program_id->id);exit();
-				$program = DB::table('programs')
-                        ->where('id', '=', $program_id->id)
-                        ->first();
-//         		$program=Program::where('id', $program_id->id);
-//         		var_dump($program);exit();
-        		if($program->is_graduate)
-        		{
-        			$attemptedGradProgramsPerOutcome[$outcome->id]++;
-        			
-        		}
-        	}
+            //         	$attempted_outcomes_per_grad_program[$outcome->id]=0;
+            $achieved_outcomes_per_grad_program[$outcome->id] = 0;
+            $attemptedGradProgramsPerOutcome[$outcome->id] = 0;
+            $achievedGradProgramsPerOutcome[$outcome->id] = 0;
+            $grad_outcomes_attempted[$outcome->id] = $outcome->attempted_by_school($semesters, $school->id, 1);
+            $grad_outcomes_achieved[$outcome->id] = $outcome->achieved_by_school($semesters, $school->id, 1);
+            // For each program with courses that do assessment
+            foreach ($programs_attempted_in_school[$outcome->id] as $program_id) {
+                //         		var_dump($program_id->id);exit();
+                $program = DB::table('programs')
+                    ->where('id', '=', $program_id->id)
+                    ->first();
+                //         		$program=Program::where('id', $program_id->id);
+                //         		var_dump($program);exit();
+                if ($program->is_graduate) {
+                    $attemptedGradProgramsPerOutcome[$outcome->id]++;
+                }
+            }
             $programs_with_courses = Program::with(array('courses' => function ($query) {
                 //                 $query->whereNotNull('outcomes_attempted');
                 $query->whereIn('semester_id', Session::get('semesters_ids'));
             }))->where('is_graduate', 1)->where('school_id', $school->id)->orderBy('name', 'asc')->get();
 
             foreach ($programs_with_courses as $program) {
-             if(in_array($program->id,$participating_programs)){
-               // To acummulate all criteria for one program
-//                 $achieved_outcomes_per_grad_program = array_fill(1, $outcomeCount, 0);
-//                 $attempted_outcomes_per_grad_program = array_fill(1, $outcomeCount, 0);
-
-                //Flag for counting programs
-                $flag = false;
-
-                // For each course in the program
-                foreach ($program->courses as $course) {
-                if($course->isAssessed()){
-                    // If the outcome in question is being evaluated
-                    //                     $course_outcomes_attempted2 = json_decode($course->outcomes_attempted, true);
-                    $course_outcomes_attempted2 = ($course->outcomes_att());
-                    $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];
-
-                        // Add one to the programs assessing, if it wasn't added before
-                        if (!$flag) {
-                            $attemptedGradProgramsPerOutcome[$outcome->id] += 1;
-                            $flag = true;
+                if (in_array($program->id, $participating_programs)) {
+                    // To acummulate all criteria for one program
+                    //                 $achieved_outcomes_per_grad_program = array_fill(1, $outcomeCount, 0);
+                    //                 $attempted_outcomes_per_grad_program = array_fill(1, $outcomeCount, 0);
+
+                    //Flag for counting programs
+                    $flag = false;
+
+                    // For each course in the program
+                    foreach ($program->courses as $course) {
+                        if ($course->isAssessed()) {
+                            // If the outcome in question is being evaluated
+                            //                     $course_outcomes_attempted2 = json_decode($course->outcomes_attempted, true);
+                            $course_outcomes_attempted2 = ($course->outcomes_att());
+                            $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];
+
+                                // 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);
                         }
                     }
-
-                    // $output[] = 'ACHIEVED: '.$program->name.'-'.json_encode($achieved_outcomes_per_grad_program);
-                    // $output[] = 'ATTEMPTED: '.$program->name.'-'.json_encode($attempted_outcomes_per_program);
-			}
-                }
-                //If the accumulated achieved criteria for a specific outcome in a program divided by the accumulated attempted criteria for a specific outcome in a program is greated than the expected outcome
-                if ($attempted_outcomes_per_grad_program[$outcome->id] != 0 && (float)$achieved_outcomes_per_grad_program[$outcome->id] / $attempted_outcomes_per_grad_program[$outcome->id] * 100 >= $outcome->expected_outcome) {
-                    $achievedGradProgramsPerOutcome[$outcome->id] += 1;
-                    // $output[]= 'END OF PROGRAM: '.$program->name.'-'.json_encode($achievedProgramsPerOutcome);
+                    //If the accumulated achieved criteria for a specific outcome in a program divided by the accumulated attempted criteria for a specific outcome in a program is greated than the expected outcome
+                    if ($attempted_outcomes_per_grad_program[$outcome->id] != 0 && (float)$achieved_outcomes_per_grad_program[$outcome->id] / $attempted_outcomes_per_grad_program[$outcome->id] * 100 >= $outcome->expected_outcome) {
+                        $achievedGradProgramsPerOutcome[$outcome->id] += 1;
+                        // $output[]= 'END OF PROGRAM: '.$program->name.'-'.json_encode($achievedProgramsPerOutcome);
+                    }
                 }
-           }
             }
         }
         if ($school->id == 13) {
-//             return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
+            //             return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
             return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
         } else {
-//             return View::make('local.managers.shared.school', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
+            //             return View::make('local.managers.shared.school', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
             return View::make('local.managers.shared.school', compact('title', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
         }
     }

app/controllers/TemplatesController.php

@@ -6,6 +6,38 @@ class TemplatesController extends \BaseController
 	/**
 	 * List all templates, grouped by program
 	 */
+	public function ProfIndex()
+	{
+		$title = 'Rubric List';
+
+
+		$role = Auth::user()->role;
+		$program_id = DB::table("program_user")
+			->where('user_id', Auth::user()->id)
+			->lists('program_id')[0];
+		$school_id = DB::table('programs')
+			->where('id', $program_id)
+			->lists('school_id')[0];
+
+
+		$templates = Template::orderBy('name')
+			->whereNull("school_id")
+			->orWhere(function ($query) use (&$school_id) {
+				$query->where('school_id', $school_id)
+					->whereNull('program_id');
+			})
+			->orWhere(function ($query) use (&$program_id, &$school_id) {
+				$query->where('school_id', $school_id)
+					->where('program_id', $program_id);
+			})
+
+
+			->get();
+
+
+
+		return View::make('local.managers.shared.rubric_list', compact('title', 'global_templates', 'schools', 'templates', 'role'));
+	}
 	public function index()
 	{
 		$title = 'Rubric List';
@@ -29,6 +61,7 @@ class TemplatesController extends \BaseController
 					->get();
 				break;
 			case 3:
+			case 4:
 				$program_id = DB::table("program_user")
 					->where('user_id', Auth::user()->id)
 					->lists('program_id')[0];
@@ -39,13 +72,19 @@ class TemplatesController extends \BaseController
 
 				$templates = Template::orderBy('name')
 					->whereNull("school_id")
-					->orWhere('school_id', $school_id)
-					->orWhere('program_id', $program_id)
+					->orWhere(function ($query) use (&$school_id) {
+						$query->where('school_id', $school_id)
+							->whereNull('program_id');
+					})
+					->orWhere(function ($query) use (&$program_id, &$school_id) {
+						$query->where('school_id', $school_id)
+							->where('program_id', $program_id);
+					})
 
 					->get();
 				break;
 		}
-		$templates = Template::orderBy('name')->get();
+		//$templates = Template::orderBy('name')->get();
 
 		return View::make('local.managers.shared.rubric_list', compact('title', 'global_templates', 'schools', 'templates', 'role'));
 	}

app/controllers/ThreeYearPlanController.php

@@ -631,4 +631,4 @@ class ThreeYearPlanController extends \BaseController
 
     return View::make('global.print_three_year_plan', compact('typ_semesters', 'program', 'three_year_plan', 'typ_semesters', 'typ_semester_outcome'));
   }
-}
+}

app/controllers/TransformativeActionsController.php

@@ -1404,4 +1404,4 @@ class TransformativeActionsController extends \BaseController
     }
     return $grouped_courses;
   }
-}
+}

app/database/migrations/2022_02_03_135359_create_transformative_typ_outcome.php

@@ -0,0 +1,56 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateTransformativeTypOutcome extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('transformative_typ_outcome', function (Blueprint $table) {
+			$table->increments('id');
+			$table->integer('trans_id')->unsigned();
+			$table->integer('typ_semester_outcome_id')->unsigned();
+			$table->foreign('trans_id')
+				->references('id')
+				->on('transformative_actions')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->foreign('typ_semester_outcome_id')
+				->references('id')
+				->on('typ_semester_outcome')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->integer('proposing_coordinator_id')->unsigned();
+			$table->foreign('proposing_coordinator_id')
+				->references('id')
+				->on('users')
+				->onDelete('restrict')
+				->onUpdate('restrict');
+
+
+
+			$table->timestamp('created_at')->default(DB::raw('CURRENT_TIMESTAMP'));
+			$table->timestamp('updated_at')->default(DB::raw('CURRENT_TIMESTAMP'));
+			$table->timestamp('deleted_at')->default(DB::raw('CURRENT_TIMESTAMP'));
+			//$table->softDeletes()->default(DB::raw('CURRENT_TIMESTAMP'));
+
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('transformative_typ_outcome');
+	}
+}

app/database/migrations/2022_02_03_193908_create_transformative_action_status.php

@@ -0,0 +1,42 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateTransformativeActionStatus extends Migration
+{
+
+	public function up()
+	{
+		Schema::create('transformative_action_status', function (Blueprint $table) {
+			$table->increments('id');
+			$table->boolean('accomplished');
+			$table->boolean('it_was_useful')->default(0);
+
+			$table->integer('trans_id')->unsigned();
+			$table->foreign('trans_id')
+				->references('id')
+				->on('transformative_actions')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+
+			$table->integer('supervised_coordinator_id')->unsigned();
+			$table->foreign('supervised_coordinator_id')
+				->references('id')
+				->on('users')
+				->onDelete('restrict')
+				->onUpdate('restrict');
+			$table->text('comments')->nullable();
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('transformative_action_status');
+	}
+}

app/database/migrations/2022_02_04_040351_add_submit_in_typ_program.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddSubmitInTypProgram extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('courses', function (Blueprint $table) {
+			$table->boolean('is_submitted');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('courses', function (Blueprint $table) {
+			$table->dropColumn('is_submitted');
+		});
+	}
+}

app/models/Activity.php

@@ -414,4 +414,4 @@ class Activity extends Eloquent
     //return json_decode($this->outcomes_attempted, true);
     return $outcomes_attempted;
   }
-}
+}

app/models/Course.php

@@ -181,9 +181,11 @@ class Course extends Eloquent
   public static function getStudentReportForOutcome($course_code = null)
   {
     if ($course_code) {
+      Log::info('entré');
       $criteria_id = DB::table('annual_plan_objective')
         ->where('typ_semester_course_id', $course_code->typ_semester_course_id)
         ->lists('criteria_id');
+      Log::info($criteria_id);
       $program = Program::where('id', $course_code->program_id)->first();
       // // Log::info($program->code);
       if ($program->code == "") {
@@ -232,10 +234,12 @@ class Course extends Eloquent
 
 
       //Log::info($criteria_id);
+      Log::info('los courseCode');
+      Log::info(array($course_code));
+      Log::info('los programas');
+      Log::info($program_ids);
 
-      //Log::info($program_ids);
-
-      //Log::info($table_per_student->toSql());
+      Log::info($table_per_student->toSql());
       $students = $table_per_student->get();
 
 

app/models/Outcome.php

@@ -221,7 +221,7 @@ class Outcome extends Eloquent
 			->select('criteria.id', 'expected_percentage', 'activity_criterion.activity_id')
 			->distinct()
 			->get();
-			
+
 		$conteo = 0;
 		foreach ($criteria as $criterion) {
 			$students_attempted = Criterion::students_attempted($criterion->id, $criterion->activity_id);
@@ -268,7 +268,7 @@ class Outcome extends Eloquent
 			->select('criteria.id', 'expected_percentage', 'activity_criterion.activity_id')
 			->distinct()
 			->get();
-			
+
 		$conteo = 0;
 		foreach ($criteria as $criterion) {
 			$students_attempted = Criterion::students_attempted($criterion->id, $criterion->activity_id);
@@ -315,7 +315,7 @@ class Outcome extends Eloquent
 			->select('criteria.id', 'expected_percentage', 'activity_criterion.activity_id')
 			->distinct()
 			->get();
-			
+
 		$conteo = 0;
 		foreach ($criteria as $criterion) {
 			$students_attempted = Criterion::students_attempted($criterion->id, $criterion->activity_id);

app/routes.php

@@ -166,7 +166,10 @@ Route::group(array('before' => 'auth|has_access'), function () {
     /**
      * Shared Routes
      */
-
+    Route::post('fetchObjectiveInfo', array(
+        'as' => 'fetchObjectiveInfo',
+        'uses' => 'AnnualPlansController@fetchObjectiveInfo'
+    ));
     Route::get('selectAnnualProgram', array(
         'as' => 'selectAnnualProgram',
         'uses' => 'AnnualPlansController@selectProgramPlan'
@@ -260,6 +263,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
         'as' => 'fetchRubricCriterion',
         'uses' => 'RubricsController@fetchRubricCriterion'
     ));
+    Route::post('fetchObjectives', 'Objective2Controller@fetchAllObjectives');
 
     // Load a rubric template
     Route::post('loadTemplate', array('uses' => 'TemplatesController@fetch'));
@@ -321,7 +325,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
         Route::post('createCriterion', array('before' => 'csrf', 'uses' => 'CriteriaController@create'));
 
         Route::get('learning-outcomes', 'OutcomesController@index');
-        Route::post('fetchObjectives', 'Objective2Controller@fetchAllObjectives');
+        //Route::post('fetchObjectives', 'Objective2Controller@fetchAllObjectives');
         // TODO: Change later
         Route::get('new-learning-outcomes', 'OutcomesController@newIndex');
 
@@ -528,6 +532,9 @@ Route::group(array('before' => 'auth|has_access'), function () {
      * Professor Routes
      */
     Route::group(array('prefix' => 'professor', 'before' => 'prof'), function () {
+
+
+        Route::get('templateForProfessor', 'TemplatesController@ProfIndex');
         Route::post('program', array('before' => 'csrf', 'uses' => 'ProfessorsController@program'));
         Route::get('activities/{activity_id}/rubrics', 'RubricsController@newRubric');
         Route::get('activities/{activity_id}/other_method', 'RubricsController@newOtherMethod');

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

@@ -104,7 +104,7 @@
         @endforeach
       </div>
       <br>
-      <div>
+    </div>
         <button type="button" class="btn btn-secondary" id = "three_year_button" data-toggle="modal" data-target="#three_year">Create Three Year Cycle</button>
 
 <!-- Modal -->
@@ -139,7 +139,7 @@
   </div>
 </div>
       </div>
-    </div>
+   
 
     <div class="col-md-9">
       <div class="btn-group pull-right">

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

@@ -58,14 +58,14 @@
                                     <?php
                                     
                                     /*$sections_evaluating = Course::has('activities')
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        ->whereNotNull('outcomes_attempted')
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        ->with(array('activities'=>function($query) use(&$outcome){
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            $query->whereNotNull('outcomes_attempted');
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        ->where('code', $course->code)->where('number',$course->number)
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        ->whereIn('semester_id', Session::get('semesters_ids'))
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        ->get();*/
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ->whereNotNull('outcomes_attempted')
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ->with(array('activities'=>function($query) use(&$outcome){
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    $query->whereNotNull('outcomes_attempted');
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ->where('code', $course->code)->where('number',$course->number)
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ->whereIn('semester_id', Session::get('semesters_ids'))
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ->get();*/
                                     
                                     $sections_evaluating = Course::has('activities')
                                     
@@ -165,36 +165,7 @@
                                             </p>
 
                                             <br>
-                                            <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
-                                            <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
-                                            @if ($formative_actions)
-                                                <p style="display: inline;">
-                                                    <strong>{{ $formative_actions[0]->at_text }}:
-                                                    </strong>
-
-                                                    <i>{{ $formative_actions[0]->description }}
-                                                    </i>
-                                                </p>
-                                                <br>
-                                                <h5>Formative Action's Associated
-                                                    Criteria: </h5>
-                                                <ul>
-                                                    @foreach ($formative_actions as $criteria)
-                                                        <li> <i>{{ $criteria->name }} <i></li>
-
-                                                    @endforeach
-                                                </ul>
 
-                                            @else
-                                                <p style="display: inline;"> <strong>Has no Formative Action yet </strong>
-
-                                            @endif
-                                            @if ($activity->assessment_comments != null)
-
-                                                <h5 style="display: inline; margin:30px;">Assessment Comments</h5>
-                                                <p style="display: inline;">{{ $activity->assessment_comments }}</p>
-                                            @endif
-                                            <br>
                                             <table class='table table-striped table-condensed datatable'>
                                                 <thead>
                                                     <tr>
@@ -211,7 +182,7 @@
                                                             %
                                                         </th>
                                                         <th>
-                                                            Outcomes
+                                                            Learning Outcomes
                                                         </th>
                                                     </tr>
                                                 </thead>
@@ -253,7 +224,7 @@
 
                                                                 @foreach (Criterion::outcomes($ac_criterion->criterion_id) as $index6 => $outcome)
 
-                                                                    {{ $index6 + 1 }}. <?php echo $outcome->name . "\n\n\n <br>"; ?>
+                                                                    <?php echo $outcome->name . "\n\n\n <br>"; ?>
 
 
 
@@ -266,17 +237,56 @@
                                                 </tbody>
 
                                             </table>
+                                            <br>
+                                            <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
+                                            <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
+                                            @if ($formative_actions)
+                                                <p style="display: inline;">
+                                                    <u>{{ $formative_actions[0]->at_text }}:
+                                                    </u>
+
+                                                    <i>{{ $formative_actions[0]->description }}
+                                                    </i>
+                                                </p>
+                                                <br>
+                                                <h5 style="display: inline; margin:30px;">Formative Action's Associated
+                                                    Criteria: </h5>
+                                                <ul style="margin:30px;">
+                                                    @foreach ($formative_actions as $criteria)
+                                                        <li> <i>{{ $criteria->name }} <i></li>
+
+                                                    @endforeach
+                                                </ul>
+
+
+
+                                            @endif
+                                            <br>
+                                            <h5 style="display: inline; margin:30px;">Assessment Comments: </h5>
+                                            @if ($activity->assessment_comments != null)
+
+
+                                                <p style="display: inline;">{{ $activity->assessment_comments }}</p>
+                                            @endif
+                                            <br>
                                             <hr>
                                             <br>
 
                                             <h4>Performance of Students by Learning Outcome</h4>
-                                            <h5 style="display: inline; margin:30px;">Target by outcome: </h5>
+                                            <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
+                                            <p style="display: inline;">{{ $activity->name }}
+                                                <strong>({{ $activity->date }})</strong>
+                                            </p>
+                                            <br>
+
+                                            <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
                                             <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
                                             </p>
                                             <br>
-                                            <h5 style="display: inline; margin:30px;">Expected percent of students achieving
+                                            <h5 style="display: inline; margin:30px;">Expected percent of students
+                                                achieving
                                                 the
-                                                target by outcome: </h5>
+                                                target by learning outcome: </h5>
                                             <p style="display: inline;"> <i>
                                                     <?php
                                                     $expected = DB::table('target_outcomes_program')
@@ -286,6 +296,9 @@
                                                     if (!$expected) {
                                                         $expected = 'It has not been defined in the annual plan';
                                                     }
+                                                    else{
+                                            $expected = $expected->expected_target;
+                                        }
                                                     ?>
                                                     {{ $expected }}
                                                 </i>
@@ -295,7 +308,7 @@
                                                 <thead>
                                                     <tr>
                                                         <th>
-                                                            Outcome
+                                                            Learning Outcome
                                                         </th>
                                                         <th>
                                                             Number of Students Assessed
@@ -322,11 +335,13 @@
                                                                 {{ $outcome->achieved }}
                                                             </td>
                                                             @if ($outcome->percentage >= $expected)
-                                                                <td class="col-md-1 success">{{ $outcome->percentage }}%
+                                                                <td class="col-md-1 success">
+                                                                    {{ $outcome->percentage }}%
                                                                 </td>
 
                                                             @else
-                                                                <td class="col-md-1 danger">{{ $outcome->percentage }}%
+                                                                <td class="col-md-1 danger">
+                                                                    {{ $outcome->percentage }}%
                                                                 </td>
 
                                                             @endif

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

@@ -101,7 +101,7 @@
                         <div class="form-group">
                             <label>Associated Outcome</label>
                             {{-- Form::select('assoc_outcome_fetch', $outcomes, null, ['class'=>'form-control selectpicker', 'id'=>'assoc_outcomes_fetch', 'onchange'=>'fetchAllObjectives("select-program", "assoc_outcomes_fetch")']) --}}
-                            <select id="'assoc_outcomes_fetch" name="assoc_outcome_fetch" class="form-control selectpicker"
+                            <select id="assoc_outcomes_fetch" name="assoc_outcome_fetch" class="form-control selectpicker"
                                 onchange="fetchAllObjectives('select-program', 'assoc_outcomes_fetch')">
                                 @foreach ($outcomes as $outcome)
                                     <option value="{{ $outcome->id }}">

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

@@ -69,7 +69,7 @@
 
             </li>
             <li><a href="{{ URL::action('OutcomesController@annualReport', Auth::user()->programs[0]->id) }}">Annual
-                    Results</a></li>
+                    Report</a></li>
 
             <li>{{ HTML::linkAction('TransformativeActionsController@viewFormativeActions', 'Formative Actions') }}
 

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

@@ -44,14 +44,14 @@
                         <?php
                         
                         /*$sections_evaluating = Course::has('activities')
-                                                                                                                                        ->whereNotNull('outcomes_attempted')
-                                                                                                                                        ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
-                                                                                                                                        ->with(array('activities'=>function($query) use(&$outcome){
-                                                                                                                                            $query->whereNotNull('outcomes_attempted');
-                                                                                                                                            $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
-                                                                                                                                        ->where('code', $course->code)->where('number',$course->number)
-                                                                                                                                        ->whereIn('semester_id', Session::get('semesters_ids'))
-                                                                                                                                        ->get();*/
+                                                                                                                                                                                                                                                                                        ->whereNotNull('outcomes_attempted')
+                                                                                                                                                                                                                                                                                        ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
+                                                                                                                                                                                                                                                                                        ->with(array('activities'=>function($query) use(&$outcome){
+                                                                                                                                                                                                                                                                                            $query->whereNotNull('outcomes_attempted');
+                                                                                                                                                                                                                                                                                            $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
+                                                                                                                                                                                                                                                                                        ->where('code', $course->code)->where('number',$course->number)
+                                                                                                                                                                                                                                                                                        ->whereIn('semester_id', Session::get('semesters_ids'))
+                                                                                                                                                                                                                                                                                        ->get();*/
                         
                         $sections_evaluating = Course::has('activities')
                         
@@ -144,36 +144,7 @@
                                     </p>
 
                                     <br>
-                                    <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
-                                    <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
-                                    @if ($formative_actions)
-                                        <p style="display: inline;"> <strong>{{ $formative_actions[0]->at_text }}:
-                                            </strong>
-
-                                            <i>{{ $formative_actions[0]->description }}
-                                            </i>
-                                        </p>
-                                        <br>
-                                        <h5>Formative Action's Associated
-                                            Criteria: </h5>
-                                        <ul>
-                                            @foreach ($formative_actions as $criteria)
-                                                <li> <i>{{ $criteria->name }} <i></li>
-
-                                            @endforeach
-                                        </ul>
 
-                                    @else
-                                        <p style="display: inline;"> <strong>Has no Formative Action yet </strong>
-
-                                    @endif
-
-                                    @if ($activity->assessment_comments != null)
-
-                                        <h5 style="display: inline; margin:30px;">Assessment Comments</h5>
-                                        <p style="display: inline;">{{ $activity->assessment_comments }}</p>
-                                    @endif
-                                    <br>
                                     <table class='table table-striped table-condensed datatable'>
                                         <thead>
                                             <tr>
@@ -190,7 +161,7 @@
                                                     %
                                                 </th>
                                                 <th>
-                                                    Outcomes
+                                                    Learning Outcomes
                                                 </th>
                                             </tr>
                                         </thead>
@@ -232,7 +203,7 @@
 
                                                         @foreach (Criterion::outcomes($ac_criterion->criterion_id) as $index6 => $outcome)
 
-                                                            {{ $index6 + 1 }}. <?php echo $outcome->name . "\n\n\n <br>"; ?>
+                                                            <?php echo $outcome->name . "\n\n\n <br>"; ?>
 
 
 
@@ -245,16 +216,52 @@
                                         </tbody>
 
                                     </table>
+                                    <br>
+                                    <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
+                                    <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
+                                    @if ($formative_actions)
+                                        <p style="display: inline;">
+                                            <u>{{ $formative_actions[0]->at_text }}:
+                                            </u>
+
+                                            <i>{{ $formative_actions[0]->description }}
+                                            </i>
+                                        </p>
+                                        <br>
+                                        <h5 style="display: inline; margin:30px;">Formative Action's Associated
+                                            Criteria: </h5>
+                                        <ul style="margin:30px;">
+                                            @foreach ($formative_actions as $criteria)
+                                                <li> <i>{{ $criteria->name }} <i></li>
+
+                                            @endforeach
+                                        </ul>
+
+
+                                    @endif
+                                    <br>
+                                    <h5 style="display: inline; margin:30px;">Assessment Comments: </h5>
+                                    @if ($activity->assessment_comments != null)
+
+
+                                        <p style="display: inline;">{{ $activity->assessment_comments }}</p>
+                                    @endif
+                                    <br>
                                     <hr>
                                     <br>
 
                                     <h4>Performance of Students by Learning Outcome</h4>
-                                    <h5 style="display: inline; margin:30px;">Target by outcome: </h5>
+                                    <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
+                                    <p style="display: inline;">{{ $activity->name }}
+                                        <strong>({{ $activity->date }})</strong>
+                                    </p>
+                                    <br>
+                                    <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
                                     <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
                                     </p>
                                     <br>
                                     <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
-                                        target by outcome: </h5>
+                                        target by learning outcome: </h5>
                                     <p style="display: inline;"> <i>
                                             <?php
                                             $expected = DB::table('target_outcomes_program')
@@ -264,7 +271,9 @@
                                             if (!$expected) {
                                                 $expected = 'It has not been defined in the annual plan';
                                             }
-                                            
+                                            else{
+                                            $expected = $expected->expected_target;
+                                        }
                                             ?>
                                             {{ $expected }}
                                         </i>
@@ -274,7 +283,7 @@
                                         <thead>
                                             <tr>
                                                 <th>
-                                                    Outcome
+                                                    Learning Outcome
                                                 </th>
                                                 <th>
                                                     Number of Students Assessed

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

@@ -115,7 +115,7 @@
                         <div class="form-group">
                             <label>Associated Outcome</label>
                             {{-- Form::select('assoc_outcome_fetch', $outcomes, null, ['class'=>'form-control selectpicker', 'id'=>'assoc_outcomes_fetch', 'onchange'=>'fetchAllObjectives("select-program", "assoc_outcomes_fetch")']) --}}
-                            <select id="'assoc_outcomes_fetch" name="assoc_outcome_fetch" class="form-control selectpicker"
+                            <select id="assoc_outcomes_fetch" name="assoc_outcome_fetch" class="form-control selectpicker"
                                 onchange="fetchAllObjectives('select-program', 'assoc_outcomes_fetch')">
                                 @foreach ($outcomes as $outcome)
                                     <option value="{{ $outcome->id }}">

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

@@ -52,7 +52,7 @@
                         </li>
 
                     @endif
-                    <li>{{ HTML::linkAction('AnnualPlansController@selectProgramPlan', 'Annual Results') }}</li>
+                    <li>{{ HTML::linkAction('AnnualPlansController@selectProgramPlan', 'Annual Reports') }}</li>
                     <li>{{ HTML::linkAction('TransformativeActionsController@viewFormativeActions', 'Formative Actions') }}
 
                 </ul>

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

@@ -56,14 +56,14 @@
                                 <?php
                                 
                                 /*$sections_evaluating = Course::has('activities')
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->whereNotNull('outcomes_attempted')
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->with(array('activities'=>function($query) use(&$outcome){
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        $query->whereNotNull('outcomes_attempted');
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->where('code', $course->code)->where('number',$course->number)
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->whereIn('semester_id', Session::get('semesters_ids'))
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->get();*/
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->whereNotNull('outcomes_attempted')
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->with(array('activities'=>function($query) use(&$outcome){
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        $query->whereNotNull('outcomes_attempted');
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->where('code', $course->code)->where('number',$course->number)
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->whereIn('semester_id', Session::get('semesters_ids'))
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->get();*/
                                 
                                 $sections_evaluating = Course::has('activities')
                                 
@@ -159,35 +159,7 @@
                                                 %</i>
                                         </p>
 
-                                        <br>
-                                        <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
-                                        <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
-                                        @if ($formative_actions)
-                                            <p style="display: inline;"> <strong>{{ $formative_actions[0]->at_text }}:
-                                                </strong>
-
-                                                <i>{{ $formative_actions[0]->description }}
-                                                </i>
-                                            </p>
-                                            <br>
-                                            <h5>Formative Action's Associated
-                                                Criteria: </h5>
-                                            <ul>
-                                                @foreach ($formative_actions as $criteria)
-                                                    <li> <i>{{ $criteria->name }} <i></li>
-
-                                                @endforeach
-                                            </ul>
-
-                                        @else
-                                            <p style="display: inline;"> <strong>Has no Formative Action yet </strong>
 
-                                        @endif
-                                        @if ($activity->assessment_comments != null)
-
-                                            <h5 style="display: inline; margin:30px;">Assessment Comments</h5>
-                                            <p style="display: inline;">{{ $activity->assessment_comments }}</p>
-                                        @endif
                                         <br>
                                         <table class='table table-striped table-condensed datatable'>
                                             <thead>
@@ -205,7 +177,7 @@
                                                         %
                                                     </th>
                                                     <th>
-                                                        Outcomes
+                                                        Learning Outcomes
                                                     </th>
                                                 </tr>
                                             </thead>
@@ -247,7 +219,7 @@
 
                                                             @foreach (Criterion::outcomes($ac_criterion->criterion_id) as $index6 => $outcome)
 
-                                                                {{ $index6 + 1 }}. <?php echo $outcome->name . "\n\n\n <br>"; ?>
+                                                                <?php echo $outcome->name . "\n\n\n <br>"; ?>
 
 
 
@@ -260,16 +232,54 @@
                                             </tbody>
 
                                         </table>
+
+                                        <br>
+                                        <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
+                                        <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
+                                        @if ($formative_actions)
+                                            <p style="display: inline;"> <u>{{ $formative_actions[0]->at_text }}:
+                                                </u>
+
+                                                <i>{{ $formative_actions[0]->description }}
+                                                </i>
+                                            </p>
+                                            <br>
+                                            <h5 style="display: inline; margin:30px;">Formative Action's Associated
+                                                Criteria: </h5>
+                                            <ul style="margin:30px;">
+                                                @foreach ($formative_actions as $criteria)
+                                                    <li> <i>{{ $criteria->name }} <i></li>
+
+                                                @endforeach
+                                            </ul>
+
+
+
+                                        @endif
+                                        <br>
+                                        <h5 style="display: inline; margin:30px;">Assessment Comments: </h5>
+                                        @if ($activity->assessment_comments != null)
+
+
+                                            <p style="display: inline;">{{ $activity->assessment_comments }}</p>
+                                        @endif
                                         <hr>
                                         <br>
 
+
+
                                         <h4>Performance of Students by Learning Outcome</h4>
-                                        <h5 style="display: inline; margin:30px;">Target by outcome: </h5>
+                                        <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
+                                        <p style="display: inline;">{{ $activity->name }}
+                                            <strong>({{ $activity->date }})</strong>
+                                        </p>
+                                        <br>
+                                        <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
                                         <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
                                         </p>
                                         <br>
                                         <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
-                                            target by outcome: </h5>
+                                            target by learning outcome: </h5>
                                         <p style="display: inline;"> <i>
                                                 <?php
                                                 $expected = DB::table('target_outcomes_program')
@@ -279,6 +289,9 @@
                                                 if (!$expected) {
                                                     $expected = 'It has not been defined in the annual plan';
                                                 }
+                                                else{
+                                            $expected = $expected->expected_target;
+                                        }
                                                 ?>
                                                 {{ $expected }}
                                             </i>
@@ -288,7 +301,7 @@
                                             <thead>
                                                 <tr>
                                                     <th>
-                                                        Outcome
+                                                        Learning Outcome
                                                     </th>
                                                     <th>
                                                         Number of Students Assessed

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

@@ -103,7 +103,7 @@
                         <div class="form-group">
                             <label>Associated Outcome</label>
                             {{-- Form::select('assoc_outcome_fetch', $outcomes, null, ['class'=>'form-control selectpicker', 'id'=>'assoc_outcomes_fetch', 'onchange'=>'fetchAllObjectives("select-program", "assoc_outcomes_fetch")']) --}}
-                            <select id="'assoc_outcomes_fetch" name="assoc_outcome_fetch" class="form-control selectpicker"
+                            <select id="assoc_outcomes_fetch" name="assoc_outcome_fetch" class="form-control selectpicker"
                                 onchange="fetchAllObjectives('select-program', 'assoc_outcomes_fetch')">
                                 @foreach ($outcomes as $outcome)
                                     <option value="{{ $outcome->id }}">
@@ -233,8 +233,8 @@
 
 
         function fetchAllObjectives(program, outcome) {
-            var program_id_fetch = $('#' + program).find(':selected').val();
-            var outcome_fetch = $('#' + outcome).find(':selected').val();
+            var program_id_fetch = $('#' + program).val();
+            var outcome_fetch = $('#' + outcome).val();
             $.post(
                 "{{ URL::action('Objective2Controller@fetchAllObjectives') }}", {
                     program_fetch: program_id_fetch,

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

@@ -113,13 +113,15 @@
             var name = $(li).data('outcome-name');
             var semester_id = $(li).data('semester-id');
             var annual_plan_id = $(li).data('annual-plan');
+            var typ_semester_outcome_id = $(li).data('typ-semester-outcome-id');
             $('#theChange').data('annual-plan', annual_plan);
             $.post(
                 "{{ URL::action('AnnualPlansController@fetchReportWithOutcome') }}", {
                     semester_id: semester_id,
                     outcome_id: outcome_id,
                     program_id: {{ $program->id }},
-                    annual_plan_id: annual_plan_id
+                    annual_plan_id: annual_plan_id,
+                    typ_semester_outcome_id: typ_semester_outcome_id
                 },
                 function(outcome) {
                     if (outcome.objectives) {
@@ -129,11 +131,17 @@
                         $('#allLists').empty();
                         $('#levelTabs').empty();
                         $('.no-outcome').hide();
+                        if(outcome.outcome_program_goal){
+                            outcome.outcome_program_goal = outcome.outcome_program_goal.expected_target;
+                        }
+                        else{
+                            outcome.outcome_program_goal ='It has not been defined';
+                        }
                         var outcomeHTML = "<h4>Performance of Students by Learning Outcome</h4>" +
-                            '<h5 style = "display: inline; margin:30px;">Target by outcome: </h5>' +
+                            '<h5 style = "display: inline; margin:30px;">Target learning by learning outcome: </h5>' +
                             '<p  style = "display: inline;"> <i>>= ' + outcome.expected_outcome +
                             ' of the attempts</i>' + '</p>' +
-                            '<br><h5 style = "display: inline; margin:30px;">Expected percent of students achieving the target by outcome: </h5>' +
+                            '<br><h5 style = "display: inline; margin:30px;">Expected percent of students achieving the target by learning outcome: </h5>' +
                             '<p  style = "display: inline;"> <i>' + outcome.outcome_program_goal + '</i></p>';
                         $('#outcomeInfo').html('<p class="outcome-definition">' + outcome.definition + '</p>' +
                             outcomeHTML);
@@ -302,7 +310,7 @@
 
                         if (students_attempted) {
                             studentPercentage = ((students_achieved / students_attempted) * 100).toFixed(2);
-                            if (studentPercentage >= outcome.outcome_program_goal) {
+                            if (parseFloat(studentPercentage) >= parseFloat(outcome.outcome_program_goal)) {
                                 FinalReport = "<br><p><strong>The students achieved the Learning Outcome with " +
                                     studentPercentage + "% of students achieving.</strong></p>";
                             } else {
@@ -518,6 +526,7 @@
                         'class': 'list-group',
                         'id': 'list'
                     });
+                    if(json.outcomes.first){
                     header5 = $('<h5/>', {
                         'style': "padding-left: 10px"
                     }).html("First Semester");
@@ -526,13 +535,15 @@
                     for (outcome in json.outcomes.first) {
                         list +=
                             "<li style='padding-left: 25px' onclick = 'fetchEverything(this)' data-annual-plan = '" +
-                            json.annual_plans.id + "' data-semester-id = '" + json.allSemesterOrder.first.id +
+                            json.annual_plans.id + "' data-typ-semester-outcome-id ='"+json.outcomes.first[outcome].typ_semester_outcome_id+"' data-semester-id = '" + json.allSemesterOrder.first.id +
                             "' data-outcome-id='" + json.outcomes.first[outcome].id + "' data-outcome-name ='" + json
                             .outcomes.first[outcome].name + "' class='list-group-item' >" + json.outcomes.first[outcome]
                             .name + " </li>";
 
                     }
                     div.append(list);
+                    }
+                    if(json.outcomes.second){
                     header4 = $('<h5/>', {
                         'style': "padding-left: 10px"
                     }).html("Second Semester");
@@ -541,13 +552,13 @@
                     for (outcome in json.outcomes.second) {
                         list +=
                             "<li style='padding-left: 25px' onclick = 'fetchEverything(this)' data-annual-plan = '" +
-                            json.annual_plans.id + "' data-semester-id = '" + json.allSemesterOrder.second.id +
+                            json.annual_plans.id + "' data-typ-semester-outcome-id ='"+json.outcomes.first[outcome].typ_semester_outcome_id+"'data-semester-id = '" + json.allSemesterOrder.second.id +
                             "' data-outcome-id='" + json.outcomes.second[outcome].id + "' data-outcome-name ='" + json
                             .outcomes.second[outcome].name + "' class='list-group-item' >" + json.outcomes.second[
                                 outcome].name + " </li>";
 
                     }
-                    div.append(list);
+                    div.append(list);}
                     html = div[0].innerHTML;
 
                     $("#allOutcomes").html(div[0].innerHTML);

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

@@ -1,14 +1,16 @@
 @extends('layouts.master')
 
 @section('navigation')
-@if($role==1)
-@include('local.managers.admins._navigation')
-@elseif($role==2)
-@include('local.managers.sCoords._navigation')
-@elseif($role==3)
-@include('local.managers.pCoords._navigation')
-@endif
-   
+    @if ($role == 1)
+        @include('local.managers.admins._navigation')
+    @elseif($role == 2)
+        @include('local.managers.sCoords._navigation')
+    @elseif($role == 3)
+        @include('local.managers.pCoords._navigation')
+    @elseif($role == 4)
+        @include('local.professors._navigation')
+    @endif
+
 @stop
 
 @section('main')
@@ -24,17 +26,20 @@
             </thead>
             <tfoot>
                 <tr class="column-search">
-                    <td><input class="column-search-bar form-control" type="text" placeholder="Buscar" aria-label="search rubric name"/></td>
-                    <td><select class="column-search-select form-control" aria-label="select associated school"><option value=""></option></select></td>
+                    <td><input class="column-search-bar form-control" type="text" placeholder="Buscar"
+                            aria-label="search rubric name" /></td>
+                    <td><select class="column-search-select form-control" aria-label="select associated school">
+                            <option value=""></option>
+                        </select></td>
                 </tr>
             </tfoot>
             <tbody>
-                @foreach($templates as $template)
+                @foreach ($templates as $template)
                     <tr>
-                        <td>{{ HTML::linkAction('TemplatesController@show', $template->name, array($template->id)) }}</td>
+                        <td>{{ HTML::linkAction('TemplatesController@show', $template->name, [$template->id]) }}</td>
                         <td>
-                            @if($template->school)
-                                {{$template->school->name}}
+                            @if ($template->school)
+                                {{ $template->school->name }}
                             @else
                                 All (global)
                             @endif
@@ -48,7 +53,7 @@
 
 @section('included-js')
 
-<!-- Datatables -->
-@include('global._datatables_js')
+    <!-- Datatables -->
+    @include('global._datatables_js')
 
-@stop
+@stop

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

@@ -1,49 +1,57 @@
 <div class="navbar navbar-inverse navbar-static-top">
-  <div class="container-fluid">
-    <!--<div class="navbar-header">
-      {{ HTML::linkAction('ProfessorsController@overview', 'Online Learning Assessment System · Professor', array() ,array('class'=>'navbar-brand')) }}
+    <div class="container-fluid">
+        <!--<div class="navbar-header">
+      {{ HTML::linkAction('ProfessorsController@overview', 'Online Learning Assessment System · Professor', [], ['class' => 'navbar-brand']) }}
       <span></span>
     </div>-->
-    <ul class="nav navbar-nav navbar-right">
-      <li>{{ HTML::linkAction('ProfessorsController@overview', 'My Courses') }}</li>
-      {{-- la linea siguiente comentada es lo que habia originalmente. tanto la linea como este comentario se pueden borrar --}}
-      {{-- <li>{{ HTML::linkAction('CriteriaController@index', 'Learning Outcomes and Criteria') }}</li> --}}
-      {{--<li>{{ HTML::linkAction('TransformativeActionsController@editTA', 'Transformative Actions') }}</li>--}}
-      <li class="dropdown">
-        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Learning and Criterias<span class="caret"></span></a>
-        <ul class="dropdown-menu" role="menu">
-          <li>{{ HTML::linkAction('CriteriaController@index', 'Outcomes and Criteria') }}</li>
-          <li>{{ HTML::linkAction('CriteriaController@objectivesIndex', 'Objectives and Criteria') }}</li>
+        <ul class="nav navbar-nav navbar-right">
+            <li>{{ HTML::linkAction('ProfessorsController@overview', 'My Courses') }}</li>
+            {{-- la linea siguiente comentada es lo que habia originalmente. tanto la linea como este comentario se pueden borrar --}}
+            {{-- <li>{{ HTML::linkAction('CriteriaController@index', 'Learning Outcomes and Criteria') }}</li> --}}
+            {{-- <li>{{ HTML::linkAction('TransformativeActionsController@editTA', 'Transformative Actions') }}</li> --}}
+            <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Learning
+                    and Criterias<span class="caret"></span></a>
+                <ul class="dropdown-menu" role="menu">
+                    <li>{{ HTML::linkAction('CriteriaController@index', 'Outcomes and Criteria') }}</li>
+                    <li>{{ HTML::linkAction('CriteriaController@objectivesIndex', 'Objectives and Criteria') }}</li>
+                </ul>
+            </li>
+            @if (count(Auth::user()->courses))
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"
+                        aria-expanded="false">Sections<span class="caret"></span></a>
+                    <ul class="dropdown-menu" role="menu">
+                        @foreach ($courses as $course)
+                            <li> {{ HTML::linkAction('CoursesController@show', $course->code . $course->number . '-' . $course->section . ' (' . $course->semester->code . ')', ['id' => $course->id]) }}
+                            </li>
+                        @endforeach
+                    </ul>
+                </li>
+            @endif
+            <li> {{ HTML::linkAction('ProfessorsController@program', 'Program') }}</li>
+            <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReport', 'Results') }}</li>
+            <li>{{ HTML::linkAction('TemplatesController@ProfIndex', 'Rubric List') }}</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">
+                    <li>{{ HTML::linkAction('FeedbackController@create', 'Feedback') }}</li>
+                    <!-- <li><a href="{{ asset('files/OLAS-intro.pdf') }}">Introduction to OLAS</a></li> -->
+                    <li><a href="{{ asset('files/intro-avaluo.pdf') }}">Introduction to Assessment</a></li>
+                    <li><a
+                            href="http://oeae.uprrp.edu/wp-content/uploads/2019/01/Brochure-de-OLAS-rev.-agosto-2018.pdf">Brochure</a>
+                    </li>
+                </ul>
+            </li>
+            <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"
+                    aria-expanded="false">Account<span class="caret"></span></a>
+                <ul class="dropdown-menu" role="menu">
+                    <li>{{ HTML::linkAction('UsersController@edit', 'Profile') }}</li>
+                    <li>{{ HTML::linkAction('AuthController@logout', 'Log out (' . Auth::user()->email . ')') }}</li>
+                </ul>
+            </li>
         </ul>
-      </li>
-      @if(count(Auth::user()->courses))
-      <li class="dropdown">
-        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Sections<span class="caret"></span></a>
-        <ul class="dropdown-menu" role="menu">
-          @foreach ($courses as $course)
-          <li> {{ HTML::linkAction('CoursesController@show', $course->code.$course->number.'-'.$course->section.' ('.$course->semester->code.')', array('id'=>$course->id)) }}</li>
-          @endforeach
-        </ul>
-      </li>
-      @endif
-      <li> {{ HTML::linkAction('ProfessorsController@program', 'Program') }}</li>
-      <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReport', 'Results') }}</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">
-          <li>{{ HTML::linkAction('FeedbackController@create', 'Feedback') }}</li>
-          <!-- <li><a href="{{ asset('files/OLAS-intro.pdf') }}">Introduction to OLAS</a></li> -->
-          <li><a href="{{ asset('files/intro-avaluo.pdf') }}">Introduction to Assessment</a></li>
-          <li><a href="http://oeae.uprrp.edu/wp-content/uploads/2019/01/Brochure-de-OLAS-rev.-agosto-2018.pdf">Brochure</a></li>
-        </ul>
-      </li>
-      <li class="dropdown">
-        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Account<span class="caret"></span></a>
-        <ul class="dropdown-menu" role="menu">
-          <li>{{ HTML::linkAction('UsersController@edit', 'Profile') }}</li>
-          <li>{{ HTML::linkAction('AuthController@logout', 'Log out ('.Auth::user()->email.')') }}</li>
-        </ul>
-      </li>
-    </ul>
-  </div>
-</div>
+    </div>
+</div>

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

@@ -63,7 +63,7 @@
                     <li>If a student dropped the class, select "N/A" (Not Applicable) for all columns in that student's row.</li>
                     <li>Cells with "N/A" <strong>will not</strong> be used to determine whether a criterion is achieved. Only scores from 0 to {{$rubric->max_score}} will be considered for this purpose.</li>
                     <li>For this activity, <strong>at least one score must be from 1-{{$rubric->max_score}}.</strong> Otherwise, the 'Publish Assessment' and 'Save as Draft' buttons will be <strong>disabled</strong>. If you want to delete previously saved scores, go back to the activity and click the "Delete Assessment" button.</li>
-
+                    <li>If some criterion has more weight on the student's final percentage, you can add it in the 'Weight' box above the criterion but be sure that the sum of criteria weights is equal to 100 (or aproximates it).
                 </ul>
             </div>
 
@@ -84,7 +84,7 @@
                     <li>Si un estudiante se dio de baja, seleccione "N/A" (No Aplica) en todas las columnas de la fila de ese estudiante.</li>
                     <li>Las celdas con "N/A" <strong>no</strong> serán utilizadas para determinar si un criterio se alcanzó o no. Solamente las puntuaciones del 0 al {{$rubric->max_score}} serán consideradas.</li>
                     <li>Para esta actividad, <strong>al menos una puntuación deber ser del 1 al {{$rubric->max_score}}.</strong> De otra manera, el botón para guardar <strong>se desactivará</strong>. Si quiere borrar los resultados del avalúo, vuelva a la actividad y oprima el botón que dice "Delete Assessment".</li>
-
+                    <li>Si algún criterio tiene más peso en el porcentaje final del estudiante, puedes añadirlo en la caja de "Weight" arriba del criterio deseado, pero debe asegurarse que la suma de los criterios sea igual a cien, o se aproxime. 
 
                 </ul>
             </div>

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

@@ -185,7 +185,7 @@
                                 %
                             </th>
                             <th>
-                                Outcomes
+                                Learning Outcomes
                             </th>
                         </tr>
                     </thead>
@@ -240,16 +240,46 @@
                     </tbody>
 
                 </table>
+
+                <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
+                <?php $formative_actions = $activity_1->formativeActionsWithCriteria(); ?>
+                @if ($formative_actions)
+                    <p style="display: inline;"> <u>{{ $formative_actions[0]->at_text }}:
+                        </u>
+
+                        <i>{{ $formative_actions[0]->description }}
+                        </i>
+                    </p>
+                    <br>
+                    <h5 style="display: inline; margin:30px;">Formative Action's Associated
+                        Criteria: </h5>
+                    <ul style=" margin:30px;">
+                        @foreach ($formative_actions as $criteria)
+                            <li> <i>{{ $criteria->name }} <i></li>
+
+                        @endforeach
+                    </ul>
+                @endif
+                <br>
+
+                <h5 style="display: inline; margin:30px;">Assessment Comments: </h5>
+                @if ($activity_1->assessment_comments != null)
+
+
+                    <p style="display: inline;">{{ $activity_1->assessment_comments }}</p>
+                @endif
                 <hr>
                 <br>
 
                 <h4>Performance of Students by Learning Outcome</h4>
-                <h5 style="display: inline; margin:30px;">Target by outcome: </h5>
+
+                <h5 style="text-align: center;">{{ $activity_1->name }} </h5>
+                <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
                 <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
                 </p>
                 <br>
                 <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
-                    target by outcome: </h5>
+                    target by learning outcome: </h5>
                 <p style="display: inline;"> <i>
                         <?php
                         $expected = DB::table('target_outcomes_program')
@@ -259,6 +289,9 @@
                         if (!$expected) {
                             $expected = 'It has not been defined in the annual plan';
                         }
+                        else{
+                                            $expected = $expected->expected_target;
+                                        }
                         
                         ?>
                         {{ $expected }}
@@ -270,7 +303,7 @@
                     <thead>
                         <tr>
                             <th>
-                                Outcome
+                                Learning Outcome
                             </th>
                             <th>
                                 Number of Students Assessed
@@ -370,6 +403,7 @@
                 <br>
                 <br>
                 <h4>Performance of Students by Learning Outcome Criteria</h4>
+                <h5 style="text-align: center;">{{ $activity_2->name }} </h5>
                 <h5 style="display: inline; margin:30px;">Target by criterion: </h5>
                 <p style="display: inline;"> <i>{{ $activity_2->rubric[0]->expected_points }} or more</i>
                 </p>
@@ -395,7 +429,7 @@
                                 %
                             </th>
                             <th>
-                                Outcomes
+                                Learning Outcomes
                             </th>
                         </tr>
                     </thead>
@@ -437,7 +471,7 @@
 
                                     @foreach (Criterion::outcomes($ac_criterion->criterion_id) as $index6 => $outcome)
 
-                                        {{ $index6 + 1 }}. <?php echo $outcome->name . "\n\n\n <br>"; ?>
+                                        <?php echo $outcome->name . "\n\n\n <br>"; ?>
 
 
 
@@ -450,16 +484,43 @@
                     </tbody>
 
                 </table>
+
+                <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
+                <?php $formative_actions = $activity_2->formativeActionsWithCriteria(); ?>
+                @if ($formative_actions)
+                    <p style="display: inline;"> <u>{{ $formative_actions[0]->at_text }}:
+                        </u>
+
+                        <i>{{ $formative_actions[0]->description }}
+                        </i>
+                    </p>
+                    <br>
+                    <h5 style="display: inline; margin:30px;">Formative Action's Associated
+                        Criteria: </h5>
+                    <ul style=" margin:30px;">
+                        @foreach ($formative_actions as $criteria)
+                            <li> <i>{{ $criteria->name }} <i></li>
+
+                        @endforeach
+                    </ul>
+                @endif
+                <br>
+                <h5 style="display: inline; margin:30px;">Assessment Comments: </h5>
+                @if ($activity_2->assessment_comments != null)
+
+
+                    <p style="display: inline;">{{ $activity_2->assessment_comments }}</p>
+                @endif
                 <hr>
                 <br>
 
                 <h4>Performance of Students by Learning Outcome</h4>
-                <h5 style="display: inline; margin:30px;">Target by outcome: </h5>
+                <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
                 <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
                 </p>
                 <br>
                 <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
-                    target by outcome: </h5>
+                    target by learning outcome: </h5>
                 <p style="display: inline;"> <i>
                         <?php
                         $expected = DB::table('target_outcomes_program')
@@ -469,6 +530,9 @@
                         if (!$expected) {
                             $expected = 'It has not been defined in the annual plan';
                         }
+                        else{
+                                            $expected = $expected->expected_target;
+                                        }
                         ?>
                         {{ $expected }}
                     </i>
@@ -478,7 +542,7 @@
                     <thead>
                         <tr>
                             <th>
-                                Outcome
+                                Learning Outcome
                             </th>
                             <th>
                                 Number of Students Assessed

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

@@ -49,14 +49,14 @@
                     <?php
                     
                     /*$sections_evaluating = Course::has('activities')
-                                                                                       ->whereNotNull('outcomes_attempted')
-                                                                                       ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
-                                                                                       ->with(array('activities'=>function($query) use(&$outcome){
-                                                                                           $query->whereNotNull('outcomes_attempted');
-                                                                                           $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
-                                                                                       ->where('code', $course->code)->where('number',$course->number)
-                                                                                       ->whereIn('semester_id', Session::get('semesters_ids'))
-                                                                                       ->get();*/
+                                                                                                                                                                                                                                                                                                                                       ->whereNotNull('outcomes_attempted')
+                                                                                                                                                                                                                                                                                                                                       ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
+                                                                                                                                                                                                                                                                                                                                       ->with(array('activities'=>function($query) use(&$outcome){
+                                                                                                                                                                                                                                                                                                                                           $query->whereNotNull('outcomes_attempted');
+                                                                                                                                                                                                                                                                                                                                           $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
+                                                                                                                                                                                                                                                                                                                                       ->where('code', $course->code)->where('number',$course->number)
+                                                                                                                                                                                                                                                                                                                                       ->whereIn('semester_id', Session::get('semesters_ids'))
+                                                                                                                                                                                                                                                                                                                                       ->get();*/
                     
                     $sections_evaluating = Course::has('activities')
                     
@@ -152,35 +152,7 @@
                                 </p>
 
                                 <br>
-                                <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
-                                <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
-                                @if ($formative_actions)
-                                    <p style="display: inline;"> <strong>{{ $formative_actions[0]->at_text }}:
-                                        </strong>
-
-                                        <i>{{ $formative_actions[0]->description }}
-                                        </i>
-                                    </p>
-                                    <br>
-                                    <h5>Formative Action's Associated
-                                        Criteria: </h5>
-                                    <ul>
-                                        @foreach ($formative_actions as $criteria)
-                                            <li> <i>{{ $criteria->name }} <i></li>
 
-                                        @endforeach
-                                    </ul>
-
-                                @else
-                                    <p style="display: inline;"> <strong>Has no Formative Action yet </strong>
-
-                                @endif
-                                @if ($activity->assessment_comments != null)
-
-                                    <h5 style="display: inline; margin:30px;">Assessment Comments</h5>
-                                    <p style="display: inline;">{{ $activity->assessment_comments }}</p>
-                                @endif
-                                <br>
 
                                 <table class='table table-striped table-condensed datatable'>
                                     <thead>
@@ -198,7 +170,7 @@
                                                 %
                                             </th>
                                             <th>
-                                                Outcomes
+                                                Learning Outcomes
                                             </th>
                                         </tr>
                                     </thead>
@@ -248,7 +220,7 @@
 
                                                     @foreach (Criterion::outcomes($ac_criterion->criterion_id) as $index6 => $outcome)
 
-                                                        {{ $index6 + 1 }}. <?php echo $outcome->name . "\n\n\n <br>"; ?>
+                                                        <?php echo $outcome->name . "\n\n\n <br>"; ?>
 
 
 
@@ -261,16 +233,50 @@
                                     </tbody>
 
                                 </table>
+                                <br>
+                                <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
+                                <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
+                                @if ($formative_actions)
+                                    <p style="display: inline;"> <u>{{ $formative_actions[0]->at_text }}:
+                                        </u>
+
+                                        <i>{{ $formative_actions[0]->description }}
+                                        </i>
+                                    </p>
+                                    <br>
+                                    <h5 style="display: inline; margin:30px;">Formative Action's Associated
+                                        Criteria: </h5>
+                                    <ul style="margin:30px;">
+                                        @foreach ($formative_actions as $criteria)
+                                            <li> <i>{{ $criteria->name }} <i></li>
+
+                                        @endforeach
+                                    </ul>
+                                @endif
+                                <br>
+
+                                <h5 style="display: inline; margin:30px;">Assessment Comments: </h5>
+                                @if ($activity->assessment_comments != null)
+
+
+                                    <p style="display: inline;">{{ $activity->assessment_comments }}</p>
+                                @endif
+                                <br>
                                 <hr>
                                 <br>
 
                                 <h4>Performance of Students by Learning Outcome</h4>
-                                <h5 style="display: inline; margin:30px;">Target by outcome: </h5>
+                                <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5><br>
+                                <p style="display: inline;">{{ $activity->name }}
+                                    <strong>({{ $activity->date }})</strong>
+                                </p>
+                                <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
                                 <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
                                 </p>
                                 <br>
-                                <h5 style="display: inline; margin:30px;">Expected percent of students achieving the target
-                                    by outcome: </h5>
+                                <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
+                                    target
+                                    by learning outcome: </h5>
                                 <p style="display: inline;"> <i>
                                         <?php
                                         $expected = DB::table('target_outcomes_program')
@@ -278,7 +284,11 @@
                                             ->where('semester_id', $course->semester_id)
                                             ->first(); //->expected_target;
                                         if (!$expected) {
-                                            $expected = 'It has not been defined in the annual plan';
+                                            
+                                             $expected = 'It has not been defined in the annual plan';
+                                        }
+                                        else{
+                                            $expected = $expected->expected_target;
                                         }
                                         
                                         ?>
@@ -290,7 +300,7 @@
                                     <thead>
                                         <tr>
                                             <th>
-                                                Outcome
+                                                Learning Outcome
                                             </th>
                                             <th>
                                                 Number of Students Assessed
@@ -342,8 +352,9 @@
 
 
 
-                            @endforeach
 
+
+                            @endforeach
                         @endforeach
                     </div>