seteando everview2 como landing page de administradores

app/controllers/AdministratorsController.php

@@ -306,47 +306,71 @@ class AdministratorsController extends \BaseController
 		// $outcome->semesters[i]->tested
 		// $outcome->semesters[i]->achievers
 		// '''
+		$is_graduate=0;
+		$levels=array(1,3);
 		$selected_semesters = Semester::find(Session::get('semesters_ids'));
-		$title = 'Overview2';
+		$title = 'Overview';
 
 		$semesters = DB::table('overview')
 			->join('semesters', 'semesters.id', '=', 'overview.semester_id')
-			->select('semesters.name', 'semesters.code')
+			->select('semesters.id', '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')
+			->rightJoin('outcomes', 'outcomes.id', '=', 'overview.outcome_id')
+			->whereIn('outcomes.level',$levels)
+			->selectRaw('outcomes.name, coalesce(outcomes.new_outcome_id,outcomes.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')
+			->groupBy(DB::raw('coalesce(outcomes.new_outcome_id,outcomes.id)'))
 			->get();
+//outcomes activos 
+// 		$outcomes = DB::table('outcomes')
+// 			->whereNull('deactivation_date')
+// 			
+// 			->get();
+			
+// DB::enableQueryLog();
 		foreach ($outcomes as $outcome) {
+// 		select semester_id, program_id, sum(`total_evaluated`) eval, sum(`total_achieved`) ach from overview where outcome_id in (select id from outcomes where coalesce(`new_outcome_id`,id) = 12) group by semester_id, program_id
 			$outcome->semesters = DB::table('overview')
 				->join('semesters', 'semesters.id', '=', 'overview.semester_id')
-				->where('overview.outcome_id', $outcome->id)
+				->whereIn('overview.outcome_id',function ($query) use ($outcome)
+				{
+					$query->select('outcomes.id')
+						  ->from('outcomes')
+						  ->whereRaw('coalesce(outcomes.new_outcome_id,outcomes.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();
 		}
+// var_dump($outcomes);
+// 		exit();
+// dd(DB::getQueryLog());
 
 		$filters = array();
 		$filters['school'] = DB::table('overview')
 			->join('programs', 'programs.id', '=', 'overview.program_id')
 			->join('schools', 'schools.id', '=', 'programs.school_id')
+			->where('programs.is_graduate',$is_graduate)
 			->select('schools.id', 'schools.name')
 			->orderBy('schools.name', 'asc')
 			->groupBy('schools.id')
 			->get();
 
+// DB::enableQueryLog();
 		$filters['program'] = DB::table('overview')
 			->join('programs', 'programs.id', '=', 'overview.program_id')
+			->where('programs.is_graduate',$is_graduate)
 			->select('programs.id', 'programs.name')
 			->orderBy('programs.name', 'asc')
 			->groupBy('overview.program_id')
 			->get();
+// dd(DB::getQueryLog());
 
 		$filters['semester'] = DB::table('overview')
 			->join('semesters', 'semesters.id', '=', 'overview.semester_id')
@@ -361,14 +385,23 @@ class AdministratorsController extends \BaseController
 			->orderBy('semesters.code', 'asc')
 			->groupBy('overview.semester_id')
 			->get();
+// DB::enableQueryLog();
+//select `outcomes`.`id`, `outcomes`.`name` from outcomes where deactivation_date is null and `outcomes`.`id` in (select outcome_id from overview)
 
-		$filters['outcome'] = DB::table('overview')
-			->join('outcomes', 'outcomes.id', '=', 'overview.outcome_id')
+		$filters['outcome'] = DB::table('outcomes')
 			->select('outcomes.id', 'outcomes.name')
+			->whereNull('deactivation_date')
+			->whereIn('outcomes.id',function($query)
+			{
+				$query->select('outcome_id')
+				 ->from('overview');
+			}
+			
+			)
 			->orderBy('outcomes.name', 'asc')
-			->groupBy('overview.outcome_id')
 			->get();
-
+// dd(DB::getQueryLog());
+// exit();
 		$target = 0.70;
 
 		return View::make('local.managers.admins.overview2', compact('title', 'selected_semesters', 'outcomes', 'semesters', 'filters', 'target'));
@@ -384,13 +417,17 @@ class AdministratorsController extends \BaseController
 		$semesters = Input::get('semesters');
 		$years = Input::get('years');
 		$outcomes = Input::get('outcomes');
-
+		$is_graduate=Input::get('is_graduate');
+// 		$is_graduate=0;
+		if($is_graduate)$levels=array(2,3);
+		else $levels=array(1,3);
 
 		// 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')
+				->where('programs.is_graduate',$is_graduate)
 				->select('schools.id')
 				->orderBy('schools.name', 'asc')
 				->groupBy('schools.id')
@@ -409,6 +446,7 @@ class AdministratorsController extends \BaseController
 		if ($programs == array("0")) {
 			$result = DB::table('overview')
 				->join('programs', 'programs.id', '=', 'overview.program_id')
+				->where('programs.is_graduate',$is_graduate)
 				->select('programs.id')
 				->orderBy('programs.name', 'asc')
 				->groupBy('overview.program_id')
@@ -442,31 +480,52 @@ class AdministratorsController extends \BaseController
 			}
 		}
 		// 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));
-			}
-		}
+// 		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();
+
+		$result = DB::table('overview')
+			->rightJoin('outcomes', 'outcomes.id', '=', 'overview.outcome_id')
+			->whereIn('outcomes.level',$levels)
+			->selectRaw('coalesce(outcomes.new_outcome_id,outcomes.id) as id')
+			->orderBy('outcomes.name', 'asc')
+			->groupBy(DB::raw('coalesce(outcomes.new_outcome_id,outcomes.id)'))
+			->get();
+// 		$result = DB::table('outcomes')
+// 			->select('outcomes.id')
+// 			->whereIn('outcomes.level',$levels)
+// 			->whereNull('deactivation_date')
+// // 			->whereIn('outcomes.id',function($query)
+// // 				{
+// // 					$query->select('outcome_id')
+// // 					 ->from('overview');
+// // 				}
+// // 			)
+// 			->orderBy('outcomes.name', 'asc')
+// 			->get();
+// 
+// 			$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);
@@ -485,6 +544,7 @@ class AdministratorsController extends \BaseController
 			->join('schools', 'schools.id', '=', 'programs.school_id')
 			->join('semesters', 'semesters.id', '=', 'overview.semester_id')
 			->join('outcomes', 'outcomes.id', '=', 'overview.outcome_id')
