EStamos

Activos

app/controllers/ActivitiesController.php

@@ -907,4 +907,74 @@ class ActivitiesController extends \BaseController
 
         return View::make('local.professors.print_assessment', compact('activity', 'title', 'students', 'course', 'rubric_contents', 'assessments', 'scores_array', 'rubric'));
     }
-}
+
+    public function compareActivities($activity_1, $activity_2)
+    {
+        $activity_1 = Activity::find($activity_1);
+        $activity_2 = Activity::find($activity_2);
+
+
+        // If activity does not exist, display 404
+        if (!$activity_1 || !$activity_2)
+            App::abort('404');
+
+        // Get activity's course
+        $course = Course::where('id', '=', $activity_1->course_id)->firstOrFail();
+
+        // If activity does not belong to the requesting user, display 403
+        if ($course->user_id != Auth::id() and Auth::user()->role == 4)
+            App::abort('403', 'Access Forbidden');
+
+        // Get active semesters
+        $active_semesters = array();
+        $active_semesters_collection = Semester::select('id')->where('is_visible', 1)->where('start', '<=', date('Y-m-d H:i:s'))->where('end', '>=', date('Y-m-d H:i:s'))->get();
+        foreach ($active_semesters_collection as $active_semester) {
+            $active_semesters[] = $active_semester->id;
+        }
+
+        Log::info($active_semesters);
+        // Added the function htmlspecialchars to activity name string because it was corrupting Jquery code while using quotes on page rendering. - Carlos R Caraballo 1/18/2019
+        $title = $course->code . $course->number . '-' . $course->section . ': ' . htmlspecialchars($activity_1->name, ENT_QUOTES) . ' <span class="small attention">(' . $course->semester->code . ')</span>';
+        $outcomes = Outcome::orderBy('name', 'asc')->get();
+        $assessment_1 = DB::table('assessments')
+            ->join('activity_criterion', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
+            ->join('activities', 'activities.id', '=', 'activity_criterion.activity_id')
+            ->where('activity_id', $activity_1->id)
+            ->get();
+
+        if ($assessment_1) {
+            $outcomes_achieved_1 = $activity_1->o_ach_array;
+            $outcomes_attempted_1 = $activity_1->o_att_array;
+        } else {
+            $outcomes_achieved_1 = [];
+            $outcomes_attempted_1 = [];
+        }
+
+        $assessment_2 = DB::table('assessments')
+            ->join('activity_criterion', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
+            ->join('activities', 'activities.id', '=', 'activity_criterion.activity_id')
+            ->where('activity_id', $activity_2->id)
+            ->get();
+
+        if ($assessment_2) {
+            $outcomes_achieved_2 = $activity_2->o_ach_array;
+            $outcomes_attempted_2 = $activity_2->o_att_array;
+        } else {
+            $outcomes_achieved_2 = [];
+            $outcomes_attempted_2 = [];
+        }
+
+
+
+        $activity_criterion_2 = DB::table('criteria')
+            ->join('activity_criterion', 'criteria.id', '=', 'activity_criterion.criterion_id')
+            ->where('activity_id', $activity_2->id)
+            ->select('activity_criterion.id', 'activity_criterion.criterion_id')
+            ->addSelect('criteria.name')
+            ->get();
+
+
+
+        return View::make('local.professors.compare_activities', compact('activity_1', 'activity_2', 'activity_criterion_1', 'activity_criterion_2', 'title', 'outcomes', 'outcomes_achieved_1', 'outcomes_attempted_1', 'outcomes_achieved_2', 'outcomes_attempted_2', 'course', 'student_count', 'active_semesters'));
+    }
+}

app/controllers/OutcomesController.php

@@ -773,31 +773,42 @@ class OutcomesController extends \BaseController
     /**
      * Campus Assessment Reports
      */
-    public function assessmentReport($outcome_id)
+    public function assessmentReport()
     {
-        $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 = "Campus Assessment Report "; //. $outcome->name;
 
 
         $schools = School::has('courses')
-            ->with(array('programs' => function ($query) use ($outcome_id) {
+            ->with(array('programs' => function ($query) /*use ($outcome_id)*/ {
                 $query
                     ->has('courses')
-                    ->with(array('courses' => function ($query2) use ($outcome_id) {
+                    ->with(array('courses' => function ($query2) /*use ($outcome_id)*/ {
                         $query2
-                            ->has('activities')
+                            /*->has('activities')
                             //                             ->whereNotNull('outcomes_attempted')
                             // ->where('outcomes_attempted', 'NOT LIKE', '%"'.$outcome_id.'":0%')
                             ->whereIn('semester_id', Session::get('semesters_ids'))
+                            ->groupBy(array('code', 'number'));*/
+                            ->has('activities')
+                            ->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)
+                            ->where('activities.diagnostic', 0)
+                            ->select('courses.*')->distinct()
+                            //->whereNotNull('outcomes_attempted')
+
+                            ->whereIn('semester_id', Session::get('semesters_ids'))
                             ->groupBy(array('code', 'number'));
                     }));
             }))
             ->get();
 
-        return View::make('local.managers.admins.assessment_report', compact('title', 'outcome', 'schools'));
+        return View::make('local.managers.admins.new_assessment_report', compact('title', 'schools'));
     }
 
     public function totalAssessmentReport()
@@ -910,9 +921,10 @@ class OutcomesController extends \BaseController
     /**
      * School Assessment Reports
      */
-    public function schoolAssessmentReport($outcome_id)
+    public function schoolAssessmentReport()
     {
-        $outcome = Outcome::find($outcome_id);
+
+        //$outcome = Outcome::find($outcome_id);
 
         //if (!$outcome)
         //    App::abort('404');
@@ -941,7 +953,7 @@ class OutcomesController extends \BaseController
             }))
             ->first();
 
-        return View::make('local.managers.sCoords.assessment_report', compact('title', 'school', 'outcome'));
+        return View::make('local.managers.sCoords.new_assessment_report', compact('title', 'school'));
     }
 
     /**
@@ -1076,4 +1088,4 @@ class OutcomesController extends \BaseController
 
         return View::make('local.managers.shared.annual_report', compact('title', 'program_id', 'annual_plans', 'program'));
     }
-}
+}

app/routes.php

@@ -341,7 +341,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
         Route::post('administrator/semesters/update', 'SemestersController@update');
         Route::post('deleteObjective', 'Objective2Controller@delete');
 
-        Route::get('assessment-report/{outcome_id}', 'OutcomesController@assessmentReport');
+        Route::get('assessment-report', 'OutcomesController@assessmentReport');
         // TODO: Change later
         Route::get('new-assessment-report/{outcome_id}', 'OutcomesController@newAssessmentReport');
 
@@ -376,7 +376,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
 
         // Assessment reports
 
-        Route::get('school-assessment-report/{outcome_id}', 'OutcomesController@schoolAssessmentReport');
+        Route::get('school-assessment-report', 'OutcomesController@schoolAssessmentReport');
 
         // Gabriel added this, so the school coordinator can add criterias and objectives
         Route::post('createCriterion', array('before' => 'csrf', 'uses' => 'CriteriaController@create'));
@@ -558,10 +558,11 @@ Route::group(array('before' => 'auth|has_access'), function () {
         Route::get('learning-objectives-criteria', 'CriteriaController@objectivesIndex');
         Route::get('export_grades/{id}', 'CoursesController@exportGrades');
         Route::get('learning-objectives-criteria', 'CriteriaController@objectivesIndex');
+        Route::get('compare_activities/{activity_1}/{activity_2}', 'ActivitiesController@compareActivities');
         // Assessment reports
         //Route::get('professor-assessment-report/{outcome_id}', 'OutcomesController@professorAssessmentReport');
         Route::get('professor-assessment-reports', 'OutcomesController@professorAssessmentReport');
 
         Route::get('general-studies-overview', 'ProfessorsController@generalStudiesOverview');
     });
-});
+});

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

@@ -1,88 +1,100 @@
 <div class="navbar navbar-inverse navbar-static-top">
-  <div class="container-fluid">
+    <div class="container-fluid">
 
-    <ul class="nav navbar-nav navbar-right">
-      <li>{{ HTML::linkAction('AdministratorsController@overview', 'Overview') }}</li>
-      <li>{{ HTML::linkAction('AdministratorsController@overview2', 'Overview2') }}</li>
+        <ul class="nav navbar-nav navbar-right">
+            <li>{{ HTML::linkAction('AdministratorsController@overview', 'Overview') }}</li>
+            <li>{{ HTML::linkAction('AdministratorsController@overview2', 'Overview2') }}</li>
 
-      <li class="dropdown">
-        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Management<span class="caret"></span></a>
-        <ul class="dropdown-menu" role="menu">
-          <li>{{ HTML::linkAction('CoursesController@reassign', 'Courses') }}</li>
-          <li>{{ HTML::linkAction('Objective2Controller@edit', 'Objectives')}}</li>
-          <li>{{ HTML::linkAction('CriteriaController@edit', 'Criteria') }}</li>
-          <li>{{ HTML::linkAction('OutcomesController@index', 'Learning Outcomes') }}</li>
-          <li>{{ HTML::linkAction('TemplatesController@newTemplate', 'Rubric Builder') }}</li>
-          <li>{{ HTML::linkAction('TemplatesController@index', 'Rubric List') }}</li>
-          <li>{{ HTML::linkAction('SemestersController@edit', 'Semesters') }}</li>
-          <li>{{ HTML::linkAction('UsersController@index', 'Users') }}</li>
-        </ul>
-      </li>
-      <li class="dropdown">
-        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Learning and Criterias<span class="caret"></span></a>
-        <ul class="dropdown-menu" role="menu">
-          <li>{{ HTML::linkAction('CriteriaController@index', 'Outcomes and Criteria') }}</li>
-          <li>{{ HTML::linkAction('CriteriaController@objectivesIndex', 'Objectives and Criteria') }}</li>
-        </ul>
-      </li>
-      <li class="dropdown">
-        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Colleges and Schools<span class="caret"></span></a>
-        <ul class="dropdown-menu" role="menu">
-          @foreach ($schools as $school)
-          <li>{{ HTML::linkAction('SchoolsController@show', $school->name, array($school->id)) }}</li>
-          @endforeach
-        </ul>
-      </li>
-      <li>{{ HTML::linkAction('ProgramsController@index', 'Programs') }}</li>
+            <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"
+                    aria-expanded="false">Management<span class="caret"></span></a>
+                <ul class="dropdown-menu" role="menu">
+                    <li>{{ HTML::linkAction('CoursesController@reassign', 'Courses') }}</li>
+                    <li>{{ HTML::linkAction('Objective2Controller@edit', 'Objectives') }}</li>
+                    <li>{{ HTML::linkAction('CriteriaController@edit', 'Criteria') }}</li>
+                    <li>{{ HTML::linkAction('OutcomesController@index', 'Learning Outcomes') }}</li>
+                    <li>{{ HTML::linkAction('TemplatesController@newTemplate', 'Rubric Builder') }}</li>
+                    <li>{{ HTML::linkAction('TemplatesController@index', 'Rubric List') }}</li>
+                    <li>{{ HTML::linkAction('SemestersController@edit', 'Semesters') }}</li>
+                    <li>{{ HTML::linkAction('UsersController@index', 'Users') }}</li>
+                </ul>
+            </li>
+            <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Learning
+                    and Criterias<span class="caret"></span></a>
+                <ul class="dropdown-menu" role="menu">
+                    <li>{{ HTML::linkAction('CriteriaController@index', 'Outcomes and Criteria') }}</li>
+                    <li>{{ HTML::linkAction('CriteriaController@objectivesIndex', 'Objectives and Criteria') }}</li>
+                </ul>
+            </li>
+            <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Colleges
+                    and Schools<span class="caret"></span></a>
+                <ul class="dropdown-menu" role="menu">
+                    @foreach ($schools as $school)
+                        <li>{{ HTML::linkAction('SchoolsController@show', $school->name, [$school->id]) }}</li>
+                    @endforeach
+                </ul>
+            </li>
+            <li>{{ HTML::linkAction('ProgramsController@index', 'Programs') }}</li>
 
-      @if(count(Auth::user()->courses))
-      <li> {{ HTML::linkAction('ProfessorsController@overview', 'My Courses', NULL) }}</li>
-      <li class="dropdown">
-        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Sections<span class="caret"></span></a>
-        <ul class="dropdown-menu" role="menu">
-          @foreach ($courses as $course)
-          <li> {{ HTML::linkAction('CoursesController@show', $course->code.$course->number.'-'.$course->section.' ('.$course->semester->code.')', array('id'=>$course->id)) }}</li>
-          @endforeach
-        </ul>
-      </li>
+            @if (count(Auth::user()->courses))
+                <li> {{ HTML::linkAction('ProfessorsController@overview', 'My Courses', null) }}</li>
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"
+                        aria-expanded="false">Sections<span class="caret"></span></a>
+                    <ul class="dropdown-menu" role="menu">
+                        @foreach ($courses as $course)
+                            <li> {{ HTML::linkAction('CoursesController@show', $course->code . $course->number . '-' . $course->section . ' (' . $course->semester->code . ')', ['id' => $course->id]) }}
+                            </li>
+                        @endforeach
+                    </ul>
+                </li>
 
-      @endif
+            @endif
 
-      <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', 'Campus Reports') }}</li>
-          <li>{{ HTML::linkAction('OutcomesController@totalAssessmentReport', 'Total Assessment Reports') }}</li>
-         @if(count(Auth::user()->courses))
-          <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReports', 'My Courses\' Reports') }}</li>
+            <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@assessmentReport', 'Campus Reports') }}</li>
+                    <li>{{ HTML::linkAction('OutcomesController@totalAssessmentReport', 'Total Assessment Reports') }}
+                    </li>
+                    @if (count(Auth::user()->courses))
+                        <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReports', 'My Courses\' Reports') }}
+                        </li>
 
-          @endif
-        </ul>
-      </li>
+                    @endif
+                </ul>
+            </li>
 
-      <li class="dropdown">
-        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Help<span class="caret"></span></a>
-        <ul class="dropdown-menu" role="menu">
-          <li>{{ HTML::linkAction('FeedbackController@create', 'Feedback') }}</li>
-          <!-- <li><a href="{{ asset('files/OLAS-intro.pdf') }}">Introduction to OLAS</a></li> -->
-          <li><a href="{{ asset('files/intro-avaluo.pdf') }}">Introduction to Assessment</a></li>
-          <!-- <li><a href="{{ asset('files/OLAS-coords.pdf') }}">OLAS for Coordinators</a></li> -->
-          <li><a href="http://oeae.uprrp.edu/wp-content/uploads/2019/01/Brochure-de-OLAS-rev.-agosto-2018.pdf">Brochure</a></li>
-        </ul>
-      </li>
-      <li class="dropdown">
-        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Account<span class="caret"></span></a>
-         <ul class="dropdown-menu" role="menu">
-          <li>{{ HTML::linkAction('UsersController@edit', 'Profile') }}</li>
-          <li>{{ HTML::linkAction('AuthController@logout', 'Log out ('.Auth::user()->email.')') }}</li>
-        </ul>
-      </li>
-<!-- 
-          <li>{{ HTML::linkAction('AuthController@logout', 'Log out ('.Auth::user()->email.')') }}
+            <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Help<span
+                        class="caret"></span></a>
+                <ul class="dropdown-menu" role="menu">
+                    <li>{{ HTML::linkAction('FeedbackController@create', 'Feedback') }}</li>
+                    <!-- <li><a href="{{ asset('files/OLAS-intro.pdf') }}">Introduction to OLAS</a></li> -->
+                    <li><a href="{{ asset('files/intro-avaluo.pdf') }}">Introduction to Assessment</a></li>
+                    <!-- <li><a href="{{ asset('files/OLAS-coords.pdf') }}">OLAS for Coordinators</a></li> -->
+                    <li><a
+                            href="http://oeae.uprrp.edu/wp-content/uploads/2019/01/Brochure-de-OLAS-rev.-agosto-2018.pdf">Brochure</a>
+                    </li>
+                </ul>
+            </li>
+            <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"
+                    aria-expanded="false">Account<span class="caret"></span></a>
+                <ul class="dropdown-menu" role="menu">
+                    <li>{{ HTML::linkAction('UsersController@edit', 'Profile') }}</li>
+                    <li>{{ HTML::linkAction('AuthController@logout', 'Log out (' . Auth::user()->email . ')') }}</li>
+                </ul>
+            </li>
+            <!-- 
+          <li>{{ HTML::linkAction('AuthController@logout', 'Log out (' . Auth::user()->email . ')') }}
       </li>
  -->
-    </ul>
-    </li>
-    </ul>
-  </div>
+        </ul>
+        </li>
+        </ul>
+    </div>
 </div>

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

@@ -0,0 +1,390 @@
+@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>
+            @foreach ($schools as $school)
+                <h3>{{ $school->name }}</h3>
+                <hr>
+                @if (!$school->programs->isEmpty())
+                    <h3>Table of Contents</h3>
+                    <ol id="table-of-contents" class="upper-roman">
+
+                    </ol>
+                    @foreach ($school->programs as $program)
+
+
+                        {{-- <ul id='levelTabs' class="nav nav-tabs" role="tablist">
+                        <!-- For each grouped course -->
+                        @foreach ($program->courses as $index2 => $course)
+
+                            <li role="presentation">
+                                <a data-toggle="tab" href="#{{ $course->code }}-{{ $course->number }}"
+                                    role="tab">{{ $course->code }}-{{ $course->number }}</a>
+                            </li>
+                        @endforeach
+                    </ul>
+                    <d id="allLists" class="tab-content"> --}}
+
+                        <div class="panel panel-default">
+                            <div class="panel-heading">
+                                <h3 class="panel-title">{{ $program->name }}</h3>
+                            </div>
+                            <div class="panel-body">
+
+
+
+
+                                <!-- If grouped course has activities that evaluate the outcome -->
+                                @foreach ($program->courses as $index2 => $course)
+
+                                    <?php
+                                    
+                                    /*$sections_evaluating = Course::has('activities')
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            ->whereNotNull('outcomes_attempted')
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            ->with(array('activities'=>function($query) use(&$outcome){
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                $query->whereNotNull('outcomes_attempted');
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            ->where('code', $course->code)->where('number',$course->number)
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            ->whereIn('semester_id', Session::get('semesters_ids'))
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            ->get();*/
+                                    
+                                    $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('id', $activities);
+                                            },
+                                        ])
+                                    
+                                        ->where('code', $course->code)
+                                        ->where('number', $course->number)
+                                        ->whereIn('semester_id', Session::get('semesters_ids'))
+                                        ->orderBy('semester_id')
+                                        ->get();
+                                    
+                                    ?>
+
+
+
+                                    @foreach ($sections_evaluating as $index3 => $section)
+                                        @if (!$section->publishedActivities->isEmpty())
+                                            <h3 style="text-align: center"> Course: {{ $course->code }}
+                                                {{ $course->number }}-{{ $section->section }} </h3>
+                                        @endif
+                                        @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 }},
+                                                            @else
+                                                                and {{ $rubric_title->text }}
+                                                            @endif
+
+                                                        @endforeach
+                                                        )
+                                                    @else
+                                                        {{ $titles[0]->text }} )
+                                                    @endif
+                                                </i></p>
+                                            <br>
+                                            <h5 style="display: inline;">Scale: </h5>
+                                            @if ($activity->rubric[0]->max_score == 1)
+                                                <p style="display: inline;">1 point scale</p>
+                                            @else
+                                                <p style="display: inline;">1-{{ $activity->rubric[0]->max_score }} point
+                                                    scale
+                                                </p>
+
+                                            @endif
+                                            <br>
+                                            <br>
+                                            <h4>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
+
+
+                                @endforeach
+                            </div>
+                        </div>
+                    @endforeach
+
+
+
+                @else
+                    <h4>This program has not assessed any activity</h4>
+                @endif
+
+            @endforeach
+
+        </div>
+    </div>
+    <script>
+        var outcome = $('.outcome');
+
+        var str = '';
+        str += '<li><a href="#' + 1 + '">' + "outcome.text()" + '</a><ol class="schools upper-alpha">';
+
+        $('[id^=' + outcome.attr('id') + '-].school:visible').each(function(e) {
+            var school = $(this);
+            str += '<li><a href="#' + school.attr('id') + '">' + school.text() + '</a><ol class="programs">';
+
+            $('[id^=' + school.attr('id') + '-].program:visible').each(function(e) {
+
+                var program = $(this);
+                if (!program.hasClass('no-courses'))
+                    str += '<li><a href="#' + program.attr('id') + '">' + program.text() + '</a></li>';
+                else
+                    str += '<li>' + program.text() + '</li>';
+
+            });
+
+            str += '</ol></li>';
+        });
+        // Hide accordion panel contents by default
+        $('.panel-body').hide();
+
+        // --------------------------------------------------------------------------
+        // Functions
+        // --------------------------------------------------------------------------
+
+
+        // --------------------------------------------------------------------------
+        // Events
+        // --------------------------------------------------------------------------
+
+        // When panel heading is clicked, toggle it
+        $('.panel-heading').on('click', function() {
+            $(this).next().stop().slideToggle();
+        })
+    </script>
+
+@section('included-js')
+    @include('global._datatables_js')
+@stop
+
+@stop
+
+@section('javascript')
+
+
+
+// Build table of contents
+
+@stop

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

