Browse Source

Assessment Comments

parent
commit
bee556051e

+ 13
- 8
app/views/local/managers/admins/new_assessment_report.blade.php View File

58
                                     <?php
58
                                     <?php
59
                                     
59
                                     
60
                                     /*$sections_evaluating = Course::has('activities')
60
                                     /*$sections_evaluating = Course::has('activities')
61
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ->whereNotNull('outcomes_attempted')
62
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
63
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ->with(array('activities'=>function($query) use(&$outcome){
64
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    $query->whereNotNull('outcomes_attempted');
65
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
66
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ->where('code', $course->code)->where('number',$course->number)
67
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ->whereIn('semester_id', Session::get('semesters_ids'))
68
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ->get();*/
61
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->whereNotNull('outcomes_attempted')
62
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
63
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->with(array('activities'=>function($query) use(&$outcome){
64
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        $query->whereNotNull('outcomes_attempted');
65
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
66
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->where('code', $course->code)->where('number',$course->number)
67
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->whereIn('semester_id', Session::get('semesters_ids'))
68
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->get();*/
69
                                     
69
                                     
70
                                     $sections_evaluating = Course::has('activities')
70
                                     $sections_evaluating = Course::has('activities')
71
                                     
71
                                     
189
                                                 <p style="display: inline;"> <strong>Has no Formative Action yet </strong>
189
                                                 <p style="display: inline;"> <strong>Has no Formative Action yet </strong>
190
 
190
 
191
                                             @endif
191
                                             @endif
192
+                                            @if ($activity->assessment_comments != null)
193
+
194
+                                                <h5 style="display: inline; margin:30px;">Assessment Comments</h5>
195
+                                                <p style="display: inline;">{{ $activity->assessment_comments }}</p>
196
+                                            @endif
192
                                             <br>
197
                                             <br>
193
                                             <table class='table table-striped table-condensed datatable'>
198
                                             <table class='table table-striped table-condensed datatable'>
194
                                                 <thead>
199
                                                 <thead>

+ 14
- 8
app/views/local/managers/pCoords/new_assessment_report.blade.php View File

44
                         <?php
44
                         <?php
45
                         
45
                         
46
                         /*$sections_evaluating = Course::has('activities')
46
                         /*$sections_evaluating = Course::has('activities')
47
-                                                                                        ->whereNotNull('outcomes_attempted')
48
-                                                                                        ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
49
-                                                                                        ->with(array('activities'=>function($query) use(&$outcome){
50
-                                                                                            $query->whereNotNull('outcomes_attempted');
51
-                                                                                            $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
52
-                                                                                        ->where('code', $course->code)->where('number',$course->number)
53
-                                                                                        ->whereIn('semester_id', Session::get('semesters_ids'))
54
-                                                                                        ->get();*/
47
+                                                                                                                ->whereNotNull('outcomes_attempted')
48
+                                                                                                                ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
49
+                                                                                                                ->with(array('activities'=>function($query) use(&$outcome){
50
+                                                                                                                    $query->whereNotNull('outcomes_attempted');
51
+                                                                                                                    $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
52
+                                                                                                                ->where('code', $course->code)->where('number',$course->number)
53
+                                                                                                                ->whereIn('semester_id', Session::get('semesters_ids'))
54
+                                                                                                                ->get();*/
55
                         
55
                         
56
                         $sections_evaluating = Course::has('activities')
56
                         $sections_evaluating = Course::has('activities')
57
                         
57
                         
167
                                         <p style="display: inline;"> <strong>Has no Formative Action yet </strong>
167
                                         <p style="display: inline;"> <strong>Has no Formative Action yet </strong>
168
 
168
 
169
                                     @endif
169
                                     @endif
170
+
171
+                                    @if ($activity->assessment_comments != null)
172
+
173
+                                        <h5 style="display: inline; margin:30px;">Assessment Comments</h5>
174
+                                        <p style="display: inline;">{{ $activity->assessment_comments }}</p>
175
+                                    @endif
170
                                     <br>
176
                                     <br>
171
                                     <table class='table table-striped table-condensed datatable'>
177
                                     <table class='table table-striped table-condensed datatable'>
172
                                         <thead>
178
                                         <thead>

+ 15
- 9
app/views/local/professors/new_assessment_report.blade.php View File

49
                     <?php
49
                     <?php
50
                     
50
                     
51
                     /*$sections_evaluating = Course::has('activities')
51
                     /*$sections_evaluating = Course::has('activities')
52
-                                               ->whereNotNull('outcomes_attempted')
53
-                                               ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
54
-                                               ->with(array('activities'=>function($query) use(&$outcome){
55
-                                                   $query->whereNotNull('outcomes_attempted');
56
-                                                   $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
57
-                                               ->where('code', $course->code)->where('number',$course->number)
58
-                                               ->whereIn('semester_id', Session::get('semesters_ids'))
59
-                                               ->get();*/
52
+                                                                   ->whereNotNull('outcomes_attempted')
53
+                                                                   ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
54
+                                                                   ->with(array('activities'=>function($query) use(&$outcome){
55
+                                                                       $query->whereNotNull('outcomes_attempted');
56
+                                                                       $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
57
+                                                                   ->where('code', $course->code)->where('number',$course->number)
58
+                                                                   ->whereIn('semester_id', Session::get('semesters_ids'))
59
+                                                                   ->get();*/
60
                     
60
                     
61
                     $sections_evaluating = Course::has('activities')
61
                     $sections_evaluating = Course::has('activities')
62
                     
62
                     
103
                             @foreach ($section->publishedActivities as $index4 => $activity)
103
                             @foreach ($section->publishedActivities as $index4 => $activity)
104
 
104
 
105
                                 <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
105
                                 <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
106
-                                <p style="display: inline;">{{ $activity->name }} <strong>({{ $activity->date }})</strong>
106
+                                <p style="display: inline;">{{ $activity->name }}
107
+                                    <strong>({{ $activity->date }})</strong>
107
                                 </p>
108
                                 </p>
108
                                 <br>
109
                                 <br>
109
                                 <br>
110
                                 <br>
174
                                     <p style="display: inline;"> <strong>Has no Formative Action yet </strong>
175
                                     <p style="display: inline;"> <strong>Has no Formative Action yet </strong>
175
 
176
 
176
                                 @endif
177
                                 @endif
178
+                                @if ($activity->assessment_comments != null)
179
+
180
+                                    <h5 style="display: inline; margin:30px;">Assessment Comments</h5>
181
+                                    <p style="display: inline;">{{ $activity->assessment_comments }}</p>
182
+                                @endif
177
                                 <br>
183
                                 <br>
178
 
184
 
179
                                 <table class='table table-striped table-condensed datatable'>
185
                                 <table class='table table-striped table-condensed datatable'>