Bugs, reporte de cursos de programas, y drafts de reportes de programas.

.gitignore

@@ -14,3 +14,4 @@ node_modules/
 app/config/
 app/controllers/AuthController.php
 app/controllers/AuthController.php
+bootstrap/start.php

app/controllers/AnnualPlansController.php

@@ -452,4 +452,44 @@ class AnnualPlansController extends \BaseController
 
     return View::make('local.managers.shared.create_annual_plan', compact('title', 'program', 'current_quinquennium', 'outcomes', 'courses'));
   }
+
+  function fetchAnnualReport()
+  {
+    $program_id = Input::get('program_id');
+    $annual_plan_id = Input::get('annual_plan_id');
+    $semester_start = Input::get('semester_start');
+    $semester_end = Input::get('semester_end');
+    $academic_year = Input::get('academic_year');
+
+    $academic_year = (int) explode(",", $academic_year)[0];
+
+    $course_codes = DB::table('typ_semester_courses')
+      ->join('typ_semester_objectives as tso', 'tso.id', '=', 'typ_semester_courses.typ_semester_objective_id')
+      ->join('courses', 'courses.id', '=', 'typ_semester_courses.course_id')
+      ->join('typ_semester_outcome as typ_out', 'typ_out.id', '=', 'tso.typ_semester_outcome_id')
+      ->join('typ_program', 'typ_out.typ_program_id', '=', 'typ_program.id')
+      ->where(function ($query) use (&$semester_start, &$semester_end) {
+        $query->where('typ_out.semester_id', $semester_start)
+          ->orWhere('typ_out.semester_id', $semester_end);
+      })
+      ->where('typ_program.program_id', $program_id)
+      ->select('courses.code', 'courses.number', 'typ_semester_courses.id as typ_sem_cou_id')
+      ->distinct()
+      ->get();
+    foreach ($course_codes as $course_code) {
+
+      $course_code->sections = DB::table('courses')
+        ->join('activities', 'activities.course_id', '=', 'courses.id')
+        ->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
+        ->join('annual_plan_objective', 'annual_plan_objective.criteria_id', '=', 'activity_criterion.criterion_id')
+        ->join('typ_semester_courses', 'typ_semester_courses.id', '=', 'annual_plan_objective.typ_semester_course_id')
+        ->where('courses.code', $course_code->code)
+        ->where('courses.number', $course_code->number)
+        ->where('annual_plan_id', $annual_plan_id)
+        ->where('annual_plan_objective.typ_semester_course_id', $course_code->typ_sem_cou_id)
+        ->toSql();
+
+      Log::info($course_code->sections);
+    }
+  }
 }

app/controllers/OutcomesController.php

@@ -911,10 +911,10 @@ class OutcomesController extends \BaseController
      */
     public function schoolAssessmentReport($outcome_id)
     {
-        $outcome = Outcome::find($outcome_id);
+        //$outcome = Outcome::find($outcome_id);
 
-        if (!$outcome)
-            App::abort('404');
+        //if (!$outcome)
+        //    App::abort('404');
         $title = "Assessment Report: " . $outcome->name;
 
 
@@ -926,31 +926,32 @@ class OutcomesController extends \BaseController
                     ->with(array('courses' => function ($query2) {
                         $query2
                             ->has('activities')
-                            //->whereNotNull('outcomes_attempted')
                             ->join('activities', 'activities.course_id', '=', 'courses.id')
                             ->join('activity_criterion as ac', 'ac.activity_id', '=', 'activities.id')
                             ->join('assessments', 'assessments.activity_criterion_id', '=', 'ac.id')
                             ->where('activities.draft', 0)
                             ->select('courses.*')->distinct()
+                            //->whereNotNull('outcomes_attempted')
+
                             ->whereIn('semester_id', Session::get('semesters_ids'))
                             ->groupBy(array('code', 'number'));
                     }));
             }))
             ->first();
 
