Push al git con pal de bugs hechos

app/controllers/ActivitiesController.php

@@ -140,7 +140,11 @@ class ActivitiesController extends \BaseController
         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->name, ENT_QUOTES) . ' <span class="small attention">(' . $course->semester->code . ')</span>';
-        $outcomes = Outcome::orderBy('name', 'asc')->get();
+        $semesters = DB::table('semesters')->where('id', $course->semester_id)->orderBy('start', 'ASC')->first();
+        $outcomes = Outcome::select(array('id', 'name', 'expected_outcome'))
+            ->whereNull('deleted_at')
+            ->whereRaw("(deactivation_date IS NULL or deactivation_date >= '{$semesters->start}')")
+            ->orderBy('name', 'ASC')->get();
         $assessment = DB::table('assessments')
             ->join('activity_criterion', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
             ->join('activities', 'activities.id', '=', 'activity_criterion.activity_id')
@@ -157,6 +161,8 @@ class ActivitiesController extends \BaseController
         Log::info($outcomes_achieved);
         Log::info($outcomes_achieved);
 
+
+
         $activity_criterion = DB::table('criteria')
             ->join('activity_criterion', 'criteria.id', '=', 'activity_criterion.criterion_id')
             ->where('activity_id', $activity->id)
@@ -932,10 +938,15 @@ class ActivitiesController extends \BaseController
             $active_semesters[] = $active_semester->id;
         }
 
+        $semesters = DB::table('semesters')->where('id', $course->semester_id)->orderBy('start', 'ASC')->first();
+
         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();
+        $outcomes = Outcome::select(array('id', 'name', 'expected_outcome'))
+            ->whereNull('deleted_at')
+            ->whereRaw("(deactivation_date IS NULL or deactivation_date >= '{$semesters->start}')")
+            ->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')

app/controllers/CriteriaController.php

@@ -213,11 +213,31 @@ class CriteriaController extends \BaseController
             ->select('outcomes.*')
             ->distinct()
             ->get();
+        $userRole = Auth::user()['role'];
 
         foreach ($criterion->outcomes as $outcome) {
+            switch ($userRole) {
+                case 1:
+                    $program_ids = DB::table('programs')->lists('id');
+                    break;
+                case 2:
+                    $program_ids = DB::table('programs')
+                        ->where('school_id', Auth::user()->school_id)
+                        ->lists('id');
+                    break;
+                case 3:
+                    $program_ids = DB::table('program_user')
+                        ->where('user_id', Auth::user()->id)
+                        ->lists('program_id');
+                    break;
+            }
             $outcome->assoc_objectives = DB::table('objective_outcome')
                 ->join('objectives', 'objectives.id', '=', 'objective_outcome.objective_id')
+                ->join('objective_program', 'objective_program.objective_id', '=', 'objectives.id')
+                ->whereIn('program_id', $program_ids)
                 ->where('outcome_id', $outcome->id)
+                ->select('objectives.*', 'objectives.id as objective_id')
+                ->distinct()
                 ->get();
             $outcome->objectives_criteria = DB::table('criterion_objective_outcome')
                 ->join('objectives', 'objectives.id', '=', 'criterion_objective_outcome.objective_id')
@@ -226,7 +246,7 @@ class CriteriaController extends \BaseController
                 ->get();
             foreach ($outcome->assoc_objectives as $objective) {
                 $objective->program_ids = json_encode(DB::table('objective_program')
-                    ->where('objective_id', $objective->objective_id)
+                    ->where('objective_id', $objective->id)
                     ->lists('program_id'));
             }
         }
@@ -437,6 +457,7 @@ class CriteriaController extends \BaseController
                     return Redirect::to('criteria')->withInput();
 
                 case 2:
+                    Log::info(Input::all());
                     return Redirect::to('school-criteria')->withInput();
 
                 case 3:
