|
@@ -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
|
|
|
@@ -245,8 +245,10 @@
|
245
|
245
|
$expected = DB::table('target_outcomes_program')
|
246
|
246
|
->where('program_id', $course->program_id)
|
247
|
247
|
->where('semester_id', $course->semester_id)
|
248
|
|
- ->first()->expected_target;
|
249
|
|
-
|
|
248
|
+ ->first(); //->expected_target;
|
|
249
|
+ if (!$expected) {
|
|
250
|
+ $expected = 'It has not been defined in the annual plan';
|
|
251
|
+ }
|
250
|
252
|
?>
|
251
|
253
|
{{ $expected }}
|
252
|
254
|
</i>
|