-        return View::make('local.managers.sCoords.assessment_report', compact('title', 'outcome', 'school'));
+        return View::make('local.managers.sCoords.assessment_report', compact('title', 'school'));
     }
 
     /**
      *    Program Assessment Reports
      */
-    public function programAssessmentReport($outcome_id, $program_id)
+    public function programAssessmentReport($program_id)
     {
-        $outcome = Outcome::find($outcome_id);
+        //$outcome = Outcome::find($outcome_id);
 
-        if (!$outcome)
-            App::abort('404');
-        $title = "Assessment Report: " . $outcome->name;
+        //if (!$outcome)
+        //    App::abort('404');
+        $title = "Program Courses Report";
 
 
         $program = Program::where('id', $program_id)
@@ -959,6 +960,11 @@ class OutcomesController extends \BaseController
                 $query
                     ->has('activities')
                     //->whereNotNull('outcomes_attempted')
+                    ->join('activities', 'activities.course_id', '=', 'courses.id')
+                    ->join('activity_criterion as ac', 'ac.activity_id', '=', 'activities.id')
+                    ->join('assessments', 'assessments.activity_criterion_id', '=', 'ac.id')
+                    ->where('activities.draft', 0)
+                    ->select('courses.*')->distinct()
 
                     ->whereIn('semester_id', Session::get('semesters_ids'))
                     ->groupBy(array('code', 'number'));
@@ -966,11 +972,12 @@ class OutcomesController extends \BaseController
             ->first();
         Log::info($program);
 
-        return View::make('local.managers.pCoords.assessment_report', compact('title', 'outcome', 'program'));
+
+        return View::make('local.managers.pCoords.new_assessment_report', compact('title', 'program'));
     }
 
 
-    public function professorAssessmentReports()
+    /*public function professorAssessmentReports()
     {
         $semesters = Session::get('semesters_ids');
         $semesters = DB::table('semesters')->whereIn('id', $semesters)->orderBy('start', 'ASC')->first();
@@ -984,7 +991,7 @@ class OutcomesController extends \BaseController
         $title = "My Courses' Assessment Reports";
 
         return View::make('local.professors.assessment_reports', compact('title', 'outcomes'));
-    }
+    }*/
 
 
     // Report for a single professor //with a single learning outcome
@@ -1026,4 +1033,20 @@ class OutcomesController extends \BaseController
 
         return View::make('local.professors.new_assessment_report', compact('title', 'courses'));
     }
+
+    public function annualReport($program_id)
+    {
+        $title = "Program Courses Report";
+
+
+        $annual_plans = DB::table('annual_plans')
+            ->join('annual_cycle', 'annual_plans.annual_cycle_id', '=', 'annual_cycle.id')
+            ->where('program_id', $program_id)
+            ->orderBy('semester_start', 'DESC')
+            ->select('*', 'annual_plans.id as annual_id')
+            ->get();
+
+
+        return View::make('local.managers.pCoords.annual_report', compact('title', 'program_id', 'annual_plans'));
+    }
 }

app/controllers/ProgramCoordinatorsController.php

@@ -17,16 +17,17 @@ class ProgramCoordinatorsController extends \BaseController
         return Redirect::to('school-coordinator');
         break;
     }
-    Log::info(Auth::user()->programs);
+    //Log::info(Auth::user()->programs);
     $title = 'Program Coordinator Overview';
 
     $programs = Auth::user()->programs;
+    //Log::info($programs);
 
     //$outcomes = Outcome::orderBy('name', 'asc')->get();
 
     $semesters = Session::get('semesters_ids');
     $semesters = DB::table('semesters')->whereIn('id', $semesters)->orderBy('start', 'ASC')->first();
-    Log::info($semesters->start);
+    //Log::info($semesters->start);
     $outcomes = Outcome::select(array('id', 'name', 'expected_outcome'))
       ->whereNull('deleted_at')
       ->whereRaw("(deactivation_date IS NULL or deactivation_date >= '{$semesters->start}')")