@@ -1058,4 +1079,4 @@ class CriteriaController extends \BaseController
                 break;
         }
     }
-}
+}

app/controllers/Objective2Controller.php

@@ -312,8 +312,10 @@ class Objective2Controller extends \BaseController
 
 		$title = "Objective";
 		$outcomes = Outcome::whereNull("deactivation_date")->orderBy('name', 'ASC')->get();
-
-		$objectives = Objective::withTrashed()->orderBy('text', 'ASC')->get();
+		$objectives_from_program = DB::table('objective_program')
+			->where('program_id', $userProgram[0]->program_id)
+			->lists('objective_id');
+		$objectives = Objective::withTrashed()->orderBy('text', 'ASC')->whereIn('id', $objectives_from_program)->get();
 
 		$programs = Program::where("id", '=', $userProgram[0]->program_id)->get();
 
@@ -330,7 +332,11 @@ class Objective2Controller extends \BaseController
 		$title = "Objective";
 		$outcomes = Outcome::whereNull("deactivation_date")->orderBy('name', 'ASC')->get();
 
-		$objectives = Objective::withTrashed()->orderBy('text', 'ASC')->get();
+		$objectives_from_school = DB::table('programs')
+			->join('objective_program', 'objective_program.program_id', '=', 'programs.id')
+			->where('programs.school_id', $userSchool)
+			->lists('objective_id');
+		$objectives = Objective::withTrashed()->orderBy('text', 'ASC')->whereIn('id', $objectives_from_school)->get();
 		$programs = Program::where("school_id", "=", $userSchool)->orderBy('name', 'ASC')->get();
 
 
@@ -471,4 +477,4 @@ class Objective2Controller extends \BaseController
 	{
 		//
 	}
-}
+}

app/controllers/TransformativeActionsController.php

@@ -1317,6 +1317,7 @@ class TransformativeActionsController extends \BaseController
       ->where('semester_id', $semesters)
       ->join('activities', 'activities.course_id', '=', 'courses.id')
       ->join('activity_criterion', 'activities.id', '=', 'activity_criterion.activity_id')
+
       ->join('transformative_activity_criterion as tac', 'tac.activity_criterion_id', '=', 'activity_criterion.id')
       ->select('courses.*')
       ->groupBy(array('courses.code', 'courses.name', 'courses.semester_id'))
@@ -1327,6 +1328,7 @@ class TransformativeActionsController extends \BaseController
 
 
 
+
     foreach ($grouped_courses as $course_name) {
       $course_name->sections = DB::table('courses')
         ->where('code', $course_name->code)
@@ -1338,6 +1340,7 @@ class TransformativeActionsController extends \BaseController
 
         $section->activities = DB::table('activities')
           ->join('activity_criterion', 'activities.id', '=', 'activity_criterion.activity_id')
+
           ->join('transformative_activity_criterion', 'transformative_activity_criterion.activity_criterion_id', '=', 'activity_criterion.id')
           ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'activity_criterion.criterion_id')
           ->join('transformative_actions', 'transformative_activity_criterion.trans_action_id', '=', 'transformative_actions.id')
@@ -1349,6 +1352,12 @@ class TransformativeActionsController extends \BaseController
           ->addSelect('transformative_actions.*', 'transformative_activity_criterion.trans_action_id as trans_action_id')
           ->groupBy('transformative_actions.id')
           ->get();
