Cambioos a rubrics, y poco de assessment

app/controllers/ActivitiesController.php

@@ -170,21 +170,29 @@ class ActivitiesController extends \BaseController
         $criterion_rubric = DB::table('criteria')
             ->join("criterion_rubric", "criterion_rubric.criterion_id", "=", "criteria.id")
             ->where('criterion_rubric.rubric_id', '=', $rubric->id)->get();
+        Log::info($criterion_rubric);
+        $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();
+
+
 
-        $rubric_contents = json_decode($rubric->contents);
 
         // Get results
-        $assessments = DB::table('assessments')->join('students', 'assessments.student_id', '=', 'students.id')->where('activity_id', '=', $activity->id)->orderBy('assessments.id', 'asc')->get();
+        $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();
 
         // Decode the scores (blade workaround)
         $scores_array = array();
         foreach ($assessments as $index => $assessment) {
             $scores_array[$assessment->id] = json_decode($assessment->scores, true);
         }
+        Log::info($rubric);
 
-        return View::make('local.professors.assessment', compact('activity', 'title', 'students', 'course', 'rubric_contents', 'assessments', 'scores_array', 'rubric'));
+        return View::make('local.professors.assessment', compact('activity', 'title', 'students', 'course', 'criterion_rubric', 'assessments', 'scores_array', 'rubric', 'scales'));
     }
 
     public function saveAssessment()
@@ -215,9 +223,9 @@ class ActivitiesController extends \BaseController
                             }
 
                             // Add the assessment to the pivot table
+
                             $student->assessed_activities()->attach($activity->id, array(
                                 'scores' => json_encode($single_student_data->scores),
-                                'percentage' => $single_student_data->percentage,
                                 'comments' => $single_student_data->comments
                             ));
                         }

app/controllers/CriteriaController.php

