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

app/controllers/ActivitiesController.php

@@ -131,17 +131,41 @@ class ActivitiesController extends \BaseController
         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));
+        $assessment = DB::table('assessments')
+            ->join('activity_criterion', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
+            ->join('activities', 'activities.id', '=', 'activity_criterion.activity_id')
+            ->where('activity_id', $activity->id)
+            ->get();
+        if ($assessment) {
+            $outcomes_achieved = $activity->o_ach_array;
+            $outcomes_attempted = $activity->o_att_array;
+        } else {
+            $outcomes_achieved = [];
+            $outcomes_attempted = [];
+        }
+
+        Log::info($outcomes_achieved);
+        Log::info($outcomes_achieved);
+
+        $activity_criterion = DB::table('criteria')
+            ->join('activity_criterion', 'criteria.id', '=', 'activity_criterion.criterion_id')
+            ->where('activity_id', $activity->id)
+            ->select('activity_criterion.id', 'activity_criterion.criterion_id')
+            ->addSelect('criteria.name')
+            ->get();
+
 
-        return View::make('local.professors.activity', compact('activity', 'title', 'outcomes', 'outcomes_achieved', 'outcomes_attempted', 'course', 'student_count', 'active_semesters'));
+        $transformative_actions = DB::table('transformative_activity_criterion')
+            ->join('activity_criterion', 'transformative_activity_criterion.activity_criterion_id', '=', 'activity_criterion.id')
+            ->join('transformative_actions', 'transformative_activity_criterion.trans_action_id', '=', 'transformative_actions.id')
+            ->where('activity_criterion.activity_id', $id)
+            ->get();
+        return View::make('local.professors.activity', compact('activity', 'transformative_actions', 'activity_criterion', 'title', 'outcomes', 'outcomes_achieved', 'outcomes_attempted', 'course', 'student_count', 'active_semesters'));
     }
 
 
@@ -165,6 +189,10 @@ class ActivitiesController extends \BaseController
 
         // Get rubric contents
         $rubric = Rubric::find($activity->rubric[0]->id);
+        $rubric->titles = DB::table('titles')
+            ->join('rubric_title', 'rubric_title.title_id', '=', 'titles.id')
+            ->where('rubric_title.rubric_id', '=', $rubric->id)
+            ->lists('text');
         Log::info($rubric);
         Log::info($activity);
         $rubric_criterion = DB::table('criteria')
@@ -175,12 +203,12 @@ class ActivitiesController extends \BaseController
             ->select('criteria.name', 'criteria.id as criterion_id', 'criteria.subcriteria')
             ->addSelect('activity_criterion.activity_id', 'activity_criterion.weight', 'activity_criterion.id as activity_criterion_id')
             ->addSelect('rubric_criterion.rubric_id', 'rubric_criterion.id as rubric_criterion_id')
-            ->addSelect('rubric_criterion.copyright', 'rubric_criterion.notes')
             ->get();
         Log::info($rubric_criterion);
         foreach ($rubric_criterion as $index => $singleCR) {
-            $singleCR->scales = json_encode(DB::table('scales')->join('rubric_criteria_scale', 'rubric_criteria_scale.scale_id', '=', 'scales.id')
-                ->where('rubric_criteria_scale.rubric_criterion_id', '=', $singleCR->rubric_criterion_id)
+            $singleCR->scales = json_encode(DB::table('scales')
+                ->join('criterion_scale', 'criterion_scale.scale_id', '=', 'scales.id')
+                ->where('criterion_scale.criterion_id', '=', $singleCR->criterion_id)
                 ->orderBy('position')
                 ->lists('description'));
         }
@@ -271,6 +299,7 @@ class ActivitiesController extends \BaseController
                     // Activity
                     $activity = Activity::find(Input::get('activity_id'));
 
+
                     // Create or update student scores
                     if ($activity->outcomes_attempted == NULL) {
                         // For each student, save her/his assessment in the db
@@ -742,21 +771,56 @@ class ActivitiesController extends \BaseController
         $students = $course->students;
 
         // Get rubric contents
-        $rubric_contents = Rubric::select('contents')->where('id', '=', $activity->rubric_id)->get();
-        $rubric_contents = json_decode($rubric_contents['0']->contents);
-
         $rubric = Rubric::find($activity->rubric[0]->id);
 
-        // Get results
-        $assessments = DB::table('assessments')->where('activity_id', '=', $activity->id)->orderBy('id', 'asc')->get();
+        $rubric->titles = DB::table('titles')
+            ->join('rubric_title', 'rubric_title.title_id', '=', 'titles.id')
+            ->where('rubric_id', $rubric->id)
+            ->get();
+
+        //$rubric_contents = Rubric::select('contents')->where('id', '=', $activity->rubric_id)->get();
+        //$rubric_contents = json_decode($rubric_contents['0']->contents);
+
 
+        $rubric_criterion = DB::table('criteria')
+            ->join("rubric_criterion", "rubric_criterion.criterion_id", "=", "criteria.id")
+            ->join("activity_criterion", "criteria.id", '=', 'activity_criterion.criterion_id')
+            ->where("activity_criterion.activity_id", '=', $activity->id)
+            ->where('rubric_criterion.rubric_id', '=', $rubric->id)
+            ->select('criteria.name', 'criteria.id as criterion_id', 'criteria.subcriteria')
+            ->addSelect('activity_criterion.activity_id', 'activity_criterion.weight', 'activity_criterion.id as activity_criterion_id')
+            ->addSelect('rubric_criterion.rubric_id', 'rubric_criterion.id as rubric_criterion_id')
+            ->get();
+
+        foreach ($rubric_criterion as $index => $crit) {
+            $crit->scales = DB::table('scales')
+                ->join('criterion_scale', 'scales.id', '=', 'criterion_scale.scale_id')
+                ->where('criterion_id', $crit->criterion_id)
+                ->get();
+        }
+
+
+
+
+        // Get results
+        $activity_criterion_ids = DB::table('activity_criterion')->where("activity_id", '=', $activity->id)->lists('id');
+        Log::info($activity_criterion_ids);
+        $assessments = DB::table('assessments')
+            ->join('students', 'assessments.student_id', '=', 'students.id')
+            ->whereIn('activity_criterion_id', $activity_criterion_ids)
+            ->orderBy('assessments.id', 'asc')->get();
+        Log::info($assessments);
         // Decode the scores (blade workaround)
         $scores_array = array();
+
         foreach ($assessments as $index => $assessment) {
-            $scores_array[$assessment->id] = json_decode($assessment->scores, true);
+            $scores_array[$assessment->student_id][] = $assessment->score;
+            $scores_array[$assessment->student_id]['comments'] = DB::table('activity_student')->where('student_id', '=', $assessment->student_id)
+                ->where("activity_id", '=', $activity->id)
+                ->select('comments')->first()->comments;
         }
 
-        return View::make('local.professors.view_assessment', compact('activity', 'title', 'students', 'course', 'rubric_contents', 'assessments', 'scores_array', 'rubric'));
+        return View::make('local.professors.view_assessment', compact('activity', 'title', 'students', 'course', 'rubric_criterion', 'assessments', 'scores_array', 'rubric'));
     }
 
     public function printAssessment($id)

app/controllers/CriteriaController.php

@@ -22,7 +22,7 @@ class CriteriaController extends \BaseController
 
         $criteria = Criterion::withTrashed()->orderBy('name', 'ASC')->get();
         $programs = Program::where("id", "=", $userProgram[0]->program_id)->get();
-        return View::make('local.managers.pCoords.new_criteria', compact('title', 'outcomes', 'schools', 'criteria', 'programs', 'objectives'));
+        return View::make('local.managers.pCoords.criteria', compact('title', 'outcomes', 'schools', 'criteria', 'programs', 'objectives'));
     }
 
     public function editSchool()
@@ -56,6 +56,12 @@ class CriteriaController extends \BaseController
         $json_to_send['criterion'] = DB::table('criteria')->where('id', '=', Input::get('id'))->first();
         $outcomeIDS = DB::table('criterion_objective_outcome')->where('criterion_id', '=', $json_to_send['criterion']->id)->lists('outcome_id');
         Log::info($outcomeIDS);
+
+        $json_to_send['scales'] = DB::table('criterion_scale')
+            ->join('scales', 'scales.id', '=', 'criterion_scale.scale_id')
+            ->where('criterion_id', Input::get('id'))
+            ->orderBy('position')
+            ->get();
         $json_to_send['outcomes'] = DB::table('outcomes')->whereIn('id', $outcomeIDS)->get();
         $outcomeStr = '';
         if (count($json_to_send['outcomes']) == 1) {
@@ -68,11 +74,6 @@ class CriteriaController extends \BaseController
             $outcomeStr = rtrim($outcomeStr, ',');
         }
         $json_to_send['outcomes'] = $outcomeStr;
-        $num_scales = Input::get('numberOfScale');
-        $criterionID = Input::get('id');
-
-        $json_to_send['scales'] = DB::select("select * from scales, template_criterion_scale where template_criterion_scale.template_criterion_id in (select id from template_criterion where template_criterion.template_id in (SELECT id FROM templates where num_scales = {$num_scales}) and template_criterion.criterion_id = {$criterionID}) and scales.id = template_criterion_scale.scale_id GROUP BY position order by position");
-        $json_to_send['crit_info'] = DB::select("select copyright, notes from template_criterion where id in (select template_criterion_id from scales, template_criterion_scale where template_criterion_scale.template_criterion_id in (select id from template_criterion where template_criterion.template_id in (SELECT id FROM templates where num_scales = {$num_scales}) and template_criterion.criterion_id = {$criterionID}) and scales.id = template_criterion_scale.scale_id  GROUP BY position  order by position) limit 1");
 
 
 

app/controllers/OutcomesController.php

@@ -412,7 +412,10 @@ class OutcomesController extends \BaseController
                 case 'all':
                     return DB::table('criteria')
                         ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
-                        ->where('criterion_objective_outcome.outcome_id', '=', Input::get('id'))
+                        ->where('criterion_objective_outcome.outcome_id', '=', Input::get('outcome_id'))
+                        ->where('criterion_objective_outcome.objective_id', '=', Input::get('objective_id'))
+                        ->where('criteria.num_scales', '=', Input::get('num_scales'))
+                        ->where('criteria.max_score', '=', Input::get('maximum'))
                         ->select('criterion_id as id', 'name')
                         ->orderBy('name', 'ASC')
                         ->get();
@@ -427,7 +430,10 @@ class OutcomesController extends \BaseController
                         $criteria = DB::table('criteria')
                             ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
                             ->join('program_criterion', 'program_criterion.criterion_id', '=', 'criteria.id')
-                            ->where('criterion_objective_outcome.outcome_id', '=', Input::get('id'))
+                            ->where('criterion_objective_outcome.outcome_id', '=', Input::get('outcome_id'))
+                            ->where('criterion_objective_outcome.objective_id', '=', Input::get('objective_id'))
+                            ->where('criteria.num_scales', '=', Input::get('num_scales'))
+                            ->where('criteria.max_score', '=', Input::get('maximum'))
                             ->whereIn('program_criterion.program_id', $program_ids)
                             ->select('criterion_id as id', 'name')
                             ->orderBy('name', 'ASC')
@@ -445,7 +451,10 @@ class OutcomesController extends \BaseController
                         return DB::table('criteria')
                             ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
                             ->join('program_criterion', 'program_criterion.criterion_id', '=', 'criteria.id')
-                            ->where('criterion_objective_outcome.outcome_id', '=', Input::get('id'))
+                            ->where('criterion_objective_outcome.outcome_id', '=', Input::get('outcome_id'))
+                            ->where('criterion_objective_outcome.objective_id', '=', Input::get('objective_id'))
+                            ->where('criteria.num_scales', '=', Input::get('num_scales'))
+                            ->where('criteria.max_score', '=', Input::get('maximum'))
                             ->whereIn('program_criterion.program_id', $program_ids)
                             ->select('criterion_id as id', 'name')
                             ->orderBy('name', 'ASC')
@@ -458,7 +467,10 @@ class OutcomesController extends \BaseController
                     $criteria = DB::table('criteria')
                         ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
                         ->join('program_criterion', 'program_criterion.criterion_id', '=', 'criteria.id')
-                        ->where('criterion_objective_outcome.outcome_id', '=', Input::get('id'))
+                        ->where('criterion_objective_outcome.outcome_id', '=', Input::get('outcome_id'))
+                        ->where('criterion_objective_outcome.objective_id', '=', Input::get('objective_id'))
+                        ->where('criteria.num_scales', '=', Input::get('num_scales'))
+                        ->where('criteria.max_score', '=', Input::get('maximum'))
                         ->whereIn('program_criterion.program_id', Auth::user()->programs->lists('id'))
                         ->select('criterion_id as id', 'name')
                         ->orderBy('name', 'ASC')
@@ -469,7 +481,10 @@ class OutcomesController extends \BaseController
                 default:
                     return DB::table('criteria')
                         ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
-                        ->where('criterion_objective_outcome.outcome_id', '=', Input::get('id'))
+                        ->where('criterion_objective_outcome.outcome_id', '=', Input::get('outcome_id'))
+                        ->where('criterion_objective_outcome.objective_id', '=', Input::get('objective_id'))
+                        ->where('criteria.num_scales', '=', Input::get('num_scales'))
+                        ->where('criteria.max_score', '=', Input::get('maximum'))
                         ->select('criterion_id as id', 'name')
                         ->orderBy('name', 'ASC')
                         ->get();
