SubiendoInfo

app/controllers/ActivitiesController.php

     {
         $activity = Activity::find($id);
 
+
         // If activity does not exist, display 404
         if (!$activity)
             App::abort('404');
         $course = Course::where('id', '=', $activity->course_id)->firstOrFail();
 
         // If activity does not belong to the requesting user, display 403
-        if ($course->user_id != Auth::id() and Auth::user()->role==4)
+        if ($course->user_id != Auth::id() and Auth::user()->role == 4)
             App::abort('403', 'Access Forbidden');
 
         // Get active semesters
         foreach ($active_semesters_collection as $active_semester) {
             $active_semesters[] = $active_semester->id;
         }
+        Log::info($active_semesters);
         // Added the function htmlspecialchars to activity name string because it was corrupting Jquery code while using quotes on page rendering. - Carlos R Caraballo 1/18/2019
         $title = $course->code . $course->number . '-' . $course->section . ': ' . htmlspecialchars($activity->name, ENT_QUOTES) . ' <span class="small attention">(' . $course->semester->code . ')</span>';
         $outcomes = Outcome::orderBy('name', 'asc')->get();
         $outcomes_achieved = json_decode($activity->outcomes_achieved, true);
         $outcomes_attempted = json_decode($activity->outcomes_attempted, true);
+        $tru = is_null($activity->rubric) ? "brr anuel"  : "ye ye ye";
+        Log::info($tru);
+        Log::info(count($activity->rubric));
 
         return View::make('local.professors.activity', compact('activity', 'title', 'outcomes', 'outcomes_achieved', 'outcomes_attempted', 'course', 'student_count', 'active_semesters'));
     }

app/controllers/AnnualPlansController.php

   public function viewAllPlans($program_id)
   {
     $title = "Annual Plans";
-    $annual_plans = DB::select("select * from annual_plans order by id desc");
+    $annual_plans = DB::select("select * from annual_plans  where program_id ={$program_id} order by id desc");
 
 
     return View::make('local.managers.sCoords.view-annual-plans', compact('title', 'program_id', 'annual_plans'));
     } else {
       $current_typ = DB::select("select * from three_year_plan where id ={$typ_id}")[0];
     }
-    Log::info($current_typ);
+
 
 
     $program = Program::where('id', '=', $program_id)->first();

app/controllers/CriteriaController.php

         return View::make('local.managers.sCoords.criteria', compact('title', 'outcomes', 'schools', 'criteria', 'programs', 'objectives'));
     }
 
+    public function fetchCriterionWithTemplate()
+    {
+        $json_to_send = array();
+        $json_to_send['criterion'] = DB::table('new_criteria')->where('id', '=', Input::get('id'))->first();
+
+
 
+
+        return json_encode($json_to_send);
+    }
     public function fetchCriterion()
     {
-        return Criterion::find(Input::get('id'));
+        $json_to_send = array();
+        $json_to_send['criterion'] = DB::table('new_criteria')->where('id', '=', Input::get('id'))->first();
+
+
+
+
+        return $json_to_send['criterion'];
     }
     public function fetchAllCriterion()
     {
         $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})");
+
         return json_encode($json);
     }
     public function fetchObjectivesForSelect()
     {
 
         $json = array();
-        Log::info("GET COCKEd");
+
         Log::info(Input::get('allOutcomes'));
         foreach (Input::get('allOutcomes') as $id) {
             $json['outcomes'][$id] = DB::select("select name from outcomes where id = {$id}");
 
         // se annadio la nueva variable
         return View::make('global.view-learning-outcomes-criteria', compact('title', 'outcomes', 'schools', 'criteria', 'semesters'));
-
     }
 
 

app/controllers/OutcomesController.php

         $undergradResults = array("names" => array(), "schools" => array(), "achieved" => array(), "attempted" => array(), "successRate" => array());
         $gradResults = array("names" => array(), "schools" => array(), "achieved" => array(), "attempted" => array(), "successRate" => array());
         foreach ($programs as $program_id) {
- //        	var_dump($program_id);
-//         	exit();
-        	$program = Program::where('id', '=', $program_id->id)->first();
-        	$school = School::where('id', '=', $program->school_id)->first();
-        	if($program->is_graduate)
-        	{
-        		$gradResults['names'][] = $program->name;
-        		$gradResults['schools'][] = $school->name;
-        		$attempted = $program->attempted_criteria_by_outcome($id, $selected_semesters);
-        		$gradResults['attempted'][] = $attempted;
-        		$achieved = $program->achieved_criteria_by_outcome($id, $selected_semesters);
-        		$gradResults['achieved'][] = $achieved;
-        		$gradResults['successRate'][] = sprintf("%.2f",100*$achieved/$attempted);
-
-        	}
-        	else
-        	{
-        		$undergradResults['names'][] = $program->name;
-        		$undergradResults['schools'][] = $school->name;
-        		$attempted = $program->attempted_criteria_by_outcome($id,$selected_semesters);
-        		$undergradResults['attempted'][] = $attempted;
-        		$achieved = $program->achieved_criteria_by_outcome($id,$selected_semesters);
-        		$undergradResults['achieved'][] = $achieved;
-        		$undergradResults['successRate'][] = sprintf("%.2f",100*$achieved/$attempted);
-        	}
-
+            //        	var_dump($program_id);
+            //         	exit();
+            $program = Program::where('id', '=', $program_id->id)->first();
+            $school = School::where('id', '=', $program->school_id)->first();
+            if ($program->is_graduate) {
+                $gradResults['names'][] = $program->name;
+                $gradResults['schools'][] = $school->name;
+                $attempted = $program->attempted_criteria_by_outcome($id, $selected_semesters);
+                $gradResults['attempted'][] = $attempted;
+                $achieved = $program->achieved_criteria_by_outcome($id, $selected_semesters);
+                $gradResults['achieved'][] = $achieved;
+                $gradResults['successRate'][] = sprintf("%.2f", 100 * $achieved / $attempted);
+            } else {
+                $undergradResults['names'][] = $program->name;
+                $undergradResults['schools'][] = $school->name;
+                $attempted = $program->attempted_criteria_by_outcome($id, $selected_semesters);
+                $undergradResults['attempted'][] = $attempted;
+                $achieved = $program->achieved_criteria_by_outcome($id, $selected_semesters);
+                $undergradResults['achieved'][] = $achieved;
+                $undergradResults['successRate'][] = sprintf("%.2f", 100 * $achieved / $attempted);
+            }
         }
 
-	   	$title = "Outcome Results: ".$outcome->name;
+        $title = "Outcome Results: " . $outcome->name;
 
 
-//  		$undergradResults["successRate"]
+        //  		$undergradResults["successRate"]
 
         return View::make('local.managers.admins.learning-outcome_new', compact('title', 'outcome', 'undergradResults', 'gradResults'));
     }
 
