Diagnostic

app/models/Course.php

@@ -64,6 +64,20 @@ class Course extends Eloquent
     //$this->hasMany('Activity')->whereNotNull('activities.outcomes_attempted')->where('activities.draft', 0)->orderBy('date', 'asc');
     return  $this->hasMany('Activity')->whereIn('activities.id', $activitiesAssessed)->orderBy('date', 'asc');
   }
+  public function diagnosticActivities()
+  {
+    $activitiesAssessed = DB::table('activities')
+      ->join('activity_criterion as ac', 'ac.activity_id', '=', 'activities.id')
+      ->join('assessments', 'assessments.activity_criterion_id', '=', 'ac.id')
+      ->where('activities.course_id', $this->id)
+      ->where('activities.draft', 0)
+      ->where('activities.diagnostic', 1)
+      ->select('activities.id')
+      ->distinct()
+      ->lists('activities.id');
+    //$this->hasMany('Activity')
+    return  $this->hasMany('Activity')->whereIn('activities.id', $activitiesAssessed)->orderBy('date', 'asc');
+  }
 
   public function outcomes_attempted()
   {

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

@@ -29,8 +29,6 @@
 
                     </ol>
                     @foreach ($school->programs as $program)
-
-
                         {{-- <ul id='levelTabs' class="nav nav-tabs" role="tablist">
                         <!-- For each grouped course -->
                         @foreach ($program->courses as $index2 => $course)
@@ -54,18 +52,17 @@
 
                                 <!-- If grouped course has activities that evaluate the outcome -->
                                 @foreach ($program->courses as $index2 => $course)
-
                                     <?php
                                     
                                     /*$sections_evaluating = Course::has('activities')
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ->whereNotNull('outcomes_attempted')
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ->with(array('activities'=>function($query) use(&$outcome){
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    $query->whereNotNull('outcomes_attempted');
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ->where('code', $course->code)->where('number',$course->number)
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ->whereIn('semester_id', Session::get('semesters_ids'))
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ->get();*/
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            ->whereNotNull('outcomes_attempted')
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            ->with(array('activities'=>function($query) use(&$outcome){
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                $query->whereNotNull('outcomes_attempted');
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            ->where('code', $course->code)->where('number',$course->number)
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            ->whereIn('semester_id', Session::get('semesters_ids'))
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            ->get();*/
                                     
                                     $sections_evaluating = Course::has('activities')
                                     
@@ -107,8 +104,8 @@
                                             <h3 style="text-align: center"> Course: {{ $course->code }}
                                                 {{ $course->number }}-{{ $section->section }} </h3>
                                         @endif
+                                        <h4>Non-Diagnostic Activities</h4>
                                         @foreach ($section->publishedActivities as $index4 => $activity)
-
                                             <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
                                             <p style="display: inline;">{{ $activity->name }}
                                                 <strong>({{ $activity->date }})</strong>
@@ -130,7 +127,6 @@
                                                             @else
                                                                 and {{ $rubric_title->text }}
                                                             @endif
-
                                                         @endforeach
                                                         )
                                                     @else
@@ -145,7 +141,6 @@
                                                 <p style="display: inline;">1-{{ $activity->rubric[0]->max_score }} point
                                                     scale
                                                 </p>
-
                                             @endif
                                             <br>
                                             <br>
@@ -217,17 +212,12 @@
 
                                                                 @else
                                                                     <td class="col-md-1 danger">{{ $percentage }}%</td>
-
                                                                 @endif
                                                             @endif
                                                             <td>
 
                                                                 @foreach (Criterion::outcomes($ac_criterion->criterion_id) as $index6 => $outcome)
-
                                                                     <?php echo $outcome->name . "\n\n\n <br>"; ?>
-
-
-
                                                                 @endforeach
 
 
@@ -254,18 +244,12 @@
                                                 <ul style="margin:30px;">
                                                     @foreach ($formative_actions as $criteria)
                                                         <li> <i>{{ $criteria->name }} <i></li>
-
                                                     @endforeach
                                                 </ul>
-
-
-
                                             @endif
                                             <br>
                                             <h5 style="display: inline; margin:30px;">Assessment Comments: </h5>
                                             @if ($activity->assessment_comments != null)
-
-
                                                 <p style="display: inline;">{{ $activity->assessment_comments }}</p>
                                             @endif
                                             <br>
@@ -295,10 +279,9 @@
                                                         ->first(); //->expected_target;
                                                     if (!$expected) {
                                                         $expected = 'It has not been defined in the annual plan';
+                                                    } else {
+                                                        $expected = $expected->expected_target;
                                                     }
-                                                    else{
-                                            $expected = $expected->expected_target;
-                                        }
                                                     ?>
                                                     {{ $expected }}
                                                 </i>
@@ -343,7 +326,6 @@
                                                                 <td class="col-md-1 danger">
                                                                     {{ $outcome->percentage }}%
                                                                 </td>
-
                                                             @endif
 
 
@@ -351,23 +333,250 @@
 
 
                                                         </tr>
+                                                    @endforeach
+                                                </tbody>
+                                            </table>
+
+                                            <br>
+                                            <hr>
+                                        @endforeach
+                                        <h4>Diagnostic Activities</h4>
+                                        @foreach ($section->diagnosticActivities as $index4 => $activity)
+                                            <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
+                                            <p style="display: inline;">{{ $activity->name }}
+                                                <strong>({{ $activity->date }})</strong>
+                                            </p>
+                                            <br>
+                                            <br>
+                                            <h5 style="display: inline;">Performance Indicators: </h5>
+                                            <?php
+                                            Log::info($activity->rubric[0]);
+                                            ?>
+                                            <p style="display: inline;"><i>{{ $activity->rubric[0]->num_scales }} (
+                                                    <?php
+                                                    $titles = $activity->rubric[0]->getTitles();
+                                                    ?>
+                                                    @if (sizeof($titles) != 1)
+                                                        @foreach ($titles as $index5 => $rubric_title)
+                                                            @if ($index5 != $activity->rubric[0]->num_scales - 1)
+                                                                {{ $rubric_title->text }},
+                                                            @else
+                                                                and {{ $rubric_title->text }}
+                                                            @endif
+                                                        @endforeach
+                                                        )
+                                                    @else
+                                                        {{ $titles[0]->text }} )
+                                                    @endif
+                                                </i></p>
+                                            <br>
+                                            <h5 style="display: inline;">Scale: </h5>
+                                            @if ($activity->rubric[0]->max_score == 1)
+                                                <p style="display: inline;">1 point scale</p>
+                                            @else
+                                                <p style="display: inline;">1-{{ $activity->rubric[0]->max_score }} point
+                                                    scale
+                                                </p>
+                                            @endif
+                                            <br>
+                                            <br>
+                                            <h4>Performance of Students by Learning Outcome Criteria</h4>
+                                            <h5 style="display: inline; margin:30px;">Target by criterion: </h5>
+                                            <p style="display: inline;"> <i>{{ $activity->rubric[0]->expected_points }}
+                                                    or
+                                                    more</i>
+                                            </p>
+                                            <br>
+                                            <h5 style="display: inline; margin:30px;">Expected percent of students achieving
+                                                the
+                                                target by criterion: </h5>
+                                            <p style="display: inline;">
+                                                <i>{{ $activity->rubric[0]->expected_percentage }}
+                                                    %</i>
+                                            </p>
+
+                                            <br>
+
+                                            <table class='table table-striped table-condensed datatable'>
+                                                <thead>
+                                                    <tr>
+                                                        <th>
+                                                            Criterion
+                                                        </th>
+                                                        <th>
+                                                            Number of Students Assessed
+                                                        </th>
+                                                        <th>
+                                                            Number of students that achieved the target
+                                                        </th>
+                                                        <th>
+                                                            %
+                                                        </th>
+                                                        <th>
+                                                            Learning Outcomes
+                                                        </th>
+                                                    </tr>
+                                                </thead>
+                                                <tbody>
+                                                    @foreach ($activity->allActivityCriterionInfo() as $index5 => $ac_criterion)
+                                                        <tr>
+                                                            <td> {{ $ac_criterion->name }}</td>
+                                                            <td>{{ Criterion::students_attempted($ac_criterion->criterion_id, $activity->id) }}
+                                                            </td>
+                                                            <td>
+                                                                {{ Criterion::students_achieved($ac_criterion->criterion_id, $activity->id) }}
+
+                                                            </td>
+                                                            <?php
+                                                            
+                                                            $out_att = Criterion::students_attempted($ac_criterion->criterion_id, $activity->id);
+                                                            $out_ach = Criterion::students_achieved($ac_criterion->criterion_id, $activity->id);
+                                                            
+                                                            $percentage = 'N/A';
+                                                            $activity->getOutcomeReport();
+                                                            
+                                                            ?>
+                                                            @if ($out_att == 0)
+                                                                <td class="col-md-1 danger">{{ $percentage }}</td>
+
+                                                            @else
+                                                                <?php
+                                                                $percentage = round(($out_ach / $out_att) * 100, 2);
+                                                                ?>
+                                                                @if ($percentage >= $activity->rubric[0]->expected_percentage)
+                                                                    <td class="col-md-1 success">{{ $percentage }}%</td>
+
+                                                                @else
+                                                                    <td class="col-md-1 danger">{{ $percentage }}%</td>
+                                                                @endif
+                                                            @endif
+                                                            <td>
+
+                                                                @foreach (Criterion::outcomes($ac_criterion->criterion_id) as $index6 => $outcome)
+                                                                    <?php echo $outcome->name . "\n\n\n <br>"; ?>
+                                                                @endforeach
+
 
+                                                            </td>
+                                                        </tr>
                                                     @endforeach
                                                 </tbody>
+
                                             </table>
+                                            <br>
+                                            <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
+                                            <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
+                                            @if ($formative_actions)
+                                                <p style="display: inline;">
+                                                    <u>{{ $formative_actions[0]->at_text }}:
+                                                    </u>
 
+                                                    <i>{{ $formative_actions[0]->description }}
+                                                    </i>
+                                                </p>
+                                                <br>
+                                                <h5 style="display: inline; margin:30px;">Formative Action's Associated
+                                                    Criteria: </h5>
+                                                <ul style="margin:30px;">
+                                                    @foreach ($formative_actions as $criteria)
+                                                        <li> <i>{{ $criteria->name }} <i></li>
+                                                    @endforeach
+                                                </ul>
+                                            @endif
+                                            <br>
+                                            <h5 style="display: inline; margin:30px;">Assessment Comments: </h5>
+                                            @if ($activity->assessment_comments != null)
+                                                <p style="display: inline;">{{ $activity->assessment_comments }}</p>
+                                            @endif
                                             <br>
                                             <hr>
+                                            <br>
 
+                                            <h4>Performance of Students by Learning Outcome</h4>
+                                            <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
+                                            <p style="display: inline;">{{ $activity->name }}
+                                                <strong>({{ $activity->date }})</strong>
+                                            </p>
+                                            <br>
 
+                                            <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
+                                            <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
+                                            </p>
+                                            <br>
+                                            <h5 style="display: inline; margin:30px;">Expected percent of students
+                                                achieving
+                                                the
+                                                target by learning outcome: </h5>
+                                            <p style="display: inline;"> <i>
+                                                    <?php
+                                                    $expected = DB::table('target_outcomes_program')
+                                                        ->where('program_id', $course->program_id)
+                                                        ->where('semester_id', $course->semester_id)
+                                                        ->first(); //->expected_target;
+                                                    if (!$expected) {
+                                                        $expected = 'It has not been defined in the annual plan';
+                                                    } else {
+                                                        $expected = $expected->expected_target;
+                                                    }
+                                                    ?>
+                                                    {{ $expected }}
+                                                </i>
+                                            </p>
+                                            <br>
+                                            <table class='table table-striped table-condensed datatable'>
+                                                <thead>
+                                                    <tr>
+                                                        <th>
+                                                            Learning Outcome
+                                                        </th>
+                                                        <th>
+                                                            Number of Students Assessed
+                                                        </th>
+                                                        <th>
+                                                            Number of students that achieved the target
+                                                        </th>
+                                                        <th>
+                                                            %
+                                                        </th>
 
+                                                    </tr>
+                                                </thead>
+                                                <tbody>
+                                                    @foreach ($activity->getOutcomeReport() as $outcome)
+                                                        <tr>
+                                                            <td>
+                                                                {{ $outcome->name }}
+                                                            </td>
+                                                            <td>
+                                                                {{ $outcome->attempted }}
+                                                            </td>
+                                                            <td>
+                                                                {{ $outcome->achieved }}
+                                                            </td>
+                                                            @if ($outcome->percentage >= $expected)
+                                                                <td class="col-md-1 success">
+                                                                    {{ $outcome->percentage }}%
+                                                                </td>
+
+                                                            @else
+                                                                <td class="col-md-1 danger">
+                                                                    {{ $outcome->percentage }}%
+                                                                </td>
+                                                            @endif
 
 
 
-                                        @endforeach
-                                    @endforeach
 
 
+                                                        </tr>
+                                                    @endforeach
+                                                </tbody>
+                                            </table>
+
+                                            <br>
+                                            <hr>
+                                        @endforeach
+                                    @endforeach
                                 @endforeach
                             </div>
                         </div>
@@ -378,7 +587,6 @@
                 @else
                     <h4>This program has not assessed any activity</h4>
                 @endif
-
             @endforeach
 
         </div>

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

@@ -91,6 +91,7 @@
                             @foreach ($sections_evaluating as $index3 => $section)
                                 <h3 style="text-align: center"> Course: {{ $course->code }}
                                     {{ $course->number }}-{{ $section->section }} </h3>
+                                    <h4>Non Diagnostic Activities</h4>
                                 @foreach ($section->publishedActivities as $index4 => $activity)
 
                                     <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
@@ -336,6 +337,252 @@
 
 
                                 @endforeach
+                                <h4>Diagnostic Activities</h4>
+                                @foreach ($section->diagnosticActivities as $index4 => $activity)
+
+                                <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
+                                <p style="display: inline;">{{ $activity->name }}
+                                    <strong>({{ $activity->date }})</strong>
+                                </p>
+                                <br>
+                                <br>
+                                <h5 style="display: inline;">Performance Indicators: </h5>
+                                <?php
+                                Log::info($activity->rubric[0]);
+                                ?>
+                                <p style="display: inline;"><i>{{ $activity->rubric[0]->num_scales }} (
+                                        <?php
+                                        $titles = $activity->rubric[0]->getTitles();
+                                        ?>
+                                        @if (sizeof($titles) != 1)
+                                            @foreach ($titles as $index5 => $rubric_title)
+                                                @if ($index5 != $activity->rubric[0]->num_scales - 1)
+                                                    {{ $rubric_title->text }},
+                                                @else
+                                                    and {{ $rubric_title->text }}
+                                                @endif
+
+                                            @endforeach
+                                            )
+                                        @else
+                                            {{ $titles[0]->text }} )
+                                        @endif
+                                    </i></p>
+                                <br>
+                                <h5 style="display: inline;">Scale: </h5>
+                                @if ($activity->rubric[0]->max_score == 1)
+                                    <p style="display: inline;">1 point scale</p>
+                                @else
+                                    <p style="display: inline;">1-{{ $activity->rubric[0]->max_score }} point scale
+                                    </p>
+
+                                @endif
+                                <br>
+                                <br>
+                                <h4>Performance of Students by Learning Outcome Criteria</h4>
+                                <h5 style="display: inline; margin:30px;">Target by criterion: </h5>
+                                <p style="display: inline;"> <i>{{ $activity->rubric[0]->expected_points }} or
+                                        more</i>
+                                </p>
+                                <br>
+                                <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
+                                    target by criterion: </h5>
+                                <p style="display: inline;"> <i>{{ $activity->rubric[0]->expected_percentage }} %</i>
+                                </p>
+
+                                <br>
+
+                                <table class='table table-striped table-condensed datatable'>
+                                    <thead>
+                                        <tr>
+                                            <th>
+                                                Criterion
+                                            </th>
+                                            <th>
+                                                Number of Students Assessed
+                                            </th>
+                                            <th>
+                                                Number of students that achieved the target
+                                            </th>
+                                            <th>
+                                                %
+                                            </th>
+                                            <th>
+                                                Learning Outcomes
+                                            </th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        @foreach ($activity->allActivityCriterionInfo() as $index5 => $ac_criterion)
+                                            <tr>
+                                                <td> {{ $ac_criterion->name }}</td>
+                                                <td>{{ Criterion::students_attempted($ac_criterion->criterion_id, $activity->id) }}
+                                                </td>
+                                                <td>
+                                                    {{ Criterion::students_achieved($ac_criterion->criterion_id, $activity->id) }}
+
+                                                </td>
+                                                <?php
+                                                
+                                                $out_att = Criterion::students_attempted($ac_criterion->criterion_id, $activity->id);
+                                                $out_ach = Criterion::students_achieved($ac_criterion->criterion_id, $activity->id);
+                                                
+                                                $percentage = 'N/A';
+                                                $activity->getOutcomeReport();
+                                                
+                                                ?>
+                                                @if ($out_att == 0)
+                                                    <td class="col-md-1 danger">{{ $percentage }}</td>
+
+                                                @else
+                                                    <?php
+                                                    $percentage = round(($out_ach / $out_att) * 100, 2);
+                                                    ?>
+                                                    @if ($percentage >= $activity->rubric[0]->expected_percentage)
+                                                        <td class="col-md-1 success">{{ $percentage }}%</td>
+
+                                                    @else
+                                                        <td class="col-md-1 danger">{{ $percentage }}%</td>
+
+                                                    @endif
+                                                @endif
+                                                <td>
+
+                                                    @foreach (Criterion::outcomes($ac_criterion->criterion_id) as $index6 => $outcome)
+
+                                                        <?php echo $outcome->name . "\n\n\n <br>"; ?>
+
+
+
+                                                    @endforeach
+
+
+                                                </td>
+                                            </tr>
+                                        @endforeach
+                                    </tbody>
+
+                                </table>
+                                <br>
+                                <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
+                                <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
+                                @if ($formative_actions)
+                                    <p style="display: inline;">
+                                        <u>{{ $formative_actions[0]->at_text }}:
+                                        </u>
+
+                                        <i>{{ $formative_actions[0]->description }}
+                                        </i>
+                                    </p>
+                                    <br>
+                                    <h5 style="display: inline; margin:30px;">Formative Action's Associated
+                                        Criteria: </h5>
+                                    <ul style="margin:30px;">
+                                        @foreach ($formative_actions as $criteria)
+                                            <li> <i>{{ $criteria->name }} <i></li>
+
+                                        @endforeach
+                                    </ul>
+
+
+                                @endif
+                                <br>
+                                <h5 style="display: inline; margin:30px;">Assessment Comments: </h5>
+                                @if ($activity->assessment_comments != null)
+
+
+                                    <p style="display: inline;">{{ $activity->assessment_comments }}</p>
+                                @endif
+                                <br>
+                                <hr>
+                                <br>
+
+                                <h4>Performance of Students by Learning Outcome</h4>
+                                <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
+                                <p style="display: inline;">{{ $activity->name }}
+                                    <strong>({{ $activity->date }})</strong>
+                                </p>
+                                <br>
+                                <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
+                                <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
+                                </p>
+                                <br>
+                                <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
+                                    target by learning outcome: </h5>
+                                <p style="display: inline;"> <i>
+                                        <?php
+                                        $expected = DB::table('target_outcomes_program')
+                                            ->where('program_id', $course->program_id)
+                                            ->where('semester_id', $course->semester_id)
+                                            ->first();
+                                        if (!$expected) {
+                                            $expected = 'It has not been defined in the annual plan';
+                                        }
+                                        else{
+                                        $expected = $expected->expected_target;
+                                    }
+                                        ?>
+                                        {{ $expected }}
+                                    </i>
+                                </p>
+                                <br>
+                                <table class='table table-striped table-condensed datatable'>
+                                    <thead>
+                                        <tr>
+                                            <th>
+                                                Learning Outcome
+                                            </th>
+                                            <th>
+                                                Number of Students Assessed
+                                            </th>
+                                            <th>
+                                                Number of students that achieved the target
+                                            </th>
+                                            <th>
+                                                %
+                                            </th>
+
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        @foreach ($activity->getOutcomeReport() as $outcome)
+                                            <tr>
+                                                <td>
+                                                    {{ $outcome->name }}
+                                                </td>
+                                                <td>
+                                                    {{ $outcome->attempted }}
+                                                </td>
+                                                <td>
+                                                    {{ $outcome->achieved }}
+                                                </td>
+                                                @if ($outcome->percentage >= $expected)
+                                                    <td class="col-md-1 success">{{ $outcome->percentage }}%</td>
+
+                                                @else
+                                                    <td class="col-md-1 danger">{{ $outcome->percentage }}%</td>
+
+                                                @endif
+
+
+
+
+
+                                            </tr>
+
+                                        @endforeach
+                                    </tbody>
+                                </table>
+
+                                <br>
+                                <hr>
+
+
+
+
+
+
+                            @endforeach
                             @endforeach
                         </div>
 

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

@@ -105,6 +105,7 @@
                                         <h3 style="text-align: center"> Course: {{ $course->code }}
                                             {{ $course->number }}-{{ $section->section }} </h3>
                                     @endif
+                                    <h4> Non-Diagnostic Activities</h4>
                                     @foreach ($section->publishedActivities as $index4 => $activity)
 
                                         <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
@@ -354,6 +355,256 @@
 
 
                                     @endforeach
+                                    <h4>Diagnostic Activities</h4>
+                                    @foreach ($section->diagnosticActivities as $index4 => $activity)
+
+                                    <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
+                                    <p style="display: inline;">{{ $activity->name }}
+                                        <strong>({{ $activity->date }})</strong>
+                                    </p>
+                                    <br>
+                                    <br>
+                                    <h5 style="display: inline;">Performance Indicators: </h5>
+                                    <?php
+                                    Log::info($activity->rubric[0]);
+                                    ?>
+                                    <p style="display: inline;"><i>{{ $activity->rubric[0]->num_scales }} (
+                                            <?php
+                                            $titles = $activity->rubric[0]->getTitles();
+                                            ?>
+                                            @if (sizeof($titles) != 1)
+                                                @foreach ($titles as $index5 => $rubric_title)
+                                                    @if ($index5 != $activity->rubric[0]->num_scales - 1)
+                                                        {{ $rubric_title->text }},
+                                                    @else
+                                                        and {{ $rubric_title->text }}
+                                                    @endif
+
+                                                @endforeach
+                                                )
+                                            @else
+                                                {{ $titles[0]->text }} )
+                                            @endif
+                                        </i></p>
+                                    <br>
+                                    <h5 style="display: inline;">Scale: </h5>
+                                    @if ($activity->rubric[0]->max_score == 1)
+                                        <p style="display: inline;">1 point scale</p>
+                                    @else
+                                        <p style="display: inline;">1-{{ $activity->rubric[0]->max_score }} point
+                                            scale
+                                        </p>
+
+                                    @endif
+                                    <br>
+                                    <br>
+                                    <h4>Performance of Students by Learning Outcome Criteria</h4>
+                                    <h5 style="display: inline; margin:30px;">Target by criterion: </h5>
+                                    <p style="display: inline;"> <i>{{ $activity->rubric[0]->expected_points }} or
+                                            more</i>
+                                    </p>
+                                    <br>
+                                    <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
+                                        target by criterion: </h5>
+                                    <p style="display: inline;"> <i>{{ $activity->rubric[0]->expected_percentage }}
+                                            %</i>
+                                    </p>
+
+
+                                    <br>
+                                    <table class='table table-striped table-condensed datatable'>
+                                        <thead>
+                                            <tr>
+                                                <th>
+                                                    Criterion
+                                                </th>
+                                                <th>
+                                                    Number of Students Assessed
+                                                </th>
+                                                <th>
+                                                    Number of students that achieved the target
+                                                </th>
+                                                <th>
+                                                    %
+                                                </th>
+                                                <th>
+                                                    Learning Outcomes
+                                                </th>
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                            @foreach ($activity->allActivityCriterionInfo() as $index5 => $ac_criterion)
+                                                <tr>
+                                                    <td> {{ $ac_criterion->name }}</td>
+                                                    <td>{{ Criterion::students_attempted($ac_criterion->criterion_id, $activity->id) }}
+                                                    </td>
+                                                    <td>
+                                                        {{ Criterion::students_achieved($ac_criterion->criterion_id, $activity->id) }}
+
+                                                    </td>
+                                                    <?php
+                                                    
+                                                    $out_att = Criterion::students_attempted($ac_criterion->criterion_id, $activity->id);
+                                                    $out_ach = Criterion::students_achieved($ac_criterion->criterion_id, $activity->id);
+                                                    
+                                                    $percentage = 'N/A';
+                                                    $activity->getOutcomeReport();
+                                                    
+                                                    ?>
+                                                    @if ($out_att == 0)
+                                                        <td class="col-md-1 danger">{{ $percentage }}</td>
+
+                                                    @else
+                                                        <?php
+                                                        $percentage = round(($out_ach / $out_att) * 100, 2);
+                                                        ?>
+                                                        @if ($percentage >= $activity->rubric[0]->expected_percentage)
+                                                            <td class="col-md-1 success">{{ $percentage }}%</td>
+
+                                                        @else
+                                                            <td class="col-md-1 danger">{{ $percentage }}%</td>
+
+                                                        @endif
+                                                    @endif
+                                                    <td>
+
+                                                        @foreach (Criterion::outcomes($ac_criterion->criterion_id) as $index6 => $outcome)
+
+                                                            <?php echo $outcome->name . "\n\n\n <br>"; ?>
+
+
+
+                                                        @endforeach
+
+
+                                                    </td>
+                                                </tr>
+                                            @endforeach
+                                        </tbody>
+
+                                    </table>
+
+                                    <br>
+                                    <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
+                                    <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
+                                    @if ($formative_actions)
+                                        <p style="display: inline;"> <u>{{ $formative_actions[0]->at_text }}:
+                                            </u>
+
+                                            <i>{{ $formative_actions[0]->description }}
+                                            </i>
+                                        </p>
+                                        <br>
+                                        <h5 style="display: inline; margin:30px;">Formative Action's Associated
+                                            Criteria: </h5>
+                                        <ul style="margin:30px;">
+                                            @foreach ($formative_actions as $criteria)
+                                                <li> <i>{{ $criteria->name }} <i></li>
+
+                                            @endforeach
+                                        </ul>
+
+
+
+                                    @endif
+                                    <br>
+                                    <h5 style="display: inline; margin:30px;">Assessment Comments: </h5>
+                                    @if ($activity->assessment_comments != null)
+
+
+                                        <p style="display: inline;">{{ $activity->assessment_comments }}</p>
+                                    @endif
+                                    <hr>
+                                    <br>
+
+
+
+                                    <h4>Performance of Students by Learning Outcome</h4>
+                                    <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
+                                    <p style="display: inline;">{{ $activity->name }}
+                                        <strong>({{ $activity->date }})</strong>
+                                    </p>
+                                    <br>
+                                    <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
+                                    <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
+                                    </p>
+                                    <br>
+                                    <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
+                                        target by learning outcome: </h5>
+                                    <p style="display: inline;"> <i>
+                                            <?php
+                                            $expected = DB::table('target_outcomes_program')
+                                                ->where('program_id', $course->program_id)
+                                                ->where('semester_id', $course->semester_id)
+                                                ->first(); //->expected_target;
+                                            if (!$expected) {
+                                                $expected = 'It has not been defined in the annual plan';
+                                            }
+                                            else{
+                                        $expected = $expected->expected_target;
+                                    }
+                                            ?>
+                                            {{ $expected }}
+                                        </i>
+                                    </p>
+                                    <br>
+                                    <table class='table table-striped table-condensed datatable'>
+                                        <thead>
+                                            <tr>
+                                                <th>
+                                                    Learning Outcome
+                                                </th>
+                                                <th>
+                                                    Number of Students Assessed
+                                                </th>
+                                                <th>
+                                                    Number of students that achieved the target
+                                                </th>
+                                                <th>
+                                                    %
+                                                </th>
+
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                            @foreach ($activity->getOutcomeReport() as $outcome)
+                                                <tr>
+                                                    <td>
+                                                        {{ $outcome->name }}
+                                                    </td>
+                                                    <td>
+                                                        {{ $outcome->attempted }}
+                                                    </td>
+                                                    <td>
+                                                        {{ $outcome->achieved }}
+                                                    </td>
+                                                    @if ($outcome->percentage >= $expected)
+                                                        <td class="col-md-1 success">{{ $outcome->percentage }}%</td>
+
+                                                    @else
+                                                        <td class="col-md-1 danger">{{ $outcome->percentage }}%</td>
+
+                                                    @endif
+
+
+
+
+
+                                                </tr>
+
+                                            @endforeach
+                                        </tbody>
+                                    </table>
+
+                                    <br>
+                                    <hr>
+
+
+
+
+
+
+                                @endforeach
                                 @endforeach
 
 

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

@@ -97,9 +97,7 @@
                         @foreach ($sections_evaluating as $index3 => $section)
                             <h3 style="text-align: center"> Course: {{ $course->code }}
                                 {{ $course->number }}-{{ $section->section }}</h3>
-                            <?php
-                            Log::info($section->publishedActivities);
-                            ?>
+                                <h4> Non-diagnostic Activities</h4>
                             @foreach ($section->publishedActivities as $index4 => $activity)
 
                                 <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
@@ -355,6 +353,263 @@
 
 
                             @endforeach
+                            <h4>Diagnostic Activities</h4>
+                            @foreach ($section->diagnosticActivities as $index4 => $activity)
+
+                                <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
+                                <p style="display: inline;">{{ $activity->name }}
+                                    <strong>({{ $activity->date }})</strong>
+                                </p>
+                                <br>
+                                <br>
+                                <h5 style="display: inline;">Performance Indicators: </h5>
+                                <?php
+                                Log::info($activity->rubric[0]);
+                                ?>
+                                <p style="display: inline;"><i>{{ $activity->rubric[0]->num_scales }} (
+                                        <?php
+                                        $titles = $activity->rubric[0]->getTitles();
+                                        ?>
+                                        @if (sizeof($titles) != 1)
+                                            @foreach ($titles as $index5 => $rubric_title)
+                                                @if ($index5 != $activity->rubric[0]->num_scales - 1)
+                                                    {{ $rubric_title->text }},
+                                                @else
+                                                    and {{ $rubric_title->text }}
+                                                @endif
+
+                                            @endforeach
+                                            )
+                                        @else
+                                            {{ $titles[0]->text }} )
+                                        @endif
+                                    </i></p>
+                                <br>
+                                <h5 style="display: inline;">Scale: </h5>
+                                @if ($activity->rubric[0]->max_score == 1)
+
+                                    <p style="display: inline;">1 point scale</p>
+                                @else
+                                    <p style="display: inline;">1-{{ $activity->rubric[0]->max_score }} point scale</p>
+
+                                @endif
+                                <br>
+                                <br>
+                                <h4>Performance of Students by Learning Outcome Criteria</h4>
+                                <h5 style="display: inline; margin:30px;">Target by criterion: </h5>
+                                <p style="display: inline;"> <i>{{ $activity->rubric[0]->expected_points }} or more</i>
+                                </p>
+                                <br>
+                                <h5 style="display: inline; margin:30px;">Expected percent of students achieving the target
+                                    by criterion: </h5>
+                                <p style="display: inline;"> <i>{{ $activity->rubric[0]->expected_percentage }} %</i>
+                                </p>
+
+                                <br>
+
+
+                                <table class='table table-striped table-condensed datatable'>
+                                    <thead>
+                                        <tr>
+                                            <th>
+                                                Criterion
+                                            </th>
+                                            <th>
+                                                Number of Students Assessed
+                                            </th>
+                                            <th>
+                                                Number of students that achieved the target
+                                            </th>
+                                            <th>
+                                                %
+                                            </th>
+                                            <th>
+                                                Learning Outcomes
+                                            </th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        @foreach ($activity->allActivityCriterionInfo() as $index5 => $ac_criterion)
+                                            <tr>
+                                                <td> {{ $ac_criterion->name }}</td>
+                                                <td>{{ Criterion::students_attempted($ac_criterion->criterion_id, $activity->id) }}
+                                                </td>
+                                                <td>
+                                                    {{ Criterion::students_achieved($ac_criterion->criterion_id, $activity->id) }}
+
+                                                </td>
+                                                <?php
+                                                
+                                                $out_att = Criterion::students_attempted($ac_criterion->criterion_id, $activity->id);
+                                                $out_ach = Criterion::students_achieved($ac_criterion->criterion_id, $activity->id);
+                                                
+                                                $percentage = 'N/A';
+                                                $activity->getOutcomeReport();
+                                                
+                                                ?>
+
+                                                @if ($out_att == 0)
+                                                    <td class="col-md-1 danger">{{ $percentage }}</td>
+
+                                                @else
+                                                    <?php
+                                                    $percentage = round(($out_ach / $out_att) * 100, 2);
+                                                    ?>
+                                                    @if ($percentage >= $activity->rubric[0]->expected_percentage)
+                                                        <td class="col-md-1 success">{{ $percentage }}%</td>
+
+                                                    @else
+                                                        <td class="col-md-1 danger">{{ $percentage }}%</td>
+
+                                                    @endif
+
+
+
+                                                @endif
+
+
+
+                                                <td>
+
+
+                                                    @foreach (Criterion::outcomes($ac_criterion->criterion_id) as $index6 => $outcome)
+
+                                                        <?php echo $outcome->name . "\n\n\n <br>"; ?>
+
+
+
+                                                    @endforeach
+
+
+                                                </td>
+                                            </tr>
+                                        @endforeach
+                                    </tbody>
+
+                                </table>
+                                <br>
+                                <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
+                                <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
+                                @if ($formative_actions)
+                                    <p style="display: inline;"> <u>{{ $formative_actions[0]->at_text }}:
+                                        </u>
+
+                                        <i>{{ $formative_actions[0]->description }}
+                                        </i>
+                                    </p>
+                                    <br>
+                                    <h5 style="display: inline; margin:30px;">Formative Action's Associated
+                                        Criteria: </h5>
+                                    <ul style="margin:30px;">
+                                        @foreach ($formative_actions as $criteria)
+                                            <li> <i>{{ $criteria->name }} <i></li>
+
+                                        @endforeach
+                                    </ul>
+                                @endif
+                                <br>
+
+                                <h5 style="display: inline; margin:30px;">Assessment Comments: </h5>
+                                @if ($activity->assessment_comments != null)
+
+
+                                    <p style="display: inline;">{{ $activity->assessment_comments }}</p>
+                                @endif
+                                <br>
+                                <hr>
+                                <br>
+
+                                <h4>Performance of Students by Learning Outcome</h4>
+                                <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5><br>
+                                <p style="display: inline;">{{ $activity->name }}
+                                    <strong>({{ $activity->date }})</strong>
+                                </p>
+                                <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
+                                <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
+                                </p>
+                                <br>
+                                <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
+                                    target
+                                    by learning outcome: </h5>
+                                <p style="display: inline;"> <i>
+                                        <?php
+                                        $expected = DB::table('target_outcomes_program')
+                                            ->where('program_id', $course->program_id)
+                                            ->where('semester_id', $course->semester_id)
+                                            ->first(); //->expected_target;
+                                        if (!$expected) {
+                                            
+                                             $expected = 'It has not been defined in the annual plan';
+                                        }
+                                        else{
+                                            $expected = $expected->expected_target;
+                                        }
+                                        
+                                        ?>
+                                        {{ $expected }}
+                                    </i>
+                                </p>
+                                <br>
+                                <table class='table table-striped table-condensed datatable'>
+                                    <thead>
+                                        <tr>
+                                            <th>
+                                                Learning Outcome
+                                            </th>
+                                            <th>
+                                                Number of Students Assessed
+                                            </th>
+                                            <th>
+                                                Number of students that achieved the target
+                                            </th>
+                                            <th>
+                                                %
+                                            </th>
+
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        @foreach ($activity->getOutcomeReport() as $outcome)
+                                            <tr>
+                                                <td>
+                                                    {{ $outcome->name }}
+                                                </td>
+                                                <td>
+                                                    {{ $outcome->attempted }}
+                                                </td>
+                                                <td>
+                                                    {{ $outcome->achieved }}
+                                                </td>
+                                                @if ($outcome->percentage >= $expected)
+                                                    <td class="col-md-1 success">{{ $outcome->percentage }}%</td>
+
+                                                @else
+                                                    <td class="col-md-1 danger">{{ $outcome->percentage }}%</td>
+
+                                                @endif
+
+
+
+
+
+                                            </tr>
+
+                                        @endforeach
+                                    </tbody>
+                                </table>
+
+                                <br>
+                                <hr>
+
+
+
+
+
+
+
+
+                            @endforeach
+                            
                         @endforeach
                     </div>