@@ -478,7 +493,10 @@ class OutcomesController extends \BaseController
         } else {
             return DB::table('criteria')
                 ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
-                ->where('criterion_objective_outcome.outcome_id', '=', Input::get('id'))
+                ->where('criterion_objective_outcome.outcome_id', '=', Input::get('outcome_id'))
+                ->where('criterion_objective_outcome.objective_id', '=', Input::get('objective_id'))
+                ->where('criteria.num_scales', '=', Input::get('num_scales'))
+                ->where('criteria.max_score', '=', Input::get('maximum'))
                 ->select('criterion_id as id', 'name')
                 ->orderBy('name', 'ASC')
                 ->get();

app/controllers/RubricsController.php

@@ -82,7 +82,7 @@ class RubricsController extends \BaseController
 
         // Get rubric contents
 
-        $scales = Input::get('scales');
+        $titles = Input::get('titles');
         $criteria = Input::get('criteria');
 
         // Process rubric
@@ -92,7 +92,7 @@ class RubricsController extends \BaseController
         $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->num_scales = count($titles);
         $rubric->max_score = Input::get('max_score');
         $defaultWeight = round(100 / count($criteria), 2);
 
@@ -108,37 +108,22 @@ class RubricsController extends \BaseController
 
             $rubricId = $rubric->id;
             foreach ($criteria as $index => $criterion_id) {
-                DB::insert("insert into rubric_criterion (`rubric_id`,`criterion_id`) values ({$rubricId},{$criterion_id})");
+                DB::insert("insert into rubric_criterion (`rubric_id`,`criterion_id`, `position`) values ({$rubricId},{$criterion_id}, {$index})");
                 DB::commit();
-                $rubric_criterion_id = DB::table('rubric_criterion')->where('rubric_id', '=', $rubricId)
-                    ->where('criterion_id', '=', $criterion_id)->first();
-
-
-
-                for ($i = 0; $i < count($scales[$index]); $i++) {
-                    $scale =  Scale::where('description', '=', $scales[$index][$i])->first();
-                    Log::info($scale);
-                    if ($scale) {
-                        DB::insert("insert into `rubric_criteria_scale` (`rubric_criterion_id`, `scale_id`, `position`) values ({$rubric_criterion_id->id},{$scale->id}, {$i})");
-                        DB::commit();
-                    } else {
-                        $scale = new Scale;
-                        $scale->description = $scales[$index][$i];
-
-                        if ($scale->save()) {
-                            DB::insert("insert into `rubric_criteria_scale` (`rubric_criterion_id`, `scale_id`, `position`) values ({$rubric_criterion_id->id},{$scale->id}, {$i})");
-                            DB::commit();
-                        } else {
-                            Session::flash('status', 'danger');
-                            Session::flash('message', 'Rubric could not be created.');
-                        }
-                    }
-                }
+
+
+
+
 
                 $activity_id = Input::get("activity_id");
                 DB::insert("insert into `activity_criterion` (`activity_id`,`criterion_id`, `weight`) values ({$activity_id}, {$criterion_id}, {$defaultWeight})");
                 DB::commit();
             }
+
+            foreach ($titles as $index => $id) {
+                DB::insert("insert into `rubric_title` (`rubric_id`, `title_id`, `position`) values ({$rubricId}, {$id}, {$index} )");
+                DB::commit();
+            }
             Session::flash('status', 'success');
             Session::flash('message', 'Rubric assigned.');
 
@@ -168,10 +153,10 @@ class RubricsController extends \BaseController
      */
     public function update()
     {
-        Log::info('entré???');
+
         $rubric = Rubric::find(Input::get('id'));
 
-        $scales = Input::get('scales');
+        $titles = Input::get('titles');
         $criteria = Input::get('criteria');
 
         // Process rubric
@@ -180,7 +165,7 @@ class RubricsController extends \BaseController
         $rubric->expected_percentage = Input::get('expected_percentage');
         $rubric->expected_points = Input::get('expected_points');
 
-        $rubric->num_scales = count($scales[0]);
+        $rubric->num_scales = count($titles);
         $rubric->max_score = Input::get('max_score');
         $defaultWeight = round(100 / count($criteria), 2);
 
@@ -201,19 +186,19 @@ class RubricsController extends \BaseController
 
 
         // If the associated activity has been assessed, delete the records
-        if ($activity->outcomes_attempted != NULL) {
+        /* if ($activity->outcomes_attempted != NULL) {
             DB::table('assessments')->where('activity_id', '=', $activity->id)->delete();
             $activity->criteria_achieved_percentage = NULL;
             $activity->criteria_achieved = NULL;
             $activity->outcomes_achieved = NULL;
             $activity->outcomes_attempted = NULL;
-        }
-        Log::info('entré3???');
+        }*/
+
 
         $rubric->save();
-        Log::info("????");
+
         $activity->save();
-        Log::info("????22");
+
         // Get all the course's activities
         Log::info($activity->course);
         $course = Course::find($activity->course->id);
@@ -230,6 +215,7 @@ class RubricsController extends \BaseController
         Log::info('entré4???');
 
         //If there are still evaluated activities in the course, recalculate course outcomes
+        /*
         if (!$activities->isEmpty() && $remainingAssessed) {
             // Variables to hold recalculated outcomes for the course
             $course_outcomes_attempted = array_fill(1, Outcome::all()->count(), 0);
@@ -269,49 +255,26 @@ class RubricsController extends \BaseController
         }
 
         $course->save();
+        */
         Log::info('entré6???');
         DB::delete("delete from rubric_criterion where rubric_id ={$rubric->id}");
         DB::delete("delete from activity_criterion where activity_id = {$activity->id}");
         foreach ($criteria as $index => $criterion_id) {
-            if (
-
-                DB::insert("insert into rubric_criterion (`rubric_id`, `criterion_id`) values ({$rubric->id}, {$criterion_id}) ")
-                &&  DB::insert("insert into `activity_criterion` (`activity_id`,`criterion_id`, `weight`) values ({$activity->id}, {$criterion_id}, {$defaultWeight})")
-            ) {
-
-                $rubric_criterion_id =  DB::table('rubric_criterion')
-                    ->where('rubric_id', '=', $rubric->id)
-                    ->where('criterion_id', '=', $criterion_id)
-                    ->first();
-
-                foreach ($scales[$index] as $in => $scale) {
-                    Log::info("AH2");
-                    $new_scale =  Scale::where('description', '=', $scale)->first();
-
-                    if ($new_scale) {
-                        DB::insert("insert into `rubric_criteria_scale` (`rubric_criterion_id`, `scale_id`, `position`) values ({$rubric_criterion_id->id},{$new_scale->id}, {$in})");
-                        DB::commit();
-                    } else {
-                        $new_scale = new Scale;
-                        $new_scale->description = $scales[$index][$in];
-                        if ($new_scale->save()) {
-                            DB::insert("insert into `rubric_criteria_scale` (`rubric_criterion_id`, `scale_id`, `position`) values ({$rubric_criterion_id->id},{$new_scale->id}, {$in})");
-                            DB::commit();
-                        } else {
-                            DB::rollBack();
-                            Session::flash('status', 'danger');
-                            Session::flash('message', 'Rubric could not be created.');
-                            return action('ActivitiesController@show', array($activity->id));
-                        }
-                    }
-                }
-            } else {
+
+
+            $result =  DB::insert("insert into rubric_criterion (`rubric_id`, `criterion_id`) values ({$rubric->id}, {$criterion_id}) ");
+            $result2 = DB::insert("insert into `activity_criterion` (`activity_id`,`criterion_id`, `weight`) values ({$activity->id}, {$criterion_id}, {$defaultWeight})");
+            if (!($result || $result2)) {
                 DB::rollBack();
                 Session::flash('status', 'danger');
                 Session::flash('message', 'Rubric could not be created.');
                 return action('ActivitiesController@show', array($activity->id));
             }
         }
+
+        foreach ($titles as $index => $id) {
+            DB::insert("insert into rubric_title (`rubric_id`, `title_id`, `position`) values ({$rubric->id},{$id},{$index}) ");
+        }
         Log::info('entré7???');
 
         DB::commit();
@@ -366,10 +329,15 @@ class RubricsController extends \BaseController
             ->get();
         Log::info($rubric_criterion);
 
+        $rubric->titles = DB::table('titles')
+            ->join('rubric_title', 'rubric_title.title_id', '=', 'titles.id')
+            ->where('rubric_title.rubric_id', $rubric->id)
+            ->lists('text');
+
         foreach ($rubric_criterion as $single_cr) {
             $single_cr->scales = json_encode(DB::table('scales')
-                ->join('rubric_criteria_scale', 'rubric_criteria_scale.scale_id', '=', 'scales.id')
-                ->where('rubric_criteria_scale.rubric_criterion_id', '=', $single_cr->id)
+                ->join('criterion_scale', 'criterion_scale.scale_id', '=', 'scales.id')
+                ->where('criterion_scale.criterion_id', '=', $single_cr->criterion_id)
                 ->orderBy('position')
                 ->lists('description'));
             $single_cr->outcomes = json_encode(DB::table('outcomes')
@@ -433,15 +401,19 @@ class RubricsController extends \BaseController
 
     public function fetchRubricCriterion()
     {
-        $rubric = DB::table("rubric_criteria_scale")
-            ->join('scales', 'scales.id', '=', 'rubric_criteria_scale.scale_id')
-            ->where("rubric_criterion_id", '=', Input::get('rubric_criterion_id'))->get();
+        $rubric = DB::table("criterion_scale")
+            ->join('scales', 'scales.id', '=', 'criterion_scale.scale_id')
+            ->where("criterion_id", '=', Input::get('criterion_id'))
+            ->orderBy('position')
+            ->get();
+
         Log::info($rubric);
 
         $rubric["criteria"] = DB::table("criteria")
-            ->join("rubric_criterion", 'rubric_criterion.criterion_id', '=', 'criteria.id')
-            ->where("rubric_criterion.id", '=', Input::get('rubric_criterion_id'))
-            ->select('name', 'rubric_criterion.notes')
+
+            ->where("criteria.id", '=', Input::get('criterion_id'))
+
+            ->select('name', 'notes')
             ->first();
         return json_encode($rubric);
 

app/controllers/TemplatesController.php

@@ -52,8 +52,9 @@ class TemplatesController extends \BaseController
 			->get();
 		Log::info($json_to_send["criteria"]);
 		foreach ($json_to_send['criteria'] as $criteria) {
-			$json_to_send['scales'][$criteria->criterion_id] = DB::table("scales")->join('template_criterion_scale', 'template_criterion_scale.scale_id', '=', 'scales.id')
-				->where("template_criterion_scale.template_criterion_id", '=', $criteria->id)->orderBy('position', 'ASC')->get();
+			$json_to_send['scales'][$criteria->criterion_id] = DB::table("scales")
+				->join('criterion_scale', 'criterion_scale.scale_id', '=', 'scales.id')
+				->where("criterion_scale.criterion_id", '=', $criteria->criterion_id)->orderBy('position', 'ASC')->get();
 		}
 		return json_encode($json_to_send);
 	}
@@ -96,7 +97,7 @@ class TemplatesController extends \BaseController
 	 */
 	public function create()
 	{
-
+		DB::beginTransaction();
 		$template = new Template;
 
 		$template->name = Input::get('name');
@@ -135,58 +136,75 @@ class TemplatesController extends \BaseController
 				$template->program_id = Auth::user()->programs[0]->id;
 				break;
 		}
-		$scales = Input::get('scales');
+
 		$criteria = Input::get('criteria');
 
 		$max_score = Input::get('max_score');
-		$copyright = Input::get('copyright');
-		$notes = Input::get('notes');
-		Log::info($scales);
-		Log::info($criteria);
-		Log::info($copyright);
-		Log::info($notes);
+		$titles = Input::get('titles');
+
 
 
-		$template->num_scales = count($scales[0]);
+		$template->num_scales = count($titles);
 		$template->max_score = $max_score;
 
 		if ($template->save()) {
+
 			$templateId = $template->id;
 			foreach ($criteria as $index => $criterion_id) {
-				$note = $notes[$index];
-				$copy = $copyright[$index];
-				if ($copy == "Empty") $copy = NULL;
-				if ($note == "Empty") $note = NULL;
-
-				DB::insert("insert into template_criterion (`template_id`,`criterion_id`, `copyright`, `notes`) values ({$templateId},{$criterion_id}, '{$copy}', '{$note}')");
-				$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 =  Scale::where('description', '=', $scales[$index][$i])->first();
-					Log::info($scale);
-					if ($scale) {
-						DB::insert("insert into `template_criterion_scale` (`template_criterion_id`, `scale_id`, `position`) values ({$template_criterion_id->id},{$scale->id}, {$i})");
-						DB::commit();
-					} else {
-						$scale = new Scale;
-						$scale->description = $scales[$index][$i];
-
-						if ($scale->save()) {
-							DB::insert("insert into `template_criterion_scale` (`template_criterion_id`, `scale_id`, `position`) values ({$template_criterion_id->id},{$scale->id}, {$i})");
-							DB::commit();
-						} else {
-							Session::flash('status', 'danger');
-							Session::flash('message', 'Rubric could not be created.');
-						}
+
+
+				if (!(DB::insert("insert into template_criterion (`template_id`,`criterion_id`, `position`) values ({$templateId},{$criterion_id}, '{$index}')"))) {
+					Session::flash('status', 'danger');
+					Session::flash('message', 'Rubric could not be created.');
+					DB::rollback();
+					return;
+				}
+			}
+
+			foreach ($titles as $index => $text) {
+				$query = DB::table('titles')
+					->where('text', $text)->first();
+				if ($query) {
+					$result = DB::insert("insert into `template_title` (`template_id`, `title_id` `position`) values ({$templateId}, {$query->id}, {$index})");
+					if (!$result) {
+						Session::flash('status', 'danger');
+						Session::flash('message', 'Rubric could not be created.');
+						DB::rollback();
+						return;
+					}
+				} else {
+					$result1 = DB::insert("insert into `titles` (`text`) values ('{$text}')");
+					if (!$result1) {
+						Session::flash('status', 'danger');
+						Session::flash('message', 'Rubric could not be created.');
+						DB::rollback();
+						return;
+					}
+					$query = DB::table('titles')
+						->where('text', $text)->first();
+					$result = DB::insert("insert into `template_title` (`template_id`, `title_id`, `position`) values ({$templateId}, {$query->id}, {$index})");
+					if (!$result) {
+						Session::flash('status', 'danger');
+						Session::flash('message', 'Rubric could not be created.');
+						DB::rollback();
+						return;
 					}
 				}
 			}
+
+
 			Session::flash('status', 'success');
 			Session::flash('message', 'Rubric created. You can now select it from the list.');
+
+			DB::commit();
+
+
+			return;
 		} else {
 			Session::flash('status', 'danger');
 			Session::flash('message', 'Rubric could not be created.');
+			DB::rollback();
+			return;
 		}
 	}
 
@@ -204,9 +222,9 @@ class TemplatesController extends \BaseController
 			->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)
+			$temp_crit->scales = DB::table('scales')
+				->join('criterion_scale', 'criterion_scale.scale_id', '=', 'scales.id')
+				->where('criterion_scale.criterion_id', '=', $temp_crit->criterion_id)
 				->orderBy('position', 'ASC')
 				->get();
 			$outcomeID = DB::table('criterion_objective_outcome')->where('criterion_id', '=', $temp_crit->criterion_id)
@@ -220,6 +238,12 @@ class TemplatesController extends \BaseController
 			$temp_crit->outcomes = $outcomeStr;
 		}
 
+		$template_info['titles'] = DB::table('titles')
+			->join('template_title', 'template_title.title_id', '=', 'titles.id')
+			->where('template_id', Input::get('id'))
+			->orderBy('position')
+			->get();
+
 		Log::info($template_info);
 
 		return json_encode($template_info);
@@ -232,7 +256,9 @@ class TemplatesController extends \BaseController
 	 */
 	public function update()
 	{
+		DB::beginTransaction();
 		$template = Template::find(Input::get('id'));
+		Log::info(Input::all());
 		$template->name = Input::get('name');
 
 		$template->is_visible = Input::get('is_visible');
@@ -269,16 +295,15 @@ class TemplatesController extends \BaseController
 				break;
 		}
 
-		$scales = Input::get('scales');
+
 		$criteria = Input::get('criteria');
 
 		$max_score = Input::get('max_score');
-		$copyright = Input::get('copyright');
-		$notes = Input::get('notes');
-		Log::info($scales);
-		Log::info(Input::all());
+		$titles = Input::get('titles');
 
-		$template->num_scales = count($scales[0]);
+
+
+		$template->num_scales = count($titles);
 		$template->max_score = $max_score;
 		//$division = $max_score / count($scales[0]);
 
@@ -286,43 +311,57 @@ class TemplatesController extends \BaseController
 			$templateId = $template->id;
 			DB::delete("delete from template_criterion where template_id ={$template->id}");
 			foreach ($criteria as $index => $criterion_id) {
-				$copy = $copyright[$index];
-				$note = $notes[$index];
-				if ($copy == 'Empty') $copy = NULL;
-				if ($note == 'Empty') $note = NULL;
-				DB::insert("insert into template_criterion (`template_id`,`criterion_id`, `copyright`, `notes`) values ({$templateId},{$criterion_id}, '{$copy}', '{$note}')");
-				$template_criterion_id = DB::table('template_criterion')->where('template_id', '=', $templateId)
-					->where('criterion_id', '=', $criterion_id)->first();
-				DB::delete("delete from template_criterion_scale where template_criterion_id ={$template_criterion_id->id}");
-				for ($i = 0; $i < count($scales[$index]); $i++) {
-					$scale =  Scale::where('description', '=', $scales[$index][$i])
-						//->where('max_score', '=', ($division * ($i + 1)))
-						//->where("min_score", '=', (1 + ($division * $i)))
-						->first();
-					Log::info($scale);
-					if ($scale) {
-						DB::insert("insert into `template_criterion_scale` (`template_criterion_id`, `scale_id`, `position`) values ({$template_criterion_id->id},{$scale->id}, {$i})");
-						DB::commit();
-					} else {
-						$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})");
-							DB::commit();
-						} else {
-							Session::flash('status', 'danger');
-							Session::flash('message', 'Rubric could not be created.');
-						}
+
+				if (!DB::insert("insert into template_criterion (`template_id`,`criterion_id`, `position`) values ({$templateId},{$criterion_id}, {$index})")) {
+
+					Session::flash('status', 'danger');
+					Session::flash('message', 'Rubric could not be created.');
+					DB::rollback();
+					return;
+				}
+			}
+			DB::delete("delete from template_title where template_id = {$template->id}");
+			foreach ($titles as $index => $text) {
+				$query = DB::table('titles')
+					->where('text', $text)->first();
+				if ($query) {
+					$result = DB::insert("insert into `template_title` (`template_id`, `title_id`, `position`) values ({$templateId}, {$query->id}, {$index})");
+					if (!$result) {
+						Session::flash('status', 'danger');
+						Session::flash('message', 'Rubric could not be created.');
+						DB::rollback();
+						return;
+					}
+				} else {
+					$result1 = DB::insert("insert into `titles` (`text`) values ('{$text}')");
+					if (!$result1) {
+						Session::flash('status', 'danger');
+						Session::flash('message', 'Rubric could not be created.');
+						DB::rollback();
+						return;
+					}
+					$query = DB::table('titles')
+						->where('text', $text)->first();
+					$result = DB::insert("insert into `template_title` (`template_id`, `title_id`, `position`) values ({$templateId}, {$query->id}, {$index})");
+					if (!$result) {
+						Session::flash('status', 'danger');
+						Session::flash('message', 'Rubric could not be created.');
+						DB::rollback();
+						return;
 					}
 				}
 			}
+
+
+
 			Session::flash('status', 'success');
+
 			Session::flash('message', 'Rubric updated (' . date('m/d/y, h:i:s a') . ').');
+			DB::commit();
 		} else {
 			Session::flash('status', 'danger');
 			Session::flash('message', 'Rubric could not be updated (' . date('m/d/y, h:i:s a') . ').');
+			DB::commit();
 		}
 	}
 

app/controllers/TransformativeActionsController.php

@@ -929,4 +929,49 @@ class TransformativeActionsController extends \BaseController
     }
     return 'ilegal';
   }