@@ -1,11 +1,11 @@
 @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')
     @endif
 @stop
@@ -13,127 +13,131 @@
 @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>
 
-            @if($program)
+            @if ($program)
 
-                
 
-                        <ul id = 'levelTabs' class = "nav nav-tabs" role = "tablist">
-                                <!-- For each grouped course -->
-                                @foreach($program->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">
+                <ul id='levelTabs' class="nav nav-tabs" role="tablist">
+                    <!-- For each grouped course -->
+                    @foreach ($program->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">
 
-                                    <!-- If grouped course has activities that evaluate the outcome -->
-                                    @foreach($program->courses as $index2=>$course)
-
-                                    <?php
-
-                                        /*$sections_evaluating = Course::has('activities')
-                                        ->whereNotNull('outcomes_attempted')
-                                        ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
-                                        ->with(array('activities'=>function($query) use(&$outcome){
-                                            $query->whereNotNull('outcomes_attempted');
-                                            $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
-                                        ->where('code', $course->code)->where('number',$course->number)
-                                        ->whereIn('semester_id', Session::get('semesters_ids'))
-                                        ->get();*/
 
+                    <!-- If grouped course has activities that evaluate the outcome -->
+                    @foreach ($program->courses as $index2 => $course)
 
-                                        $sections_evaluating = Course::has('activities')
-                            
+                        <?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('id', $activities);
-                        } ))
-                                
-
-                            ->where('code', $course->code)->where('number',$course->number)
+                            ->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('id', $activities);
+                                },
+                            ])
+                        
+                            ->where('code', $course->code)
+                            ->where('number', $course->number)
                             ->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>
