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

Resolviendo varias bugs

app/controllers/ProgramsController.php

   {
 
     $program = Program::find($id);
+    Log::info(debug_backtrace()[1]['function']);
     $title = $program->school->name . ': ' . $program->name;
     $program_courses = $program->courses;
     //     $outcomes = Outcome::orderBy('name', 'asc')->get();
    */
   public function fetch()
   {
-    Log::info('id:' . Input::get('id'));
+    //Log::info('id:' . Input::get('id'));
     return School::find(Input::get('id'))->programs;
   }
-}
+}

app/models/Activity.php

     return  $criteria_achieved;
   }
 
-
+  public function formativeActionsWithCriteria()
+  {
+    return DB::table('activity_criterion')
+      ->join('transformative_activity_criterion', 'transformative_activity_criterion.activity_criterion_id', '=', 'activity_criterion.id')
+      ->join('criteria', 'criteria.id', '=', 'activity_criterion.criterion_id')
+      ->join('transformative_actions', 'transformative_actions.id', '=', 'transformative_activity_criterion.trans_action_id')
+      ->where('activity_id', $this->id)
+      ->get();
+  }
 
   // cap_array
   public function getCapArrayAttribute()
     $activity_criterion = DB::table('activity_criterion')
       ->join('criteria', 'criteria.id', '=', 'activity_criterion.criterion_id')
       ->where('activity_id', $this->id)
+      ->select('activity_criterion.activity_id', 'activity_criterion.criterion_id', 'criteria.*')
+      ->distinct()
       ->get();
 
 
     //return json_decode($this->outcomes_attempted, true);
     return $outcomes_attempted;
   }
-}
+}

app/models/Course.php

       ->select('activities.id')
       ->distinct()
       ->lists('activities.id');
-    //return $this->hasMany('Activity')->whereNotNull('activities.outcomes_attempted')->where('activities.draft', 0)->orderBy('date', 'asc');
+    //$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');
   }
 

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

                                     <?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')
                                     
                                             @endif
                                             <br>
                                             <br>
-                                            <h4>Perfomance by Learning Outcome Criteria</h4>
+                                            <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
                                                 <i>{{ $activity->rubric[0]->expected_percentage }}
                                                     %</i>
                                             </p>
+
+                                            <br>
+                                            <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
+                                            <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
+                                            @if ($formative_actions)
+                                                <p style="display: inline;">
+                                                    <strong>{{ $formative_actions[0]->at_text }}:
+                                                    </strong>
+
+                                                    <i>{{ $formative_actions[0]->description }}
+                                                    </i>
+                                                </p>
+                                                <br>
+                                                <h5>Formative Action's Associated
+                                                    Criteria: </h5>
+                                                <ul>
+                                                    @foreach ($formative_actions as $criteria)
+                                                        <li> <i>{{ $criteria->name }} <i></li>
+
+                                                    @endforeach
+                                                </ul>
+
+                                            @else
+                                                <p style="display: inline;"> <strong>Has no Formative Action yet </strong>
+
+                                            @endif
+                                            @if ($activity->assessment_comments != null)
+
+                                                <h5 style="display: inline; margin:30px;">Assessment Comments</h5>
+                                                <p style="display: inline;">{{ $activity->assessment_comments }}</p>
+                                            @endif
                                             <br>
                                             <table class='table table-striped table-condensed datatable'>
                                                 <thead>
                                             <hr>
                                             <br>
 
-                                            <h4>Perfomance by Learning Outcome Student</h4>
+                                            <h4>Performance of Students by Learning Outcome</h4>
                                             <h5 style="display: inline; margin:30px;">Target by outcome: </h5>
                                             <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
                                             </p>
                                                     $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";
+                                                        ->first(); //->expected_target;
+                                                    if (!$expected) {
+                                                        $expected = 'It has not been defined in the annual plan';
                                                     }
                                                     ?>
                                                     {{ $expected }}

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

                         <?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')
                         
 
                                     <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
                                     <p style="display: inline;">{{ $activity->name }}