+
+        //If section has activity that assessess outcome
+        if (count($section->activities)) {
+          $course_name->outcome_assessed = true;
+        }
+
         foreach ($section->activities as $activity) {
           /*$activity->criterion = DB::table('transformative_activity_criterion')
           ->join('activity_criterion','activity_criterion.id','=','transformative_activity_criterion.activity_criterion_id')
@@ -1357,11 +1366,20 @@ class TransformativeActionsController extends \BaseController
           ->where('activity_id', $activity->id)
           ->select('criteria')*/
           //Log::info($activity->trans_action_id);
-          $activity->objectives = DB::table('transformative_objective')
+          $activity->criterion_with_objective = DB::table('transformative_activity_criterion')
+            ->join('activity_criterion', 'activity_criterion.id', '=', 'transformative_activity_criterion.activity_criterion_id')
+            ->join('criteria', 'activity_criterion.criterion_id', '=', 'criteria.id')
+            ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
+            ->join('objectives', 'objectives.id', '=', 'criterion_objective_outcome.objective_id')
+            ->where('activity_id', $activity->activity_id)
+            ->where('trans_action_id', $activity->trans_action_id)
+            ->get();
+          /*$activity->objectives = DB::table('transformative_objective')
             ->join('objectives', 'transformative_objective.objective_id', '=', 'objectives.id')
             ->where('ta_id', $activity->trans_action_id)
-            ->get();
-          foreach ($activity->objectives as $objective) {
+            ->get();*/
+
+          /*foreach ($activity->objectives as $objective) {
             // Log::info($activity->activity_id);
             // Log::info($objective->objective_id);
             /* Log::info(DB::table('criterion_objective_outcome')
@@ -1371,7 +1389,7 @@ class TransformativeActionsController extends \BaseController
               ->where('objective_id', $objective->objective_id)
               ->select('criteria.*')
               ->distinct()
-              ->toSql());*/
+              ->toSql());
             $objective->criterion = DB::table('criterion_objective_outcome')
               ->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'criterion_objective_outcome.criterion_id')
               ->join('criteria', 'criteria.id', '=', 'activity_criterion.criterion_id')
@@ -1380,10 +1398,10 @@ class TransformativeActionsController extends \BaseController
               ->select('criteria.*')
               ->distinct()
               ->get();
-          }
+          }*/
         }
       }
     }
     return $grouped_courses;
   }
-}
+}

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

@@ -1,85 +1,103 @@
 <div class="navbar navbar-inverse navbar-static-top">
-  <div class="container-fluid">
-    <!--<div class="navbar-header">
-      {{ HTML::linkAction('ProgramCoordinatorsController@overview', 'Online Learning Assessment System · Program Coordinator', array(), array('class'=>'navbar-brand')) }}
+    <div class="container-fluid">
+        <!--<div class="navbar-header">
+      {{ HTML::linkAction('ProgramCoordinatorsController@overview', 'Online Learning Assessment System · Program Coordinator', [], ['class' => 'navbar-brand']) }}
     </div>-->
-    <ul class="nav navbar-nav navbar-right">
-      <li>{{ HTML::linkAction('ProgramCoordinatorsController@overview', 'Overview') }}</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('TemplatesController@newTemplate', 'Rubrics') }}</li>
-          <li>{{ HTML::linkAction('TemplatesController@index', 'Rubric List') }}</li>
-      
-          <li>{{ HTML::linkAction('Objective2Controller@editProgram', 'Objectives')}}</li>
-      
-        <li>{{ HTML::linkAction('CriteriaController@editProgram', 'Criteria') }}</li>
-      <li>{{ HTML::linkAction('TransformativeActionsController@editTA', 'Transformative Actions') }}</li>
+        <ul class="nav navbar-nav navbar-right">
+            <li>{{ HTML::linkAction('ProgramCoordinatorsController@overview', 'Overview') }}</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('TemplatesController@newTemplate', 'Rubrics') }}</li>
+                    <li>{{ HTML::linkAction('TemplatesController@index', 'Rubric List') }}</li>
 