+                                @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]);
                                     ?>
-                    
-                                  
-                                        <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}}: </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}} (
+                                    <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}},
+                                            $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)
-                                    <p style="display: inline;">1 point scale</p>
+                                    @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>
-                                    <h5 style = "display: inline; margin:30px;">Target by criterion: </h5>
-                                    <p  style = "display: inline;"> <i>{{$activity->rubric[0]->expected_points}} or more</i>
+                                    <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>
                                     <table class='table table-striped table-condensed datatable'>
@@ -157,154 +161,154 @@
                                             </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)
+                                            @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;
                                             
-        {{$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
-                                        </div>
-
-            @endforeach
-
-
-
-@else
-<h4>This program has not assessed any activity</h4>
-@endif
+                                            ?>
+                                            {{ $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
+                        </div>
+
+                    @endforeach
+
+
+
+                @else
+                    <h4>This program has not assessed any activity</h4>
+            @endif
 
         </div>
     </div>
 
 
 @section('included-js')
-@include('global._datatables_js')
+    @include('global._datatables_js')
 @stop
-    
+
 @stop
 
 @section('javascript')

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

@@ -40,7 +40,7 @@
       <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', 'School Reports') }}</li>
+          <li>{{ HTML::linkAction('OutcomesController@schoolAssessmentReport', 'School Reports') }}</li>
           @if(count(Auth::user()->courses))
           <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReport', 'My Courses\' Reports') }}</li>
           

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

@@ -1,11 +1,11 @@
 @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')
     @endif
 @stop
@@ -13,27 +13,28 @@
 @section('main')
     <div class="row">
         <div class="col-md-12">
-            <p>This report contains performance information for all your School's Programs with assessed courses during the following semester(s):</p>
+            <p>This report contains performance information for all your School's Programs with assessed courses during the
+                following semester(s):</p>
             <ul>
                 @foreach (Session::get('semesters_info') as $semester_info)
                     <li>{{ $semester_info }}</li>
                 @endforeach
             </ul>
 
-            @if(!$school->programs->isEmpty())
+            @if (!$school->programs->isEmpty())
                 <p class="hidden-print">Unlinked programs did not assess this outcome.</p>
 
                 <h3>Table of Contents</h3>
                 <ol id="table-of-contents" class="upper-roman">
 
                 </ol>
-                
+
                 <h3 id="{{ $outcome->id }}" class="outcome">{{ $outcome->name }}</h3>
                 <table class="table table-condensed table-bordered">
                     <thead>
                         <tr>
                             <th colspan="12">
-                                <h4 id="{{ $outcome->id }}-{{ $school->id }}" class="school table-header" >
+                                <h4 id="{{ $outcome->id }}-{{ $school->id }}" class="school table-header">
                                     {{ $school->name }}
                                 </h4>
                             </th>
@@ -44,119 +45,160 @@
                         </tr>
                     </thead>
                     <tbody>
-                    @foreach ($school->programs as $program)
-                        @if($program->assessesOutcome($outcome->id))
-                            <tr>
-                                <td id="{{ $outcome->id }}-{{ $school->id }}-{{ $program->id }}" class="program col-md-3" ><h5>{{ $program->name }}</h5></td>
-                                <td class="col-md-9">
-
-                                <!-- 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();
-                                    ?>
-
-                                    @if(count($sections_evaluating))
-                                        <a class="to-top hidden-print" href="">
-                                            <span class="glyphicon glyphicon-arrow-up"></span>
-                                            To Top
-                                        </a>
-                                        <h4>{{ $course->code}}-{{ $course->number }}</h4>
-
-                                        <!-- For each section -->
-                                        @foreach($sections_evaluating as $index3 => $section)
-                                            <h5><u>Instance {{ $index3 + 1}}</u></h5>
-
-                                            <!-- For each activity in the section -->
-                                            @foreach($section->activities as $index4 => $activity)
-
-                                                <!-- If activity has a rubric and the rubric has the outcome being evaluated -->
-                                                @if(array_key_exists($outcome->id, (array)$activity->o_att_array) && $activity->o_att_array[$outcome->id] >=1)
-                                                    <h5>Measure {{ $index4 + 1 }}</h5>
-                                                    <p>A rubric was used in the {{ $section->code }}-{{ $section->number }} ({{ $section->name }}) course ({{ date('M Y', strtotime($course->updated_at))}}) to assess students’ <u>{{ strtolower($outcome->name) }}</u> in the activity: "<strong>{{ $activity->name }}</strong>". N= {{ count($section->students) }}. </p>
-                                                    <p>The expected performance level was that <strong>{{ $activity->rubric->expected_percentage }}%</strong> of students participating in the activity would score <strong>{{ $activity->rubric->expected_points }} points</strong> or more in the 1-8 point scale used.</p>
-                                                    <p>The results for each criterion were as follows:</p>
-
-                                                    <table class="table table-condensed table-bordered">
-                                                        @foreach((array)$activity->cap_array as $index5 => $cap)
-                                                            <?php
-                                                                $criterion = Criterion::find($index5);
-                                                            ?>
-
-                                                            @if($criterion['outcome_id'] == $outcome->id && $cap >= $activity->rubric->expected_percentage )
-                                                                <tr>
-                                                                    <td>{{ $criterion['name'] }}</td>
-                                                                    <td class="col-md-1 success">{{ $cap }}%</td>
-                                                                </tr>
-                                                            @elseif($criterion['outcome_id'] == $outcome->id && $cap < $activity->rubric->expected_percentage )
-                                                                <tr>
-                                                                    <td>{{ $criterion['name'] }}</td>
-                                                                    <td class="col-md-1 danger">{{ $cap }}%</td>
-                                                                </tr>
+                        @foreach ($school->programs as $program)
+                            @if ($program->assessesOutcome($outcome->id))
+                                <tr>
+                                    <td id="{{ $outcome->id }}-{{ $school->id }}-{{ $program->id }}"
+                                        class="program col-md-3">
+                                        <h5>{{ $program->name }}</h5>
+                                    </td>
+                                    <td class="col-md-9">
+
+                                        <!-- 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([
+                                                    '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();
+                                            ?>
+
+                                            @if (count($sections_evaluating))
+                                                <a class="to-top hidden-print" href="">
+                                                    <span class="glyphicon glyphicon-arrow-up"></span>
+                                                    To Top
+                                                </a>
+                                                <h4>{{ $course->code }}-{{ $course->number }}</h4>
+
+                                                <!-- For each section -->
+                                                @foreach ($sections_evaluating as $index3 => $section)
+                                                    <h5><u>Instance {{ $index3 + 1 }}</u></h5>
+
+                                                    <!-- For each activity in the section -->
+                                                    @foreach ($section->activities as $index4 => $activity)
+
+                                                        <!-- If activity has a rubric and the rubric has the outcome being evaluated -->
+                                                        @if (array_key_exists($outcome->id, (array) $activity->o_att_array) && $activity->o_att_array[$outcome->id] >= 1)
+                                                            <h5>Measure {{ $index4 + 1 }}</h5>
+                                                            <p>A rubric was used in the
+                                                                {{ $section->code }}-{{ $section->number }}
+                                                                ({{ $section->name }}) course
+                                                                ({{ date('M Y', strtotime($course->updated_at)) }}) to
+                                                                assess students’ <u>{{ strtolower($outcome->name) }}</u>
+                                                                in the activity:
+                                                                "<strong>{{ $activity->name }}</strong>". N=
+                                                                {{ count($section->students) }}. </p>
+                                                            <p>The expected performance level was that
+                                                                <strong>{{ $activity->rubric->expected_percentage }}%</strong>
+                                                                of students participating in the activity would score
+                                                                <strong>{{ $activity->rubric->expected_points }}
+                                                                    points</strong> or more in the 1-8 point scale used.</p>
+                                                            <p>The results for each criterion were as follows:</p>
+
+                                                            <table class="table table-condensed table-bordered">
+                                                                @foreach ((array) $activity->cap_array as $index5 => $cap)
+                                                                    <?php
+                                                                    $criterion = Criterion::find($index5);
+                                                                    ?>
+
+                                                                    @if ($criterion['outcome_id'] == $outcome->id && $cap >= $activity->rubric->expected_percentage)
+                                                                        <tr>
+                                                                            <td>{{ $criterion['name'] }}</td>
+                                                                            <td class="col-md-1 success">
+                                                                                {{ $cap }}%</td>
+                                                                        </tr>
+                                                                    @elseif($criterion['outcome_id'] == $outcome->id && $cap < $activity->rubric->expected_percentage)
+                                                                        <tr>
+                                                                            <td>{{ $criterion['name'] }}</td>
+                                                                            <td class="col-md-1 danger">
+                                                                                {{ $cap }}%</td>
+                                                                        </tr>
+                                                                    @endif
+                                                                @endforeach
+                                                            </table>
+
+                                                            <ul>
+
+                                                            </ul>
+                                                            <p>
+
+                                                                <?php
+                                                                $o_att_array = $activity->o_att_array;
+                                                                $o_ach_array = $activity->o_ach_array;
+                                                                $percentage = ($o_ach_array[$outcome->id] / $o_att_array[$outcome->id]) * 100;
+                                                                ?>
+                                                                @if ($percentage >= 100)
+                                                                    The expected goal was reached in <strong>all</strong>
+                                                                    (100%) of the criteria assessed. Therefore, the goal for
+                                                                    this outcome ({{ $outcome->expected_outcome }}%) was
+                                                                    <strong>met</strong>.
+                                                                @elseif ($percentage < 1)
+                                                                    The expected goal was reached in <strong>none</strong>
+                                                                    (0%) of the criteria assessed. Therefore, the goal for
+                                                                    this outcome ({{ $outcome->expected_outcome }}%) was
+                                                                    <strong>not met</strong>.
+                                                                @elseif ($percentage >= $outcome->expected_outcome)
+                                                                    The expected goal was reached in
+                                                                    <strong>{{ $o_ach_array[$outcome->id] }}</strong> out
+                                                                    of the
+                                                                    <strong>{{ $o_att_array[$outcome->id] }}</strong>
+                                                                    ({{ round($percentage, 2) }}%) criteria assessed.
+                                                                    Therefore, the goal for this outcome
+                                                                    ({{ $outcome->expected_outcome }}%) was
+                                                                    <strong>met</strong>.
+                                                                @elseif ($percentage < $outcome->expected_outcome)
+                                                                    The expected goal was reached in
+                                                                    <strong>{{ $o_ach_array[$outcome->id] }}</strong> out
+                                                                    of the
+                                                                    <strong>{{ $o_att_array[$outcome->id] }}</strong>
+                                                                    ({{ round($percentage, 2) }}%) criteria assessed.
+                                                                    Therefore, the goal for this outcome
+                                                                    ({{ $outcome->expected_outcome }}%) was <strong> not
+                                                                        met</strong>.
+                                                                @endif
+                                                            </p>
+
+                                                            <h5><strong>Transforming Actions</strong></h5>
+                                                            @if ($activity->transforming_actions)
+                                                                {{ $activity->transforming_actions }}
+                                                            @else
+                                                                None
                                                             @endif
-                                                        @endforeach
-                                                    </table>
-
-                                                    <ul>
-
-                                                    </ul>
-                                                    <p>
-
-                                                    <?php
-                                                        $o_att_array = $activity->o_att_array;
-                                                        $o_ach_array = $activity->o_ach_array;
-                                                        $percentage = ($o_ach_array[$outcome->id]/$o_att_array[$outcome->id])*100;
-                                                    ?>
-                                                    @if($percentage >= 100)
-                                                        The expected goal was reached in <strong>all</strong> (100%) of the criteria assessed. Therefore, the goal for this outcome ({{ $outcome->expected_outcome }}%) was <strong>met</strong>.
-                                                    @elseif ($percentage < 1)
-                                                        The expected goal was reached in <strong>none</strong> (0%) of the criteria assessed. Therefore, the goal for this outcome ({{ $outcome->expected_outcome }}%) was <strong>not met</strong>.
-                                                    @elseif ($percentage >= $outcome->expected_outcome)
-                                                        The expected goal was reached in <strong>{{ $o_ach_array[$outcome->id] }}</strong> out of the <strong>{{ $o_att_array[$outcome->id] }}</strong> ({{ round($percentage, 2) }}%) criteria assessed. Therefore, the goal for this outcome ({{ $outcome->expected_outcome }}%) was <strong>met</strong>.
-                                                    @elseif ($percentage < $outcome->expected_outcome)
-                                                        The expected goal was reached in <strong>{{ $o_ach_array[$outcome->id] }}</strong> out of the <strong>{{ $o_att_array[$outcome->id] }}</strong> ({{ round($percentage, 2) }}%) criteria assessed. Therefore, the goal for this outcome ({{ $outcome->expected_outcome }}%) was <strong> not met</strong>.
-                                                    @endif
-                                                    </p>
-
-                                                    <h5><strong>Transforming Actions</strong></h5>
-                                                    @if($activity->transforming_actions)
-                                                        {{ $activity->transforming_actions }}
-                                                    @else
-                                                        None
-                                                    @endif
-                                                    <br><br>
-
-                                                @else
-                                                    <h5>Measure {{ $index4 + 1 }}</h5>
-                                                    <em>Outcome not measured.</em>
-                                                @endif
-                                            @endforeach
+                                                            <br><br>
+
+                                                        @else
+                                                            <h5>Measure {{ $index4 + 1 }}</h5>
+                                                            <em>Outcome not measured.</em>
+                                                        @endif
+                                                    @endforeach
+                                                @endforeach
+                                                <hr>
+                                            @endif
                                         @endforeach
-                                    <hr>
-                                    @endif
-                                @endforeach
-                                </td>
-                            </tr>
-                        @else
-                            <tr>
-                                <td id="{{ $outcome->id }}-{{ $school->id }}-{{ $program->id }}" class="program no-courses col-md-3" >{{ $program->name }}</td>
-                                <td class="col-md-9">
-                                    This program does not assess {{ $outcome->name }}.
-                                </td>
-                            </tr>
-                        @endif
-                    @endforeach
+                                    </td>
+                                </tr>
+                            @else
+                                <tr>
+                                    <td id="{{ $outcome->id }}-{{ $school->id }}-{{ $program->id }}"
+                                        class="program no-courses col-md-3">{{ $program->name }}</td>
+                                    <td class="col-md-9">
+                                        This program does not assess {{ $outcome->name }}.
+                                    </td>
+                                </tr>
+                            @endif
+                        @endforeach
                     </tbody>
                 </table>
             @else
@@ -168,61 +210,65 @@
 
 @section('javascript')
 
-// Hide tables that have no courses
-$('.no-courses').each(function() {
+    // Hide tables that have no courses
+    $('.no-courses').each(function() {
 
-   // $(this).closest('tr').hide();
+    // $(this).closest('tr').hide();
 
-});
+    });
 
-// Hide tables with empty bodies
-$('tbody').each(function() {
-   if($(this).children(':visible').length==0)
-   {
-       $(this).closest('table').hide();
-   }
-});
+    // Hide tables with empty bodies
+    $('tbody').each(function() {
+    if($(this).children(':visible').length==0)
+    {
+    $(this).closest('table').hide();
+    }
+    });
 
 
 
 
-// Build table of contents
-var outcome = $('.outcome');
-var str ='';
-str+='<li><a href="#'+outcome.attr('id')+'">'+outcome.text()+'</a><ol class="schools upper-alpha">';
+    // Build table of contents
+    var outcome = $('.outcome');
+    var str ='';
+    str+='<li><a href="#'+outcome.attr('id')+'">'+outcome.text()+'</a>
+        <ol class="schools upper-alpha">';
 
-$('[id^='+outcome.attr('id')+'-].school:visible').each(function(e){
-    var school = $(this);
-    str+='<li><a href="#'+school.attr('id')+'">'+school.text()+'</a><ol class="programs">';
+            $('[id^='+outcome.attr('id')+'-].school:visible').each(function(e){
+            var school = $(this);
+            str+='<li><a href="#'+school.attr('id')+'">'+school.text()+'</a>
+                <ol class="programs">';
 
-    $('[id^='+school.attr('id')+'-].program:visible').each(function(e){
+                    $('[id^='+school.attr('id')+'-].program:visible').each(function(e){
 
-        var program = $(this);
-        if(!program.hasClass('no-courses'))
-            str+='<li><a href="#'+program.attr('id')+'">'+program.text()+'</a></li>';
-        else
-            str+='<li>'+program.text()+'</li>';
+                    var program = $(this);
+                    if(!program.hasClass('no-courses'))
+                    str+='<li><a href="#'+program.attr('id')+'">'+program.text()+'</a></li>';
+                    else
+                    str+='<li>'+program.text()+'</li>';
 
-    });
+                    });
 
-    str+='</ol></li>';
-});
+                    str+='</ol>
+            </li>';
+            });
 
-str+='</ol></li>';
-// console.log(str);
-$('#table-of-contents').append(str);
+            str+='</ol>
+    </li>';
+    // console.log(str);
+    $('#table-of-contents').append(str);
 
 
-// ----------------------------------------------------------------------------
-// Events
-//
+    // ----------------------------------------------------------------------------
+    // Events
+    //
 
-$('.to-top').on('click', function(e) {
+    $('.to-top').on('click', function(e) {
     e.preventDefault();
 
-     $(this).scrollTop(0);
+    $(this).scrollTop(0);
     $('html').animate({scrollTop:0}, 1);
     $('body').animate({scrollTop:0}, 1);
-})
+    })
 
 @stop

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

@@ -1,11 +1,11 @@
 @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')
     @endif
 @stop
@@ -13,302 +13,368 @@
 @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>
 
-            @if(!$school->programs->isEmpty())
+            @if (!$school->programs->isEmpty())
+                <h3>Table of Contents</h3>
+                <ol id="table-of-contents" class="upper-roman">
 
-                
+                </ol>
+                @foreach ($school->programs as $program)
 
-                        <ul id = 'levelTabs' class = "nav nav-tabs" role = "tablist">
-                                <!-- For each grouped course -->
-                                @foreach($program->courses as $index2=>$course)
 
-                                <li role= "presentation">
-                                    <a data-toggle = "tab" href ="#{{ $course->code}}-{{ $course->number }}"
-                                        role ="tab">{{ $course->code}}-{{ $course->number }}</a>
-                                    </li>
+                    {{-- <ul id='levelTabs' class="nav nav-tabs" role="tablist">
+                        <!-- For each grouped course -->
+                        @foreach ($program->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">
-
-
-                                    <!-- If grouped course has activities that evaluate the outcome -->
-                                    @foreach($program->courses as $index2=>$course)
-
-                                    <?php
-
-                                        /*$sections_evaluating = Course::has('activities')
-                                        ->whereNotNull('outcomes_attempted')
-                                        ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
-                                        ->with(array('activities'=>function($query) use(&$outcome){
-                                            $query->whereNotNull('outcomes_attempted');
-                                            $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
-                                        ->where('code', $course->code)->where('number',$course->number)
-                                        ->whereIn('semester_id', Session::get('semesters_ids'))
-                                        ->get();*/
-
-
-                                        $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('id', $activities);
-                        } ))
+                    </ul>
+                    <d id="allLists" class="tab-content"> --}}
+
+                    <div class="panel panel-default">
+                        <div class="panel-heading">
+                            <h3 class="panel-title">{{ $program->name }}</h3>
+                        </div>
+                        <div class="panel-body">
+
+
+
+
+                            <!-- If grouped course has activities that evaluate the outcome -->
+                            @foreach ($program->courses as $index2 => $course)
+
+                                <?php
                                 
+                                /*$sections_evaluating = Course::has('activities')
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->whereNotNull('outcomes_attempted')
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->with(array('activities'=>function($query) use(&$outcome){
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        $query->whereNotNull('outcomes_attempted');
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->where('code', $course->code)->where('number',$course->number)
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->whereIn('semester_id', Session::get('semesters_ids'))
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->get();*/
+                                
+                                $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('id', $activities);
+                                        },
+                                    ])
+                                
+                                    ->where('code', $course->code)
+                                    ->where('number', $course->number)
+                                    ->whereIn('semester_id', Session::get('semesters_ids'))
+                                    ->orderBy('semester_id')
+                                    ->get();
+                                
+                                ?>
+
+
 