+// 			->where('programs.is_graduate',$is_graduate)
 			->whereIn('schools.id', $schools_id)
 			->whereIn('programs.id', $programs_id)
 			->whereIn('semesters.id', $semesters_id)
@@ -494,35 +554,78 @@ class AdministratorsController extends \BaseController
 			->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)
+
+// 		$outcomes = DB::table('overview')
+// 			->rightJoin('outcomes', 'outcomes.id', '=', 'overview.outcome_id')
+// 			->join('programs', 'programs.id', '=', 'overview.program_id')
+// 			->join('schools', 'schools.id', '=', 'programs.school_id')
+// 			->join('semesters', 'semesters.id', '=', 'overview.semester_id')
+// 			->whereIn('schools.id', $schools_id)
+// 			->whereIn('programs.id', $programs_id)
+// 			->whereIn('semesters.id', $semesters_id)
+// 			->whereIn('outcomes.id', $outcomes_id)
+// 			->selectRaw('outcomes.name, coalesce(outcomes.new_outcome_id,outcomes.id) as id, sum(overview.total_evaluated) as total_evaluated, sum(overview.total_achieved) as total_achieved')
+// 			->orderBy('outcomes.name', 'asc')
+// 			->groupBy(DB::raw('coalesce(outcomes.new_outcome_id,outcomes.id)'))
+// 			->get();
+			
+// 			$sql=DB::table('overview')
+// 				->join('programs', 'programs.id', '=', 'overview.program_id')
+// 				->join('schools', 'schools.id', '=', 'programs.school_id')
+// 				->join('semesters', 'semesters.id', '=', 'overview.semester_id')
+// 				->select('overview.id','program_id','outcome_id','semester_id','total_evaluated','total_achieved')
+// 				->whereIn('schools.id', $schools_id)
+// 				->whereIn('programs.id', $programs_id)
+// 				->whereIn('semesters.id', $semesters_id);
+
+			$schools_text=implode(",", $schools_id);
+			$programs_text=implode(",", $programs_id);
+			$semesters_text=implode(",", $semesters_id);
+
+			$sql="select overview.* from `overview` inner join `programs` on `programs`.`id` = `overview`.`program_id` inner join `schools` on `schools`.`id` = `programs`.`school_id` inner join `semesters` on `semesters`.`id` = `overview`.`semester_id` where `schools`.`id` in ($schools_text) and `programs`.`id` in ($programs_text) and `semesters`.`id` in ($semesters_text)";
+			
+			$outcomes = DB::table('outcomes')
+			->leftJoin(DB::raw("({$sql}) as overview2"),'outcomes.id', '=', 'overview2.outcome_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')
+			->selectRaw('outcomes.name, coalesce(outcomes.new_outcome_id,outcomes.id) as id, sum(overview2.total_evaluated) as total_evaluated, sum(overview2.total_achieved) as total_achieved')
 			->orderBy('outcomes.name', 'asc')