@@ -54,6 +54,10 @@ class CriteriaController extends \BaseController
     {
         $json_to_send = array();
         $json_to_send['criterion'] = DB::table('criteria')->where('id', '=', Input::get('id'))->first();
+        $num_scales = Input::get('numberOfScale');
+        $criterionID = Input::get('id');
+        $json_to_send['scales'] = DB::select("select * from scales, template_criterion_scale where template_criterion_scale.template_criterion_id in (select id from template_criterion where template_criterion.template_id in (SELECT id FROM templates where num_scales = {$num_scales}) and template_criterion.criterion_id = {$criterionID}) and scales.id = template_criterion_scale.scale_id GROUP BY position order by position");
+        Log::info("select * from scales, template_criterion_scale where template_criterion_scale.template_criterion_id in (select id from template_criterion where template_criterion.template_id in (SELECT id FROM templates where num_scales = {$num_scales}) and template_criterion.criterion_id = {$criterionID}) and scales.id = template_criterion_scale.scale_id GROUP BY position order by position");
 
 
 
@@ -63,8 +67,8 @@ class CriteriaController extends \BaseController
     public function fetchCriterion()
     {
         $json_to_send = array();
-        $json_to_send['criterion'] = DB::table('criteria')->where('id', '=', Input::get('id'))->first();
 
+        $json_to_send['criterion'] = DB::table('criteria')->where('id', '=', Input::get('id'))->first();
 
 
 

app/controllers/RubricsController.php

@@ -105,21 +105,37 @@ class RubricsController extends \BaseController
             $rubricId = $rubric->id;
             foreach ($criteria as $index => $criterion_id) {
                 DB::insert("insert into criterion_rubric (`rubric_id`,`criterion_id`) values ({$rubricId},{$criterion_id})");
+                DB::commit();
                 $rubric_criterion_id = DB::table('criterion_rubric')->where('rubric_id', '=', $rubricId)
                     ->where('criterion_id', '=', $criterion_id)->first();
 
+
+
                 for ($i = 0; $i < count($scales[$index]); $i++) {
-                    $scale = new Scale;
-                    $scale->description = $scales[$index][$i];
-                    $scale->min_score = 1 + ($division * $i);
-                    $scale->max_score = ($division * ($i + 1));
-                    if ($scale->save()) {
+                    $scale =  Scale::where('description', '=', $scales[$index][$i])
+                        ->where('max_score', '=', ($division * ($i + 1)))
+                        ->where("min_score", '=', (1 + ($division * $i)))->first();
+                    Log::info($scale);
+                    if ($scale) {
                         DB::insert("insert into `rubric_criteria_scale` (`rubric_criterion_id`, `scale_id`, `position`) values ({$rubric_criterion_id->id},{$scale->id}, {$i})");
+                        DB::commit();
                     } else {
-                        Session::flash('status', 'danger');
-                        Session::flash('message', 'Rubric could not be created.');
+                        $scale = new Scale;
+                        $scale->description = $scales[$index][$i];
+                        $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();
+                        } 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`) values ({$activity_id}, {$criterion_id})");
+                DB::commit();
             }
             Session::flash('status', 'success');
             Session::flash('message', 'Rubric assigned.');

app/controllers/TemplatesController.php

@@ -154,15 +154,25 @@ class TemplatesController extends \BaseController
 					->where('criterion_id', '=', $criterion_id)->first();
 
 				for ($i = 0; $i < count($scales[$index]); $i++) {
-					$scale = new Scale;
-					$scale->description = $scales[$index][$i];
-					$scale->min_score = 1 + ($division * $i);
-					$scale->max_score = ($division * ($i + 1));
-					if ($scale->save()) {
+					$scale =  Scale::where('description', '=', $scales[$index][$i])
+						->where('max_score', '=', ($division * ($i + 1)))
+						->where("min_score", '=', (1 + ($division * $i)))->first();
+					Log::info($scale);
+					if ($scale) {
 						DB::insert("insert into `template_criterion_scale` (`template_criterion_id`, `scale_id`, `position`) values ({$template_criterion_id->id},{$scale->id}, {$i})");
+						DB::commit();
 					} else {
-						Session::flash('status', 'danger');
-						Session::flash('message', 'Rubric could not be created.');
+						$scale = new Scale;
+						$scale->description = $scales[$index][$i];
+						$scale->min_score = 1 + ($division * $i);
+						$scale->max_score = ($division * ($i + 1));
+						if ($scale->save()) {
+							DB::insert("insert into `template_criterion_scale` (`template_criterion_id`, `scale_id`, `position`) values ({$template_criterion_id->id},{$scale->id}, {$i})");
+							DB::commit();
+						} else {
+							Session::flash('status', 'danger');
+							Session::flash('message', 'Rubric could not be created.');
+						}
 					}
 				}
 			}
@@ -263,15 +273,25 @@ class TemplatesController extends \BaseController
 					->where('criterion_id', '=', $criterion_id)->first();
 				DB::delete("delete from template_criterion_scale where template_criterion_id ={$template_criterion_id->id}");
 				for ($i = 0; $i < count($scales[$index]); $i++) {
-					$scale = new Scale;
-					$scale->description = $scales[$index][$i];
-					$scale->min_score = 1 + ($division * $i);
-					$scale->max_score = ($division * ($i + 1));
-					if ($scale->save()) {
+					$scale =  Scale::where('description', '=', $scales[$index][$i])
+						->where('max_score', '=', ($division * ($i + 1)))
+						->where("min_score", '=', (1 + ($division * $i)))->first();
+					Log::info($scale);
+					if ($scale) {
 						DB::insert("insert into `template_criterion_scale` (`template_criterion_id`, `scale_id`, `position`) values ({$template_criterion_id->id},{$scale->id}, {$i})");
+						DB::commit();
 					} else {
-						Session::flash('status', 'danger');
-						Session::flash('message', 'Rubric could not be created.');
+						$scale = new Scale;
+						$scale->description = $scales[$index][$i];
+						$scale->min_score = 1 + ($division * $i);
+						$scale->max_score = ($division * ($i + 1));
+						if ($scale->save()) {
+							DB::insert("insert into `template_criterion_scale` (`template_criterion_id`, `scale_id`, `position`) values ({$template_criterion_id->id},{$scale->id}, {$i})");
+							DB::commit();
+						} else {
+							Session::flash('status', 'danger');
+							Session::flash('message', 'Rubric could not be created.');
+						}
 					}
 				}
 			}

app/models/Scale.php

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

app/models/Student.php

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

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

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

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

@@ -23,12 +23,8 @@
             </div>
             <div class="modal-body">
                 <table class="table table-bordered">
-                    <thead>
-                        <th>Beginning (1-2)</th>
-                        <th>In Progress (3-4)</th>
-                        <th>Good (5-6)</th>
-                        <th>Excellent (7-8)</th>
-                        <th>Notes</th>
+                    <thead id = "criteria-header">;
+                        
                     </thead>
                     <tbody>
                         <tr></tr>
@@ -60,7 +56,7 @@
                     <li>If a student did not complete any work for this activity, select "0" for all columns in that student's row.</li>
                     <li>If a student dropped the class, select "N/A" (Not Applicable) for all columns in that student's row.</li>
                     <li>Cells with "N/A" <strong>will not</strong> be used to determine whether a criterion is achieved. Only scores from 0 to 8 will be considered for this purpose.</li>
-                    <li><strong>At least one score must be from 1-8.</strong> Otherwise, the 'Publish Assessment' and 'Save as Draft' buttons will be <strong>disabled</strong>. If you want to delete previously saved scores, go back to the activity and click the "Delete Assessment" button.</li>
+                    <li>For this activity, <strong>at least one score must be from 1-{{$rubric->max_score}}.</strong> Otherwise, the 'Publish Assessment' and 'Save as Draft' buttons will be <strong>disabled</strong>. If you want to delete previously saved scores, go back to the activity and click the "Delete Assessment" button.</li>
 
                 </ul>
             </div>
@@ -81,14 +77,15 @@
                     <li>Si un estudiante no completó el trabajo para esta actividad, seleccione "0" en todas las columnas de la fila de ese estudiante.</li>
                     <li>Si un estudiante se dio de baja, seleccione "N/A" (No Aplica) en todas las columnas de la fila de ese estudiante.</li>
                     <li>Las celdas con "N/A" <strong>no</strong> serán utilizadas para determinar si un criterio se alcanzó o no. Solamente las puntuaciones del 0 al 8 serán consideradas.</li>
-                    <li><strong>Al menos una puntuación deber ser del 1 al 8.</strong> De otra manera, el botón para guardar <strong>se desactivará</strong>. Si quiere borrar los resultados del avalúo, vuelva a la actividad y oprima el botón que dice "Delete Assessment".</li>
+                    <li>Para esta actividad, <strong>al menos una puntuación deber ser del 1 al {{$rubric->max_score}}.</strong> De otra manera, el botón para guardar <strong>se desactivará</strong>. Si quiere borrar los resultados del avalúo, vuelva a la actividad y oprima el botón que dice "Delete Assessment".</li>
 
 
                 </ul>
             </div>
 
         </div>
-
+        <input type='hidden' id='max' name= 'max' value='{{$rubric->max_score}}'>
+        <input type ='hidden' id='num_of_scales' name ='num_of_scales' value ='{{$rubric->num_scales}}'>
         <p id="course">Course: {{{ $course->code }}} {{{ $course->number }}}</p>
         <p id="section">Section: {{{ $course->section }}}</p>
         {{ HTML::linkAction('ActivitiesController@show', 'Back to Activity', array($activity->id), array('class'=>'btn btn-default btn-sm pull-right')) }}
@@ -103,8 +100,8 @@
                                 Student
                             </div>
                         </th>
-                        @foreach ($rubric_contents as $criterion)
-                            <th class="criterion-field" data-criterion-id="{{{ $criterion->id }}}"><div class="th-box">{{ $criterion->name}}</div></th>
+                        @foreach ($criterion_rubric as $criterion)
+                            <th class="criterion-field" data-criterion-id="{{{ $criterion->id }}}" ><div class="th-box">{{ $criterion->name}}</div></th>
                         @endforeach
                         <th>Student Percentage</th>
                         <th>Comments</th>
@@ -123,13 +120,13 @@
                         </td>
 
                         <!-- For each criterion in the rubric, there's a score field -->
-                        @for ($i = 0; $i<sizeof($rubric_contents); $i++)
+                        @for ($i = 0; $i<sizeof($criterion_rubric); $i++)
                             <td class="score-field">
                                 <select name="" id="" class="form-control" data-toggle="tooltip" data-placement="right" title="{{{ $assessment->name }}}">
                                 <!-- Option from 0-8 -->
                                 @for ($j=0; $j<=8; $j++)
                                     <!-- If the decoded scores with index as the assessment id and second index as criterion id equals the loop index, mark it as selected -->
-                                    @if( $j ==  $scores_array[$assessment->id][$rubric_contents[$i]->id])
+                                    @if( $j ==  $scores_array[$assessment->id][$criterion_rubric[$i]->criterion_id])
                                         <option value="{{$j}}" selected="selected">{{ $j }}</option>
                                     @else
                                         <option value="{{$j}}">{{ $j }}</option>
@@ -137,7 +134,7 @@
                                 @endfor
 
                                 <!-- N/A option -->
-                                @if( $scores_array[$assessment->id][$rubric_contents[$i]->id]=="N/A")
+                                @if( $scores_array[$assessment->id][$criterion_rubric[$i]->criterion_id]=="N/A")
                                     <option value="N/A" selected="selected">N/A</option>
                                 @else
                                     <option value="N/A">N/A</option>
@@ -155,18 +152,12 @@
                 @foreach ($students as $student)
                     <tr class="student-row">
                         <td class="student-field" data-student-id={{ $student->id }}>{{{ $student->name }}}</td>
-                        @for ($i = 0; $i<sizeof($rubric_contents); $i++)
+                        @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="{{{ $student->name }}}">
-                                    <option value="0">0</option>
-                                    <option value="1">1</option>
-                                    <option value="2">2</option>
-                                    <option value="3">3</option>
-                                    <option value="4">4</option>
-                                    <option value="5">5</option>
-                                    <option value="6">6</option>
-                                    <option value="7">7</option>
-                                    <option value="8">8</option>
+                                    @for($i=0; $i<$rubric->max_score; $i++)
+                                    <option value ='{{$i}}'>{{$i}}</option>
+                                    @endfor
                                     <option selected="selected" value="N/A">N/A</option>
                                 </select>
                             </td>
@@ -182,7 +173,7 @@
                     <td>
                         <strong>Passed Criteria Percentage </strong>
                     </td>
-                    @for ($i = 0; $i<sizeof($rubric_contents); $i++)
+                    @for ($i = 0; $i<sizeof($criterion_rubric); $i++)
                         <td class="total"><strong><span class="total-value"></span><span class="percent-sign">%</span></strong>
                         </td>
                     @endfor
@@ -198,7 +189,43 @@
         </div>
     </div>
 </div>
+<script>
+    function changeTable(){
+    
+ 
+    amount_of_scales = parseInt($('#num_of_scales').val());
+    counter2 = 0;
+    maximum = parseInt($('#max').val());
+    
+   
+    newScaleHeaders = '';
+    counter = 0;
+    division = maximum/amount_of_scales;
+    if(amount_of_scales==1){
+        newScaleHeaders+= "<th>Score (1 - "+maximum+")</th>";
+    }
+    else if(maximum!= amount_of_scales){
+    while(counter <amount_of_scales){
+        
+        minimumScore = 1+(counter*division);
+        maximumScore = (1+counter)*division;
+        newScaleHeaders+= "<th>Scale "+ (counter +1) + " ("+minimumScore+" - "+maximumScore+")</th>";
+        counter++;
+    }
+    }else{
+        while(counter <amount_of_scales){
+        
 
+        newScaleHeaders+= "<th>Scale "+ (counter +1) + " </th>";
+        counter++;
+    }
+    }
+    newScaleHeaders += '<th>Notes</th>';
+    
+    $("#criterion-header").html(newScaleHeaders);
+    
+}
+    </script>
 @stop
 
 @section('included-js')
@@ -215,7 +242,7 @@
 // Page load
 // --------------------------------------------------------------------------
 
-
+changeTable();
 // Enable fixed headers
 $('#assessment-table').stickyTableHeaders();
 
@@ -306,6 +333,7 @@ function percentagePerStudent(row)
     var sum = 0 ;
     var total = 0;
     var percentage = 0;
+    var max_score = parseInt($('#max').val());
 
     row.find('td.score-field').each(function(index)
     {
@@ -317,7 +345,7 @@ function percentagePerStudent(row)
         }
     });
 
-    percentage =((sum/(total*8))*100).toFixed(2);
+    percentage =((sum/(total*max_score))*100).toFixed(2);
 
     //If percentage is not a number, set it to 0.
     if(isNaN(percentage))