Perdon

app/controllers/ActivitiesController.php

@@ -164,7 +164,15 @@ class ActivitiesController extends \BaseController
         $students = $course->students;
 
         // Get rubric contents
-        $rubric = Rubric::find($activity->rubric_id);
+        $rubric = Rubric::find($activity->rubric[0]->id);
+        Log::info($rubric);
+        Log::info($activity);
+        $criterion_rubric = DB::table('criteria')
+            ->join("criterion_rubric", "criterion_rubric.criterion_id", "=", "criteria.id")
+            ->where('criterion_rubric.rubric_id', '=', $rubric->id)->get();
+        Log::info($rubric);
+        Log::info($criterion_rubric);
+
         $rubric_contents = json_decode($rubric->contents);
 
         // Get results

app/controllers/AnnualPlansController.php

@@ -193,14 +193,14 @@ class AnnualPlansController extends \BaseController
     //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}))");
     //  foreach ($typ_info['courses_objective'][$course->id] as $objective) {
-    //    $typ_info['criteria'][$objective->id] = DB::select("select * from new_criteria where id in (select criterion_id from criterion_objective_outcome where outcome_id = ? and objective_id = {$objective->id})", array(Input::get('id')));
+    //    $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')));
     //  }
     //}
     //$typ_info['courses'] = DB::select("select * from courses where id in (select course_id from typ_semester_courses where typ_semester_objective_id in (select id from typ_semester_objectives where typ_semester_outcome_id in (select id from type_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')));
     //$typ_info['unique_objective'] = DB::select("select * from objectives where id in (select distinct objective_id from typ_semester_objectives where  typ_semester_outcome_id in (select id from typ_semester_outcome where semester_id = {$semester->id} and outcome_id =? and typ_program_id in (select id from typ_program where program_id ={$program_id})))", array(Input::get('id')));
     //foreach ($typ_info['unique_objective'] as $objective) {
     //  $typ_info['courses_objective'][$objective->id] = 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 outcome_id =? and typ_program_id in (select id from typ_program where program_id = {$program_id})) and id in (select typ_semester_course_id from typ_semester_objectives where objective_id  = {$objective->id}))", array(Input::get('id')));
-    //  $typ_info['criteria'][$objective->id] = DB::select("select * from new_criteria where id in (select criterion_id from criterion_objective_outcome where outcome_id = ? and objective_id = {$objective->id})", array(Input::get('id')));
+    //  $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 id from annual_plans where (semester_start = {$semester->id} or semester_end ={$semester->id}) and program_id ={$program_id}")[0];
     $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')));
@@ -209,7 +209,7 @@ class AnnualPlansController extends \BaseController
 
       $typ_info['courses'][$objective->id] = DB::select("select c.id, c.number, c.code, typ.id typ_course_id from courses c, typ_semester_courses typ, (select course_id, id  from typ_semester_courses where typ_semester_objective_id in (select id from typ_semester_objectives where objective_id ={$objective->id} and 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})))) rel where typ.course_id =c.id and rel.course_id = c.id and typ.id = rel.id ", array(Input::get('id')));
 
