a subir los migrations con casi todo

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/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');
@@ -147,39 +148,63 @@ class TemplatesController extends \BaseController
 		$template->max_score = $max_score;
 
 		if ($template->save()) {
+
 			$templateId = $template->id;
 			foreach ($criteria as $index => $criterion_id) {
 
 
-				DB::insert("insert into template_criterion (`template_id`,`criterion_id`, `position`) values ({$templateId},{$criterion_id}, '{$index}')");
-				$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;
 		}
 	}
 
@@ -197,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)
@@ -213,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);
@@ -225,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');
@@ -262,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]);
 
@@ -279,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_04_003757_create_activities_table.php

@@ -20,7 +20,7 @@ class CreateActivitiesTable extends Migration
 			//$table->text('outcomes_achieved')->nullable();
 			//$table->text('outcomes_attempted')->nullable();
 
-			//$table->text('assessment_comments')->nullable();
+			$table->text('assessment_comments')->nullable();
 			//$table->text('transforming_actions')->nullable();
 			//$table->text('criteria_achieved_percentage')->nullable();
 

app/models/Title.php

@@ -1,8 +0,0 @@
-<?php
-
-use Illuminate\Database\Eloquent\SoftDeletingTrait;
-
-class Title extends Eloquent
-{
-    protected $table = 'titles';
-}

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/shared/rubrics.blade.php

@@ -783,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);
@@ -821,6 +815,7 @@ function loadTemplate()
 
             
             }
+
             /*
             var contents = JSON.parse(data.contents);
             contents.forEach(function (data)
@@ -886,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)
@@ -1259,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)
             {

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>