Bugs de rubrics y assessments

app/controllers/ActivitiesController.php

@@ -283,7 +283,7 @@ class ActivitiesController extends \BaseController
                         }
                     }
                     $activity_draft = Input::get('draft');
-
+                    Log::info(json_encode($weights));
                     foreach ($weights as $act_crit => $weigh) {
                         DB::update("update activity_criterion set weight = {$weigh} where id = {$act_crit}");
                     }
@@ -843,20 +843,55 @@ 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);
+        $rubric_contents = 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_contents as $index => $crit) {
+            $crit->scales = DB::table('scales')
+                ->join('criterion_scale', 'scales.id', '=', 'criterion_scale.scale_id')
+                ->where('criterion_id', $crit->criterion_id)
+                ->get();
+        }
+
+
 
-        $rubric = Rubric::find($activity->rubric_id);
 
         // Get results
-        $assessments = DB::table('assessments')->where('activity_id', '=', $activity->id)->orderBy('id', 'asc')->get();
+        /*$assessments = DB::table('assessments')->where('activity_id', '=', $activity->id)->orderBy('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);
+        }*/
+        // 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->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.print_assessment', compact('activity', 'title', 'students', 'course', 'rubric_contents', 'assessments', 'scores_array', 'rubric'));
     }
 }

app/controllers/OutcomesController.php

@@ -806,7 +806,13 @@ class OutcomesController extends \BaseController
 
     public function professorAssessmentReports()
     {
-        $outcomes = Outcome::select(array('id', 'name', 'expected_outcome'))->orderBy('name', 'ASC')->get();
+        $semesters = Session::get('semesters_ids');
+        $semesters = DB::table('semesters')->whereIn('id', $semesters)->orderBy('start', 'ASC')->first();
+        Log::info($semesters->start);
+        $outcomes = Outcome::select(array('id', 'name', 'expected_outcome'))
+            ->where('deleted_at', '=', NULL)
+            ->whereRaw("(deactivation_date = NULL or deactivation_date >= '{$semesters->start}')")
+            ->orderBy('name', 'ASC')->get();
         $title = "My Courses' Assessment Reports";
 
         return View::make('local.professors.assessment_reports', compact('title', 'outcomes'));

app/controllers/RubricsController.php

@@ -380,8 +380,28 @@ class RubricsController extends \BaseController
             App::abort('403', 'Access Forbidden');
 
         $rubric = Rubric::where('id', '=', $activity->rubric_id)->firstOrFail();
+        $rubric_criterion = DB::table('criteria')
+            ->join('rubric_criterion', 'rubric_criterion.criterion_id', '=', 'criteria.id')
+            ->where('rubric_criterion.rubric_id', '=', $activity->rubric[0]->id)
+            ->get();
+        $rubric->titles = DB::table('titles')
+            ->join('rubric_title', 'rubric_title.title_id', '=', 'titles.id')
+            ->where('rubric_title.rubric_id', $rubric->id)
+            ->orderBy('position')
+            ->lists('text');
+
+        foreach ($rubric_criterion as $single_cr) {
+            $single_cr->scales = json_encode(DB::table('scales')
+                ->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')
+                ->join('criterion_objective_outcome', 'outcomes.id', '=', 'criterion_objective_outcome.outcome_id')
+                ->where('criterion_objective_outcome.criterion_id', '=', $single_cr->criterion_id)->lists('name'));
+        }
         $title = $activity->name . ': ' . $rubric->name;
-        return View::make('local.professors.downloadrubric', compact('rubric', 'activity', 'title', 'course'));
+        return View::make('local.professors.downloadrubric', compact('rubric', 'rubric_criterion', 'activity', 'title', 'course'));
     }
 
     public function printview($activity_id, $rubric_id)
@@ -394,9 +414,31 @@ class RubricsController extends \BaseController
         if ($course->user_id != Auth::id())
             App::abort('403', 'Access Forbidden');
 