-      $typ_info['criteria'][$objective->id] = DB::select("select * from new_criteria where id in (select criterion_id from criterion_objective_outcome where outcome_id = ? and objective_id = {$objective->id})", array(Input::get('id')));
+      $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')));
       Log::info($typ_info['criteria'][$objective->id]);
       $typ_info['typ_objective_id'][$objective->id] = DB::select("select id from typ_semester_objectives where objective_id = {$objective->id} and 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')));
       Log::info($typ_info['typ_objective_id'][$objective->id]);
@@ -332,7 +332,7 @@ class AnnualPlansController extends \BaseController
         $annual_plan['first']['typ_objective_id'][$objective->id] = DB::select("select id from typ_semester_objectives where objective_id = {$objective->id} and  typ_semester_outcome_id in (select id from typ_semester_outcome where outcome_id ={$outcomes->id} and semester_id ={$an_semesters->semester_start} and typ_program_id in(select id from typ_program where program_id ={$an_semesters->program_id})) ")[0];
         $annual_plan['first']['courses'][$objective->id] = DB::select("select typ.id typ_id, typ.course_id, c.code, c.number from (select course_id, id from typ_semester_courses where typ_semester_objective_id = {$annual_plan['first']['typ_objective_id'][$objective->id]->id}) typ, courses c where c.id = typ.course_id");
         foreach ($annual_plan['first']['courses'][$objective->id] as $course) {
-          $annual_plan['first']['criteria'][$objective->id][$course->course_id] = DB::select("select * from new_criteria where id in(select criteria_id from annual_plan_objective where annual_plan_id = {$an_id} and typ_semester_course_id = {$course->typ_id} )");
+          $annual_plan['first']['criteria'][$objective->id][$course->course_id] = DB::select("select * from criteria where id in(select criteria_id from annual_plan_objective where annual_plan_id = {$an_id} and typ_semester_course_id = {$course->typ_id} )");
         }
         Log::info($objective->id);
         $annual_plan['first']['trans_actions'][$objective->id] = DB::select("select * from transformative_actions where id in (select trans_id from annual_plan_transformative where typ_semester_objective_id ={$annual_plan['first']['typ_objective_id'][$objective->id]->id})");
@@ -355,7 +355,7 @@ class AnnualPlansController extends \BaseController
 
         $annual_plan['second']['courses'][$objective->id] = DB::select("select typ.id typ_id, typ.course_id, c.code, c.number from (select course_id, id from typ_semester_courses where typ_semester_objective_id = {$annual_plan['second']['typ_objective_id'][$objective->id]->id}) typ, courses c where c.id = typ.course_id");
         foreach ($annual_plan['second']['courses'][$objective->id] as $course) {
-          $annual_plan['second']['criteria'][$objective->id][$course->course_id] = DB::select("select * from new_criteria where id in(select criteria_id from annual_plan_objective where annual_plan_id = {$an_id} and typ_semester_course_id ={$course->typ_id})");
+          $annual_plan['second']['criteria'][$objective->id][$course->course_id] = DB::select("select * from criteria where id in(select criteria_id from annual_plan_objective where annual_plan_id = {$an_id} and typ_semester_course_id ={$course->typ_id})");
         }
 
         $annual_plan['second']['trans_actions'][$objective->id] = DB::select("select * from transformative_actions where id in (select trans_id from annual_plan_transformative where typ_semester_objective_id ={$annual_plan['second']['typ_objective_id'][$objective->id]->id})");

app/controllers/CriteriaController.php

@@ -18,7 +18,7 @@ class CriteriaController extends \BaseController
         $userProgram = DB::select("select program_user.program_id from program_user where user_id = {$userProgram}");
         Log::info($userProgram);
         $title = "Criteria";
-        $outcomes = Outcome::orderBy('name', 'ASC')->lists('name', 'id');
+        $outcomes = Outcome::where("deactivation_date", '=', null)->orderBy('name', 'ASC')->lists('name', 'id');
 
         $criteria = Criterion::withTrashed()->orderBy('name', 'ASC')->get();
         $programs = Program::where("id", "=", $userProgram[0]->program_id)->get();
@@ -30,7 +30,7 @@ class CriteriaController extends \BaseController
         $userSchool = Auth::user()['school_id'];
         Log::info($userSchool);
         $title = "Criteria";
-        $outcomes = Outcome::orderBy('name', 'ASC')->lists('name', 'id');
+        $outcomes = Outcome::where("deactivation_date", '=', null)->orderBy('name', 'ASC')->lists('name', 'id');
 
         $schools = School::find($userSchool)->get();
         $criteria = Criterion::withTrashed()->orderBy('name', 'ASC')->get();
@@ -53,7 +53,7 @@ class CriteriaController extends \BaseController
     public function fetchCriterionWithTemplate()
     {
         $json_to_send = array();
-        $json_to_send['criterion'] = DB::table('new_criteria')->where('id', '=', Input::get('id'))->first();
+        $json_to_send['criterion'] = DB::table('criteria')->where('id', '=', Input::get('id'))->first();
 
 
 
@@ -63,7 +63,7 @@ class CriteriaController extends \BaseController
     public function fetchCriterion()
     {
         $json_to_send = array();
-        $json_to_send['criterion'] = DB::table('new_criteria')->where('id', '=', Input::get('id'))->first();
+        $json_to_send['criterion'] = DB::table('criteria')->where('id', '=', Input::get('id'))->first();
 
 
 
@@ -75,7 +75,7 @@ class CriteriaController extends \BaseController
         $program_id = Input::get('program_fetch');
         $outcome_id = Input::get('outcome_fetch');
         $json = array();
-        $json['criterion'] = DB::select("SELECT * FROM `new_criteria` where id in (select criterion_id from criterion_objective_outcome where outcome_id ={$outcome_id}) and id in(select criterion_id from program_criterion where program_id = {$program_id})");
+        $json['criterion'] = DB::select("SELECT * FROM `criteria` where id in (select criterion_id from criterion_objective_outcome where outcome_id ={$outcome_id}) and id in(select criterion_id from program_criterion where program_id = {$program_id})");
 
         return json_encode($json);
     }
@@ -96,12 +96,12 @@ class CriteriaController extends \BaseController
     {
 
         $json = array();
-        $json['criteria'] = DB::select(" select * from new_criteria where id = ?", array(Input::get('id')));
+        $json['criteria'] = DB::select(" select * from criteria where id = ?", array(Input::get('id')));
         $json['outcomes'] = DB::select("select  DISTINCT outcomes.id, outcomes.name from outcomes , criterion_objective_outcome where criterion_objective_outcome.criterion_id = ? and outcomes.id = criterion_objective_outcome.outcome_id order by outcomes.id", array(Input::get('id')));
         $json['objectives'] = DB::select("SELECT DISTINCT objectives.id, objectives.text FROM objectives, criterion_objective_outcome where criterion_objective_outcome.criterion_id = ? and criterion_objective_outcome.objective_id= objectives.id ", array(Input::get('id')));
         $json['objectives_outcome'] = DB::select("select objectives.id, objectives.text, objective_outcome.outcome_id from objective_outcome, objectives where objective_outcome.outcome_id in(select  DISTINCT outcomes.id from outcomes , criterion_objective_outcome where criterion_objective_outcome.criterion_id = ? and outcomes.id = criterion_objective_outcome.outcome_id) and objectives.id = objective_outcome.objective_id ORDER BY outcome_id", array(Input::get('id')));
         $json['program'] = DB::select("select criterion_id, program_id from program_criterion where criterion_id =?", array(Input::get('id')));
-        $json['activity_criterion'] = DB::select("select * from new_assessments where activity_criterion_id  in (select id from activity_criterion where criterion_id = ?)", array(Input::get('id')));
+        $json['activity_criterion'] = DB::select("select * from assessments where activity_criterion_id  in (select id from activity_criterion where criterion_id = ?)", array(Input::get('id')));
 
         foreach ($json['outcomes'] as $id) {
             $outId = $id->id;
@@ -114,7 +114,7 @@ class CriteriaController extends \BaseController
 
     public function delete()
     {
-        DB::delete("delete from new_criteria where id = ?", array(Input::get('criterion_delete')));
+        DB::delete("delete from criteria where id = ?", array(Input::get('criterion_delete')));
         $role = Auth::user()['role'];
         switch ($role) {
             case 1:
@@ -186,13 +186,13 @@ class CriteriaController extends \BaseController
 
         $clean_input['copyright'] = trim(preg_replace('/\t+/', '', Input::get('copyright')));
         $clean_input['notes'] = trim(preg_replace('/\t+/', '', Input::get('notes')));
-        $clean_input['maximum_score'] =  (int) Input::get('maximum_score');
-        $clean_input['scale_title'] = Input::get('title');
-        $clean_input['scale_description'] = Input::get('Scales');
-        $clean_input['min_score'] = Input::get('min');
-        $clean_input['max_score'] = Input::get('max');
+        // $clean_input['maximum_score'] =  (int) Input::get('maximum_score');
+        // $clean_input['scale_title'] = Input::get('title');
+        //$clean_input['scale_description'] = Input::get('Scales');
+        // $clean_input['min_score'] = Input::get('min');
+        //$clean_input['max_score'] = Input::get('max');
 
-        $clean_input['number_of_scales'] = sizeof($clean_input['scale_title']);
+        // $clean_input['number_of_scales'] = sizeof($clean_input['scale_title']);
 
 
         return $clean_input;
@@ -207,8 +207,8 @@ class CriteriaController extends \BaseController
                 'subcriteria' => $clean_input['subcriteria'],
                 'outcome_id' => $clean_input['outcome_id'],
                 'notes' => $clean_input['notes'],
-                'copyright' => $clean_input['copyright'],
-                'maximum_score' => $clean_input['maximum_score']
+                'copyright' => $clean_input['copyright']
+                //'maximum_score' => $clean_input['maximum_score']
             ),
             array(
                 'name' => 'required|string',
@@ -216,8 +216,8 @@ class CriteriaController extends \BaseController
                 'outcome_id' => 'required|array',
 
                 'notes' => 'string',
-                'copyright' => 'string',
-                'maximum_score' => 'required|integer'
+                'copyright' => 'string'
+                //'maximum_score' => 'required|integer'
             )
 
         );
@@ -277,8 +277,8 @@ class CriteriaController extends \BaseController
 
             //gabriel añadió aqui
 
-            $criterion->number_of_scales = $clean_input['number_of_scales'];
-            $criterion->maximum_score = $clean_input['maximum_score'];
+            //$criterion->number_of_scales = $clean_input['number_of_scales'];
+            //$criterion->maximum_score = $clean_input['maximum_score'];
 
             if (Input::get('copyright'))
                 $criterion->copyright = $clean_input['copyright'];
@@ -295,11 +295,11 @@ class CriteriaController extends \BaseController
                 foreach ($clean_input['outcome_id'] as $outcome_id) {
                     foreach ($clean_input['objective_id'] as $objective_id) {
 
-                        DB::insert("insert into `criterion_objective_outcome` (`objective_id`, `outcome_id`, `criterion_id`, `objective_outcome_id`) values ({$objective_id},{$outcome_id}, {$criterionId}, 0)");
+                        DB::insert("insert into `criterion_objective_outcome` (`objective_id`, `outcome_id`, `criterion_id`) values ({$objective_id},{$outcome_id}, {$criterionId})");
                     }
                 }
 
-                for ($i = 0; $i < sizeof($clean_input['scale_title']); $i++) {
+                /*for ($i = 0; $i < sizeof($clean_input['scale_title']); $i++) {
                     $scale = new Scale;
                     $scale->title = $clean_input['scale_title'][$i];
                     $scale->position = $i + 1;
@@ -324,7 +324,7 @@ class CriteriaController extends \BaseController
                                 return Redirect::to('program-criteria')->withInput();
                         }
                     }
-                }
+                }*/
 
                 foreach ($clean_input['program_id'] as $program_id) {
                     DB::insert("insert into `program_criterion` (`criterion_id`, `program_id`) values({$criterionId},{$program_id})");
@@ -369,7 +369,7 @@ class CriteriaController extends \BaseController
     public function edit()
     {
         $title = "Criteria";
-        $outcomes = Outcome::orderBy('name', 'ASC')->lists('name', 'id');
+        $outcomes = Outcome::where("deactivation_date", '=', null)->orderBy('name', 'ASC')->lists('name', 'id');
 
         $schools = School::orderBy('name', 'ASC')->get();
         $criteria = Criterion::withTrashed()->orderBy('name', 'ASC')->get();
@@ -418,10 +418,10 @@ class CriteriaController extends \BaseController
 
         $clean_input['copyright'] = trim(preg_replace('/\t+/', '', Input::get('copyright')));
         $clean_input['notes'] = trim(preg_replace('/\t+/', '', Input::get('notes')));
-        $clean_input['maximum_score'] = (int) Input::get('assoc_maximum_score');
+        /* $clean_input['maximum_score'] = (int) Input::get('assoc_maximum_score');
         $clean_input['scale_title'] = Input::get('assoc_title');
         $clean_input['scale_description'] = Input::get('assoc_scales');
-        $clean_input['number_of_scales'] = sizeof($clean_input['scale_title']);
+        $clean_input['number_of_scales'] = sizeof($clean_input['scale_title']);*/
 
 
         return $clean_input;
@@ -509,11 +509,12 @@ class CriteriaController extends \BaseController
             if ($criterion->save()) {
                 $criterionId = $criterion->id;
                 DB::delete("delete from `criterion_objective_outcome` where `criterion_id` ={$criterionId}");
+                DB::delete("delete from `program_criterion` where `criterion_id` ={$criterionId}");
 
                 foreach ($clean_input['outcome_id'] as $outcome_id) {
                     foreach ($clean_input['objective_id'] as $objective_id) {
 
-                        DB::insert("insert into `criterion_objective_outcome` (`objective_id`, `outcome_id`, `criterion_id`,`objective_outcome_id`) values ({$objective_id},{$outcome_id}, {$criterionId}, 0)");
+                        DB::insert("insert into `criterion_objective_outcome` (`objective_id`, `outcome_id`, `criterion_id`) values ({$objective_id},{$outcome_id}, {$criterionId})");
                     }
                 }
                 /*DB::delete("delete from `scales` where id in (select scale_id id from criterion_scale where criterion_id = {$criterionId})");
@@ -541,6 +542,9 @@ class CriteriaController extends \BaseController
                         }
                     }
                 }*/
+                foreach ($clean_input['program_id'] as $program_id) {
+                    DB::insert("insert into `program_criterion` (`criterion_id`, `program_id`) values({$criterionId},{$program_id})");
+                }
 
 
 
@@ -549,13 +553,13 @@ class CriteriaController extends \BaseController
                 $role = Auth::user()['role'];
                 switch ($role) {
                     case 1:
-                        return Redirect::to('objective')->withInput();
+                        return Redirect::to('criteria')->withInput();
 
                     case 2:
-                        return Redirect::to('school-objective')->withInput();
+                        return Redirect::to('school-criteria')->withInput();
 
                     case 3:
-                        return Redirect::to('program-objective')->withInput();
+                        return Redirect::to('program-criteria')->withInput();
                 }
             }
 
@@ -566,13 +570,13 @@ class CriteriaController extends \BaseController
                 $role = Auth::user()['role'];
                 switch ($role) {
                     case 1:
-                        return Redirect::to('objective')->withInput();
+                        return Redirect::to('criteria')->withInput();
 
                     case 2:
-                        return Redirect::to('school-objective')->withInput();
+                        return Redirect::to('school-criteria')->withInput();
 
                     case 3:
-                        return Redirect::to('program-objective')->withInput();
+                        return Redirect::to('program-criteria')->withInput();
                 }
             }
         }

app/controllers/Objective2Controller.php

@@ -39,16 +39,17 @@ class Objective2Controller extends \BaseController
 		else
 			$program_id = NULL;
 
-		$saved_Objective = Objective::withTrashed()
-			->where('text', '=', $input['text'])
-			->where('outcome_id', '=', $input['outcome_id'])
-			->where('program_id', '=', $program_id)
+		$saved_Objective = DB::table('objectives')->join('objective_outcome', 'objective_outcome.objective_id', '=', 'objectives.id')
+			->join('objective_program', 'objective_program.objective_id', '=', 'objectives.id')
+			->where('objectives.text', '=', $input['text'])
+			->whereIn('objective_outcome.outcome_id', $input['outcome_id'])
+			->whereIn('objective_program.program_id', $input['program_id'])
 
-			->first();
+			->get();
 
 
 
-		if ($saved_Objective)
+		if (count($saved_Objective))
 			return false;
 		else
 			return true;
@@ -126,8 +127,10 @@ class Objective2Controller extends \BaseController
 		$json['program'] = DB::select("select program_id from objective_program where objective_id = ?", array(Input::get('id')));
 		$json['outcome'] = DB::select("select outcome_id from objective_outcome outc where outc.objective_id = ?", array(Input::get('id')));
 		$json['objective'] = DB::select("select text, id from objectives where id =?", array(Input::get('id')));
-		$json['assessment'] = DB::select("select * from assessments where activity_id  in (select activity_id from activity_criterion where criterion_id in (select criterion_id from criterion_objective_outcome where objective_id = ?))", array(Input::get('id')));
+		$json['assessment'] = DB::select("select * from assessments where activity_criterion_id  in (select id from activity_criterion where criterion_id in (select criterion_id from criterion_objective_outcome where objective_id = ?))", array(Input::get('id')));
+
 		$json['assoc_criteria'] = DB::select("select name from criteria where id in(select criterion_id from criterion_objective_outcome where objective_id =?)", array(Input::get('id')));
+		Log::info('is here');
 		return json_encode($json);
 	}
 	public function fetchAllobjectives()
@@ -301,7 +304,7 @@ class Objective2Controller extends \BaseController
 	public function edit()
 	{
 		$title = "Objective";
-		$outcomes = Outcome::orderBy('name', 'ASC')->lists('name', 'id');
+		$outcomes = Outcome::where('deactivation_date', '=', null)->orderBy('name', 'ASC')->lists('name', 'id');
 
 		$objectives = Objective::withTrashed()->orderBy('text', 'ASC')->get();
 		$programs = Program::orderBy('name', 'ASC')->get();

app/controllers/OutcomesController.php

@@ -410,8 +410,8 @@ class OutcomesController extends \BaseController
         if (Input::get('filter')) {
             switch (Input::get('filter')) {
                 case 'all':
-                    return DB::table('new_criteria')
-                        ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
+                    return DB::table('criteria')
+                        ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
                         ->where('criterion_objective_outcome.outcome_id', '=', Input::get('id'))
                         ->select('criterion_id as id', 'name')
                         ->orderBy('name', 'ASC')
@@ -424,16 +424,16 @@ class OutcomesController extends \BaseController
 
                         // Fetch all the programs whose school is the user's
                         $program_ids = DB::table('programs')->where('school_id', Auth::user()->school_id)->lists('id');
-                        $new_criteria = DB::table('new_criteria')
-                            ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
-                            ->join('program_criterion', 'program_criterion.criterion_id', '=', 'new_criteria.id')
+                        $criteria = DB::table('criteria')
+                            ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
+                            ->join('program_criterion', 'program_criterion.criterion_id', '=', 'criteria.id')
                             ->where('criterion_objective_outcome.outcome_id', '=', Input::get('id'))
                             ->whereIn('program_criterion.program_id', $program_ids)
                             ->select('criterion_id as id', 'name')
                             ->orderBy('name', 'ASC')
                             ->get();
                         // Return all criteria belonging to any of those programs
-                        return $new_criteria;
+                        return $criteria;
                     }
 
                     // If pcoord
@@ -442,9 +442,9 @@ class OutcomesController extends \BaseController
                         // Fetch all the programs from the user's school;
                         $program_ids = DB::table('programs')->where('school_id', Auth::user()->programs[0]->school->id)->lists('id');
 
-                        return DB::table('new_criteria')
-                            ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
-                            ->join('program_criterion', 'program_criterion.criterion_id', '=', 'new_criteria.id')
+                        return DB::table('criteria')
+                            ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
+                            ->join('program_criterion', 'program_criterion.criterion_id', '=', 'criteria.id')
                             ->where('criterion_objective_outcome.outcome_id', '=', Input::get('id'))
                             ->whereIn('program_criterion.program_id', $program_ids)
                             ->select('criterion_id as id', 'name')
@@ -455,20 +455,20 @@ class OutcomesController extends \BaseController
                     break;
 
                 case 'program':
-                    $new_criteria = DB::table('new_criteria')
-                        ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
-                        ->join('program_criterion', 'program_criterion.criterion_id', '=', 'new_criteria.id')
+                    $criteria = DB::table('criteria')
+                        ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
+                        ->join('program_criterion', 'program_criterion.criterion_id', '=', 'criteria.id')
                         ->where('criterion_objective_outcome.outcome_id', '=', Input::get('id'))
                         ->whereIn('program_criterion.program_id', Auth::user()->programs->lists('id'))
                         ->select('criterion_id as id', 'name')
                         ->orderBy('name', 'ASC')
                         ->get();
-                    return $new_criteria;
+                    return $criteria;
                     break;
 
                 default:
-                    return DB::table('new_criteria')
-                        ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
+                    return DB::table('criteria')
+                        ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
                         ->where('criterion_objective_outcome.outcome_id', '=', Input::get('id'))
                         ->select('criterion_id as id', 'name')
                         ->orderBy('name', 'ASC')
@@ -476,8 +476,8 @@ class OutcomesController extends \BaseController
                     break;
             }
         } else {
-            return DB::table('new_criteria')
-                ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
+            return DB::table('criteria')
+                ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
                 ->where('criterion_objective_outcome.outcome_id', '=', Input::get('id'))
                 ->select('criterion_id as id', 'name')
                 ->orderBy('name', 'ASC')
@@ -552,12 +552,12 @@ class OutcomesController extends \BaseController
         $outcome = $outcome_info[0];
 
         $diferent_levels = DB::table('criterion_objective_outcome')
-            ->join('new_criteria', 'new_criteria.id', '=', 'criterion_objective_outcome.criterion_id')
+            ->join('criteria', 'criteria.id', '=', 'criterion_objective_outcome.criterion_id')
             ->join('objectives', 'objectives.id', '=', 'criterion_objective_outcome.objective_id')
             ->where('criterion_objective_outcome.outcome_id', $id)
-            ->distinct('new_criteria.number_of_scales')
-            ->select('new_criteria.number_of_scales as levels')
-            ->orderBy('new_criteria.number_of_scales', 'asc')
+            ->distinct('criteria.number_of_scales')
+            ->select('criteria.number_of_scales as levels')
+            ->orderBy('criteria.number_of_scales', 'asc')
             ->get();
 
         $criteria_array = array();
@@ -568,13 +568,13 @@ class OutcomesController extends \BaseController
 
             // buscar todos los criterios con el level y ponerlos en un array
             $outcome_criterias = DB::table('criterion_objective_outcome')
-                ->join('new_criteria', 'new_criteria.id', '=', 'criterion_objective_outcome.criterion_id')
+                ->join('criteria', 'criteria.id', '=', 'criterion_objective_outcome.criterion_id')
                 ->join('objectives', 'objectives.id', '=', 'criterion_objective_outcome.objective_id')
                 ->where('criterion_objective_outcome.outcome_id', $id)
-                ->where('new_criteria.number_of_scales', $level)
-                ->whereNull('new_criteria.deleted_at')
-                ->select('new_criteria.id', 'new_criteria.name')
-                ->orderBy('new_criteria.name', 'asc')
+                ->where('criteria.number_of_scales', $level)
+                ->whereNull('criteria.deleted_at')
+                ->select('criteria.id', 'criteria.name')
+                ->orderBy('criteria.name', 'asc')
                 ->get();
             $outcome_criterias = $outcome_criterias;
 
@@ -585,20 +585,20 @@ class OutcomesController extends \BaseController
                         DB::raw("
                   SELECT *
                   FROM (
-                    SELECT new_criteria.id as criterion_id,
+                    SELECT criteria.id as criterion_id,
                       ROW_NUMBER() OVER(PARTITION BY scales.id) rn,
                       scales.position,
                       scales.title, scales.description,
                       criterion_objective_outcome.outcome_id,criterion_objective_outcome.objective_id,
                       criterion_scale.scale_id
-                    FROM new_criteria,criterion_scale,scales, criterion_objective_outcome, objectives
-                    where new_criteria.id=criterion_scale.criterion_id
+                    FROM criteria,criterion_scale,scales, criterion_objective_outcome, objectives
+                    where criteria.id=criterion_scale.criterion_id
                       and scales.id = criterion_scale.scale_id
-                      and new_criteria.id = criterion_objective_outcome.criterion_id
+                      and criteria.id = criterion_objective_outcome.criterion_id
                       and objectives.id = criterion_objective_outcome.objective_id
                       and criterion_objective_outcome.outcome_id = $id
-                      and new_criteria.id = $criteria_id->id
-                    ORDER BY new_criteria.name ASC) a
+                      and criteria.id = $criteria_id->id
+                    ORDER BY criteria.name ASC) a
                   WHERE rn = 1
                   ORDER BY `a`.`position` ASC
                       ")

app/controllers/RubricsController.php

@@ -78,14 +78,14 @@ class RubricsController extends \BaseController
 
 
         // Get rubric contents
-        $rubric_contents = json_decode(Input::get('contents'));
+
         $scales = Input::get('scales');
         $criteria = Input::get('criteria');
 
         // Process rubric
         $rubric = new Rubric;
         $rubric->name = Input::get('name');
-        $rubric->contents = json_encode($rubric_contents);
+
         $rubric->expected_percentage = Input::get('expected_percentage');
         $rubric->expected_points = Input::get('expected_points');
         $rubric->user_id = Auth::id();
@@ -99,13 +99,13 @@ class RubricsController extends \BaseController
             //             $activity->rubric_id = $rubric->id;
             //             $activity->save();
 
-            DB::table('new_rubric_activity')->insert(array('activity_id' => Input::get('activity_id'), 'rubric_id' => $rubric->id));
+            DB::table('rubric_activity')->insert(array('activity_id' => Input::get('activity_id'), 'rubric_id' => $rubric->id));
             DB::commit();
 
             $rubricId = $rubric->id;
             foreach ($criteria as $index => $criterion_id) {
-                DB::insert("insert into new_criterion_rubric (`rubric_id`,`criterion_id`) values ({$rubricId},{$criterion_id})");
-                $rubric_criterion_id = DB::table('new_criterion_rubric')->where('rubric_id', '=', $rubricId)
+                DB::insert("insert into criterion_rubric (`rubric_id`,`criterion_id`) values ({$rubricId},{$criterion_id})");
+                $rubric_criterion_id = DB::table('criterion_rubric')->where('rubric_id', '=', $rubricId)
                     ->where('criterion_id', '=', $criterion_id)->first();
 
                 for ($i = 0; $i < count($scales[$index]); $i++) {
@@ -152,7 +152,7 @@ class RubricsController extends \BaseController
     {
         $rubric = Rubric::find(Input::get('id'));
         $rubric->name = Input::get('name');
-        $rubric->contents = Input::get('contents');
+
         $rubric->expected_percentage = Input::get('expected_percentage');
         $rubric->expected_points = Input::get('expected_points');
 

app/controllers/TemplatesController.php

@@ -47,7 +47,7 @@ class TemplatesController extends \BaseController
 	{
 		$json_to_send = [];
 		$template_id = Input::get('id');
-		$json_to_send["criteria"] = DB::table("new_criteria")->join('template_criterion', 'template_criterion.criterion_id', '=', 'new_criteria.id')
+		$json_to_send["criteria"] = DB::table("criteria")->join('template_criterion', 'template_criterion.criterion_id', '=', 'criteria.id')
 			->where("template_criterion.template_id", '=', $template_id)
 			->get();
 		Log::info($json_to_send["criteria"]);
@@ -67,7 +67,7 @@ class TemplatesController extends \BaseController
 		$title = "Rubric Builder";
 
 		$templates = Template::orderBy('name', 'ASC')->get();
-		$outcomes = Outcome::orderBy('name', 'ASC')->get();
+		$outcomes = Outcome::where("deactivation_date", '=', null)->orderBy('name', 'ASC')->get();
 		$criteria = Criterion::orderBy('name', 'ASC')->get();
 		$schools = School::orderBy('name', 'ASC')->get();
 		$role = Auth::user()->role;
@@ -100,7 +100,7 @@ class TemplatesController extends \BaseController
 		$template = new Template;
 
 		$template->name = Input::get('name');
-		$template->contents = Input::get('contents');
+
 		$template->is_visible = Input::get('is_visible');
 		$template->expected_percentage = Input::get('expected_percentage');
 		$template->expected_points = Input::get('expected_points');
@@ -183,8 +183,8 @@ class TemplatesController extends \BaseController
 	{
 		$template_info = [];
 		$template_info['template'] = Template::find(Input::get('id'));
-		$template_info['criterion'] = DB::table('new_criteria')
-			->join('template_criterion', 'template_criterion.criterion_id', '=', 'new_criteria.id')
+		$template_info['criterion'] = DB::table('criteria')
+			->join('template_criterion', 'template_criterion.criterion_id', '=', 'criteria.id')
 			->where("template_criterion.template_id", '=', Input::get('id'))
 			->get();
 		foreach ($template_info['criterion'] as $temp_crit) {
@@ -208,7 +208,7 @@ class TemplatesController extends \BaseController
 	{
 		$template = Template::find(Input::get('id'));
 		$template->name = Input::get('name');
-		$template->contents = Input::get('contents');
+
 		$template->is_visible = Input::get('is_visible');
 		$template->expected_percentage = Input::get('expected_percentage');
 		$template->expected_points = Input::get('expected_points');
@@ -232,7 +232,49 @@ class TemplatesController extends \BaseController
 				$template->program_id = NULL;
 		}
 
+		switch (Auth::user()->role) {
+			case 2:
+				$template->school_id = Auth::user()->school->id;
+				break;
+
+			case 3:
+				$template->school_id = Auth::user()->programs[0]->school->id;
+				$template->program_id = Auth::user()->programs[0]->id;
+				break;
+		}
+
+		$scales = Input::get('scales');
+		$criteria = Input::get('criteria');
+
+		$max_score = Input::get('max_score');
+		Log::info($scales);
+		Log::info(Input::all());
+		$template->num_scales = count($scales[0]);
+		$template->max_score = $max_score;
+		$division = $max_score / count($scales[0]);
+
 		if ($template->save()) {
+			$templateId = $template->id;
+			DB::delete("delete from template_criterion where template_id ={$template->id}");
+			foreach ($criteria as $index => $criterion_id) {
+
+				DB::insert("insert into template_criterion (`template_id`,`criterion_id`) values ({$templateId},{$criterion_id})");
+				$template_criterion_id = DB::table('template_criterion')->where('template_id', '=', $templateId)
+					->where('criterion_id', '=', $criterion_id)->first();
+				DB::delete("delete from template_criterion_scale where template_criterion_id ={$template_criterion_id->id}");
+				for ($i = 0; $i < count($scales[$index]); $i++) {
+					$scale = new Scale;
+					$scale->description = $scales[$index][$i];
+					$scale->min_score = 1 + ($division * $i);
+					$scale->max_score = ($division * ($i + 1));
+					if ($scale->save()) {
+						DB::insert("insert into `template_criterion_scale` (`template_criterion_id`, `scale_id`, `position`) values ({$template_criterion_id->id},{$scale->id}, {$i})");
+					} else {
+						Session::flash('status', 'danger');
+						Session::flash('message', 'Rubric could not be created.');
+					}
+				}
+			}
 			Session::flash('status', 'success');
 			Session::flash('message', 'Rubric updated (' . date('m/d/y, h:i:s a') . ').');
 		} else {

app/database/old_migrations/2020_04_04_002657_create_new_criteria_table.php

@@ -3,7 +3,8 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateNewCriteriaTable extends Migration {
+class CreateNewCriteriaTable extends Migration
+{
 
 	/**
 	 * Run the migrations.
@@ -12,27 +13,26 @@ class CreateNewCriteriaTable extends Migration {
 	 */
 	public function up()
 	{
-		Schema::create('new_criteria', function(Blueprint $table)
-		{
-            $table->increments('id');
-            $table->string('name');
-            $table->string('subcriteria')->nullable();
-            $table->text('description12');
-            $table->text('description34');
-            $table->text('description56');
-            $table->text('description78');
-            $table->integer('objective_id')->unsigned();
-            $table->integer('program_id')->unsigned()->nullable();
-            $table->integer('user_id')->unsigned()->nullable();
-            $table->text('copyright')->nullable();
-            $table->text('notes')->nullable();
-
-            $table->timestamps();
-            $table->timestamp('deleted_at')->nullable();
-
-            $table->foreign('objective_id')->references('id')->on('objectives')->onDelete('cascade')->onUpdate('cascade');
-            $table->foreign('program_id')->references('id')->on('programs')->onDelete('cascade')->onUpdate('cascade');
-            $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade')->onUpdate('cascade');
+		Schema::create('criteria', function (Blueprint $table) {
+			$table->increments('id');
+			$table->string('name');
+			$table->string('subcriteria')->nullable();
+			$table->text('description12');
+			$table->text('description34');
+			$table->text('description56');
+			$table->text('description78');
+			$table->integer('objective_id')->unsigned();
+			$table->integer('program_id')->unsigned()->nullable();
+			$table->integer('user_id')->unsigned()->nullable();
+			$table->text('copyright')->nullable();
+			$table->text('notes')->nullable();
+
+			$table->timestamps();
+			$table->timestamp('deleted_at')->nullable();
+
+			$table->foreign('objective_id')->references('id')->on('objectives')->onDelete('cascade')->onUpdate('cascade');
+			$table->foreign('program_id')->references('id')->on('programs')->onDelete('cascade')->onUpdate('cascade');
+			$table->foreign('user_id')->references('id')->on('users')->onDelete('cascade')->onUpdate('cascade');
 		});
 	}
 
@@ -44,7 +44,6 @@ class CreateNewCriteriaTable extends Migration {
 	 */
 	public function down()
 	{
-		Schema::drop('new_criteria');
+		Schema::drop('criteria');
 	}
-
 }

app/database/old_migrations/2020_04_22_095649_create_new_criterion_rubric_table.php

@@ -3,7 +3,8 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateNewCriterionRubricTable extends Migration {
+class CreateNewCriterionRubricTable extends Migration
+{
 
 	/**
 	 * Run the migrations.
@@ -12,25 +13,24 @@ class CreateNewCriterionRubricTable extends Migration {
 	 */
 	public function up()
 	{
-		Schema::create('new_criterion_rubric', function(Blueprint $table)
-		{
+		Schema::create('criterion_rubric', function (Blueprint $table) {
 			$table->increments('id');
 			$table->integer('criterion_id')->unsigned();
 			$table->integer('rubric_id')->unsigned();
 			$table->timestamps();
 
 			$table
-                ->foreign('criterion_id')
-                ->references('id')
-                ->on('new_criteria')
-                ->onDelete('cascade')
-                ->onUpdate('cascade');
+				->foreign('criterion_id')
+				->references('id')
+				->on('criteria')
+				->onDelete('cascade')
+				->onUpdate('cascade');
 			$table
-                ->foreign('rubric_id')
-                ->references('id')
-                ->on('rubrics')
-                ->onDelete('cascade')
-                ->onUpdate('cascade');
+				->foreign('rubric_id')
+				->references('id')
+				->on('rubrics')
+				->onDelete('cascade')
+				->onUpdate('cascade');
 		});
 	}
 
@@ -42,7 +42,6 @@ class CreateNewCriterionRubricTable extends Migration {
 	 */
 	public function down()
 	{
-		Schema::drop('new_criterion_rubric');
+		Schema::drop('criterion_rubric');
 	}
-
 }

app/database/old_migrations/2020_04_22_101110_create_new_rubric_activity_table.php

@@ -3,7 +3,8 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateNewRubricActivityTable extends Migration {
+class CreateNewRubricActivityTable extends Migration
+{
 
 	/**
 	 * Run the migrations.
@@ -12,25 +13,24 @@ class CreateNewRubricActivityTable extends Migration {
 	 */
 	public function up()
 	{
-		Schema::create('new_rubric_activity', function(Blueprint $table)
-		{
+		Schema::create('rubric_activity', function (Blueprint $table) {
 			$table->increments('id');
 			$table->integer('rubric_id')->unsigned();
 			$table->integer('activity_id')->unsigned();
 			$table->timestamps();
 
 			$table
-                ->foreign('rubric_id')
-                ->references('id')
-                ->on('rubrics')
-                ->onDelete('cascade')
-                ->onUpdate('cascade');
+				->foreign('rubric_id')
+				->references('id')
+				->on('rubrics')
+				->onDelete('cascade')
+				->onUpdate('cascade');
 			$table
-                ->foreign('activity_id')
-                ->references('id')
-                ->on('activities')
-                ->onDelete('cascade')
-                ->onUpdate('cascade');
+				->foreign('activity_id')
+				->references('id')
+				->on('activities')
+				->onDelete('cascade')
+				->onUpdate('cascade');
 		});
 	}
 
@@ -42,7 +42,6 @@ class CreateNewRubricActivityTable extends Migration {
 	 */
 	public function down()
 	{
-		Schema::drop('new_rubric_activity');
+		Schema::drop('rubric_activity');
 	}
-
 }

app/database/old_migrations/2020_10_04_142756_create_new_assessments_table.php

@@ -3,7 +3,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class CreateNewAssessmentsTable extends Migration {
+class CreateNewAssessmentsTable extends Migration
+{
 
 	/**
 	 * Run the migrations.
@@ -12,8 +13,7 @@ class CreateNewAssessmentsTable extends Migration {
 	 */
 	public function up()
 	{
-		Schema::create('new_assessments', function(Blueprint $table)
-		{
+		Schema::create('assessments', function (Blueprint $table) {
 			$table->increments('id');
 			$table->integer('student_id')->unsigned();
 			$table->integer('activity_criterion_id')->unsigned();
@@ -41,7 +41,6 @@ class CreateNewAssessmentsTable extends Migration {
 	 */
 	public function down()
 	{
-		Schema::drop('new_assessments');
+		Schema::drop('assessments');
 	}
-
 }

app/database/old_migrations/2020_10_05_130252_add_max_score_num_scales_new_criteria_table.php

@@ -3,7 +3,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class AddMaxScoreNumScalesNewCriteriaTable extends Migration {
+class AddMaxScoreNumScalesNewCriteriaTable extends Migration
+{
 
 	/**
 	 * Run the migrations.
@@ -12,8 +13,7 @@ class AddMaxScoreNumScalesNewCriteriaTable extends Migration {
 	 */
 	public function up()
 	{
-		Schema::table('new_criteria', function(Blueprint $table)
-		{
+		Schema::table('criteria', function (Blueprint $table) {
 			$table->integer('maximum_score')->after('name');;
 			$table->integer('number_of_scales')->after('maximum_score');;
 		});
@@ -26,10 +26,8 @@ class AddMaxScoreNumScalesNewCriteriaTable extends Migration {
 	 */
 	public function down()
 	{
-		Schema::table('new_criteria', function(Blueprint $table)
-		{
-    		$table->dropColumn(array('maximum_score', 'number_of_scales'));
+		Schema::table('criteria', function (Blueprint $table) {
+			$table->dropColumn(array('maximum_score', 'number_of_scales'));
 		});
 	}
-
 }

app/database/old_migrations/2020_10_29_195413_MakeObjectiveNullable.php

@@ -13,8 +13,8 @@ class MakeObjectiveNullable extends Migration
 	 */
 	public function up()
 	{
-		Schema::table('new_criteria', function (Blueprint $table) {
-			$table->dropForeign('new_criteria_objective_id_foreign');
+		Schema::table('criteria', function (Blueprint $table) {
+			$table->dropForeign('criteria_objective_id_foreign');
 		});
 	}
 

app/database/old_migrations/2020_10_29_224846_Make_criterion_objective_outcome_changeForeignKey.php

@@ -15,7 +15,7 @@ class MakeCriterionObjectiveOutcomeChangeForeignKey extends Migration
 	{
 		Schema::table('criterion_objective_outcome', function (Blueprint $table) {
 			$table->dropForeign('criterion_objective_outcome_criterion_id_foreign');
-			$table->foreign('criterion_id')->references('id')->on('new_criteria')->onDelete('cascade')->onUpdate('cascade');
+			$table->foreign('criterion_id')->references('id')->on('criteria')->onDelete('cascade')->onUpdate('cascade');
 		});
 	}
 

app/database/old_migrations/2020_12_04_111708_dropDescriptionInCriteria.php

@@ -13,7 +13,7 @@ class DropDescriptionInCriteria extends Migration
 	 */
 	public function up()
 	{
-		Schema::table('new_criteria', function (Blueprint $table) {
+		Schema::table('criteria', function (Blueprint $table) {
 
 			$table->dropColumn('description12');
 			$table->dropColumn('description34');

app/database/old_migrations/2020_12_10_175517_createProgramCriterion2.php

@@ -26,7 +26,7 @@ class CreateProgramCriterion2 extends Migration
 			$table
 				->foreign('criterion_id')
 				->references('id')
-				->on('new_criteria')
+				->on('criteria')
 				->onDelete('cascade')
 				->onUpdate('cascade');
 		});

app/database/old_migrations/2021_03_03_090217_create_annual_plan_objective_table.php

@@ -33,7 +33,7 @@ class CreateAnnualPlanObjectiveTable extends Migration
 			$table->integer('criteria_id')->unsigned();
 			$table->foreign('criteria_id')
 				->references('id')
-				->on('new_criteria')
+				->on('criteria')
 				->onUpdate('cascade')
 				->onDelete('cascade');
 

app/database/old_migrations/2021_05_20_184230_create_rubric_scales.php

@@ -25,7 +25,7 @@ class CreateRubricScales extends Migration
 				->onUpdate('cascade');
 			$table->foreign('rubric_criterion_id')
 				->references('id')
-				->on('new_criterion_rubric')
+				->on('criterion_rubric')
 				->onDelete('cascade')
 				->onUpdate('cascade');
 			$table->integer('position');

app/database/old_migrations/2021_05_20_212410_create_template_criterion.php

@@ -19,7 +19,7 @@ class CreateTemplateCriterion extends Migration
 			$table->integer('criterion_id')->unsigned();
 			$table->foreign('criterion_id')
 				->references('id')
-				->on('new_criteria')
+				->on('criteria')
 				->onDelete('cascade')
 				->onUpdate('cascade');
 			$table->foreign('template_id')

app/database/seeds/FillNewAssessmentActivityCriterion.php

@@ -1,125 +1,117 @@
 <?php
 
-class FillNewAssessmentActivityCriterion extends Seeder {
+class FillNewAssessmentActivityCriterion extends Seeder
+{
 
-    public function run()
-    {
-    
-//   DB::enableQueryLog();
-    	$activities=DB::table('activities')
-    					->join('new_rubric_activity', 'activities.id', '=', 'new_rubric_activity.activity_id')
-    					->join('rubrics', 'rubrics.id', '=', 'new_rubric_activity.rubric_id')
-    					->join('new_criterion_rubric', 'rubrics.id', '=', 'new_criterion_rubric.rubric_id')
-						->select('activities.*','rubrics.expected_percentage','rubrics.expected_points','new_criterion_rubric.criterion_id')
-						->orderBy('activities.id')
-						->orderBy('new_criterion_rubric.criterion_id')
-    					->get();
-//   DB::enableQueryLog();
-// 		dd(DB::getQueryLog());
-// 		exit();
-		$activity_antes=-1;
-		foreach ($activities as $activity)
-		{
-			$activity_id=$activity->id;
-			$expected_percentage_students_achieving=$activity->expected_percentage;
-			$transformative_actions=$activity->transforming_actions;
-			$assessment_comments=$activity->assessment_comments;
-			$expected_student_score=$activity->expected_points;
-			$criterion_id=$activity->criterion_id;
-// 			$datos=json_decode($activity->criteria_achieved, true);
-// 			$i=0;
-// 			foreach($datos as $criterion_id=>$score)
-// 			{
-			$existe_ya=DB::table('activity_criterion')->where('activity_id', $activity_id)->where('criterion_id', $criterion_id)->first();
-			if(empty($existe_ya))
-			{			
-				if($activity_antes==$activity_id)
-				{
+	public function run()
+	{
+
+		//   DB::enableQueryLog();
+		$activities = DB::table('activities')
+			->join('rubric_activity', 'activities.id', '=', 'rubric_activity.activity_id')
+			->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
+			->join('criterion_rubric', 'rubrics.id', '=', 'criterion_rubric.rubric_id')
+			->select('activities.*', 'rubrics.expected_percentage', 'rubrics.expected_points', 'criterion_rubric.criterion_id')
+			->orderBy('activities.id')
+			->orderBy('criterion_rubric.criterion_id')
+			->get();
+		//   DB::enableQueryLog();
+		// 		dd(DB::getQueryLog());
+		// 		exit();
+		$activity_antes = -1;
+		foreach ($activities as $activity) {
+			$activity_id = $activity->id;
+			$expected_percentage_students_achieving = $activity->expected_percentage;
+			$transformative_actions = $activity->transforming_actions;
+			$assessment_comments = $activity->assessment_comments;
+			$expected_student_score = $activity->expected_points;
+			$criterion_id = $activity->criterion_id;
+			// 			$datos=json_decode($activity->criteria_achieved, true);
+			// 			$i=0;
+			// 			foreach($datos as $criterion_id=>$score)
+			// 			{
+			$existe_ya = DB::table('activity_criterion')->where('activity_id', $activity_id)->where('criterion_id', $criterion_id)->first();
+			if (empty($existe_ya)) {
+				if ($activity_antes == $activity_id) {
 					DB::table('activity_criterion')->insert(
-					array("activity_id"=>$activity_id,
-						  "criterion_id"=>$criterion_id,
-						  "expected_percentage_students_achieving"=>$expected_percentage_students_achieving,
-						  "expected_student_score"=>$expected_student_score
-						  )
-						);
-				}
-				else
-				{
-					$activity_antes=$activity_id;
+						array(
+							"activity_id" => $activity_id,
+							"criterion_id" => $criterion_id,
+							"expected_percentage_students_achieving" => $expected_percentage_students_achieving,
+							"expected_student_score" => $expected_student_score
+						)
+					);
+				} else {
+					$activity_antes = $activity_id;
 					DB::table('activity_criterion')->insert(
-					array("activity_id"=>$activity_id,
-						  "criterion_id"=>$criterion_id,
-						  "expected_percentage_students_achieving"=>$expected_percentage_students_achieving,
-						  "expected_student_score"=>$expected_student_score,
-						  "transformative_actions"=>$transformative_actions,
-						  "assessment_comments"=>$assessment_comments
-						  )
-						);				
+						array(
+							"activity_id" => $activity_id,
+							"criterion_id" => $criterion_id,
+							"expected_percentage_students_achieving" => $expected_percentage_students_achieving,
+							"expected_student_score" => $expected_student_score,
+							"transformative_actions" => $transformative_actions,
+							"assessment_comments" => $assessment_comments
+						)
+					);
 				}
-				print $activity_id.':'.$criterion_id;print"\n";
+				print $activity_id . ':' . $criterion_id;
+				print "\n";
 			}
-// 				$i++;
-// 			}
+			// 				$i++;
+			// 			}
 		}
-    	
-//     exit();
-    	$assessments=DB::table('assessments')->get();
-    $i=0;
-		foreach ($assessments as $assessment)
-		{
-// 			var_dump($assessment);exit();
-			$student_id=$assessment->student_id;
-			$activity_id=$assessment->activity_id;
-			$datos=json_decode($assessment->scores, true);
-// 			$criterion=(array)DB::table('activity_criterion')->where('activity_id', $activity_id)->first();
-// 			var_dump($rubric);exit();
-// 			$criterion_id=$criterion["criterion_id"];
-// 			print_r($datos);
-// 			print"\n";
-// 			print $rubric->id;print"\t";
-			foreach($datos as $criterion_id=>$score)
-			{
-// 				print $dato["id"];print"\n";
-// 				var_dump($new_criterion);
-				$activity_criterion=DB::table('activity_criterion')->where('criterion_id', $criterion_id)->where('activity_id', $activity_id)->first();
-				if(empty($activity_criterion))
-				{
-// 					var_dump($criterion_id);
+
+		//     exit();
+		$assessments = DB::table('assessments')->get();
+		$i = 0;
+		foreach ($assessments as $assessment) {
+			// 			var_dump($assessment);exit();
+			$student_id = $assessment->student_id;
+			$activity_id = $assessment->activity_id;
+			$datos = json_decode($assessment->scores, true);
+			// 			$criterion=(array)DB::table('activity_criterion')->where('activity_id', $activity_id)->first();
+			// 			var_dump($rubric);exit();
+			// 			$criterion_id=$criterion["criterion_id"];
+			// 			print_r($datos);
+			// 			print"\n";
+			// 			print $rubric->id;print"\t";
+			foreach ($datos as $criterion_id => $score) {
+				// 				print $dato["id"];print"\n";
+				// 				var_dump($criterion);
+				$activity_criterion = DB::table('activity_criterion')->where('criterion_id', $criterion_id)->where('activity_id', $activity_id)->first();
+				if (empty($activity_criterion)) {
+					// 					var_dump($criterion_id);
 					var_dump($assessment);
-// 					$activities=DB::table('activities')->where('id', $activity_id)->first();
-// 					$criterion_rubric=DB::table('new_criterion_rubric')->where('criterion_id', $criterion_id)->first();
-// 					var_dump($activities);
-// 					var_dump($criterion_rubric);
-// 					exit();
-					$activity_criterion_id=DB::table('activity_criterion')->insertGetId(
-						array("activity_id"=>$activity_id,
-							  "criterion_id"=>$criterion_id,
-							  "transformative_actions"=>$transformative_actions,
-							  "assessment_comments"=>$assessment_comments
-							  )
-						);				
-					
-				}
-				else $activity_criterion_id=$activity_criterion->id;
-				$existe_ya=DB::table('new_assessments')->where('student_id', $student_id)->where('activity_criterion_id', $activity_criterion_id)->first();
-				if(empty($existe_ya))
-				{
-					DB::table('new_assessments')->insert(array("student_id"=>$student_id,"activity_criterion_id"=>$activity_criterion_id,'score'=>$score));
-					print".";
+					// 					$activities=DB::table('activities')->where('id', $activity_id)->first();
+					// 					$criterion_rubric=DB::table('criterion_rubric')->where('criterion_id', $criterion_id)->first();
+					// 					var_dump($activities);
+					// 					var_dump($criterion_rubric);
+					// 					exit();
+					$activity_criterion_id = DB::table('activity_criterion')->insertGetId(
+						array(
+							"activity_id" => $activity_id,
+							"criterion_id" => $criterion_id,
+							"transformative_actions" => $transformative_actions,
+							"assessment_comments" => $assessment_comments
+						)
+					);
+				} else $activity_criterion_id = $activity_criterion->id;
+				$existe_ya = DB::table('assessments')->where('student_id', $student_id)->where('activity_criterion_id', $activity_criterion_id)->first();
+				if (empty($existe_ya)) {
+					DB::table('assessments')->insert(array("student_id" => $student_id, "activity_criterion_id" => $activity_criterion_id, 'score' => $score));
+					print ".";
 				}
 			}
-// 			print $activity_id.':'.$criterion_id;print"\n";
+			// 			print $activity_id.':'.$criterion_id;print"\n";
 
 			$i++;
 		}
 
 
-// 		$course = Rubric::where('code', $code)->where('number', $number)->where('section', $section)->where('semester_id', $semester_id)->first();
+		// 		$course = Rubric::where('code', $code)->where('number', $number)->where('section', $section)->where('semester_id', $semester_id)->first();
 
 
 
 
 	}
-
-
-}
+}

app/database/seeds/FillNewCriterionRubric.php

@@ -1,94 +1,83 @@
 <?php
 
-class FillNewCriterionRubric extends Seeder {
+class FillNewCriterionRubric extends Seeder
+{
 
-    public function run()
-    {
-    	$rubrics=DB::table('rubrics')->get();
-    $i=0;
-		foreach ($rubrics as $rubric)
-		{
-			$datos=json_decode($rubric->contents, true);
-// 			print_r($datos);
-// 			print"\n";
-// 			print $rubric->id;print"\t";
-// 			if($rubric->id==29){var_dump($datos);}
-			foreach($datos as $dato)
-			{
-				if($rubric->id==29){print $dato["id"];print"Entrando\n";}
-				$new_criterion=(array)DB::table('criteria')->where('id', $dato["id"])->first();
-// 				var_dump($new_criterion);
-				$program_id=(array)DB::table('courses')
-				->join('activities', 'courses.id', '=', 'activities.course_id')
-				->join('new_rubric_activity', 'new_rubric_activity.activity_id', '=', 'activities.id')
-				->select('courses.program_id')
-				->where('new_rubric_activity.rubric_id',$rubric->id)
-				->first();
-				if(empty($program_id))$program_id['program_id']=1;
-	// 			else var_dump($program_id);
+	public function run()
+	{
+		$rubrics = DB::table('rubrics')->get();
+		$i = 0;
+		foreach ($rubrics as $rubric) {
+			$datos = json_decode($rubric->contents, true);
+			// 			print_r($datos);
+			// 			print"\n";
+			// 			print $rubric->id;print"\t";
+			// 			if($rubric->id==29){var_dump($datos);}
+			foreach ($datos as $dato) {
+				if ($rubric->id == 29) {
+					print $dato["id"];
+					print "Entrando\n";
+				}
+				$criterion = (array)DB::table('criteria')->where('id', $dato["id"])->first();
+				// 				var_dump($criterion);
+				$program_id = (array)DB::table('courses')
+					->join('activities', 'courses.id', '=', 'activities.course_id')
+					->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
+					->select('courses.program_id')
+					->where('rubric_activity.rubric_id', $rubric->id)
+					->first();
+				if (empty($program_id)) $program_id['program_id'] = 1;
+				// 			else var_dump($program_id);
 
-// 				var_dump($program_id);
-// 				var_dump($new_criterion);
-				if(!empty($new_criterion))
-				{
-					$existe=(array)DB::table('objectives')->where('id', $new_criterion["id"])->first();
-					$objective_id=$new_criterion["id"];
-					if(empty($existe))
-					{
-						$existe4=(array)DB::table('objectives')->where('program_id', $program_id['program_id'])->where('text', $new_criterion["name"])->first();
-	// 					print_r($existe4);print"\n";
-						if(!empty($existe4))
-						{
-	// 						DB::table('objectives')->insert(array("id"=> $new_criterion["id"],"program_id"=>$program_id['program_id'],"text"=>$new_criterion["name"],'outcome_id'=>$new_criterion['outcome_id']));
-							$objective_id=$existe4["id"];
-						}
-						else 
-						{
+				// 				var_dump($program_id);
+				// 				var_dump($criterion);
+				if (!empty($criterion)) {
+					$existe = (array)DB::table('objectives')->where('id', $criterion["id"])->first();
+					$objective_id = $criterion["id"];
+					if (empty($existe)) {
+						$existe4 = (array)DB::table('objectives')->where('program_id', $program_id['program_id'])->where('text', $criterion["name"])->first();
+						// 					print_r($existe4);print"\n";
+						if (!empty($existe4)) {
+							// 						DB::table('objectives')->insert(array("id"=> $criterion["id"],"program_id"=>$program_id['program_id'],"text"=>$criterion["name"],'outcome_id'=>$criterion['outcome_id']));
+							$objective_id = $existe4["id"];
+						} else {
 							print "A crear entrada en objectives:  $objective_id";
-// 							var_dump(array("id"=> $objective_id,"program_id"=>$program_id['program_id'],"text"=>$new_criterion["name"],'outcome_id'=>$new_criterion['outcome_id']));
-							DB::table('objectives')->insert(array("id"=> $objective_id,"program_id"=>$program_id['program_id'],"text"=>$new_criterion["name"],'outcome_id'=>$new_criterion['outcome_id']));
+							// 							var_dump(array("id"=> $objective_id,"program_id"=>$program_id['program_id'],"text"=>$criterion["name"],'outcome_id'=>$criterion['outcome_id']));
+							DB::table('objectives')->insert(array("id" => $objective_id, "program_id" => $program_id['program_id'], "text" => $criterion["name"], 'outcome_id' => $criterion['outcome_id']));
 						}
-					}
-					else
-					{
-						$existe4=(array)DB::table('objectives')->where('program_id', $program_id['program_id'])->where('text', $new_criterion["name"])->first();
-	// 					print_r($existe4);print"\n";
-						if(empty($existe4))
-						{
-							$objective_id=DB::table('objectives')->insertGetId(array("program_id"=>$program_id['program_id'],"text"=>$new_criterion["name"],'outcome_id'=>$new_criterion['outcome_id']));
+					} else {
+						$existe4 = (array)DB::table('objectives')->where('program_id', $program_id['program_id'])->where('text', $criterion["name"])->first();
+						// 					print_r($existe4);print"\n";
+						if (empty($existe4)) {
+							$objective_id = DB::table('objectives')->insertGetId(array("program_id" => $program_id['program_id'], "text" => $criterion["name"], 'outcome_id' => $criterion['outcome_id']));
 						}
-
 					}
-					$new_criterion["objective_id"]=$objective_id;
-					unset($new_criterion['outcome_id']);
-// 					var_dump($new_criterion);
-					$existe2=(array)DB::table('new_criteria')->where('id', $new_criterion["id"])->first();
-					if(empty($existe2))
-					{
-						DB::table('new_criteria')->insert($new_criterion);
+					$criterion["objective_id"] = $objective_id;
+					unset($criterion['outcome_id']);
+					// 					var_dump($criterion);
+					$existe2 = (array)DB::table('criteria')->where('id', $criterion["id"])->first();
+					if (empty($existe2)) {
+						DB::table('criteria')->insert($criterion);
 					}
-					$existe3=(array)DB::table('new_criterion_rubric')->where('criterion_id', $new_criterion["id"])->where('rubric_id', $rubric->id)->first();
-					if(empty($existe3))
-					{
-						DB::table('new_criterion_rubric')->insert(
-						array('criterion_id' => $dato["id"], 'rubric_id' => $rubric->id)
+					$existe3 = (array)DB::table('criterion_rubric')->where('criterion_id', $criterion["id"])->where('rubric_id', $rubric->id)->first();
+					if (empty($existe3)) {
+						DB::table('criterion_rubric')->insert(
+							array('criterion_id' => $dato["id"], 'rubric_id' => $rubric->id)
 						);
 					}
 				}
-	// 			if($i)exit();
-		
+				// 			if($i)exit();
+
 			}
-// 			if($rubric->id==29){exit();}
-		$i++;
+			// 			if($rubric->id==29){exit();}
+			$i++;
 		}
 
 
-// 		$course = Rubric::where('code', $code)->where('number', $number)->where('section', $section)->where('semester_id', $semester_id)->first();
+		// 		$course = Rubric::where('code', $code)->where('number', $number)->where('section', $section)->where('semester_id', $semester_id)->first();
 
 
 
 
 	}
-
-
-}
+}

app/database/unusedMigrations/2020_10_05_130252_add_max_score_num_scales_new_criteria_table.php

@@ -3,7 +3,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class AddMaxScoreNumScalesNewCriteriaTable extends Migration {
+class AddMaxScoreNumScalesNewCriteriaTable extends Migration
+{
 
 	/**
 	 * Run the migrations.
@@ -12,8 +13,7 @@ class AddMaxScoreNumScalesNewCriteriaTable extends Migration {
 	 */
 	public function up()
 	{
-		Schema::table('new_criteria', function(Blueprint $table)
-		{
+		Schema::table('criteria', function (Blueprint $table) {
 			$table->integer('maximum_score')->after('name');;
 			$table->integer('number_of_scales')->after('maximum_score');;
 		});
@@ -26,10 +26,8 @@ class AddMaxScoreNumScalesNewCriteriaTable extends Migration {
 	 */
 	public function down()
 	{
-		Schema::table('new_criteria', function(Blueprint $table)
-		{
-    		$table->dropColumn(array('maximum_score', 'number_of_scales'));
+		Schema::table('criteria', function (Blueprint $table) {
+			$table->dropColumn(array('maximum_score', 'number_of_scales'));
 		});
 	}
-
 }

app/database/unusedMigrations/2020_10_08_203557_create_new_criteria_table2.php

@@ -14,7 +14,7 @@ class CreateNewCriteriaTable2 extends Migration
 	 */
 	public function up()
 	{
-		Schema::table('new_criteria', function ($table) {
+		Schema::table('criteria', function ($table) {
 			$table->integer('outcome_id')->unsigned();
 
 			$table->foreign('outcome_id')->references('id')->on('outcomes')->onDelete('cascade')->onUpdate('cascade');
@@ -29,7 +29,7 @@ class CreateNewCriteriaTable2 extends Migration
 	 */
 	public function down()
 	{
-		Schema::table('new_criteria', function ($table) {
+		Schema::table('criteria', function ($table) {
 			$table->dropColumn('outcome_id');
 		});
 	}

app/database/unusedMigrations/2020_10_08_215013_drop_objective_id_new_criteria.php

@@ -13,7 +13,7 @@ class DropObjectiveIdNewCriteria extends Migration
 	 */
 	public function up()
 	{
-		Schema::table('new_criteria', function ($table) {
+		Schema::table('criteria', function ($table) {
 			$table->integer('objective_id')->nullable();
 		});
 	}
@@ -25,7 +25,7 @@ class DropObjectiveIdNewCriteria extends Migration
 	 */
 	public function down()
 	{
-		Schema::table('new_criteria', function ($table) {
+		Schema::table('criteria', function ($table) {
 
 			$table->dropColumn('objective_id');
 		});

app/database/unusedMigrations/2020_10_09_092810_drop_assessment_criteria.php

@@ -17,7 +17,7 @@ class DropAssessmentCriteria extends Migration
 			$table->dropForeign('assessments_criterion_id_foreign');
 			$table->integer('criterion_id')->unsigned();
 
-			$table->foreign('criterion_id')->references('id')->on('new_criteria')->onDelete('cascade')->onUpdate('cascade');
+			$table->foreign('criterion_id')->references('id')->on('criteria')->onDelete('cascade')->onUpdate('cascade');
 		});
 	}
 

app/database/unusedMigrations/2020_10_09_094503_add_criterion_to_assessment.php

@@ -17,7 +17,7 @@ class AddCriterionToAssessment extends Migration
 
 
 
-				$table->foreign('criterion_id')->references('id')->on('new_criteria')->onDelete('cascade')->onUpdate('cascade');
+				$table->foreign('criterion_id')->references('id')->on('criteria')->onDelete('cascade')->onUpdate('cascade');
 			});
 		}
 	}

app/models/Activity.php

@@ -10,8 +10,8 @@ class Activity extends Eloquent
 
   public function rubric()
   {
-//     return $this->belongsTo('Rubric');
-    return $this->belongsToMany('Rubric','new_rubric_activity');
+    //     return $this->belongsTo('Rubric');
+    return $this->belongsToMany('Rubric', 'rubric_activity');
   }
 
   public function course()
@@ -27,19 +27,18 @@ class Activity extends Eloquent
   // cap_array
   public function getCapArrayAttribute($value)
   {
-      return json_decode($this->criteria_achieved_percentage, true);
+    return json_decode($this->criteria_achieved_percentage, true);
   }
 
   // o_ach_array
   public function getOAchArrayAttribute($value)
   {
-      return json_decode($this->outcomes_achieved, true);
+    return json_decode($this->outcomes_achieved, true);
   }
 
   // o_att_array
   public function getOAttArrayAttribute($value)
   {
-      return json_decode($this->outcomes_attempted, true);
+    return json_decode($this->outcomes_attempted, true);
   }
-
 }

app/models/Course.php

@@ -12,7 +12,7 @@ class Course extends Eloquent
 
   public function students()
   {
-  	return $this->belongsToMany('Student')->orderBy('name', 'asc')->withTimestamps();
+    return $this->belongsToMany('Student')->orderBy('name', 'asc')->withTimestamps();
   }
 
   public function user()
@@ -28,7 +28,7 @@ class Course extends Eloquent
 
   public function activity()
   {
-      return $this->belongsTo('Activity');
+    return $this->belongsTo('Activity');
   }
 
   public function assessedActivities()
@@ -39,59 +39,52 @@ class Course extends Eloquent
   public function publishedActivities()
   {
     return $this->hasMany('Activity')->whereNotNull('activities.outcomes_attempted')->where('activities.draft', 0)->orderBy('date', 'asc');
-
   }
 
   public function outcomes_attempted()
   {
-	return DB::table('courses')
-	    	->join('activities', 'activities.course_id', '=', 'courses.id')
-	    	->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
-	    	->join('new_criteria', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
-	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
-	    	->where('courses.id','=',$this->id)
-	    	->select('criterion_objective_outcome.outcome_id')
-	    	->distinct()
-	    	->orderBy('criterion_objective_outcome.outcome_id')
-	    	->get();
-
-//   	SELECT distinct cr.outcome_id FROM  courses c, activities a, activity_criterion ac, criteria cr WHERE c.id=a.course_id and a.id=ac.activity_id and ac.criterion_id=cr.id and c.id=1
-// 	return $this->id;
+    return DB::table('courses')
+      ->join('activities', 'activities.course_id', '=', 'courses.id')
+      ->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
+      ->join('criteria', 'activity_criterion.criterion_id', '=', 'criteria.id')
+      ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
+      ->where('courses.id', '=', $this->id)
+      ->select('criterion_objective_outcome.outcome_id')
+      ->distinct()
+      ->orderBy('criterion_objective_outcome.outcome_id')
+      ->get();
+
+    //   	SELECT distinct cr.outcome_id FROM  courses c, activities a, activity_criterion ac, criteria cr WHERE c.id=a.course_id and a.id=ac.activity_id and ac.criterion_id=cr.id and c.id=1
+    // 	return $this->id;
   }
 
   public function outcomes_achieved()
   {
-		 $criteria=DB::table('new_criteria')
-	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
-	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
-	    	->join('courses', 'activities.course_id', '=', 'courses.id')
-	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
-	    	->where('courses.id','=',$this->id)
-	    	->select('new_criteria.id','expected_percentage_students_achieving','activity_criterion.activity_id')
-	    	->distinct()
-	    	->get()
-			;
-
-		$conteo=0;
-		foreach($criteria as $criterion)
-		{	
-			$students_attempted=Criterion::students_attempted($criterion->id, $criterion->activity_id);
-			$students_achieved=Criterion::students_achieved($criterion->id, $criterion->activity_id);
-		
-			if($students_attempted)
-			{
-				$percentage_students_who_achieved=100.0*$students_achieved/$students_attempted;
-			}
-			else
-			{
-				$percentage_students_who_achieved=0;
-			}
-			if($percentage_students_who_achieved>=$criterion->expected_percentage_students_achieving)
-			{
-				$conteo++;
-			}
-		}		
-		return $conteo;
+    $criteria = DB::table('criteria')
+      ->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'criteria.id')
+      ->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+      ->join('courses', 'activities.course_id', '=', 'courses.id')
+      ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
+      ->where('courses.id', '=', $this->id)
+      ->select('criteria.id', 'expected_percentage_students_achieving', 'activity_criterion.activity_id')
+      ->distinct()
+      ->get();
+
+    $conteo = 0;
+    foreach ($criteria as $criterion) {
+      $students_attempted = Criterion::students_attempted($criterion->id, $criterion->activity_id);
+      $students_achieved = Criterion::students_achieved($criterion->id, $criterion->activity_id);
+
+      if ($students_attempted) {
+        $percentage_students_who_achieved = 100.0 * $students_achieved / $students_attempted;
+      } else {
+        $percentage_students_who_achieved = 0;
+      }
+      if ($percentage_students_who_achieved >= $criterion->expected_percentage_students_achieving) {
+        $conteo++;
+      }
+    }
+    return $conteo;
   }
 
   public function semester()
@@ -99,11 +92,10 @@ class Course extends Eloquent
     return $this->belongsTo('Semester');
   }
 
-  public function sectionsWithOutcome($outcome_id) 
+  public function sectionsWithOutcome($outcome_id)
   {
-      return Course::has('activities')->with(array('activities'=>function($query) use (&$outcome_id){
-        $query->where('outcomes_attempted', 'not like', '\'%"'.$outcome_id.'":0%\'');
-      }))->where('code',$this->code)->where('number',$this->number)->get();
-
+    return Course::has('activities')->with(array('activities' => function ($query) use (&$outcome_id) {
+      $query->where('outcomes_attempted', 'not like', '\'%"' . $outcome_id . '":0%\'');
+    }))->where('code', $this->code)->where('number', $this->number)->get();
   }
 }

app/models/Criterion.php

@@ -4,28 +4,28 @@ use Illuminate\Database\Eloquent\SoftDeletingTrait;
 
 class Criterion extends Eloquent
 {
-    use SoftDeletingTrait;
-    protected $dates = ['deleted_at'];
+	use SoftDeletingTrait;
+	protected $dates = ['deleted_at'];
 
-    protected $table = 'new_criteria';
+	protected $table = 'criteria';
 
-    public function outcomes()
-    {
-//	    return $this->belongs('Objective')->belongs('Outcome');
-//	    TODO: Changes here
-//		return $this->belongs('Outcome');
-        return $this->hasManyThrough('Outcome', 'Objective');
-    }
+	public function outcomes()
+	{
+		//	    return $this->belongs('Objective')->belongs('Outcome');
+		//	    TODO: Changes here
+		//		return $this->belongs('Outcome');
+		return $this->hasManyThrough('Outcome', 'Objective');
+	}
 
-    public function objectives()
-    {
-        return $this->belongsToMany('Objective');
-    }
+	public function objectives()
+	{
+		return $this->belongsToMany('Objective');
+	}
 
-    public function rubrics()
-    {
-        return $this->belongsToMany('Rubric', 'new_criterion_rubric');
-    }
+	public function rubrics()
+	{
+		return $this->belongsToMany('Rubric', 'criterion_rubric');
+	}
 
 	/**
 	 * Return the program that the criterion belongs to
@@ -37,65 +37,62 @@ class Criterion extends Eloquent
 		return $this->belongsTo('Program');
 	}
 
-// 	public function activities()
-// 	{
-// 		return $this->hasManyThrough('Activity','activity_criterion');
-// 	}
-// 
+	// 	public function activities()
+	// 	{
+	// 		return $this->hasManyThrough('Activity','activity_criterion');
+	// 	}
+	// 
 	public function subcriteria()
 	{
 		return json_decode($this->subcriteria);
 	}
-	
-	public static function students_attempted($criterion_id,$activity_id)	
+
+	public static function students_attempted($criterion_id, $activity_id)
 	{
-		$students_attempted=0;
-// 		var_dump($criterion_id);
-// 		var_dump($semester);
-// 		exit();
-		$activities_criterions=DB::table('activity_criterion')
+		$students_attempted = 0;
+		// 		var_dump($criterion_id);
+		// 		var_dump($semester);
+		// 		exit();
+		$activities_criterions = DB::table('activity_criterion')
 			->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
 			->join('courses', 'activities.course_id', '=', 'courses.id')
-			->where('activities.id','=',$activity_id)
-			->where('activity_criterion.criterion_id','=',$criterion_id)
+			->where('activities.id', '=', $activity_id)
+			->where('activity_criterion.criterion_id', '=', $criterion_id)
 			->select('activity_criterion.id')
 			->distinct()
 			->get();
-			
-		foreach($activities_criterions as $activity_criterion)
-		{
-		
-			 $students_attempted+=DB::table('new_assessments')
-				->join('activity_criterion', 'new_assessments.activity_criterion_id', '=', 'activity_criterion.id')
-				->where('activity_criterion.id',$activity_criterion->id)
+
+		foreach ($activities_criterions as $activity_criterion) {
+
+			$students_attempted += DB::table('assessments')
+				->join('activity_criterion', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
+				->where('activity_criterion.id', $activity_criterion->id)
 				->count();
 		}
 		return $students_attempted;
 	}
 
-	public static function students_achieved($criterion_id,$activity_id)	
+	public static function students_achieved($criterion_id, $activity_id)
 	{
-		$students_achieved=0;
-		$activities_criterions=DB::table('activity_criterion')
+		$students_achieved = 0;
+		$activities_criterions = DB::table('activity_criterion')
 			->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
 			->join('courses', 'activities.course_id', '=', 'courses.id')
-			->where('activities.id','=',$activity_id)
-			->where('activity_criterion.criterion_id','=',$criterion_id)
-			->select('activity_criterion.id','expected_student_score')
+			->where('activities.id', '=', $activity_id)
+			->where('activity_criterion.criterion_id', '=', $criterion_id)
+			->select('activity_criterion.id', 'expected_student_score')
 			->distinct()
 			->get();
-			
-		foreach($activities_criterions as $activity_criterion)
-		{
-		
-// 			$expected_student_score=DB::table('new_criteria')->where('id',$criterion_id)->select('expected_student_score')->get();
-			 $students_achieved+=DB::table('new_assessments')
-				->join('activity_criterion', 'new_assessments.activity_criterion_id', '=', 'activity_criterion.id')
-				->where('activity_criterion.id',$activity_criterion->id)
-				->where('new_assessments.score','>=',$activity_criterion->expected_student_score)
+
+		foreach ($activities_criterions as $activity_criterion) {
+
+			// 			$expected_student_score=DB::table('criteria')->where('id',$criterion_id)->select('expected_student_score')->get();
+			$students_achieved += DB::table('assessments')
+				->join('activity_criterion', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
+				->where('activity_criterion.id', $activity_criterion->id)
+				->where('assessments.score', '>=', $activity_criterion->expected_student_score)
 				->count();
 		}
 		return $students_achieved;
 	}
-
 }

app/models/Outcome.php

@@ -7,11 +7,11 @@ class Outcome extends Eloquent
 	use SoftDeletingTrait;
 	protected $dates = ['deleted_at'];
 
-	protected $fillable= array('name', 'definition');
+	protected $fillable = array('name', 'definition');
 
 	public function criteria()
 	{
-	   return $this->hasManyThrough('Criterion', 'Objective')->orderBy('name');
+		return $this->hasManyThrough('Criterion', 'Objective')->orderBy('name');
 	}
 
 	/**
@@ -21,214 +21,192 @@ class Outcome extends Eloquent
 	 */
 	public function objectives()
 	{
-	    return $this->hasMany('Objective');
-//		return $this->belongsToMany('Objective', 'objective_outcome');
+		return $this->hasMany('Objective');
+		//		return $this->belongsToMany('Objective', 'objective_outcome');
 	}
-// 	public function attempted($semester, $is_grad)
-// 	{
-// 		return DB::table('new_criteria')
-// 	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
-// 	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
-// 	    	->join('courses', 'activities.course_id', '=', 'courses.id')
-// 	    	->join('programs', 'programs.id', '=', 'courses.program_id')
-// 	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
-// 	    	->where('criterion_objective_outcome.outcome_id','=',$this->id)
-// 	    	->where('programs.is_graduate','=',$is_grad)
-// 	    	->where('courses.semester_id','=',$semester)
-// 	    	->count(DB::raw('DISTINCT new_criteria.id,activity_criterion.activity_id'))
-// 			;
-//
-// 	}
-// 	public function attempted($semester, $is_grad)
-// 	{
-// 		 $criteria=DB::table('new_criteria')
-// 	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
-// 	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
-// 	    	->join('courses', 'activities.course_id', '=', 'courses.id')
-// 	    	->join('programs', 'programs.id', '=', 'courses.program_id')
-// 	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
-// 	    	->where('criterion_objective_outcome.outcome_id','=',$this->id)
-// 	    	->where('programs.is_graduate','=',$is_grad)
-// 	    	->where('courses.semester_id','=',$semester)
-// 	    	->select('new_criteria.id','expected_percentage_students_achieving','activity_criterion.activity_id')
-// 	    	->distinct()
-// 	    	->get()
-// 			;
-// 		$conteo=0;
-// 		foreach($criteria as $criterion)
-// 		{
-// 			$students_attempted=Criterion::students_attempted($criterion->id, $criterion->activity_id);
-// 			if($students_attempted)
-// 			{
-// 				$conteo++;
-// 			}
-// 		}
-// 		return $conteo;
-// 	}
+	// 	public function attempted($semester, $is_grad)
+	// 	{
+	// 		return DB::table('criteria')
+	// 	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'criteria.id')
+	// 	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+	// 	    	->join('courses', 'activities.course_id', '=', 'courses.id')
+	// 	    	->join('programs', 'programs.id', '=', 'courses.program_id')
+	// 	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
+	// 	    	->where('criterion_objective_outcome.outcome_id','=',$this->id)
+	// 	    	->where('programs.is_graduate','=',$is_grad)
+	// 	    	->where('courses.semester_id','=',$semester)
+	// 	    	->count(DB::raw('DISTINCT criteria.id,activity_criterion.activity_id'))
+	// 			;
+	//
+	// 	}
+	// 	public function attempted($semester, $is_grad)
+	// 	{
+	// 		 $criteria=DB::table('criteria')
+	// 	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'criteria.id')
+	// 	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+	// 	    	->join('courses', 'activities.course_id', '=', 'courses.id')
+	// 	    	->join('programs', 'programs.id', '=', 'courses.program_id')
+	// 	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
+	// 	    	->where('criterion_objective_outcome.outcome_id','=',$this->id)
+	// 	    	->where('programs.is_graduate','=',$is_grad)
+	// 	    	->where('courses.semester_id','=',$semester)
+	// 	    	->select('criteria.id','expected_percentage_students_achieving','activity_criterion.activity_id')
+	// 	    	->distinct()
+	// 	    	->get()
+	// 			;
+	// 		$conteo=0;
+	// 		foreach($criteria as $criterion)
+	// 		{
+	// 			$students_attempted=Criterion::students_attempted($criterion->id, $criterion->activity_id);
+	// 			if($students_attempted)
+	// 			{
+	// 				$conteo++;
+	// 			}
+	// 		}
+	// 		return $conteo;
+	// 	}
 	public function active_by_semesters($selected_semesters, $level)
 	{
-		$min_start="9000-01-01 00:00:00";
-		$max_end="1000-01-01 00:00:00";
-		foreach($selected_semesters as $semester)
-		{
-			if($min_start>$semester->start)
-			{
-				$min_start=$semester->start;
+		$min_start = "9000-01-01 00:00:00";
+		$max_end = "1000-01-01 00:00:00";
+		foreach ($selected_semesters as $semester) {
+			if ($min_start > $semester->start) {
+				$min_start = $semester->start;
 			}
-			if($max_end<$semester->end)
-			{
-				$max_end=$semester->end;
+			if ($max_end < $semester->end) {
+				$max_end = $semester->end;
 			}
 		}
-		$outcomes = Outcome::where(function($query) use ($min_start)
-								   {
-										$query->where('deactivation_date', '>=', $min_start)
-											  ->orWhere('deactivation_date', null);
-								   })
-							->where('activation_date', '<=', $max_end)
-							->where(function($query2) use ($level)
-									{
-										$query2->where("level", $level+1)
-											   ->orWhere("level",3);
-									})
-							->orderBy('name', 'ASC')
-							->get();
+		$outcomes = Outcome::where(function ($query) use ($min_start) {
+			$query->where('deactivation_date', '>=', $min_start)
+				->orWhere('deactivation_date', null);
+		})
+			->where('activation_date', '<=', $max_end)
+			->where(function ($query2) use ($level) {
+				$query2->where("level", $level + 1)
+					->orWhere("level", 3);
+			})
+			->orderBy('name', 'ASC')
+			->get();
 
-// 		return array('outcomes'=>$outcomes,'outcomes_attempted'=>$outcomes_attempted, 'outcomes_achieved'=>$outcomes_achieved, 'attemptedProgramsPerOutcome'=>$attemptedProgramsPerOutcome, 'achievedProgramsPerOutcome'=>$achievedProgramsPerOutcome,'participating_programs'=>$participating_programs);
+		// 		return array('outcomes'=>$outcomes,'outcomes_attempted'=>$outcomes_attempted, 'outcomes_achieved'=>$outcomes_achieved, 'attemptedProgramsPerOutcome'=>$attemptedProgramsPerOutcome, 'achievedProgramsPerOutcome'=>$achievedProgramsPerOutcome,'participating_programs'=>$participating_programs);
 		return $outcomes;
 	}
 
 	public function programs_attempted($semesters)
 	{
-		$semesters_array=[];
-		foreach($semesters as $semester)
-		{
-			$semesters_array[]=$semester->id;
+		$semesters_array = [];
+		foreach ($semesters as $semester) {
+			$semesters_array[] = $semester->id;
 		}
-		 $programs=DB::table('programs')
-	    	->join('courses', 'programs.id', '=', 'courses.program_id')
-	    	->join('activities', 'activities.course_id', '=', 'courses.id')
-	    	->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
-	    	->join('new_criteria', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
-	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
-	    	->where('criterion_objective_outcome.outcome_id','=',$this->id)
-	    	->whereIn('courses.semester_id',$semesters_array)
-	    	->distinct()
-	    	->select('programs.id')
-	    	->get()
-			;
+		$programs = DB::table('programs')
+			->join('courses', 'programs.id', '=', 'courses.program_id')
+			->join('activities', 'activities.course_id', '=', 'courses.id')
+			->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
+			->join('criteria', 'activity_criterion.criterion_id', '=', 'criteria.id')
+			->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
+			->where('criterion_objective_outcome.outcome_id', '=', $this->id)
+			->whereIn('courses.semester_id', $semesters_array)
+			->distinct()
+			->select('programs.id')
+			->get();
 
 		return $programs;
-
 	}
 
 	public function attempted($semesters, $is_grad)
 	{
-		$semesters_array=[];
-		foreach($semesters as $semester)
-		{
-			$semesters_array[]=$semester->id;
+		$semesters_array = [];
+		foreach ($semesters as $semester) {
+			$semesters_array[] = $semester->id;
 		}
-		 $criteria=DB::table('new_criteria')
-	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
-	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
-	    	->join('courses', 'activities.course_id', '=', 'courses.id')
-	    	->join('programs', 'programs.id', '=', 'courses.program_id')
-	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
-	    	->where('criterion_objective_outcome.outcome_id','=',$this->id)
-	    	->where('programs.is_graduate','=',$is_grad)
-	    	->whereIn('courses.semester_id',$semesters_array)
-	    	->select('new_criteria.id','expected_percentage_students_achieving','activity_criterion.activity_id')
-	    	->distinct()
-	    	->get()
-			;
-		$conteo=0;
-		foreach($criteria as $criterion)
-		{
-			$students_attempted=Criterion::students_attempted($criterion->id, $criterion->activity_id);
-			if($students_attempted)
-			{
+		$criteria = DB::table('criteria')
+			->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'criteria.id')
+			->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+			->join('courses', 'activities.course_id', '=', 'courses.id')
+			->join('programs', 'programs.id', '=', 'courses.program_id')
+			->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
+			->where('criterion_objective_outcome.outcome_id', '=', $this->id)
+			->where('programs.is_graduate', '=', $is_grad)
+			->whereIn('courses.semester_id', $semesters_array)
+			->select('criteria.id', 'expected_percentage_students_achieving', 'activity_criterion.activity_id')
+			->distinct()
+			->get();
+		$conteo = 0;
+		foreach ($criteria as $criterion) {
+			$students_attempted = Criterion::students_attempted($criterion->id, $criterion->activity_id);
+			if ($students_attempted) {
 				$conteo++;
 			}
 		}
-// 		var_dump($conteo);
-// 		exit();
+		// 		var_dump($conteo);
+		// 		exit();
 		return $conteo;
 	}
 
 	public function courses_attempted($courses)
 	{
-		$courses_array=[];
-		foreach($courses as $course)
-		{
-// 		var_dump($course);
-// 		exit();
-			$courses_array[]=$course->id;
+		$courses_array = [];
+		foreach ($courses as $course) {
+			// 		var_dump($course);
+			// 		exit();
+			$courses_array[] = $course->id;
 		}
-		 $criteria=DB::table('new_criteria')
-	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
-	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
-	    	->join('courses', 'activities.course_id', '=', 'courses.id')
-	    	->join('programs', 'programs.id', '=', 'courses.program_id')
-	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
-	    	->where('criterion_objective_outcome.outcome_id','=',$this->id)
-	    	->whereIn('courses.id',$courses_array)
-	    	->select('new_criteria.id','expected_percentage_students_achieving','activity_criterion.activity_id')
-	    	->distinct()
-	    	->get()
-			;
-		$conteo=0;
-		foreach($criteria as $criterion)
-		{
-			$students_attempted=Criterion::students_attempted($criterion->id, $criterion->activity_id);
-			if($students_attempted)
-			{
+		//'expected_percentage_students_achieving'
+		$criteria = DB::table('criteria')
+			->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'criteria.id')
+			->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+			->join('courses', 'activities.course_id', '=', 'courses.id')
+			->join('programs', 'programs.id', '=', 'courses.program_id')
+			->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
+			->where('criterion_objective_outcome.outcome_id', '=', $this->id)
+			->whereIn('courses.id', $courses_array)
+			->select('criteria.id',  'activity_criterion.activity_id')
+			->distinct()
+			->get();
+		$conteo = 0;
+		foreach ($criteria as $criterion) {
+			$students_attempted = Criterion::students_attempted($criterion->id, $criterion->activity_id);
+			if ($students_attempted) {
 				$conteo++;
 			}
 		}
-// 		var_dump($conteo);
-// 		exit();
+		// 		var_dump($conteo);
+		// 		exit();
 		return $conteo;
 	}
 
 	public function courses_achieved($courses)
 	{
-		$courses_array=[];
-		foreach($courses as $course)
-		{
-			$courses_array[]=$course->id;
+		$courses_array = [];
+		foreach ($courses as $course) {
+			$courses_array[] = $course->id;
 		}
-
-		 $criteria=DB::table('new_criteria')
-	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
-	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
-	    	->join('courses', 'activities.course_id', '=', 'courses.id')
-	    	->join('programs', 'programs.id', '=', 'courses.program_id')
-	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
-	    	->where('criterion_objective_outcome.outcome_id','=',$this->id)
-	    	->whereIn('courses.id',$courses_array)
-	    	->select('new_criteria.id','expected_percentage_students_achieving','activity_criterion.activity_id')
-	    	->distinct()
-	    	->get()
-			;
+		//'expected_percentage_students_achieving',
+		$criteria = DB::table('criteria')
+			->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'criteria.id')
+			->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+			->join('courses', 'activities.course_id', '=', 'courses.id')
+			->join('programs', 'programs.id', '=', 'courses.program_id')
+			->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
+			->where('criterion_objective_outcome.outcome_id', '=', $this->id)
+			->whereIn('courses.id', $courses_array)
+			->select('criteria.id',  'activity_criterion.activity_id')
+			->distinct()
+			->get();
 
 
-		$conteo=0;
-		foreach($criteria as $criterion)
-		{
-			$students_attempted=Criterion::students_attempted($criterion->id, $criterion->activity_id);
-			$students_achieved=Criterion::students_achieved($criterion->id, $criterion->activity_id);
+		$conteo = 0;
+		foreach ($criteria as $criterion) {
+			$students_attempted = Criterion::students_attempted($criterion->id, $criterion->activity_id);
+			$students_achieved = Criterion::students_achieved($criterion->id, $criterion->activity_id);
 
-			if($students_attempted)
-			{
-				$percentage_students_who_achieved=100.0*$students_achieved/$students_attempted;
-			}
-			else
-			{
-				$percentage_students_who_achieved=0;
+			if ($students_attempted) {
+				$percentage_students_who_achieved = 100.0 * $students_achieved / $students_attempted;
+			} else {
+				$percentage_students_who_achieved = 0;
 			}
-			if($percentage_students_who_achieved>=$criterion->expected_percentage_students_achieving)
-			{
+			if ($percentage_students_who_achieved >= $criterion->expected_percentage_students_achieving) {
 				$conteo++;
 			}
 		}
@@ -237,44 +215,38 @@ class Outcome extends Eloquent
 
 	public function achieved($semesters, $is_grad)
 	{
-		$semesters_array=[];
-		foreach($semesters as $semester)
-		{
-			$semesters_array[]=$semester->id;
+		$semesters_array = [];
+		foreach ($semesters as $semester) {
+			$semesters_array[] = $semester->id;
 		}
 
-//   DB::enableQueryLog();
-		 $criteria=DB::table('new_criteria')
-	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
-	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
-	    	->join('courses', 'activities.course_id', '=', 'courses.id')
-	    	->join('programs', 'programs.id', '=', 'courses.program_id')
-	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
-	    	->where('criterion_objective_outcome.outcome_id','=',$this->id)
-	    	->where('programs.is_graduate','=',$is_grad)
-	    	->whereIn('courses.semester_id',$semesters_array)
-	    	->select('new_criteria.id','expected_percentage_students_achieving','activity_criterion.activity_id')
-	    	->distinct()
-	    	->get()
-			;
-// 		dd(DB::getQueryLog());
+		//   DB::enableQueryLog();
+		//'expected_percentage_students_achieving'
+		$criteria = DB::table('criteria')
+			->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'criteria.id')
+			->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+			->join('courses', 'activities.course_id', '=', 'courses.id')
+			->join('programs', 'programs.id', '=', 'courses.program_id')
+			->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
+			->where('criterion_objective_outcome.outcome_id', '=', $this->id)
+			->where('programs.is_graduate', '=', $is_grad)
+			->whereIn('courses.semester_id', $semesters_array)
+			->select('criteria.id',  'activity_criterion.activity_id')
+			->distinct()
+			->get();
+		// 		dd(DB::getQueryLog());
 
-		$conteo=0;
-		foreach($criteria as $criterion)
-		{
-			$students_attempted=Criterion::students_attempted($criterion->id, $criterion->activity_id);
-			$students_achieved=Criterion::students_achieved($criterion->id, $criterion->activity_id);
+		$conteo = 0;
+		foreach ($criteria as $criterion) {
+			$students_attempted = Criterion::students_attempted($criterion->id, $criterion->activity_id);
+			$students_achieved = Criterion::students_achieved($criterion->id, $criterion->activity_id);
 
-			if($students_attempted)
-			{
-				$percentage_students_who_achieved=100.0*$students_achieved/$students_attempted;
+			if ($students_attempted) {
+				$percentage_students_who_achieved = 100.0 * $students_achieved / $students_attempted;
+			} else {
+				$percentage_students_who_achieved = 0;
 			}
-			else
-			{
-				$percentage_students_who_achieved=0;
-			}
-			if($percentage_students_who_achieved>=$criterion->expected_percentage_students_achieving)
-			{
+			if ($percentage_students_who_achieved >= $criterion->expected_percentage_students_achieving) {
 				$conteo++;
 			}
 		}
@@ -282,68 +254,68 @@ class Outcome extends Eloquent
 	}
 
 
-// 	public function achieved($semester, $is_grad)
-// 	{
-//
-// //   DB::enableQueryLog();
-// 		 $criteria=DB::table('new_criteria')
-// 	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
-// 	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
-// 	    	->join('courses', 'activities.course_id', '=', 'courses.id')
-// 	    	->join('programs', 'programs.id', '=', 'courses.program_id')
-// 	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
-// 	    	->where('criterion_objective_outcome.outcome_id','=',$this->id)
-// 	    	->where('programs.is_graduate','=',$is_grad)
-// 	    	->where('courses.semester_id','=',$semester)
-// 	    	->select('new_criteria.id','expected_percentage_students_achieving','activity_criterion.activity_id')
-// 	    	->distinct()
-// 	    	->get()
-// 			;
-// // 		dd(DB::getQueryLog());
-//
-// 		$conteo=0;
-// 		foreach($criteria as $criterion)
-// 		{
-// 			$outcome_performance=DB::table('outcome_performance')
-// 				->where('outcome_performance.outcome_id','=',$this->id)
-// 				->where('outcome_performance.criterion_id','=',$criterion->id)
-// 				->where('outcome_performance.semester_id','=',$semester)
-// 				->where('outcome_performance.level','=',$is_grad)
-// 				->select('students_attempted','students_achieved')
-// 				->first();
-// 			if(!empty($outcome_performance) and $outcome_performance->students_attempted)
-// 			{
-// 				$percentage_students_who_achieved=100.0*$outcome_performance->students_achieved/$outcome_performance->students_attempted;
-// 			}
-// 			else
-// 			{
-// 				$students_attempted=Criterion::students_attempted($criterion->id, $criterion->activity_id);
-// 				$students_achieved=Criterion::students_achieved($criterion->id, $criterion->activity_id);
-//
-// 				if($students_attempted)
-// 				{
-// 					$percentage_students_who_achieved=100.0*$students_achieved/$students_attempted;
-// 					DB::table('outcome_performance')->insert(array('criterion_id'=>$criterion->id,'outcome_id'=>$this->id,'semester_id'=>$semester,
-// 					'students_attempted' => $students_attempted,'students_achieved' => $students_achieved,'level'=>$is_grad));
-// 				}
-// 				else
-// 				{
-// 					$percentage_students_who_achieved=0;
-// 				}
-// 			}
-// 			if($percentage_students_who_achieved>=$criterion->expected_percentage_students_achieving)
-// 			{
-// 				$conteo++;
-// 			}
-// 		}
-// 		return $conteo;
-// 	}
-//
+	// 	public function achieved($semester, $is_grad)
+	// 	{
+	//
+	// //   DB::enableQueryLog();
+	// 		 $criteria=DB::table('criteria')
+	// 	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'criteria.id')
+	// 	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+	// 	    	->join('courses', 'activities.course_id', '=', 'courses.id')
+	// 	    	->join('programs', 'programs.id', '=', 'courses.program_id')
+	// 	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
+	// 	    	->where('criterion_objective_outcome.outcome_id','=',$this->id)
+	// 	    	->where('programs.is_graduate','=',$is_grad)
+	// 	    	->where('courses.semester_id','=',$semester)
+	// 	    	->select('criteria.id','expected_percentage_students_achieving','activity_criterion.activity_id')
+	// 	    	->distinct()
+	// 	    	->get()
+	// 			;
+	// // 		dd(DB::getQueryLog());
+	//
+	// 		$conteo=0;
+	// 		foreach($criteria as $criterion)
+	// 		{
+	// 			$outcome_performance=DB::table('outcome_performance')
+	// 				->where('outcome_performance.outcome_id','=',$this->id)
+	// 				->where('outcome_performance.criterion_id','=',$criterion->id)
+	// 				->where('outcome_performance.semester_id','=',$semester)
+	// 				->where('outcome_performance.level','=',$is_grad)
+	// 				->select('students_attempted','students_achieved')
+	// 				->first();
+	// 			if(!empty($outcome_performance) and $outcome_performance->students_attempted)
+	// 			{
+	// 				$percentage_students_who_achieved=100.0*$outcome_performance->students_achieved/$outcome_performance->students_attempted;
+	// 			}
+	// 			else
+	// 			{
+	// 				$students_attempted=Criterion::students_attempted($criterion->id, $criterion->activity_id);
+	// 				$students_achieved=Criterion::students_achieved($criterion->id, $criterion->activity_id);
+	//
+	// 				if($students_attempted)
+	// 				{
+	// 					$percentage_students_who_achieved=100.0*$students_achieved/$students_attempted;
+	// 					DB::table('outcome_performance')->insert(array('criterion_id'=>$criterion->id,'outcome_id'=>$this->id,'semester_id'=>$semester,
+	// 					'students_attempted' => $students_attempted,'students_achieved' => $students_achieved,'level'=>$is_grad));
+	// 				}
+	// 				else
+	// 				{
+	// 					$percentage_students_who_achieved=0;
+	// 				}
+	// 			}
+	// 			if($percentage_students_who_achieved>=$criterion->expected_percentage_students_achieving)
+	// 			{
+	// 				$conteo++;
+	// 			}
+	// 		}
+	// 		return $conteo;
+	// 	}
+	//
 
 	public static function active()
-    {
-        //TODO: Check when semester doesnt exist or session is empty
-        $selected_semester = Semester::find(Session::get('semesters_ids')[0]);
-        return Outcome::withTrashed()->where('deactivation_date', '>=', $selected_semester->start)->orWhere('deactivation_date', null)->orderBy('name', 'ASC')->get();
-    }
+	{
+		//TODO: Check when semester doesnt exist or session is empty
+		$selected_semester = Semester::find(Session::get('semesters_ids')[0]);
+		return Outcome::withTrashed()->where('deactivation_date', '>=', $selected_semester->start)->orWhere('deactivation_date', null)->orderBy('name', 'ASC')->get();
+	}
 }

app/models/Program.php

@@ -45,11 +45,9 @@ class Program extends Eloquent
 	public function assessesOutcome($outcome_id)
 	{
 
-		foreach ($this->publishedActivities as $activity)
-		{
+		foreach ($this->publishedActivities as $activity) {
 			$outcomes_attempted = (array)$activity->o_att_array;
-			if(array_key_exists($outcome_id, $outcomes_attempted) && $outcomes_attempted[$outcome_id] != 0)
-			{
+			if (array_key_exists($outcome_id, $outcomes_attempted) && $outcomes_attempted[$outcome_id] != 0) {
 				return true;
 			}
 		}
@@ -70,18 +68,17 @@ class Program extends Eloquent
 	// Return learning objectives ordered by outcome
 	public function objectivesByOutcome()
 	{
-        // Objective::
+		// Objective::
 		$objectives = DB::table('outcomes')
-		->select('outcomes.id as outcome_id', 'outcomes.name as outcome_name', 'objectives.id as objective_id', 'objectives.text', 'objectives.active')
-		->leftJoin('objectives', function($join)
-		{
-			$join
-				->on('outcomes.id', '=', 'objectives.outcome_id')
-				->where('objectives.program_id', '=', $this->id);
-		})
-		->orderBy('outcome_name', 'ASC')
-		->orderBy('objectives.text', 'ASC')
-		->get();
+			->select('outcomes.id as outcome_id', 'outcomes.name as outcome_name', 'objectives.id as objective_id', 'objectives.text', 'objectives.active')
+			->leftJoin('objectives', function ($join) {
+				$join
+					->on('outcomes.id', '=', 'objectives.outcome_id')
+					->where('objectives.program_id', '=', $this->id);
+			})
+			->orderBy('outcome_name', 'ASC')
+			->orderBy('objectives.text', 'ASC')
+			->get();
 
 		return $objectives;
 	}
@@ -102,135 +99,121 @@ class Program extends Eloquent
 		return $this->hasMany('Criterion');
 	}
 
-// 	public function attempted_outcome($outcome_id, $semester)
-// 	{
-// 		$conteo= DB::table('activity_criterion')
-// 	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
-// 	    	->join('courses', 'activities.course_id', '=', 'courses.id')
-// 	    	->join('programs', 'programs.id', '=', 'courses.program_id')
-// 	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'activity_criterion.criterion_id')
-// 	    	->where('criterion_objective_outcome.outcome_id','=',$outcome_id)
-// 	    	->where('programs.id','=',$this->id)
-// 	    	->where('courses.semester_id','=',$semester)
-// 	    	->count(DB::raw('DISTINCT criterion_objective_outcome.outcome_id'))
-// 			;	    	
-// 		return $conteo;		
-// 	}
+	// 	public function attempted_outcome($outcome_id, $semester)
+	// 	{
+	// 		$conteo= DB::table('activity_criterion')
+	// 	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+	// 	    	->join('courses', 'activities.course_id', '=', 'courses.id')
+	// 	    	->join('programs', 'programs.id', '=', 'courses.program_id')
+	// 	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'activity_criterion.criterion_id')
+	// 	    	->where('criterion_objective_outcome.outcome_id','=',$outcome_id)
+	// 	    	->where('programs.id','=',$this->id)
+	// 	    	->where('courses.semester_id','=',$semester)
+	// 	    	->count(DB::raw('DISTINCT criterion_objective_outcome.outcome_id'))
+	// 			;	    	
+	// 		return $conteo;		
+	// 	}
 
 	public function attempted_criteria_by_outcome($outcome_id, $semesters)
 	{
-		$semesters_array=[];
-		foreach($semesters as $semester)
-		{
-			$semesters_array[]=$semester->id;
+		$semesters_array = [];
+		foreach ($semesters as $semester) {
+			$semesters_array[] = $semester->id;
 		}
-		
-		$conteo= DB::table('activity_criterion')
-	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
-	    	->join('courses', 'activities.course_id', '=', 'courses.id')
-	    	->join('programs', 'programs.id', '=', 'courses.program_id')
-	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'activity_criterion.criterion_id')
-	    	->where('criterion_objective_outcome.outcome_id','=',$outcome_id)
-	    	->where('programs.id','=',$this->id)
-	    	->whereIn('courses.semester_id',$semesters_array)
-	    	->count(DB::raw('DISTINCT criterion_objective_outcome.criterion_id'))
-			;	    	
-		return $conteo;		
+
+		$conteo = DB::table('activity_criterion')
+			->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+			->join('courses', 'activities.course_id', '=', 'courses.id')
+			->join('programs', 'programs.id', '=', 'courses.program_id')
+			->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'activity_criterion.criterion_id')
+			->where('criterion_objective_outcome.outcome_id', '=', $outcome_id)
+			->where('programs.id', '=', $this->id)
+			->whereIn('courses.semester_id', $semesters_array)
+			->count(DB::raw('DISTINCT criterion_objective_outcome.criterion_id'));
+		return $conteo;
 	}
 
 	public function attempted_outcome($outcome_id, $semesters)
 	{
-		$semesters_array=[];
-		foreach($semesters as $semester)
-		{
-			$semesters_array[]=$semester->id;
+		$semesters_array = [];
+		foreach ($semesters as $semester) {
+			$semesters_array[] = $semester->id;
 		}
-		
-		$conteo= DB::table('activity_criterion')
-	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
-	    	->join('courses', 'activities.course_id', '=', 'courses.id')
-	    	->join('programs', 'programs.id', '=', 'courses.program_id')
-	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'activity_criterion.criterion_id')
-	    	->where('criterion_objective_outcome.outcome_id','=',$outcome_id)
-	    	->where('programs.id','=',$this->id)
-	    	->whereIn('courses.semester_id',$semesters_array)
-	    	->count(DB::raw('DISTINCT criterion_objective_outcome.outcome_id'))
-			;	    	
-		return $conteo;		
+
+		$conteo = DB::table('activity_criterion')
+			->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+			->join('courses', 'activities.course_id', '=', 'courses.id')
+			->join('programs', 'programs.id', '=', 'courses.program_id')
+			->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'activity_criterion.criterion_id')
+			->where('criterion_objective_outcome.outcome_id', '=', $outcome_id)
+			->where('programs.id', '=', $this->id)
+			->whereIn('courses.semester_id', $semesters_array)
+			->count(DB::raw('DISTINCT criterion_objective_outcome.outcome_id'));
+		return $conteo;
 	}
-	
+
 	public function achieved_criteria_by_outcome($outcome_id, $semesters)
 	{
-		$semesters_array=[];
-		foreach($semesters as $semester)
-		{
-			$semesters_array[]=$semester->id;
+		$semesters_array = [];
+		foreach ($semesters as $semester) {
+			$semesters_array[] = $semester->id;
 		}
-		
-//   DB::enableQueryLog();
-// 		dd(DB::getQueryLog());
-		 $criteria=DB::table('new_criteria')
-	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
-	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
-	    	->join('courses', 'activities.course_id', '=', 'courses.id')
-	    	->join('programs', 'programs.id', '=', 'courses.program_id')
-	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
-	    	->where('criterion_objective_outcome.outcome_id','=',$outcome_id)
-	    	->where('programs.id','=',$this->id)
-	    	->whereIn('courses.semester_id',$semesters_array)
-	    	->select('new_criteria.id','expected_percentage_students_achieving','activity_criterion.activity_id')
-	    	->distinct()
-	    	->get()
-			;
-// 		dd(DB::getQueryLog());
-		 
-		$conteo=0;
-		$attempted_criteria_per_program_array=[];
-// 		$students_attempted=0;
-// 		$students_achieved=0;
-		foreach($criteria as $criterion)
-		{	
-			if(!isset($students_attempted[$criterion->id]))$students_attempted[$criterion->id]=0;
-			if(!isset($students_achieved[$criterion->id]))$students_achieved[$criterion->id]=0;
-			$attempted_criteria_per_program_array[$criterion->id]=1;
-			$students_attempted[$criterion->id]+=Criterion::students_attempted($criterion->id, $criterion->activity_id);
-			$students_achieved[$criterion->id]+=Criterion::students_achieved($criterion->id, $criterion->activity_id);
+
+		//   DB::enableQueryLog();
+		// 		dd(DB::getQueryLog());
+		$criteria = DB::table('criteria')
+			->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'criteria.id')
+			->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+			->join('courses', 'activities.course_id', '=', 'courses.id')
+			->join('programs', 'programs.id', '=', 'courses.program_id')
+			->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
+			->where('criterion_objective_outcome.outcome_id', '=', $outcome_id)
+			->where('programs.id', '=', $this->id)
+			->whereIn('courses.semester_id', $semesters_array)
+			->select('criteria.id', 'expected_percentage_students_achieving', 'activity_criterion.activity_id')
+			->distinct()
+			->get();
+		// 		dd(DB::getQueryLog());
+
+		$conteo = 0;
+		$attempted_criteria_per_program_array = [];
+		// 		$students_attempted=0;
+		// 		$students_achieved=0;
+		foreach ($criteria as $criterion) {
+			if (!isset($students_attempted[$criterion->id])) $students_attempted[$criterion->id] = 0;
+			if (!isset($students_achieved[$criterion->id])) $students_achieved[$criterion->id] = 0;
+			$attempted_criteria_per_program_array[$criterion->id] = 1;
+			$students_attempted[$criterion->id] += Criterion::students_attempted($criterion->id, $criterion->activity_id);
+			$students_achieved[$criterion->id] += Criterion::students_achieved($criterion->id, $criterion->activity_id);
 		}
-// 		var_dump($outcome_id);
-// 		var_dump($this->id);
-// 		if(isset($students_attempted))var_dump($students_attempted);
-// 		else{print "aqui hay algo";}
-// 		print "<br>";
-// 		if(isset($students_achieved))var_dump($students_achieved);
-// 		print "<br>";
-// 		print "<br>";
-// 			exit();
-		if(isset($students_attempted))
-		{
-			foreach($students_attempted as $criteria_id => $students_attempted_n)
-			{
-				if($students_attempted_n)
-				{
-					$percentage_students_who_achieved=100.0*$students_achieved[$criteria_id]/$students_attempted[$criteria_id];
+		// 		var_dump($outcome_id);
+		// 		var_dump($this->id);
+		// 		if(isset($students_attempted))var_dump($students_attempted);
+		// 		else{print "aqui hay algo";}
+		// 		print "<br>";
+		// 		if(isset($students_achieved))var_dump($students_achieved);
+		// 		print "<br>";
+		// 		print "<br>";
+		// 			exit();
+		if (isset($students_attempted)) {
+			foreach ($students_attempted as $criteria_id => $students_attempted_n) {
+				if ($students_attempted_n) {
+					$percentage_students_who_achieved = 100.0 * $students_achieved[$criteria_id] / $students_attempted[$criteria_id];
+				} else {
+					$percentage_students_who_achieved = 0;
 				}
-				else
-				{
-					$percentage_students_who_achieved=0;
-				}
-				if($percentage_students_who_achieved>=$criterion->expected_percentage_students_achieving)
-				{
+				if ($percentage_students_who_achieved >= $criterion->expected_percentage_students_achieving) {
 					$conteo++;
 				}
-			}		
+			}
 		}
-		$attempted_criteria_per_program=count($attempted_criteria_per_program_array);
-		$achievedProgramOutcome=0;
-		$outcome=Outcome::where('id',$outcome_id)->select('expected_outcome')->first();
-// 		var_dump($outcome->expected_outcome);
-// 		exit();
-		if($attempted_criteria_per_program!=0 && 100.0*$conteo/$attempted_criteria_per_program >= $outcome->expected_outcome)
-		{
-			$achievedProgramOutcome=1;
+		$attempted_criteria_per_program = count($attempted_criteria_per_program_array);
+		$achievedProgramOutcome = 0;
+		$outcome = Outcome::where('id', $outcome_id)->select('expected_outcome')->first();
+		// 		var_dump($outcome->expected_outcome);
+		// 		exit();
+		if ($attempted_criteria_per_program != 0 && 100.0 * $conteo / $attempted_criteria_per_program >= $outcome->expected_outcome) {
+			$achievedProgramOutcome = 1;
 			// $output[]= 'END OF PROGRAM: '.$program->name.'-'.json_encode($achievedProgramsPerOutcome);
 		}
 		return $conteo;
@@ -238,142 +221,128 @@ class Program extends Eloquent
 
 	public function achieved_outcome($outcome_id, $semesters)
 	{
-		$semesters_array=[];
-		foreach($semesters as $semester)
-		{
-			$semesters_array[]=$semester->id;
+		$semesters_array = [];
+		foreach ($semesters as $semester) {
+			$semesters_array[] = $semester->id;
 		}
-		
-//   DB::enableQueryLog();
-// 		dd(DB::getQueryLog());
-		 $criteria=DB::table('new_criteria')
-	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
-	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
-	    	->join('courses', 'activities.course_id', '=', 'courses.id')
-	    	->join('programs', 'programs.id', '=', 'courses.program_id')
-	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
-	    	->where('criterion_objective_outcome.outcome_id','=',$outcome_id)
-	    	->where('programs.id','=',$this->id)
-	    	->whereIn('courses.semester_id',$semesters_array)
-	    	->select('new_criteria.id','expected_percentage_students_achieving','activity_criterion.activity_id')
-	    	->distinct()
-	    	->get()
-			;
-// 		dd(DB::getQueryLog());
-		 
-		$conteo=0;
-		$attempted_criteria_per_program_array=[];
-// 		$students_attempted=0;
-// 		$students_achieved=0;
-		foreach($criteria as $criterion)
-		{	
-			if(!isset($students_attempted[$criterion->id]))$students_attempted[$criterion->id]=0;
-			if(!isset($students_achieved[$criterion->id]))$students_achieved[$criterion->id]=0;
-			$attempted_criteria_per_program_array[$criterion->id]=1;
-			$students_attempted[$criterion->id]+=Criterion::students_attempted($criterion->id, $criterion->activity_id);
-			$students_achieved[$criterion->id]+=Criterion::students_achieved($criterion->id, $criterion->activity_id);
+
+		//   DB::enableQueryLog();
+		// 		dd(DB::getQueryLog());
+		$criteria = DB::table('criteria')
+			->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'criteria.id')
+			->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+			->join('courses', 'activities.course_id', '=', 'courses.id')
+			->join('programs', 'programs.id', '=', 'courses.program_id')
+			->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
+			->where('criterion_objective_outcome.outcome_id', '=', $outcome_id)
+			->where('programs.id', '=', $this->id)
+			->whereIn('courses.semester_id', $semesters_array)
+			->select('criteria.id', 'expected_percentage_students_achieving', 'activity_criterion.activity_id')
+			->distinct()
+			->get();
+		// 		dd(DB::getQueryLog());
+
+		$conteo = 0;
+		$attempted_criteria_per_program_array = [];
+		// 		$students_attempted=0;
+		// 		$students_achieved=0;
+		foreach ($criteria as $criterion) {
+			if (!isset($students_attempted[$criterion->id])) $students_attempted[$criterion->id] = 0;
+			if (!isset($students_achieved[$criterion->id])) $students_achieved[$criterion->id] = 0;
+			$attempted_criteria_per_program_array[$criterion->id] = 1;
+			$students_attempted[$criterion->id] += Criterion::students_attempted($criterion->id, $criterion->activity_id);
+			$students_achieved[$criterion->id] += Criterion::students_achieved($criterion->id, $criterion->activity_id);
 		}
-// 		var_dump($outcome_id);
-// 		var_dump($this->id);
-// 		if(isset($students_attempted))var_dump($students_attempted);
-// 		else{print "aqui hay algo";}
-// 		print "<br>";
-// 		if(isset($students_achieved))var_dump($students_achieved);
-// 		print "<br>";
-// 		print "<br>";
-// 			exit();
-		if(isset($students_attempted))
-		{
-			foreach($students_attempted as $criteria_id => $students_attempted_n)
-			{
-				if($students_attempted_n)
-				{
-					$percentage_students_who_achieved=100.0*$students_achieved[$criteria_id]/$students_attempted[$criteria_id];
+		// 		var_dump($outcome_id);
+		// 		var_dump($this->id);
+		// 		if(isset($students_attempted))var_dump($students_attempted);
+		// 		else{print "aqui hay algo";}
+		// 		print "<br>";
+		// 		if(isset($students_achieved))var_dump($students_achieved);
+		// 		print "<br>";
+		// 		print "<br>";
+		// 			exit();
+		if (isset($students_attempted)) {
+			foreach ($students_attempted as $criteria_id => $students_attempted_n) {
+				if ($students_attempted_n) {
+					$percentage_students_who_achieved = 100.0 * $students_achieved[$criteria_id] / $students_attempted[$criteria_id];
+				} else {
+					$percentage_students_who_achieved = 0;
 				}
-				else
-				{
-					$percentage_students_who_achieved=0;
-				}
-				if($percentage_students_who_achieved>=$criterion->expected_percentage_students_achieving)
-				{
+				if ($percentage_students_who_achieved >= $criterion->expected_percentage_students_achieving) {
 					$conteo++;
 				}
-			}		
+			}
 		}
-		$attempted_criteria_per_program=count($attempted_criteria_per_program_array);
-		$achievedProgramOutcome=0;
-		$outcome=Outcome::where('id',$outcome_id)->select('expected_outcome')->first();
-// 		var_dump($outcome->expected_outcome);
-// 		exit();
-		if($attempted_criteria_per_program!=0 && 100.0*$conteo/$attempted_criteria_per_program >= $outcome->expected_outcome)
-		{
-			$achievedProgramOutcome=1;
+		$attempted_criteria_per_program = count($attempted_criteria_per_program_array);
+		$achievedProgramOutcome = 0;
+		$outcome = Outcome::where('id', $outcome_id)->select('expected_outcome')->first();
+		// 		var_dump($outcome->expected_outcome);
+		// 		exit();
+		if ($attempted_criteria_per_program != 0 && 100.0 * $conteo / $attempted_criteria_per_program >= $outcome->expected_outcome) {
+			$achievedProgramOutcome = 1;
 			// $output[]= 'END OF PROGRAM: '.$program->name.'-'.json_encode($achievedProgramsPerOutcome);
 		}
 		return $achievedProgramOutcome;
 	}
 
-	public static function generalComponentPrograms(){
-		return self::whereIn('id', array(123,124,125,126,127,128,129))->get();
+	public static function generalComponentPrograms()
+	{
+		return self::whereIn('id', array(123, 124, 125, 126, 127, 128, 129))->get();
 	}
 
-	public function assessmentOverview(){
+	public function assessmentOverview()
+	{
 
-        $assessment_overview = array();
+		$assessment_overview = array();
 
 		$assessment_overview['program_courses'] = $this->courses;
-        $outcomeCount = Outcome::all()->count();
-
-
-        $assessment_overview['outcomes_achieved'] = array_fill(1, $outcomeCount, 0);
-        $assessment_overview['outcomes_attempted'] = array_fill(1, $outcomeCount, 0);
-
-        $assessment_overview['assessed_courses_count'] = 0;
-        foreach ($assessment_overview['program_courses'] as $course)
-        {
-            if($course->outcomes_achieved!=NULL)
-            {
-                $course_outcomes_achieved =json_decode($course->outcomes_achieved, true);
-                $course_outcomes_attempted =json_decode($course->outcomes_attempted, true);
-                for($i=1; $i<=count($assessment_overview['outcomes_attempted']); $i++)
-                {
-                  $assessment_overview['outcomes_achieved'][$i]+=$course_outcomes_achieved[$i];
-                  $assessment_overview['outcomes_attempted'][$i]+=$course_outcomes_attempted[$i];
-                }
-                $assessment_overview['assessed_courses_count']+=1;
-            }
-        }
-
-        /**
-         * List of grouped courses (grouped sections)
-         */
-
-        $assessment_overview['grouped_courses'] = Course::
-            select(DB::raw('name, code, number, max(outcomes_attempted) as outcomes_attempted, semester_id, program_id'))
-            ->with('semester')
-            ->with('program')
-            ->where('program_id', $this->id)
-            ->whereIn('semester_id', Session::get('semesters_ids'))
-            ->groupBy(array('code', 'number', 'semester_id'))
-            ->orderBy('code')
-            ->orderBy('number')
-            ->orderBy('semester_id')
-            ->get();
-
-            Log::info(Course::
-            select(DB::raw('name, code, number, max(outcomes_attempted) as outcomes_attempted, semester_id, program_id'))
-            ->with('semester')
-            ->with('program')
-            ->where('program_id', $this->id)
-            ->whereIn('semester_id', Session::get('semesters_ids'))
-            ->groupBy(array('code', 'number', 'semester_id'))
-            ->orderBy('code')
-            ->orderBy('number')
-            ->orderBy('semester_id')
-            ->toSql());
-
-
-        return $assessment_overview;
-	}
+		$outcomeCount = Outcome::all()->count();
+
+
+		$assessment_overview['outcomes_achieved'] = array_fill(1, $outcomeCount, 0);
+		$assessment_overview['outcomes_attempted'] = array_fill(1, $outcomeCount, 0);
 
+		$assessment_overview['assessed_courses_count'] = 0;
+		foreach ($assessment_overview['program_courses'] as $course) {
+			if ($course->outcomes_achieved != NULL) {
+				$course_outcomes_achieved = json_decode($course->outcomes_achieved, true);
+				$course_outcomes_attempted = json_decode($course->outcomes_attempted, true);
+				for ($i = 1; $i <= count($assessment_overview['outcomes_attempted']); $i++) {
+					$assessment_overview['outcomes_achieved'][$i] += $course_outcomes_achieved[$i];
+					$assessment_overview['outcomes_attempted'][$i] += $course_outcomes_attempted[$i];
+				}
+				$assessment_overview['assessed_courses_count'] += 1;
+			}
+		}
+
+		/**
+		 * List of grouped courses (grouped sections)
+		 */
+
+		$assessment_overview['grouped_courses'] = Course::select(DB::raw('name, code, number, max(outcomes_attempted) as outcomes_attempted, semester_id, program_id'))
+			->with('semester')
+			->with('program')
+			->where('program_id', $this->id)
+			->whereIn('semester_id', Session::get('semesters_ids'))
+			->groupBy(array('code', 'number', 'semester_id'))
+			->orderBy('code')
+			->orderBy('number')
+			->orderBy('semester_id')
+			->get();
+
+		Log::info(Course::select(DB::raw('name, code, number, max(outcomes_attempted) as outcomes_attempted, semester_id, program_id'))
+			->with('semester')
+			->with('program')
+			->where('program_id', $this->id)
+			->whereIn('semester_id', Session::get('semesters_ids'))
+			->groupBy(array('code', 'number', 'semester_id'))
+			->orderBy('code')
+			->orderBy('number')
+			->orderBy('semester_id')
+			->toSql());
+
+
+		return $assessment_overview;
+	}
 }

app/models/Rubric.php

@@ -3,16 +3,16 @@
 class Rubric extends Eloquent
 {
 
-    /**
-     * Searchable rules.
-     *
-     * @var array
-     */
-    protected $searchable = [
-        'columns' => [
-            'name' => 10,
-        ],
-    ];
+  /**
+   * Searchable rules.
+   *
+   * @var array
+   */
+  protected $searchable = [
+    'columns' => [
+      'name' => 10,
+    ],
+  ];
 
   public function professor()
   {
@@ -21,7 +21,7 @@ class Rubric extends Eloquent
 
   public function activities()
   {
-    return $this->belongsToMany('Activity', 'new_rubric_activity');
+    return $this->belongsToMany('Activity', 'rubric_activity');
   }
 
   public function getCriterion($id, $criterion_id)
@@ -30,13 +30,10 @@ class Rubric extends Eloquent
 
     $rubric_contents = json_decode($rubric->contents);
 
-    foreach ($rubric_contents as $key => $criterion)
-    {
-      if($criterion->id == $criterion_id)
-      {
+    foreach ($rubric_contents as $key => $criterion) {
+      if ($criterion->id == $criterion_id) {
         return $criterion;
       }
     }
   }
-
 }

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

@@ -484,7 +484,7 @@
 
             function(json) {
 
-                optionName = '';
+                optionName = '<option value ="0">Nothing Selected</option>';
                 for(outcome in varArray.outcomes){
                     optionName += '<optgroup label="' + varArray.outcomes[outcome][0].name + '">';
                     var objectiveForOutcome = varArray.objectives;
@@ -551,7 +551,7 @@
             },
             function(varArray) {
                 counterOutcome =0;
-                optionName = '';
+                optionName = '<option value ="0">Nothing Selected</option>';
                 for(outcome in varArray.outcomes){
                     optionName += '<optgroup label="' + varArray.outcomes[outcome][0].name + '">';
                     var objectiveForOutcome = varArray.objectives;
@@ -756,7 +756,7 @@
 
                 assocOutcomeCounter = 0;
                 var i = 0;
-                optionName = '';
+                optionName = '<option value ="0">Nothing Selected</option>';
                 for(outcome in json.outcomes_assoc){
                     optionName += '<optgroup label="' + json.outcomes_assoc[outcome][0].name + '">';
                     var objectiveForOutcome = json.objectives_assoc;

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

@@ -476,7 +476,7 @@ $('.filterSection').hide();
 
             function(json) {
 
-                optionName = '';
+                optionName = '<option value ="0">Nothing Selected</option>';
                 for(outcome in varArray.outcomes){
                     optionName += '<optgroup label="' + varArray.outcomes[outcome][0].name + '">';
                     var objectiveForOutcome = varArray.objectives;
@@ -543,7 +543,7 @@ $('.filterSection').hide();
             },
             function(varArray) {
                 counterOutcome =0;
-                optionName = '';
+                optionName = '<option value ="0">Nothing Selected</option>';
                 for(outcome in varArray.outcomes){
                     optionName += '<optgroup label="' + varArray.outcomes[outcome][0].name + '">';
                     var objectiveForOutcome = varArray.objectives;
@@ -745,7 +745,7 @@ $('#DeleteButton').prop('disabled', true);
 
                 assocOutcomeCounter = 0;
                 var i = 0;
-                optionName = '';
+                optionName = '<option value ="0">Nothing Selected</option>';
                 for(outcome in json.outcomes_assoc){
                     optionName += '<optgroup label="' + json.outcomes_assoc[outcome][0].name + '">';
                     var objectiveForOutcome = json.objectives_assoc;

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

@@ -482,7 +482,7 @@
 
             function(json) {
 
-                optionName = '';
+                optionName = '<option value ="0">Nothing Selected</option>';
                 for(outcome in varArray.outcomes){
                     optionName += '<optgroup label="' + varArray.outcomes[outcome][0].name + '">';
                     var objectiveForOutcome = varArray.objectives;
@@ -549,7 +549,7 @@
             },
             function(varArray) {
                 counterOutcome =0;
-                optionName = '';
+                optionName = '<option value ="0">Nothing Selected</option>';
                 for(outcome in varArray.outcomes){
                     optionName += '<optgroup label="' + varArray.outcomes[outcome][0].name + '"';
                     var objectiveForOutcome = varArray.objectives;
@@ -753,7 +753,7 @@
 
                 assocOutcomeCounter = 0;
                 var i = 0;
-                optionName = '';
+                optionName = '<option value ="0">Nothing Selected</option>';
                 for(outcome in json.outcomes_assoc){
                     optionName += '<optgroup label="' + json.outcomes_assoc[outcome][0].name + '">';
                     var objectiveForOutcome = json.objectives_assoc;

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

@@ -659,7 +659,7 @@ function loadTemplate()
                 current_criterion = temp_criterion[temp_c]
                 var subcriteria ='';
                 if(current_criterion.subcriteria){
-                    var subcriteria_array = current_criterion.subcriteria;
+                    var subcriteria_array = JSON.parse(current_criterion.subcriteria);
                     subcriteria = '<ul class="subcriteria list-unstyled">';
                     subcriteria_array.forEach(function (value) {
                         subcriteria += '<li>'+value+'</li>';
@@ -1061,7 +1061,7 @@ $('.save').on('click', function(e)
             "{{ URL::to('saveTemplate') }}",
             {
                 name: $('#rubric-name').val(),
-                contents: " ",
+                
                 school_id: $('#select-school').find(':selected').data('school-id'),
                 program_id: $('#select-program').find(':selected').data('program-id'),
                 expected_percentage: $('#expected_percentage').find(':selected').val(),
@@ -1090,12 +1090,15 @@ $('.save').on('click', function(e)
             {
                 id: $('#select-template').find(':selected').data('template-id'),
                 name: $('#rubric-name').val(),
-                contents: JSON.stringify(criteriaArray),
+                
                 school_id: $('#select-school').find(':selected').data('school-id'),
                 program_id: $('#select-program').find(':selected').data('program-id'),
                 expected_percentage: $('#expected_percentage').find(':selected').val(),
                 expected_points: $('#expected_points').find(':selected').val(),
-                is_visible: $('input[name=is_visible]:checked').val()
+                is_visible: $('input[name=is_visible]:checked').val(),
+                criteria : criteria,
+                scales: scales,
+                max_score : max
             },
             function(data)
             {

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

@@ -302,7 +302,7 @@ function loadTemplate()
                 current_criterion = temp_criterion[temp_c]
                 var subcriteria ='';
                 if(current_criterion.subcriteria){
-                    var subcriteria_array = current_criterion.subcriteria;
+                    var subcriteria_array = JSON.parse(current_criterion.subcriteria);
                     subcriteria = '<ul class="subcriteria list-unstyled">';
                     subcriteria_array.forEach(function (value) {
                         subcriteria += '<li>'+value+'</li>';