@@ -63,30 +64,62 @@ class ProgramCoordinatorsController extends \BaseController
       */
 
     foreach ($programs as $program) {
+      //Log::info($program);
       $program_array = array();
-
-      $program_array['program'] = $program;
+      $program_object = new \stdClass();
+      $program_object->name = $program->name;
+      $program_object->school = $program->school->name;
+      $program_object->id = $program->id;
+      $program_array['program'] = $program_object;
+      //Log::info($program_array);
 
       $program_array['outcomes_achieved'] = [];
       $program_array['outcomes_attempted'] = [];
+      //Log::info($program_array);
 
       $program_array['program_courses'] = $program->courses;
-      $program_array['grouped_objectives'] = $program->objectives();
+      //Log::info($program_array);
+      //Log::info('grouped_objectives, 1.variable, 2.array');
+
+      ////Log::info(array($program->objectives()));
+      // $program_array['grouped_objectives'] = $program->objectives();
+      //Log::info($program_array);
+      //Log::info("program_courses");
+      //Log::info($program_array['program_courses']);
+      //Log::info($program_array);
 
       $program_array['assessed_courses_count'] = 0;
       foreach ($program_array['program_courses'] as $course) {
-        if (!($program_array['course_outcomes_achieved'] = $course->outcomes_ach())) {
-//           $program_array['course_outcomes_achieved'] = $course->outcomes_ach();
+        //Log::info($program_array);
+
+        $program_array['course_outcomes_achieved'] = $course->outcomes_ach();
+
+        //Log::info("course_outcomes_achieved");
+        //Log::info($program_array['course_outcomes_achieved']);
+        //Log::info($program_array);
+        if (($program_array['course_outcomes_achieved'])) {
+          $program_array['course_outcomes_achieved'] = $course->outcomes_ach();
           $program_array['course_outcomes_attempted'] = $course->outcomes_att();
-          Log::info($program_array['course_outcomes_achieved']);
+          //Log::info('course_outcomes_achieved');
+          //Log::info($program_array['course_outcomes_achieved']);
+          //Log::info($program_array);
+
           foreach ($program_array['course_outcomes_achieved'] as $i => $score) {
             if (array_key_exists($i, $program_array['outcomes_achieved']))  $program_array['outcomes_achieved'][$i] += $program_array['course_outcomes_achieved'][$i];
             else $program_array['outcomes_achieved'][$i] = $program_array['course_outcomes_achieved'][$i];
+            //Log::info('program["outcomes_achieved"]');
+            //Log::info($program_array['outcomes_achieved'][$i]);
+            //Log::info($program_array);
+            Log::info("outcomes_achieved");
+            Log::info($program_array['outcomes_achieved']);
           }
           foreach ($program_array['course_outcomes_attempted'] as $i => $score) {
 
             if (array_key_exists($i, $program_array['outcomes_attempted']))  $program_array['outcomes_attempted'][$i] += $program_array['course_outcomes_attempted'][$i];
             else $program_array['outcomes_attempted'][$i] = $program_array['course_outcomes_attempted'][$i];
+            //Log::info('program["outcomes_achieved"]');
+            //Log::info($program_array['outcomes_attempted'][$i]);
+            //Log::info($program_array);
           }
 
           $program_array['assessed_courses_count'] += 1;
@@ -108,6 +141,7 @@ class ProgramCoordinatorsController extends \BaseController
         ->orderBy('number')
         ->orderBy('semester_id')
         ->get(); */
+      //Log::info($program_array);
       $program_array['grouped_courses'] = Course::select(DB::raw('name, code, number, semester_id, program_id'))
         ->with('semester')
         ->with('program')
@@ -118,10 +152,12 @@ class ProgramCoordinatorsController extends \BaseController
         ->orderBy('number')
         ->orderBy('semester_id')
         ->get();
-
+      //Log::info($program_array);
       $programs_array[] = $program_array;
 
 
+
+
       // Program contact information
       $users = User::select('users.*')
         ->leftJoin('program_user', 'users.id', '=', 'program_user.user_id')
@@ -146,6 +182,7 @@ class ProgramCoordinatorsController extends \BaseController
       $programs_contact[] = $users;
     }
 
+
     return View::make('local.managers.pCoords.overview', compact('title', 'programs', 'outcomes', 'programs_array', 'programs_contact'));
   }
 }

app/controllers/ProgramsController.php

@@ -388,43 +388,43 @@ class ProgramsController extends \BaseController
 
 
 
-    foreach ($programs as $program) {
-      $program_array = array();
 
-      $program_array['program'] = $program;
+    $program_array = array();
 
-      $program_array['outcomes_achieved'] = [];
-      $program_array['outcomes_attempted'] = [];
+    $program_array['program'] = $program;
 
-      $program_array['program_courses'] = $program->courses;
-      $program_array['grouped_objectives'] = $program->objectives();
+    $program_array['outcomes_achieved'] = [];
+    $program_array['outcomes_attempted'] = [];
 
-      $program_array['assessed_courses_count'] = 0;
-      foreach ($program_array['program_courses'] as $course) {
-        if (!$program_array['course_outcomes_achieved'] = $course->outcomes_ach()) {
-          //           $program_array['course_outcomes_achieved'] = $course->outcomes_ach();
-          $program_array['course_outcomes_attempted'] = $course->outcomes_att();
-          Log::info($program_array['course_outcomes_achieved']);
-          foreach ($program_array['course_outcomes_achieved'] as $i => $score) {
-            if (array_key_exists($i, $program_array['outcomes_achieved']))  $program_array['outcomes_achieved'][$i] += $program_array['course_outcomes_achieved'][$i];
-            else $program_array['outcomes_achieved'][$i] = $program_array['course_outcomes_achieved'][$i];
-          }
-          foreach ($program_array['course_outcomes_attempted'] as $i => $score) {
+    $program_array['program_courses'] = $program->courses;
+    // $program_array['grouped_objectives'] = $program->objectives();
 
-            if (array_key_exists($i, $program_array['outcomes_attempted']))  $program_array['outcomes_attempted'][$i] += $program_array['course_outcomes_attempted'][$i];
-            else $program_array['outcomes_attempted'][$i] = $program_array['course_outcomes_attempted'][$i];
-          }
+    $program_array['assessed_courses_count'] = 0;
+    foreach ($program_array['program_courses'] as $course) {
+      if (!$program_array['course_outcomes_achieved'] = $course->outcomes_ach()) {
+        //           $program_array['course_outcomes_achieved'] = $course->outcomes_ach();
+        $program_array['course_outcomes_attempted'] = $course->outcomes_att();
+        Log::info($program_array['course_outcomes_achieved']);
+        foreach ($program_array['course_outcomes_achieved'] as $i => $score) {
+          if (array_key_exists($i, $program_array['outcomes_achieved']))  $program_array['outcomes_achieved'][$i] += $program_array['course_outcomes_achieved'][$i];
+          else $program_array['outcomes_achieved'][$i] = $program_array['course_outcomes_achieved'][$i];
+        }
+        foreach ($program_array['course_outcomes_attempted'] as $i => $score) {
 
-          $program_array['assessed_courses_count'] += 1;
+          if (array_key_exists($i, $program_array['outcomes_attempted']))  $program_array['outcomes_attempted'][$i] += $program_array['course_outcomes_attempted'][$i];
+          else $program_array['outcomes_attempted'][$i] = $program_array['course_outcomes_attempted'][$i];
         }
+
+        $program_array['assessed_courses_count'] += 1;
       }
+    }
 
-      /**
-       * List of grouped courses (grouped sections)
-       */
+    /**
+     * List of grouped courses (grouped sections)
+     */
 
-      //old code
-      /* $program_array['grouped_courses'] = Course::select(DB::raw('name, code, number, max(outcomes_attempted) as outcomes_attempted, semester_id, program_id'))
+    //old code
+    /* $program_array['grouped_courses'] = Course::select(DB::raw('name, code, number, max(outcomes_attempted) as outcomes_attempted, semester_id, program_id'))
         ->with('semester')
         ->with('program')
         ->where('program_id', $program->id)
@@ -434,43 +434,43 @@ class ProgramsController extends \BaseController
         ->orderBy('number')
         ->orderBy('semester_id')
         ->get(); */
-      $program_array['grouped_courses'] = Course::select(DB::raw('name, code, number, semester_id, program_id'))
-        ->with('semester')
-        ->with('program')
-        ->where('program_id', $program->id)
-        ->whereIn('semester_id', Session::get('semesters_ids'))
-        ->groupBy(array('code', 'number', 'semester_id'))
-        ->orderBy('code')
-        ->orderBy('number')
-        ->orderBy('semester_id')
-        ->get();
+    $program_array['grouped_courses'] = Course::select(DB::raw('name, code, number, semester_id, program_id'))
+      ->with('semester')
+      ->with('program')
+      ->where('program_id', $program->id)
+      ->whereIn('semester_id', Session::get('semesters_ids'))
+      ->groupBy(array('code', 'number', 'semester_id'))
+      ->orderBy('code')
+      ->orderBy('number')
+      ->orderBy('semester_id')
+      ->get();
 
-      $programs_array[] = $program_array;
-
-
-      // Program contact information
-      $users = User::select('users.*')
-        ->leftJoin('program_user', 'users.id', '=', 'program_user.user_id')
-        ->where(function ($query) use ($program) {
-          $query
-            ->where('school_id', $program->school_id)
-            ->where('role', 2);
-        })
-        ->orWhere(function ($query) use ($program) {
-          $query
-            ->where('role', 3)
-            ->where('program_id', $program->id);
-        })
-        ->orWhere(function ($query) use ($program) {
-          $query
-            ->where('role', 4)
-            ->where('program_id', $program->id);
-        })
-        ->get();
+    $programs_array[] = $program_array;
 
 
-      $programs_contact[] = $users;
-    }
+    // Program contact information
+    $users = User::select('users.*')
+      ->leftJoin('program_user', 'users.id', '=', 'program_user.user_id')
+      ->where(function ($query) use ($program) {
+        $query
+          ->where('school_id', $program->school_id)
+          ->where('role', 2);
+      })
+      ->orWhere(function ($query) use ($program) {
+        $query
+          ->where('role', 3)
+          ->where('program_id', $program->id);
+      })
+      ->orWhere(function ($query) use ($program) {
+        $query
+          ->where('role', 4)
+          ->where('program_id', $program->id);
+      })
+      ->get();
+
+
+    $programs_contact[] = $users;
+
 
     return View::make('local.managers.shared.print_program', compact('title', 'program', 'outcomes', 'outcomes_attempted', 'outcomes_achieved', 'schools', 'program_courses', 'assessed_courses_count', 'grouped_courses'));
   }

app/models/Activity.php

@@ -237,6 +237,12 @@ class Activity extends Eloquent
 
 
 
+
+
+
+
+
+
       /*foreach ($students_attempted as $student) {
         $student_criteria[$student];
       }

app/models/Course.php

@@ -137,6 +137,9 @@ class Course extends Eloquent
       $students_attempted = Criterion::students_attempted($criterion->id, $criterion->activity_id);
       $students_achieved = Criterion::students_achieved($criterion->id, $criterion->activity_id);
 
+      Log::info('estamos aqui');
+      Log::info($students_attempted);
+
       if ($students_attempted) {
         $percentage_students_who_achieved = 100.0 * $students_achieved / $students_attempted;
       } else {
@@ -148,12 +151,19 @@ class Course extends Eloquent
           ->select('outcome_id')
           ->distinct()
           ->lists('outcome_id');
+
         foreach ($outcomes as $outcome_id) {
           if (array_key_exists($outcome_id, $outcomes_achieved)) $outcomes_achieved[$outcome_id] += 1;
           else $outcomes_achieved[$outcome_id] = 1;
         }
       }
     }
+    Log::info(
+      "OUTCOMES_ACHIEVED: "
+    );
+    Log::info(
+      $outcomes_achieved
+    );
     return $outcomes_achieved;
   }
 

app/models/Program.php

@@ -70,6 +70,7 @@ class Program extends Eloquent
 
 	public function objectives()
 	{
+		
 		return $this->hasMany('Objective');
 	}
 

app/routes.php

@@ -166,6 +166,15 @@ Route::group(array('before' => 'auth|has_access'), function () {
     /**
      * Shared Routes
      */
+
+    Route::get('annual_plan_report/{program_id}', array(
+        'as' => 'annual_plan_report/{program_id}',
+        'uses' => 'OutcomesController@annualReport'
+    ));
+    Route::post('fetchAnnualReport', array(
+        'as' => 'fetchAnnualReport',
+        'uses' => 'AnnualPlansController@fetchAnnualReport'
+    ));
     Route::post('postActivityCriterionTrans/{activity_id}', array(
         'as' => 'postActivityCriterionTrans/{activity_id}',
         'uses' => 'TransformativeActionsController@postActivityCriterion'
@@ -425,7 +434,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
         Route::get('print_course/{code}/{number}/{semester_code}', 'CoursesController@print_course');
 
         // Assessment reports
-        Route::get('program-assessment-report/{outcome_id}/{program_id}', 'OutcomesController@programAssessmentReport');
+        Route::get('program-assessment-report/{program_id}', 'OutcomesController@programAssessmentReport');
         Route::get('assessment-reports', 'OutcomesController@managerAssessmentReports');
 
         // Learning Objectives

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

@@ -45,10 +45,18 @@
       <li class="dropdown">
         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Reports<span class="caret"></span></a>
         <ul class="dropdown-menu" role="menu">
-          <li>{{ HTML::linkAction('OutcomesController@managerAssessmentReports', 'Program Reports') }}</li>
+          <li><a href="{{ URL::action('OutcomesController@programAssessmentReport', Auth::user()->programs[0]->id) }}">Program Reports</a></li>
+   
+            </li>
+          
           @if(count(Auth::user()->courses))
           <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReports', 'My Courses\' Reports') }}</li>
           @endif
+
+   
+            </li>
+            <li><a href="{{ URL::action('OutcomesController@annualReport', Auth::user()->programs[0]->id) }}">Annual Reports</a></li>
+  
           <li>{{ HTML::linkAction('TransformativeActionsController@viewFormativeActions', 'Tranformative and Formative Actions')}}
     
         </ul>

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

@@ -0,0 +1,69 @@
+@extends('layouts.master')
+
+@section('navigation')
+    @if(Auth::user()->role==1)
+        @include('local.managers.admins._navigation')
+    @elseif(Auth::user()->role==2)
+        @include('local.managers.sCoords._navigation')
+    @elseif(Auth::user()->role==3)
+        @include('local.managers.pCoords._navigation')
+    @endif
+@stop
+
+@section('main')
+    <div class="row">
+            <div class="category" >
+              <label for="annual_plans">Annual Plan</label>
+              <div class="select">
+                <select  class="selectpicker" name="annual_plan" id="annual_plans" onchange ="fetchAnnualReport(this)">
+                  
+                  @foreach ($annual_plans as $an_pl)
+                    <option value='{{json_encode($an_pl)}}'>Annual Plan {{$an_pl->academic_year}}</option>
+                  @endforeach
+                </select>
+              </div>
+            </div>
+
+    </div>
+
+<script>
+    function fetchAnnualReport(select){
+        object_json = $(select).val();
+        object_json = JSON.parse(object_json);
+        semester_start = object_json.semester_start;
+        semester_end = object_json.semester_end;
+        program_id = object_json.program_id;
+        annual_plan_id = object_json.annual_id;
+
+        $.post(
+        "{{ URL::action('AnnualPlansController@fetchAnnualReport') }}",
+        { 
+            semester_start: semester_start,
+            semester_end: semester_end,
+            program_id: program_id,
+            annual_plan_id: annual_plan_id,
+            academic_year:object_json.academic_year
+
+        
+        },
+        function(data)
+        {
+
+        }
+        );
+
+    }
+
+    fetchAnnualReport(document.getElementById('annual_plans'));
+</script>
+@section('included-js')
+@include('global._datatables_js')
+@stop
+    
+@stop
+
+@section('javascript')
+
+
+
+@stop

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

@@ -0,0 +1,309 @@
+@extends('layouts.master')
+
+@section('navigation')
+    @if(Auth::user()->role==1)
+        @include('local.managers.admins._navigation')
+    @elseif(Auth::user()->role==2)
+        @include('local.managers.sCoords._navigation')
+    @elseif(Auth::user()->role==3)
+        @include('local.managers.pCoords._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>
+            <ul>
+                @foreach (Session::get('semesters_info') as $semester_info)
+                    <li>{{ $semester_info }}</li>
+                @endforeach
+            </ul>
+
+            @if($program)
+
+                
+
+                        <ul id = 'levelTabs' class = "nav nav-tabs" role = "tablist">
+                                <!-- For each grouped course -->
+                                @foreach($program->courses as $index2=>$course)
+                                    <!-- If grouped course has activities that evaluate the outcome -->
+
+                                    <?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')
+                                ->where('course_id', $course->id)
+                                //->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('id', $activities);
+                        } ))
+                                
+
+                            ->where('code', $course->code)->where('number',$course->number)
+                            ->whereIn('semester_id', Session::get('semesters_ids'))
+                            ->get();
+                            
+                            
+                                    ?>
+                    @if($sections_evaluating)
+                                    <li role= "presentation">
+                                        <a onclick = "$(this).tab('show');" data-toggle = "tab" href ="#{{ $course->code}}-{{ $course->number }}"
+                                            role ="tab">{{ $course->code}}-{{ $course->number }}</a>
+                                        </li>
+                                        @section('lists')
+                                        <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> 
+                                            @foreach($section->publishedActivities as $index4 => $activity)
+
+                                            <h5 style="display: inline;">Activity {{$index4+1}}: </h4>
+                                            <p style="display: inline;">{{$activity->name}} <strong>({{$activity->date}})</strong></p>
+                                            <br>
+                                            <br>
+                                            <h5 style="display: inline;">Performance Indicators: </h4>
+                                                <?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: </h4>
+                                    @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>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>
+                                    </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>
+                                                    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)
+                                            
+        {{$index6 + 1}}.   <?php echo $outcome->name."\n\n\n <br>" ?>
+        
+       
+
+       @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>
+</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;
+
+
+?>
+{{$expected}}
+</i>
+</p>
+<br>
+<table class='table table-striped table-condensed datatable'>
+<thead>
+   <tr>
+       <th>
+           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
+@stop
+
+@else
+    <h4>There is no assessment for this course.</h4>
+
+@endif
+
+            @endforeach
+            <ul>
+
+        <div id="allLists" class="tab-content">
+        @yield('lists')
+        </div>
+@else
+<h4>This program has not assessed any activity</h4>
+@endif
+
+        </div>
+    </div>
+
+
+@section('included-js')
+@include('global._datatables_js')
+@stop
+    
+@stop
+
+@section('javascript')
+
+
+
+@stop

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