-                            ->where('code', $course->code)->where('number',$course->number)
-                            ->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> 
-                                            @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>
+                                @foreach ($sections_evaluating as $index3 => $section)
+                                    @if (!$section->publishedActivities->isEmpty())
+                                        <h3 style="text-align: center"> Course: {{ $course->code }}
+                                            {{ $course->number }}-{{ $section->section }} </h3>
+                                    @endif
+                                    @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
-                                                Log::info($activity->rubric[0]);
-                                                ?>
-                                            <p style="display: inline;"><i>{{$activity->rubric[0]->num_scales}} (
-                                            <?php
                                                 $titles = $activity->rubric[0]->getTitles();
                                                 ?>
-                                            @if(sizeof($titles) != 1)
-                                            @foreach ($titles as $index5=>$rubric_title)
-                                            @if($index5!= ($activity->rubric[0]->num_scales)-1 )
-                                                {{$rubric_title->text}},
-                                            @else
-                                                and {{$rubric_title->text}}
-                                            @endif
-                                                
-                                        @endforeach
-                                    )
-                                    @else
-                                        {{$titles[0]->text}} )
-                                    @endif
-                                    </i></p>
-                                    <br>
-                                    <h5 style="display: inline;">Scale: </h5>
-                                    @if($activity->rubric[0]->max_score == 1)
-                                    <p style="display: inline;">1 point scale</p>
-                                    @else
-                                    <p style="display: inline;">1-{{$activity->rubric[0]->max_score}} point scale</p>
-    
-                                    @endif
-                                    <br>
-                                    <br>
-                                    <h4>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>
+                                                @if (sizeof($titles) != 1)
+                                                    @foreach ($titles as $index5 => $rubric_title)
+                                                        @if ($index5 != $activity->rubric[0]->num_scales - 1)
+                                                            {{ $rubric_title->text }},
+                                                        @else
+                                                            and {{ $rubric_title->text }}
+                                                        @endif
+
+                                                    @endforeach
+                                                    )
+                                                @else
+                                                    {{ $titles[0]->text }} )
+                                                @endif
+                                            </i></p>
+                                        <br>
+                                        <h5 style="display: inline;">Scale: </h5>
+                                        @if ($activity->rubric[0]->max_score == 1)
+                                            <p style="display: inline;">1 point scale</p>
+                                        @else
+                                            <p style="display: inline;">1-{{ $activity->rubric[0]->max_score }} point
+                                                scale
+                                            </p>
+
+                                        @endif
+                                        <br>
+                                        <br>
+                                        <h4>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
-        
-                                                $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();
+                                                $expected = DB::table('target_outcomes_program')
+                                                    ->where('program_id', $course->program_id)
+                                                    ->where('semester_id', $course->semester_id)
+                                                    ->first()->expected_target;
                                                 
                                                 ?>
