Merge branch 'Merge_gabriel_mayo' of https://git.ccom.uprrp.edu/CDCC/OLAS into Merge_gabriel_mayo

app/models/Activity.php

@@ -209,7 +209,8 @@ class Activity extends Eloquent
       ->whereIn('activity_criterion_id', $all_criterion)
       ->lists('id');
 
-    return boolval(count($assessments));
+//     return boolval(count($assessments));
+    return (bool)(count($assessments));
   }
 
   public function isStudentAssessed($student_id)

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

@@ -390,7 +390,7 @@ $(function () {
             title: {
                 text: 'Percentage'
             },
-            @if(isset($activity->rubric[0]->expected_percentage)  )
+            @if(isset($activity->rubric[0]) and isset($activity->rubric[0]->expected_percentage)  )
             plotLines:[{
                 value:{{ $activity->rubric[0]->expected_percentage }},
                 color: '#000',

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

@@ -240,6 +240,7 @@ $(function () {
                     @if(
                         is_array($outcomes_attempted)
                         && array_key_exists($outcome->id, $outcomes_attempted)
+                        && array_key_exists($outcome->id, $outcomes_achieved)
                         && $outcomes_attempted[$outcome->id]!=0)
                         {{{ ($outcomes_achieved[$outcome->id]/$outcomes_attempted[$outcome->id])*100 }}},
                     @else