-    
-          <li><a href="{{ URL::action('AnnualPlansController@showPlan', Auth::user()->programs[0]->id)}}">Annual Plan</a><li>
-        <li><a href="{{ URL::action('ThreeYearPlanController@threeYearsReport', Auth::user()->programs[0]->id) }}">Three Years Plan</a></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>
-      @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>
-      @endif
+                    <li>{{ HTML::linkAction('Objective2Controller@editProgram', 'Objectives') }}</li>
+
+                    <li>{{ HTML::linkAction('CriteriaController@editProgram', 'Criteria') }}</li>
+                    <li>{{ HTML::linkAction('TransformativeActionsController@editTA', 'Transformative Actions') }}
+                    </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><a href="{{ URL::action('OutcomesController@programAssessmentReport', Auth::user()->programs[0]->id) }}">Program Reports</a></li>
-   
+
+                    <li><a href="{{ URL::action('AnnualPlansController@showPlan', Auth::user()->programs[0]->id) }}">Annual
+                            Plan</a>
+                    <li>
+                    <li><a
+                            href="{{ URL::action('ThreeYearPlanController@threeYearsReport', Auth::user()->programs[0]->id) }}">Three
+                            Years Plan</a></li>
+                </ul>
             </li>
-          
-          @if(count(Auth::user()->courses))
-          <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReport', 'My Courses\' Reports') }}</li>
-          @endif
 
-   
+
+            <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><a href="{{ URL::action('OutcomesController@annualReport', Auth::user()->programs[0]->id) }}">Annual Reports</a></li>
-  
-          <li>{{ HTML::linkAction('TransformativeActionsController@viewFormativeActions', 'Tranformative and Formative Actions')}}
-    
-        </ul>
-      </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
+
+            <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><a
+                            href="{{ URL::action('OutcomesController@programAssessmentReport', Auth::user()->programs[0]->id) }}">Program
+                            Reports</a></li>
+
+            </li>
+
+            @if (count(Auth::user()->courses))
+                <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReport', 'My Courses\' Reports') }}
+                </li>
+            @endif
+
+
+            </li>
+            <li><a href="{{ URL::action('OutcomesController@annualReport', Auth::user()->programs[0]->id) }}">Annual
+                    Reports</a></li>
+
+            <li>{{ HTML::linkAction('TransformativeActionsController@viewFormativeActions', 'Formative Actions') }}
 
-      <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>
-    </ul>
-  </div>
+        </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>
+            </ul>
+    </div>
 </div>

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

@@ -1,86 +1,105 @@
 <div class="navbar navbar-inverse navbar-static-top">
-  <div class="container-fluid">
-    <!--<div class="navbar-header">
-      {{ HTML::linkAction('SchoolCoordinatorsController@overview', 'Online Learning Assessment System · Administrator', array(), array('class'=>'navbar-brand')) }}
+    <div class="container-fluid">
+        <!--<div class="navbar-header">
+      {{ HTML::linkAction('SchoolCoordinatorsController@overview', 'Online Learning Assessment System · Administrator', [], ['class' => 'navbar-brand']) }}
     </div>-->
-    <ul class="nav navbar-nav navbar-right">
-      <li>{{ HTML::linkAction('SchoolCoordinatorsController@overview', 'Overview') }}</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">Management<span class="caret"></span></a>
-        <ul class="dropdown-menu" role="menu">
-<li>{{ HTML::linkAction('Objective2Controller@editSchool', 'Objectives')}}</li>
-      <li>{{ HTML::linkAction('CriteriaController@editSchool', 'Criteria') }}</li>
- <li>{{ HTML::linkAction('TemplatesController@newTemplate', 'Rubrics') }}</li>
- <li>{{ HTML::linkAction('TemplatesController@index', 'Rubric List') }}</li>
-         
- <li>{{ HTML::linkAction('TransformativeActionsController@editTA', 'Transformative Actions') }}</li>
+        <ul class="nav navbar-nav navbar-right">
+            <li>{{ HTML::linkAction('SchoolCoordinatorsController@overview', 'Overview') }}</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">Management<span class="caret"></span></a>
+                <ul class="dropdown-menu" role="menu">
+                    <li>{{ HTML::linkAction('Objective2Controller@editSchool', 'Objectives') }}</li>
+                    <li>{{ HTML::linkAction('CriteriaController@editSchool', 'Criteria') }}</li>
+                    <li>{{ HTML::linkAction('TemplatesController@newTemplate', 'Rubrics') }}</li>
+                    <li>{{ HTML::linkAction('TemplatesController@index', 'Rubric List') }}</li>
 