-                                        <strong>({{ $activity->date }})</strong></p>
+                                        <strong>({{ $activity->date }})</strong>
+                                    </p>
                                     <br>
                                     <br>
                                     <h5 style="display: inline;">Performance Indicators: </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>
+                                        <p style="display: inline;">1-{{ $activity->rubric[0]->max_score }} point scale
+                                        </p>
 
                                     @endif
                                     <br>
                                     <br>
-                                    <h4>Perfomance by Learning Outcome Criteria</h4>
+                                    <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 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>
+                                    <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
+                                    <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
+                                    @if ($formative_actions)
+                                        <p style="display: inline;"> <strong>{{ $formative_actions[0]->at_text }}:
+                                            </strong>
+
+                                            <i>{{ $formative_actions[0]->description }}
+                                            </i>
+                                        </p>
+                                        <br>
+                                        <h5>Formative Action's Associated
+                                            Criteria: </h5>
+                                        <ul>
+                                            @foreach ($formative_actions as $criteria)
+                                                <li> <i>{{ $criteria->name }} <i></li>
+
+                                            @endforeach
+                                        </ul>
+
+                                    @else
+                                        <p style="display: inline;"> <strong>Has no Formative Action yet </strong>
+
+                                    @endif
+
+                                    @if ($activity->assessment_comments != null)
+
+                                        <h5 style="display: inline; margin:30px;">Assessment Comments</h5>
+                                        <p style="display: inline;">{{ $activity->assessment_comments }}</p>
+                                    @endif
                                     <br>
                                     <table class='table table-striped table-condensed datatable'>
                                         <thead>
                                     <hr>
                                     <br>
 
-                                    <h4>Perfomance by Learning Outcome Student</h4>
+                                    <h4>Performance of Students by Learning Outcome</h4>
                                     <h5 style="display: inline; margin:30px;">Target by outcome: </h5>
                                     <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
                                     </p>
                                                 ->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";
-                                                    }
+                                            if (!$expected) {
+                                                $expected = 'It has not been defined in the annual plan';
+                                            }
                                             
                                             ?>
                                             {{ $expected }}

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

                                 {{ Form::select('outcome[]', $outcomes, reset($outcomes), ['class' => 'form-control selectpicker', 'id' => 'outcome0', 'onchange' => 'fetchObjectiveForSelect("outcome0", "objectiveGroupFor0")']) }}
                             </div>
 
-                            <div id='objectiveGroupFor0' class='createObjective' class data-value='1'>
+                            <div id='objectiveGroupFor0' class='createObjective' data-value='1'>
                                 <div class="form-group col-md-11 selectObjective">
                                     <label>Associated Objectives for Outcome 1</label>
                                     <select id="objective_0_counter_1" name="objective[]" class="form-control selectpicker"
                         {{ Form::text('name', '', ['class' => 'form-control']) }}
                     </div>
 
-                    <div class="form-group  ">
+                    <div class="form-group">
                         {{ Form::label('subcriteria', 'Subcriteria') }}
                         <p class="help-block"><strong>Manually add</strong> bullets or numbering.</p>
                         {{ Form::textarea('subcriteria', '', ['class' => 'form-control', 'rows' => 3, 'aria-labelledby' => 'subcriteria']) }}
                             onchange='fetchCriterionForEditing()'>
                             @foreach ($criteria as $criterion)
                                 <option value="{{ $criterion->id }}" data-subtext="
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
-                                                                                                                                                                                                                                                                                                                                                                                                                       
-                                                                                                                                                                                                                                                                                                                                                                       
-                                                                                                                                                                                                                                                                                                                       
-                                                                                                                                                                                                                                                                       
-                                                                                                                                                                                                                       
-                                                                                                                                                                       
-                                                                                                                       
-                                                                  @if ($criterion->program)
+               @if ($criterion->program)
                                     &nbsp;&nbsp;&nbsp;[{{ $criterion->program->name }}]
                             @endif
                             ">
                         {{ Form::textarea('notes', Input::old('notes'), ['class' => 'form-control', 'rows' => 2, 'id' => 'criterion_notes', 'placeholder' => '(optional)']) }}
                     </div>
 
