Squashed commit of the following:

commit f75627ee58
Author: Gabriel A. Santiago Plaza <gabriel.santiago21@upr.edu>
Date:   Fri Jun 25 17:13:57 2021 -0400

    Antes de volver al merge

commit 025103dc98
Author: Gabriel A. Santiago Plaza <gabriel.santiago21@upr.edu>
Date:   Tue Jun 22 15:58:10 2021 -0400

    sE ACAbo ese juego

commit 996d4d8f12
Merge: 6592b0a 02d188a
Author: Gabriel A. Santiago Plaza <gabriel.santiago21@upr.edu>
Date:   Tue Jun 22 14:51:04 2021 -0400

    Merge branch 'Merge_gabriel_mayo' into ANTES-DE-MEZCLAR

commit 6592b0a485
Author: Gabriel A. Santiago Plaza <gabriel.santiago21@upr.edu>
Date:   Tue Jun 22 11:12:34 2021 -0400

    ANtes de terminar assessment

commit 25016ca2d3
Author: Gabriel A. Santiago Plaza <gabriel.santiago21@upr.edu>
Date:   Sun Jun 20 13:41:34 2021 -0400

    Cambioos a rubrics, y poco de assessment

.gitignore

@@ -12,3 +12,4 @@ app/config/app.php
 app/config/database.php
 node_modules/
 app/config/
+app/controllers/AuthController.php

app/controllers/ActivitiesController.php

@@ -169,22 +169,48 @@ class ActivitiesController extends \BaseController
         Log::info($activity);
         $criterion_rubric = DB::table('criteria')
             ->join("criterion_rubric", "criterion_rubric.criterion_id", "=", "criteria.id")
-            ->where('criterion_rubric.rubric_id', '=', $rubric->id)->get();
+            ->join("activity_criterion", "criteria.id", '=', 'activity_criterion.criterion_id')
+            ->where("activity_criterion.activity_id", '=', $activity->id)
+            ->where('criterion_rubric.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('criterion_rubric.rubric_id', 'criterion_rubric.id as rubric_criterion_id')
+            ->addSelect('criterion_rubric.copyright', 'criterion_rubric.notes')
+            ->get();
+        Log::info($criterion_rubric);
+        foreach ($criterion_rubric 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)
+                ->orderBy('position')
+                ->lists('description'));
+        }
+        $criterion_rubric_ids = DB::table('criterion_rubric')->where('rubric_id', '=', $rubric->id)->lists('id');
         Log::info($rubric);
         Log::info($criterion_rubric);
 
-        $rubric_contents = json_decode($rubric->contents);
 
-        // Get results
-        $assessments = DB::table('assessments')->join('students', 'assessments.student_id', '=', 'students.id')->where('activity_id', '=', $activity->id)->orderBy('assessments.id', 'asc')->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][$index] = $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.assessment', compact('activity', 'title', 'students', 'course', 'rubric_contents', 'assessments', 'scores_array', 'rubric'));
+        Log::info($scores_array);
+
+
+        return View::make('local.professors.assessment', compact('activity', 'title', 'students', 'course', 'criterion_rubric', 'assessments', 'scores_array', 'rubric'));
     }
 
     public function saveAssessment()
