Преглед изворни кода

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

Resolviendo varias bugs
Carlos J Corrada Bravo пре 2 година
родитељ
комит
940833dabd

+ 3
- 2
app/controllers/ProgramsController.php Прегледај датотеку

@@ -11,6 +11,7 @@ class ProgramsController extends \BaseController
11 11
   {
12 12
 
13 13
     $program = Program::find($id);
14
+    Log::info(debug_backtrace()[1]['function']);
14 15
     $title = $program->school->name . ': ' . $program->name;
15 16
     $program_courses = $program->courses;
16 17
     //     $outcomes = Outcome::orderBy('name', 'asc')->get();
@@ -495,7 +496,7 @@ class ProgramsController extends \BaseController
495 496
    */
496 497
   public function fetch()
497 498
   {
498
-    Log::info('id:' . Input::get('id'));
499
+    //Log::info('id:' . Input::get('id'));
499 500
     return School::find(Input::get('id'))->programs;
500 501
   }
501
-}
502
+}

+ 12
- 2
app/models/Activity.php Прегледај датотеку

@@ -60,7 +60,15 @@ class Activity extends Eloquent
60 60
     return  $criteria_achieved;
61 61
   }
62 62
 
63
-
63
+  public function formativeActionsWithCriteria()
64
+  {
65
+    return DB::table('activity_criterion')
66
+      ->join('transformative_activity_criterion', 'transformative_activity_criterion.activity_criterion_id', '=', 'activity_criterion.id')
67
+      ->join('criteria', 'criteria.id', '=', 'activity_criterion.criterion_id')
68
+      ->join('transformative_actions', 'transformative_actions.id', '=', 'transformative_activity_criterion.trans_action_id')
69
+      ->where('activity_id', $this->id)
70
+      ->get();
71
+  }
64 72
 
65 73
   // cap_array
66 74
   public function getCapArrayAttribute()
@@ -114,6 +122,8 @@ class Activity extends Eloquent
114 122
     $activity_criterion = DB::table('activity_criterion')
115 123
       ->join('criteria', 'criteria.id', '=', 'activity_criterion.criterion_id')
116 124
       ->where('activity_id', $this->id)
125
+      ->select('activity_criterion.activity_id', 'activity_criterion.criterion_id', 'criteria.*')
126
+      ->distinct()
117 127
       ->get();
118 128
 
119 129
 
@@ -404,4 +414,4 @@ class Activity extends Eloquent
404 414
     //return json_decode($this->outcomes_attempted, true);
405 415
     return $outcomes_attempted;
406 416
   }
407
-}
417
+}

+ 1
- 1
app/models/Course.php Прегледај датотеку

@@ -61,7 +61,7 @@ class Course extends Eloquent
61 61
       ->select('activities.id')
62 62
       ->distinct()
63 63
       ->lists('activities.id');
64
-    //return $this->hasMany('Activity')->whereNotNull('activities.outcomes_attempted')->where('activities.draft', 0)->orderBy('date', 'asc');
64
+    //$this->hasMany('Activity')->whereNotNull('activities.outcomes_attempted')->where('activities.draft', 0)->orderBy('date', 'asc');
65 65
     return  $this->hasMany('Activity')->whereIn('activities.id', $activitiesAssessed)->orderBy('date', 'asc');
66 66
   }
67 67
 

+ 1323
- 1011
app/views/local/managers/admins/criteria.blade.php
Разлика између датотеке није приказан због своје велике величине
Прегледај датотеку


+ 44
- 13
app/views/local/managers/admins/new_assessment_report.blade.php Прегледај датотеку

@@ -58,14 +58,14 @@
58 58
                                     <?php
59 59
                                     
60 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 70
                                     $sections_evaluating = Course::has('activities')
71 71
                                     
@@ -149,7 +149,7 @@
149 149
                                             @endif
150 150
                                             <br>
151 151
                                             <br>
152
-                                            <h4>Perfomance by Learning Outcome Criteria</h4>
152
+                                            <h4>Performance of Students by Learning Outcome Criteria</h4>
153 153
                                             <h5 style="display: inline; margin:30px;">Target by criterion: </h5>
154 154
                                             <p style="display: inline;"> <i>{{ $activity->rubric[0]->expected_points }}
155 155
                                                     or
@@ -163,6 +163,37 @@
163 163
                                                 <i>{{ $activity->rubric[0]->expected_percentage }}
164 164
                                                     %</i>
165 165
                                             </p>
166
+
167
+                                            <br>
168
+                                            <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
169
+                                            <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
170
+                                            @if ($formative_actions)
171
+                                                <p style="display: inline;">
172
+                                                    <strong>{{ $formative_actions[0]->at_text }}:
173
+                                                    </strong>
174
+
175
+                                                    <i>{{ $formative_actions[0]->description }}
176
+                                                    </i>
177
+                                                </p>
178
+                                                <br>
179
+                                                <h5>Formative Action's Associated
180
+                                                    Criteria: </h5>
181
+                                                <ul>
182
+                                                    @foreach ($formative_actions as $criteria)
183
+                                                        <li> <i>{{ $criteria->name }} <i></li>
184
+
185
+                                                    @endforeach
186
+                                                </ul>
187
+
188
+                                            @else
189
+                                                <p style="display: inline;"> <strong>Has no Formative Action yet </strong>
190
+
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
166 197
                                             <br>
167 198
                                             <table class='table table-striped table-condensed datatable'>
