Created new Overview page

For Administrators, show Percent of Students Achieving Learning Outcomes By Academic Session

app/controllers/AdministratorsController.php

@@ -1,7 +1,7 @@
 <?php
 
 class AdministratorsController extends \BaseController
-{	
+{
 	private function outcomes_semesters($selected_semesters, $level)
 	{
 		$min_start="9000-01-01 00:00:00";
@@ -42,14 +42,14 @@ class AdministratorsController extends \BaseController
 												   ->orWhere("level",3);
 										})
 								->count();
-	
+
 		foreach($outcomes as $outcome)
 		{
-			
+
 // 		var_dump($outcome->id);
 // 		print "<br>";
 			$outcomes_attempted[$outcome->id]=$outcome->attempted($selected_semesters, $level);
-			$outcomes_achieved[$outcome->id]=$outcome->achieved($selected_semesters, $level);	
+			$outcomes_achieved[$outcome->id]=$outcome->achieved($selected_semesters, $level);
 		}
 
         $uhs_school_id = School::where('name', 'LIKE', '%UHS%')->first()->id;
@@ -91,34 +91,34 @@ class AdministratorsController extends \BaseController
 				}
 			}
 		}
-	
+
 		return array('outcomes'=>$outcomes,'outcomes_attempted'=>$outcomes_attempted, 'outcomes_achieved'=>$outcomes_achieved, 'attemptedProgramsPerOutcome'=>$attemptedProgramsPerOutcome, 'achievedProgramsPerOutcome'=>$achievedProgramsPerOutcome,'participating_programs'=>$participating_programs);
