Assessment Comments

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')
                                     
@@ -189,6 +189,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>

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')
                         
@@ -167,6 +167,12 @@
                                         <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>

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')
                     
@@ -103,7 +103,8 @@
                             @foreach ($section->publishedActivities as $index4 => $activity)
 
                                 <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
-                                <p style="display: inline;">{{ $activity->name }} <strong>({{ $activity->date }})</strong>
+                                <p style="display: inline;">{{ $activity->name }}
+                                    <strong>({{ $activity->date }})</strong>
                                 </p>
                                 <br>
                                 <br>
@@ -174,6 +175,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'>