-                    {{ Form::submit('Update', ['class' => 'btn btn-primary btn-block', 'id' => 'update_the_criterion_button']) }}
+                    {{ Form::submit('Update', ['class' => 'btn btn-primary btn-block', 'id' => 'update_the_criterion_button', 'data-form-id' => 'update_criterion']) }}
                     {{ Form::close() }}
 
                     {{ Form::open(['action' => 'CriteriaController@delete']) }}
         visibleProgram["allAssocOutcomes"] = {}
         visibleProgram["allOutcomes"] = {}
 
-
         function visiblePrograms(allOutcomesDiv) {
             checkedPrograms = {}
             $('#' + allOutcomesDiv).parent().find('input:checkbox').each(function(index) {
                     checkedPrograms[$(this).attr('id')] = 1;
                     $(this).prop("checked", false);
                 }
-
                 program_id = $(this).val();
                 if (!(program_id in visibleProgram[allOutcomesDiv])) {
                     visibleProgram[allOutcomesDiv][program_id] = {};
                             $("#update_the_criterion_button").val('Update');
                             $("#update_criterion").attr('action', "{{ URL::action('CriteriaController@update') }}")
 
+
                         } else {
                             $('#DeleteButton').prop('disabled', true);
                             $("#update_the_criterion_button").val("Create New")
                                 '<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>'
                             );
 
+
                         }
                         var name = criterion.name;
                         if (criterion.subcriteria) {

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

                                 <?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')
                                 
                                         @endif
                                         <br>
                                         <br>
-                                        <h4>Perfomance by Learning Outcome Criteria</h4>
+                                        <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 style="display: inline;"> <i>{{ $activity->rubric[0]->expected_percentage }}
                                                 %</i>
                                         </p>
+
+                                        <br>
+                                        <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
+                                        <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
+                                        @if ($formative_actions)
+                                            <p style="display: inline;"> <strong>{{ $formative_actions[0]->at_text }}:
+                                                </strong>
+
+                                                <i>{{ $formative_actions[0]->description }}
+                                                </i>
+                                            </p>
+                                            <br>
+                                            <h5>Formative Action's Associated
+                                                Criteria: </h5>
+                                            <ul>
+                                                @foreach ($formative_actions as $criteria)
+                                                    <li> <i>{{ $criteria->name }} <i></li>
+
+                                                @endforeach
+                                            </ul>
+
+                                        @else
+                                            <p style="display: inline;"> <strong>Has no Formative Action yet </strong>
+
+                                        @endif
+                                        @if ($activity->assessment_comments != null)
+
+                                            <h5 style="display: inline; margin:30px;">Assessment Comments</h5>
+                                            <p style="display: inline;">{{ $activity->assessment_comments }}</p>
+                                        @endif
                                         <br>
                                         <table class='table table-striped table-condensed datatable'>
                                             <thead>
                                         <hr>
                                         <br>
 
-                                        <h4>Perfomance by Learning Outcome Student</h4>
+                                        <h4>Performance of Students by Learning Outcome</h4>
                                         <h5 style="display: inline; margin:30px;">Target by outcome: </h5>
                                         <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
                                         </p>
                                                 $expected = DB::table('target_outcomes_program')
                                                     ->where('program_id', $course->program_id)
                                                     ->where('semester_id', $course->semester_id)
-                                                    ->first()->expected_target;
-                                                
+                                                    ->first(); //->expected_target;
+                                                if (!$expected) {
+                                                    $expected = 'It has not been defined in the annual plan';
+                                                }
                                                 ?>
                                                 {{ $expected }}
                                             </i>

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

         <hr>
             <h5>Description</h5>
             <p>{{ $activity->description }}</p>
-
-        @if($activity->transforming_actions != NULL)
+        <?php
+        $formative_actions = $activity->formativeActionsWithCriteria();
+        ?>
+        @if($formative_actions != NULL)
             <hr>
-            <h5>Transforming Actions</h5>
-            {{{ $activity->transforming_actions }}}
+            <h5>Formative Actions</h5>
+            <p><strong>{{ $formative_actions[0]->at_text }}: </strong> {{$formative_actions[0]->description}}</p>
+            <h5>Formative Action's Associated Criteria</h5>
+            <ul>
+                @foreach($formative_actions as $criteria)
+                <li>{{$criteria->name}}</li>
+                @endforeach
+            </ul>
         @endif
 
         @if($activity->assessment_comments != NULL)

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

 @extends('layouts.master')
 
 @section('navigation')
-    @if(Auth::user()->role==1)
+    @if (Auth::user()->role == 1)
         @include('local.managers.admins._navigation')
-    @elseif(Auth::user()->role==2)
+    @elseif(Auth::user()->role == 2)
         @include('local.managers.sCoords._navigation')
-    @elseif(Auth::user()->role==3)
+    @elseif(Auth::user()->role == 3)
         @include('local.managers.pCoords._navigation')
     @else
-    @include('local.professors._navigation')
+        @include('local.professors._navigation')
 
     @endif
 @stop
 @section('main')
     <div class="row">
         <div class="col-md-12">
-            <p>This report contains performance information for all your Program's assessed courses during the following semester(s):</p>
+            <p>This report contains performance information for all your Program's assessed courses during the following
+                semester(s):</p>
             <ul>
                 @foreach (Session::get('semesters_info') as $semester_info)
                     <li>{{ $semester_info }}</li>
                 @endforeach
             </ul>
-         
 
-                                <!-- For each grouped course -->
-                                <ul id = "levelTabs" class="nav nav-tabs" role="tablist">
-                                        
-                                   
-                                @foreach($courses as $index2=>$course)
-                              
-                            
-                          
-                                   <li role= "presentation">
-                                        <a data-toggle = "tab" href ="#{{ $course->code}}-{{ $course->number }}"
-                                            role ="tab">{{ $course->code}}-{{ $course->number }}</a>
-                                        </li>
-                            @endforeach
-                                </ul>
-                                <div id="allLists" class="tab-content">
-                                   
-                                
-
-
-                           @foreach($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();*/
-
-
-                           $sections_evaluating = Course::has('activities')
-               
-               //->whereNotNull('outcomes_attempted')
-               //->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
-               ->with(array('activities'=>function($query) use(&$course){
-                   $activities = DB::table('activities')
-                   ->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
-                   ->join('assessments', 'assessments.activity_criterion_id', '=','activity_criterion.id')
-                   //->join('criterion_objective_outcome', 'activity_criterion.criterion_id', '=', 'criterion_objective_outcome.criterion_id')
-                   ->join('courses','courses.id','=','activities.course_id')
-                   ->where('courses.code',$course->code)
-                   ->where('courses.number',$course->number)
-                   ->where('activities.draft',0)
-                   ->where('activities.diagnostic',0)
-                   //->where('criterion_objective_outcome.outcome_id', $outcome->id)
-                   ->select('activity_id')
-                   ->lists('activity_id');
-
-                   //$query->whereNotNull('outcomes_attempted');
-                   //$query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');
-               $query->whereIn('activities.id', $activities);
-           } ))
-                   
-
-               ->where('code', $course->code)->where('number',$course->number)
-               ->where('user_id',Auth::user()->id)
-               ->whereIn('semester_id', Session::get('semesters_ids'))
-               ->orderBy('semester_id')
-               ->get();
-               
-              
-                       ?>
-
-                            
-                            <div role = "tabpanel" class = 'tab-pane' id = "{{$course->code}}-{{$course->number}}">
-                                @foreach($sections_evaluating as $index3 => $section)
-                                <h3 style="text-align: center"> Course: {{$course->code}} {{$course->number}}-{{$section->section}}</h3> 
-                                <?php
-                                Log::info($section->publishedActivities);
-                                ?>
-                                @foreach($section->publishedActivities as $index4 => $activity)
 
-                                <h5 style="display: inline;">Activity {{$index4+1}}: </h5>
-                                <p style="display: inline;">{{$activity->name}} <strong>({{$activity->date}})</strong></p>
+            <!-- For each grouped course -->
+            <ul id="levelTabs" class="nav nav-tabs" role="tablist">
+
+
+                @foreach ($courses as $index2 => $course)
+
+
+
+                    <li role="presentation">
+                        <a data-toggle="tab" href="#{{ $course->code }}-{{ $course->number }}"
+                            role="tab">{{ $course->code }}-{{ $course->number }}</a>
+                    </li>
+                @endforeach
+            </ul>
+            <div id="allLists" class="tab-content">
+
+
+
+
+                @foreach ($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();*/
+                    
+                    $sections_evaluating = Course::has('activities')
+                    
+                        //->whereNotNull('outcomes_attempted')
+                        //->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
+                        ->with([
+                            'activities' => function ($query) use (&$course) {
+                                $activities = DB::table('activities')
+                                    ->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
+                                    ->join('assessments', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
+                                    //->join('criterion_objective_outcome', 'activity_criterion.criterion_id', '=', 'criterion_objective_outcome.criterion_id')
+                                    ->join('courses', 'courses.id', '=', 'activities.course_id')
+                                    ->where('courses.code', $course->code)
+                                    ->where('courses.number', $course->number)
+                                    ->where('activities.draft', 0)
+                                    ->where('activities.diagnostic', 0)
+                                    //->where('criterion_objective_outcome.outcome_id', $outcome->id)
+                                    ->select('activity_id')
+                                    ->lists('activity_id');
+                    
+                                //$query->whereNotNull('outcomes_attempted');
+                                //$query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');
+                                $query->whereIn('activities.id', $activities);
+                            },
+                        ])
+                    
+                        ->where('code', $course->code)
+                        ->where('number', $course->number)
+                        ->where('user_id', Auth::user()->id)
+                        ->whereIn('semester_id', Session::get('semesters_ids'))
+                        ->orderBy('semester_id')
+                        ->get();
+                    
+                    ?>
+
+
+                    <div role="tabpanel" class='tab-pane' id="{{ $course->code }}-{{ $course->number }}">
+                        @foreach ($sections_evaluating as $index3 => $section)
+                            <h3 style="text-align: center"> Course: {{ $course->code }}
+                                {{ $course->number }}-{{ $section->section }}</h3>
+                            <?php
+                            Log::info($section->publishedActivities);
+                            ?>
+                            @foreach ($section->publishedActivities as $index4 => $activity)
+
+                                <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
+                                <p style="display: inline;">{{ $activity->name }}
+                                    <strong>({{ $activity->date }})</strong>
+                                </p>
                                 <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}},
+                                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
-                                            and {{$rubric_title->text}}
+                                            {{ $titles[0]->text }} )
                                         @endif
-                                            
-                                    @endforeach
-                                )
-                                @else
-                                    {{$titles[0]->text}} )
-                                @endif
-                                </i></p>
+                                    </i></p>
                                 <br>
                                 <h5 style="display: inline;">Scale: </h5>