+                    <li>{{ HTML::linkAction('TransformativeActionsController@editTA', 'Transformative Actions') }}
+                    </li>
 
-      </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.')', array('id'=>$course->id)) }}</li>
-          @endforeach
-        </ul>
-      </li>
-      @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@schoolAssessmentReport', 'School Reports') }}</li>
-          @if(count(Auth::user()->courses))
-          <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReport', 'My Courses\' Reports') }}</li>
-          
-          @endif
-          <li>{{HTML::linkAction('AnnualPlansController@selectProgramPlan','Annual Reports')}}</li>
-          <li>{{ HTML::linkAction('TransformativeActionsController@viewFormativeActions', 'Tranformative and Formative Actions')}}
-    
-        </ul>
-      </li>
-      <li class='dropdown'>
-        <a href ='#' class ='dropdown-toggle' data-toggle='dropdown' role='button' aria-expanded="false"> Annual Plans<span class="caret"></span></a>
-        <ul class ='dropdown-menu' role='menu'>
-          @foreach (Auth::user()->school->programs as $program)
-          <li><a href ="{{ URL::action('AnnualPlansController@showPlan', array($program->id))}}" >{{$program->name}}</a></li>
-          @endforeach
-        </ul></li>
-        <li class='dropdown'>
-          <a href ='#' class ='dropdown-toggle' data-toggle='dropdown' role='button' aria-expanded="false"> Three year Plans<span class="caret"></span></a>
-          <ul class ='dropdown-menu' role='menu'>
-            @foreach (Auth::user()->school->programs as $program)
-            <li><a href ="{{ URL::action('ThreeYearPlanController@threeYearsReport', array($program->id))}}" >{{$program->name}}</a></li>
-            @endforeach
-          </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>
+            @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
+
+            <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@schoolAssessmentReport', 'School Reports') }}</li>
+                    @if (count(Auth::user()->courses))
+                        <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReport', 'My Courses\' Reports') }}
+                        </li>
+
+                    @endif
+                    <li>{{ HTML::linkAction('AnnualPlansController@selectProgramPlan', 'Annual Reports') }}</li>
+                    <li>{{ HTML::linkAction('TransformativeActionsController@viewFormativeActions', 'Formative Actions') }}
+
+                </ul>
+            </li>
+            <li class='dropdown'>
+                <a href='#' class='dropdown-toggle' data-toggle='dropdown' role='button' aria-expanded="false"> Annual
+                    Plans<span class="caret"></span></a>
+                <ul class='dropdown-menu' role='menu'>
+                    @foreach (Auth::user()->school->programs as $program)
+                        <li><a
+                                href="{{ URL::action('AnnualPlansController@showPlan', [$program->id]) }}">{{ $program->name }}</a>
+                        </li>
+                    @endforeach
+                </ul>
+            </li>
+            <li class='dropdown'>
+                <a href='#' class='dropdown-toggle' data-toggle='dropdown' role='button' aria-expanded="false"> Three
+                    year Plans<span class="caret"></span></a>
+                <ul class='dropdown-menu' role='menu'>
+                    @foreach (Auth::user()->school->programs as $program)
+                        <li><a
+                                href="{{ URL::action('ThreeYearPlanController@threeYearsReport', [$program->id]) }}">{{ $program->name }}</a>
+                        </li>
+                    @endforeach
+                </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>
         </ul>
-      </li>
-    </ul>
-  </div>
+    </div>
 </div>

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

@@ -47,13 +47,13 @@
         </ul>
         <div id="allLists" class="tab-content">
             <div role="tabpanel" class='tab-pane first' id="activity_1">