-//     public function show($id)
-//     {
-//         DB::disableQueryLog();
-//         $outcome = Outcome::find($id);
-//
-//         $undergradResults=array("names"=>array(), "schools"=>array(), "achieved"=>array(), "attempted"=>array(), "successRate"=>array());
-//         $gradResults = array("names"=>array(), "schools"=>array(), "achieved"=>array(), "attempted"=>array(), "successRate"=>array());
-//
-//         //Calculate performance for this outcome for each undergrad program
-//         $undergradPrograms = Program::where('is_graduate','=', 0)
-//             ->where(function($query)
-//             {
-//                 if(Auth::user()->school_id)
-//                 {
-//                     $query->where('school_id', Auth::user()->school_id);
-//                 }
-//             })
-//             ->with('courses')
-//             ->orderBy('name', 'asc')->get();
-//
-//         foreach($undergradPrograms as $program)
-//         {
-//             $undergradResults["names"][$program->id]=$program->name;
-//             $undergradResults["schools"][$program->id]=$program->school->name;
-//             $programAssessed=false;
-//
-//             $undergradResults["attempted"][$program->id]=0;
-//             $undergradResults["achieved"][$program->id]=0;
-//
-//             foreach($program->courses as $course)
-//             {
-//                 $course_outcomes_achieved = json_decode($course->outcomes_achieved, true);
-//                 $course_outcomes_attempted = json_decode($course->outcomes_attempted, true);
-//
-//                 $attemptedCriteriaCount=0;
-//                 $achievedCriteriaCount=0;
-//
-//                 // If this outcome was evaluated
-//                 if(
-//                     $course_outcomes_attempted
-//                     && array_key_exists($outcome->id, $course_outcomes_attempted)
-//                     && $course_outcomes_attempted[$outcome->id]!=0)
-//                 {
-//                     // Count +1 for attempted and achieved in the program
-//                     $attemptedCriteriaCount+=$course_outcomes_attempted[$outcome->id];
-//                     $achievedCriteriaCount+=$course_outcomes_achieved[$outcome->id];
-//                     $programAssessed=true;
-//
-//                     if($attemptedCriteriaCount>0  &&(float)$achievedCriteriaCount/$attemptedCriteriaCount*100 > $outcome->expected_outcome)
-//                     {
-//                         $undergradResults["achieved"][$program->id]+=1;
-//                     }
-//                     $undergradResults["attempted"][$program->id]+=1;
-//                 }
-//             }
-//
-//             // Calculate success rate for this program
-//             if($programAssessed && $undergradResults["attempted"][$program->id]>0)
-//                 $undergradResults["successRate"][$program->id]= round((float)$undergradResults["achieved"][$program->id]/$undergradResults["attempted"][$program->id]*100, 2).'%';
-//             else
-//                 $undergradResults["successRate"][$program->id]= 'N/M';
-//         }
-//
-//
-//         //Calculate performance for this outcome for each grad program
-//         $gradPrograms = Program::where('is_graduate','=', 1)
-//             ->where(function($query)
-//             {
-//                 if(Auth::user()->school_id)
-//                 {
-//                     $query->where('school_id', Auth::user()->school_id);
-//                 }
-//             })
-//             ->with(array('courses'=>function($query)
-//             {
-//                 $query->whereNotNull('outcomes_attempted');
-//             }))
-//             ->orderBy('name', 'asc')->get();
-//
-//         foreach($gradPrograms as $program)
-//         {
-//             $gradResults["names"][$program->id]=$program->name;
-//             $gradResults["schools"][$program->id]=$program->school->name;
-//
-//             $programAssessed=false;
-//
-//             $gradResults["attempted"][$program->id]=0;
-//             $gradResults["achieved"][$program->id]=0;
-//
-//             foreach($program->courses as $course)
-//             {
-//                 $course_outcomes_achieved = json_decode($course->outcomes_achieved, true);
-//                 $course_outcomes_attempted = json_decode($course->outcomes_attempted, true);
-//
-//                 $attemptedCriteriaCount=0;
-//                 $achievedCriteriaCount=0;
-//
-//                 // If this outcome was evaluated
-//                 if(
-//                     $course_outcomes_attempted
-//                     && array_key_exists($outcome->id, $course_outcomes_attempted)
-//                     && $course_outcomes_attempted[$outcome->id]!=0)
-//                 {
-//                     // Count +1 for attempted and achieved in the program
-//                     $attemptedCriteriaCount+=$course_outcomes_attempted[$outcome->id];
-//                     $achievedCriteriaCount+=$course_outcomes_achieved[$outcome->id];
-//                     $programAssessed=true;
-//
-//                     if($attemptedCriteriaCount>0  &&(float)$achievedCriteriaCount/$attemptedCriteriaCount*100 > $outcome->expected_outcome)
-//                     {
-//                         $gradResults["achieved"][$program->id]+=1;
-//                     }
-//                     $gradResults["attempted"][$program->id]+=1;
-//                 }
-//             }
-//
-//             // Calculate success rate for this program
-//             if($programAssessed && $gradResults["attempted"][$program->id]>0)
-//                 $gradResults["successRate"][$program->id]= round((float)$gradResults["achieved"][$program->id]/$gradResults["attempted"][$program->id]*100, 2).'%';
-//             else
-//                 $gradResults["successRate"][$program->id]= 'N/M';
-//         }
-//
-//         $title = "Outcome Results: ".$outcome->name;
-//
-//         return View::make('local.managers.admins.learning-outcome', compact('title', 'outcome', 'undergradResults', 'gradResults'));
-//     }
+    //     public function show($id)
+    //     {
+    //         DB::disableQueryLog();
+    //         $outcome = Outcome::find($id);
+    //
+    //         $undergradResults=array("names"=>array(), "schools"=>array(), "achieved"=>array(), "attempted"=>array(), "successRate"=>array());
+    //         $gradResults = array("names"=>array(), "schools"=>array(), "achieved"=>array(), "attempted"=>array(), "successRate"=>array());
+    //
+    //         //Calculate performance for this outcome for each undergrad program
+    //         $undergradPrograms = Program::where('is_graduate','=', 0)
+    //             ->where(function($query)
+    //             {
+    //                 if(Auth::user()->school_id)
+    //                 {
+    //                     $query->where('school_id', Auth::user()->school_id);
+    //                 }
+    //             })
+    //             ->with('courses')
+    //             ->orderBy('name', 'asc')->get();
+    //
+    //         foreach($undergradPrograms as $program)
+    //         {
+    //             $undergradResults["names"][$program->id]=$program->name;
+    //             $undergradResults["schools"][$program->id]=$program->school->name;
+    //             $programAssessed=false;
+    //
+    //             $undergradResults["attempted"][$program->id]=0;
+    //             $undergradResults["achieved"][$program->id]=0;
+    //
+    //             foreach($program->courses as $course)
+    //             {
+    //                 $course_outcomes_achieved = json_decode($course->outcomes_achieved, true);
+    //                 $course_outcomes_attempted = json_decode($course->outcomes_attempted, true);
+    //
+    //                 $attemptedCriteriaCount=0;
+    //                 $achievedCriteriaCount=0;
+    //
+    //                 // If this outcome was evaluated
+    //                 if(
+    //                     $course_outcomes_attempted
+    //                     && array_key_exists($outcome->id, $course_outcomes_attempted)
+    //                     && $course_outcomes_attempted[$outcome->id]!=0)
+    //                 {
+    //                     // Count +1 for attempted and achieved in the program
+    //                     $attemptedCriteriaCount+=$course_outcomes_attempted[$outcome->id];
+    //                     $achievedCriteriaCount+=$course_outcomes_achieved[$outcome->id];
+    //                     $programAssessed=true;
+    //
+    //                     if($attemptedCriteriaCount>0  &&(float)$achievedCriteriaCount/$attemptedCriteriaCount*100 > $outcome->expected_outcome)
+    //                     {
+    //                         $undergradResults["achieved"][$program->id]+=1;
+    //                     }
+    //                     $undergradResults["attempted"][$program->id]+=1;
+    //                 }
+    //             }
+    //
+    //             // Calculate success rate for this program
+    //             if($programAssessed && $undergradResults["attempted"][$program->id]>0)
+    //                 $undergradResults["successRate"][$program->id]= round((float)$undergradResults["achieved"][$program->id]/$undergradResults["attempted"][$program->id]*100, 2).'%';
+    //             else
+    //                 $undergradResults["successRate"][$program->id]= 'N/M';
+    //         }
+    //
+    //
+    //         //Calculate performance for this outcome for each grad program
+    //         $gradPrograms = Program::where('is_graduate','=', 1)
+    //             ->where(function($query)
+    //             {
+    //                 if(Auth::user()->school_id)
+    //                 {
+    //                     $query->where('school_id', Auth::user()->school_id);
+    //                 }
+    //             })
+    //             ->with(array('courses'=>function($query)
+    //             {
+    //                 $query->whereNotNull('outcomes_attempted');
+    //             }))
+    //             ->orderBy('name', 'asc')->get();
+    //
+    //         foreach($gradPrograms as $program)
+    //         {
+    //             $gradResults["names"][$program->id]=$program->name;
+    //             $gradResults["schools"][$program->id]=$program->school->name;
+    //
+    //             $programAssessed=false;
+    //
+    //             $gradResults["attempted"][$program->id]=0;
+    //             $gradResults["achieved"][$program->id]=0;
+    //
+    //             foreach($program->courses as $course)
+    //             {
+    //                 $course_outcomes_achieved = json_decode($course->outcomes_achieved, true);
+    //                 $course_outcomes_attempted = json_decode($course->outcomes_attempted, true);
+    //
+    //                 $attemptedCriteriaCount=0;
+    //                 $achievedCriteriaCount=0;
+    //
+    //                 // If this outcome was evaluated
+    //                 if(
+    //                     $course_outcomes_attempted
+    //                     && array_key_exists($outcome->id, $course_outcomes_attempted)
+    //                     && $course_outcomes_attempted[$outcome->id]!=0)
+    //                 {
+    //                     // Count +1 for attempted and achieved in the program
+    //                     $attemptedCriteriaCount+=$course_outcomes_attempted[$outcome->id];
+    //                     $achievedCriteriaCount+=$course_outcomes_achieved[$outcome->id];
+    //                     $programAssessed=true;
+    //
+    //                     if($attemptedCriteriaCount>0  &&(float)$achievedCriteriaCount/$attemptedCriteriaCount*100 > $outcome->expected_outcome)
+    //                     {
+    //                         $gradResults["achieved"][$program->id]+=1;
+    //                     }
+    //                     $gradResults["attempted"][$program->id]+=1;
+    //                 }
+    //             }
+    //
+    //             // Calculate success rate for this program
+    //             if($programAssessed && $gradResults["attempted"][$program->id]>0)
+    //                 $gradResults["successRate"][$program->id]= round((float)$gradResults["achieved"][$program->id]/$gradResults["attempted"][$program->id]*100, 2).'%';
+    //             else
+    //                 $gradResults["successRate"][$program->id]= 'N/M';
+    //         }
+    //
+    //         $title = "Outcome Results: ".$outcome->name;
+    //
+    //         return View::make('local.managers.admins.learning-outcome', compact('title', 'outcome', 'undergradResults', 'gradResults'));
+    //     }
 
     // TODO: Clean up and verify relationships are correct
     public function newShow($id)
         if (Input::get('filter')) {
             switch (Input::get('filter')) {
                 case 'all':
-                    return Outcome::find(Input::get('id'))->criteria;
+                    return DB::table('new_criteria')
+                        ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
+                        ->where('criterion_objective_outcome.outcome_id', '=', Input::get('id'))
+                        ->select('criterion_id as id', 'name')
+                        ->orderBy('name', 'ASC')
+                        ->get();
                     break;
 
                 case 'school':
 
                         // Fetch all the programs whose school is the user's
                         $program_ids = DB::table('programs')->where('school_id', Auth::user()->school_id)->lists('id');
-
-                        // Return all criteria belonging to any of those programs
-                        return Criterion::where('outcome_id', Input::get('id'))
-                            ->whereIn('program_id', $program_ids)
+                        $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')
+                            ->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;
                     }
 
                     // If pcoord
                         // 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 Criterion::where('outcome_id', Input::get('id'))
-                            ->whereIn('program_id', $program_ids)
+                        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')
+                            ->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();
                     }
                     break;
 
                 case 'program':