-                                @if($activity->rubric[0]->max_score == 1)
+                                @if ($activity->rubric[0]->max_score == 1)
 
-                               <p style="display: inline;">1 point scale</p>
+                                    <p style="display: inline;">1 point scale</p>
                                 @else
-                                <p style="display: inline;">1-{{$activity->rubric[0]->max_score}} point scale</p>
+                                    <p style="display: inline;">1-{{ $activity->rubric[0]->max_score }} point scale</p>
 
                                 @endif
                                 <br>
                                 <br>
-                                <h4>Perfomance 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>
+                                <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>
+                                <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>
+                                <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
+                                <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
+                                @if ($formative_actions)
+                                    <p style="display: inline;"> <strong>{{ $formative_actions[0]->at_text }}:
+                                        </strong>
+
+                                        <i>{{ $formative_actions[0]->description }}
+                                        </i>
+                                    </p>
+                                    <br>
+                                    <h5>Formative Action's Associated
+                                        Criteria: </h5>
+                                    <ul>
+                                        @foreach ($formative_actions as $criteria)
+                                            <li> <i>{{ $criteria->name }} <i></li>
 
-                                <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>
-                                            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
+                                        @endforeach
+                                    </ul>
 
-                                        $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();
-                                        
+                                @else
+                                    <p style="display: inline;"> <strong>Has no Formative Action yet </strong>
+
+                                @endif
+                                @if ($activity->assessment_comments != null)
+
+                                    <h5 style="display: inline; margin:30px;">Assessment Comments</h5>
+                                    <p style="display: inline;">{{ $activity->assessment_comments }}</p>
+                                @endif
+                                <br>
+
+                                <table class='table table-striped table-condensed datatable'>
+                                    <thead>
+                                        <tr>
+                                            <th>
+                                                Criterion
+                                            </th>
+                                            <th>
+                                                Number of Students Assessed
+                                            </th>
+                                            <th>
+                                                Number of students that achieved the target
+                                            </th>
+                                            <th>
+                                                %
+                                            </th>
+                                            <th>
+                                                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>
 