-	
-	
-	
+
+
+
 	}
     public function overview()
     {
-    
+
         $selected_semesters = Semester::find(Session::get('semesters_ids'));
-        
+
 		$subgraduado=$this->outcomes_semesters($selected_semesters,0);
         $outcomes_subgrad=$subgraduado['outcomes'];
-        $undergrad_outcomes_achieved=$subgraduado['outcomes_achieved']; 
-        $undergrad_outcomes_attempted=$subgraduado['outcomes_attempted']; 
-        $attemptedUndergradProgramsPerOutcome=$subgraduado['attemptedProgramsPerOutcome']; 
-        $achievedUndergradProgramsPerOutcome=$subgraduado['achievedProgramsPerOutcome']; 
-        $participating_undergrad_programs=$subgraduado['participating_programs']; 
-		
-		
+        $undergrad_outcomes_achieved=$subgraduado['outcomes_achieved'];
+        $undergrad_outcomes_attempted=$subgraduado['outcomes_attempted'];
+        $attemptedUndergradProgramsPerOutcome=$subgraduado['attemptedProgramsPerOutcome'];
+        $achievedUndergradProgramsPerOutcome=$subgraduado['achievedProgramsPerOutcome'];
+        $participating_undergrad_programs=$subgraduado['participating_programs'];
+
+
 		$graduado=$this->outcomes_semesters($selected_semesters,1);
         $outcomes_grad=$graduado['outcomes'];
-        $grad_outcomes_achieved=$graduado['outcomes_achieved']; 
-        $grad_outcomes_attempted=$graduado['outcomes_attempted']; 
-        $attemptedGradProgramsPerOutcome=$graduado['attemptedProgramsPerOutcome']; 
-        $achievedGradProgramsPerOutcome=$graduado['achievedProgramsPerOutcome']; 
-        $participating_grad_programs=$graduado['participating_programs']; 
-		
+        $grad_outcomes_achieved=$graduado['outcomes_achieved'];
+        $grad_outcomes_attempted=$graduado['outcomes_attempted'];
+        $attemptedGradProgramsPerOutcome=$graduado['attemptedProgramsPerOutcome'];
+        $achievedGradProgramsPerOutcome=$graduado['achievedProgramsPerOutcome'];
+        $participating_grad_programs=$graduado['participating_programs'];
+
         //Total amount of learning outcomes
 //         $outcomeCount = Outcome::withTrashed()->count();
 //         $selected_semester = Semester::find(Session::get('semesters_ids')[0]);
@@ -147,7 +147,7 @@ class AdministratorsController extends \BaseController
 //         									    		   ->orWhere("level",3);
 //         									    })
 //         								->count();
-// 
+//
 //         $outcomes_grad = Outcome::where(function($query) use ($selected_semester){$query->where('deactivation_date', '>=', $selected_semester->start)->orWhere('deactivation_date', null);})->where(function($query2){$query2->where("level",2)->orWhere("level",3);})->orderBy('name', 'ASC')->get();
 //         $outcomeCount_grad = Outcome::where(function($query) use ($selected_semester){$query->where('deactivation_date', '>=', $selected_semester->start)->orWhere('deactivation_date', null);})->where(function($query2){$query2->where("level",2)->orWhere("level",3);})->count();
 
@@ -159,21 +159,21 @@ class AdministratorsController extends \BaseController
 
         $schools = School::where('id', '!=', $uhs_school_id)->orderBy('name', 'asc')->get();
         $title = 'Campus Overview';
-        
-        
+
+
         /**
          * Calculate campus wide outcome performance by counting the number of students
-         $undergrad_outcomes_attempted will have the number of criteria that was assessed in undergradute courses during the selected semester 
-         $undergrad_outcomes_achieved will have the number of criteria that was assessed in undergradute courses  during the selected semester 
+         $undergrad_outcomes_attempted will have the number of criteria that was assessed in undergradute courses during the selected semester
+         $undergrad_outcomes_achieved will have the number of criteria that was assessed in undergradute courses  during the selected semester
             where the percentage of students that obtained a better or equal score than the expected_student_score established in the
             activity_criterion table is greater or equal than the expected_percentage_students_achieving also established in the
-            activity_criterion table         
+            activity_criterion table
          */
 
 // 		foreach($outcomes_subgrad as $outcome)
 // 		{
 // 			$undergrad_outcomes_attempted[$outcome->id]=$outcome->attempted($selected_semester->id,0);
-// 			$undergrad_outcomes_achieved[$outcome->id]=$outcome->achieved($selected_semester->id,0);	
+// 			$undergrad_outcomes_achieved[$outcome->id]=$outcome->achieved($selected_semester->id,0);
 // 		}
 // 		var_dump($undergrad_outcomes_attempted);
 // 		print"<br>";
@@ -182,7 +182,7 @@ class AdministratorsController extends \BaseController
 // 		foreach($outcomes_grad as $outcome)
 // 		{
 // 			$grad_outcomes_attempted[$outcome->id]=$outcome->attempted($selected_semester->id,1);
-// 			$grad_outcomes_achieved[$outcome->id]=$outcome->achieved($selected_semester->id,1);			
+// 			$grad_outcomes_achieved[$outcome->id]=$outcome->achieved($selected_semester->id,1);
 // 		}
 
         /**
@@ -221,7 +221,7 @@ class AdministratorsController extends \BaseController
 //             }))->where('is_graduate', 0)->where('school_id', '!=', $uhs_school_id)->orderBy('name', 'asc')->get() as $program)
 //             {
 //             	$participating_undergrad_programs[$program->id]=(object)array('id'=>$program->id, 'name'=>$program->name, 'is_graduate'=> $program->is_graduate, 'school_id'=>$program->school_id,'semestre_id',$selected_semester);
-// 
+//
 // // 				SELECT ac.id activity_criterion_id, ac.activity_id, ac.expected_student_score, ac.expected_percentage_students_achieving, co.program_id FROM activity_criterion ac, new_criteria c, activities a, objectives o, courses co where co.id=a.course_id and co.semester_id=13 and a.id=ac.activity_id and c.id = ac.criterion_id and o.id=c.objective_id and o.outcome_id = 2 order by program_id
 // 				$program_attempted_outcome=$program->attempted_outcome($outcome->id, $selected_semester->id);
 // 				$attempted_outcomes_per_undergrad_program[$outcome->id]+=$program_attempted_outcome;
@@ -250,11 +250,11 @@ class AdministratorsController extends \BaseController
 // 		exit();
         /**
          * Calculate how many grad programs achieved and attempted each outcome
-         $grad_outcomes_attempted will have the number of criteria that was assessed in gradute courses during the selected semester 
-         $grad_outcomes_achieved will have the number of criteria that was assessed in gradute courses  during the selected semester 
+         $grad_outcomes_attempted will have the number of criteria that was assessed in gradute courses during the selected semester
+         $grad_outcomes_achieved will have the number of criteria that was assessed in gradute courses  during the selected semester
             where the percentage of students that obtained a better or equal score than the expected_student_score established in the
             activity_criterion table is greater or equal than the expected_percentage_students_achieving also established in the
-            activity_criterion table         
+            activity_criterion table
          */
 
 
@@ -303,4 +303,319 @@ class AdministratorsController extends \BaseController
 // 		exit();
         return View::make('local.managers.admins.overview', compact('title', 'schools', 'outcomes_subgrad', 'outcomes_grad', 'undergrad_outcomes_achieved', 'undergrad_outcomes_attempted', 'grad_outcomes_achieved', 'grad_outcomes_attempted', 'attemptedUndergradProgramsPerOutcome', 'participating_undergrad_programs', 'achievedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'participating_grad_programs', 'achievedGradProgramsPerOutcome'));
     }
+
+
+    public function overview2()
+    {
+			// '''
+			//stucture of outcomes array:
+			//
+			// $outcome->id
+			// $outcome->name
+			// $outcome->semesters
+			//
+			// $outcome->semesters[i]->id
+			// $outcome->semesters[i]->code
+			// $outcome->semesters[i]->name
+			// $outcome->semesters[i]->tested
+			// $outcome->semesters[i]->achievers
+			// '''
+      $selected_semesters = Semester::find(Session::get('semesters_ids'));
+			$title = 'Overview2';
+
+			$semesters = DB::table('overview')
+          ->join('semesters','semesters.id','=','overview.semester_id')
+          ->select('semesters.name', 'semesters.code')
+					->orderBy('semesters.code', 'asc')
+					->groupBy('semesters.id')
+          ->get();
+			$outcomes = DB::table('overview')
+          ->join('outcomes','outcomes.id','=','overview.outcome_id')
+          ->selectRaw('outcomes.name, overview.outcome_id as id, sum(overview.total_evaluated) as total_evaluated, sum(overview.total_achieved) as total_achieved')
+					->orderBy('outcomes.name', 'asc')
+					->groupBy('overview.outcome_id')
+          ->get();
+			foreach ($outcomes as $outcome) {
+				$outcome->semesters = DB::table('overview')
+	          ->join('semesters','semesters.id','=','overview.semester_id')
+						->where('overview.outcome_id', $outcome->id)
+						->selectRaw('semesters.id, semesters.name, semesters.code, sum(overview.total_evaluated) as total_evaluated, sum(overview.total_achieved) as total_achieved')
+						->orderBy('semesters.code', 'asc')
+						->groupBy('overview.outcome_id')
+						->groupBy('overview.semester_id')
+	          ->get();
+			}
+
+			$filters = array();
+			$filters['school'] = DB::table('overview')
+          ->join('programs','programs.id','=','overview.program_id')
+          ->join('schools','schools.id','=','programs.school_id')
+					->select('schools.id','schools.name')
+					->orderBy('schools.name', 'asc')
+					->groupBy('schools.id')
+          ->get();
+
+			$filters['program'] = DB::table('overview')
+          ->join('programs','programs.id','=','overview.program_id')
+					->select('programs.id','programs.name')
+					->orderBy('programs.name', 'asc')
+					->groupBy('overview.program_id')
+          ->get();
+
+			$filters['semester'] = DB::table('overview')
+          ->join('semesters','semesters.id','=','overview.semester_id')
+          ->select('semesters.id','semesters.name','semesters.code')
+					->orderBy('semesters.code', 'asc')
+					->groupBy('overview.semester_id')
+          ->get();
+
+			$filters['year'] = DB::table('overview')//
+          ->join('semesters','semesters.id','=','overview.semester_id')
+          ->select('semesters.id','semesters.start')
+					->orderBy('semesters.code', 'asc')
+					->groupBy('overview.semester_id')
+          ->get();
+
+			$filters['outcome'] = DB::table('overview')
+          ->join('outcomes','outcomes.id','=','overview.outcome_id')
+          ->select('outcomes.id','outcomes.name')
+					->orderBy('outcomes.name', 'asc')
+					->groupBy('overview.outcome_id')
+          ->get();
+
+			$target = 0.70;
+
+      return View::make('local.managers.admins.overview2', compact('title','selected_semesters','outcomes','semesters','filters','target'));
+    }
+
+		// this is called when filters are changed
+    public function overview2_filter_results()
+    {
+
+			// selected filter data
+			$schools = Input::get('schools');
+			$programs = Input::get('programs');
+			$semesters = Input::get('semesters');
+			$years = Input::get('years');
+			$outcomes = Input::get('outcomes');
+
+
+			// make an array id's of schools selected. if All, use All available id's
+			if ($schools == array("0")){
+				$result = DB::table('overview')
+						->join('programs','programs.id','=','overview.program_id')
+						->join('schools','schools.id','=','programs.school_id')
+						->select('schools.id')
+						->orderBy('schools.name', 'asc')
+						->groupBy('schools.id')
+						->get();
+				$schools_id = array();
+				foreach ($result as $school) {
+					array_push($schools_id,$school->id);
+				}
+			}else {
+				$schools_id = array();
+				foreach ($schools as $school_id) {
+					array_push($schools_id,intval($school_id));
+				}
+			}
+			// make an array id's of programs selected. if All, use All available id's
+			if ($programs == array("0")){
+				$result = DB::table('overview')
+	          ->join('programs','programs.id','=','overview.program_id')
+						->select('programs.id')
+						->orderBy('programs.name', 'asc')
+						->groupBy('overview.program_id')
+	          ->get();
+				$programs_id = array();
+				foreach ($result as $program) {
+					array_push($programs_id,$program->id);
+				}
+			}else {
+				$programs_id = array();
+				foreach ($programs as $program_id) {
+					array_push($programs_id,intval($program_id));
+				}
+			}
+			// make an array id's of semesters selected. if All, use All available id's
+			if ($semesters == array("0")){
+				$result = DB::table('overview')
+	          ->join('semesters','semesters.id','=','overview.semester_id')
+	          ->select('semesters.id')
+						->orderBy('semesters.code', 'asc')
+						->groupBy('overview.semester_id')
+	          ->get();
+				$semesters_id = array();
+				foreach ($result as $semester) {
+					array_push($semesters_id,$semester->id);
+				}
+			}else {
+				$semesters_id = array();
+				foreach ($semesters as $semester_id) {
+					array_push($semesters_id,intval($semester_id));
+				}
+			}
+			// make an array id's of years selected. if All, use All available id's
+			if ($years == array("0")){
+				$result = DB::table('overview')//
+	          ->join('semesters','semesters.id','=','overview.semester_id')
+	          ->select('semesters.id')
+						->orderBy('semesters.code', 'asc')
+						->groupBy('overview.semester_id')
+	          ->get();
+				$years_id = array();
+				foreach ($result as $year) {
+					array_push($years_id,$year->id);
+				}
+			}else {
+				$years_id = array();
+				foreach ($years as $year_id) {
+					array_push($years_id,intval($year_id));
+				}
+			}
+			// make an array id's of outcomes selected. if All, use All available id's
+			if ($outcomes == array("0")){
+				$result = DB::table('overview')
+	          ->join('outcomes','outcomes.id','=','overview.outcome_id')
+	          ->select('outcomes.id')
+						->orderBy('outcomes.name', 'asc')
+						->groupBy('overview.outcome_id')
+	          ->get();
+				$outcomes_id = array();
+				foreach ($result as $outcome) {
+					array_push($outcomes_id,$outcome->id);
+				}
+			}else {
+				$outcomes_id = array();
+				foreach ($outcomes as $outcome_id) {
+					array_push($outcomes_id,intval($outcome_id));
+				}
+			}
+
+
+			// get data for graph
+			$semesters = DB::table('overview')
+					->join('programs','programs.id','=','overview.program_id')
+					->join('schools','schools.id','=','programs.school_id')
+					->join('semesters','semesters.id','=','overview.semester_id')
+					->join('outcomes','outcomes.id','=','overview.outcome_id')
+					->whereIn('schools.id',$schools_id)
+					->whereIn('programs.id',$programs_id)
+					->whereIn('semesters.id',$semesters_id)
+					// ->whereIn('years.id',$years_id)
+					->whereIn('outcomes.id',$outcomes_id)
+          ->select('semesters.name', 'semesters.code')
+					->orderBy('semesters.code', 'asc')
+					->groupBy('semesters.id')
+					->get();
+			$outcomes = DB::table('overview')
+					->join('programs','programs.id','=','overview.program_id')
+					->join('schools','schools.id','=','programs.school_id')
+					->join('semesters','semesters.id','=','overview.semester_id')
+					->join('outcomes','outcomes.id','=','overview.outcome_id')
+					->whereIn('schools.id',$schools_id)
+					->whereIn('programs.id',$programs_id)
+					->whereIn('semesters.id',$semesters_id)
+					// ->whereIn('years.id',$years_id)
+					->whereIn('outcomes.id',$outcomes_id)
+          ->selectRaw('outcomes.name, overview.outcome_id as id, sum(overview.total_evaluated) as total_evaluated, sum(overview.total_achieved) as total_achieved')
+					->orderBy('outcomes.name', 'asc')
+					->groupBy('overview.outcome_id')
+					->get();
+			foreach ($outcomes as $outcome) {
+				$outcome->semesters = DB::table('overview')
+						->join('programs','programs.id','=','overview.program_id')
+						->join('schools','schools.id','=','programs.school_id')
+						->join('semesters','semesters.id','=','overview.semester_id')
+						->join('outcomes','outcomes.id','=','overview.outcome_id')
+						->whereIn('schools.id',$schools_id)
+						->whereIn('programs.id',$programs_id)
+						->whereIn('semesters.id',$semesters_id)
+						// ->whereIn('years.id',$years_id)
+						->whereIn('outcomes.id',$outcomes_id)
+						->where('overview.outcome_id', $outcome->id)
+						->selectRaw('semesters.id, semesters.name, semesters.code, sum(overview.total_evaluated) as total_evaluated, sum(overview.total_achieved) as total_achieved')
+						->orderBy('semesters.code', 'asc')
+						->groupBy('overview.outcome_id')
+						->groupBy('overview.semester_id')
+						->get();
+			}
+
+			// get data for filters
+			$filters = array();
+			$filters['school'] = DB::table('overview')
+					->join('programs','programs.id','=','overview.program_id')
+					->join('schools','schools.id','=','programs.school_id')
+					->join('semesters','semesters.id','=','overview.semester_id')
+					->join('outcomes','outcomes.id','=','overview.outcome_id')
+					->whereIn('schools.id',$schools_id)
+					->whereIn('programs.id',$programs_id)
+					->whereIn('semesters.id',$semesters_id)
+					// ->whereIn('years.id',$years_id)
+					->whereIn('outcomes.id',$outcomes_id)
+					->select('schools.id','schools.name')
+					->orderBy('schools.name', 'asc')
+					->groupBy('schools.id')
+					->get();
+			$filters['program'] = DB::table('overview')
+					->join('programs','programs.id','=','overview.program_id')
+					->join('schools','schools.id','=','programs.school_id')
+					->join('semesters','semesters.id','=','overview.semester_id')
+					->join('outcomes','outcomes.id','=','overview.outcome_id')
+					->whereIn('schools.id',$schools_id)
+					// ->whereIn('programs.id',$programs_id)
+					->whereIn('semesters.id',$semesters_id)
+					// ->whereIn('years.id',$years_id)
+					->whereIn('outcomes.id',$outcomes_id)
+					->select('programs.id','programs.name')
+					->orderBy('programs.name', 'asc')
+					->groupBy('overview.program_id')
+					->get();
+			$filters['semester'] = DB::table('overview')
+					->join('programs','programs.id','=','overview.program_id')
+					->join('schools','schools.id','=','programs.school_id')
+					->join('semesters','semesters.id','=','overview.semester_id')
+					->join('outcomes','outcomes.id','=','overview.outcome_id')
+					->whereIn('schools.id',$schools_id)
+					->whereIn('programs.id',$programs_id)
+					// ->whereIn('semesters.id',$semesters_id)
+					// ->whereIn('years.id',$years_id)
+					->whereIn('outcomes.id',$outcomes_id)
+					->select('semesters.id','semesters.name','semesters.code')
+					->orderBy('semesters.code', 'asc')
+					->groupBy('overview.semester_id')
+					->get();
+			$filters['year'] = DB::table('overview')////////////////////////////////////////////
+					->join('programs','programs.id','=','overview.program_id')
+					->join('schools','schools.id','=','programs.school_id')
+					->join('semesters','semesters.id','=','overview.semester_id')
+					->join('outcomes','outcomes.id','=','overview.outcome_id')
+					->whereIn('schools.id',$schools_id)
+					->whereIn('programs.id',$programs_id)
+					->whereIn('semesters.id',$semesters_id)
+					// ->whereIn('years.id',$years_id)
+					->whereIn('outcomes.id',$outcomes_id)
+
+					->get();
+			$filters['outcome'] = DB::table('overview')
+					->join('programs','programs.id','=','overview.program_id')
+					->join('schools','schools.id','=','programs.school_id')
+					->join('semesters','semesters.id','=','overview.semester_id')
+					->join('outcomes','outcomes.id','=','overview.outcome_id')
+					->whereIn('schools.id',$schools_id)
+					->whereIn('programs.id',$programs_id)
+					->whereIn('semesters.id',$semesters_id)
+					// ->whereIn('years.id',$years_id)
+					// ->whereIn('outcomes.id',$outcomes_id)
+					->select('outcomes.id','outcomes.name')
+					->orderBy('outcomes.name', 'asc')
+					->groupBy('overview.outcome_id')
+          ->get();
+
+			return array(
+				"semesters" => $semesters,
+				"outcomes_info" => $outcomes,
+				"filters" => $filters,
+			);
+    }
 }

app/database/migrations/2021_05_18_102422_create_overview_table.php

@@ -0,0 +1,55 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateOverviewTable extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		Schema::create('overview', function (Blueprint $table) {
+			$table->increments('id');
+
+			$table->integer('program_id')->unsigned();
+			$table->foreign('program_id')
+				->references('id')
+				->on('programs')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->integer('outcome_id')->unsigned();
+			$table->foreign('outcome_id')
+				->references('id')
+				->on('outcomes')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->integer('semester_id')->unsigned();
+			$table->foreign('semester_id')
+				->references('id')
+				->on('semesters')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+
+			$table->integer('total_evaluated')->unsigned();
+			$table->integer('total_achieved')->unsigned();
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		Schema::drop('overview');
+
+	}
+
+}

app/routes.php

@@ -256,6 +256,8 @@ Route::group(array('before' => 'auth|has_access'), function () {
      */
     Route::group(array('before' => 'admin'), function () {
         Route::get('/administrator', 'AdministratorsController@overview');
+        Route::get('/administrator2', 'AdministratorsController@overview2');
+        Route::post('/administrator2/filter', 'AdministratorsController@overview2_filter_results');
         Route::post('administrator/rubrics', array(
             'as' => 'rubrics',
             'before' => 'csrf',

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

@@ -3,8 +3,7 @@
 
     <ul class="nav navbar-nav navbar-right">
       <li>{{ HTML::linkAction('AdministratorsController@overview', 'Overview') }}</li>
-      <li>{{ HTML::linkAction('ThreeYearPlanController@threeYearsReport', 'Three Years Plan') }}</li>
-      <li>{{ HTML::linkAction('TransformativeActionsController@editTA', 'Transformative Actions') }}</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>
@@ -35,7 +34,7 @@
         </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">
@@ -46,16 +45,16 @@
           @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@managerAssessmentReports', 'Campus Reports') }}</li>
           @if(count(Auth::user()->courses))
           <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReports', 'My Courses\' Reports') }}</li>
-          
+
           @endif
         </ul>
       </li>

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

@@ -0,0 +1,515 @@
+@extends('layouts.master')
+
+@section('navigation')
+@include('local.managers.admins._navigation')
+@stop
+
+@section('main')
+
+<div>
+  <div class="">
+    <script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>
+    <script type="text/javascript">
+
+    function make_chart(outcomes_info, semesters) {
+      //////// Get values ready for chart
+      var target_line = {{$target}};
+      var x_label = 'Learning Outcomes';
+      var y_label = 'Percent of students';
+      var outcomes_labels = Array();
+      var i = 0;
+      outcomes_info.forEach(eachOutcome);
+      function eachOutcome(outcome, index) {
+        outcomes_labels.push({v: (index+1), f: outcome.name});
+        i = i + 1;
+      }
+
+      //
+      var outcomes_data = Array();
+
+      var legend = Array();
+      legend.push('');
+      legend.push('Target');
+      $.each(semesters, function(index, semester){
+        var name = semester.name;
+        name = name.split(' ');
+        var semester_number = name[0];
+        var semester_year = name[2];
+
+        if (semester_number == 'First'){
+          semester_number = '1';
+        }
+        else if (semester_number == 'Second'){
+          semester_number = '2';
+        }
+
+        name = semester_year + " Sem " + semester_number;
+        legend.push(name);
+      });
+      outcomes_data.push(legend);
+
+      //
+      var hidden_values = Array();
+      hidden_values.push(0);
+      hidden_values.push(target_line);
+      var k = 0;
+      while (k < semesters.length){
+        hidden_values.push(null);
+        k = k + 1;
+      }
+
+      //
+      outcomes_data.push(hidden_values);
+
+      $.each(outcomes_info, function(index, outcome){
+        var temp_outcome_grouping_info = Array();
+        temp_outcome_grouping_info.push({v:(index+1),f:"Students acheiving Learning Outcomes"});
+        temp_outcome_grouping_info.push(target_line);
+
+        var i = 0;
+        $.each(outcome.semesters, function(index, semester){
+
+          // if semester is not the same, insert null.
+          //  else, insert info from expected semester.
+          if(semester.name != semesters[i].name){
+            while(semester.name != semesters[i].name && i < semesters.length){
+              temp_outcome_grouping_info.push(null);
+              i = i + 1;
+            }
+          }
+          i = i + 1;
+
+          var total = semester.total_evaluated;
+          var achievers = semester.total_achieved;
+
+          var percentage = achievers/total;
+          var display_percentage = percentage*100;
+          temp_outcome_grouping_info.push({v:percentage,f:'\nAchieved by ' + display_percentage.toFixed(2) + '%\n(' + achievers + ' achievers and ' + total + ' participants)'});
+        });
+
+        var i = temp_outcome_grouping_info.length;
+        while(i < semesters.length+2){
+          temp_outcome_grouping_info.push(null);
+          i = i + 1;
+        }
+
+        outcomes_data.push(temp_outcome_grouping_info);
+      });
+      var last_hidden_values = [...hidden_values];
+      last_hidden_values[0] = i+1;
+      outcomes_data.push(last_hidden_values);
+
+      ////////
+      google.charts.load('current', {
+        packages: ['corechart']
+      }).then(function () {
+        var data = google.visualization.arrayToDataTable(outcomes_data);
+        // var data = google.visualization.arrayToDataTable([
+        //   ['', 'Target', '2020-21 Sem 2', '2021-22 Sem 1', '2021-22 Sem 2'],
+        //   [0, 0.80, null, null, null],
+        //   [{v:1,f:"Students acheiving Learning Outcomes"}, 0.80, {v:0.8275,f:82.75}, {v:0.9075,f:'\nAchieved by '+(90.75).toString()+'%\n(60 achievers and 80 participants)'}, {v:0.8475,f:84.75}],
+        //   [{v:2,f:"Students acheiving Learning Outcomes"}, 0.80, {v:0.7475,f:74.75}, {v:0.8775,f:87.75}, {v:0.9975,f:60.75}],
+        //   [{v:3,f:"Students acheiving Learning Outcomes"}, 0.80, {v:0.6875,f:68.75}, {v:0.9175,f:91.75}, {v:0.8475,f:84.75}],
+        //   [4, 0.80, null, null, null]
+        // ]);
+
+        var chartDiv = document.getElementById('chart_div');
+        var chart = new google.visualization.ColumnChart(chartDiv);
+        chart.draw(data, {
+          // colors: ['lime', 'magenta'],
+          hAxis: {
+            title: x_label,
+            ticks: outcomes_labels,
+            viewWindow: {
+              min: 0.5,
+              max: outcomes_info.length + 0.5 // el total de outcomes + 0.5
+            },
+            textStyle : {
+              fontSize: 10,
+              bold: true,
+            }
+          },
+          legend: 'right',
+          series: {
+            0: {
+              type: 'line'
+            }
+          },
+          title: ' ',
+          chartArea: {
+            width: '70%',
+            // top: 10,
+            // height: '50%'
+          },
+          vAxis: {
+            title: y_label,
+            format: 'percent',
+            viewWindow: {
+              min: 0,
+              max: 1
+            }
+          }
+        });
+      });
+    }
+
+
+    // labels for each outcome grouping
+    var outcomes_info = <?= json_encode($outcomes, JSON_HEX_TAG); ?>;
+    var semesters = <?= json_encode($semesters, JSON_HEX_TAG); ?>;
+
+    make_chart(outcomes_info,semesters);
+
+    </script>
+    <script src="https://www.gstatic.com/charts/loader.js"></script>
+    <div class="">
+      <div class="filters">
+        <div class="row" style="display: flex;">
+          <div class="category" >
+            <label for="school">School</label>
+            <div class="select">
+              <select multiple class="selectpicker" name="school" id="school">
+                <option value="0" selected="selected">All</option>
+                @foreach ($filters['school'] as $school)
+                  <option value="{{$school->id}}">{{$school->name}}</option>
+                @endforeach
+              </select>
+            </div>
+          </div>
+          <div class="category" >
+            <label for="program" >Academic Program</label>
+            <div class="select">
+              <select multiple class="selectpicker" name="program" id="program">
+                <option value="0" selected="selected">All</option>
+                @foreach ($filters['program'] as $program)
+                  <option value="{{$program->id}}">{{$program->name}}</option>
+                @endforeach
+              </select>
+            </div>
+          </div>
+        </div>
+        <div class="row" style="display: flex;">
+          <div class="category" >
+            <label for="semester">Semester</label>
+            <div class="select">
+              <select multiple class="selectpicker" name="semester" id="semester">
+                <option value="0" selected="selected">All</option>
+                @foreach ($filters['semester'] as $semester)
+                  <option value="{{$semester->id}}">{{$semester->name}}</option>
+                @endforeach
+              </select>
+            </div>
+          </div>
+          <div class="category" >
+            <label for="year">Academic Year</label>
+            <div class="select">
+              <select multiple class="selectpicker" name="year" id="year">
+                <option value="0" selected="selected">All</option>
+                @foreach ($filters['year'] as $year)
+                  <option value="{{$year->id}}">{{$year->start}}</option>
+                @endforeach
+              </select>
+            </div>
+          </div>
+          <div class="category" >
+            <label for="outcome">Learning Outcomes</label>
+            <div class="select">
+              <select multiple class="selectpicker" name="outcome" id="outcome">
+                <option value="0" selected="selected">All</option>
+                @foreach ($filters['outcome'] as $outcome)
+                  <option value="{{$outcome->id}}">{{$outcome->name}}</option>
+                @endforeach
+              </select>
+            </div>
+          </div>
+        </div>
+      </div>
+      <h4 class="container">
+        <b>Percent of Students Achieving Learning Outcomes By Academic Session</b>
+      </h4>
+      <div class="container" style="height:500px; width:1300px;" id="chart_div"></div>
+      <div class="" style="padding-left: 25px;">
+        <h5>
+          <b>Annotation</b>
+        </h5>
+        The target line represents the expected percent of students achieving the learning outcome({{$target*100}}%).
+      </div>
+    </div>
+  </div>
+</div>
+
+@stop
+
+@section('included-js')
+
+<!-- HighCharts -->
+<script src="{{ asset('vendor/highcharts/highcharts.js') }}"></script>
+
+@stop
+
+@section('javascript')
+
+
+$(document).ready(function()
+{
+  $("#year").parent().parent().parent().hide();
+
+
+
+  // when a filter is focused
+  var previous;
+  $(".category").find("button").focus(function() {
+    previous = Array();
+    $(this).parent().find("select option:selected").each(function() {
+      previous.push(this.value);
+    });
+  });
+
+  // when a filter is changed
+  $(".category").find("select").change(function() {
+    var new_value = Array();
+    $(this).parent().find("select option:selected").each(function() {
+      new_value.push(this.value);
+    });
+
+    //if statements so that "All" only can be selected alone and dont allow selecting no options
+    if(jQuery.inArray("0",new_value) !== -1 && jQuery.inArray("0",previous) === -1){
+      $(this).parent().find("select option:selected").each(function() {
+        $(this).removeAttr('selected');
+        $(this).parent().val(0);
+        //$('.selectpicker').selectpicker('refresh');
+        new_value = ["0"];
+      });
+    }else if(jQuery.inArray("0",new_value) !== -1 && jQuery.inArray("0",previous) !== -1 && new_value.length > previous.length){
+      $(this).parent().find("select option:selected").each(function() {
+        if(this.value == "0"){
+          $(this).removeAttr('selected');
+          //$('.selectpicker').selectpicker('refresh');
+          new_value = Array(new_value[1]);
+        }
+      });
+    }else if(new_value.length == 0){
+      $(this).parent().find("select").val(0);
+      //$('.selectpicker').selectpicker('refresh');
+      new_value = ["0"];
+    }
+    previous = new_value;
+
+
+    // get values from all selects
+    var schools = $("#school").val();
+    var programs = $("#program").val();
+    var semesters = $("#semester").val();
+    var years = $("#year").val();
+    var outcomes = $("#outcome").val();
+
+    // query the values and get new data for chart
+    $.post(
+        "{{ URL::action('AdministratorsController@overview2_filter_results') }}",
+      {
+        schools: (schools),
+        programs: (programs),
+        semesters: (semesters),
+        years: (years),
+        outcomes: (outcomes),
+      },
+      function(data)
+      {
+        var filters = data.filters;
+        var outcomes_info = data.outcomes_info;
+        var semesters = data.semesters;
+
+        //////// update chart
+        make_chart(outcomes_info,semesters);
+
+
+        ////////update filters
+        var new_all = $('<option/>',{
+          'value': "0",
+          'html': "All",
+        });;
+
+        {{--
+        //update school filter
+        var school_filter = $("#school");
+        var new_school_options = filters.school;
+        school_filter.find("option").remove();
+        school_filter.append(new_all.clone(true));
+        $.each(new_school_options, function(index, school)
+        {
+          var value = school.id;
+          var html = school.name;
+          var new_option = $('<option/>',{
+            'value': value,
+            'html': html,
+          });;
+          school_filter.append(new_option);
+        });
+        --}}
+
+        //update school filter
+        var school_filter = $("#school");
+        var school_selected_options = Array();
+        school_filter.find("option:selected").each(function() {
+          school_selected_options.push(this.value);
+        });
+        var new_school_options = filters.school;
+        school_filter.find("option").remove();
+        if(Array("0")[0] == school_selected_options[0]){
+          school_filter.append(new_all.clone(true).attr("selected","selected"));
+        } else{
+          school_filter.append(new_all.clone(true));
+        }
+        $.each(new_school_options, function(index, school)
+        {
+          var value = school.id.toString();
+          var html = school.name;
+          var new_option;
+          if(jQuery.inArray(value,school_selected_options) === -1){
+            new_option = $('<option/>',{
+              'value': value,
+              'html': html,
+            });;
+          }else{
+            new_option = $('<option/>',{
+              'value': value,
+              'html': html,
+              'selected': 'selected',
+            });;
+          }
+          school_filter.append(new_option);
+        });
+
+        //update semester filter
+        var semester_filter = $("#semester");
+        var semester_selected_options = Array();
+        semester_filter.find("option:selected").each(function() {
+          semester_selected_options.push(this.value);
+        });
+        var new_semester_options = filters.semester;
+        semester_filter.find("option").remove();
+        if(Array("0")[0] == semester_selected_options[0]){
+          semester_filter.append(new_all.clone(true).attr("selected","selected"));
+        } else{
+          semester_filter.append(new_all.clone(true));
+        }
+        $.each(new_semester_options, function(index, semester)
+        {
+          var value = semester.id.toString();
+          var html = semester.name;
+          var new_option;
+          if(jQuery.inArray(value,semester_selected_options) === -1){
+            new_option = $('<option/>',{
+              'value': value,
+              'html': html,
+            });;
+          }else{
+            new_option = $('<option/>',{
+              'value': value,
+              'html': html,
+              'selected': 'selected',
+            });;
+          }
+          semester_filter.append(new_option);
+        });
+
+        //update program filter
+        var program_filter = $("#program");
+        var program_selected_options = Array();
+        program_filter.find("option:selected").each(function() {
+          program_selected_options.push(this.value);
+        });
+        var new_program_options = filters.program;
+        program_filter.find("option").remove();
+        if(Array("0")[0] == program_selected_options[0]){
+          program_filter.append(new_all.clone(true).attr("selected","selected"));
+        } else{
+          program_filter.append(new_all.clone(true));
+        }
+        $.each(new_program_options, function(index, program)
+        {
+          var value = program.id.toString();
+          var html = program.name;
+          var new_option;
+          if(jQuery.inArray(value,program_selected_options) === -1){
+            new_option = $('<option/>',{
+              'value': value,
+              'html': html,
+            });;
+          }else{
+            new_option = $('<option/>',{
+              'value': value,
+              'html': html,
+              'selected': 'selected',
+            });;
+          }
+          program_filter.append(new_option);
+        });
+
+
+        //update outcome filter
+        var outcome_filter = $("#outcome");
+        var outcome_selected_options = Array();
+        outcome_filter.find("option:selected").each(function() {
+          outcome_selected_options.push(this.value);
+        });
+        var new_outcome_options = filters.outcome;
+        outcome_filter.find("option").remove();
+        if(Array("0")[0] == outcome_selected_options[0]){
+          outcome_filter.append(new_all.clone(true).attr("selected","selected"));
+        } else{
+          outcome_filter.append(new_all.clone(true));
+        }
+        $.each(new_outcome_options, function(index, outcome)
+        {
+          var value = outcome.id.toString();
+          var html = outcome.name;
+          var new_option;
+          if(jQuery.inArray(value,outcome_selected_options) === -1){
+            new_option = $('<option/>',{
+              'value': value,
+              'html': html,
+            });;
+          }else{
+            new_option = $('<option/>',{
+              'value': value,
+              'html': html,
+              'selected': 'selected',
+            });;
+          }
+          outcome_filter.append(new_option);
+        });
+
+
+        {{--
+        //update semester filter
+        var semester_filter = $("#semester");
+        var new_semester_options = filters.semester;
+        semester_filter.find("option").remove();
+        semester_filter.append(new_all.clone(true));
+        $.each(new_semester_options, function(index, semester)
+        {
+          var value = semester.id;
+          var html = semester.name;
+          var new_option = $('<option/>',{
+            'value': value,
+            'html': html,
+          });;
+          semester_filter.append(new_option);
+        });
+        --}}
+
+
+        $('.selectpicker').selectpicker('refresh');
+      }
+    );
+
+  });
+
+});
+
+
+
+{{-- @include('global.dummy-outcomes') --}}
+
+@stop