-			->groupBy('overview.outcome_id')
+			->groupBy(DB::raw('coalesce(outcomes.new_outcome_id,outcomes.id)'))
+// 			->mergeBindings($sql->getQuery())
 			->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();
+
 			$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)
+				->whereIn('overview.outcome_id',function ($query) use ($outcome)
+				{
+					$query->select('outcomes.id')
+						  ->from('outcomes')
+						  ->whereRaw('coalesce(outcomes.new_outcome_id,outcomes.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();
 		}
@@ -539,10 +642,12 @@ class AdministratorsController extends \BaseController
 			->whereIn('semesters.id', $semesters_id)
 			// ->whereIn('years.id',$years_id)
 			->whereIn('outcomes.id', $outcomes_id)
+			->where('programs.is_graduate',$is_graduate)
 			->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')
@@ -553,6 +658,7 @@ class AdministratorsController extends \BaseController
 			->whereIn('semesters.id', $semesters_id)
 			// ->whereIn('years.id',$years_id)
 			->whereIn('outcomes.id', $outcomes_id)
+			->where('programs.is_graduate',$is_graduate)
 			->select('programs.id', 'programs.name')
 			->orderBy('programs.name', 'asc')
 			->groupBy('overview.program_id')
@@ -567,37 +673,49 @@ class AdministratorsController extends \BaseController
 			// ->whereIn('semesters.id',$semesters_id)
 			// ->whereIn('years.id',$years_id)
 			->whereIn('outcomes.id', $outcomes_id)
+			->where('programs.is_graduate',$is_graduate)
 			->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)
+// 		$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();
+			$sql="select overview.* from `overview` inner join `programs` on `programs`.`id` = `overview`.`program_id` inner join `schools` on `schools`.`id` = `programs`.`school_id` inner join `semesters` on `semesters`.`id` = `overview`.`semester_id` where `schools`.`id` in ($schools_text) and `programs`.`id` in ($programs_text) and `semesters`.`id` in ($semesters_text) and programs.is_graduate=$is_graduate";
+			
+			$filters['outcome']  = DB::table('outcomes')
+			->leftJoin(DB::raw("({$sql}) as overview2"),'outcomes.id', '=', 'overview2.outcome_id')
 			->select('outcomes.id', 'outcomes.name')
 			->orderBy('outcomes.name', 'asc')
-			->groupBy('overview.outcome_id')
+			->groupBy(DB::raw('coalesce(outcomes.new_outcome_id,outcomes.id)'))
+// 			->mergeBindings($sql->getQuery())
 			->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)
+// 			->where('programs.is_graduate',$is_graduate)
+// 			->select('outcomes.id', 'outcomes.name')
+// 			->orderBy('outcomes.name', 'asc')
+// 			->groupBy('overview.outcome_id')
+// 			->get();
+
 		return array(
 			"semesters" => $semesters,
 			"outcomes_info" => $outcomes,

app/routes.php

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

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

@@ -60,12 +60,14 @@
 
       //
       outcomes_data.push(hidden_values);
+// 		console.log(semesters)
 
       $.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);
-
+		
+// 		console.log(outcome.semesters)
         var i = 0;
         $.each(outcome.semesters, function(index, semester){
 
@@ -158,6 +160,7 @@
     var outcomes_info = <?= json_encode($outcomes, JSON_HEX_TAG); ?>;
     var semesters = <?= json_encode($semesters, JSON_HEX_TAG); ?>;
 
+// 	console.log(outcomes_info);
     make_chart(outcomes_info,semesters);
 
     </script>
@@ -166,6 +169,17 @@
       <div class="filters">
         <div class="row" style="display: flex;">
           <div class="category" >
+            <label for="is_graduate">Level</label>
+            <div class="select">
+              <select class="selectpicker" name="is_graduate" id="is_graduate">
+                <option value="0" selected="selected">Undergradute</option>
+                <option value="1">Graduate</option>
+              </select>
+            </div>
+          </div>
+        </div>
+        <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">
@@ -302,6 +316,8 @@ $(document).ready(function()
     var semesters = $("#semester").val();
     var years = $("#year").val();
     var outcomes = $("#outcome").val();
+    var outcomes = $("#outcome").val();
+    var is_graduate = $("#is_graduate").val();
 
     // query the values and get new data for chart
     $.post(
@@ -312,6 +328,7 @@ $(document).ready(function()
         semesters: (semesters),
         years: (years),
         outcomes: (outcomes),
+        is_graduate: (is_graduate),
       },
       function(data)
       {