-        $rubric = Rubric::where('id', '=', $activity->rubric_id)->firstOrFail();
+        $rubric = Rubric::where('id', '=', $activity->rubric[0]->id)->firstOrFail();
+        $rubric_criterion = DB::table('criteria')
+            ->join('rubric_criterion', 'rubric_criterion.criterion_id', '=', 'criteria.id')
+            ->where('rubric_criterion.rubric_id', '=', $activity->rubric[0]->id)
+            ->get();
+        $rubric->titles = DB::table('titles')
+            ->join('rubric_title', 'rubric_title.title_id', '=', 'titles.id')
+            ->where('rubric_title.rubric_id', $rubric->id)
+            ->orderBy('position')
+            ->lists('text');
+
+        foreach ($rubric_criterion as $single_cr) {
+            $single_cr->scales = json_encode(DB::table('scales')
+                ->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')
+                ->join('criterion_objective_outcome', 'outcomes.id', '=', 'criterion_objective_outcome.outcome_id')
+                ->where('criterion_objective_outcome.criterion_id', '=', $single_cr->criterion_id)->lists('name'));
+        }
         $title = $activity->name . ': ' . $rubric->name;
-        return View::make('local.professors.printrubric', compact('rubric', 'activity', 'title', 'course'));
+        return View::make('local.professors.printrubric', compact('rubric', 'rubric_criterion', 'activity', 'title', 'course'));
     }
 
     public function fetchRubricCriterion()

app/models/Activity.php

@@ -191,6 +191,18 @@ class Activity extends Eloquent
   }
 
   // o_att_array