168 199
                                                 <thead>
@@ -238,7 +269,7 @@
238 269
                                             <hr>
239 270
                                             <br>
240 271
 
241
-                                            <h4>Perfomance by Learning Outcome Student</h4>
272
+                                            <h4>Performance of Students by Learning Outcome</h4>
242 273
                                             <h5 style="display: inline; margin:30px;">Target by outcome: </h5>
243 274
                                             <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
244 275
                                             </p>
@@ -251,9 +282,9 @@
251 282
                                                     $expected = DB::table('target_outcomes_program')
252 283
                                                         ->where('program_id', $course->program_id)
253 284
                                                         ->where('semester_id', $course->semester_id)
254
-                                                        ->first();//->expected_target;
255
-                                                    if(!$expected){
256
-                                                        $expected = "It has not been defined in the annual plan";
285
+                                                        ->first(); //->expected_target;
286
+                                                    if (!$expected) {
287
+                                                        $expected = 'It has not been defined in the annual plan';
257 288
                                                     }
258 289
                                                     ?>
259 290
                                                     {{ $expected }}

+ 1217
- 928
app/views/local/managers/pCoords/criteria.blade.php
Разлика између датотеке није приказан због своје велике величине
Прегледај датотеку


+ 50
- 16
app/views/local/managers/pCoords/new_assessment_report.blade.php Прегледај датотеку

@@ -44,14 +44,14 @@
44 44
                         <?php
45 45
                         
46 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 56
                         $sections_evaluating = Course::has('activities')
57 57
                         
@@ -95,7 +95,8 @@
95 95
 
96 96
                                     <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
97 97
                                     <p style="display: inline;">{{ $activity->name }}
98
-                                        <strong>({{ $activity->date }})</strong></p>
98
+                                        <strong>({{ $activity->date }})</strong>
99
+                                    </p>
99 100
                                     <br>
100 101
                                     <br>
101 102
                                     <h5 style="display: inline;">Performance Indicators: </h5>
@@ -125,20 +126,53 @@
125 126
                                     @if ($activity->rubric[0]->max_score == 1)
126 127
                                         <p style="display: inline;">1 point scale</p>
127 128
                                     @else
128
-                                        <p style="display: inline;">1-{{ $activity->rubric[0]->max_score }} point scale</p>
129
+                                        <p style="display: inline;">1-{{ $activity->rubric[0]->max_score }} point scale
130
+                                        </p>
129 131
 
130 132
                                     @endif
131 133
                                     <br>
132 134
                                     <br>
133
-                                    <h4>Perfomance by Learning Outcome Criteria</h4>
135
+                                    <h4>Performance of Students by Learning Outcome Criteria</h4>
134 136
                                     <h5 style="display: inline; margin:30px;">Target by criterion: </h5>
135
-                                    <p style="display: inline;"> <i>{{ $activity->rubric[0]->expected_points }} or more</i>
137
+                                    <p style="display: inline;"> <i>{{ $activity->rubric[0]->expected_points }} or
138
+                                            more</i>
136 139
                                     </p>
137 140
                                     <br>
138 141
                                     <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
139 142
                                         target by criterion: </h5>
140 143
                                     <p style="display: inline;"> <i>{{ $activity->rubric[0]->expected_percentage }} %</i>
141 144
                                     </p>
145
+
146
+                                    <br>
147
+                                    <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
148
+                                    <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
149
+                                    @if ($formative_actions)
150
+                                        <p style="display: inline;"> <strong>{{ $formative_actions[0]->at_text }}:
151
+                                            </strong>
152
+
153
+                                            <i>{{ $formative_actions[0]->description }}
154
+                                            </i>
155
+                                        </p>
156
+                                        <br>
157
+                                        <h5>Formative Action's Associated
158
+                                            Criteria: </h5>
159
+                                        <ul>
160
+                                            @foreach ($formative_actions as $criteria)
161
+                                                <li> <i>{{ $criteria->name }} <i></li>
162
+
163
+                                            @endforeach
164
+                                        </ul>
165
+
166
+                                    @else
167
+                                        <p style="display: inline;"> <strong>Has no Formative Action yet </strong>
168
+
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
142 176
                                     <br>
143 177
                                     <table class='table table-striped table-condensed datatable'>
144 178
                                         <thead>
@@ -214,7 +248,7 @@
214 248
                                     <hr>
215 249
                                     <br>
216 250
 
217
-                                    <h4>Perfomance by Learning Outcome Student</h4>
251
+                                    <h4>Performance of Students by Learning Outcome</h4>
218 252
                                     <h5 style="display: inline; margin:30px;">Target by outcome: </h5>
219 253
                                     <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
220 254
                                     </p>
@@ -227,9 +261,9 @@
227 261
                                                 ->where('program_id', $course->program_id)
228 262
                                                 ->where('semester_id', $course->semester_id)
229 263
                                                 ->first();
230
-                                                if(!$expected){
231
-                                                        $expected = "It has not been defined in the annual plan";
232
-                                                    }
264
+                                            if (!$expected) {
265
+                                                $expected = 'It has not been defined in the annual plan';
266
+                                            }
233 267
                                             
234 268
                                             ?>
235 269
                                             {{ $expected }}

+ 6
- 14
app/views/local/managers/sCoords/criteria.blade.php Прегледај датотеку

@@ -25,7 +25,7 @@
25 25
                                 {{ Form::select('outcome[]', $outcomes, reset($outcomes), ['class' => 'form-control selectpicker', 'id' => 'outcome0', 'onchange' => 'fetchObjectiveForSelect("outcome0", "objectiveGroupFor0")']) }}
26 26
                             </div>
27 27
 
28
-                            <div id='objectiveGroupFor0' class='createObjective' class data-value='1'>
28
+                            <div id='objectiveGroupFor0' class='createObjective' data-value='1'>
29 29
                                 <div class="form-group col-md-11 selectObjective">
30 30
                                     <label>Associated Objectives for Outcome 1</label>
31 31
                                     <select id="objective_0_counter_1" name="objective[]" class="form-control selectpicker"
@@ -80,7 +80,7 @@
80 80
                         {{ Form::text('name', '', ['class' => 'form-control']) }}
81 81
                     </div>
82 82
 
83
-                    <div class="form-group  ">
83
+                    <div class="form-group">
84 84
                         {{ Form::label('subcriteria', 'Subcriteria') }}
85 85
                         <p class="help-block"><strong>Manually add</strong> bullets or numbering.</p>
86 86
                         {{ Form::textarea('subcriteria', '', ['class' => 'form-control', 'rows' => 3, 'aria-labelledby' => 'subcriteria']) }}
@@ -151,15 +151,7 @@
151 151
                             onchange='fetchCriterionForEditing()'>
152 152
                             @foreach ($criteria as $criterion)
153 153
                                 <option value="{{ $criterion->id }}" data-subtext="
154
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
155
-                                                                                                                                                                                                                                                                                                                                                                                                                       
156
-                                                                                                                                                                                                                                                                                                                                                                       
157
-                                                                                                                                                                                                                                                                                                                       
158
-                                                                                                                                                                                                                                                                       
159
-                                                                                                                                                                                                                       
160
-                                                                                                                                                                       
161
-                                                                                                                       
162
-                                                                  @if ($criterion->program)
154
+               @if ($criterion->program)
163 155
                                     &nbsp;&nbsp;&nbsp;[{{ $criterion->program->name }}]
164 156
                             @endif
165 157
                             ">
@@ -277,7 +269,7 @@
277 269
                         {{ Form::textarea('notes', Input::old('notes'), ['class' => 'form-control', 'rows' => 2, 'id' => 'criterion_notes', 'placeholder' => '(optional)']) }}
278 270
                     </div>
279 271
 
280
-                    {{ Form::submit('Update', ['class' => 'btn btn-primary btn-block', 'id' => 'update_the_criterion_button']) }}
272
+                    {{ Form::submit('Update', ['class' => 'btn btn-primary btn-block', 'id' => 'update_the_criterion_button', 'data-form-id' => 'update_criterion']) }}
281 273
                     {{ Form::close() }}
282 274
 
283 275
                     {{ Form::open(['action' => 'CriteriaController@delete']) }}
@@ -565,7 +557,6 @@
565 557
         visibleProgram["allAssocOutcomes"] = {}
566 558
         visibleProgram["allOutcomes"] = {}
567 559
 
568
-
569 560
         function visiblePrograms(allOutcomesDiv) {
570 561
             checkedPrograms = {}
571 562
             $('#' + allOutcomesDiv).parent().find('input:checkbox').each(function(index) {
@@ -575,7 +566,6 @@
575 566
                     checkedPrograms[$(this).attr('id')] = 1;
576 567
                     $(this).prop("checked", false);
577 568
                 }
578
-
579 569
                 program_id = $(this).val();
580 570
                 if (!(program_id in visibleProgram[allOutcomesDiv])) {
581 571
                     visibleProgram[allOutcomesDiv][program_id] = {};
@@ -1349,6 +1339,7 @@
1349 1339
                             $("#update_the_criterion_button").val('Update');
1350 1340
                             $("#update_criterion").attr('action', "{{ URL::action('CriteriaController@update') }}")
1351 1341
 
1342
+
1352 1343
                         } else {
1353 1344
                             $('#DeleteButton').prop('disabled', true);
1354 1345
                             $("#update_the_criterion_button").val("Create New")
@@ -1357,6 +1348,7 @@
1357 1348
                                 '<div class="alert alert-danger alert-dismissible" role="alert"> <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button> <strong>Warning!</strong> The criterion is already used in assessments. Editting the criterion will actually create a new criterion </div>'
1358 1349
                             );
1359 1350
 
1351
+
1360 1352
                         }
1361 1353
                         var name = criterion.name;
1362 1354
                         if (criterion.subcriteria) {

+ 44
- 12
app/views/local/managers/sCoords/new_assessment_report.blade.php Прегледај датотеку

@@ -56,14 +56,14 @@
56 56
                                 <?php
57 57
                                 
58 58
                                 /*$sections_evaluating = Course::has('activities')
59
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->whereNotNull('outcomes_attempted')
60
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
61
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->with(array('activities'=>function($query) use(&$outcome){
62
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        $query->whereNotNull('outcomes_attempted');
63
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
64
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->where('code', $course->code)->where('number',$course->number)
65
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->whereIn('semester_id', Session::get('semesters_ids'))
66
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->get();*/
59
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->whereNotNull('outcomes_attempted')
60
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
61
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->with(array('activities'=>function($query) use(&$outcome){
62
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        $query->whereNotNull('outcomes_attempted');
63
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
64
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->where('code', $course->code)->where('number',$course->number)
65
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->whereIn('semester_id', Session::get('semesters_ids'))
66
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->get();*/
67 67
                                 
68 68
                                 $sections_evaluating = Course::has('activities')
69 69
                                 
@@ -147,7 +147,7 @@
147 147
                                         @endif
148 148
                                         <br>
149 149
                                         <br>
150
-                                        <h4>Perfomance by Learning Outcome Criteria</h4>
150
+                                        <h4>Performance of Students by Learning Outcome Criteria</h4>
151 151
                                         <h5 style="display: inline; margin:30px;">Target by criterion: </h5>
152 152
                                         <p style="display: inline;"> <i>{{ $activity->rubric[0]->expected_points }} or
153 153
                                                 more</i>
@@ -158,6 +158,36 @@
158 158
                                         <p style="display: inline;"> <i>{{ $activity->rubric[0]->expected_percentage }}
159 159
                                                 %</i>
160 160
                                         </p>
161
+
162
+                                        <br>
163
+                                        <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
164
+                                        <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
165
+                                        @if ($formative_actions)
166
+                                            <p style="display: inline;"> <strong>{{ $formative_actions[0]->at_text }}:
167
+                                                </strong>
168
+
169
+                                                <i>{{ $formative_actions[0]->description }}
170
+                                                </i>
171
+                                            </p>
172
+                                            <br>
173
+                                            <h5>Formative Action's Associated
174
+                                                Criteria: </h5>
175
+                                            <ul>
176
+                                                @foreach ($formative_actions as $criteria)
177
+                                                    <li> <i>{{ $criteria->name }} <i></li>
178
+
179
+                                                @endforeach
180
+                                            </ul>
181
+
182
+                                        @else
183
+                                            <p style="display: inline;"> <strong>Has no Formative Action yet </strong>
184
+
185
+                                        @endif
186
+                                        @if ($activity->assessment_comments != null)
187
+
188
+                                            <h5 style="display: inline; margin:30px;">Assessment Comments</h5>
189
+                                            <p style="display: inline;">{{ $activity->assessment_comments }}</p>
190
+                                        @endif
161 191
                                         <br>
162 192
                                         <table class='table table-striped table-condensed datatable'>
163 193
                                             <thead>
@@ -233,7 +263,7 @@
233 263
                                         <hr>
234 264
                                         <br>
235 265
 
236
-                                        <h4>Perfomance by Learning Outcome Student</h4>
266
+                                        <h4>Performance of Students by Learning Outcome</h4>
237 267
                                         <h5 style="display: inline; margin:30px;">Target by outcome: </h5>
238 268
                                         <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
239 269
                                         </p>
@@ -245,8 +275,10 @@
245 275
                                                 $expected = DB::table('target_outcomes_program')
246 276
                                                     ->where('program_id', $course->program_id)
247 277
                                                     ->where('semester_id', $course->semester_id)
248
-                                                    ->first()->expected_target;
249
-                                                
278
+                                                    ->first(); //->expected_target;
279
+                                                if (!$expected) {
280
+                                                    $expected = 'It has not been defined in the annual plan';
281
+                                                }
250 282
                                                 ?>
251 283
                                                 {{ $expected }}
252 284
                                             </i>

+ 541
- 512
app/views/local/managers/shared/annual_report.blade.php
Разлика између датотеке није приказан због своје велике величине
Прегледај датотеку


+ 12
- 4
app/views/local/professors/activity.blade.php Прегледај датотеку

@@ -241,11 +241,19 @@
241 241
         <hr>
242 242
             <h5>Description</h5>
243 243
             <p>{{ $activity->description }}</p>
244
-
245
-        @if($activity->transforming_actions != NULL)
244
+        <?php
245
+        $formative_actions = $activity->formativeActionsWithCriteria();
246
+        ?>
247
+        @if($formative_actions != NULL)
246 248
             <hr>
247
-            <h5>Transforming Actions</h5>
248
-            {{{ $activity->transforming_actions }}}
249
+            <h5>Formative Actions</h5>
250
+            <p><strong>{{ $formative_actions[0]->at_text }}: </strong> {{$formative_actions[0]->description}}</p>
251
+            <h5>Formative Action's Associated Criteria</h5>
252
+            <ul>
253
+                @foreach($formative_actions as $criteria)
254
+                <li>{{$criteria->name}}</li>
255
+                @endforeach
256
+            </ul>
249 257
         @endif
250 258
 
251 259
         @if($activity->assessment_comments != NULL)

+ 416
- 400
app/views/local/professors/compare_activities.blade.php
Разлика између датотеке није приказан због своје велике величине
Прегледај датотеку


+ 265
- 231
app/views/local/professors/new_assessment_report.blade.php Прегледај датотеку

@@ -1,14 +1,14 @@
1 1
 @extends('layouts.master')
2 2
 
3 3
 @section('navigation')
4
-    @if(Auth::user()->role==1)
4
+    @if (Auth::user()->role == 1)
5 5
         @include('local.managers.admins._navigation')
6
-    @elseif(Auth::user()->role==2)
6
+    @elseif(Auth::user()->role == 2)
7 7
         @include('local.managers.sCoords._navigation')
8
-    @elseif(Auth::user()->role==3)
8
+    @elseif(Auth::user()->role == 3)
9 9
         @include('local.managers.pCoords._navigation')
10 10
     @else
11
-    @include('local.professors._navigation')
11
+        @include('local.professors._navigation')
12 12
 
13 13
     @endif
14 14
 @stop
@@ -16,240 +16,274 @@
16 16
 @section('main')
17 17
     <div class="row">
18 18
         <div class="col-md-12">
19
-            <p>This report contains performance information for all your Program's assessed courses during the following semester(s):</p>
19
+            <p>This report contains performance information for all your Program's assessed courses during the following
20
+                semester(s):</p>
20 21
             <ul>
21 22
                 @foreach (Session::get('semesters_info') as $semester_info)
22 23
                     <li>{{ $semester_info }}</li>
23 24
                 @endforeach
24 25
             </ul>
25
-         
26 26
 
27
-                                <!-- For each grouped course -->
28
-                                <ul id = "levelTabs" class="nav nav-tabs" role="tablist">
29
-                                        
30
-                                   
31
-                                @foreach($courses as $index2=>$course)
32
-                              
33
-                            
34
-                          
35
-                                   <li role= "presentation">
36
-                                        <a data-toggle = "tab" href ="#{{ $course->code}}-{{ $course->number }}"
37
-                                            role ="tab">{{ $course->code}}-{{ $course->number }}</a>
38
-                                        </li>
39
-                            @endforeach
40
-                                </ul>
41
-                                <div id="allLists" class="tab-content">
42
-                                   
43
-                                
44
-
45
-
46
-                           @foreach($courses as $index2=>$course)
47
-
48
-                           <?php
49
-
50
-                           /*$sections_evaluating = Course::has('activities')
51
-                           ->whereNotNull('outcomes_attempted')
52
-                           ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
53
-                           ->with(array('activities'=>function($query) use(&$outcome){
54
-                               $query->whereNotNull('outcomes_attempted');
55
-                               $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
56
-                           ->where('code', $course->code)->where('number',$course->number)
57
-                           ->whereIn('semester_id', Session::get('semesters_ids'))
58
-                           ->get();*/
59
-
60
-
61
-                           $sections_evaluating = Course::has('activities')
62
-               
63
-               //->whereNotNull('outcomes_attempted')
64
-               //->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
65
-               ->with(array('activities'=>function($query) use(&$course){
66
-                   $activities = DB::table('activities')
67
-                   ->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
68
-                   ->join('assessments', 'assessments.activity_criterion_id', '=','activity_criterion.id')
69
-                   //->join('criterion_objective_outcome', 'activity_criterion.criterion_id', '=', 'criterion_objective_outcome.criterion_id')
70
-                   ->join('courses','courses.id','=','activities.course_id')
71
-                   ->where('courses.code',$course->code)
72
-                   ->where('courses.number',$course->number)
73
-                   ->where('activities.draft',0)
74
-                   ->where('activities.diagnostic',0)
75
-                   //->where('criterion_objective_outcome.outcome_id', $outcome->id)
76
-                   ->select('activity_id')
77
-                   ->lists('activity_id');
78
-
79
-                   //$query->whereNotNull('outcomes_attempted');
80
-                   //$query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');
81
-               $query->whereIn('activities.id', $activities);
82
-           } ))
83
-                   
84
-
85
-               ->where('code', $course->code)->where('number',$course->number)
86
-               ->where('user_id',Auth::user()->id)
87
-               ->whereIn('semester_id', Session::get('semesters_ids'))
88
-               ->orderBy('semester_id')
89
-               ->get();
90
-               
91
-              
92
-                       ?>
93
-
94
-                            
95
-                            <div role = "tabpanel" class = 'tab-pane' id = "{{$course->code}}-{{$course->number}}">
96
-                                @foreach($sections_evaluating as $index3 => $section)
97
-                                <h3 style="text-align: center"> Course: {{$course->code}} {{$course->number}}-{{$section->section}}</h3> 
98
-                                <?php
99
-                                Log::info($section->publishedActivities);
100
-                                ?>
101
-                                @foreach($section->publishedActivities as $index4 => $activity)
102 27
 
103
-                                <h5 style="display: inline;">Activity {{$index4+1}}: </h5>
104
-                                <p style="display: inline;">{{$activity->name}} <strong>({{$activity->date}})</strong></p>
28
+            <!-- For each grouped course -->
29
+            <ul id="levelTabs" class="nav nav-tabs" role="tablist">
30
+
31
+
32
+                @foreach ($courses as $index2 => $course)
33
+
34
+
35
+
36
+                    <li role="presentation">
37
+                        <a data-toggle="tab" href="#{{ $course->code }}-{{ $course->number }}"
38
+                            role="tab">{{ $course->code }}-{{ $course->number }}</a>
39
+                    </li>
40
+                @endforeach
41
+            </ul>
42
+            <div id="allLists" class="tab-content">
43
+
44
+
45
+
46
+
47
+                @foreach ($courses as $index2 => $course)
48
+
49
+                    <?php
50
+                    
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();*/
60
+                    
61
+                    $sections_evaluating = Course::has('activities')
62
+                    
63
+                        //->whereNotNull('outcomes_attempted')
64
+                        //->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
65
+                        ->with([
66
+                            'activities' => function ($query) use (&$course) {
67
+                                $activities = DB::table('activities')
68
+                                    ->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
69
+                                    ->join('assessments', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
70
+                                    //->join('criterion_objective_outcome', 'activity_criterion.criterion_id', '=', 'criterion_objective_outcome.criterion_id')
71
+                                    ->join('courses', 'courses.id', '=', 'activities.course_id')
72
+                                    ->where('courses.code', $course->code)
73
+                                    ->where('courses.number', $course->number)
74
+                                    ->where('activities.draft', 0)
75
+                                    ->where('activities.diagnostic', 0)
76
+                                    //->where('criterion_objective_outcome.outcome_id', $outcome->id)
77
+                                    ->select('activity_id')
78
+                                    ->lists('activity_id');
79
+                    
80
+                                //$query->whereNotNull('outcomes_attempted');
81
+                                //$query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');
82
+                                $query->whereIn('activities.id', $activities);
83
+                            },
84
+                        ])
85
+                    
86
+                        ->where('code', $course->code)
87
+                        ->where('number', $course->number)
88
+                        ->where('user_id', Auth::user()->id)
89
+                        ->whereIn('semester_id', Session::get('semesters_ids'))
90
+                        ->orderBy('semester_id')
91
+                        ->get();
92
+                    
93
+                    ?>
94
+
95
+
96
+                    <div role="tabpanel" class='tab-pane' id="{{ $course->code }}-{{ $course->number }}">
97
+                        @foreach ($sections_evaluating as $index3 => $section)
98
+                            <h3 style="text-align: center"> Course: {{ $course->code }}
99
+                                {{ $course->number }}-{{ $section->section }}</h3>
100
+                            <?php
101
+                            Log::info($section->publishedActivities);
102
+                            ?>
103
+                            @foreach ($section->publishedActivities as $index4 => $activity)
104
+
105
+                                <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
106
+                                <p style="display: inline;">{{ $activity->name }}
107
+                                    <strong>({{ $activity->date }})</strong>
108
+                                </p>
105 109
                                 <br>
106 110
                                 <br>
107 111
                                 <h5 style="display: inline;">Performance Indicators: </h5>
108
-                                    <?php
109
-                                    Log::info($activity->rubric[0]);
110
-                                    ?>
111
-                                <p style="display: inline;"><i>{{$activity->rubric[0]->num_scales}} (
112 112
                                 <?php
113
-                                    $titles = $activity->rubric[0]->getTitles();
114
-                                    ?>
115
-                                @if(sizeof($titles) != 1)
116
-                                    @foreach ($titles as $index5=>$rubric_title)
117
-                                        @if($index5!= ($activity->rubric[0]->num_scales)-1 )
118
-                                            {{$rubric_title->text}},
113
+                                Log::info($activity->rubric[0]);
114
+                                ?>
115
+                                <p style="display: inline;"><i>{{ $activity->rubric[0]->num_scales }} (
116
+                                        <?php
117
+                                        $titles = $activity->rubric[0]->getTitles();
118
+                                        ?>
119
+                                        @if (sizeof($titles) != 1)
120
+                                            @foreach ($titles as $index5 => $rubric_title)
121
+                                                @if ($index5 != $activity->rubric[0]->num_scales - 1)
122
+                                                    {{ $rubric_title->text }},
123
+                                                @else
124
+                                                    and {{ $rubric_title->text }}
125
+                                                @endif
126
+
127
+                                            @endforeach
128
+                                            )
119 129
                                         @else
120
-                                            and {{$rubric_title->text}}
130
+                                            {{ $titles[0]->text }} )
121 131
                                         @endif
122
-                                            
123
-                                    @endforeach
124
-                                )
125
-                                @else
126
-                                    {{$titles[0]->text}} )
127
-                                @endif
128
-                                </i></p>
132
+                                    </i></p>
129 133
                                 <br>
130 134
                                 <h5 style="display: inline;">Scale: </h5>
131
-                                @if($activity->rubric[0]->max_score == 1)
135
+                                @if ($activity->rubric[0]->max_score == 1)
132 136
 
133
-                               <p style="display: inline;">1 point scale</p>
137
+                                    <p style="display: inline;">1 point scale</p>
134 138
                                 @else
135
-                                <p style="display: inline;">1-{{$activity->rubric[0]->max_score}} point scale</p>
139
+                                    <p style="display: inline;">1-{{ $activity->rubric[0]->max_score }} point scale</p>
136 140
 
137 141
                                 @endif
138 142
                                 <br>
139 143
                                 <br>
140
-                                <h4>Perfomance by Learning Outcome Criteria</h4>
141
-                                <h5 style = "display: inline; margin:30px;">Target by criterion: </h5>
142
-                                <p  style = "display: inline;"> <i>{{$activity->rubric[0]->expected_points}} or more</i>
144
+                                <h4>Performance of Students by Learning Outcome Criteria</h4>
145
+                                <h5 style="display: inline; margin:30px;">Target by criterion: </h5>
146
+                                <p style="display: inline;"> <i>{{ $activity->rubric[0]->expected_points }} or more</i>
143 147
                                 </p>
144 148
                                 <br>
145
-                                <h5 style = "display: inline; margin:30px;">Expected percent of students achieving the target by criterion: </h5>
146
-                                <p  style = "display: inline;"> <i>{{$activity->rubric[0]->expected_percentage}} %</i>
149
+                                <h5 style="display: inline; margin:30px;">Expected percent of students achieving the target
150
+                                    by criterion: </h5>
151
+                                <p style="display: inline;"> <i>{{ $activity->rubric[0]->expected_percentage }} %</i>
147 152
                                 </p>
153
+
148 154
                                 <br>
155
+                                <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
156
+                                <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
157
+                                @if ($formative_actions)
158
+                                    <p style="display: inline;"> <strong>{{ $formative_actions[0]->at_text }}:
159
+                                        </strong>
160
+
161
+                                        <i>{{ $formative_actions[0]->description }}
162
+                                        </i>
163
+                                    </p>
164
+                                    <br>
165
+                                    <h5>Formative Action's Associated
166
+                                        Criteria: </h5>
167
+                                    <ul>
168
+                                        @foreach ($formative_actions as $criteria)
169
+                                            <li> <i>{{ $criteria->name }} <i></li>
149 170
 
150
-                                <table class='table table-striped table-condensed datatable'>
151
-                                <thead>
152
-                                    <tr>
153
-                                        <th>
154
-                                            Criterion
155
-                                        </th>
156
-                                        <th>
157
-                                            Number of Students Assessed
158
-                                        </th>
159
-                                        <th>
160
-                                            Number of students that achieved the target
161
-                                        </th>
162
-                                        <th>
163
-                                            %
164
-                                        </th>
165
-                                        <th>
166
-                                            Outcomes
167
-                                        </th>
168
-                                    </tr>
169
-                                </thead>
170
-                                <tbody>
171
-                                    @foreach($activity->allActivityCriterionInfo() as $index5=>$ac_criterion)
172
-                                    <tr>
173
-                                        <td> {{$ac_criterion->name}}</td>
174
-                                        <td>{{Criterion::students_attempted($ac_criterion->criterion_id, $activity->id)}}
175
-                                        </td>
176
-                                        <td>
177
-                                        {{Criterion::students_achieved($ac_criterion->criterion_id, $activity->id)}}
178
-
179
-                                        </td>
180
-                                        <?php
171
+                                        @endforeach
172
+                                    </ul>
181 173
 
182
-                                        $out_att = Criterion::students_attempted($ac_criterion->criterion_id, $activity->id);
183
-                                        $out_ach = Criterion::students_achieved($ac_criterion->criterion_id, $activity->id);
184
-                                        
185
-                                        $percentage = "N/A";
186
-                                        $activity->getOutcomeReport();
187
-                                        
174
+                                @else
175
+                                    <p style="display: inline;"> <strong>Has no Formative Action yet </strong>
176
+
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
183
+                                <br>
184
+
185
+                                <table class='table table-striped table-condensed datatable'>
186
+                                    <thead>
187
+                                        <tr>
188
+                                            <th>
189
+                                                Criterion
190
+                                            </th>
191
+                                            <th>
192
+                                                Number of Students Assessed
193
+                                            </th>
194
+                                            <th>
195
+                                                Number of students that achieved the target
196
+                                            </th>
197
+                                            <th>
198
+                                                %
199
+                                            </th>
200
+                                            <th>
201
+                                                Outcomes
202
+                                            </th>
203
+                                        </tr>
204
+                                    </thead>
205
+                                    <tbody>
206
+                                        @foreach ($activity->allActivityCriterionInfo() as $index5 => $ac_criterion)
207
+                                            <tr>
208
+                                                <td> {{ $ac_criterion->name }}</td>
209
+                                                <td>{{ Criterion::students_attempted($ac_criterion->criterion_id, $activity->id) }}
210
+                                                </td>
211
+                                                <td>
212
+                                                    {{ Criterion::students_achieved($ac_criterion->criterion_id, $activity->id) }}
213
+
214
+                                                </td>
215
+                                                <?php
216
+                                                
217
+                                                $out_att = Criterion::students_attempted($ac_criterion->criterion_id, $activity->id);
218
+                                                $out_ach = Criterion::students_achieved($ac_criterion->criterion_id, $activity->id);
219
+                                                
220
+                                                $percentage = 'N/A';
221
+                                                $activity->getOutcomeReport();
222
+                                                
223
+                                                ?>
224
+
225
+                                                @if ($out_att == 0)
226
+                                                    <td class="col-md-1 danger">{{ $percentage }}</td>
188 227
 
189
-                                        ?>
190
-                                        
191
-                                            @if($out_att==0)
192
-                                            <td class="col-md-1 danger">{{ $percentage }}</td>
193
-
194
-                                            @else
195
-                                            <?php
196
-                                            $percentage = round(($out_ach/$out_att)*100, 2)
197
-                                            ?>
198
-                                                @if ($percentage>=$activity->rubric[0]->expected_percentage)
199
-                                                <td class="col-md-1 success">{{ $percentage }}%</td>
200
-                                                                 
201 228
                                                 @else
202
-                                                <td class="col-md-1 danger">{{ $percentage }}%</td>
203
-                                                      
229
+                                                    <?php
230
+                                                    $percentage = round(($out_ach / $out_att) * 100, 2);
231
+                                                    ?>
232
+                                                    @if ($percentage >= $activity->rubric[0]->expected_percentage)
233
+                                                        <td class="col-md-1 success">{{ $percentage }}%</td>
234
+
235
+                                                    @else
236
+                                                        <td class="col-md-1 danger">{{ $percentage }}%</td>
237
+
238
+                                                    @endif
239
+
240
+
241
+
204 242
                                                 @endif
205 243
 
206 244
 
207 245
 
208
-                                           @endif
246
+                                                <td>
209 247
 
210 248
 
211
-                                        
212
-                                        <td>
213
-                                            
214
-                                            
215
-                                            @foreach(Criterion::outcomes($ac_criterion->criterion_id) as $index6=>$outcome)
216
-                                            
217
-                                             {{$index6 + 1}}.   <?php echo $outcome->name."\n\n\n <br>" ?>
218
-                                             
219
-                                            
249
+                                                    @foreach (Criterion::outcomes($ac_criterion->criterion_id) as $index6 => $outcome)
250
+
251
+                                                        {{ $index6 + 1 }}. <?php echo $outcome->name . "\n\n\n <br>"; ?>
252
+
253
+
254
+
255
+                                                    @endforeach
256
+
257
+
258
+                                                </td>
259
+                                            </tr>
260
+                                        @endforeach
261
+                                    </tbody>
220 262
 
221
-                                            @endforeach
222
-                                            
223
-                                            
224
-                                        </td>
225
-                                    </tr>
226
-                                    @endforeach
227
-                                </tbody>
228
-                            
229 263
                                 </table>
230 264
                                 <hr>
231 265
                                 <br>
232 266
 
233
-                                <h4>Perfomance by Learning Outcome Student</h4>
234
-                                <h5 style = "display: inline; margin:30px;">Target by outcome: </h5>
235
-                                <p  style = "display: inline;"> <i>>= 66.67% of the attempts</i>
267
+                                <h4>Performance of Students by Learning Outcome</h4>
268
+                                <h5 style="display: inline; margin:30px;">Target by outcome: </h5>
269
+                                <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
236 270
                                 </p>
237 271
                                 <br>
238
-                                <h5 style = "display: inline; margin:30px;">Expected percent of students achieving the target by outcome: </h5>
239
-                                <p  style = "display: inline;"> <i> 
240
-                                    <?php
241
-                                     $expected = DB::table('target_outcomes_program')
242
-        ->where('program_id', $course->program_id)
243
-        ->where('semester_id', $course->semester_id)
244
-        ->first();//->expected_target;
245
-        if(!$expected){
246
-                                                        $expected = "It has not been defined in the annual plan";
247
-                                                    }
248
-
249
-        
250
-                                    ?>
251
-                                    {{$expected}}
252
-                                </i>
272
+                                <h5 style="display: inline; margin:30px;">Expected percent of students achieving the target
273
+                                    by outcome: </h5>
274
+                                <p style="display: inline;"> <i>
275
+                                        <?php
276
+                                        $expected = DB::table('target_outcomes_program')
277
+                                            ->where('program_id', $course->program_id)
278
+                                            ->where('semester_id', $course->semester_id)
279
+                                            ->first(); //->expected_target;
280
+                                        if (!$expected) {
281
+                                            $expected = 'It has not been defined in the annual plan';
282
+                                        }
283
+                                        
284
+                                        ?>
285
+                                        {{ $expected }}
286
+                                    </i>
253 287
                                 </p>
254 288
                                 <br>
255 289
                                 <table class='table table-striped table-condensed datatable'>
@@ -267,34 +301,34 @@
267 301
                                             <th>
268 302
                                                 %
269 303
                                             </th>
270
-                                            
304
+
271 305
                                         </tr>
272 306
                                     </thead>
273 307
                                     <tbody>
274
-                                        @foreach($activity->getOutcomeReport() as $outcome)
275
-                                        <tr>
276
-                                            <td>
277
-                                                {{$outcome->name}}
278
-                                            </td>
279
-                                            <td>
280
-                                                {{$outcome->attempted}}
281
-                                            </td>
282
-                                            <td>
283
-                                                {{$outcome->achieved}}
284
-                                            </td>
285
-                                            @if($outcome->percentage>= $expected)
286
-                                                <td class="col-md-1 success">{{ $outcome->percentage }}%</td>
287
-                                                                 
308
+                                        @foreach ($activity->getOutcomeReport() as $outcome)
309
+                                            <tr>
310
+                                                <td>
311
+                                                    {{ $outcome->name }}
312
+                                                </td>
313
+                                                <td>
314
+                                                    {{ $outcome->attempted }}
315
+                                                </td>
316
+                                                <td>
317
+                                                    {{ $outcome->achieved }}
318
+                                                </td>
319
+                                                @if ($outcome->percentage >= $expected)
320
+                                                    <td class="col-md-1 success">{{ $outcome->percentage }}%</td>
321
+
288 322
                                                 @else
289
-                                                <td class="col-md-1 danger">{{ $outcome->percentage }}%</td>
290
-                                                      
323
+                                                    <td class="col-md-1 danger">{{ $outcome->percentage }}%</td>
324
+
291 325
                                                 @endif
292 326
 
293 327
 
294 328
 
295
-                                           
296 329
 
297
-                                        </tr>
330
+
331
+                                            </tr>
298 332
 
299 333
                                         @endforeach
300 334
                                     </tbody>
@@ -307,29 +341,29 @@
307 341
 
308 342
 
309 343
 
310
-                                
311
-                                @endforeach
312
-                            
313
-                                @endforeach
314
-                            </div>
315 344
 
316
-                            
345
+                            @endforeach
317 346
 
318
-                                        @endforeach
319
-                            
347
+                        @endforeach
348
+                    </div>
320 349
 
321
-            
322 350
 
323 351
 
324
-                                        
352
+                @endforeach
353
+
354
+
355
+
356
+
357
+
358
+
359
+            </div>
325 360
         </div>
326
-    </div>
327 361
 
328
- 
329
-@section('included-js')
330
-    @include('global._datatables_js')
331
-@stop
332
-        
362
+
363
+    @section('included-js')
364
+        @include('global._datatables_js')
365
+    @stop
366
+
333 367
 @stop
334 368
 
335 369
 @section('javascript')