-@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
-                                        </div>
-
-            @endforeach
-
-
-
-@else
-<h4>This program has not assessed any activity</h4>
-@endif
+                                                {{ $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
+
+
+                            @endforeach
+                        </div>
+                    </div>
+                @endforeach
+
+
+
+            @else
+                <h4>This program has not assessed any activity</h4>
+            @endif
 
         </div>
     </div>
+    <script>
+        var outcome = $('.outcome');
+
+        var str = '';
+        str += '<li><a href="#' + 1 + '">' + "outcome.text()" + '</a><ol class="schools upper-alpha">';
+
+        $('[id^=' + outcome.attr('id') + '-].school:visible').each(function(e) {
+            var school = $(this);
+            str += '<li><a href="#' + school.attr('id') + '">' + school.text() + '</a><ol class="programs">';
+
+            $('[id^=' + school.attr('id') + '-].program:visible').each(function(e) {
+
+                var program = $(this);
+                if (!program.hasClass('no-courses'))
+                    str += '<li><a href="#' + program.attr('id') + '">' + program.text() + '</a></li>';
+                else
+                    str += '<li>' + program.text() + '</li>';
+
+            });
 
+            str += '</ol></li>';
+        });
+        // Hide accordion panel contents by default
+        $('.panel-body').hide();
+
+        // --------------------------------------------------------------------------
+        // Functions
+        // --------------------------------------------------------------------------
+
+
+        // --------------------------------------------------------------------------
+        // Events
+        // --------------------------------------------------------------------------
+
+        // When panel heading is clicked, toggle it
+        $('.panel-heading').on('click', function() {
+            $(this).next().stop().slideToggle();
+        })
+    </script>
 
 @section('included-js')
-@include('global._datatables_js')
+    @include('global._datatables_js')
 @stop
-    
+
 @stop
 
 @section('javascript')
 
 
 
+// Build table of contents
+
 @stop

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

@@ -0,0 +1,996 @@
+@extends('layouts.master')
+
+@section('css')
+    {{ HTML::style('vendor/jquery-ui-1.11.4.custom/jquery-ui.min.css') }}
+    {{ HTML::style('vendor/jquery-ui-1.11.4.custom/jquery-ui.theme.min.css') }}
+@stop
+
+@section('navigation')
+    @if ($role == 1)
+        @include('local.managers.admins._navigation')
+    @elseif($role == 2)
+        @include('local.managers.sCoords._navigation')
+    @elseif($role == 3)
+        @include('local.managers.pCoords._navigation')
+    @else
+        @include('local.professors._navigation')
+    @endif
+@stop
+
+
+@section('main')
+
+
+
+
+
+
+
+
+
+
+    <div class="row">
+        <ul id='levelTabs' class="nav nav-tabs" role="tablist">
+            <!-- For each grouped course -->
+
+
+            <li role="presentation" class ='first'>
+                <a data-toggle="tab" href="#activity_1"
+                    role="tab">{{ strlen($activity_1->name) > 50 ? substr($activity_1->name, 0, 50) . '...' : $activity_1->name }}</a>
+            </li>
+            <li role="presentation">
+                <a data-toggle="tab" href="#activity_2"
+                    role="tab">{{ strlen($activity_2->name) > 50 ? substr($activity_2->name, 0, 50) . '...' : $activity_2->name }}</a>
+            </li>
+
+
+        </ul>
+        <div id="allLists" class="tab-content">
+            <div role="tabpanel" class='tab-pane first' id="activity_1">
+
+                <div class="col-md-9" id="graph_1"></div>
+                
+            </div>
+
+            <div role="tabpanel" class='tab-pane' id="activity_2">
+
+                <div class="col-md-9" id="graph_2"></div>
+               
+            </div>
+
+        </div>
+    </div>
+    <div class="row">
+
+        <ul id='levelTabs' class="nav nav-tabs" role="tablist">
+            <!-- For each grouped course -->
+
+
+            <li role="presentation" class = "first">
+                <a data-toggle="tab" href="#activity_criteriaGraph_1"
+                    role="tab">{{ strlen($activity_1->name) > 50 ? substr($activity_1->name, 0, 50) . '...' : $activity_1->name }}</a>
+            </li>
+            <li role="presentation">
+                <a data-toggle="tab" href="#activity_criteriaGraph_2"
+                    role="tab">{{ strlen($activity_2->name) > 50 ? substr($activity_2->name, 0, 50) . '...' : $activity_2->name }}</a>
+            </li>
+
+
+        </ul>
+        <div id="allLists" class="tab-content">
+            <div role="tabpanel" class='tab-pane first' id="activity_criteriaGraph_1">
+                <div class="col-md-9" id="criteriaGraph_1"></div>
+            </div>
+            <div role="tabpanel" class='tab-pane' id="activity_criteriaGraph_2">
+                <div class="col-md-9" id="criteriaGraph_2"></div>
+            </div>
+        </div>
+    </div>
+    <div class="row">
+
+        <ul id='levelTabs' class="nav nav-tabs" role="tablist">
+            <!-- For each grouped course -->
+
+
+            <li role="presentation" class ="first">
+                <a data-toggle="tab" href="#activity_tabla_1"
+                    role="tab">{{ strlen($activity_1->name) > 50 ? substr($activity_1->name, 0, 50) . '...' : $activity_1->name }}</a>
+            </li>
+            <li role="presentation">
+                <a data-toggle="tab" href="#activity_tabla_2"
+                    role="tab">{{ strlen($activity_2->name) > 50 ? substr($activity_2->name, 0, 50) . '...' : $activity_2->name }}</a>
+            </li>
+
+
+        </ul>
+        <div id="allLists" class="tab-content">
+            <div role="tabpanel" class='tab-pane first' id="activity_tabla_1">
+
+
+                <h3 style="text-align: center;">{{ $activity_1->name }} </h3>
+               
+                <br>
+                <br>
+                <h5 style="display: inline;">Date: </h5>
+                <p style="display: inline;">
+                    <strong>({{ $activity_1->date }})</strong>
+                </p>
+                <br>
+         
+                <h5 style="display: inline;">Performance Indicators: </h5>
+                <?php
+                Log::info($activity_1->rubric[0]);
+                ?>
+                <p style="display: inline;"><i>{{ $activity_1->rubric[0]->num_scales }} (
+                        <?php
+                        $titles = $activity_1->rubric[0]->getTitles();
+                        ?>
+                        @if (sizeof($titles) != 1)
+                            @foreach ($titles as $index5 => $rubric_title)
+                                @if ($index5 != $activity_1->rubric[0]->num_scales - 1)
+                                    {{ $rubric_title->text }},
+                                @else
+                                    and {{ $rubric_title->text }}
+                                @endif
+
+                            @endforeach
+                            )
+                        @else
+                            {{ $titles[0]->text }} )
+                        @endif
+                    </i></p>
+                <br>
+                <h5 style="display: inline;">Scale: </h5>
+                @if ($activity_1->rubric[0]->max_score == 1)
+                    <p style="display: inline;">1 point scale</p>
+                @else
+                    <p style="display: inline;">1-{{ $activity_1->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_1->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_1->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_1->allActivityCriterionInfo() as $index5 => $ac_criterion)
+                            <tr>
+                                <td> {{ $ac_criterion->name }}</td>
+                                <td>{{ Criterion::students_attempted($ac_criterion->criterion_id, $activity_1->id) }}
+                                </td>
+                                <td>
+                                    {{ Criterion::students_achieved($ac_criterion->criterion_id, $activity_1->id) }}
+
+                                </td>
+                                <?php
+                                
+                                $out_att = Criterion::students_attempted($ac_criterion->criterion_id, $activity_1->id);
+                                $out_ach = Criterion::students_achieved($ac_criterion->criterion_id, $activity_1->id);
+                                
+                                $percentage = 'N/A';
+                                $activity_1->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_1->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_1->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>
+
+
+
+
+
+
+
+            </div>
+            <div role="tabpanel" class='tab-pane' id="activity_tabla_2">
+
+
+                <h3 style="text-align: center;">{{ $activity_2->name }} </h3>
+               
+                <br>
+                <br>
+                <h5 style="display: inline;">Date: </h5>
+                <p style="display: inline;">
+                    <strong>({{ $activity_2->date }})</strong>
+                </p>
+                <br>
+         
+                <h5 style="display: inline;">Performance Indicators: </h5>
+                <?php
+                Log::info($activity_2->rubric[0]);
+                ?>
+                <p style="display: inline;"><i>{{ $activity_2->rubric[0]->num_scales }} (
+                        <?php
+                        $titles = $activity_2->rubric[0]->getTitles();
+                        ?>
+                        @if (sizeof($titles) != 1)
+                            @foreach ($titles as $index5 => $rubric_title)
+                                @if ($index5 != $activity_2->rubric[0]->num_scales - 1)
+                                    {{ $rubric_title->text }},
+                                @else
+                                    and {{ $rubric_title->text }}
+                                @endif
+
+                            @endforeach
+                            )
+                        @else
+                            {{ $titles[0]->text }} )
+                        @endif
+                    </i></p>
+                <br>
+                <h5 style="display: inline;">Scale: </h5>
+                @if ($activity_2->rubric[0]->max_score == 1)
+                    <p style="display: inline;">1 point scale</p>
+                @else
+                    <p style="display: inline;">1-{{ $activity_2->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_2->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_2->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_2->allActivityCriterionInfo() as $index5 => $ac_criterion)
+                            <tr>
+                                <td> {{ $ac_criterion->name }}</td>
+                                <td>{{ Criterion::students_attempted($ac_criterion->criterion_id, $activity_2->id) }}
+                                </td>
+                                <td>
+                                    {{ Criterion::students_achieved($ac_criterion->criterion_id, $activity_2->id) }}
+
+                                </td>
+                                <?php
+                                
+                                $out_att = Criterion::students_attempted($ac_criterion->criterion_id, $activity_2->id);
+                                $out_ach = Criterion::students_achieved($ac_criterion->criterion_id, $activity_2->id);
+                                
+                                $percentage = 'N/A';
+                                $activity_2->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_2->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_2->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>
+
+
+
+
+
+
+
+            </div>
+        </div>
+    </div>
+
+ @stop
+ @section('included-js')
+@include('global._datatables_js')
+    <!-- HighCharts -->
+    <script src="{{ asset('vendor/highcharts/highcharts.js') }}"></script>
+    <!--script src="http://code.highcharts.com/modules/exporting.js"></script -->
+
+    <!-- Datepicker -->
+    <script src="{{ asset('vendor/jquery-ui-1.11.4.custom/jquery-ui.min.js') }}"></script>
+
+@stop
+
+
+@section('javascript')
+$(function() {
+
+
+
+$('#criteriaGraph_1').highcharts({
+    chart: {
+        type: 'bar',
+        height:
+        @if ($activity_1->is_assessed())
+        
+            {{ count($activity_1->criteria_achieved()) * 22 + 225 }}
+        @else
+            {{ 22 + 225 }}
+        @endif,
+    },
+    title: {
+        text: 'Criteria Achievement',
+    },
+    xAxis: {
+        categories: [
+            @if ($activity_1->is_assessed())
+                @foreach ($activity_1->criteria_achieved() as $id => $value)
+                    "{{ Criterion::withTrashed()->find($id)->name }}",
+                @endforeach
+            @endif
+        ],
+        labels: {
+            style: {
+                fontSize: '12px'
+            },
+            step: 1,
+            useHTML: true,
+            formatter: function() {
+                return '<div style="width:200px; word-break:break; text-overflow:ellipsis; overflow:hidden;">' +
+                    this.value + '</div>';
+            },
+        }
+    },
+    yAxis: {
+        min: 0,
+        max: 100,
+        title: {
+            text: 'Percentage'
+        },
+        @if (isset($activity_1->rubric[0]) and isset($activity_1->rubric[0]->expected_percentage))
+            plotLines:[{
+            value:{{ $activity_1->rubric[0]->expected_percentage }},
+            color: '#000',
+            width:3,
+            zIndex:4,
+            label:{
+            text: 'Goal ({{ $activity_1->rubric[0]->expected_percentage }}%)',
+            style: {
+            color: '#000',
+            fontSize: '14px',
+            }
+        
+            }
+            }]
+        @endif
+    },
+
+    tooltip: {
+        headerFormat: '<span style="font-size:10px">{point.key}</span> <table > ',
+        pointFormat: '<tr> <td style = "color:{series.color};padding:0" > {series.name}: < /td>' +
+            '<td style="padding:0"><b>{point.y:.2f}%</b></td> </tr>',
+        footerFormat: '</table>',
+        shared: true,
+        useHTML: true
+    },
+    plotOptions: {
+        bar: {
+            //grouping: false,
+            shadow: false,
+            borderWidth: 0,
+        },
+        series: {
+            pointPadding: 0,
+            groupPadding: 0.1
+        },
+    },
+    series: [{
+        type: 'column',
+        name: 'Passed',
+        color: '#e70033',
+        dataLabels: {
+            enabled: true,
+            fontSize: 8,
+            color: '#fff',
+            align: 'right',
+            format: '{y:.1f}%',
+            style: {
+                //fontWeight: 'bold'
+            },
+            y: -1
+        },
+        data: [
+            @if ($activity_1->is_assessed())
+                @foreach ($activity_1->cap_array as $id => $crit)
+                
+                    //This conditional is to ignore criteria that weren't assessed. These would have a value of null.
+                    @if ($crit->score_percentage)
+                        {{ $crit->score_percentage }},
+                    @else
+                        0,
+                    @endif
+                @endforeach
+            @endif
+        ],
+        pointPadding: 0,
+    }]
+});
+
+$('#criteriaGraph_2').highcharts({
+    chart: {
+        type: 'bar',
+        height:
+        @if ($activity_2->is_assessed())
+        
+            {{ count($activity_2->criteria_achieved()) * 22 + 225 }}
+        @else
+            {{ 22 + 225 }}
+        @endif,
+    },
+    title: {
+        text: 'Criteria Achievement',
+    },
+    xAxis: {
+        categories: [
+            @if ($activity_2->is_assessed())
+                @foreach ($activity_2->criteria_achieved() as $id => $value)
+                    "{{ Criterion::withTrashed()->find($id)->name }}",
+                @endforeach
+            @endif
+        ],
+        labels: {
+            style: {
+                fontSize: '12px'
+            },
+            step: 1,
+            useHTML: true,
+            formatter: function() {
+                return '<div style="width:200px; word-break:break; text-overflow:ellipsis; overflow:hidden;">' +
+                    this.value + '</div>';
+            },
+        }
+    },
+    yAxis: {
+        min: 0,
+        max: 100,
+        title: {
+            text: 'Percentage'
+        },
+        @if (isset($activity_2->rubric[0]) and isset($activity_2->rubric[0]->expected_percentage))
+            plotLines:[{
+            value:{{ $activity_2->rubric[0]->expected_percentage }},
+            color: '#000',
+            width:3,
+            zIndex:4,
+            label:{
+            text: 'Goal ({{ $activity_2->rubric[0]->expected_percentage }}%)',
+            style: {
+            color: '#000',
+            fontSize: '14px',
+            }
+        
+            }
+            }]
+        @endif
+    },
+
+    tooltip: {
+        headerFormat: '<span style="font-size:10px">{point.key}</span> <table > ',
+        pointFormat: '<tr> <td style = "color:{series.color};padding:0" > {series.name}: < /td>' +
+            '<td style="padding:0"><b>{point.y:.2f}%</b></td> </tr>',
+        footerFormat: '</table>',
+        shared: true,
+        useHTML: true
+    },
+    plotOptions: {
+        bar: {
+            //grouping: false,
+            shadow: false,
+            borderWidth: 0,
+        },
+        series: {
+            pointPadding: 0,
+            groupPadding: 0.1
+        },
+    },
+    series: [{
+        type: 'column',
+        name: 'Passed',
+        color: '#e70033',
+        dataLabels: {
+            enabled: true,
+            fontSize: 8,
+            color: '#fff',
+            align: 'right',
+            format: '{y:.1f}%',
+            style: {
+                //fontWeight: 'bold'
+            },
+            y: -1
+        },
+        data: [
+            @if ($activity_2->is_assessed())
+                @foreach ($activity_2->cap_array as $id => $crit)
+                
+                    //This conditional is to ignore criteria that weren't assessed. These would have a value of null.
+                    @if ($crit->score_percentage)
+                        {{ $crit->score_percentage }},
+                    @else
+                        0,
+                    @endif
+                @endforeach
+            @endif
+        ],
+        pointPadding: 0,
+    }]
+});
+
+
+$('#graph_1').highcharts({
+    chart: {
+        type: 'bar',
+    },
+    title: {
+        text: 'Performance by Learning Outcome Criteria in {{ $activity_1->name }}<br><br>'
+    },
+    xAxis: {
+        categories: [
+            @foreach ($outcomes as $outcome)
+                "{{ $outcome->name }}",
+            @endforeach
+        ],
+        labels: {
+            style: {
+                fontSize: '11px'
+            },
+            step: 1,
+            useHTML: true,
+            formatter: function() {
+                return '<div style="width:200px; word-break:break; text-overflow:ellipsis; overflow:hidden;">' +
+                    this.value + '</div>';
+            },
+        }
+    },
+    yAxis: {
+        min: 0,
+        max: 100,
+        title: {
+            text: 'Percentage'
+        }
+    },
+    tooltip: {
+        headerFormat: '<span style="font-size:10px">{point.key}</span> <table > ',
+        pointFormat: '<tr> <td style = "color:{series.color};padding:0" > {series.name}: < /td>' +
+            '<td style="padding:0"><b>{point.y:.2f}</b></td> </tr>',
+        footerFormat: '</table>',
+        shared: true,
+        useHTML: true
+    },
+    plotOptions: {
+        bar: {
+            //grouping: false,
+            shadow: false,
+            borderWidth: 0,
+        },
+        series: {
+            pointPadding: 0,
+            groupPadding: 0.075
+        },
+    },
+    series: [{
+        name: 'Obtained Value',
+        color: '#e70033',
+        dataLabels: {
+            enabled: true,
+            fontSize: 8,
+            color: '#fff',
+            align: 'right',
+            format: '{y:.1f}%',
+            style: {
+                //fontWeight: 'bold'
+            },
+            y: -1
+        },
+        data: [
+            @foreach ($outcomes as $index => $outcome)
+                @if (is_array($outcomes_attempted_1) && array_key_exists($outcome->id, $outcomes_attempted_1) && $outcomes_attempted_1[$outcome->id] != 0)
+                    {{ ($outcomes_achieved_1[$outcome->id] / $outcomes_attempted_1[$outcome->id]) * 100 }},
+                @else
+                    0,
+                @endif
+            @endforeach
+        ],
+        pointPadding: 0,
+    }, {
+        name: 'Expected Value',
+        color: '#555555',
+        dataLabels: {
+            enabled: true,
+            fontSize: 8,
+            color: '#fff',
+            align: 'right',
+            format: '{y:.1f}%',
+            style: {
+                //fontWeight: 'bold'
+            },
+            y: -1
+        },
+        data: [
+            @foreach ($outcomes as $index => $outcome)
+                @if (is_array($outcomes_attempted_1) && array_key_exists($outcome->id, $outcomes_attempted_1) && $outcomes_attempted_1[$outcome->id] != 0)
+                    {{ $outcome->expected_outcome }},
+                @else
+                    0,
+                @endif
+            @endforeach
+        ],
+        pointPadding: 0,
+    }]
+});
+
+$('#graph_2').highcharts({
+    chart: {
+        type: 'bar',
+    },
+    title: {
+        text:'Performance by Learning Outcome Criteria in {{ $activity_2->name }}<br><br>'
+        },
+    xAxis: {
+        categories: [
+            @foreach ($outcomes as $outcome)
+                "{{ $outcome->name }}",
+            @endforeach
+        ],
+        labels: {
+            style: {
+                fontSize: '11px'
+            },
+            step: 1,
+            useHTML: true,
+            formatter: function() {
+                return '<div style="width:200px; word-break:break; text-overflow:ellipsis; overflow:hidden;">' +
+                    this.value + '</div>';
+            },
+        }
+    },
+    yAxis: {
+        min: 0,
+        max: 100,
+        title: {
+            text: 'Percentage'
+        }
+    },
+    tooltip: {
+        headerFormat: '<span style="font-size:10px">{point.key}</span> <table > ',
+        pointFormat: '<tr> <td style = "color:{series.color};padding:0" > {series.name}: < /td>' +
+            '<td style="padding:0"><b>{point.y:.2f}</b></td> </tr>',
+        footerFormat: '</table>',
+        shared: true,
+        useHTML: true
+    },
+    plotOptions: {
+        bar: {
+            //grouping: false,
+            shadow: false,
+            borderWidth: 0,
+        },
+        series: {
+            pointPadding: 0,
+            groupPadding: 0.075
+        },
+    },
+    series: [{
+        name: 'Obtained Value',
+        color: '#e70033',
+        dataLabels: {
+            enabled: true,
+            fontSize: 8,
+            color: '#fff',
+            align: 'right',
+            format: '{y:.1f}%',
+            style: {
+                //fontWeight: 'bold'
+            },
+            y: -1
+        },
+        data: [
+            @foreach ($outcomes as $index => $outcome)
+                @if (is_array($outcomes_attempted_2) && array_key_exists($outcome->id, $outcomes_attempted_2) && $outcomes_attempted_2[$outcome->id] != 0)
+                    {{ ($outcomes_achieved_2[$outcome->id] / $outcomes_attempted_2[$outcome->id]) * 100 }},
+                @else
+                    0,
+                @endif
+            @endforeach
+        ],
+        pointPadding: 0,
+    }, {
+        name: 'Expected Value',
+        color: '#555555',
+        dataLabels: {
+            enabled: true,
+            fontSize: 8,
+            color: '#fff',
+            align: 'right',
+            format: '{y:.1f}%',
+            style: {
+                //fontWeight: 'bold'
+            },
+            y: -1
+        },
+        data: [
+            @foreach ($outcomes as $index => $outcome)
+                @if (is_array($outcomes_attempted_2) && array_key_exists($outcome->id, $outcomes_attempted_2) && $outcomes_attempted_2[$outcome->id] != 0)
+                    {{ $outcome->expected_outcome }},
+                @else
+                    0,
+                @endif
+            @endforeach
+        ],
+        pointPadding: 0,
+    }]
+});
+
+var chart = $('#graph_1').highcharts();
+var titletext = $('#graph_1').highcharts().options.title.text;
+var newtitletext = titletext.replace("&#039;", "\'");
+chart.setTitle({
+    text: newtitletext
+});
+var chart = $('#graph_2').highcharts();
+var titletext = $('#graph_2').highcharts().options.title.text;
+var newtitletext = titletext.replace("&#039;", "\'");
+chart.setTitle({
+    text: newtitletext
+});
+$('.first').each(function(){
+    $(this).addClass('active');
+})
+// Include dummy graph for outcomes
+@include('global.dummy-outcomes')
+
+
+});
+
+
+@stop
+
+@section('included-js')
+@include('global._datatables_js')
+    <!-- HighCharts -->
+    <script src="{{ asset('vendor/highcharts/highcharts.js') }}"></script>
+    <!--script src="http://code.highcharts.com/modules/exporting.js"></script -->
+
+    <!-- Datepicker -->
+    <script src="{{ asset('vendor/jquery-ui-1.11.4.custom/jquery-ui.min.js') }}"></script>
+
+@stop

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

@@ -59,6 +59,7 @@
 </div>
 
 
+
 <div class="row">
     <div class="col-md-7">
         <h3>Activities</h3>
@@ -77,6 +78,7 @@
                         <th>Updated</th>
                         <th>Assessed</th>
                         <th>Published</th>
+                        <th>Diagnostic</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -95,6 +97,12 @@
                                 <span class="glyphicon glyphicon-ok"></span>
                             @endif
                         </td>
+                        <td>
+                        @if($activity->o_att_array && !$activity->draft && $activity->diagnostic)
+                        <span class="glyphicon glyphicon-ok"></span>
+                        
+                    @endif
+                        </td>
                     </tr>
                     @endforeach
 
@@ -122,7 +130,62 @@
                 @endif
             </div>
         @endif
+        
+        <button class="btn-lg btn-primary" style="margin:5px;" data-toggle="modal" data-target="#compareActivities">Compare Activities</button>
+        <div class="modal fade" id="compareActivities">
+            <div class="modal-dialog modal-sm">
+              <div class="modal-content">
+                <div class="modal-header">
+                  <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                  <h4 class="modal-title">Compare Two Activities</h4>
+                </div>
+                  <div class="modal-body">
+                                           
+          
+                          <p>Vas a seleccionar dos actividades para comparar y presentar los datos de las actividades</p>
+                          
+                          <h5>Escoge dos actividades para comparar <br></h5>
+          
+                          <div class="form-group">
+          
+                             <label>Activity 1</label>
+                              
+                              <select id='select-activity-1' data-count = "1" class="form-control selectpicker" >
+                                  @foreach ($activities as $activity)
+                                 
+                                  <option value='{{$activity->id}}' >{{$activity->name}}</option>
+          
+                                  @endforeach
+                              </select>
+                              <hr>
+                              <label>Activity 2</label>
+
+                              <select id='select-activity-2' data-count = "1" class="form-control selectpicker" >
+                                @foreach ($activities as $activity)
+                               
+                                <option value='{{$activity->id}}' >{{$activity->name}}</option>
+        
+                                @endforeach
+                            </select>
+                            <hr>
+                          </div>
+          
+          
+                         
+                         
+                          
+                         
+                  </div>
+                <div class="modal-footer">
+                      <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                     <button type ="button" class= 'btn btn-primary' onclick ="goToURL()">Compare</button>
+                  {{ Form::close() }}
+                </div>
+              </div><!-- /.modal-content -->
+            </div><!-- /.modal-dialog -->
+          </div>
     </div>
+       
     <div class="col-md-5">
         <h3>Students</h3>
         @if(!$students->isEmpty())
@@ -159,6 +222,14 @@
         @endif
     </div>
 </div>
+<script>
+    function goToURL(){
+        activity1 = $('#select-activity-1').val();
+        activity2 = $('#select-activity-2').val();
+
+        window.open('../compare_activities/'+activity1+'/'+activity2,'_self');
+    }
+</script>
 @stop
 
 @section('included-js')