@@ -184,7 +184,7 @@
                                                         <td>All</td>
                                                     @elseif($user->role == 2)
                                                         <td>School Coordinator</td>
-                                                        <td>All in {{ $program_item['program']->school->name }}</td>
+                                                        <td>All in {{ $program_item['program']->school }}</td>
                                                     @elseif($user->role == 3)
                                                         <td>Program Coordinator</td>
                                                         <td>
@@ -331,7 +331,12 @@
                         //fontWeight: 'bold'
                     },
                     y:-1
-                },
+                }, 
+                <?php
+                Log::info('program_item');
+                Log::info($program_item);
+
+                ?>
                 data: [
                     @foreach($outcomes as $index => $outcome)
                         @if(

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

@@ -7,8 +7,7 @@
         @include('local.managers.sCoords._navigation')
     @elseif(Auth::user()->role==3)
         @include('local.managers.pCoords._navigation')
-    @else
-    @include('local.professors._navigation')
+
     @endif
 @stop
 
@@ -22,11 +21,6 @@
                 @endforeach
             </ul>
 
-          
-
-                
-                
-                       
                                 <!-- For each grouped course -->
                                 <ul id = "levelTabs" class="nav nav-tabs" role="tablist">
                                         
@@ -73,7 +67,7 @@
                             ?>
                             @if($sections_evaluating)
                                    <li role= "presentation">
-                                        <a onclick = "$(this).tab('show')" data-toggle = "tab" href ="#{{ $course->code}}-{{ $course->number }}"
+                                        <a onclick = "$(this).tab('show');" data-toggle = "tab" href ="#{{ $course->code}}-{{ $course->number }}"
                                             role ="tab">{{ $course->code}}-{{ $course->number }}</a>
                                         </li>
 
@@ -200,8 +194,8 @@
                                             
                                             @foreach(Criterion::outcomes($ac_criterion->criterion_id) as $index6=>$outcome)
                                             
-                                             {{$index6 + 1}}.   {{$outcome->name}}
-                                             <br>
+                                             {{$index6 + 1}}.   <?php echo $outcome->name."\n\n\n <br>" ?>
+                                             
                                             
 
                                             @endforeach
@@ -222,7 +216,17 @@
                                 </p>
                                 <br>
                                 <h5 style = "display: inline; margin:30px;">Expected percent of students achieving the target by outcome: </h5>
-                                <p  style = "display: inline;"> <i>TODO 75.00 %</i>
+                                <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;
+
+        
+                                    ?>
+                                    {{$expected}}
+                                </i>
                                 </p>
                                 <br>
                                 <table class='table table-striped table-condensed datatable'>
@@ -255,7 +259,7 @@
                                             <td>
                                                 {{$outcome->achieved}}
                                             </td>
-                                            @if($outcome->percentage>= 75)
+                                            @if($outcome->percentage>= $expected)
                                                 <td class="col-md-1 success">{{ $outcome->percentage }}%</td>
                                                                  
                                                 @else
@@ -302,6 +306,12 @@
                                         
         </div>
     </div>
+
+ 
+@section('included-js')
+    @include('global._datatables_js')
+@stop
+        
 @stop
 
 @section('javascript')

bootstrap/start.php

@@ -23,14 +23,14 @@ $app = new Illuminate\Foundation\Application;
 | given environment, then we will automatically detect it for you.
 |
 */
-/*
+
 $env = $app->detectEnvironment(array(
 
-	'local' => array(gethostname(), 'RPV20111.rrp.campus', 'homestead'),
+    'local' => array(gethostname(), 'RPV20111.rrp.campus', 'homestead'),
     'production' => array('*.com', '*.edu', '*.org'),
 
 ));
-*/
+/*
 
 $env = $app->detectEnvironment(array(
 
@@ -38,7 +38,7 @@ $env = $app->detectEnvironment(array(
     'production' => array('*.com', '*.edu', '*.org'),
 
 ));
-
+*/
 /*
 |--------------------------------------------------------------------------
 | Bind Paths
@@ -50,7 +50,7 @@ $env = $app->detectEnvironment(array(
 |
 */
 
-$app->bindInstallPaths(require __DIR__.'/paths.php');
+$app->bindInstallPaths(require __DIR__ . '/paths.php');
 
 /*
 |--------------------------------------------------------------------------
@@ -63,10 +63,10 @@ $app->bindInstallPaths(require __DIR__.'/paths.php');
 |
 */
 
-$framework = $app['path.base'].
-                 '/vendor/laravel/framework/src';
+$framework = $app['path.base'] .
+    '/vendor/laravel/framework/src';
 
-require $framework.'/Illuminate/Foundation/start.php';
+require $framework . '/Illuminate/Foundation/start.php';
 
 /*
 |--------------------------------------------------------------------------