+  public function is_assessed()
+  {
+    $all_criterion = DB::table('activity_criterion')
+      ->where('activity_criterion.activity_id', '=', $this->id)
+      ->lists('id');
+
+    $assessments = DB::table('assessments')
+      ->whereIn('activity_criterion_id', $all_criterion)
+      ->lists('id');
+
+    return boolval(count($assessments));
+  }
   public function getOAttArrayAttribute()
   {
 

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

@@ -197,7 +197,7 @@
             <!-- If no rubric is assigned and the semester is active -->
             @if(count($activity->rubric) == 0 && in_array($course->semester->id, $active_semesters))
                 {{ HTML::linkAction('RubricsController@newRubric', 'Assign Rubric', array($activity->id), array('class'=>'btn btn-primary btn-sm btn-block')) }}
-                {{ HTML::linkAction('RubricsController@newOtherMethod', 'Assign Other Assessment Method', array($activity->id), array('class'=>'btn btn-primary btn-sm btn-block')) }}
+                <!--{{ HTML::linkAction('RubricsController@newOtherMethod', 'Assign Other Assessment Method', array($activity->id), array('class'=>'btn btn-primary btn-sm btn-block')) }}-->
             @else
 
                 {{ HTML::linkAction('RubricsController@show', 'View Rubric', array($activity->id), array('class'=>'btn btn-primary btn-sm btn-block')) }}
@@ -208,7 +208,7 @@
                 @endif
 
                 <!-- If there is no assessment and the semester is active -->
-                @if($activity->o_att_array == NULL && in_array($course->semester->id, $active_semesters))
+                @if(!$activity->is_assessed() && 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')) }}
@@ -353,14 +353,21 @@ $(function () {
     $('#criteriaGraph').highcharts({
         chart: {
             type: 'bar',
-            height: {{{ count($activity->criteria_achieved() )*22+225 }}},
+            height: 
+            @if($activity->is_assessed())
+            
+                {{ count($activity->criteria_achieved() )*22+225 }}
+            @else
+                {{22+225}}
+            @endif
+            ,
         },
         title: {
             text: 'Criteria Achievement',
         },
         xAxis: {
             categories: [
-                @if($activity->cap_array!=NULL)
+                @if($activity->is_assessed())
                     @foreach($activity->criteria_achieved() as $id=>$value)
                         "{{{ Criterion::withTrashed()->find($id)->name }}}",
                     @endforeach
@@ -436,7 +443,7 @@ $(function () {
                 y:-1
             },
             data:[
-                @if($activity->cap_array!=NULL)
+                @if($activity->is_assessed())
                     @foreach($activity->cap_array as $id=>$crit)
 
                         //This conditional is to ignore criteria that weren't assessed. These would have a value of null.

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

@@ -141,9 +141,13 @@
                             <td class="score-field">
                                 <select name="" id="" class="form-control" data-toggle="tooltip" data-placement="right" title="{{{ $student->name }}}">
                                 <!-- Option from 0-8 -->
+                                
                                 @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[$student->id][$i])
+                                    <?php
+                                    Log::info($scores_array);
+                                    ?>
+                                    @if(array_key_exists($student->id, $scores_array) && $j ==  $scores_array[$student->id][$i])
                                         <option value="{{$j}}" selected="selected">{{ $j }}</option>
                                     @else
                                         <option value="{{$j}}">{{ $j }}</option>
@@ -151,7 +155,7 @@
                                 @endfor
 
                                 <!-- N/A option -->
-                                @if( $scores_array[$student->id][$i]=="N/A")
+                                @if( !array_key_exists($student->id, $scores_array)|| isset($scores_array[$student->id][$i]))
                                     <option value="N/A" selected="selected">N/A</option>
                                 @else
                                     <option value="N/A">N/A</option>
@@ -162,7 +166,12 @@
                         <td class="percentage"></td>
                         <td class="percentage-per-weight"></td>
                         <td class="">
-                            <textarea class="comments full-textarea" placeholder="Max. 255 characters" maxLength="255" >{{ $scores_array[$student->id]["comments"] }}</textarea>
+                            <textarea class="comments full-textarea" placeholder="Max. 255 characters" maxLength="255" >
+                            
+                                @if(array_key_exists($student->id, $scores_array))
+                                {{ $scores_array[$student->id]["comments"] }}
+                                @endif
+                            </textarea>
                         </td>
                      </tr>
                 @endforeach
@@ -209,6 +218,7 @@
     </div>
 </div>
 <script>
+
 $('#button-submit-assessment, #button-draft-assessment').on('click', function(e)
 {
 
@@ -265,8 +275,9 @@ $('#button-submit-assessment, #button-draft-assessment').on('click', function(e)
 
             // 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 = scoreField.children('select').find(':selected').val();
+            if(score != "N/A")
+            student_info[index].activity_crit_id[activity_criterion_id] = score;
             // Score in the cell
             //var score = scoreField.children('select').find(':selected').val();
 
@@ -600,4 +611,10 @@ $('.criterion-field').on('click', function()
 });
 
 
+$(window).load(function(){
+    $(".tableFloatingHeader").each(function(){
+        $(this).remove();
+    })
+});
+
 @stop

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

@@ -118,10 +118,12 @@ echo
             <thead>
                     <tr>
                         <th>Student</th>
-                        @foreach ($rubric_contents as $criterion)
-                            <th class="criterion-field" data-criterion-id="{{{ $criterion->id }}}">{{ $criterion->name}}</th>
+                        @foreach ($rubric_contents as $index=>$criterion)
+                            <th class="criterion-field" data-criterion-id="{{{ $criterion->criterion_id }}}">{{ $criterion->name}}</th>
+                            <input type="hidden" id="weight-{{$index}}" val = "{{$criterion->weight}}">
                         @endforeach
                         <th>Student Percentage</th>
+                        <th>Student % per Weight<th>
                     </tr>
             </thead>
             <tbody>
@@ -139,10 +141,15 @@ echo
                         <!-- For each criterion in the rubric, there's a score field -->
                         @for ($i = 0; $i<sizeof($rubric_contents); $i++)
                             <td class="score-field">
-                                {{ $scores_array[$assessment->id][$rubric_contents[$i]->id] }}
+                                @if(array_key_exists($assessment->student_id, $scores_array)&& isset($scores_array[$assessment->student_id][$i]))
+                                {{ $scores_array[$assessment->student_id][$i] }}
+                                @else
+                                N/A
+                                @endif
                             </td>
                         @endfor
-                        <td class="percentage">{{{ $assessment->percentage }}}</td>
+                        <td class="percentage"></td>
+                        <td class="percentage-per-weight"></td>
                      </tr>
                 @endforeach
             @endif
@@ -239,6 +246,9 @@ echo '</html>';
         var sum = 0 ;
         var total = 0;
         var percentage = 0;
+        var max_score = {{$rubric->max_score}};
+        var per_of_weight =0;
+        var sum_of_weight =0;
 
         row.find('td.score-field').each(function(index)
         {
@@ -247,16 +257,22 @@ echo '</html>';
             {
                 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*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))
             percentage="0.00";
+        if(isNaN(percentage_per_weight))
+        percentage_per_weight ="0.00";
 
         row.find('.percentage').html('<strong>'+percentage+'%</strong>');
+        row.find('.percentage-per-weight').html('<strong>'+percentage+'%</strong>');
 
     }
   });

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

@@ -118,17 +118,17 @@ echo '<style type="text/css" media="print">
     <tr>
       <th></th>
       <th>Criterion</th>
-      <th>Beginning (1-2)</th>
-      <th>In Progress (3-4)</th>
-      <th>Good (5-6)</th>
-      <th>Excellent (7-8)</th>
+      @foreach($rubric->titles as $position => $text)
+      <th>{{$text}} ({{1+ ($position*($rubric->max_score/$rubric->num_scales))}}-{{(1+$position)*($rubric->max_score/$rubric->num_scales)}})</th>
+      @endforeach
+     
       <th>Learning Outcome</th>
       <th>Copyright</th>
       <th>Notes</th>
     </tr>
   </thead>
   <tbody>
-  @foreach(json_decode($rubric->contents) as $index => $criterion)
+    @foreach($rubric_criterion as $index=> $criterion)
     <tr>
       <td>{{ $index + 1 }}.</td>
       <td>
@@ -136,17 +136,25 @@ echo '<style type="text/css" media="print">
 
         @if(property_exists($criterion, 'subcriteria'))
           <ul class="list-unstyled">
-            @foreach($criterion->subcriteria as $subcriterion)
+            @foreach(json_decode($criterion->subcriteria) as $subcriterion)
                 <li>{{ $subcriterion }}</li>
             @endforeach
           </ul>
         @endif
       </td>
-      <td>{{ nl2br($criterion->description12) }}</td>
-      <td>{{ nl2br($criterion->description34) }}</td>
-      <td>{{ nl2br($criterion->description56) }}</td>
-      <td>{{ nl2br($criterion->description78) }}</td>
-      <td>{{ Outcome::where('id', $criterion->outcome_id)->first()->name }}</td>
+      @foreach(json_decode($criterion->scales) as $index2 => $description)
+      <td>{{  nl2br($description) }}</td>
+      @endforeach
+      
+      <td>
+        <ol>
+        @foreach(json_decode($criterion->outcomes) as $outcome)
+        
+<li>{{$outcome}}</li>
+        
+        @endforeach
+      </ol>
+      </td>
       <td>
       @if($criterion->copyright)
         {{{ $criterion->copyright }}}
@@ -157,8 +165,9 @@ echo '<style type="text/css" media="print">
         {{{ $criterion->notes }}}
       @endif
       </td>
-    </tr>
-  @endforeach
+    </tr>     
+    @endforeach
+
   </tbody>
 </table>
 

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

@@ -99,14 +99,22 @@
                     <!-- 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">
+                            @if(array_key_exists($student->id, $scores_array) && isset($scores_array[$student->id][$i]))
                             {{$scores_array[$student->id][$i]}}
+                            @else
+                            N/A
+                            @endif
                         </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>
+                        <textarea class="comments full-textarea" placeholder="Max. 255 characters" maxLength="255" disabled >
+                            @if(array_key_exists($student->id, $scores_array))
+                            {{ $scores_array[$student->id]["comments"] }}
+                            @endif
+                        </textarea>
                     </td>
                  </tr>
             @endforeach