@@ -193,9 +219,49 @@ class ActivitiesController extends \BaseController
             $exception = DB::transaction(function () {
                 DB::transaction(function () {
                     // Student assessment data
-                    $student_data = json_decode(Input::get('student_scores'));
 
+                    $activity_id = Input::get('activity_id');
+                    $student_data = json_decode(Input::get('student_info'));
+                    $weights = json_decode(Input::get('weights'));
+                    Log::info(json_encode($weights));
+                    Log::info(json_encode($student_data));
+
+                    foreach ($student_data as $index => $student_dict) {
+                        $student_id = $student_dict->studentId;
+                        foreach ($student_dict->activity_crit_id as $act_crit_id => $score) {
+                            if (DB::table('assessments')->where('student_id', '=', $student_id)
+                                ->where('activity_criterion_id', '=', $act_crit_id)
+                                ->first()
+                            ) {
+                                DB::table('assessments')->where('student_id', '=', $student_id)
+                                    ->where('activity_criterion_id', '=', $act_crit_id)
+                                    ->update(array('score' => $score));
+                            } else {
+                                DB::insert("insert into assessments (`activity_criterion_id`, `student_id`, `score`) values ({$act_crit_id}, {$student_id}, {$score})");
+                            }
+                        }
+                        if (DB::table('activity_student')
+                            ->where('student_id', '=', $student_id)->where('activity_id', '=', $activity_id)
+                            ->first()
+                        ) {
+                            DB::table('activity_student')
+                                ->where('student_id', '=', $student_id)->where('activity_id', '=', $activity_id)
+                                ->update(array('comments' => $student_dict->comments));
+                        } else {
+                            DB::insert("insert into activity_student (`activity_id`, `student_id`, `comments`) values ({$activity_id}, {$student_id}, '{$student_dict->comments}')");
+                        }
+                    }
+                    $activity_draft = Input::get('draft');
+
+                    foreach ($weights as $act_crit => $weigh) {
+                        DB::update("update activity_criterion set weight = {$weigh} where id = {$act_crit}");
+                    }
+                    DB::update("update activities set draft = {$activity_draft} where id = {$activity_id}");
                     // Outcome count
+                    Session::flash('status', 'success');
+                    Session::flash('message', 'Assessment Saved. To add transforming actions click "Transforming Actions".');
+                    return action('ActivitiesController@show', array(Input::get('activity_id')));
+
                     $outcomeCount = Outcome::all()->count();
 
 
@@ -215,9 +281,9 @@ class ActivitiesController extends \BaseController
                             }
 
                             // Add the assessment to the pivot table
+
                             $student->assessed_activities()->attach($activity->id, array(
                                 'scores' => json_encode($single_student_data->scores),
-                                'percentage' => $single_student_data->percentage,
                                 'comments' => $single_student_data->comments
                             ));
                         }
@@ -676,7 +742,7 @@ class ActivitiesController extends \BaseController
         $rubric_contents = Rubric::select('contents')->where('id', '=', $activity->rubric_id)->get();
         $rubric_contents = json_decode($rubric_contents['0']->contents);
 
-        $rubric = Rubric::find($activity->rubric_id);
+        $rubric = Rubric::find($activity->rubric[0]->id);
 
         // Get results
         $assessments = DB::table('assessments')->where('activity_id', '=', $activity->id)->orderBy('id', 'asc')->get();

app/controllers/CriteriaController.php

@@ -54,6 +54,10 @@ class CriteriaController extends \BaseController
     {
         $json_to_send = array();
         $json_to_send['criterion'] = DB::table('criteria')->where('id', '=', Input::get('id'))->first();
+        $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");
+        Log::info("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");
 
 
 
@@ -63,8 +67,8 @@ class CriteriaController extends \BaseController
     public function fetchCriterion()
     {
         $json_to_send = array();
-        $json_to_send['criterion'] = DB::table('criteria')->where('id', '=', Input::get('id'))->first();
 
+        $json_to_send['criterion'] = DB::table('criteria')->where('id', '=', Input::get('id'))->first();
 
 
 

app/controllers/RubricsController.php

@@ -33,6 +33,9 @@ class RubricsController extends \BaseController
         $outcomes = Outcome::orderBy('name', 'ASC')->get();
         $criteria = Criterion::orderBy('name', 'ASC')->get();
         $rubric = $activity->rubric;
+        Log::info($rubric);
+        Log::info($activity->rubric_id);
+        Log::info($activity->rubric[0]->id);
 
         return View::make('local.professors.rubrics', compact('title', 'templates', 'outcomes', 'criteria', 'rubrics', 'activity', 'rubric'));
     }
@@ -91,7 +94,8 @@ class RubricsController extends \BaseController
         $rubric->user_id = Auth::id();
         $rubric->num_scales = count($scales[0]);
         $rubric->max_score = Input::get('max_score');
-        $division = $rubric->max_score / count($scales[0]);
+        $defaultWeight = round(100 / $rubric->num_scales, 2);
+
         if ($rubric->save()) {
 
             // Process activity
@@ -105,21 +109,35 @@ class RubricsController extends \BaseController
             $rubricId = $rubric->id;
             foreach ($criteria as $index => $criterion_id) {
                 DB::insert("insert into criterion_rubric (`rubric_id`,`criterion_id`) values ({$rubricId},{$criterion_id})");
+                DB::commit();
                 $rubric_criterion_id = DB::table('criterion_rubric')->where('rubric_id', '=', $rubricId)
                     ->where('criterion_id', '=', $criterion_id)->first();
 
+
+
                 for ($i = 0; $i < count($scales[$index]); $i++) {
-                    $scale = new Scale;
-                    $scale->description = $scales[$index][$i];
-                    $scale->min_score = 1 + ($division * $i);
-                    $scale->max_score = ($division * ($i + 1));
-                    if ($scale->save()) {
+                    $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 {
-                        Session::flash('status', 'danger');
-                        Session::flash('message', 'Rubric could not be created.');
+                        $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();
             }
             Session::flash('status', 'success');
             Session::flash('message', 'Rubric assigned.');
@@ -150,94 +168,159 @@ class RubricsController extends \BaseController
      */
     public function update()
     {
+        Log::info('entré???');
         $rubric = Rubric::find(Input::get('id'));
+
+        $scales = Input::get('scales');
+        $criteria = Input::get('criteria');
+
+        // Process rubric
         $rubric->name = Input::get('name');
 
         $rubric->expected_percentage = Input::get('expected_percentage');
         $rubric->expected_points = Input::get('expected_points');
 
+        $rubric->num_scales = count($scales[0]);
+        $rubric->max_score = Input::get('max_score');
+        $defaultWeight = round(100 / $rubric->num_scales, 2);
+
+
         DB::beginTransaction();
 
-        try {
-            // Get associated activity
-            $activity = Activity::where('rubric_id', '=', $rubric->id)->first();
 
-            // If the associated activity has been assessed, delete the records
+        // Get associated activity
+        //$activity = Activity::where('rubric_id', '=', $rubric->id)->first();
+
+        $activity_id = DB::table('activities')
+            ->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
+            ->where('rubric_id', '=', $rubric->id)
+            ->first();
+
+        $activity = Activity::where('id', '=', $activity_id->activity_id)->first();
+
+
+
+        // If the associated activity has been assessed, delete the records
+        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);
+        $activities = $course->activities;
+
+        // Check if any assessed activities remain
+        $remainingAssessed = false;
+        foreach ($course->activities as $activity) {
             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;
+                $remainingAssessed = true;
+                break;
             }
+        }
+        Log::info('entré4???');
 
-            $rubric->save();
-            $activity->save();
-
-            // Get all the course's activities
-            $course = Course::find($activity->course->id);
-            $activities = $course->activities;
+        //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);
+            $course_outcomes_achieved = array_fill(1, Outcome::all()->count(), 0);
 
-            // Check if any assessed activities remain
-            $remainingAssessed = false;
-            foreach ($course->activities as $activity) {
+            // For each activity
+            foreach ($activities as $activity) {
+                // If activity has been assessed
                 if ($activity->outcomes_attempted != NULL) {
-                    $remainingAssessed = true;
-                    break;
+                    // Get the achieved criteria
+                    $criteria_achievement = json_decode($activity->criteria_achieved, true);
+                    foreach ($criteria_achievement as $criterion_id => $criterion_achieved) {
+                        // Find corresponding learning outcome;
+                        $criterion = Criterion::find($criterion_id);
+                        $outcome = Outcome::find($criterion->outcome_id);
+
+                        // If criterion is achieved (1), add 1 to both arrays
+                        if ($criterion_achieved === 1) {
+                            $course_outcomes_attempted[$outcome->id] += 1;
+                            $course_outcomes_achieved[$outcome->id] += 1;
+                        }
+                        // Else, only add to the attempted outcomes arrays
+                        elseif ($criterion_achieved === 0) {
+                            $course_outcomes_attempted[$outcome->id] += 1;
+                        }
+                    }
                 }
             }
+            Log::info('entré5???');
+            // Update course
+            $course->outcomes_achieved = json_encode($course_outcomes_achieved);
+            $course->outcomes_attempted = json_encode($course_outcomes_attempted);
+        } else {
+            // Update course
+            $course->outcomes_achieved = NULL;
+            $course->outcomes_attempted = NULL;
+        }
 
-            //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);
-                $course_outcomes_achieved = array_fill(1, Outcome::all()->count(), 0);
-
-                // For each activity
-                foreach ($activities as $activity) {
-                    // If activity has been assessed
-                    if ($activity->outcomes_attempted != NULL) {
-                        // Get the achieved criteria
-                        $criteria_achievement = json_decode($activity->criteria_achieved, true);
-                        foreach ($criteria_achievement as $criterion_id => $criterion_achieved) {
-                            // Find corresponding learning outcome;
-                            $criterion = Criterion::find($criterion_id);
-                            $outcome = Outcome::find($criterion->outcome_id);
-
-                            // If criterion is achieved (1), add 1 to both arrays
-                            if ($criterion_achieved === 1) {
-                                $course_outcomes_attempted[$outcome->id] += 1;
-                                $course_outcomes_achieved[$outcome->id] += 1;
-                            }
-                            // Else, only add to the attempted outcomes arrays
-                            elseif ($criterion_achieved === 0) {
-                                $course_outcomes_attempted[$outcome->id] += 1;
-                            }
+        $course->save();
+        Log::info('entré6???');
+        DB::delete("delete from criterion_rubric 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 criterion_rubric (`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('criterion_rubric')
+                    ->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));
                         }
                     }
                 }
-
-                // Update course
-                $course->outcomes_achieved = json_encode($course_outcomes_achieved);
-                $course->outcomes_attempted = json_encode($course_outcomes_attempted);
             } else {
-                // Update course
-                $course->outcomes_achieved = NULL;
-                $course->outcomes_attempted = NULL;
+                DB::rollBack();
+                Session::flash('status', 'danger');
+                Session::flash('message', 'Rubric could not be created.');
+                return action('ActivitiesController@show', array($activity->id));
             }
+        }
+        Log::info('entré7???');
 
-            $course->save();
-            DB::commit();
+        DB::commit();
 
-            Session::flash('status', 'success');
-            Session::flash('message', 'Rubric updated.');
 
-            return action('ActivitiesController@show', array($activity->id));
-        } catch (Exception $e) {
-            DB::rollBack();
-            Session::flash('status', 'danger');
-            Session::flash('message', 'Error: The rubric could not be updated. Try again later.');
-        }
+        Session::flash('status', 'success');
+        Session::flash('message', 'Rubric updated.');
+
+        return action('ActivitiesController@show', array($activity->id));
     }
 
     /**
@@ -277,8 +360,28 @@ class RubricsController extends \BaseController
         Log::info($activity->rubric[0]->id);
 
         $rubric = Rubric::where('id', '=', $activity->rubric[0]->id)->firstOrFail();
+        $criterion_rubric = DB::table('criteria')
+            ->join('criterion_rubric', 'criterion_rubric.criterion_id', '=', 'criteria.id')
+            ->where('criterion_rubric.rubric_id', '=', $activity->rubric[0]->id)
+            ->get();
+        Log::info($criterion_rubric);
+
+        foreach ($criterion_rubric 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)
+                ->orderBy('position')
+                ->lists('description'));
+            $single_cr->outcomes = json_encode(DB::table('outcomes')
+                ->join('criterion_objective_outcome', 'outcomes.id', '=', 'criterion_objective_outcome.outcome_id')
+                ->where('criterion_objective_outcome.criterion_id', '=', $single_cr->criterion_id)->lists('name'));
+        }
+
+
+        Log::info($criterion_rubric);
+
         $title = $activity->name . ': ' . $rubric->name;
-        return View::make('local.professors.viewrubric', compact('rubric', 'activity', 'title', 'course'));
+        return View::make('local.professors.viewrubric', compact('rubric', 'activity', 'criterion_rubric', 'title', 'course'));
     }
 
     /**
@@ -330,15 +433,23 @@ class RubricsController extends \BaseController
 
     public function fetchRubricCriterion()
     {
-        $rubric = Rubric::findOrFail(Input::get('rubric_id'));
-        $criterion_id = Input::get('criterion_id');
-
-        $rubric_contents = json_decode($rubric->contents);
-
-        foreach ($rubric_contents as $key => $criterion) {
-            if ($criterion->id == $criterion_id) {
-                return json_encode($criterion);
-            }
-        }
+        $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();
+        Log::info($rubric);
+
+        $rubric["criteria"] = DB::table("criteria")
+            ->join("criterion_rubric", 'criterion_rubric.criterion_id', '=', 'criteria.id')
+            ->where("criterion_rubric.id", '=', Input::get('rubric_criterion_id'))
+            ->select('name', 'criterion_rubric.notes')
+            ->first();
+        return json_encode($rubric);
+
+        //$rubric_contents = json_decode($rubric->contents);
+
+        //foreach ($rubric_contents as $key => $criterion) {
+        //    if ($criterion->id == $criterion_id) {
+        //        return json_encode($criterion);
+        //    }
     }
 }

app/controllers/TemplatesController.php

@@ -145,7 +145,7 @@ class TemplatesController extends \BaseController
 
 		$template->num_scales = count($scales[0]);
 		$template->max_score = $max_score;
-		$division = $max_score / count($scales[0]);
+
 		if ($template->save()) {
 			$templateId = $template->id;
 			foreach ($criteria as $index => $criterion_id) {
@@ -154,15 +154,22 @@ class TemplatesController extends \BaseController
 					->where('criterion_id', '=', $criterion_id)->first();
 
 				for ($i = 0; $i < count($scales[$index]); $i++) {
-					$scale = new Scale;
-					$scale->description = $scales[$index][$i];
-					$scale->min_score = 1 + ($division * $i);
-					$scale->max_score = ($division * ($i + 1));
-					if ($scale->save()) {
+					$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 {
-						Session::flash('status', 'danger');
-						Session::flash('message', 'Rubric could not be created.');
+						$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.');
+						}
 					}
 				}
 			}
@@ -251,7 +258,7 @@ class TemplatesController extends \BaseController
 		Log::info(Input::all());
 		$template->num_scales = count($scales[0]);
 		$template->max_score = $max_score;
-		$division = $max_score / count($scales[0]);
+		//$division = $max_score / count($scales[0]);
 
 		if ($template->save()) {
 			$templateId = $template->id;
@@ -263,15 +270,26 @@ class TemplatesController extends \BaseController
 					->where('criterion_id', '=', $criterion_id)->first();
 				DB::delete("delete from template_criterion_scale where template_criterion_id ={$template_criterion_id->id}");
 				for ($i = 0; $i < count($scales[$index]); $i++) {
-					$scale = new Scale;
-					$scale->description = $scales[$index][$i];
-					$scale->min_score = 1 + ($division * $i);
-					$scale->max_score = ($division * ($i + 1));
-					if ($scale->save()) {
+					$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 {
-						Session::flash('status', 'danger');
-						Session::flash('message', 'Rubric could not be created.');
+						$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.');
+						}
 					}
 				}
 			}

app/database/migrations/2021_06_22_150017_delete_min_max_scales.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Blade;
+
+class DeleteMinMaxScales extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('scales', function (Blueprint $table) {
+			$table->dropColumn(array('min_score', 'max_score'));
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('scales', function (Blueprint $table) {
+			$table->integer('min_score')->unsigned();
+			$table->integer('max_score')->unsigned();
+		});
+	}
+}

app/database/migrations/2021_06_22_150108_add_copyright_notes_rubric_criterion.php

@@ -0,0 +1,41 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Schema;
+
+class AddCopyrightNotesRubricCriterion extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('criterion_rubric', function (Blueprint $table) {
+			$table->text('copyright')->nullable();
+			$table->text('notes')->nullable();
+		});
+		Schema::table('template_criterion', function (Blueprint $table) {
+			$table->text('copyright')->nullable();
+			$table->text('notes')->nullable();
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('criterion_rubric', function (Blueprint $table) {
+			$table->dropColumn(array('copyright', 'notes'));
+		});
+		Schema::table('template_criterion', function (Blueprint $table) {
+			$table->dropColumn(array('copyright', 'notes'));
+		});
+	}
+}

app/database/migrations/2021_06_22_150135_change_weight_float.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class ChangeWeightFloat extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('activity_criterion', function (Blueprint $table) {
+
+			DB::statement("ALTER TABLE `activity_criterion` MODIFY COLUMN `weight` decimal(6,2)");
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('activity_criterion', function (Blueprint $table) {
+
+			DB::statement("ALTER TABLE `activity_criterion` MODIFY COLUMN `weight` decimal(3,2)");
+		});
+	}
+}

app/models/Scale.php

@@ -4,9 +4,6 @@ use Illuminate\Database\Eloquent\SoftDeletingTrait;
 
 class Scale extends Eloquent
 {
-    use SoftDeletingTrait;
-    protected $dates = ['deleted_at'];
-
     protected $table = 'scales';
 
     public function outcomes()

app/models/Student.php

@@ -16,6 +16,7 @@ class Student extends Eloquent
 
   public function assessed_activities()
   {
-  	return $this->belongsToMany('Activity', 'assessments')->withPivot('scores', 'percentage')->withTimestamps();
+    //return $this->belongsToMany('Activity', 'assessments')->withPivot('scores', 'percentage')->withTimestamps();
+    return $this->belongsToMany('Activity', 'assessments')->withPivot('scores')->withTimestamps();
   }
 }

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

@@ -371,6 +371,7 @@ function addCriterion()
 
     // Check for duplicates
     var duplicates=false;
+    numberOfScale = $('#number_of_scales').find(':selected').val();
     $('tbody tr').each(function()
     {
         if ($(this).data('criterion-id') == id)
@@ -398,7 +399,8 @@ function addCriterion()
     $.post
     (
         "{{ URL::route('fetchCriterionWithTemplate') }}",
-        { id: id},
+        { id: id,
+        numberOfScale: numberOfScale },
         function(data)
         {
             // Append the fetched data
@@ -425,10 +427,17 @@ 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"></td>';
+                str+='<td class="editable" data-type="textarea">'+data.scales[i].description+'</td>';
+                
           
             }
+            else{
+                for(i=0; i<numberOfScale; i++){
+                str+='<td class="editable" data-type="textarea"></td>';
+            }
+        }
 
             str +='<th><span class="glyphicon glyphicon-remove icon-btn" aria-hidden="true"></span></th></tr>';
 

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

@@ -23,15 +23,17 @@
             </div>
             <div class="modal-body">
                 <table class="table table-bordered">
-                    <thead>
-                        <th>Beginning (1-2)</th>
-                        <th>In Progress (3-4)</th>
-                        <th>Good (5-6)</th>
-                        <th>Excellent (7-8)</th>
+                    <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>
+                        @endfor
                         <th>Notes</th>
                     </thead>
                     <tbody>
-                        <tr></tr>
+                        <tr>
+                            
+                            
+                        </tr>
                     </tbody>
                 </table>
             </div>
@@ -59,8 +61,8 @@
                     <li>If a particular criterion was assessed but the student did not complete the necessary work, you must select "0". This <strong>will</strong> affect the student's score.</li>
                     <li>If a student did not complete any work for this activity, select "0" for all columns in that student's row.</li>
                     <li>If a student dropped the class, select "N/A" (Not Applicable) for all columns in that student's row.</li>
-                    <li>Cells with "N/A" <strong>will not</strong> be used to determine whether a criterion is achieved. Only scores from 0 to 8 will be considered for this purpose.</li>
-                    <li><strong>At least one score must be from 1-8.</strong> Otherwise, the 'Publish Assessment' and 'Save as Draft' buttons will be <strong>disabled</strong>. If you want to delete previously saved scores, go back to the activity and click the "Delete Assessment" button.</li>
+                    <li>Cells with "N/A" <strong>will not</strong> be used to determine whether a criterion is achieved. Only scores from 0 to {{$rubric->max_score}} will be considered for this purpose.</li>
+                    <li>For this activity, <strong>at least one score must be from 1-{{$rubric->max_score}}.</strong> Otherwise, the 'Publish Assessment' and 'Save as Draft' buttons will be <strong>disabled</strong>. If you want to delete previously saved scores, go back to the activity and click the "Delete Assessment" button.</li>
 
                 </ul>
             </div>
@@ -80,15 +82,16 @@
                     <li>Si un criterio particular fue evaluado, pero el estudiante no completó el trabajo necesario, debe seleccionar "0". Esto <strong>sí</strong> afectará la puntuación final del estudiante.</li>
                     <li>Si un estudiante no completó el trabajo para esta actividad, seleccione "0" en todas las columnas de la fila de ese estudiante.</li>
                     <li>Si un estudiante se dio de baja, seleccione "N/A" (No Aplica) en todas las columnas de la fila de ese estudiante.</li>
-                    <li>Las celdas con "N/A" <strong>no</strong> serán utilizadas para determinar si un criterio se alcanzó o no. Solamente las puntuaciones del 0 al 8 serán consideradas.</li>
-                    <li><strong>Al menos una puntuación deber ser del 1 al 8.</strong> De otra manera, el botón para guardar <strong>se desactivará</strong>. Si quiere borrar los resultados del avalúo, vuelva a la actividad y oprima el botón que dice "Delete Assessment".</li>
+                    <li>Las celdas con "N/A" <strong>no</strong> serán utilizadas para determinar si un criterio se alcanzó o no. Solamente las puntuaciones del 0 al {{$rubric->max_score}} serán consideradas.</li>
+                    <li>Para esta actividad, <strong>al menos una puntuación deber ser del 1 al {{$rubric->max_score}}.</strong> De otra manera, el botón para guardar <strong>se desactivará</strong>. Si quiere borrar los resultados del avalúo, vuelva a la actividad y oprima el botón que dice "Delete Assessment".</li>
 
 
                 </ul>
             </div>
 
         </div>
-
+        <input type='hidden' id='max' name= 'max' value='{{$rubric->max_score}}'>
+        <input type ='hidden' id='num_of_scales' name ='num_of_scales' value ='{{$rubric->num_scales}}'>
         <p id="course">Course: {{{ $course->code }}} {{{ $course->number }}}</p>
         <p id="section">Section: {{{ $course->section }}}</p>
         {{ HTML::linkAction('ActivitiesController@show', 'Back to Activity', array($activity->id), array('class'=>'btn btn-default btn-sm pull-right')) }}
@@ -97,16 +100,27 @@
 
         <table data-rubric-id="{{{ $rubric->id }}}" id="assessment-table" class="table table-striped table-condensed table-bordered">
             <thead>
+                <tr>
+                    <th>
+                    </th>
+                    @foreach ($criterion_rubric as $index => $criterion)
+                    <th  data-criterion-id="{{{ $criterion->criterion_id }}}" ><div class="th-box">
+                        
+                        Weight<input class="form-control" id="weight-{{$index}}" name='weight[]' type="text"  value="{{$criterion->weight}}" data-activity-criterion-id="{{$criterion->activity_criterion_id}}">
+                        </div></th>
+                @endforeach
+                </tr>
                     <tr>
                         <th>
                             <div class="th-box">
                                 Student
                             </div>
                         </th>
-                        @foreach ($rubric_contents as $criterion)
-                            <th class="criterion-field" data-criterion-id="{{{ $criterion->id }}}"><div class="th-box">{{ $criterion->name}}</div></th>
+                        @foreach ($criterion_rubric as $criterion)
+                            <th class="criterion-field" data-activity-criterion-id = "{{$criterion->activity_criterion_id}}"data-rubric-criterion-id = "{{$criterion->rubric_criterion_id}}" 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>
@@ -115,21 +129,21 @@
             <!-- If the activity was assessed, load the assessment. Otherwise load empty sheet -->
             @if(sizeof($assessments)!=0)
                 <!-- For each assessment -->
-                @foreach ($assessments as $assessment)
+                @foreach ($students as $student)
                     <tr class="student-row">
                         <!-- Fetch student name -->
-                        <td class="student-field" data-student-id="{{ $assessment->student_id }}">
-                            {{{ $assessment->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_contents); $i++)
+                        @for ($i = 0; $i<sizeof($criterion_rubric); $i++)
                             <td class="score-field">
-                                <select name="" id="" class="form-control" data-toggle="tooltip" data-placement="right" title="{{{ $assessment->name }}}">
+                                <select name="" id="" class="form-control" data-toggle="tooltip" data-placement="right" title="{{{ $student->name }}}">
                                 <!-- Option from 0-8 -->
-                                @for ($j=0; $j<=8; $j++)
+                                @for ($j=0; $j<=$rubric->max_score; $j++)
                                     <!-- If the decoded scores with index as the assessment id and second index as criterion id equals the loop index, mark it as selected -->
-                                    @if( $j ==  $scores_array[$assessment->id][$rubric_contents[$i]->id])
+                                    @if( $j ==  $scores_array[$student->id][$i])
                                         <option value="{{$j}}" selected="selected">{{ $j }}</option>
                                     @else
                                         <option value="{{$j}}">{{ $j }}</option>
@@ -137,7 +151,7 @@
                                 @endfor
 
                                 <!-- N/A option -->
-                                @if( $scores_array[$assessment->id][$rubric_contents[$i]->id]=="N/A")
+                                @if( $scores_array[$student->id][$i]=="N/A")
                                     <option value="N/A" selected="selected">N/A</option>
                                 @else
                                     <option value="N/A">N/A</option>
@@ -145,9 +159,10 @@
                                 </select>
                             </td>
                         @endfor
-                        <td class="percentage">{{{ $assessment->percentage }}}</td>
+                        <td class="percentage"></td>
+                        <td class="percentage-per-weight"></td>
                         <td class="">
-                            <textarea class="comments full-textarea" placeholder="Max. 255 characters" maxLength="255" >{{ $assessment->comments }}</textarea>
+                            <textarea class="comments full-textarea" placeholder="Max. 255 characters" maxLength="255" >{{ $scores_array[$student->id]["comments"] }}</textarea>
                         </td>
                      </tr>
                 @endforeach
@@ -155,23 +170,18 @@
                 @foreach ($students as $student)
                     <tr class="student-row">
                         <td class="student-field" data-student-id={{ $student->id }}>{{{ $student->name }}}</td>
-                        @for ($i = 0; $i<sizeof($rubric_contents); $i++)
-                            <td class="score-field">
+                        @for ($i = 0; $i<sizeof($criterion_rubric); $i++)
+                            <td class="score-field" data-weight = '1'>
                                 <select name="" id="" class="form-control" data-toggle="tooltip" data-placement="right" title="{{{ $student->name }}}">
-                                    <option value="0">0</option>
-                                    <option value="1">1</option>
-                                    <option value="2">2</option>
-                                    <option value="3">3</option>
-                                    <option value="4">4</option>
-                                    <option value="5">5</option>
-                                    <option value="6">6</option>
-                                    <option value="7">7</option>
-                                    <option value="8">8</option>
+                                    @for($j=0; $j<=$rubric->max_score; $j++)
+                                    <option value ='{{$j}}'>{{$j}}</option>
+                                    @endfor
                                     <option selected="selected" value="N/A">N/A</option>
                                 </select>
                             </td>
                         @endfor
                         <td class="percentage"></td>
+                        <td class="percentage-per-weight"></td>
                         <td class="comments"><textarea class="comments full-textarea" placeholder="Max. 255 characters" maxLength="255" ></textarea></td>
                      </tr>
                 @endforeach
@@ -182,7 +192,7 @@
                     <td>
                         <strong>Passed Criteria Percentage </strong>
                     </td>
-                    @for ($i = 0; $i<sizeof($rubric_contents); $i++)
+                    @for ($i = 0; $i<sizeof($criterion_rubric); $i++)
                         <td class="total"><strong><span class="total-value"></span><span class="percent-sign">%</span></strong>
                         </td>
                     @endfor
@@ -198,7 +208,147 @@
         </div>
     </div>
 </div>
+<script>
+$('#button-submit-assessment, #button-draft-assessment').on('click', function(e)
+{
+
+    var draft = 0;
+
+    if($(this).hasClass('draft'))
+        draft = 1;
+
+    var expected_points = parseInt($('#expected_points').text());
+    var expected_percentage = parseInt($('#expected_percentage').text());
+
+    //Prevent page refresh
+    e.preventDefault();
+
+    // Row in the database
+    var activity_id   =  $('#activity').data('activity-id');
+
+    var student_info = new Object();
+
+    // Object to hold the score sum of each criterion
+    var criteriaSumObject = new Object();
+
+    // Object to hold % of students that passed each criterion
+    var CriteriaAchievedPercentage = new Object();
+
+    // Object to hold all student evaluations
+    var studentAssessments = new Array();
+
+    var weights = new Object();
+
+    $('input[name="weight[]"]').each(function (index){
+        activity_criterion_id = $(this).data('activity-criterion-id');
+        weights[activity_criterion_id] = $(this).val();
+    });
+
+    // Iterate through all students
+    $('#assessment-table tbody tr').each(function( index )
+    {   
+
+        student_info[index] = new Object()
+        student_info[index].studentId = $(this).find('.student-field').data('student-id');
+        student_info[index].activity_crit_id = new Object();
+
+       /* var ScoresObject     = new Object();        // Scores column in database
+        var CriterionObject = new Object();     // Objects inside ScoresObject
+        var SingleStudentAssessment = new Object();
+        SingleStudentAssessment.student_id = $(this).find('.student-field').data('student-id');
+        */
+        // For each criterion, store the score in array
+        $(this).children('td.score-field').each(function(index2)
+        {
+            // Table cell with a score
+            var scoreField = $(this);
+
+            // Criterion being evaluated in current iteration
+            activity_criterion_id = $('.criterion-field').eq(index2).data('activity-criterion-id');
+            student_info[index].activity_crit_id[activity_criterion_id] = scoreField.children('select').find(':selected').val();
+
+            // Score in the cell
+            //var score = scoreField.children('select').find(':selected').val();
+
+            // Store the score in the scores Object
+            //ScoresObject[criterion_id]=score;
+
+            // Initialize the index for the sum object, if it's undefined
+            //if(typeof(criteriaSumObject[criterion_id]) == 'undefined')
+            //{
+            //    criteriaSumObject[criterion_id]=0;
+            //}
+
+            // Add to this criterion's total
+            //criteriaSumObject[criterion_id]+=parseInt(score);
+        });
+        student_info[index].comments = $.trim($(this).find('.comments').val());
+
+        //SingleStudentAssessment.scores = ScoresObject;
+        //SingleStudentAssessment.percentage = $(this).find('.percentage').text();
+        //SingleStudentAssessment.comments = $.trim($(this).find('.comments').val());
+        // console.log('comment '+index+': '+SingleStudentAssessment.comments);
+        // console.log('student object: '+JSON.stringify(SingleStudentAssessment));
+
+        //var clone = jQuery.extend({}, SingleStudentAssessment);
+        //studentAssessments.push(clone);
+
+
+    });
+
+    // console.log('students: '+JSON.stringify(studentAssessments));
+    // console.log('total points per criteria: '+JSON.stringify(criteriaSumObject));
+
+    // Iterate through all evaluated criteria, determining which were achieved
+    // by comparing the completion percentage to the expected percentage
+    /*var CriteriaAchievedResults = new Object();
+
+
+    $('.total').each(function(index)
+    {
+        var id = $('.criterion-field').eq(index).data('criterion-id');
+
+        CriteriaAchievedPercentage[id] = parseFloat($(this).find('span').text());
+
+        //Set whether criterion was achieved (1) or not (0)
+        if(CriteriaAchievedPercentage[id] >= expected_percentage)
+        {
+            CriteriaAchievedResults[id]=1;
+        }
+        else if (CriteriaAchievedPercentage[id] < expected_percentage)
+        {
+            CriteriaAchievedResults[id]=0;
+        }
+        else
+        {
+            CriteriaAchievedResults[id]=null;
+        }
+
+    });
+*/
+    // console.log('criteria percentages: '+JSON.stringify(CriteriaAchievedPercentage));
+    // console.log('criteria achieved results: '+JSON.stringify(CriteriaAchievedResults));
+
+
+    // Save activity to the database
+    $.post
+    (
+        "{{ URL::action('ActivitiesController@saveAssessment') }}",
+        {
+            activity_id: activity_id,
+            draft: draft,
+            weights: JSON.stringify(weights),
+        
+            student_info: JSON.stringify(student_info)
+        },
+        function(data)
+        {
+            location.replace(data);
+        }
+    );
 
