Antes de volver al merge

.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,19 +169,25 @@ 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->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);
-        $scales = DB::table('scales')->join('rubric_criteria_scale', 'rubric_criteria_scale.scale_id', '=', 'scales.id')
-            ->whereIn('rubric_criteria_scale.rubric_criterion_id', $criterion_rubric_ids)->get();
+
 
 
 
@@ -190,16 +196,21 @@ class ActivitiesController extends \BaseController
         $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;
         }
-        Log::info(sizeof($criterion_rubric));
+
+        Log::info($scores_array);
 
 
-        return View::make('local.professors.assessment', compact('activity', 'title', 'students', 'course', 'criterion_rubric', 'assessments', 'scores_array', 'rubric', 'scales'));
+        return View::make('local.professors.assessment', compact('activity', 'title', 'students', 'course', 'criterion_rubric', 'assessments', 'scores_array', 'rubric'));
     }
 
     public function saveAssessment()
@@ -208,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();
 
 

app/controllers/RubricsController.php

@@ -94,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
@@ -115,9 +116,7 @@ class RubricsController extends \BaseController
 
 
                 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();
+                    $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})");
@@ -125,8 +124,7 @@ class RubricsController extends \BaseController
                     } 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 `rubric_criteria_scale` (`rubric_criterion_id`, `scale_id`, `position`) values ({$rubric_criterion_id->id},{$scale->id}, {$i})");
                             DB::commit();
@@ -136,8 +134,9 @@ class RubricsController extends \BaseController
                         }
                     }
                 }
+
                 $activity_id = Input::get("activity_id");
-                DB::insert("insert into `activity_criterion` (`activity_id`,`criterion_id`) values ({$activity_id}, {$criterion_id})");
+                DB::insert("insert into `activity_criterion` (`activity_id`,`criterion_id`, `weight`) values ({$activity_id}, {$criterion_id}, {$defaultWeight})");
                 DB::commit();
             }
             Session::flash('status', 'success');
@@ -183,7 +182,8 @@ class RubricsController extends \BaseController
 
         $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);
+
 
         DB::beginTransaction();
 
@@ -271,12 +271,14 @@ class RubricsController extends \BaseController
         $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})")
             ) {
-                Log::info("AHH");
+
                 $rubric_criterion_id =  DB::table('criterion_rubric')
                     ->where('rubric_id', '=', $rubric->id)
                     ->where('criterion_id', '=', $criterion_id)
@@ -284,9 +286,7 @@ class RubricsController extends \BaseController
 
                 foreach ($scales[$index] as $in => $scale) {
                     Log::info("AH2");
-                    $new_scale =  Scale::where('description', '=', $scale)
-                        ->where('max_score', '=', ($division * ($in + 1)))
-                        ->where("min_score", '=', (1 + ($division * $in)))->first();
+                    $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})");
@@ -294,8 +294,6 @@ class RubricsController extends \BaseController
                     } else {
                         $new_scale = new Scale;
                         $new_scale->description = $scales[$index][$in];
-                        $new_scale->min_score = 1 + ($division * $in);
-                        $new_scale->max_score = ($division * ($in + 1));
                         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();
@@ -366,6 +364,7 @@ class RubricsController extends \BaseController
             ->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')
@@ -434,15 +433,23 @@ class RubricsController extends \BaseController
 
     public function fetchRubricCriterion()
     {
-        $rubric = Rubric::findOrFail(Input::get('rubric_id'));
-        $criterion_id = Input::get('criterion_id');
+        $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_contents = json_decode($rubric->contents);
+        $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);
 
-        foreach ($rubric_contents as $key => $criterion) {
-            if ($criterion->id == $criterion_id) {
-                return json_encode($criterion);
-            }
-        }
+        //$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,9 +154,7 @@ class TemplatesController extends \BaseController
 					->where('criterion_id', '=', $criterion_id)->first();
 
 				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();
+					$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})");
@@ -164,8 +162,7 @@ class TemplatesController extends \BaseController
 					} 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();
@@ -261,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;
@@ -274,8 +271,9 @@ class TemplatesController extends \BaseController
 				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();
+						//->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})");
@@ -283,8 +281,8 @@ class TemplatesController extends \BaseController
 					} else {
 						$scale = new Scale;
 						$scale->description = $scales[$index][$i];
-						$scale->min_score = 1 + ($division * $i);
-						$scale->max_score = ($division * ($i + 1));
+						//$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();

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

@@ -61,7 +61,7 @@
                     <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>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>
@@ -82,7 +82,7 @@
                     <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>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>
 
 
@@ -105,13 +105,8 @@
                     </th>
                     @foreach ($criterion_rubric as $index => $criterion)
                     <th  data-criterion-id="{{{ $criterion->criterion_id }}}" ><div class="th-box">
-                        <!--<div class="form-group row">
-                            <div class="col-xs-1">
-                                <label for="weight-{{$index}}">Weight</label>
-                            <input class="form-control" id="weight-{{$index}}" name='weight[]' type="text">
-                            </div>
-                        </div>-->
-                        Weight<input class="form-control" id="weight-{{$index}}" name='weight[]' type="text" style = "width: 50%">
+                        
+                        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>
@@ -122,7 +117,7 @@
                             </div>
                         </th>
                         @foreach ($criterion_rubric as $criterion)
-                            <th class="criterion-field" data-criterion-id="{{{ $criterion->criterion_id }}}" ><div class="th-box">{{ $criterion->name}}</div></th>
+                            <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>
@@ -134,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($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][$criterion_rubric[$i]->criterion_id])
+                                    @if( $j ==  $scores_array[$student->id][$i])
                                         <option value="{{$j}}" selected="selected">{{ $j }}</option>
                                     @else
                                         <option value="{{$j}}">{{ $j }}</option>
@@ -156,7 +151,7 @@
                                 @endfor
 
                                 <!-- N/A option -->
-                                @if( $scores_array[$assessment->id][$criterion_rubric[$i]->criterion_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>
@@ -164,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
@@ -175,7 +171,7 @@
                     <tr class="student-row">
                         <td class="student-field" data-student-id={{ $student->id }}>{{{ $student->name }}}</td>
                         @for ($i = 0; $i<sizeof($criterion_rubric); $i++)
-                            <td class="score-field">
+                            <td class="score-field" data-weight = '1'>
                                 <select name="" id="" class="form-control" data-toggle="tooltip" data-placement="right" title="{{{ $student->name }}}">
                                     @for($j=0; $j<=$rubric->max_score; $j++)
                                     <option value ='{{$j}}'>{{$j}}</option>
@@ -185,7 +181,7 @@
                             </td>
                         @endfor
                         <td class="percentage"></td>
-                        <td class="percentage-per-w"></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
@@ -212,8 +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')
@@ -230,7 +365,7 @@
 // Page load
 // --------------------------------------------------------------------------
 
-changeTable();
+
 // Enable fixed headers
 $('#assessment-table').stickyTableHeaders();
 
@@ -322,6 +457,8 @@ function percentagePerStudent(row)
     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)
     {
@@ -330,9 +467,12 @@ function percentagePerStudent(row)
         {
             sum += val;
             total+=1;
+            per_of_weight += val * parseInt($('#weight-'+index).val()); 
+            sum_of_weight += parseInt($('#weight-'+index).val());
         }
-    });
 
+    });
+    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.
@@ -345,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>');
+    }
 
 
 }
@@ -398,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)
@@ -539,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/viewrubric.blade.php

@@ -59,7 +59,7 @@
               <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>