+
+  function postActivityCriterion($activity_id)
+  {
+    DB::beginTransaction();
+    $activity_criterion = Input::get('trans_act');
+
+    $trans = new TransformativeAction;
+
+    $trans->user_id = Auth::user()['id'];
+    $program_id = DB::table('activities')
+      ->join('courses', 'activities.course_id', '=', 'courses.id')
+      ->where('activities.id', $activity_id)
+      ->lists('program_id');
+    $trans->program_id = $program_id[0];
+    $trans->is_custom = 1;
+    $trans->by_professor = 1;
+
+    $trans->at_text = Input::get('name_trans');
+    $trans->description = Input::get('transforming_actions');
+
+    if ($trans->save()) {
+
+      foreach ($activity_criterion as $single_ac) {
+        $result = DB::insert("insert into `transformative_activity_criterion` (`trans_action_id`, `activity_criterion_id`) values ($trans->id, $single_ac)");
+        if (!$result) {
+          DB::rollback();
+          Session::flash('status', 'danger');
+          Session::flash('message', 'Error saving Transforming Action. Try again later.');
+
+          return Redirect::to("professor/activities/{$activity_id}");
+        }
+      }
+      DB::commit();
+      Session::flash('status', 'success');
+      Session::flash('message', 'Transformative Actions Saved.');
+
+      return Redirect::to("professor/activities/{$activity_id}");
+    } else {
+      DB::rollback();
+      Session::flash('status', 'danger');
+      Session::flash('message', 'Error saving Transforming Action. Try again later.');
+
+      return Redirect::to("professor/activities/{$activity_id}");
+    }
+  }
 }

app/database/migrations/2021_06_02_000507_create_rubrics_table.php

@@ -16,8 +16,8 @@ class CreateRubricsTable extends Migration
 			$table->integer('expected_points');
 			$table->integer('user_id')->unsigned();
 			$table->timestamps();
