MAs bugs

app/views/local/managers/admins/new_assessment_report.blade.php

@@ -58,14 +58,14 @@
                                     <?php
                                     
                                     /*$sections_evaluating = Course::has('activities')
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->whereNotNull('outcomes_attempted')
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->with(array('activities'=>function($query) use(&$outcome){
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        $query->whereNotNull('outcomes_attempted');
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->where('code', $course->code)->where('number',$course->number)
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->whereIn('semester_id', Session::get('semesters_ids'))
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->get();*/
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        ->whereNotNull('outcomes_attempted')
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        ->with(array('activities'=>function($query) use(&$outcome){
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            $query->whereNotNull('outcomes_attempted');
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        ->where('code', $course->code)->where('number',$course->number)
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        ->whereIn('semester_id', Session::get('semesters_ids'))
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        ->get();*/
                                     
                                     $sections_evaluating = Course::has('activities')
                                     
@@ -149,7 +149,7 @@
                                             @endif
                                             <br>
                                             <br>
-                                            <h4>Perfomance by Learning Outcome Criteria</h4>
+                                            <h4>Performance of Students by Learning Outcome Criteria</h4>
                                             <h5 style="display: inline; margin:30px;">Target by criterion: </h5>
                                             <p style="display: inline;"> <i>{{ $activity->rubric[0]->expected_points }}
                                                     or
@@ -269,7 +269,7 @@
                                             <hr>
                                             <br>
 
-                                            <h4>Perfomance by Learning Outcome Student</h4>
+                                            <h4>Performance of Students by Learning Outcome</h4>
                                             <h5 style="display: inline; margin:30px;">Target by outcome: </h5>
                                             <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
                                             </p>

app/views/local/managers/pCoords/new_assessment_report.blade.php

@@ -44,14 +44,14 @@
                         <?php
                         
                         /*$sections_evaluating = Course::has('activities')
-                                                                                                                ->whereNotNull('outcomes_attempted')
-                                                                                                                ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
-                                                                                                                ->with(array('activities'=>function($query) use(&$outcome){
-                                                                                                                    $query->whereNotNull('outcomes_attempted');
-                                                                                                                    $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
-                                                                                                                ->where('code', $course->code)->where('number',$course->number)
-                                                                                                                ->whereIn('semester_id', Session::get('semesters_ids'))
-                                                                                                                ->get();*/
+                                                                                                                                        ->whereNotNull('outcomes_attempted')
+                                                                                                                                        ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
+                                                                                                                                        ->with(array('activities'=>function($query) use(&$outcome){
+                                                                                                                                            $query->whereNotNull('outcomes_attempted');
+                                                                                                                                            $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
+                                                                                                                                        ->where('code', $course->code)->where('number',$course->number)
+                                                                                                                                        ->whereIn('semester_id', Session::get('semesters_ids'))
+                                                                                                                                        ->get();*/
                         
                         $sections_evaluating = Course::has('activities')
                         
@@ -132,7 +132,7 @@
                                     @endif
                                     <br>
                                     <br>
-                                    <h4>Perfomance by Learning Outcome Criteria</h4>
+                                    <h4>Performance of Students by Learning Outcome Criteria</h4>
                                     <h5 style="display: inline; margin:30px;">Target by criterion: </h5>
                                     <p style="display: inline;"> <i>{{ $activity->rubric[0]->expected_points }} or
                                             more</i>
@@ -248,7 +248,7 @@
                                     <hr>
                                     <br>
 
-                                    <h4>Perfomance by Learning Outcome Student</h4>
+                                    <h4>Performance of Students by Learning Outcome</h4>
                                     <h5 style="display: inline; margin:30px;">Target by outcome: </h5>
                                     <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
                                     </p>

app/views/local/managers/sCoords/new_assessment_report.blade.php

@@ -56,14 +56,14 @@
                                 <?php
                                 
                                 /*$sections_evaluating = Course::has('activities')
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->whereNotNull('outcomes_attempted')
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->with(array('activities'=>function($query) use(&$outcome){
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        $query->whereNotNull('outcomes_attempted');
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->where('code', $course->code)->where('number',$course->number)
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->whereIn('semester_id', Session::get('semesters_ids'))
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->get();*/
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->whereNotNull('outcomes_attempted')
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->with(array('activities'=>function($query) use(&$outcome){
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        $query->whereNotNull('outcomes_attempted');
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->where('code', $course->code)->where('number',$course->number)
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->whereIn('semester_id', Session::get('semesters_ids'))
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->get();*/
                                 
                                 $sections_evaluating = Course::has('activities')
                                 
@@ -147,7 +147,7 @@
                                         @endif
                                         <br>
                                         <br>
-                                        <h4>Perfomance by Learning Outcome Criteria</h4>
+                                        <h4>Performance of Students by Learning Outcome Criteria</h4>
                                         <h5 style="display: inline; margin:30px;">Target by criterion: </h5>
                                         <p style="display: inline;"> <i>{{ $activity->rubric[0]->expected_points }} or
                                                 more</i>
@@ -183,6 +183,11 @@
                                             <p style="display: inline;"> <strong>Has no Formative Action yet </strong>
 
                                         @endif
+                                        @if ($activity->assessment_comments != null)
+
+                                            <h5 style="display: inline; margin:30px;">Assessment Comments</h5>
+                                            <p style="display: inline;">{{ $activity->assessment_comments }}</p>
+                                        @endif
                                         <br>
                                         <table class='table table-striped table-condensed datatable'>
                                             <thead>
@@ -258,7 +263,7 @@
                                         <hr>
                                         <br>
 
-                                        <h4>Perfomance by Learning Outcome Student</h4>
+                                        <h4>Performance of Students by Learning Outcome</h4>
                                         <h5 style="display: inline; margin:30px;">Target by outcome: </h5>
                                         <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
                                         </p>

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

@@ -49,14 +49,14 @@
                     <?php
                     
                     /*$sections_evaluating = Course::has('activities')
-                                                                   ->whereNotNull('outcomes_attempted')
-                                                                   ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
-                                                                   ->with(array('activities'=>function($query) use(&$outcome){
-                                                                       $query->whereNotNull('outcomes_attempted');
-                                                                       $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
-                                                                   ->where('code', $course->code)->where('number',$course->number)
-                                                                   ->whereIn('semester_id', Session::get('semesters_ids'))
-                                                                   ->get();*/
+                                                                                       ->whereNotNull('outcomes_attempted')
+                                                                                       ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
+                                                                                       ->with(array('activities'=>function($query) use(&$outcome){
+                                                                                           $query->whereNotNull('outcomes_attempted');
+                                                                                           $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
+                                                                                       ->where('code', $course->code)->where('number',$course->number)
+                                                                                       ->whereIn('semester_id', Session::get('semesters_ids'))
+                                                                                       ->get();*/
                     
                     $sections_evaluating = Course::has('activities')
                     
@@ -141,7 +141,7 @@
                                 @endif
                                 <br>
                                 <br>
-                                <h4>Perfomance by Learning Outcome Criteria</h4>
+                                <h4>Performance of Students by Learning Outcome Criteria</h4>
                                 <h5 style="display: inline; margin:30px;">Target by criterion: </h5>
                                 <p style="display: inline;"> <i>{{ $activity->rubric[0]->expected_points }} or more</i>
                                 </p>
@@ -264,7 +264,7 @@
                                 <hr>
                                 <br>
 
-                                <h4>Perfomance by Learning Outcome Student</h4>
+                                <h4>Performance of Students by Learning Outcome</h4>
                                 <h5 style="display: inline; margin:30px;">Target by outcome: </h5>
                                 <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
                                 </p>