-                                        ?>
-                                        
-                                            @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>
-                                                      
+                                                    <?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
 
 
 
-                                           @endif
+                                                <td>
 
 
-                                        
-                                        <td>
-                                            
-                                            
-                                            @foreach(Criterion::outcomes($ac_criterion->criterion_id) as $index6=>$outcome)
-                                            
-                                             {{$index6 + 1}}.   <?php echo $outcome->name."\n\n\n <br>" ?>
-                                             
-                                            
+                                                    @foreach (Criterion::outcomes($ac_criterion->criterion_id) as $index6 => $outcome)
+
+                                                        {{ $index6 + 1 }}. <?php echo $outcome->name . "\n\n\n <br>"; ?>
+
+
+
+                                                    @endforeach
+
+
+                                                </td>
+                                            </tr>
+                                        @endforeach
+                                    </tbody>
 
-                                            @endforeach
-                                            
-                                            
-                                        </td>
-                                    </tr>
-                                    @endforeach
-                                </tbody>
-                            
                                 </table>
                                 <hr>
                                 <br>
 
-                                <h4>Perfomance by Learning Outcome Student</h4>
-                                <h5 style = "display: inline; margin:30px;">Target by outcome: </h5>
-                                <p  style = "display: inline;"> <i>>= 66.67% of the attempts</i>
+                                <h4>Performance of Students by Learning Outcome</h4>
+                                <h5 style="display: inline; margin:30px;">Target by 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 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";
-                                                    }
-
-        
-                                    ?>
-                                    {{$expected}}
-                                </i>
+                                <h5 style="display: inline; margin:30px;">Expected percent of students achieving the target
+                                    by 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';
+                                        }
+                                        
+                                        ?>
+                                        {{ $expected }}
+                                    </i>
                                 </p>
                                 <br>
                                 <table class='table table-striped table-condensed datatable'>
                                             <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>
-                                                                 
+                                        @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>
-                                                      
+                                                    <td class="col-md-1 danger">{{ $outcome->percentage }}%</td>
+
                                                 @endif
 
 
 
-                                           
 
-                                        </tr>
+
+                                            </tr>
 
                                         @endforeach
                                     </tbody>
 
 
 
-                                
-                                @endforeach
-                            
-                                @endforeach
-                            </div>
 
-                            
+                            @endforeach
 
-                                        @endforeach
-                            
+                        @endforeach
+                    </div>
 
-            
 
 
-                                        
+                @endforeach
+
+
+
+
+
+
+            </div>
         </div>
-    </div>
 
- 
-@section('included-js')
-    @include('global._datatables_js')
-@stop
-        
+
+    @section('included-js')
+        @include('global._datatables_js')
+    @stop
+
 @stop
 
 @section('javascript')