-			//$table->integer('num_scales')->unsigned();
-			//$table->integer('max_score')->unsigned();
+			$table->integer('num_scales')->unsigned();
+			$table->integer('max_score')->unsigned();
 		});
 
 		Schema::table('rubrics', function (Blueprint $table) {

app/database/migrations/2021_06_04_003810_create_activity_criterion_table.php

@@ -29,8 +29,8 @@ class CreateActivityCriterionTable extends Migration
 				->on('criteria')
 				->onDelete('cascade')
 				->onUpdate('cascade');
-			$table->text('transformative_actions')->nullable();
-			$table->text('assessment_comments')->nullable();
+			//$table->text('transformative_actions')->nullable();
+			//$table->text('assessment_comments')->nullable();
 
 
 			$table->decimal('weight', 6, 2)->default(1.0);

app/models/TransformativeAction.php

@@ -0,0 +1,6 @@
+<?php
+
+class TransformativeAction extends Eloquent
+{
+    protected $table = 'transformative_actions';
+}

app/routes.php

@@ -166,7 +166,10 @@ Route::group(array('before' => 'auth|has_access'), function () {
     /**
      * Shared Routes
      */
-
+    Route::post('postActivityCriterionTrans/{activity_id}', array(
+        'as' => 'postActivityCriterionTrans/{activity_id}',
+        'uses' => 'TransformativeActionsController@postActivityCriterion'
+    ));
     Route::post('changeStatusOfCriterion', array(
         'as' => 'changeStatusOfCriterion',
         'uses' => 'CriteriaController@changeStatus'

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

@@ -13,35 +13,43 @@
                 Create
             </div>
             <div class="panel-body">
-                {{ Form::open(array('action' => 'CriteriaController@create')) }}
-                <div id='outcomeGroup' data-value = "1">
+                {{ Form::open(array('action' => 'CriteriaController@create', 'id'=> 'create_criterion')) }}
+                <div id ='allOutcomes'>
+                <div id='outcomeGroup0' data-value = "1">
+                    <div class="form-group col-md-12">
+                        <label>Outcome 1</label>
+
+                        {{ Form::select('outcome[]', $outcomes, reset($outcomes),  ['class'=>'form-control selectpicker', 'id' =>'outcome0', 'onchange'=>'fetchObjectiveForSelect("outcome0", "objectiveGroupFor0")']) }}
+                    </div>
+                
+                <div id='objectiveGroupFor0' data-value = '1'>
                     <div class="form-group col-md-11">
-                        <label>Associated Outcomes</label>
+                        <label>Associated Objectives for Outcome 1</label>
+                        <select id="objective_0_counter_1" name="objective[]" class="form-control selectpicker">
+                        </select>
 
-                        {{ Form::select('outcome[]', $outcomes, reset($outcomes),  ['class'=>'form-control selectpicker', 'id' =>'outcome0', 'onchange'=>'fetchObjectiveForSelect("outcomeGroup", "objectiveGroup")']) }}
+                    </div>
+                    <div class = "col-md-1">
                     </div>
                 </div>
-                <input type='hidden' name='counterOutcome' id='counterOutcome' value=1>
-                <button id='button-add-outcome' class='btn btn-md btn-secondary' onclick='addOutcomeTest()'>
+                <input type='hidden' name='counterObjective' id='counterObjective' value=1>
+                <button  class='btn btn-md btn-secondary button-add-objective' onclick='addObjectiveTest("objectiveGroupFor0", "objective_0")'>
                     <span class='glyphicon glyphicon-plus'>
 
                     </span>
-                    Add another Outcome
+                    Add another Objective
                 </button>
-                <div id='objectiveGroup' data-value = '1'>
-                    <div class="form-group">
-                        <label>Associated Objectives</label>
-                        <select id="objective_0" name="objective[]" class="form-control selectpicker">
-                        </select>
-
-                    </div>
+                
+                <br></div><hr>
                 </div>
-                <input type='hidden' name='counterObjective' id='counterObjective' value=1>
-                <button id='button-add-objective' class='btn btn-md btn-secondary' onclick='addObjectiveTest()'>
+                
+                <input type='hidden' name='counterOutcome' id='counterOutcome' value=1>
+                
+                <button id='button-add-outcome' class='btn btn-md btn-secondary' onclick='addOutcomeTest()'>
                     <span class='glyphicon glyphicon-plus'>
 
                     </span>
-                    Add another Objective
+                    Add another Outcome
                 </button>
 
                 <!-- Associated Program -->
@@ -92,7 +100,7 @@
                     {{ Form::textarea('notes', '', array('class' => 'form-control', 'rows'=>2, 'placeholder'=>'(optional)', 'aria-labelledby'=>'notes')) }}
                 </div>
 
-                {{ Form::submit('Create', array('class' => 'btn btn-primary btn-block')) }}
+                {{ Form::submit('Create', array('class' => 'btn btn-primary btn-block', 'id'=>'create_the_criterion')) }}
                 {{ Form::close() }}
             </div>
         </div>
@@ -104,7 +112,7 @@
                 Edit
             </div>
             <div class="panel-body">
-                {{ Form::open(array('action' => 'CriteriaController@update')) }}
+                {{ Form::open(array('action' => 'CriteriaController@update', 'id'=>'update_criterion')) }}
 
                 <button class="btn btn-md btn-secondary filterButton">
                     <span class="glyphicon glyphicon-plus">
@@ -126,6 +134,7 @@
 
                 </div>
                 </div>
+                <hr>
 
                 <div class="form-group">
                     {{ Form::label('criterion_id', 'Criterion') }}
@@ -144,38 +153,41 @@
                         @endforeach
                     </select>
                 </div>
-
+                <div id ='allAssocOutcomes'>
                 <!-- Associated Outcome -->
-                <div id='assocOutcomeGroup' data-value="1">
-                    <div class="form-group">
-                        <label>Associated Outcome</label>
-                        {{ Form::select('assoc_outcome[]', $outcomes, null, ['class'=>'form-control selectpicker', 'id'=>'assoc_outcome_0', 'onchange'=>'fetchAssocObjective("assoc_outcome_0")']) }}
+                <div id='assocOutcomeGroup0' data-value="1">
+                    <div class="form-group col-md-12">
+                        <label>Outcome 1</label>
+                        {{ Form::select('outcome[]', $outcomes, null, ['class'=>'form-control selectpicker', 'id'=>'assoc_outcome_0', 'onchange'=>'fetchAssocObjective("assoc_outcome_0")']) }}
 
                     </div>
-                </div>
-                <button id='button-add-objective-assoc' class='btn btn-md btn-secondary' onclick='addAssocOutcome()'>
-                    <span class='glyphicon glyphicon-plus'>
-
-                    </span>
-                    Add another Outcome
-                </button>
-
-                <div id='assoc_objectiveGroup' data-value="1">
-                    <div class="form-group">
-                        <label>Associated Objectives</label>
-                        <select id="assoc_objective_0" name="assoc_objective[]" class="form-control selectpicker">
+<div id='assoc_objectiveGroupFor0' data-value="1">
+                    <div class="form-group col-md-11">
+                        <label>Associated Objectives for Outcome 1</label>
+                        <select id="assoc_objective_0_counter_1" name="objective[]" class="form-control selectpicker">
                             <option value="0">No associated objectives</option>
                         </select>
 
-                    </div>
+                    </div> <div class ='col-md-1'></div>
                 </div>
-                <button id='button-add-outcome-assoc' class='btn btn-md btn-secondary' onclick='addAssocObjective()'>
+               
+
+               <button id='button-add-objective-assoc' class='btn btn-md btn-secondary' onclick='addAssocObjective("assoc_objectiveGroupFor0", "assoc_objective_0")'>
                     <span class='glyphicon glyphicon-plus'>
 
                     </span>
                     Add another Objective
+                </button> </div><hr></div>
+                <button  class='btn btn-md btn-secondary button-add-outcome-assoc' onclick='addAssocOutcome()'>
+                    <span class='glyphicon glyphicon-plus'>
+
+                    </span>
+                    Add another Outcome
                 </button>
 
+                
+                
+
                 <!-- Associated Program -->
                 <div class="form-group">
 
@@ -213,8 +225,8 @@
                     {{ Form::textarea('subcriteria', '', array('class' => 'form-control', 'rows'=>3, 'id' => 'criterion_subcriteria')) }}
                 </div>
                 <div class="form-group">
-                    {{ Form::label('assoc_maximum_score', 'Maximum Score') }}
-                    {{ Form::text('assoc_maximum_score', '', array('class' => 'form-control', 'id'=>'assoc_maximum_score', 'oninput'=>'addOptions("Num_assoc_scale", "assoc_maximum_score", "Assoc_Scales")')) }}
+                    {{ Form::label('maximum_score', 'Maximum Score') }}
+                    {{ Form::text('maximum_score', '', array('class' => 'form-control', 'id'=>'assoc_maximum_score', 'oninput'=>'addOptions("Num_assoc_scale", "assoc_maximum_score", "Assoc_Scales")')) }}
                 </div>
 
 
@@ -241,7 +253,7 @@
                     {{ Form::textarea('notes', Input::old('notes'), array('class' => 'form-control', 'rows'=>2, 'id'=>'criterion_notes', 'placeholder'=>'(optional)')) }}
                 </div>
                
-                {{ Form::submit('Update', array('class' => 'btn btn-primary btn-block')) }}
+                {{ Form::submit('Update', array('class' => 'btn btn-primary btn-block', 'id'=>'update_the_criterion')) }}
                 {{ Form::close() }}
                 {{ Form::open(array('action' => 'CriteriaController@delete')) }}
                 
@@ -265,6 +277,19 @@
         numberOfScales('Num_scale', 'Scales');
     });
 
+    $(document).on('submit', '#create_criterion', function(e){
+
+        if(e.originalEvent.submitter.id != "create_the_criterion")
+        e.preventDefault();
+    })
+
+    $(document).on('submit', '#update_criterion', function(e){
+
+if(e.originalEvent.submitter.id != "update_the_criterion")
+e.preventDefault();
+})
+
+
     function addOptions(select, max, scaleDiv) {
 
         
@@ -297,11 +322,11 @@
 
             fullDiv = '';
         if(division ==1){
-            for (var i = dataValue; i < amountOfScale; i++) {
+            for (var i = 0; i < amountOfScale; i++) {
                 div = '<div id="assoc_eval' + i.toString() + Scales + '">' +
                     '<div class ="form-group">' +
                     '<label for ="assoc_descripcion' + i.toString() + '">Scale Description ('+(i+1)+')</label>' +
-                    '<textarea class="form-control" rows="2" aria-labelledby="assoc_descripcion' + i.toString() + '" name="assoc_scales[]" cols="50" ></textarea></div></div>';
+                    '<textarea id = "assoc_scale_'+i+'" class="form-control" rows="2" aria-labelledby="assoc_descripcion' + i.toString() + '" name="Scales[]" cols="50" ></textarea></div></div>';
                 fullDiv += div;
 
 
@@ -311,7 +336,7 @@
             div = '<div id="assoc_eval' +0 + Scales + '">' +
                     '<div class ="form-group">' +
                     '<label for ="assoc_descripcion' + 0 + '">Scale Description ('+1+' - '+maximum+') </label>' +
-                    '<textarea class="form-control" rows="2" aria-labelledby="assoc_descripcion' + 0 + '" name="assoc_scales[]" cols="50" ></textarea></div></div>';
+                    '<textarea id = "assoc_scale_'+0+'" class="form-control" rows="2" aria-labelledby="assoc_descripcion' + 0 + '" name="Scales[]" cols="50" ></textarea></div></div>';
                 fullDiv += div;
         }
         else{
@@ -320,7 +345,7 @@
             div = '<div id="assoc_eval' + i.toString() + Scales + '">' +
                     '<div class ="form-group">' +
                     '<label for ="assoc_descripcion' + i.toString() + '">Scale Description ('+(1+(i*division))+' - '+((1+i)*division)+')</label>' +
-                    '<textarea class="form-control" rows="2" aria-labelledby="assoc_descripcion' + i.toString() + '" name="assoc_scales[]" cols="50" ></textarea></div></div>';
+                    '<textarea  id = "assoc_scale_'+i+'" class="form-control" rows="2" aria-labelledby="assoc_descripcion' + i.toString() + '" name="Scales[]" cols="50" ></textarea></div></div>';
                 fullDiv += div;
         }
         }
@@ -346,11 +371,13 @@
         var amountOfScale = parseInt($('#' + string).val());
         var dataValue = parseInt($('#' + Scales).attr('data-value'));
         var division = maximum/amountOfScale;
-        //add
-    
 
 
 
+        
+        //add
+    
+
             fullDiv = '';
             if(division ==1){
                 for (var i = 0; i < amountOfScale; i++) {
@@ -403,18 +430,20 @@ $('.filterSection').hide();
 
     //Add outcome Button
     function addOutcomeTest() {
-        counter = parseInt($('#outcomeGroup').data("value"));
+
+
+        counter = parseInt($('#outcomeGroup0').data("value"));
         var $select = $('<select/>', {
             'class': "selectpicker form-control",
             'name': "outcome[]",
             'data-live-search': 'true',
             'id': 'outcome' + counter.toString(),
-            'onchange': 'fetchObjectiveForSelect("outcomeGroup", "objectiveGroup")'
+            'onchange': 'fetchObjectiveForSelect("outcome'+counter+'", "objectiveGroupFor'+counter+'")'
 
         });
         var $div = $('<div/>', {
             'id': 'outcomeForm' + counter.toString(),
-            'class': 'form-group col-md-11'
+            'class': 'form-group col-md-11 '
         });
 
         var $divForButton = $('<div/>', {
@@ -425,20 +454,68 @@ $('.filterSection').hide();
         var $button = $('<button/>', {
             'type': 'button',
             'class': 'btn btn-primary',
-            'onclick': 'deleteLast("outcomeForm'+counter.toString()+'", "outcomeGroup", "close' + counter.toString() + '", "objectiveGroup")'
-   });
+            'onclick': '$(this).parent().parent().remove();'
+        });
+        var divForGroup = $('<div/>', {
+            'id' : 'outcomeGroup'+counter.toString(),
+        }).html("<label>Outcome "+(counter+1)+"</label>");
+        
+
+        var objectiveGroup = $('<div/>', {
+            'id' : 'objectiveGroupFor'+counter,
+            'data-value': '1'
+        });
+
+        var form_group_for_objective = $('<div/>', {
+            'class': 'form-group col-md-11'
+        }).html('<label>Associated Objectives for Outcome '+(counter+1)+'</label>'); 
+        
+        
+        var $select_objective = $('<select/>', {
+            'class': "selectpicker form-control",
+            'name': "objective[]",
+            'data-live-search': 'true',
+            'id': 'objective_'+counter +'_counter_1'  
+        });
+
+        var empty_div = $('<div/>',{
+            'class': 'col-md-1'
+        });
+
+        
+
+        var button_for_add = $('<button/>', {
+            'class': 'btn btn-md btn-secondary button-add-objective',
+            'onclick': 'addObjectiveTest("objectiveGroupFor'+counter+'", "objective_'+counter+'")'
+        }).html("<span class='glyphicon glyphicon-plus'></span>Add another Objective");
+        
+        
+        divForGroup.append($div)
 
         $button.append('X');
         $divForButton.append($button);
-
-        $div.appendTo('#outcomeGroup')
+        
+       
+        $('#allOutcomes').append(divForGroup);
         $select.append(selectOptions);
 
         $select.appendTo('#outcomeForm' + counter.toString()).selectpicker('refresh');
-        $('#outcomeGroup').data("value", (counter +1));
-        fetchObjectiveForSelect('outcomeGroup', "objectiveGroup");
-        counter += 1;
-        $divForButton.appendTo('#outcomeGroup');
+        $('#outcomeGroup0').data("value", (counter +1));
+        
+        
+        divForGroup.append($divForButton);
+
+        form_group_for_objective.append($select_objective)
+        objectiveGroup.append(form_group_for_objective);
+        objectiveGroup.append(empty_div);
+        //objectiveGroup.append(button_for_add);
+
+        divForGroup.append(objectiveGroup);
+        divForGroup.append(button_for_add);
+        divForGroup.append('<hr>');
+        fetchObjectiveForSelect('outcome'+counter, "objectiveGroupFor"+counter);
+        $select_objective.selectpicker('refresh');
+
 
         
 
@@ -466,91 +543,96 @@ $('.filterSection').hide();
         $div.remove();
         $div = document.getElementById(closeObj);
         $div.remove();
-        counter = parseInt($('#'+objectiveGroup).data("value"));
-        $('#'+objectiveGroup).data("value", counter-1);
+        //counter = parseInt($('#'+objectiveGroup).data("value"));
+       // $('#'+objectiveGroup).data("value", counter-1);
 
 
     }
 
     //Add objective when editing
 
-    function addAssocObjective() {
-        selectObj = document.getElementById('assoc_objective_0').innerHTML;
-        assocObjectiveCounter = parseInt($('#assoc_objectiveGroup').data('value'));
+    function addAssocObjective(objForGroup, originalObjective) {
+        counter = $("#"+objForGroup).data('value');
+
+        selectObj = document.getElementById(originalObjective+'_counter_1').innerHTML;
+        assocObjectiveCounter = parseInt($('#'+objForGroup).data('value'));
         var $select = $('<select/>', {
             'class': "selectpicker form-control",
-            'name': "assoc_objective[]",
+            'name': "objective[]",
             'data-live-search': 'true',
-            'id': 'assoc_objective_' + assocObjectiveCounter.toString(),
+            'id': originalObjective+'_counter_' + (assocObjectiveCounter+1).toString(),
 
 
         });
         var $div = $('<div/>', {
-            'id': 'assoc_objectiveForm' + assocObjectiveCounter.toString(),
-            'class': 'form-group col-md-11'
+            'id': 'assoc_objectiveForm_'+objForGroup +'_' + assocObjectiveCounter.toString(),
+            'class': 'form-group col-md-10'
         });
         var $divForButton = $('<div/>', {
-            'class': 'col-md-1',
-            'id': 'assoc_closeObj' + assocObjectiveCounter.toString()
+            'class': 'col-md-2',
+            'id': 'assoc_closeObj_'+objForGroup+'_' + assocObjectiveCounter.toString()
 
         });
         var $button = $('<button/>', {
             'type': 'button',
             'class': 'btn btn-primary',
-            'onclick': 'deleteObjective("assoc_objectiveForm' + assocObjectiveCounter.toString() + '", "assoc_closeObj' + assocObjectiveCounter.toString() + ', "assoc_objectiveGroup")'
+            'onclick': 'deleteObjective("assoc_objectiveForm_'+objForGroup+'_' + assocObjectiveCounter.toString() + '", "assoc_closeObj_' +objForGroup+'_' + assocObjectiveCounter.toString() + '", "'+objForGroup+'")'
         });
 
         $button.append('X');
         $divForButton.append($button);
 
-        $div.appendTo('#assoc_objectiveGroup')
+        $div.appendTo('#'+objForGroup)
         $select.append(selectObj);
 
-        $select.appendTo('#assoc_objectiveForm' + assocObjectiveCounter.toString()).selectpicker('refresh');
-        $('#assoc_objectiveGroup').data("value", assocObjectiveCounter +1);
+        $select.appendTo($div).selectpicker('refresh');
+        //$('#assoc_objectiveGroup').data("value", assocObjectiveCounter +1);
 
-        $divForButton.appendTo('#assoc_objectiveGroup');
+        $divForButton.appendTo('#'+objForGroup);
+        $('#'+ objForGroup).data('value', counter +1);
 
     }
 
 
     //Add objective when creating a criteria
-    function addObjectiveTest() {
-        selectObj = document.getElementById('objective_0').innerHTML;
-        counter = parseInt($("#objectiveGroup").data('value'));
+    function addObjectiveTest(objForGroup, originalObjective) {
+
+        counter  =$('#'+objForGroup).data('value');
+
+        selectObj = document.getElementById(originalObjective+'_counter_1').innerHTML;
+
         var $select = $('<select/>', {
             'class': "selectpicker form-control",
             'name': "objective[]",
             'data-live-search': 'true',
-            'id': 'objective_' + counter.toString()
-
+            'id': originalObjective +'_counter_' + (counter+1).toString()
         });
         var $div = $('<div/>', {
-            'id': 'objectiveForm' + counter.toString(),
-            'class': 'form-group col-md-11'
+            'id': 'objectiveForm_'+objForGroup + '_' + counter.toString(),
+            'class': 'form-group col-md-10'
         });
         var $divForButton = $('<div/>', {
-            'class': 'col-md-1',
-            'id': 'closeObj' + counter.toString()
+            'class': 'col-md-2',
+            'id': 'closeObj_'+objForGroup+'_' + counter.toString()
 
         });
         var $button = $('<button/>', {
             'type': 'button',
             'class': 'btn btn-primary',
-            'onclick': 'deleteObjective("objectiveForm' + counter.toString() + '", "closeObj' + counter.toString() + '")'
+            'onclick': 'deleteObjective("objectiveForm_' +objForGroup +'_' + counter.toString() + '", "closeObj_'+objForGroup+'_' + counter.toString() + '", "'+objForGroup+'")'
         });
 
         $button.append('X');
         $divForButton.append($button);
 
-        $div.appendTo('#objectiveGroup')
+        $div.appendTo('#'+objForGroup)
         $select.append(selectObj);
 
-        $select.appendTo('#objectiveForm' + counter.toString()).selectpicker('refresh');
+        $select.appendTo($div).selectpicker('refresh');
         
 
-        $divForButton.appendTo('#objectiveGroup');
-        $('#objectiveGroup').data('value', counter +1);
+        $divForButton.appendTo('#'+objForGroup);
+        $('#'+ objForGroup).data('value', counter +1);
     }
 
     //Create outcome for editing
@@ -558,14 +640,14 @@ $('.filterSection').hide();
     var assocOutcomeCounter = 0;
 
 
-    function addAssocOutcome() {
-        assocOutcomeCounter = parseInt($('#assocOutcomeGroup').data('value'));
+    function addAssocOutcome(depends= null) {
+        assocOutcomeCounter = parseInt($('#assocOutcomeGroup0').data('value'));
         var $select = $('<select/>', {
             'class': "selectpicker form-control",
-            'name': "assoc_outcome[]",
+            'name': "outcome[]",
             'data-live-search': 'true',
             'id': 'assoc_outcome_' + assocOutcomeCounter.toString(),
-            'onchange': 'fetchAssocObjective("assoc_outcome_' + assocOutcomeCounter.toString() + '")'
+            'onchange': 'fetchAssocObjective("assoc_outcome_' + assocOutcomeCounter.toString() + '", "assoc_objectiveGroupFor'+assocOutcomeCounter+'")'
 
         });
         var $div = $('<div/>', {
@@ -581,20 +663,67 @@ $('.filterSection').hide();
         var $button = $('<button/>', {
             'type': 'button',
             'class': 'btn btn-primary',
-            'onclick': 'deleteLast("assoc_outcomeForm' + assocOutcomeCounter.toString() + '", "assocOutcomeGroup", "assoc_close' + assocOutcomeCounter.toString() + '","assoc_objectiveGroup")'
+            'id': 'assoc_close_button'+assocOutcomeCounter,
+            'onclick': '$(this).parent().parent().remove()'
          });
 
+        var divForGroup = $('<div/>', {
+            'id' : 'assocOutcomeGroup'+assocOutcomeCounter.toString(),
+        }).html("<label>Outcome "+(assocOutcomeCounter+1)+"</label>");
+
+        var objectiveGroup = $('<div/>', {
+            'id' : 'assoc_objectiveGroupFor'+assocOutcomeCounter,
+            'data-value': '1'
+        });
+        var form_group_for_objective = $('<div/>', {
+            'class': 'form-group col-md-11'
+        }).html('<label>Associated Objectives for Outcome '+(assocOutcomeCounter+1)+'</label>'); 
+        
+        var $select_objective = $('<select/>', {
+            'class': "selectpicker form-control",
+            'name': "objective[]",
+            'data-live-search': 'true',
+            'id': 'assoc_objective_'+assocOutcomeCounter +'_counter_1'  
+        });
+
+        var empty_div = $('<div/>',{
+            'class': 'col-md-1'
+        });
+
+        var button_for_add = $('<button/>', {
+            'class': 'btn btn-md btn-secondary button-add-objective',
+            'onclick': 'addAssocObjective("assoc_objectiveGroupFor'+assocOutcomeCounter+'", "assoc_objective_'+assocOutcomeCounter+'")'
+        }).html("<span class='glyphicon glyphicon-plus'></span>Add another Objective");
+        
+        divForGroup.append($div)
         $button.append('X');
         $divForButton.append($button);
 
-        $div.appendTo('#assocOutcomeGroup')
+        $('#allAssocOutcomes').append(divForGroup);
+        
+
+        //$div.appendTo('#assocOutcomeGroup')
         $select.append(selectOptions);
 
         $select.appendTo('#assoc_outcomeForm' + assocOutcomeCounter.toString()).selectpicker('refresh');
-         assocOutcomeCounter += 1;
-        $divForButton.appendTo('#assocOutcomeGroup');
+        //assocOutcomeCounter += 1;
+        $('#assocOutcomeGroup0').data('value', assocOutcomeCounter+1);
+        //$divForButton.appendTo('#assocOutcomeGroup');
+        divForGroup.append($divForButton);
+
+        form_group_for_objective.append($select_objective)
+        objectiveGroup.append(form_group_for_objective);
+        objectiveGroup.append(empty_div);
+        //objectiveGroup.append(button_for_add);
+
+        divForGroup.append(objectiveGroup);
+        divForGroup.append(button_for_add);
+        divForGroup.append('<hr>');
+        if(!depends)fetchObjectiveForSelect('assoc_outcome_'+assocOutcomeCounter, 'assoc_objectiveGroupFor'+assocOutcomeCounter);
+        $select_objective.selectpicker('refresh');
+
 
-        $('#assocOutcomeGroup').data('value', assocOutcomeCounter);
+       
 
 
     }
@@ -673,13 +802,10 @@ $('.filterSection').hide();
     //Fetch objective at creating criteria
     counterForPost = 0;
 
-    function fetchObjectiveForSelect(outcomeDiv, objectiveGroup) {
-        var count = $("#" + outcomeDiv).data('value');
-        var allOutcomes = [];
-        $("#" + outcomeDiv + ' select').each(function() {
-            allOutcomes.push( this.value);
+    
 
-        })
+    function fetchObjectiveForSelect(outcome, objectiveGroup) {
+        outcomeID = $('#'+outcome).val();
         var allObjectives = [];
         $("#" + objectiveGroup + ' select').each(function() {
             var temp = {
@@ -691,11 +817,18 @@ $('.filterSection').hide();
 
         $.post(
             "{{ URL::action('CriteriaController@fetchObjectivesForSelect') }}", {
-                allOutcomes: allOutcomes
+                outcomeID: outcomeID
             },
             function(varArray) {
                 counterOutcome =0;
                 optionName = '<option value ="0">Nothing Selected</option>';
+                for(index in varArray){
+                    objectiveObject = varArray[index];
+                    optionName += '<option value ="('+objectiveObject.outcome_id+','+objectiveObject.objective_id+')">'+
+                        objectiveObject.text+'</option>';
+
+                }
+                /*
                 for(outcome in varArray.outcomes){
                     optionName += '<optgroup label="' + varArray.outcomes[outcome][0].name + '">';
                     var objectiveForOutcome = varArray.objectives;
@@ -708,12 +841,17 @@ $('.filterSection').hide();
                         optionName += (option);
                     }
                     optionName += "</optgroup>";
-                }
+                }*/
                 
-
+                for(index in allObjectives){
+                    
+                    id = allObjectives[index].id
+                    $('#'+id).html(optionName);
+                    $('#'+id).selectpicker('refresh');
+                }
                 
 
-                $('#objective_0').html(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);
@@ -731,7 +869,7 @@ $('.filterSection').hide();
                     $("#objective_"+i.toString()).val(allObjectives[i].value);
                     $("#objective_"+i.toString()).selectpicker("refresh");
                 }
-                }
+                }*/
 
                 
 
@@ -794,11 +932,17 @@ $('.filterSection').hide();
 
                 if (!(json.activity_criterion.length)) {
 
-$('#DeleteButton').prop('enabled', true);
+                    $('#DeleteButton').prop('disabled', false);
+                    $("#update_the_criterion").val('Update');
+                    $("#update_criterion").attr('action', "{{ URL::action('CriteriaController@update')}}")
 
-} else {
-$('#DeleteButton').prop('disabled', true);
-}
+                } else {
+                    $('#DeleteButton').prop('disabled', true);
+                    $("#update_the_criterion").val("Create New")
+                    $("#update_criterion").attr('action', "{{ URL::action('CriteriaController@create')}}")
+                    alert("The criterion is already used in assessments. Editting the criterion will actually create a new criterion");
+
+                    }
 
                 if (!(json.criteria.length)) {
                     name = ' ';
@@ -832,8 +976,19 @@ $('#DeleteButton').prop('disabled', true);
                         $('#status').val(0);
                     else
                         $('#status').val(1);
-                    $('#assoc_maximum_score').val(json.criteria[0].maximum_score);
-                    var maximum = json.criteria[0].maximum_score;
+                    $('#assoc_maximum_score').val(json.criteria[0].max_score);
+                    var maximum = json.criteria[0].max_score;
+
+                    addOptions("Num_assoc_scale", "assoc_maximum_score", "Assoc_Scales");
+                    $('#Num_assoc_scale').val(json.criteria[0].num_scales)
+                    $('#Num_assoc_scale').selectpicker('refresh');
+                    $('#Num_assoc_scale').trigger('change');
+
+                    for(i=0; i<json.criteria[0].num_scales;i++){
+                        $('#assoc_scale_'+i).val(json.scales[i].description);
+                    }
+
+
 
                     // If copyright or notes aren't empty, load them
 
@@ -854,10 +1009,11 @@ $('#DeleteButton').prop('disabled', true);
 
                 // Select associated outcome
                 try {
-                    assocOutcomeCounter= parseInt($("#assocOutcomeGroup").data('value'));
+                    assocOutcomeCounter= parseInt($("#assocOutcomeGroup0").data('value'));
                     for (var i = assocOutcomeCounter - 1; i > 0; i--) {
-                        deleteLast("assoc_outcomeForm" + i.toString() , "assocOutcomeGroup", "assoc_close" + i.toString() ,"assoc_objectiveGroup");
+                        $('#assoc_close_button'+i).click();
                                }
+                    $('#assocOutcomeGroup0').data('value', 1);
                 } catch (err) {
                     var Notran = true;
                 }
@@ -865,36 +1021,102 @@ $('#DeleteButton').prop('disabled', true);
                 if (json.outcomes.length) {
                     $('#assoc_outcome_0').val(json.outcomes[0].id);
                     $('#assoc_outcome_0').selectpicker('refresh');
+
+                    var first_outcome_id = json.outcomes[0].id;
+                    options = "<option value ='0'>Nothing Selected</option>";
+
+                    for(objective_index  in json.objectives_assoc[first_outcome_id]){
+                        objective = json.objectives_assoc[first_outcome_id][objective_index]
+                        options += '<option value ="('+first_outcome_id+','+objective.objective_id+')">'+
+                            objective.text+'</option>';
+                    }
+                    $('#assoc_objective_0_counter_1').html(options);
+                    $('#assoc_objective_0_counter_1').selectpicker('refresh');
+                    
+                    if(json.objectives[first_outcome_id].length){
+                        objective_id = json.objectives[first_outcome_id][0].objective_id;
+                    value = '('+first_outcome_id+','+objective_id+')';
+                    $('#assoc_objective_0_counter_1').val(value);
+                    $('#assoc_objective_0_counter_1').selectpicker('refresh');
+
+                    }
+                    
+
+                    for(var i =1; i<json.objectives[first_outcome_id].length; i++ ){
+                        addAssocObjective("assoc_objectiveGroupFor0", "assoc_objective_0");
+                        objective_id = json.objectives[first_outcome_id][i].objective_id;
+                        value = "("+first_outcome_id+","+objective_id+")";
+                        $('#assoc_objective_0_counter_'+(i+1)).val(value);
+                        $('#assoc_objective_0_counter_'+(i+1)).selectpicker('refresh');
+                        
+
+
+                    }
+                    
                 } else {
                     $('#assoc_outcome_0').val($('#assoc_outcomes_fetch').find(':selected').val());
                     $('#assoc_outcome_0').selectpicker('refresh');
+
                 }
 
 
 
                 for (var i = 1; i < json.outcomes.length; i++) {
-                    addAssocOutcome();
+                    addAssocOutcome(true);
+
+
                     $('#assoc_outcome_' + i.toString()).val(json.outcomes[i].id);
                     $('#assoc_outcome_' + i.toString()).selectpicker('refresh');
 
+                    var outcome_id = json.outcomes[i].id;
+                    options = "<option value ='0'>Nothing Selected</option>";
+
+                    for(objective_index  in json.objectives_assoc[outcome_id]){
+                        objective = json.objectives_assoc[outcome_id][objective_index]
+                        options += '<option value ="('+outcome_id+','+objective.objective_id+')">'+
+                            objective.text+'</option>';
+                    }
+                    $('#assoc_objective_'+i+'_counter_1').html(options);
+                    $('#assoc_objective_'+i+'_counter_1').selectpicker('refresh');
+                    if(json.objectives[outcome_id].length){
+                        objective_id = json.objectives[outcome_id][0].objective_id;
+                        value = "("+outcome_id+","+objective_id+")"
+                    $('#assoc_objective_'+i+'_counter_1').val(value);
+                    $('#assoc_objective_'+i+'_counter_1').selectpicker('refresh')
+                    }
+                    
+
+                    for(var j =1; i<json.objectives[outcome_id].length; i++ ){
+                        addAssocObjective("assoc_objectiveGroupFor"+i, "assoc_objective_"+i);
+                        objective_id = json.objectives[outcome_id][j].objective_id;
+                        value = "("+outcome_id+","+objective_id+")";
+                        $('#assoc_objective_'+i+'_counter_'+(j+1)).val(value);
+                        $('#assoc_objective_'+i+'_counter_'+(j+1)).selectpicker('refresh');
+                        
+
+                    }
+
                 }
 
-                counterObj =$('#assoc_objectiveGroup').data('value');
+                
 
 
-                try {
+                /*try {
                     for (var i = counterObj - 1; i > 0; i--) {
                         deleteObjective('assoc_objectiveForm' + i.toString(), 'assoc_closeObj' + i.toString(), 'assoc_objectiveGroup')
                     }
                 } catch (err) {
                     var noEntro = true;
-                }
-                $('#assoc_objectiveGroup').data('value', 1);
+                }*/
 
 
+                //$('#assoc_objectiveGroup').data('value', 1);
+                //counterObj =$('#assoc_objectiveGroup').data('value');
 
 
 
+
+        /*
                 assocOutcomeCounter = 0;
                 var i = 0;
                 optionName = '<option value ="0">Nothing Selected</option>';
@@ -945,7 +1167,7 @@ $('#DeleteButton').prop('disabled', true);
                 
 
 
-
+        */
 
 
 
@@ -977,7 +1199,7 @@ $('.panel-group .panel-body').hide();
 $('#outcome-display').parent().hide();
 
 fetchCriterionForEditing();
-fetchObjectiveForSelect('outcomeGroup', 'objectiveGroup');
+fetchObjectiveForSelect('outcome0', 'objectiveGroupFor0');
 // setCriterionStatus();
 
 
@@ -1000,7 +1222,7 @@ $('.filterButton').on('click', function(e) {
     
     return false;
     });
-$('#button-add-objective-assoc').on('click', function(e) {
+$('.button-add-objective-assoc').on('click', function(e) {
 // Prevent the default action of the clicked item. In this case that is submit
 e.preventDefault();
 
@@ -1014,7 +1236,7 @@ e.preventDefault();
 
 return false;
 });
-$('#button-add-objective').on('click', function(e) {
+$('.button-add-objective').on('click', function(e) {
 // Prevent the default action of the clicked item. In this case that is submit
 e.preventDefault();
 

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

@@ -203,7 +203,7 @@
                 </div>
                 <div class="form-group">
                     <label>Select an Objective</label>
-                    <select id="select-objective" class="form-control selectpicker" onchange="fetchCriteria($('#select-outcome'), this)">
+                    <select id="select-objective" class="form-control selectpicker" onchange="fetchCriteria($('#select-outcome'), $(this))">
                         
                     </select>
                 </div>
@@ -224,7 +224,7 @@
                 </div>
                 <div class="form-group">
                     <label>Select the Type of Rubric</label>
-                <select id="number_of_scales" class="form-control selectpicker">
+                <select id="number_of_scales" class="form-control selectpicker" onchange ="fetchCriteria($('#select-outcome'), $('#select-objective'))">
                     @for($i = 1; $i <= 20; $i++)
                     @if(8%$i == 0)
                     @if($i==1)
@@ -275,6 +275,9 @@
     <div class="col-md-12">
         <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 id = "theScaleTitles">
+
+            </thead>
             <thead>
                 <tr id ="criterion-header">
                     <th></th>
@@ -287,7 +290,7 @@
 
         <div id="copyright-info">
             <hr>
-            <p class="small"><strong>Outcomes Evaluated</strong></p>
+            <p class="small"><strong>Copyright</strong></p>
             <ul id="copyright-list" class="list-unstyled small">
             </ul>
             <hr>
@@ -340,11 +343,17 @@ function fetchObjective(outcome){
 // Fetch criteria associated to a specific learning outcome
 function fetchCriteria(outcome, objective)
 {
+    amount_of_scales = parseInt($('#number_of_scales').find(':selected').val());
+            
+    maximum = parseInt($('#max_score').find(":selected").val());
     $.post
     (
         "{{ URL::route('fetchCriteria') }}",
         {
-            id: outcome.find(':selected').data('outcome-id'),
+            outcome_id: outcome.find(':selected').data('outcome-id'),
+            objective_id: objective.find(':selected').val(),
+            num_scales: amount_of_scales,
+            maximum: maximum,
             filter: $('input[name=criteria-filter]:checked').val()
         },
         function(data)
@@ -427,15 +436,17 @@ function addCriterion()
     (
         "{{ URL::route('fetchCriterionWithTemplate') }}",
         { id: id,
-        numberOfScale: numberOfScale },
+         },
         function(data)
         {
             // Append the fetched data
             copyright = null;
             notes = null;
-            if(data.crit_info.length){
-                copyright = data.crit_info[0].copyright;
-                notes = data.crit_info[0].notes;
+            if(data.criterion.copyright){
+                copyright = data.criterion.copyright;
+            }
+            if(data.criterion.notes){
+                notes = data.criterion.notes;
             }
             
             
@@ -462,17 +473,14 @@ function addCriterion()
                 str+='<span>'+data.criterion.name+'</span><sup></sup>'+subcriteria+'</td>';
             }
             numberOfScale = $('#number_of_scales').find(':selected').val();
-            if(data.scales.length)
+            
             for(i=0; i<numberOfScale; i++){
-                str+='<td class="editable" data-type="textarea">'+data.scales[i].description+'</td>';
+                str+='<td>'+data.scales[i].description+'</td>';
                 
           
             }
-            else{
-                for(i=0; i<numberOfScale; i++){
-                str+='<td class="editable" data-type="textarea"></td>';
-            }
-        }
+           
+        
         str+= '<td>'+data.outcomes+'</td>'
         
 
@@ -540,8 +548,8 @@ function buildCopyrightList()
     {
         var criterion = $(this);
         // If there's copyright info
-        if(criterion.data('copyright')!=null){
-            var copyright = criterion.data('copyright');
+        if(criterion.data('criterion-copyright')!=null){
+            var copyright = criterion.data('criterion-copyright');
             if($('#copyright-list li').length>0)
             {
                 var found = false;
@@ -661,6 +669,7 @@ function refreshSelects()
     $('#expected_percentage').selectpicker('refresh');
     $('#expected_points').selectpicker('refresh');
     $('#number_of_scales').selectpicker('refresh');
+    $('#select-objective').selectpicker('refresh');
 }
 
 // Fetch programs associated to a specific school
@@ -774,21 +783,15 @@ function loadTemplate()
                 }
                 str+= '</td>';
                 
-                for(scaleIndex in data.scales[current_criterion.id]){
+                for(scaleIndex in current_criterion.scales){
 
-                    scale = data.scales[current_criterion.id][scaleIndex];
+                    scale = current_criterion.scales[scaleIndex];
 
-                    str+='<td class="editable" data-id-value ="'+scale.scale_id+'" data-type="textarea">'+scale.description+'</td>';
+                    str+='<td>'+scale.description+'</td>';
 
                 }
-                copyright = temp_criterion[temp_c].copyright;
-                notes = temp_criterion[temp_c].notes;
-                if(copyright == null){
-                    copyright = '';
-                }
-                if(notes==null) notes ='';
-                str += '<td class = "editable" data-type = "textarea">'+copyright+'</td>';
-                str+= '<td class = "editable" data-type = "textarea">'+notes+'</td>';
+                str+= '<td>'+current_criterion.outcomes+'</td>'
+  
                 str+='<th><span class="glyphicon glyphicon-remove" aria-hidden="true"></span></th></tr>';
 
     $('table tbody').append(str);
@@ -812,6 +815,7 @@ function loadTemplate()
 
             
             }
+
             /*
             var contents = JSON.parse(data.contents);
             contents.forEach(function (data)
@@ -877,13 +881,15 @@ function loadTemplate()
             // Build Copyright List
             buildCopyrightList();
 
+            $('.editable').each(function (index){
+                $(this).text(data.titles[index].text);
+            })
+            
             var selected = $('#select-template').find(':selected');
-        var programs = {{ json_encode(Auth::user()->programs->lists('id')) }};
+            var programs = {{ json_encode(Auth::user()->programs->lists('id')) }};
         
-        var template_program = selected.data('template-program-id');
-      
+            var template_program = selected.data('template-program-id');
         
-
         if(
             {{ Auth::user()->role }}==1
             || ({{ Auth::user()->role }}==2 && selected.data('admin')!=1)
@@ -948,6 +954,7 @@ function toggleProgramSelect(school)
 
 }
 
+fetchObjective($('#select-outcome'));
 // --------------------------------------------------------------------------
 // Events
 // --------------------------------------------------------------------------
@@ -1037,17 +1044,20 @@ function changeTable(){
             
            
             newScaleHeaders = '<th></th><th>Criterion</th>';
+            editableTitles = '<th></th><th></th>';
             counter = 0;
             division = maximum/amount_of_scales;
             if(amount_of_scales==1){
-                newScaleHeaders+= "<th class = 'editable' data-type = 'textarea'>Score (1 - "+maximum+")</th>";
+                newScaleHeaders+= "<th>Score (1 - "+maximum+")</th>";
+                editableTitles += "<th  class = 'editable' data-type = 'textarea'>Click to edit Title </th>"
             }
             else if(maximum!= amount_of_scales){
             while(counter <amount_of_scales){
                 
                 minimumScore = 1+(counter*division);
                 maximumScore = (1+counter)*division;
-                newScaleHeaders+= "<th class = 'editable' data-type = 'textarea'>Scale "+ (counter +1) + " ("+minimumScore+" - "+maximumScore+")</th>";
+                newScaleHeaders+= "<th>Scale "+ (counter +1) + " ("+minimumScore+" - "+maximumScore+")</th>";
+                editableTitles+="<th  class = 'editable' data-type = 'textarea'>Click to edit Title "+(counter+1)+"</th>"
                 counter++;
             }
             }else{
@@ -1055,11 +1065,16 @@ function changeTable(){
                 
        
                 newScaleHeaders+= "<th>Scale "+ (counter +1) + " </th>";
+                editableTitles+="<th  class = 'editable' data-type = 'textarea'>Click to edit Title "+(counter+1)+"</th>"
+              
                 counter++;
             }
             }
             newScaleHeaders += '<th>Outcomes</th><th></th>';
-            
+            editableTitles += '<th></th><th></th>';
+
+
+            $('#theScaleTitles').html(editableTitles);
             $("#criterion-header").html(newScaleHeaders);
             $('#allCriteria').html(' ');
 }
@@ -1099,6 +1114,7 @@ $('#max_score').on('change', function(){
     $('#expected_points').val(expected_points);
     refreshSelects();
     changeTable();
+    fetchCriteria($('#select-outcome'), $('#select-objective'))
 })
 $('#number_of_scales').on('change', function(){
     changeTable();
@@ -1165,12 +1181,7 @@ $('.save').on('click', function(e)
     var criteriaArray = new Array();
 
     var criteria = [];
-    scales = [];
-    scalesMaxArray =[];
-    scalesMinArray =[];
-    scales_id =[];
-    copyright = [];
-    notes = [];
+    var titles = [];
 
     
     var amount_of_scales =parseInt($('#number_of_scales').find(':selected').val())+2;
@@ -1179,27 +1190,22 @@ $('.save').on('click', function(e)
     $('tbody tr').each(function( index )
     {
             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());
-
-            }
-            copyright.push($(this.children[i]).text());
-            i+=1;
-            notes.push($(this.children[i]).text());
-
-            scales.push(each_criterion_scale);
-
+            
             
             
 
             
 
-            // Clone the object and push it into the array
+            
            
 
     });
 
+    $('.editable').each(function(index){
+        titles.push($(this).text());
+    })
+
+
     //console.log('school', $('#select-school').find(':selected').data('school-id') );
     //console.log('program', $('#select-program').find(':selected').data('program-id') );
 
@@ -1218,10 +1224,11 @@ $('.save').on('click', function(e)
                 expected_points: $('#expected_points').find(':selected').val(),
                 is_visible: $('input[name=is_visible]:checked').val(),
                 criteria : criteria,
-                scales: scales,
+                //scales: scales,
                 max_score : max,
-                copyright : copyright,
-                notes :notes
+                /*copyright : copyright,
+                notes :notes*/
+                titles: titles
 
             },
             function(data)
@@ -1249,10 +1256,11 @@ $('.save').on('click', function(e)
                 expected_points: $('#expected_points').find(':selected').val(),
                 is_visible: $('input[name=is_visible]:checked').val(),
                 criteria : criteria,
-                scales: scales,
+                //scales: scales,
                 max_score : max,
-                copyright :copyright,
-                notes:notes
+                /*copyright : copyright,
+                notes :notes*/
+                titles: titles
             },
             function(data)
             {
@@ -1329,7 +1337,7 @@ if({{Auth::user()->role}}==1)
     toggleProgramSelect($('#select-school'));
 
 // Fetch criteria of first outcome
-fetchCriteria($('#select-outcome'));
+fetchCriteria($('#select-outcome'), $('#select-objective'));
 changeTable();
 
 // Hide table

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

@@ -61,11 +61,42 @@
         <h4 class="modal-title">Edit Transforming Actions</h4>
       </div>
         <div class="modal-body">
-            {{ Form::open(array('action' => array('ActivitiesController@update', $activity->id))) }}
+            {{ Form::open(array('action' => array('TransformativeActionsController@postActivityCriterion', $activity->id))) }}
+                                  
 
                 <p>A Transforming Action is the educational action to be taken to address the criteria of an unachieved Learning Outcome.</p>
                 <p>Una acción transformadora es una acción educativa a tomarse para atender el o los criterios de un dominio dado que no se alcanzaron.</p>
 
+                <h5>Choose criteria for the transforming action <br>
+                Escoge los criterion para la acción transformadora</h5>
+
+                <div class="form-group">
+
+                    {{ Form::label('select-activity-criterion', 'Criteria')}}
+                    
+                    <select id='select-activity-criterion' name = "trans_act[]"data-count = "1" class="form-control selectpicker" >
+                        @foreach ($activity_criterion as $ac)
+                       
+                        <option value='{{$ac->id}}' selected>{{$ac->name}}</option>
+
+                        @endforeach
+                    </select>
+                </div>
+
+
+                <button id='button-add-activity-criterion' class='btn btn-md btn-secondary'>
+                    <span class='glyphicon glyphicon-plus'>
+
+                    </span>
+                    Add another Criteria
+                </button>
+                <hr>
+                
+                <div class ="form-group">
+                    {{ Form::label('name_trans', 'Name of Transforming Actions')}}
+                    {{ Form::text('name_trans', '', array('class' => 'form-control')) }}
+                </div>
+                
                 <div class="form-group">
                     {{ Form::label('transforming_actions', 'Transforming Actions') }}
                     {{ Form::textarea('transforming_actions', $activity->transforming_actions, array('class' => 'form-control', 'rows'=> 4, 'placeholder'=>'Actions to improve student performance after assessment (optional)')) }}
@@ -177,7 +208,7 @@
                 @endif
 
                 <!-- If there is no assessment and the semester is active -->
-                @if($activity->outcomes_attempted == NULL && in_array($course->semester->id, $active_semesters))
+                @if($activity->o_att_array == NULL && in_array($course->semester->id, $active_semesters))
                     {{ HTML::linkAction('ActivitiesController@assess', 'Assess', array($activity->id), array('class'=>'btn btn-primary btn-sm btn-block')) }}
                 @else
                     {{ HTML::linkAction('ActivitiesController@viewAssessment', 'View Assessment Sheet', array($activity->id), array('class'=>'btn btn-primary btn-sm btn-block')) }}
@@ -185,6 +216,7 @@
 
                     <!-- If semester is active, allow users to edit assessments -->
                     @if (in_array($course->semester->id, $active_semesters))
+                    
                         {{ HTML::linkAction('ActivitiesController@assess', 'Edit Assessment', array($activity->id), array('class'=>'btn btn-primary btn-sm btn-block')) }}
                         <button class="btn btn-primary btn-sm btn-block" btn-block data-toggle="modal" data-target="#modal-confirm-delete-assessment">Delete Assessment</button>
                         <button class="btn btn-primary btn-sm btn-block" btn-block data-toggle="modal" data-target="#modal-edit-transforming-actions">Transforming Actions</button>
@@ -221,6 +253,83 @@
 <div class="row">
     <div class="col-md-12" id="criteriaGraph"></div>
 </div>
+
+<script>
+
+
+$('#button-add-activity-criterion').on('click', function(e){
+    e.preventDefault();
+
+    options = $('#select-activity-criterion').html();
+    counter = $('#select-activity-criterion').data('count');
+
+    var div = $('<div/>', {
+        'id': "selectFor"+counter
+        
+    });
+    var divForSelect = $('<div/>', {
+        'class':'col-12 form-group'
+    });
+    var select = $('<select/>', {
+        'class':'selectpicker',
+        'name': 'trans_act[]',
+
+    })
+
+
+
+    var $button = $('<button/>', {
+            'type': 'button',
+            'class': 'btn btn-primary',
+            'onclick': '$(this).parent().parent().remove();$("#button-add-activity-criterion").show(); '
+        }).html('X');
+    
+    divForSelect.append(select);
+    divForSelect.append($button);
+    div.append(divForSelect);
+  
+    $('#select-activity-criterion').parent().parent().after(div);
+    select.html(options);
+
+    refreshSelects();
+
+    countSelects = $('.selectpicker').length;
+    countOptions = $('#select-activity-criterion option').length;
+    if(countOptions == countSelects){
+        $('#button-add-activity-criterion').hide();
+    }
+
+
+
+});
+
+function refreshSelects(){
+    $('.selectpicker').each(function(){
+        $(this).selectpicker('refresh');
+    });
+}
+$(document).ready(function(){
+
+if({{count($transformative_actions)}}){
+    var trans_actions = {{json_encode($transformative_actions)}};
+    //$('#select-activity-criterion').val(trans_actions[0].activity_id);
+    $('#name_trans').val(trans_actions[0].at_text);
+    $('#transforming_actions').val(trans_actions[0].description);
+    refreshSelects();
+
+    for(index in trans_actions){
+        if(index==0) continue;
+        $('#button-add-activity-criterion').click();
+    }
+    $('.selectpicker').each(function(index){
+        $(this).val(trans_actions[index].activity_criterion_id);
+    });
+    refreshSelects();
+}
+});
+
+
+</script>
 @stop
 
 @section('included-js')
@@ -244,15 +353,15 @@ $(function () {
     $('#criteriaGraph').highcharts({
         chart: {
             type: 'bar',
-            height: {{{ count(json_decode($activity->criteria_achieved, true))*22+225 }}},
+            height: {{{ count($activity->criteria_achieved() )*22+225 }}},
         },
         title: {
             text: 'Criteria Achievement',
         },
         xAxis: {
             categories: [
-                @if($activity->criteria_achieved_percentage!=NULL)
-                    @foreach(json_decode($activity->criteria_achieved, true) as $id=>$value)
+                @if($activity->cap_array!=NULL)
+                    @foreach($activity->criteria_achieved() as $id=>$value)
                         "{{{ Criterion::withTrashed()->find($id)->name }}}",
                     @endforeach
                 @endif
@@ -274,14 +383,14 @@ $(function () {
             title: {
                 text: 'Percentage'
             },
-            @if(isset($activity->rubric->expected_percentage)  )
+            @if(isset($activity->rubric[0]->expected_percentage)  )
             plotLines:[{
-                value:{{ $activity->rubric->expected_percentage }},
+                value:{{ $activity->rubric[0]->expected_percentage }},
                 color: '#000',
                 width:3,
                 zIndex:4,
                 label:{
-                    text: 'Goal ({{ $activity->rubric->expected_percentage }}%)',
+                    text: 'Goal ({{ $activity->rubric[0]->expected_percentage }}%)',
                     style: {
                         color: '#000',
                         fontSize: '14px',
@@ -327,12 +436,12 @@ $(function () {
                 y:-1
             },
             data:[
-                @if($activity->criteria_achieved_percentage!=NULL)
-                    @foreach(json_decode($activity->criteria_achieved_percentage, true) as $id=>$value)
+                @if($activity->cap_array!=NULL)
+                    @foreach($activity->cap_array as $id=>$crit)
 
                         //This conditional is to ignore criteria that weren't assessed. These would have a value of null.
-                        @if($value)
-                            {{{ $value }}},
+                        @if($crit->score_percentage)
+                            {{{ $crit->score_percentage }}},
                         @else
                             0,
                         @endif

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

@@ -25,7 +25,7 @@
                 <table class="table table-bordered">
                     <thead id = "criteria-header">;
                         @for($i=0; $i<$rubric->num_scales; $i++)
-                        <th>Scale {{$i+1}} ({{1+($i*($rubric->max_score/$rubric->num_scales))}} - {{(1+$i)*($rubric->max_score/$rubric->num_scales)}})</th>
+                        <th>{{$rubric->titles[$i]}} ({{1+($i*($rubric->max_score/$rubric->num_scales))}} - {{(1+$i)*($rubric->max_score/$rubric->num_scales)}})</th>
                         @endfor
                         <th>Notes</th>
                     </thead>
@@ -572,7 +572,7 @@ $('.criterion-field').on('click', function()
         type: 'POST',
         url: "{{ URL::action('RubricsController@fetchRubricCriterion') }}",
         data: {
-            rubric_criterion_id: $(this).data('rubric-criterion-id')
+            criterion_id: $(this).data('criterion-id')
         },
         success: function(data)
         {

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

@@ -84,7 +84,7 @@
 <div id="rubric-container" class="row">
   <div class="col-md-12">
 
-    <table class="table">
+    <table class="table" style="table-layout: fixed">
       <thead><tr><th colspan="6 "><h3 id="rubric-name"></h3></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>
@@ -96,7 +96,7 @@
       
 
       <hr>
-      <p class="small"><strong>Outcome Information</strong></p>
+      <p class="small"><strong>Copyright Information</strong></p>
       <ul id="copyright-list" class="list-unstyled small">
       </ul>
       <hr>
@@ -114,7 +114,7 @@
 
 <script>
   
-function changeTable(){
+function changeTable(data){
     
  
             amount_of_scales = parseInt($('#num_of_scales').val());
@@ -126,25 +126,25 @@ function changeTable(){
             counter = 0;
             division = maximum/amount_of_scales;
             if(amount_of_scales==1){
-                newScaleHeaders+= "<th>Score (1 - "+maximum+")</th>";
+                newScaleHeaders+= "<th class ='titles' data-title-id  ="+data.titles[counter].title_id+">"+data.titles[counter].text+" (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>";
+                newScaleHeaders+= "<th class ='titles' data-title-id = "+data.titles[counter].title_id+">"+data.titles[counter].text+"  ("+minimumScore+" - "+maximumScore+")</th>";
                 counter++;
             }
             }else{
                 while(counter <amount_of_scales){
                 
        
-                newScaleHeaders+= "<th>Scale "+ (counter +1) + " </th>";
+                newScaleHeaders+= "<th class ='titles' data-title-id  ="+data.titles[counter].title_id+"> "+data.titles[counter].text+ " </th>";
                 counter++;
             }
             }
-            newScaleHeaders += '<th>Copyright</th><th>Notes</th>';
+            newScaleHeaders += '<th>Outcomes</th>';
             
             $("#criterion-header").html(newScaleHeaders);
             
@@ -214,7 +214,7 @@ function fetchCriteria(outcome)
 }
 
 // Build list from copyright info in rubric
-function buildOutcomeList()
+function buildCopyrightList()
 {
     // Empty the copyright list
     $('#copyright-list').empty();
@@ -223,22 +223,22 @@ function buildOutcomeList()
     {
         var criterion = $(this);
         // If there's copyright info
-        if(criterion.data('outcomes')!=null){
-            var outcomes = criterion.data('outcomes');
+        if(criterion.data('criterion-copyright')!=null){
+            var copyright = criterion.data('criterion-copyright');
             if($('#copyright-list li').length>0)
             {
                 var found = false;
                 $('#copyright-list li').each(function()
                 {
                     // If found, give the string its number
-                    if(outcomes==$(this).find('span').text())
+                    if(copyright==$(this).find('span').text())
                     {
 
                         copyrightNumber = Number.parseInt($(this).find('sup').text());
 
                         console.log('a: '+copyrightNumber);
 
-                        criterion.children('td:nth-child(1)').find('sup').text(copyrightNumber);
+                        criterion.children('td:nth-child(2)').find('sup').text(copyrightNumber);
                         found =true;
 
                         //to break
@@ -253,16 +253,16 @@ function buildOutcomeList()
                     var copyrightNumber = $('#copyright-list li').length+1;
 
                     console.log('b: '+copyrightNumber);
-                    console.log(criterion.children('td:nth-child(1)').find('sup').length);
+                    console.log(criterion.children('td:nth-child(2)').find('sup').length);
 
-                    criterion.children('td:nth-child(1)').find('sup').text(copyrightNumber);
-                    $('#copyright-list').append('<li><sup>'+copyrightNumber+' </sup><span>'+outcomes+'<span></li>');
+                    criterion.children('td:nth-child(2)').find('sup').text(copyrightNumber);
+                    $('#copyright-list').append('<li><sup>'+copyrightNumber+' </sup><span>'+copyright+'<span></li>');
                 }
             }
             else
             {
-                criterion.children('td:nth-child(1)').find('sup').text('1');
-                $('#copyright-list').append('<li><sup>1 </sup><span>'+outcomes+'<span></li>');
+                criterion.children('td:nth-child(2)').find('sup').text('1');
+                $('#copyright-list').append('<li><sup>1 </sup><span>'+copyright+'<span></li>');
             }
         }
     });
@@ -297,7 +297,7 @@ function loadTemplate()
             $('#expected_points').text(data.template.expected_points)
             $('#max').val(data.template.max_score);
             $('#num_of_scales').val(data.template.num_scales);
-            changeTable();
+            changeTable(data);
 
 
             // Set the contents of the rubric
@@ -324,26 +324,19 @@ function loadTemplate()
                 }
                 
                 
-                for(scaleIndex in data.scales[current_criterion.id]){
+                for(scaleIndex in current_criterion.scales){
 
-                    scale = data.scales[current_criterion.id][scaleIndex];
+                  scale = current_criterion.scales[scaleIndex];
 
-                    str+='<td data-scale-id ="'+scale.id+'">'+scale.description+'</td>';
+                  str+='<td>'+scale.description+'</td>';
 
-                }
-                copyright = temp_criterion[temp_c].copyright;
-                notes = temp_criterion[temp_c].notes;
-                if(copyright == null){
-                    copyright = '';
-                }
-                if(notes==null) notes ='';
-                str+= '<td >'+copyright+'</td>';
-                str+= '<td>'+notes+'</td>';
+              }
+ str+= '<td>'+current_criterion.outcomes+'</td>';
                 str+='</tr>';
-
+               
     $('table tbody').append(str);
 
-    buildOutcomeList();
+    buildCopyrightList();
 
                 
 
@@ -394,7 +387,7 @@ function loadTemplate()
                 $('table tbody').append(str);
 
                 // Build copyright list
-                buildOutcomeList();
+                buildCopyrightList();
 
                 // Enable X-Edtable on this new row
                 $('.editable').editable({
@@ -412,7 +405,7 @@ function loadTemplate()
           
 
             // Build Copyright List
-            buildOutcomeList();
+            buildCopyrightList();
         }, 
         'json',
     );
@@ -473,7 +466,7 @@ function loadTemplate()
       });
 
       // Build Copyright List
-      buildOutcomeList();
+      buildCopyrightList();
     }
   );
 }
@@ -502,7 +495,7 @@ $('#button-save-rubric').on('click', function(e)
   e.preventDefault();
 
   var criteria = [];
-  scales = [];
+  var titles =  [];
   max_score = $('#max').val();
 
   // For each criterion in the rubric, get its value and put it into an array
@@ -510,15 +503,8 @@ $('#button-save-rubric').on('click', function(e)
   {
 
     criteria.push($(this).data('criterion-id'));
-    each_criterion_scale =[];
-    $(this).children('td').each(function(index){
-      if(index!=0 )
-      each_criterion_scale.push($(this).text());
-      
-    })
-each_criterion_scale.pop();
-each_criterion_scale.pop();
-    scales.push(each_criterion_scale);
+
+    
     /*
       criterionObject.id = $(this).data('criterion-id');
       criterionObject.outcome_id = $(this).data('assoc-outcome-id');
@@ -542,8 +528,16 @@ each_criterion_scale.pop();
       var clone = jQuery.extend({}, criterionObject);
       criteriaArray.push(clone);
 */
+
+  });
+
+  $('.titles').each(function(index){
+    titles.push($(this).data('title-id'));
   });
 
+
+  
+
   // If activity does not have a rubric, create it
   if($('#assigned_rubric').length === 0)
   {
@@ -560,7 +554,7 @@ each_criterion_scale.pop();
         expected_percentage: $('#expected_percentage').text(),
         expected_points: $('#expected_points').text(),
         criteria: criteria,
-        scales: scales,
+        titles:titles,
         max_score:max_score
 
 
@@ -586,7 +580,7 @@ each_criterion_scale.pop();
         expected_percentage: $('#expected_percentage').text(),
         expected_points: $('#expected_points').text(),
         criteria: criteria,
-        scales: scales,
+        titles:titles,
         max_score:max_score
       },
       function(data)

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

@@ -54,13 +54,34 @@
 
 
         <table id="assessment-table" class="table table-striped table-condensed table-bordered">
+            
             <thead>
+                <tr>
+
+                    <th>
+                        
+                    </th>
+                    @foreach ($rubric_criterion as $index => $criterion)
+                    
+                        
+                        <th data-criterion-id="{{{ $criterion->criterion_id }}}" id="weight-{{$index}}"  data-weight = " {{$criterion->weight}}" data-activity-criterion-id="{{$criterion->activity_criterion_id}}">
+                        Weight: {{$criterion->weight}}
+                        </th>
+                        
+                        
+                @endforeach
+                <th></th>
+                <th></th>
+                <th></th>
+                </tr>
                     <tr>
                         <th>Student</th>
-                        @foreach ($rubric_contents as $criterion)
-                            <th class="criterion-field" data-criterion-id="{{{ $criterion->id }}}"><div class="th-box">{{ $criterion->name}}</div></th>
+                        @foreach ($rubric_criterion as $criterion)
+                            <th class="criterion-field" data-criterion-id="{{{ $criterion->criterion_id }}}"><div class="th-box">{{ $criterion->name}}</div></th>
                         @endforeach
                         <th>Student Percentage</th>
+                        <th>Student % Per Weight</th>
+                        <th>Comments</th>
                     </tr>
             </thead>
             <tbody>
@@ -68,22 +89,28 @@
             <!-- If the activity was assessed, load the assessment. Otherwise load empty sheet -->
             @if(sizeof($assessments)!=0)
                 <!-- For each assessment -->
-                @foreach ($assessments as $assessment)
-                    <tr class="student-row">
-                        <!-- Fetch student name -->
-                        <td class="student-field" data-student-id="{{ $assessment->student_id }}">
-                            {{{ Student::find($assessment->student_id)->name }}}
+                @foreach ($students as $student)
+                <tr class="student-row">
+                    <!-- Fetch student name -->
+                    <td class="student-field" data-student-id="{{ $student->id }}">
+                        {{{ $student->name }}}
+                    </td>
+
+                    <!-- For each criterion in the rubric, there's a score field -->
+                    @for ($i = 0; $i<sizeof($rubric_criterion); $i++)
+                        <td class="score-field text-center">
+                            {{$scores_array[$student->id][$i]}}
                         </td>
+                            
+                    @endfor
+                    <td class="percentage text-center"></td>
+                    <td class="percentage-per-weight text-center"></td>
+                    <td class="">
+                        <textarea class="comments full-textarea" placeholder="Max. 255 characters" maxLength="255" disabled >{{ $scores_array[$student->id]["comments"] }}</textarea>
+                    </td>
+                 </tr>
+            @endforeach
 
-                        <!-- For each criterion in the rubric, there's a score field -->
-                        @for ($i = 0; $i<sizeof($rubric_contents); $i++)
-                            <td class="score-field text-center">
-                                {{ $scores_array[$assessment->id][$rubric_contents[$i]->id] }}
-                            </td>
-                        @endfor
-                        <td class="percentage text-center">{{{ $assessment->percentage }}}</td>
-                     </tr>
-                @endforeach
             @endif
             </tbody>
             <tfoot>
@@ -91,7 +118,7 @@
                     <td>
                         <strong>Passed Criteria Percentage </strong>
                     </td>
-                    @for ($i = 0; $i<sizeof($rubric_contents); $i++)
+                    @for ($i = 0; $i<sizeof($rubric_criterion); $i++)
                         <td class="total text-center"><strong><span class="total-value"></span>%</strong>
                         </td>
                     @endfor
@@ -102,7 +129,13 @@
         </table>
     </div>
 </div>
+<input type='hidden' value = {{$rubric->max_score}} id = "max">
+
+<script>
+
+
 
+    </script>
 @stop
 
 @section('included-js')
@@ -177,7 +210,7 @@ function percentagePerCriterionPlain(columnIndex)
 // Calculate total for a specific student
 function percentagePerStudentPlain(row)
 {
-    // Object to hold the score student's total score
+   /* // Object to hold the score student's total score
     var sum = 0 ;
     var total = 0;
     var percentage = 0;
@@ -199,6 +232,48 @@ function percentagePerStudentPlain(row)
         percentage="0.00";
 
     row.find('.percentage').html('<strong>'+percentage+'%</strong>');
+*/
+
+    var sum = 0 ;
+    var total = 0;
+    var percentage = 0;
+    var max_score = parseInt($('#max').val());
+    sum_of_weight = 0;
+    per_of_weight =0;
+
+    row.find('td.score-field').each(function(index)
+    {
+        var val =  parseInt($(this).text());
+        if(val % 1 === 0) //If number is integer
+        {
+            sum += val;
+            total+=1;
+            per_of_weight += val * parseInt($('#weight-'+index).data("weight")); 
+            sum_of_weight += parseInt($('#weight-'+index).data("weight"));
+        }
+
+    });
+    percentage_per_weight = (100 *(per_of_weight/(max_score*sum_of_weight))).toFixed(2);
+    percentage =((sum/(total*max_score))*100).toFixed(2);
+
+    //If percentage is not a number, set it to 0.
+    if(isNaN(percentage))
+    {
+        percentage="N/A";
+        row.find('.percentage').html('<strong>'+percentage+'</strong>');
+    }
+    else
+    {
+        row.find('.percentage').html('<strong>'+percentage+'%</strong>');
+    }
+    if(isNaN(percentage_per_weight)){
+        percentage_per_weight="N/A";
+        row.find('.percentage-per-weight').html('<strong>'+percentage_per_weight+'</strong>');
+    }
+    else{
+        row.find('.percentage-per-weight').html('<strong>'+percentage_per_weight+'%</strong>');
+    }
+
 
 }
 

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

@@ -33,7 +33,7 @@
             <th></th>
             <th>Criterion</th>
             @for($i = 0; $i<$rubric->num_scales; $i++)
-            <th>Scale {{$i+1}} ({{1+($i*($rubric->max_score/$rubric->num_scales))}} - {{(1+$i)*($rubric->max_score/$rubric->num_scales)}})</th>
+            <th> {{$rubric->titles[$i]}} ({{1+($i*($rubric->max_score/$rubric->num_scales))}} - {{(1+$i)*($rubric->max_score/$rubric->num_scales)}})</th>
             @endfor
             <th>Learning Outcome</th>
           </tr>