-                    return Criterion::where('outcome_id', Input::get('id'))
-                        ->whereIn('program_id', Auth::user()->programs->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')
+                        ->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;
                     break;
 
                 default:
-                    return Outcome::find(Input::get('id'))->criteria;
+                    return DB::table('new_criteria')
+                        ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
+                        ->where('criterion_objective_outcome.outcome_id', '=', Input::get('id'))
+                        ->select('criterion_id as id', 'name')
+                        ->orderBy('name', 'ASC')
+                        ->get();
                     break;
             }
         } else {
-            return Outcome::find(Input::get('id'))->criteria;
+            return DB::table('new_criteria')
+                ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
+                ->where('criterion_objective_outcome.outcome_id', '=', Input::get('id'))
+                ->select('criterion_id as id', 'name')
+                ->orderBy('name', 'ASC')
+                ->get();
         }
     }
 
 
         $outcome->criteria = array();
         foreach ($diferent_levels as $level) {
-          $level = $level->levels;
-
-          // 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('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')
-              ->get();
-          $outcome_criterias = $outcome_criterias;
-
-          foreach ($outcome_criterias as $criteria_id) {
-
-            $scales =
-              DB::select(
-                  DB::raw("
+            $level = $level->levels;
+
+            // 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('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')
+                ->get();
+            $outcome_criterias = $outcome_criterias;
+
+            foreach ($outcome_criterias as $criteria_id) {
+
+                $scales =
+                    DB::select(
+                        DB::raw("
                   SELECT *
                   FROM (
                     SELECT new_criteria.id as criterion_id,
                   WHERE rn = 1
                   ORDER BY `a`.`position` ASC
                       ")
-              );
-              // insertar la informacion de los criterios con N niveles en el arreglo de arreglos
-              $criteria_id->scales = $scales;
-              // $i++;
-            }//ends foreach criteria_id
-            array_push($outcome->criteria, array($outcome_criterias,'amount_of_levels'=>$level));
-        }//ends foreach level
-
-        return array
-        (
+                    );
+                // insertar la informacion de los criterios con N niveles en el arreglo de arreglos
+                $criteria_id->scales = $scales;
+                // $i++;
+            } //ends foreach criteria_id
+            array_push($outcome->criteria, array($outcome_criterias, 'amount_of_levels' => $level));
+        } //ends foreach level
+
+        return array(
             'outcome' => $outcome,
         );
     }

app/controllers/RubricsController.php

         if (!$activity)
             App::abort('404');
 
-        $title = 'Rubric for <em>'.$activity->name.'</em>';
+        $title = 'Rubric for <em>' . $activity->name . '</em>';
 
         // Select templates that belong to everyone or belong to the activity's course's school
-        $templates = Template::
-        where('is_visible', '=', 1)
-        ->where(function($query) use ($activity)
-        {
-            if(Auth::user()->role != 1){
-                $query
-                ->where('school_id', $activity->course->program->school->id)
-                ->orWhere('school_id', '=', NULL);
-            }
-        })
-        ->orderBy('name', 'ASC')->get();
+        $templates = Template::where('is_visible', '=', 1)
+            ->where(function ($query) use ($activity) {
+                if (Auth::user()->role != 1) {
+                    $query
+                        ->where('school_id', $activity->course->program->school->id)
+                        ->orWhere('school_id', '=', NULL);
+                }
+            })
+            ->orderBy('name', 'ASC')->get();
 
         $rubrics = Auth::user()->rubrics;
         $outcomes = Outcome::orderBy('name', 'ASC')->get();
 
         DB::beginTransaction();
 
-        try {
-            // Get rubric contents
-            $rubric_contents = json_decode(Input::get('contents'));
-
-            // 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();
-            $rubric->save();
+
+        // 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();
+        $rubric->num_scales = count($scales[0]);
+        $rubric->max_score = Input::get('max_score');
+        $division = $rubric->max_score / count($scales[0]);
+        if ($rubric->save()) {
 
             // Process activity
-//             $activity = Activity::find(Input::get('activity_id'));
-//             $activity->rubric_id = $rubric->id;
-//             $activity->save();
+            //             $activity = Activity::find(Input::get('activity_id'));
+            //             $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('new_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)
+                    ->where('criterion_id', '=', $criterion_id)->first();
+
+                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 `rubric_criteria_scale` (`rubric_criterion_id`, `scale_id`, `position`) values ({$rubric_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 assigned.');
 
             return action('ActivitiesController@show', array(Input::get('activity_id')));
-
+        } else {
             DB::rollBack();
             Session::flash('status', 'danger');
-            Session::flash('message', 'Error creating Rubric. Try again later.'.$e);
+            Session::flash('message', 'Error creating Rubric. Try again later.' . $e);
         }
     }
 
+
     /**
      * Return a specific template
      *
         // If activity does not belong to the requesting user, display 403
         if ($course->user_id != Auth::id())
             App::abort('403', 'Access Forbidden');
+        Log::info($activity->rubric[0]->id);
 
-        $rubric = Rubric::where('id', '=', $activity->rubric_id)->firstOrFail();
+        $rubric = Rubric::where('id', '=', $activity->rubric[0]->id)->firstOrFail();
         $title = $activity->name . ': ' . $rubric->name;
         return View::make('local.professors.viewrubric', compact('rubric', 'activity', 'title', 'course'));
     }

app/controllers/TemplatesController.php

 <?php
 
-class TemplatesController extends \BaseController {
+class TemplatesController extends \BaseController
+{
 
 	/**
 	 * List all templates, grouped by program
 		$global_templates = Template::whereNull('school_id')->whereNull('program_id')->get();
 
 		$schools = School::with('programs.templates')
-		->orderBy('name')
-		->get();
+			->orderBy('name')
+			->get();
 
 		$templates = Template::orderBy('name')->get();
 
-		return View::make('local.managers.admins.rubric_list', compact('title', 'global_templates','schools', 'templates'));
+		return View::make('local.managers.admins.rubric_list', compact('title', 'global_templates', 'schools', 'templates'));
 	}
 
 	public function schoolCoordinatorIndex()
 		$global_templates = Template::whereNull('school_id')->whereNull('program_id')->get();
 
 		$schools = School::with('programs.templates')
-		->orderBy('name')
-		->get();
+			->orderBy('name')
+			->get();
 
 		$templates = Template::orderBy('name')->get();
 
-		return View::make('local.managers.admins.rubric_list', compact('title', 'global_templates','schools', 'templates'));
+		return View::make('local.managers.admins.rubric_list', compact('title', 'global_templates', 'schools', 'templates'));
 	}
 
 	public function show(Template $template)
 	{
-	    $title = $template->name;
-	    return View::make('local.managers.admins.view_template', compact('template', 'title'));
+		$title = $template->name;
+		return View::make('local.managers.admins.view_template', compact('template', 'title'));
 	}
 
 	/**
 	 */
 	public function newTemplate()
 	{
-		$title= "Rubric Builder";
+		$title = "Rubric Builder";
 
 		$templates = Template::orderBy('name', 'ASC')->get();
 		$outcomes = Outcome::orderBy('name', 'ASC')->get();
 		$templates = NULL;
 		$programs = NULL;
 		// Returns templates depending on the type of user
-		if( $role == 1)
-		{
+		if ($role == 1) {
 			$templates = Template::orderBy('name', 'ASC')->get();
 			$programs = Program::orderBy('name', 'ASC')->get();
-
-		} elseif ($role == 2)
-		{
-			$templates = Template::where('school_id', '=', Auth::user()->school->id )->orWhere('school_id', '=', NULL)->orderBy('name', 'ASC')->get();
+		} elseif ($role == 2) {
+			$templates = Template::where('school_id', '=', Auth::user()->school->id)->orWhere('school_id', '=', NULL)->orderBy('name', 'ASC')->get();
 			$programs = Auth::user()->school->programs;
-		}
-		elseif ($role == 3)
-		{
+		} elseif ($role == 3) {
 			$templates = Template::where('school_id', '=', Auth::user()->programs[0]->school->id)->orWhere('school_id', '=', NULL)->orderBy('name', 'ASC')->get();
 			$programs = Auth::user()->programs()->get();
 		}
 
 		// If user can set the school (that is, if school_id is not undefined)
 		// set the school id or set to null
-		if(is_numeric(Input::get('school_id')))
-		{
-			if(Input::get('school_id')!=0)
+		if (is_numeric(Input::get('school_id'))) {
+			if (Input::get('school_id') != 0)
 				$template->school_id = Input::get('school_id');
-			elseif(Input::get('school_id')==0)
+			elseif (Input::get('school_id') == 0)
 				$template->school_id = NULL;
 		}
 
 		// If user can set the program (that is, if program_id is not undefined)
 		// set the program id or set to null
-		if(is_numeric(Input::get('program_id')))
-		{
-			if(Input::get('program_id')!=0)
+		if (is_numeric(Input::get('program_id'))) {
+			if (Input::get('program_id') != 0)
 				$template->program_id = Input::get('program_id');
-			elseif(Input::get('program_id')==0)
+			elseif (Input::get('program_id') == 0)
 				$template->program_id = NULL;
 		}
 
 				$template->program_id = Auth::user()->programs[0]->id;
 				break;
 		}
-
-		if($template->save())
-		{
+		$scales = Input::get('scales');
+		$criteria = Input::get('criteria');
+
+		$max_score = Input::get('max_score');
+		Log::info($scales);
+		Log::info($criteria);
+
+
+		$template->num_scales = count($scales[0]);
+		$template->max_score = $max_score;
+		$division = $max_score / count($scales[0]);
+		if ($template->save()) {
+			$templateId = $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();
+
+				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 created. You can now select it from the list.');
-		}
-		else
-		{
+		} else {
 			Session::flash('status', 'danger');
 			Session::flash('message', 'Rubric could not be created.');
 		}
 	 */
 	public function fetch()
 	{
-		return Template::find(Input::get('id'));
+		$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')
+			->where("template_criterion.template_id", '=', Input::get('id'))
+			->get();
+		foreach ($template_info['criterion'] as $temp_crit) {
+			$template_info['scales'][$temp_crit->id] = DB::table('scales')
+				->join('template_criterion_scale', 'template_criterion_scale.scale_id', '=', 'scales.id')
+				->where('template_criterion_scale.template_criterion_id', '=', $temp_crit->id)
+				->orderBy('position', 'ASC')
+				->get();
+		}
+		Log::info($template_info);
+
+		return json_encode($template_info);
 	}
 
 	/**
 
 		// If user can set the school (that is, if school_id is not undefined)
 		// set the school id or set to null
-		if(is_numeric(Input::get('school_id')))
-		{
-			if(Input::get('school_id')!=0)
+		if (is_numeric(Input::get('school_id'))) {
+			if (Input::get('school_id') != 0)
 				$template->school_id = Input::get('school_id');
-			elseif(Input::get('school_id')==0)
+			elseif (Input::get('school_id') == 0)
 				$template->school_id = NULL;
 		}
 
 		// If user can set the program (that is, if program_id is not undefined)
 		// set the program id or set to null
-		if(is_numeric(Input::get('program_id')))
-		{
-			if(Input::get('program_id')!=0)
+		if (is_numeric(Input::get('program_id'))) {
+			if (Input::get('program_id') != 0)
 				$template->program_id = Input::get('program_id');
-			elseif(Input::get('program_id')==0)
+			elseif (Input::get('program_id') == 0)
 				$template->program_id = NULL;
 		}
 
-		if($template->save())
-		{
+		if ($template->save()) {
 			Session::flash('status', 'success');
-			Session::flash('message', 'Rubric updated ('.date('m/d/y, h:i:s a').').');
-		}
-		else
-		{
+			Session::flash('message', 'Rubric updated (' . date('m/d/y, h:i:s a') . ').');
+		} else {
 			Session::flash('status', 'danger');
-			Session::flash('message', 'Rubric could not be updated ('.date('m/d/y, h:i:s a').').');
+			Session::flash('message', 'Rubric could not be updated (' . date('m/d/y, h:i:s a') . ').');
 		}
 	}
 
 	{
 		$template = Template::find(Input::get('id'));
 
-		if($template->delete())
-		{
+		if ($template->delete()) {
 			Session::flash('status', 'success');
 			Session::flash('message', 'Rubric deleted.');
-		}
-		else
-		{
+		} else {
 			Session::flash('status', 'danger');
 			Session::flash('message', 'Rubric could not be deleted.');
 		}
 
 			$title = $template->name;
 
-			if($template->school_id!=NULL)
-				$school= $template->school->name;
+			if ($template->school_id != NULL)
+				$school = $template->school->name;
 			else
 				$school = 'All Schools';
 
-			if($template->program_id!=NULL)
-				$program= $template->program->name;
+			if ($template->program_id != NULL)
+				$program = $template->program->name;
 			else
 				$program = 'All Programs';
 
 			return View::make('local.managers.shared.print_rubric', compact('title', 'template', 'school', 'program'));
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 			Session::flash('status', 'danger');
 			Session::flash('message', $e->getMessage());
 			return Redirect::back();
 		}
 	}
-
 }

app/controllers/ThreeYearPlanController.php

           foreach ($result_objectives as $objectives_) {
             $objective_id = $objectives_->objective_id;
             $program_id = $objectives_->program_id;
-            $result_courses = DB::table('objective_program')
-              ->join('objectives', 'objectives.id', '=', 'objective_program.objective_id')
-              ->join('courses', 'courses.program_id', '=', 'objective_program.program_id')
-              ->where('objective_program.objective_id', $objective_id)
-              ->where('objective_program.program_id', $program_id)
-              ->where('courses.semester_id', $semester_id)
-              ->distinct('courses.name', 'courses.code')
-              ->select('courses.id as course_id', 'courses.name', 'courses.code', 'objective_program.objective_id', 'objective_program.program_id')
+            $result_courses = DB::table('courses')
+              ->where('courses.program_id', '=', $program_id)
+              ->select('courses.id as course_id', 'courses.name', 'courses.code', 'courses.program_id')
               ->orderBy('courses.name', 'asc')
               ->groupBy('courses.name', 'courses.code')
               ->get();
     }
     return 'update succes?';
   }
-
   public function createAnnualPlan($program_id)
   {
     $current_typ = DB::select("select * from three_year_plan where year_start <=" . date('Y') . " and year_end >=" . date('Y'))[0];
     $count = 0;
     $yearStartPlusOne = $current_typ->year_start + 1;
     $yearStart = $current_typ->year_start;
+    Log::info($yearStart);
+    Log::info($yearStartPlusOne);
     while ($count < 3) {
 
 
 
       $secondSemester = DB::select("select * from semesters where name like 'Second Semester {$yearStart}-{$yearStartPlusOne}'");
       if (count($firstSemester) && count($secondSemester)) {
+        Log::info($firstSemester);
+        Log::info($secondSemester);
         $query = DB::select("select * from annual_plans where semester_start ={$firstSemester[0]->id} and semester_end ={$secondSemester[0]->id} and program_id = {$program_id}");
         if (!count($query)) {
-          DB::insert("insert into annual_plans (academic_year, semester_start, semester_end, program_id) values ('{$yearStart}-{$yearStartPlusOne}', {$firstSemester->id}, {$secondSemester->id}, {$program_id})");
+          DB::insert("insert into annual_plans (academic_year, semester_start, semester_end, program_id) values ('{$yearStart}-{$yearStartPlusOne}', {$firstSemester[0]->id}, {$secondSemester[0]->id}, {$program_id})");
         }
-        $count++;
-        $yearStart++;
-        $yearStartPlusOne++;
-      } else {
-        $count++;
-        $yearStart++;
-        $yearStartPlusOne++;
-        continue;
       }
+      $count++;
+      $yearStart++;
+      $yearStartPlusOne++;
     }
   }
 }

app/database/migrations/2021_05_20_134522_fix_every_table_for_rubric.php

+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Schema;
+
+class FixEveryTableForRubric extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('rubrics', function (Blueprint $table) {
+			$table->integer('num_scales')->unsigned();
+			$table->integer('max_score')->unsigned();
+		});
+		Schema::table('templates', function (Blueprint $table) {
+			$table->integer('num_scales')->unsigned();
+			$table->integer('max_score')->unsigned();
+		});
+		Schema::table('scales', function (Blueprint $table) {
+			$table->dropColumn('title');
+			$table->dropColumn('position');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('rubrics', function (Blueprint $table) {
+			$table->dropColumn('num_scales');
+			$table->dropColumn('max_score');
+		});
+		Schema::table('templates', function (Blueprint $table) {
+			$table->dropColumn('num_scales');
+			$table->dropColumn('max_score');
+		});
+		Schema::table('scales', function (Blueprint $table) {
+			$table->text('title');
+		});
+	}
+}

app/database/migrations/2021_05_20_184230_create_rubric_scales.php

+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Schema;
+
+class CreateRubricScales extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create("rubric_criteria_scale", function (Blueprint $table) {
+			$table->increments('id');
+			$table->integer('rubric_criterion_id')->unsigned();
+			$table->integer('scale_id')->unsigned();
+			$table->foreign('scale_id')
+				->references('id')
+				->on('scales')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->foreign('rubric_criterion_id')
+				->references('id')
+				->on('new_criterion_rubric')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->integer('position');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('rubric_criteria_scale');
+	}
+}

app/database/migrations/2021_05_20_212410_create_template_criterion.php

+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateTemplateCriterion extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('template_criterion', function (Blueprint $table) {
+			$table->increments('id');
+			$table->integer('template_id')->unsigned();
+			$table->integer('criterion_id')->unsigned();
+			$table->foreign('criterion_id')
+				->references('id')
+				->on('new_criteria')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->foreign('template_id')
+				->references('id')
+				->on('templates')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('template_criterion');
+	}
+}

app/database/migrations/2021_05_20_212437_create_template_criterion_son_scale.php

+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateTemplateCriterionSonScale extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('template_criterion_scale', function (Blueprint $table) {
+			$table->increments('id');
+			$table->integer('template_criterion_id')->unsigned();
+			$table->integer('scale_id')->unsigned();
+			$table->foreign('template_criterion_id')
+				->references('id')
+				->on('template_criterion')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->foreign('scale_id')
+				->references('id')
+				->on('scales')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->integer('position');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('template_criterion_scale');
+	}
+}

app/database/unusedMigrations/2021_05_14_072542_create_rubric_outcome.php

+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateRubricOutcome extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('rubric_outcome', function (Blueprint $table) {
+			$table->increments('id');
+
+			$table->integer('rubric_id')->unsigned();
+			$table->foreign('rubric_id')
+				->references('id')
+				->on('rubrics')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+
+			$table->integer('outcome_id')->unsigned();
+			$table->foreign('outcome_id')
+				->references('id')
+				->on('outcomes')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('rubric_outcome');
+	}
+}

app/routes.php

         'as' => 'fetchCriteria',
         'uses' => 'OutcomesController@fetchCriteria'
     ));
+    Route::post('fetchCriterionWithTemplate', array(
+        'as' => 'fetchCriterionWithTemplate',
+        'uses' => 'CriteriaController@fetchCriterionWithTemplate'
+    ));
 
     // Fetch a criterion for a rubric
     Route::post('fetchCriterion', array(

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

 $('.go-to-temp').on('click', function(){
   $.post(
     "{{ URL::action('ThreeYearPlanController@createAnnualPlan', array($program_id))}}");
-});
+    window.location.href = "{{URL::action('AnnualPlansController@showPlan',array($program_id))}}";
+
+  });
 
     // When list item is clicked, load corresponding info
     //section 1

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

                         <label>Associated Outcomes</label>
 
                         {{ Form::select('outcome[]', $outcomes, reset($outcomes),  ['class'=>'form-control selectpicker', 'id' =>'outcome0', 'onchange'=>'fetchObjectiveForSelect("outcome0")']) }}
-
                     </div>
                 </div>
                 <input type='hidden' name='counterOutcome' id='counterOutcome' value=1>
             'name': "outcome[]",
             'data-live-search': 'true',
             'id': 'outcome' + counter.toString(),
-            'onchange': 'fetchObjectiveForSelect("outcome' + counter.toString() + '")'
+            'onchange': 'fetchObjectiveForSelect("outcomeGroup", "objectiveGroup")'
 
         });
         var $div = $('<div/>', {
         var $button = $('<button/>', {
             'type': 'button',
             'class': 'btn btn-primary',
-            'onclick': 'deleteLast("outcomeForm' + counter.toString() + '", "' + outcomeString + (counter).toString() + '", "close' + counter.toString() + '","objective_")'
-        });
+            'onclick': 'deleteLast("outcomeForm'+counter.toString()+'", "outcomeGroup", "close' + counter.toString() + '", "objectiveGroup")'
+   });
 
         $button.append('X');
         $divForButton.append($button);
         $select.append(selectOptions);
 
         $select.appendTo('#outcomeForm' + counter.toString()).selectpicker('refresh');
-        fetchObjectiveForSelect('outcome' + counter.toString());
+        fetchObjectiveForSelect('outcomeGroup', "objectiveGroup");
         counter += 1;
         $divForButton.appendTo('#outcomeGroup');
 
 
     //Delete Outcome and OptGroup associated
 
-    function deleteLast(outcomeForm, outcomeOptGroup, closeButton, objective) {
-        $div = document.getElementById(outcomeForm);
+    function deleteLast(outcomeForm, outcomeDiv, closeButton, objectiveGroup) {
+        $div = document.getElementById(outcomeForm );
         $div.remove();
-        $div = document.getElementById(outcomeOptGroup);
+        $div = document.getElementById(closeButton);
         $div.remove();
-        $div = document.getElementById(closeButton)
-        $div.remove();
-
-        for (var i = 0; i < counterObj; i++) {
-
-
-            $('#' + objective + i.toString()).selectpicker('refresh');
-        }
+        if(outcomeDiv =='outcomeGroup'){
+        $('#' + outcomeDiv).data('value',parseInt($('#' + outcomeDiv).data('value')) - 1);
+        fetchObjectiveForSelect(outcomeDiv, objectiveGroup);}
 
     }
     //Delete Objective
         var $button = $('<button/>', {
             'type': 'button',
             'class': 'btn btn-primary',
-            'onclick': 'deleteLast("assoc_outcomeForm' + assocOutcomeCounter.toString() + '", "' + 'Associated_Outcome' + (assocOutcomeCounter).toString() + '", "assoc_close' + assocOutcomeCounter.toString() + '","assoc_objective_")'
-        });
+            'onclick': 'deleteLast("assoc_outcomeForm' + assocOutcomeCounter.toString() + '", "assocOutcomeGroup", "assoc_close' + assocOutcomeCounter.toString() + '","assoc_objectiveGroup")'
+         });
 
         $button.append('X');
         $divForButton.append($button);
     //Fetch objective at creating criteria
     counterForPost = 0;
 
-    function fetchObjectiveForSelect(outcomeInput) {
-
-
-        var id = $('#' + outcomeInput).find(':selected').val();
+    function fetchObjectiveForSelect(outcomeDiv, objectiveGroup) {
+        var count = $("#" + outcomeDiv).data('value');
+        var allOutcomes = [];
+        $("#" + outcomeDiv + ' select').each(function() {
+            allOutcomes.push( this.value);
+
+        })
+        var allObjectives = [];
+        $("#" + objectiveGroup + ' select').each(function() {
+            var temp = {
+                id: this.id,
+                value: this.value
+            }
+            allObjectives.push(temp);
+        })
 
         $.post(
             "{{ URL::action('CriteriaController@fetchObjectivesForSelect') }}", {
-                id: id
+                allOutcomes: allOutcomes
             },
             function(varArray) {
+                counterOutcome =0;
+                optionName = '';
+                for(outcome in varArray.outcomes){
+                    optionName += '<optgroup label="' + varArray.outcomes[outcome][0].name + '"';
+                    var objectiveForOutcome = varArray.objectives;
+                    var objectives = objectiveForOutcome[outcome];
+                    for (objective in varArray.objectives[outcome]) {
+                
 
-                var optionName = '<optgroup id="' + outcomeString + (counter - 1).toString() + '"label="' + varArray[0].name + '"';
-                for (var i = 0; i < varArray.length; i++) {
-                    var option = '<option value ="' + varArray[i].id.toString() + '">' + varArray[i].text + '</option>'
-                    optionName += (option)
-
-                }
-                optGroup = document.getElementById(outcomeString + (counter - 1).toString());
-                if (optGroup != null) {
-                    optGroup.remove()
-
+                        var obj= objectives[objective];
+                        var option = '<option value ="' + obj.id + '">' +obj.text + '</option>';
+                        optionName += (option);
+                    }
                 }
+                
 
+                
 
-                $('#objective_0').append(optionName);
+                $('#objective_0').html(optionName);
                 $('#objective_0').selectpicker('refresh');
+                if($("#objective_0 option[value='"+allObjectives[0].value+"']").length>0){
+                    $("#objective_0").val(allObjectives[0].value);
+                    $('#objective_0').selectpicker('refresh');
+                }
+                
 
-                for (var i = counterObj - 1; i > 0; i--) {
-                    deleteObjective('objectiveForm' + i.toString(), 'closeObj' + i.toString())
+                for (var i = allObjectives.length - 1; i > 0; i--) {
+                    deleteObjective('objectiveForm' + i.toString(), 'closeObj' + i.toString(), 'objectiveGroup');
                 }
-                counterObj = 1;
+                for(var i =1; i<allObjectives.length; i++){
+                    addObjectiveTest();
+                    $('#objective_'+i.toString()).selectpicker('refresh');
+                    if($("#objective_"+i.toString()+" option[value='"+allObjectives[i].value+"']").length>0){
+                    $("#objective_"+i.toString()).val(allObjectives[i].value);
+                    $("#objective_"+i.toString()).selectpicker("refresh");
+                }
+                }
+
+                
 
 
 
             'json'
         );
     }
-
     //after post
 
     fetchAllCriterion("select-program", "assoc_outcomes_fetch");
                 // Select associated outcome
                 try {
                     for (var i = assocOutcomeCounter - 1; i > 0; i--) {
-                        deleteLast("assoc_outcomeForm" + (i).toString(), 'Associated_Outcome' + (i).toString(), "assoc_close" + (i).toString(), "assoc_objective_");
-                    }
+                        deleteLast("assoc_outcomeForm" + i.toString() , "assocOutcomeGroup", "assoc_close" + i.toString() ,"assoc_objectiveGroup");
+                               }
                 } catch (err) {
                     var Notran = true;
                 }
 $('#outcome-display').parent().hide();
 
 fetchCriterionForEditing();
-fetchObjectiveForSelect('outcome0');
+fetchObjectiveForSelect('outcomeGroup', 'objectiveGroup');
 // setCriterionStatus();
 
 
 })
 
 $('#outcome[0]').on('change', function(){
-fetchObjectiveForSelect(0);
+
 $('.selectpicker').selectpicker('refresh');
 })
 // When list item is clicked, load corresponding info

app/views/local/managers/sCoords/annual-plans.blade.php

            var $button = $('<button/>', {
            'type': 'button',
       'class': 'btn btn-secondary',
-      'onclick': 'addObjectiveTest("forObjective-'+objectives[objective].id+"-course-"+courses[objectives[objective].id][course].id+'", "'+objectives[objective].id+"-course-"+courses[objectives[objective].id][course].id+'", '+courses[objectives[objective].id][course].typ_course_id+', null, "'+options+'")'
+      'onclick': 'addCriteriaTest("forObjective-'+objectives[objective].id+"-course-"+courses[objectives[objective].id][course].id+'", "'+objectives[objective].id+"-course-"+courses[objectives[objective].id][course].id+'", '+courses[objectives[objective].id][course].typ_course_id+', null, "'+options+'")'
   });
            
           $button.append("+ Add criteria");
 
 
           $divForTA.append($divForTASelects);
-          
-          $divForTA.append($buttonTA)
           $divForTA.append('<br>');
+          $divForTA.append($buttonTA)
+          
 
 
            table.row.add([
          
             
             for(i =0; i<json.selected_criteria[objectives[objective].id][course_id].length; i++){
-              addObjectiveTest("forObjective-"+objectives[objective].id+"-course-"+course_id, ""+objectives[objective].id+"-course-"+course_id, ""+json.selected_criteria[objectives[objective].id][course_id][i].typ_course_id+"", i, options);
+              addCriteriaTest("forObjective-"+objectives[objective].id+"-course-"+course_id, ""+objectives[objective].id+"-course-"+course_id, ""+json.selected_criteria[objectives[objective].id][course_id][i].typ_course_id+"", i, options);
               $('#criteriaFor'+objectives[objective].id+"-course-"+course_id+'_'+i).val(json.selected_criteria[objectives[objective].id][course_id][i].criteria_id);
               $('#criteriaFor'+objectives[objective].id+"-course-"+course_id+'_'+i).data('old-criteria', json.selected_criteria[objectives[objective].id][course_id][i].criteria_id);
               $('#criteriaFor'+objectives[objective].id+"-course-"+course_id+'_'+i).selectpicker('refresh');
        
           else{
            
-            addObjectiveTest("forObjective-"+objectives[objective].id+"-course-"+course_id, ""+objectives[objective].id+"-course-"+course_id+"", ""+courses[objectives[objective].id][course].typ_course_id+"", 0, options);
+            addCriteriaTest("forObjective-"+objectives[objective].id+"-course-"+course_id, ""+objectives[objective].id+"-course-"+course_id+"", ""+courses[objectives[objective].id][course].typ_course_id+"", 0, options);
             $('#criteriaFor'+objectives[objective].id+"-course-"+course_id+'_0').val(0);
               $('#criteriaFor'+objectives[objective].id+"-course-"+course_id+'_0').data('old-criteria', 0);
               $('#criteriaFor'+objectives[objective].id+"-course-"+course_id+'_0').selectpicker('refresh');
   }).html('x');
   $span.appendTo($div);
   $div.append("<br><br>");
-  $div.appendTo('#'+master_div);
+  $('#'+master_div).append("<br>");
+  
+  $div.appendTo($('#'+master_div));
   $('#'+master_div).data('amount-ta', counter+1);
 
 
 }
 
 
-function addObjectiveTest(div, new_id_for_select, typ_course_id, i=null, options) {
+function addCriteriaTest(div, new_id_for_select, typ_course_id, i=null, options) {
   
   if(!i) amount_select = $('#'+div).data("amount-select");
   else amount_select = i;
   }).html('x');
   $div.append($span);
  $div.append("<br><br>")
+ $("#forObjective-"+new_id_for_select).append("<br>");
   $div.appendTo($("#forObjective-"+new_id_for_select));
   
 

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

                     </div>
                     @endif
                 </form>
+          
+               
 
                 <label for="">Select the lower bound for passing criteria</label>
                 <form class="form-inline">
                         </select>
                         % of all students must score at least
 
+
+
+                        
                         <!-- Select points. If there is a rubric, select the saved value -->
                         <select id="expected_points" class="form-control selectpicker">
-                            @for($i = 5; $i <= 8; $i++)
+                            @for($i = 0; $i <= 8; $i++)
                                 @if($i==5)
                                     <option selected="selected" value="{{ $i }}">{{ $i }}</option>
                                 @else
                         @endforeach
                     </select>
                 </div>
+                    <div class="form-group">
+                        <label>Select the Maximum Score</label>
+                    <select id="max_score" class="form-control selectpicker">
+                        @for($i = 1; $i <= 100; $i++)
+                            @if($i==8)
+                                <option selected="selected" value="{{ $i }}">{{ $i }}</option>
+                            @else
+                                <option value="{{ $i }}">{{ $i }}</option>
+                            @endif
+                        @endfor
+                        
+                    </select>
+                    
+                </div>
+                <div class="form-group">
+                    <label>Select the Type of Rubric</label>
+                <select id="number_of_scales" class="form-control selectpicker">
+                    @for($i = 1; $i <= 20; $i++)
+                    @if(8%$i == 0)
+                    @if($i==1)
+                    <option value="{{ $i }}">Cuantitative Rubric</option>
+                    
+                        @elseif($i==4)
+                        <option selected="selected" value="{{ $i }}">{{ $i }}-Scale Rubric</option>
+                        @else
+                        <option value="{{ $i }}">{{ $i }}-Scale Rubric</option>
+                    @endif
+                    @endif
+                    @endfor
+                    
+                </select>
 
+                <div>
                 @if(Auth::user()->role != '1')
 
                     <label>Filter Criteria</label>
 
 <div id="rubric-container" class="row">
     <div class="col-md-12">
-        <table class="table table-striped table-condensed">
-            <thead><tr><th colspan="6 "><input id="rubric-name" type="text" class="form-control input-lg" placeholder="Rubric Name"></th></tr></thead>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead id="theHead"><tr><th colspan="7 "><input id="rubric-name" type="text" class="form-control input-lg" placeholder="Rubric Name"></th></tr></thead>
             <thead>
-                <tr>
+                <tr id ="criterion-header">
                     <th></th>
-                    <th>Criterion</th>
-                    <th>Beginning (1-2)</th>
-                    <th>In Progress (3-4)</th>
-                    <th>Good (5-6)</th>
-                    <th>Excellent (7-8)</th>
                     <th></th>
                 </tr>
             </thead>
-            <tbody>
+            <tbody id = "allCriteria">
             </tbody>
         </table>
 
         </div>
     </div>
 </div>
-@stop
-
-@section('included-js')
-
-<!-- jQuery Sortable Tables -->
-<script src="{{ asset('vendor/jQuerySortable/jquery-sortable-min.js') }}"></script>
-
-<!-- X-Editable js -->
-<script src="{{ asset('vendor/xeditable/bootstrap-editable.min.js') }}"></script>
-
-@stop
-
-@section('javascript')
-
-// --------------------------------------------------------------------------
-// Page load
-// --------------------------------------------------------------------------
-$('#updated-text').hide();
-
-// Enable/disable program selection depending on school selection if user is
-// admin
-if({{Auth::user()->role}}==1)
-    toggleProgramSelect($('#select-school'));
-
-// Fetch criteria of first outcome
-fetchCriteria($('#select-outcome'));
-
-// Hide table
-$('#rubric-container').hide();
-
-// Disable Update and Delete Buttons by default
-$('#button-confirm-update-rubric').prop('disabled', true);
-$('#button-confirm-delete-rubric').prop('disabled', true);
-$('#button-print-rubric').prop('disabled', true);
-
-
-// Sortable rows
-$('.table').sortable({
-    handle: 'span.glyphicon.glyphicon-move',
-    containerSelector: 'table',
-    itemPath: '> tbody',
-    itemSelector: 'tr',
-    placeholder: '<tr class="placeholder"><th><span class="glyphicon glyphicon-arrow-right"></span></th></tr>'
-});
-
-// --------------------------------------------------------------------------
+<script>
+    // --------------------------------------------------------------------------
 // Functions
 // --------------------------------------------------------------------------
 
             $('#updated-text').fadeIn('slow').fadeOut('slow');
 
             refreshSelects();
+
+
         }
     );
 }
     // Fetch information of the criterion selected
     $.post
     (
-        "{{ URL::route('fetchCriterion') }}",
+        "{{ URL::route('fetchCriterionWithTemplate') }}",
         { id: id},
         function(data)
         {
             // Append the fetched data
-            var str ='<tr data-assoc-outcome-id="'+data.outcome_id+'"'
-                +'data-criterion-id="'+data.id+'" data-criterion-copyright="'+data.copyright+'" data-criterion-notes="'+data.notes+'"><th><span class="glyphicon glyphicon-move"></span></th><td>';
+            var str ='<tr data-criterion-id="'+data.criterion.id+'" data-criterion-copyright="'+data.criterion.copyright+'" data-criterion-notes="'+data.criterion.notes+'"><th><span class="glyphicon glyphicon-move"></span></th><td>';
 
             var subcriteria = '';
-            if(data.subcriteria){
+            if(data.criterion.subcriteria){
 
-                var subcriteria_array = JSON.parse(data.subcriteria);
+                var subcriteria_array = JSON.parse(data.criterion.subcriteria);
                 subcriteria = '<ul class="subcriteria list-unstyled">';
                 subcriteria_array.forEach(function (value) {
                     subcriteria += '<li>'+value+'</li>';
 
             }
 
-            if(data.notes)
+            if(data.criterion.notes)
             {
-                str+='<span><em data-toggle="tooltip" data-placement="top" title="'+data.notes+'">'+data.name+'</em></span><sup></sup>'+subcriteria;
+                str+='<span><em data-toggle="tooltip" data-placement="top" title="'+data.criterion.notes+'">'+data.criterion.name+'</em></span><sup></sup>'+subcriteria+'</td>';
             }
             else
             {
-                str+='<span>'+data.name+'</span><sup></sup>'+subcriteria;
+                str+='<span>'+data.criterion.name+'</span><sup></sup>'+subcriteria+'</td>';
+            }
+            numberOfScale = $('#number_of_scales').find(':selected').val();
+            for(i=0; i<numberOfScale; i++){
+                str+='<td class="editable" data-type="textarea"></td>';
+          
             }
 
-            str+='</td><td class="editable" data-type="textarea">'+data.description12+'</td>'
-                +'<td class="editable" data-type="textarea">'+data.description34+'</td>'
-                +'<td class="editable" data-type="textarea">'+data.description56+'</td>'
-                +'<td class="editable" data-type="textarea">'+data.description78+'</td>'
-                +'<th><span class="glyphicon glyphicon-remove icon-btn" aria-hidden="true"></span></th></tr>';
+            str +='<th><span class="glyphicon glyphicon-remove icon-btn" aria-hidden="true"></span></th></tr>';
 
             $('table tbody').append(str);
 
                 itemSelector: 'tr',
                 placeholder: '<tr class="placeholder"><th><span class="glyphicon glyphicon-arrow-right"></span></th></tr>'
             });
-        }
+        },
+        'json',
     );
 }
 
     $('#select-criterion').selectpicker('refresh');
     $('#expected_percentage').selectpicker('refresh');
     $('#expected_points').selectpicker('refresh');
+    $('#number_of_scales').selectpicker('refresh');
 }
 
 // Fetch programs associated to a specific school
             $('tbody').empty();
 
             //Set the name of the rubric
-            $('#rubric-name').val(data.name);
+            $('#rubric-name').val(data.template.name);
 
             // Set school id to 0, then to the saved value if it exists
             $('#select-school option[data-school-id="0"]').prop('selected', true);
-            $('#select-school option[data-school-id="'+data.school_id+'"]').prop('selected', true);
+            $('#select-school option[data-school-id="'+data.template.school_id+'"]').prop('selected', true);
 
             // Fetch programs associated to that school
             fetchPrograms($('#select-school'));
 
             // Set program id to 0, then to the saved value if it exists
             $('#select-program option[data-program-id="0"]').prop('selected', true);
-            $('#select-program option[data-program-id="'+data.program_id+'"]').prop('selected', true);
+            $('#select-program option[data-program-id="'+data.template.program_id+'"]').prop('selected', true);
 
             // Set expected values
-            console.log(data.expected_percentage);
-            console.log(data.expected_points);
-            $('#expected_percentage option[value="'+data.expected_percentage+'"]').attr('selected', true);
-            $('#expected_points option[value="'+data.expected_points+'"]').attr('selected', true);
-
+            console.log(data.template.expected_percentage);
+
+            console.log(data.template.expected_points);
+            console.log(data.template.max_score);
+        
+        $('#max_score').val(data.template.max_score);
+          
+        $('#max_score').trigger("change");
+            
+            $('#expected_percentage').val(data.template.expected_percentage);
+            
+            $('#expected_points').val(data.template.expected_points);
+            $('#number_of_scales').val(data.template.num_scales);
+            refreshSelects();
+            changeTable();
             // Set visibility
-            var is_visible = JSON.parse(data.is_visible);
+            var is_visible = data.template.is_visible;
             if(is_visible)
             {
                 $('#is_visible0').prop('checked', false);
 
 
             // Set the contents of the rubric
+            var temp_criterion = data.criterion;
+            for(temp_c in temp_criterion){
+                var str = '<tr data-criterion-id="'+temp_criterion[temp_c].criterion_id+'" data-criterion-copyright="'+temp_criterion[temp_c].copyright+'" data-criterion-notes="'+temp_criterion[temp_c].notes+'"><th><span class="glyphicon glyphicon-move"></span></th><td>';
+                current_criterion = temp_criterion[temp_c]
+                var subcriteria ='';
+                if(current_criterion.subcriteria){
+                    var subcriteria_array = current_criterion.subcriteria;
+                    subcriteria = '<ul class="subcriteria list-unstyled">';
+                    subcriteria_array.forEach(function (value) {
+                        subcriteria += '<li>'+value+'</li>';
+                    });
+                    subcriteria += '</ul>';
+                }
+                if(current_criterion.notes)
+                {
+                    str+='<span><em data-toggle="tooltip" data-placement="top" title="'+current_criterion.notes+'">'+current_criterion.name+'</em></span><sup></sup>'+subcriteria;
+                }
+                else
+                {
+                    str+='<span>'+current_criterion.name+'</span><sup></sup>'+subcriteria;
+                }
+                str+= '</td>';
+                
+                for(scaleIndex in data.scales[current_criterion.id]){
+
+                    scale = data.scales[current_criterion.id][scaleIndex];
+
+                    str+='<td class="editable" data-id-value ="'+scale.scale_id+'" data-type="textarea">'+scale.description+'</td>';
+
+                }
+
+                str+='<th><span class="glyphicon glyphicon-remove" aria-hidden="true"></span></th></tr>';
+
+    $('table tbody').append(str);
+
+    buildCopyrightList();
+
+                // Enable X-Edtable on this new row
+                $('.editable').editable({
+                    unsavedclass: null,
+                    rows: 4
+                });
+
+                // Turn on tooltips again (because content is dynamic)
+                $('[data-toggle="tooltip"]').tooltip();
+
+
+                refreshSelects();
+            
+
+            
+            }
+            /*
             var contents = JSON.parse(data.contents);
             contents.forEach(function (data)
             {
                 // Append the fetched data
-                var str ='<tr data-assoc-outcome-id="'+data.outcome_id+'"'
-                    +'data-criterion-id="'+data.id+'" data-criterion-copyright="'+data.copyright+'" data-criterion-notes="'+data.notes+'"><th><span class="glyphicon glyphicon-move"></span></th><td>';
+                var str ='<tr data-criterion-id="'+data.id+'" data-criterion-copyright="'+data.copyright+'" data-criterion-notes="'+data.notes+'"><th><span class="glyphicon glyphicon-move"></span></th><td>';
 
 
                 var subcriteria = '';
 
 
                 refreshSelects();
-            });
+            }); */
 
             // Sortable rows
             $('.table').sortable({
 
             // Build Copyright List
             buildCopyrightList();
-        }
+        }, 
+        'json',
     );
 }
 
 //Enable disable program select
 function toggleProgramSelect(school)
 {
-    if(school.find(':selected').data('school-id')<1)
+    if(school.find(':selected').data('school-id') <1)
     {
         $('#select-program option[data-program-id="0"]').prop('selected', true);
         $('#select-program').prop('disabled', true);
     $(this).siblings('.panel-body').stop().slideToggle();
 });
 
+
 // When trying to change the template, ask the user to confirm and reset the
 // rubric if s/he does
 $('#select-template').on('change', function()
 
 });
 
+function changeTable(){
+    
+ 
+            amount_of_scales = parseInt($('#number_of_scales').find(':selected').val());
+            counter2 = 0;
+            maximum = parseInt($('#max_score').find(":selected").val());
+            
+           
+            newScaleHeaders = '<th></th><th>Criterion</th>';
+            counter = 0;
+            division = maximum/amount_of_scales;
+            if(amount_of_scales==1){
+                newScaleHeaders+= "<th>Score (1 - "+maximum+")</th>";
+            }
+            else if(maximum!= amount_of_scales){
+            while(counter <amount_of_scales){
+                
+                minimumScore = 1+(counter*division);
+                maximumScore = (1+counter)*division;
+                newScaleHeaders+= "<th>Scale "+ (counter +1) + " ("+minimumScore+" - "+maximumScore+")</th>";
+                counter++;
+            }
+            }else{
+                while(counter <amount_of_scales){
+                
+       
+                newScaleHeaders+= "<th>Scale "+ (counter +1) + " </th>";
+                counter++;
+            }
+            }
+            newScaleHeaders += '<th></th>';
+            
+            $("#criterion-header").html(newScaleHeaders);
+            $('#allCriteria').html(' ');
+}
+
+
 // When a school changes, update its programs. If all is selected, disable
 $('#select-school').on('change', function()
 {
     toggleProgramSelect($(this));
 });
 
+$('#max_score').on('change', function(){
+    var max = parseInt($('#max_score').find(':selected').val());
+    var stringToScales = "<option value= '1'>Cuantitative Rubric </option>";
+    selectedValue = 1;
+    valueBefore = 0;
+    
+    for(i=2; i<=20; i++){
+        if(max%i==0){
+        stringToScales += "<option value= '"+i+"'>"+i+"-Scale Rubric</option>";
+        selectedValue = i - valueBefore;
+        valueBefore = i;
+        }
+    }
+    $('#number_of_scales').html(stringToScales);
+
+    $('#number_of_scales').selectpicker('refresh');
+    $('#number_of_scales').val(selectedValue);
+    $('#number_of_scales').selectpicker('refresh');
+    var expected_points = Math.floor(max *0.7);
+    var expected_points_html = '';
+    for(i=1; i<max; i++){
+        expected_points_html += '<option value="'+i+'"> '+i+'</option>';
+    }
+    $('#expected_points').html(expected_points_html);
+    refreshSelects();
+    $('#expected_points').val(expected_points);
+    refreshSelects();
+    changeTable();
+})
+$('#number_of_scales').on('change', function(){
+    changeTable();
+})
 // When a learning outcome changes, update its criteria
 $('#select-outcome, input[name=criteria-filter]').on('change', function()
 {
     // Empty field validation
     var emptyFields=false;
 
-    $('td').each(function()
+    $('#allCriteria').children('td').each(function()
     {
         if ($(this).text() == "" || $(this).text() == "Empty")
         {
         }
     });
 
+
     // If any fields are empty, display error
     if(emptyFields || $.trim($('#rubric-name').val())=='')
     {
         $('#js-error-row').show();
-        $('#js-error-row').find('#error-message').text('Error: Please fill all the fields. Make sure your rubric has a name.');
+        $('#js-error-row').find('#error-message').text('Error: Please fill all the fields. Make sure your rubric has a name and all scale scores are filled.');
         return;
     }
     else
     var criterionObject = new Object();
     var criteriaArray = new Array();
 
+    var criteria = [];
+    scales = [];
+    scalesMaxArray =[];
+    scalesMinArray =[];
+    scales_id =[];
+
+    
+    var amount_of_scales =parseInt($('#number_of_scales').find(':selected').val())+2;
+    var max = parseInt($('#max_score').find(':selected').val());
     // For each criterion in the rubric, get its value and put it into an array
     $('tbody tr').each(function( index )
     {
-            criterionObject.id = $(this).data('criterion-id');
-            criterionObject.outcome_id = $(this).data('assoc-outcome-id');
-            criterionObject.name = $(this).children('td:nth-child(2)').find('span').text();
+            criteria.push($(this).data('criterion-id'));
+            each_criterion_scale = [];
+            for(i=2; i<amount_of_scales; i++){
+               each_criterion_scale.push($(this.children[i]).text());
 
-            var subcriteriaArray = new Array();
-            $(this).children('td:nth-child(2)').find('.subcriteria li').each(function(index){
-                subcriteriaArray.push($(this).text());
-            });
-            criterionObject.subcriteria = subcriteriaArray;
+            }
+            scales.push(each_criterion_scale);
+
+            
+            
 
-            criterionObject.description12 = $(this).children('td:nth-child(3)').text();
-            criterionObject.description34 = $(this).children('td:nth-child(4)').text();
-            criterionObject.description56 = $(this).children('td:nth-child(5)').text();
-            criterionObject.description78 = $(this).children('td:nth-child(6)').text();
-            criterionObject.copyright = $(this).data('criterion-copyright');
-            criterionObject.notes = $(this).data('criterion-notes');
+            
 
             // Clone the object and push it into the array
-            var clone = jQuery.extend({}, criterionObject);
-            criteriaArray.push(clone);
+           
 
     });
 
             "{{ URL::to('saveTemplate') }}",
             {
                 name: $('#rubric-name').val(),
-                contents: JSON.stringify(criteriaArray),
+                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(),
                 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)
             {
 
 });
 
+    </script>
+@stop
+
+@section('included-js')
+
+<!-- jQuery Sortable Tables -->
+<script src="{{ asset('vendor/jQuerySortable/jquery-sortable-min.js') }}"></script>
+
+<!-- X-Editable js -->
+<script src="{{ asset('vendor/xeditable/bootstrap-editable.min.js') }}"></script>
+
+@stop
+
+@section('javascript')
+
+// --------------------------------------------------------------------------
+// Page load
+// --------------------------------------------------------------------------
+$('#updated-text').hide();
+
+// Enable/disable program selection depending on school selection if user is
+// admin
+if({{Auth::user()->role}}==1)
+    toggleProgramSelect($('#select-school'));
+
+// Fetch criteria of first outcome
+fetchCriteria($('#select-outcome'));
+changeTable();
+
+// Hide table
+$('#rubric-container').hide();
+
+// Disable Update and Delete Buttons by default
+$('#button-confirm-update-rubric').prop('disabled', true);
+$('#button-confirm-delete-rubric').prop('disabled', true);
+$('#button-print-rubric').prop('disabled', true);
+
+
+// Sortable rows
+$('.table').sortable({
+    handle: 'span.glyphicon.glyphicon-move',
+    containerSelector: 'table',
+    itemPath: '> tbody',
+    itemSelector: 'tr',
+    placeholder: '<tr class="placeholder"><th><span class="glyphicon glyphicon-arrow-right"></span></th></tr>'
+});
+
+
 @stop

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

             @endif
 
             <!-- If no rubric is assigned and the semester is active -->
-            @if($activity->rubric == NULL && in_array($course->semester->id, $active_semesters))
+            @if(count($activity->rubric) == 0 && in_array($course->semester->id, $active_semesters))
                 {{ HTML::linkAction('RubricsController@newRubric', 'Assign Rubric', array($activity->id), array('class'=>'btn btn-primary btn-sm btn-block')) }}
                 {{ HTML::linkAction('RubricsController@newOtherMethod', 'Assign Other Assessment Method', array($activity->id), array('class'=>'btn btn-primary btn-sm btn-block')) }}
             @else
             title: {
                 text: 'Percentage'
             },
-            @if($activity->rubric!=NULL)
+            @if(isset($activity->rubric->expected_percentage)  )
             plotLines:[{
                 value:{{ $activity->rubric->expected_percentage }},
                 color: '#000',

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

           @endforeach
         </select>
       </div>
-
+      <input type='hidden' id='max' name= 'max' value="0">
+      <input type ='hidden' id='num_of_scales' name ='num_of_scales' value ='0'>
       <div class="form-group">
         <label>Expected Criteria Outcome: </label>
         <!-- Select percentage. If there is a rubric, select the saved value -->
 
     <table class="table">
       <thead><tr><th colspan="6 "><h3 id="rubric-name"></h3></th></tr></thead>
-      <thead><tr><th>Criterion</th><th>Beginning (1-2)</th><th>In Progress (3-4)</th><th>Good (5-6)</th><th>Excellent (7-8)</th></tr></thead>
+      <thead><tr id ="criterion-header"><th>Criterion</th><th>Beginning (1-2)</th><th>In Progress (3-4)</th><th>Good (5-6)</th><th>Excellent (7-8)</th></tr></thead>
       <tbody>
 
       </tbody>
     </div>
   </div>
 </div>
+
+<script>
+  
+function changeTable(){
+    
+ 
+            amount_of_scales = parseInt($('#num_of_scales').val());
+            counter2 = 0;
+            maximum = parseInt($('#max').val());
+            
+           
+            newScaleHeaders = '<th>Criterion</th>';
+            counter = 0;
+            division = maximum/amount_of_scales;
+            if(amount_of_scales==1){
+                newScaleHeaders+= "<th>Score (1 - "+maximum+")</th>";
+            }
+            else if(maximum!= amount_of_scales){
+            while(counter <amount_of_scales){
+                
+                minimumScore = 1+(counter*division);
+                maximumScore = (1+counter)*division;
+                newScaleHeaders+= "<th>Scale "+ (counter +1) + " ("+minimumScore+" - "+maximumScore+")</th>";
+                counter++;
+            }
+            }else{
+                while(counter <amount_of_scales){
+                
+       
+                newScaleHeaders+= "<th>Scale "+ (counter +1) + " </th>";
+                counter++;
+            }
+            }
+            newScaleHeaders += '';
+            
+            $("#criterion-header").html(newScaleHeaders);
+            
+}
+
+  </script>
 @stop
 
 @section('javascript')
 }
 
 // Load a template
+
 function loadTemplate()
 {
-  $.post
-  (
-    "{{ URL::to('loadTemplate') }}",
-    { id: $('#select-template').find(':selected').data('template-id')},
-    function(data)
-    {
-      //alert(JSON.stringify(data));
+    $.post
+    (
+        "{{ URL::to('loadTemplate') }}",
+        { id: $('#select-template').find(':selected').data('template-id')},
+        function(data)
+        {
+            // Show the container and empty all rows
+            $('#rubric-container').show();
+            $('tbody').empty();
+
+            //Set the name of the rubric
+            $('#rubric-name').val(data.template.name);
+
+            $('#expected_percentage').text(data.template.expected_percentage);
+            $('#expected_points').text(data.template.expected_points)
+            $('#max').val(data.template.max_score);
+            $('#num_of_scales').val(data.template.num_scales);
+            changeTable();
+
+
+            // Set the contents of the rubric
+            var temp_criterion = data.criterion;
+            for(temp_c in temp_criterion){
+                var str = '<tr data-criterion-id="'+temp_criterion[temp_c].criterion_id+'" data-criterion-copyright="'+temp_criterion[temp_c].copyright+'" data-criterion-notes="'+temp_criterion[temp_c].notes+'">';
+                current_criterion = temp_criterion[temp_c]
+                var subcriteria ='';
+                if(current_criterion.subcriteria){
+                    var subcriteria_array = current_criterion.subcriteria;
+                    subcriteria = '<ul class="subcriteria list-unstyled">';
+                    subcriteria_array.forEach(function (value) {
+                        subcriteria += '<li>'+value+'</li>';
+                    });
+                    subcriteria += '</ul>';
+                }
+                if(current_criterion.notes)
+                {
+                    str+='<td><span><em data-toggle="tooltip" data-placement="top" title="'+current_criterion.notes+'">'+current_criterion.name+'</em></span><sup></sup>'+subcriteria+'</td>';
+                }
+                else
+                {
+                    str+='<td><span>'+current_criterion.name+'</span><sup></sup>'+subcriteria+'</td>';
+                }
+                
+                
+                for(scaleIndex in data.scales[current_criterion.id]){
+
+                    scale = data.scales[current_criterion.id][scaleIndex];
+
+                    str+='<td data-scale-id ="'+scale.id+'">'+scale.description+'</td>';
+
+                }
+
+                str+='</tr>';
+
+    $('table tbody').append(str);
+
+    buildCopyrightList();
+
+                
+
+                // Turn on tooltips again (because content is dynamic)
+                $('[data-toggle="tooltip"]').tooltip();
+
+
+                
+            
+
+            
+            }
+            /*
+            var contents = JSON.parse(data.contents);
+            contents.forEach(function (data)
+            {
+                // Append the fetched data
+                var str ='<tr data-criterion-id="'+data.id+'" data-criterion-copyright="'+data.copyright+'" data-criterion-notes="'+data.notes+'"><th><span class="glyphicon glyphicon-move"></span></th><td>';
+
+
+                var subcriteria = '';
+                if(data.subcriteria){
+
+                    var subcriteria_array = data.subcriteria;
+                    subcriteria = '<ul class="subcriteria list-unstyled">';
+                    subcriteria_array.forEach(function (value) {
+                        subcriteria += '<li>'+value+'</li>';
+                    });
+                    subcriteria += '</ul>';
+
+                }
+
+                if(data.notes)
+                {
+                    str+='<span><em data-toggle="tooltip" data-placement="top" title="'+data.notes+'">'+data.name+'</em></span><sup></sup>'+subcriteria;
+                }
+                else
+                {
+                    str+='<span>'+data.name+'</span><sup></sup>'+subcriteria;
+                }
+
+                str+='</td><td class="editable" data-type="textarea">'+data.description12+'</td>'
+                    +'<td class="editable" data-type="textarea">'+data.description34+'</td>'
+                    +'<td class="editable" data-type="textarea">'+data.description56+'</td>'
+                    +'<td class="editable" data-type="textarea">'+data.description78+'</td>'
+                    +'<th><span class="glyphicon glyphicon-remove" aria-hidden="true"></span></th></tr>';
+
+                $('table tbody').append(str);
+
+                // Build copyright list
+                buildCopyrightList();
+
+                // Enable X-Edtable on this new row
+                $('.editable').editable({
+                    unsavedclass: null,
+                    rows: 4
+                });
+
+                // Turn on tooltips again (because content is dynamic)
+                $('[data-toggle="tooltip"]').tooltip();
 
-      // Show the container and empty all rows
-      $('#rubric-container').show();
-      $('tbody').empty();
 
-      //Set the name of the rubric
-      $('#rubric-name').val(data.name);
+               
+            }); */
+
+          
+
+            // Build Copyright List
+            buildCopyrightList();
+        }, 
+        'json',
+    );
+}
 
+
+/*
       console.log($('#expected_percentage').text());
       console.log($('#expected_points').text());
 
     }
   );
 }
-
+*/
 // --------------------------------------------------------------------------
 // Events
 // --------------------------------------------------------------------------
   //Prevent page refresh
   e.preventDefault();
 
-  var criterionObject = new Object();
-  var criteriaArray = new Array();
+  var criteria = [];
+  scales = [];
+  max_score = $('#max').val();
 
   // For each criterion in the rubric, get its value and put it into an array
   $('tbody tr').each(function( index )
   {
+
+    criteria.push($(this).data('criterion-id'));
+    each_criterion_scale =[];
+    $(this).children('td').each(function(index){
+      if(index!=0)
+      each_criterion_scale.push($(this).text());
+    })
+    scales.push(each_criterion_scale);
+    /*
       criterionObject.id = $(this).data('criterion-id');
       criterionObject.outcome_id = $(this).data('assoc-outcome-id');
       criterionObject.name = $(this).children('td:nth-child(1)').find('span').text();
       // Clone the object and push it into the array
       var clone = jQuery.extend({}, criterionObject);
       criteriaArray.push(clone);
-
+*/
   });
 
   // If activity does not have a rubric, create it
       {
         name: $('#select-template').find(':selected').text(),
         activity_id: parseInt($('#activity_id').val()),
-        contents: JSON.stringify(criteriaArray),
+        contents: " ",
         expected_percentage: $('#expected_percentage').text(),
-        expected_points: $('#expected_points').text()
+        expected_points: $('#expected_points').text(),
+        criteria: criteria,
+        scales: scales,
+        max_score:max_score
+
 
       },
       function(data)

script.php

+<?php
+
+
+$servername = "127.0.0.1";
+$username = "root";
+$password = "";
+$database = "trabajoolas5";
+
+// Create connection
+$conn = mysqli_connect($servername, $username, $password, $database);
+
+// Check connection
+if (!$conn) {
+    die("Connection failed: " . mysqli_connect_error());
+}
+echo "Connected successfully\n";
+
+$allrubrics = mysqli_query($conn, 'select id, contents from `rubrics`');
+
+while ($row = mysqli_fetch_array($allrubrics)) {
+
+    foreach (json_decode($row['contents']) as $criterion) {
+
+        $outcome_id = $criterion->outcome_id;
+        $querySelect = "select * from rubric_outcome where rubric_id ={$row['id']} and outcome_id = {$outcome_id}";
+        $makeQuery = mysqli_query($conn, $querySelect);
+        if (!mysqli_num_rows($makeQuery)) {
+
+            $query2 = "insert into `rubric_outcome` (`rubric_id`, `outcome_id`) values ({$row['id']}, {$outcome_id});";
+            $makeQuery = mysqli_query($conn, $query2);
+            if (!$makeQuery) {
+                die("Connection failed: " . mysqli_error($conn) . $query2);
+            }
+        }
+
+
+
+        $criteria_id = $criterion->id;
+        $querySelect = "select * from rubric_criterion where rubric_id ={$row['id']} and criterion_id = {$criteria_id}";
+        $makeQuery = mysqli_query($conn, $querySelect);
+        if (!mysqli_num_rows($makeQuery)) {
+            $query2 = "insert into `rubric_criterion` (`rubric_id`, `criterion_id`) values ({$row['id']}, {$criteria_id});";
+            $makeQuery = mysqli_query($conn, $query2);
+            if (!$makeQuery) {
+                echo "Connection failed: " . mysqli_error($conn) . $query2;
+            }
+        }
+    }
+}

script_template_fix.php

+<?php
+
+
+$servername = "127.0.0.1";
+$username = "root";
+$password = "";
+$database = "trabajoolas5";
+
+// Create connection
+$conn = mysqli_connect($servername, $username, $password, $database);
+
+// Check connection
+if (!$conn) {
+    die("Connection failed: " . mysqli_connect_error());
+}
+echo "Connected successfully\n";
+
+$allrubrics = mysqli_query($conn, 'select id, num_scales, max_score from `rubrics`');
+
+while ($row = mysqli_fetch_array($allrubrics)) {
+
+if($row['num_scales']==0 && $row['max_score']==0){
+    $query = "update rubrics set num_scales = 4, max_score =8 where id ={$row['id']} ";
+    $makeQuery = mysqli_query($conn, $query);
+    if(!$query){
+        die("Connection failed: " . mysqli_error($conn) . $query1);
+    }
+
+}
+
+}
+
+$allrubrics = mysqli_query($conn, 'select id, num_scales, max_score from `templates`');
+
+while ($row = mysqli_fetch_array($allrubrics)) {
+
+if($row['num_scales']==0 && $row['max_score']==0){
+    $query = "update templates set num_scales = 4, max_score =8 where id ={$row['id']} ";
+    $makeQuery = mysqli_query($conn, $query);
+    if(!$query){
+        die("Connection failed: " . mysqli_error($conn) . $query1);
+    }
+
+}
+
+}

script_template_scales.php

+<?php
+
+
+$servername = "127.0.0.1";
+$username = "root";
+$password = "";
+$database = "trabajoolas5";
+
+// Create connection
+$conn = mysqli_connect($servername, $username, $password, $database);
+
+// Check connection
+if (!$conn) {
+    die("Connection failed: " . mysqli_connect_error());
+}
+echo "Connected successfully\n";
+
+$allrubrics = mysqli_query($conn, 'select id, contents from `templates`');
+
+while ($row = mysqli_fetch_array($allrubrics)) {
+
+    foreach (json_decode($row['contents']) as $criterion) {
+
+        $criterion_id = $criterion->id;
+        $querySelect = "select * from template_criterion where template_id ={$row['id']} and criterion_id = {$criterion_id}";
+        $makeQuery = mysqli_query($conn, $querySelect);
+        if (!mysqli_num_rows($makeQuery)) {
+
+            $query2 = "insert into `template_criterion` (`template_id`, `criterion_id`) values ({$row['id']}, {$criterion_id});";
+            $makeQuery = mysqli_query($conn, $query2);
+            if (!$makeQuery) {
+                echo "Connection failed: " . mysqli_error($conn) . $query2;
+            }
+        }
+    }
+}

script_template_scales_to_scales.php

+<?php
+
+
+$servername = "127.0.0.1";
+$username = "root";
+$password = "";
+$database = "trabajoolas5";
+
+// Create connection
+$conn = mysqli_connect($servername, $username, $password, $database);
+
+// Check connection
+if (!$conn) {
+    die("Connection failed: " . mysqli_connect_error());
+}
+echo "Connected successfully\n";
+
+$allrubrics = mysqli_query($conn, 'select id, contents from `templates`');
+
+while ($row = mysqli_fetch_array($allrubrics)) {
+
+    foreach (json_decode($row['contents']) as $criterion) {
+
+        $criterion_id = $criterion->id;
+        $querySelect = "select * from template_criterion where template_id ={$row['id']} and criterion_id = {$criterion_id}";
+        $makeQuery = mysqli_query($conn, $querySelect);
+        if (mysqli_num_rows($makeQuery)) {
+
+            $row2 = mysqli_fetch_array($makeQuery);
+            $template_criterion_id = $row2['id'];
+            $description12 = mysqli_escape_string($conn, $criterion->description12);
+            $queryForScale = "insert into scales (`description`, `min_score`, `max_score`) values ('{$description12}', 1, 2)";
+            $makeQueryForScale = mysqli_query($conn, $queryForScale);
+            if ($makeQueryForScale) {
+                $toFindScale = "select * from scales order by id DESC";
+                $findScale = mysqli_query($conn, $toFindScale);
+                if (mysqli_num_rows($findScale)) {
+                    $scale = mysqli_fetch_array($findScale);
+                    $queryToInsert = "insert into `template_criterion_scale` (`template_criterion_id`,`scale_id`, `position`) values ({$template_criterion_id}, {$scale['id']}, 0)";
+                    $insertIntoTemplate = mysqli_query($conn, $queryToInsert);
+                    if (!$insertIntoTemplate) {
+                        echo "Scales problem: " . mysqli_error($conn) . $queryToInsert;
+                        die;
+                    }
+                }
+            } else {
+                echo "Couldnt insert scale: " . mysqli_error($conn) . $queryForScale;
+                die;
+            }
+            $description34 = mysqli_escape_string($conn, $criterion->description34);
+            $queryForScale = "insert into scales (`description`, `min_score`, `max_score`) values ('{$description34}', 3, 4)";
+            $makeQueryForScale = mysqli_query($conn, $queryForScale);
+            if ($makeQueryForScale) {
+                $toFindScale = "select * from scales order by id DESC";
+                $findScale = mysqli_query($conn, $toFindScale);
+                if (mysqli_num_rows($findScale)) {
+                    $scale = mysqli_fetch_array($findScale);
+                    $queryToInsert = "insert into `template_criterion_scale` (`template_criterion_id`,`scale_id`, `position`) values ({$template_criterion_id}, {$scale['id']}, 1)";
+                    $insertIntoTemplate = mysqli_query($conn, $queryToInsert);
+                    if (!$insertIntoTemplate) {
+                        echo "Scales problem: " . mysqli_error($conn) . $queryToInsert;
+                        die;
+                    }
+                }
+            } else {
+                echo "Couldnt insert scale: " . mysqli_error($conn) . $queryForScale;
+                die;
+            }
+            $description56 = mysqli_escape_string($conn, $criterion->description56);
+            $queryForScale = "insert into scales (`description`, `min_score`, `max_score`) values ('{$description56}', 5, 6)";
+            $makeQueryForScale = mysqli_query($conn, $queryForScale);
+            if ($makeQueryForScale) {
+                $toFindScale = "select * from scales order by id DESC";
+                $findScale = mysqli_query($conn, $toFindScale);
+                if (mysqli_num_rows($findScale)) {
+                    $scale = mysqli_fetch_array($findScale);
+                    $queryToInsert = "insert into `template_criterion_scale` (`template_criterion_id`,`scale_id`, `position`) values ({$template_criterion_id}, {$scale['id']}, 2)";
+                    $insertIntoTemplate = mysqli_query($conn, $queryToInsert);
+                    if (!$insertIntoTemplate) {
+                        echo "Scales problem: " . mysqli_error($conn) . $queryToInsert;
+                        die;
+                    }
+                }
+            } else {
+                echo "Couldnt insert scale: " . mysqli_error($conn) . $queryForScale;
+                die;
+            }
+            $description78 = mysqli_escape_string($conn, $criterion->description78);
+            $queryForScale = "insert into scales (`description`, `min_score`, `max_score`) values ('{$description78}', 7, 8)";
+            $makeQueryForScale = mysqli_query($conn, $queryForScale);
+            if ($makeQueryForScale) {
+                $toFindScale = "select * from scales order by id DESC";
+                $findScale = mysqli_query($conn, $toFindScale);
+                if (mysqli_num_rows($findScale)) {
+                    $scale = mysqli_fetch_array($findScale);
+                    $queryToInsert = "insert into `template_criterion_scale` (`template_criterion_id`,`scale_id`, `position`) values ({$template_criterion_id}, {$scale['id']}, 3)";
+                    $insertIntoTemplate = mysqli_query($conn, $queryToInsert);
+                    if (!$insertIntoTemplate) {
+                        echo "Scales problem: " . mysqli_error($conn) . $queryToInsert;
+                        die;
+                    }
+                }
+            } else {
+                echo "Couldnt insert scale: " . mysqli_error($conn) . $queryForScale;
+                die;
+            }
+        } else {
+            echo "no creo que hay problema no?";
+        }
+    }
+}