+});
+    </script>
 @stop
 
 @section('included-js')
@@ -306,6 +456,9 @@ function percentagePerStudent(row)
     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)
     {
@@ -314,10 +467,13 @@ function percentagePerStudent(row)
         {
             sum += val;
             total+=1;
+            per_of_weight += val * parseInt($('#weight-'+index).val()); 
+            sum_of_weight += parseInt($('#weight-'+index).val());
         }
-    });
 
-    percentage =((sum/(total*8))*100).toFixed(2);
+    });
+    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))
@@ -329,6 +485,13 @@ function percentagePerStudent(row)
     {
         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>');
+    }
 
 
 }
@@ -382,131 +545,9 @@ $('select').on('change', function(e)
     percentagePerStudent($(this).closest('tr'));
     toggleSaveButton();
 });
-
+//LA LINEA DONDE VA, 410
 // Submit button is clicked
-$('#button-submit-assessment, #button-draft-assessment').on('click', function(e)
-{
 
-    var draft = 0;
-
-    if($(this).hasClass('draft'))
-        draft = 1;
-
-    var expected_points = parseInt($('#expected_points').text());
-    var expected_percentage = parseInt($('#expected_percentage').text());
-
-    //Prevent page refresh
-    e.preventDefault();
-
-    // Row in the database
-    var activity_id   =  $('#activity').data('activity-id');
-
-    // Object to hold the score sum of each criterion
-    var criteriaSumObject = new Object();
-
-    // Object to hold % of students that passed each criterion
-    var CriteriaAchievedPercentage = new Object();
-
-    // Object to hold all student evaluations
-    var studentAssessments = new Array();
-
-    // Iterate through all students
-    $('#assessment-table tbody tr').each(function( index )
-    {
-        var ScoresObject     = new Object();        // Scores column in database
-        var CriterionObject = new Object();     // Objects inside ScoresObject
-        var SingleStudentAssessment = new Object();
-        SingleStudentAssessment.student_id = $(this).find('.student-field').data('student-id');
-
-        // For each criterion, store the score in array
-        $(this).children('td.score-field').each(function(index)
-        {
-            // Table cell with a score
-            var scoreField = $(this);
-
-            // Criterion being evaluated in current iteration
-            var criterion_id = $('.criterion-field').eq(index).data('criterion-id');
-
-            // Score in the cell
-            var score = scoreField.children('select').find(':selected').val();
-
-            // Store the score in the scores Object
-            ScoresObject[criterion_id]=score;
-
-            // Initialize the index for the sum object, if it's undefined
-            if(typeof(criteriaSumObject[criterion_id]) == 'undefined')
-            {
-                criteriaSumObject[criterion_id]=0;
-            }
-
-            // Add to this criterion's total
-            criteriaSumObject[criterion_id]+=parseInt(score);
-        });
-
-        SingleStudentAssessment.scores = ScoresObject;
-        SingleStudentAssessment.percentage = $(this).find('.percentage').text();
-        SingleStudentAssessment.comments = $.trim($(this).find('.comments').val());
-        // console.log('comment '+index+': '+SingleStudentAssessment.comments);
-        // console.log('student object: '+JSON.stringify(SingleStudentAssessment));
-
-        var clone = jQuery.extend({}, SingleStudentAssessment);
-        studentAssessments.push(clone);
-
-
-    });
-
-    // console.log('students: '+JSON.stringify(studentAssessments));
-    // console.log('total points per criteria: '+JSON.stringify(criteriaSumObject));
-
-    // Iterate through all evaluated criteria, determining which were achieved
-    // by comparing the completion percentage to the expected percentage
-    var CriteriaAchievedResults = new Object();
-
-
-    $('.total').each(function(index)
-    {
-        var id = $('.criterion-field').eq(index).data('criterion-id');
-
-        CriteriaAchievedPercentage[id] = parseFloat($(this).find('span').text());
-
-        //Set whether criterion was achieved (1) or not (0)
-        if(CriteriaAchievedPercentage[id] >= expected_percentage)
-        {
-            CriteriaAchievedResults[id]=1;
-        }
-        else if (CriteriaAchievedPercentage[id] < expected_percentage)
-        {
-            CriteriaAchievedResults[id]=0;
-        }
-        else
-        {
-            CriteriaAchievedResults[id]=null;
-        }
-
-    });
-
-    // console.log('criteria percentages: '+JSON.stringify(CriteriaAchievedPercentage));
-    // console.log('criteria achieved results: '+JSON.stringify(CriteriaAchievedResults));
-
-
-    // Save activity to the database
-    $.post
-    (
-        "{{ URL::action('ActivitiesController@saveAssessment') }}",
-        {
-            activity_id: activity_id,
-            draft: draft,
-            criteria_achieved_percentage: JSON.stringify(CriteriaAchievedPercentage),
-            criteria_achievement: JSON.stringify(CriteriaAchievedResults),
-            student_scores: JSON.stringify(studentAssessments),
-        },
-        function(data)
-        {
-            location.replace(data);
-        }
-    );
-
-});
 
 // Language button is clicked
 $('#button-language').on('click', function(e)
@@ -523,25 +564,24 @@ $('.criterion-field').on('click', function()
         type: 'POST',
         url: "{{ URL::action('RubricsController@fetchRubricCriterion') }}",
         data: {
-            rubric_id: $(this).closest('table').data('rubric-id'),
-            criterion_id: $(this).data('criterion-id'),
+            rubric_criterion_id: $(this).data('rubric-criterion-id')
         },
         success: function(data)
         {
             data = JSON.parse(data);
-            $('.modal-title').html(data.name);
-
+            $('.modal-title').html(data.criteria.name);
+            descriptions = '';
             $('.modal-body tbody tr').empty();
+            for(i =0; i<{{$rubric->num_scales}}; i++){
+                descriptions += '<td>'+data[i].description+'</td>'
+            }
             $('.modal-body tbody tr').append
             (
-                '<td>'+data.description12+'</td>'
-                +'<td>'+data.description34+'</td>'
-                +'<td>'+data.description56+'</td>'
-                +'<td>'+data.description78+'</td>'
+                descriptions
             );
 
-            if(data.notes!=null)
-                $('.modal-body tbody tr').append('<td>'+data.notes+'</td>');
+            if(data.criteria.notes!=null)
+                $('.modal-body tbody tr').append('<td>'+data.criteria.notes+'</td>');
             else
                 $('.modal-body tbody tr').append('<td></td>');
 

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

@@ -42,8 +42,8 @@
 
 
     <div class="well">
-      @if($activity->rubric_id!=NULL)
-        <span id="assigned_rubric" class="hidden" data-assigned-rubric="{{{ $activity->rubric_id }}}"></span>
+      @if(count($activity->rubric)!=0)
+        <span id="assigned_rubric" class="hidden" data-assigned-rubric="{{{ $activity->rubric[0]->id }}}"></span>
       @endif
       <input id="activity_id" type="hidden" value="{{{ $activity->id}}}">
 
@@ -51,7 +51,7 @@
         <label>Select a Rubric:</label>
         <select id="select-template" class="form-control selectpicker">
           @foreach ($templates as $template)
-            @if($activity->rubric_id!=NULL && $template->name == Rubric::find($activity->rubric_id)->name)
+            @if(count($activity->rubric)!=0 && $template->name == Rubric::find($activity->rubric[0]->id)->name)
               <option data-template-id="{{ $template->id }}" class="template" selected="selected">{{ $template->name }}</option>
             @else
               <option data-template-id="{{ $template->id }}" class="template">{{ $template->name }}</option>
@@ -541,7 +541,7 @@ $('#button-save-rubric').on('click', function(e)
       {
         name: $('#select-template').find(':selected').text(),
         activity_id: parseInt($('#activity_id').val()),
-        contents: " ",
+        
         expected_percentage: $('#expected_percentage').text(),
         expected_points: $('#expected_points').text(),
         criteria: criteria,
@@ -566,9 +566,13 @@ $('#button-save-rubric').on('click', function(e)
       {
         id: $('#assigned_rubric').data('assigned-rubric'),
         name: $('#select-template').find(':selected').text(),
-        contents: JSON.stringify(criteriaArray),
+        activity_id: parseInt($('#activity_id').val()),
+        
         expected_percentage: $('#expected_percentage').text(),
-        expected_points: $('#expected_points').text()
+        expected_points: $('#expected_points').text(),
+        criteria: criteria,
+        scales: scales,
+        max_score:max_score
       },
       function(data)
       {

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

@@ -32,15 +32,14 @@
           <tr>
             <th></th>
             <th>Criterion</th>
-            <th>Beginning (1-2)</th>
-            <th>In Progress (3-4)</th>
-            <th>Good (5-6)</th>
-            <th>Excellent (7-8)</th>
+            @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>
+            @endfor
             <th>Learning Outcome</th>
           </tr>
         </thead>
         <tbody>
-        @foreach(json_decode($rubric->contents) as $index => $criterion)
+        @foreach($criterion_rubric as $index => $criterion)
           <tr data-criterion-copyright="{{ $criterion->copyright }}" data-criterion-notes="{{ $criterion->notes }}">
             <td>{{ $index + 1 }}.</td>
             @if(isset($criterion->notes))
@@ -49,7 +48,7 @@
               <sup></sup>
               @if(property_exists($criterion, 'subcriteria'))
                 <ul class="list-unstyled">
-                  @foreach($criterion->subcriteria as $subcriterion)
+                  @foreach(json_decode($criterion->subcriteria) as $subcriterion)
                       <li>{{ $subcriterion }}</li>
                   @endforeach
                 </ul>
@@ -60,18 +59,24 @@
               <span>{{{ $criterion->name }}}</span><sup></sup>
               @if(property_exists($criterion, 'subcriteria'))
                 <ul class="list-unstyled">
-                  @foreach($criterion->subcriteria as $subcriterion)
+                  @foreach(json_decode($criterion->subcriteria) as $subcriterion)
                       <li>{{ $subcriterion }}</li>
                   @endforeach
                 </ul>
               @endif
             </td>
             @endif
-            <td>{{ nl2br($criterion->description12) }}</td>
-            <td>{{ nl2br($criterion->description34) }}</td>
-            <td>{{ nl2br($criterion->description56) }}</td>
-            <td>{{ nl2br($criterion->description78) }}</td>
-            <td>{{ Outcome::where('id', $criterion->outcome_id)->first()->name }}</td>
+            @foreach(json_decode($criterion->scales) as $scale)
+            <td>{{ nl2br($scale) }}</td>
+
+            @endforeach
+
+            <td>
+            
+            @foreach (json_decode($criterion->outcomes) as $index => $outcome)
+            {{$index+1}}. {{$outcome}}<br>                 
+            @endforeach  
+            </td>
           </tr>
         @endforeach
         </tbody>