-
+<h3 style="text-align: center">Performance by Learning Outcome Criteria in {{ $activity_1->name }}</h3><hr>
                 <div class="col-md-9" id="graph_1"></div>
                 
             </div>
 
             <div role="tabpanel" class='tab-pane' id="activity_2">
-
+                <h3 style="text-align: center">Performance by Learning Outcome Criteria in {{ $activity_2->name }}</h3><hr>
                 <div class="col-md-9" id="graph_2"></div>
                
             </div>
@@ -79,10 +79,16 @@
         </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>
+                <h3 style="text-align: center">Criteria Achievement {{ $activity_1->name }}</h3><hr>
+                <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>
+                <h3 style="text-align: center">Criteria Achievement {{ $activity_2->name }}</h3><hr>
+                <div class="col-md-9" id="criteriaGraph_2">
+                    
+                </div>
             </div>
         </div>
     </div>
@@ -549,7 +555,7 @@ $('#criteriaGraph_1').highcharts({
         @endif,
     },
     title: {
-        text: 'Criteria Achievement',
+        text: ' ',
     },
     xAxis: {
         categories: [
@@ -597,7 +603,7 @@ $('#criteriaGraph_1').highcharts({
 
     tooltip: {
         headerFormat: '<span style="font-size:10px">{point.key}</span> <table > ',
-        pointFormat: '<tr> <td style = "color:{series.color};padding:0" > {series.name}: < /td>' +
+        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,
@@ -658,7 +664,7 @@ $('#criteriaGraph_2').highcharts({
         @endif,
     },
     title: {
-        text: 'Criteria Achievement',
+        text: ' ',
     },
     xAxis: {
         categories: [
@@ -706,7 +712,7 @@ $('#criteriaGraph_2').highcharts({
 
     tooltip: {
         headerFormat: '<span style="font-size:10px">{point.key}</span> <table > ',
-        pointFormat: '<tr> <td style = "color:{series.color};padding:0" > {series.name}: < /td>' +
+        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,
@@ -761,7 +767,7 @@ $('#graph_1').highcharts({
         type: 'bar',
     },
     title: {
-        text: 'Performance by Learning Outcome Criteria in {{ $activity_1->name }}<br><br>'
+        text: ' '
     },
     xAxis: {
         categories: [
@@ -790,7 +796,7 @@ $('#graph_1').highcharts({
     },
     tooltip: {
         headerFormat: '<span style="font-size:10px">{point.key}</span> <table > ',
-        pointFormat: '<tr> <td style = "color:{series.color};padding:0" > {series.name}: < /td>' +
+        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,
@@ -863,7 +869,7 @@ $('#graph_2').highcharts({
         type: 'bar',
     },
     title: {
-        text:'Performance by Learning Outcome Criteria in {{ $activity_2->name }}<br><br>'
+        text:' '
         },
     xAxis: {
         categories: [
@@ -892,7 +898,7 @@ $('#graph_2').highcharts({
     },
     tooltip: {
         headerFormat: '<span style="font-size:10px">{point.key}</span> <table > ',
-        pointFormat: '<tr> <td style = "color:{series.color};padding:0" > {series.name}: < /td>' +
+        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,

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

@@ -178,7 +178,11 @@
                   </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>
+                     <button type ="button" class= 'btn btn-primary' onclick ="goToURL()" 
+                     @if(!count($activities))
+                     disabled
+                     @endif
+                     >Compare</button>
                   {{ Form::close() }}
                 </div>
               </div><!-- /.modal-content -->
@@ -226,8 +230,9 @@
     function goToURL(){
         activity1 = $('#select-activity-1').val();
         activity2 = $('#select-activity-2').val();
-
+        if(activity1 && activity2)
         window.open('../compare_activities/'+activity1+'/'+activity2,'_self');
+
     }
 </script>
 @stop