para cambiar de branch

para Oniel poder cambiar de branch, necesita commit y merge estos files

app/config/app.php

@@ -27,7 +27,7 @@ return array(
 	|
 	*/ //$_ENV['APP_URL'] ?:
 
-	'url' =>  'https://localhost',
+	'url' =>  'http://localhost',
 
 	/*
 	|--------------------------------------------------------------------------
@@ -125,7 +125,7 @@ return array(
 		'Illuminate\Workbench\WorkbenchServiceProvider',
 		'Way\Generators\GeneratorsServiceProvider',
 		'Barryvdh\DomPDF\ServiceProvider',
-		//'Cornford\Backup\Providers\BackupServiceProvider',
+		// 'Cornford\Backup\Providers\BackupServiceProvider',
 		'Zizaco\Entrust\EntrustServiceProvider'
 
 	),

app/controllers/CriteriaController.php

@@ -572,13 +572,24 @@ class CriteriaController extends \BaseController
 
         $title = "Learning Outcomes and Criteria";
         $outcomes = Outcome::orderBy('name', 'ASC')->get();
+        // $outcomes = DB::table('outcomes')
+        //     ->orderBy('name', 'asc')
+        //     ->get();
         $schools = School::orderBy('name', 'ASC')->get();
+        // $schools = DB::table('schools')
+        //     ->orderBy('name', 'asc')
+        //     ->get();
         $criteria = Criterion::withTrashed()->orderBy('name', 'ASC')->get();
+        // $criteria = DB::table('criteria')
+        //     ->orderBy('name', 'asc')
+        //     ->get();
 
         // se annadio la nueva variable
         return View::make('global.view-learning-outcomes-criteria', compact('title', 'outcomes', 'schools', 'criteria', 'semesters'));
+
     }
 
+
     // copie index() y lo edite
     public function objectivesIndex()
     {

app/controllers/OutcomesController.php

@@ -43,164 +43,169 @@ class OutcomesController extends \BaseController
         $undergradResults = array("names" => array(), "schools" => array(), "achieved" => array(), "attempted" => array(), "successRate" => array());
         $gradResults = array("names" => array(), "schools" => array(), "achieved" => array(), "attempted" => array(), "successRate" => array());
         foreach ($programs as $program_id) {
-            //        	var_dump($program_id);
-            //         	exit();
-            $program = Program::where('id', '=', $program_id->id)->first();
-            $school = School::where('id', '=', $program->school_id)->first();
-            if ($program->is_graduate) {
-                $gradResults['names'][] = $program->name;
-                $gradResults['schools'][] = $school->name;
-                $attempted = $program->attempted_criteria_by_outcome($id, $selected_semesters);
-                $gradResults['attempted'][] = $attempted;
-                $achieved = $program->achieved_criteria_by_outcome($id, $selected_semesters);
-                $gradResults['achieved'][] = $achieved;
-                $gradResults['successRate'][] = sprintf("%.2f", 100 * $achieved / $attempted);
-            } else {
-                $undergradResults['names'][] = $program->name;
-                $undergradResults['schools'][] = $school->name;
-                $attempted = $program->attempted_criteria_by_outcome($id, $selected_semesters);
-                $undergradResults['attempted'][] = $attempted;
-                $achieved = $program->achieved_criteria_by_outcome($id, $selected_semesters);
-                $undergradResults['achieved'][] = $achieved;
-                $undergradResults['successRate'][] = sprintf("%.2f", 100 * $achieved / $attempted);
-            }
+ //        	var_dump($program_id);
+//         	exit();
+        	$program = Program::where('id', '=', $program_id->id)->first();
+        	$school = School::where('id', '=', $program->school_id)->first();
+        	if($program->is_graduate)
+        	{
+        		$gradResults['names'][] = $program->name;
+        		$gradResults['schools'][] = $school->name;
+        		$attempted = $program->attempted_criteria_by_outcome($id, $selected_semesters);
+        		$gradResults['attempted'][] = $attempted;
+        		$achieved = $program->achieved_criteria_by_outcome($id, $selected_semesters);
+        		$gradResults['achieved'][] = $achieved;
+        		$gradResults['successRate'][] = sprintf("%.2f",100*$achieved/$attempted);
+
+        	}
+        	else
+        	{
+        		$undergradResults['names'][] = $program->name;
+        		$undergradResults['schools'][] = $school->name;
+        		$attempted = $program->attempted_criteria_by_outcome($id,$selected_semesters);
+        		$undergradResults['attempted'][] = $attempted;
+        		$achieved = $program->achieved_criteria_by_outcome($id,$selected_semesters);
+        		$undergradResults['achieved'][] = $achieved;
+        		$undergradResults['successRate'][] = sprintf("%.2f",100*$achieved/$attempted);
+        	}
+
         }
 
-        $title = "Outcome Results: " . $outcome->name;
+	   	$title = "Outcome Results: ".$outcome->name;
 
 
-        //  		$undergradResults["successRate"]
+//  		$undergradResults["successRate"]
 
         return View::make('local.managers.admins.learning-outcome_new', compact('title', 'outcome', 'undergradResults', 'gradResults'));
     }
 
-    //     public function show($id)
-    //     {
-    //         DB::disableQueryLog();
-    //         $outcome = Outcome::find($id);
-    // 
-    //         $undergradResults=array("names"=>array(), "schools"=>array(), "achieved"=>array(), "attempted"=>array(), "successRate"=>array());
-    //         $gradResults = array("names"=>array(), "schools"=>array(), "achieved"=>array(), "attempted"=>array(), "successRate"=>array());
-    // 
-    //         //Calculate performance for this outcome for each undergrad program
-    //         $undergradPrograms = Program::where('is_graduate','=', 0)
-    //             ->where(function($query)
-    //             {
-    //                 if(Auth::user()->school_id)
-    //                 {
-    //                     $query->where('school_id', Auth::user()->school_id);
-    //                 }
-    //             })
-    //             ->with('courses')
-    //             ->orderBy('name', 'asc')->get();
-    // 
-    //         foreach($undergradPrograms as $program)
-    //         {
-    //             $undergradResults["names"][$program->id]=$program->name;
-    //             $undergradResults["schools"][$program->id]=$program->school->name;
-    //             $programAssessed=false;
-    // 
-    //             $undergradResults["attempted"][$program->id]=0;
-    //             $undergradResults["achieved"][$program->id]=0;
-    // 
-    //             foreach($program->courses as $course)
-    //             {
-    //                 $course_outcomes_achieved = json_decode($course->outcomes_achieved, true);
-    //                 $course_outcomes_attempted = json_decode($course->outcomes_attempted, true);
-    // 
-    //                 $attemptedCriteriaCount=0;
-    //                 $achievedCriteriaCount=0;
-    // 
-    //                 // If this outcome was evaluated
-    //                 if(
-    //                     $course_outcomes_attempted
-    //                     && array_key_exists($outcome->id, $course_outcomes_attempted)
-    //                     && $course_outcomes_attempted[$outcome->id]!=0)
-    //                 {
-    //                     // Count +1 for attempted and achieved in the program
-    //                     $attemptedCriteriaCount+=$course_outcomes_attempted[$outcome->id];
-    //                     $achievedCriteriaCount+=$course_outcomes_achieved[$outcome->id];
-    //                     $programAssessed=true;
-    // 
-    //                     if($attemptedCriteriaCount>0  &&(float)$achievedCriteriaCount/$attemptedCriteriaCount*100 > $outcome->expected_outcome)
-    //                     {
-    //                         $undergradResults["achieved"][$program->id]+=1;
-    //                     }
-    //                     $undergradResults["attempted"][$program->id]+=1;
-    //                 }
-    //             }
-    // 
-    //             // Calculate success rate for this program
-    //             if($programAssessed && $undergradResults["attempted"][$program->id]>0)
-    //                 $undergradResults["successRate"][$program->id]= round((float)$undergradResults["achieved"][$program->id]/$undergradResults["attempted"][$program->id]*100, 2).'%';
-    //             else
-    //                 $undergradResults["successRate"][$program->id]= 'N/M';
-    //         }
-    // 
-    // 
-    //         //Calculate performance for this outcome for each grad program
-    //         $gradPrograms = Program::where('is_graduate','=', 1)
-    //             ->where(function($query)
-    //             {
-    //                 if(Auth::user()->school_id)
-    //                 {
-    //                     $query->where('school_id', Auth::user()->school_id);
-    //                 }
-    //             })
-    //             ->with(array('courses'=>function($query)
-    //             {
-    //                 $query->whereNotNull('outcomes_attempted');
-    //             }))
-    //             ->orderBy('name', 'asc')->get();
-    // 
-    //         foreach($gradPrograms as $program)
-    //         {
-    //             $gradResults["names"][$program->id]=$program->name;
-    //             $gradResults["schools"][$program->id]=$program->school->name;
-    // 
-    //             $programAssessed=false;
-    // 
-    //             $gradResults["attempted"][$program->id]=0;
-    //             $gradResults["achieved"][$program->id]=0;
-    // 
-    //             foreach($program->courses as $course)
-    //             {
-    //                 $course_outcomes_achieved = json_decode($course->outcomes_achieved, true);
-    //                 $course_outcomes_attempted = json_decode($course->outcomes_attempted, true);
-    // 
-    //                 $attemptedCriteriaCount=0;
-    //                 $achievedCriteriaCount=0;
-    // 
-    //                 // If this outcome was evaluated
-    //                 if(
-    //                     $course_outcomes_attempted
-    //                     && array_key_exists($outcome->id, $course_outcomes_attempted)
-    //                     && $course_outcomes_attempted[$outcome->id]!=0)
-    //                 {
-    //                     // Count +1 for attempted and achieved in the program
-    //                     $attemptedCriteriaCount+=$course_outcomes_attempted[$outcome->id];
-    //                     $achievedCriteriaCount+=$course_outcomes_achieved[$outcome->id];
-    //                     $programAssessed=true;
-    // 
-    //                     if($attemptedCriteriaCount>0  &&(float)$achievedCriteriaCount/$attemptedCriteriaCount*100 > $outcome->expected_outcome)
-    //                     {
-    //                         $gradResults["achieved"][$program->id]+=1;
-    //                     }
-    //                     $gradResults["attempted"][$program->id]+=1;
-    //                 }
-    //             }
-    // 
-    //             // Calculate success rate for this program
-    //             if($programAssessed && $gradResults["attempted"][$program->id]>0)
-    //                 $gradResults["successRate"][$program->id]= round((float)$gradResults["achieved"][$program->id]/$gradResults["attempted"][$program->id]*100, 2).'%';
-    //             else
-    //                 $gradResults["successRate"][$program->id]= 'N/M';
-    //         }
-    // 
-    //         $title = "Outcome Results: ".$outcome->name;
-    // 
-    //         return View::make('local.managers.admins.learning-outcome', compact('title', 'outcome', 'undergradResults', 'gradResults'));
-    //     }
+//     public function show($id)
+//     {
+//         DB::disableQueryLog();
+//         $outcome = Outcome::find($id);
+//
+//         $undergradResults=array("names"=>array(), "schools"=>array(), "achieved"=>array(), "attempted"=>array(), "successRate"=>array());
+//         $gradResults = array("names"=>array(), "schools"=>array(), "achieved"=>array(), "attempted"=>array(), "successRate"=>array());
+//
+//         //Calculate performance for this outcome for each undergrad program
+//         $undergradPrograms = Program::where('is_graduate','=', 0)
+//             ->where(function($query)
+//             {
+//                 if(Auth::user()->school_id)
+//                 {
+//                     $query->where('school_id', Auth::user()->school_id);
+//                 }
+//             })
+//             ->with('courses')
+//             ->orderBy('name', 'asc')->get();
+//
+//         foreach($undergradPrograms as $program)
+//         {
+//             $undergradResults["names"][$program->id]=$program->name;
+//             $undergradResults["schools"][$program->id]=$program->school->name;
+//             $programAssessed=false;
+//
+//             $undergradResults["attempted"][$program->id]=0;
+//             $undergradResults["achieved"][$program->id]=0;
+//
+//             foreach($program->courses as $course)
+//             {
+//                 $course_outcomes_achieved = json_decode($course->outcomes_achieved, true);
+//                 $course_outcomes_attempted = json_decode($course->outcomes_attempted, true);
+//
+//                 $attemptedCriteriaCount=0;
+//                 $achievedCriteriaCount=0;
+//
+//                 // If this outcome was evaluated
+//                 if(
+//                     $course_outcomes_attempted
+//                     && array_key_exists($outcome->id, $course_outcomes_attempted)
+//                     && $course_outcomes_attempted[$outcome->id]!=0)
+//                 {
+//                     // Count +1 for attempted and achieved in the program
+//                     $attemptedCriteriaCount+=$course_outcomes_attempted[$outcome->id];
+//                     $achievedCriteriaCount+=$course_outcomes_achieved[$outcome->id];
+//                     $programAssessed=true;
+//
+//                     if($attemptedCriteriaCount>0  &&(float)$achievedCriteriaCount/$attemptedCriteriaCount*100 > $outcome->expected_outcome)
+//                     {
+//                         $undergradResults["achieved"][$program->id]+=1;
+//                     }
+//                     $undergradResults["attempted"][$program->id]+=1;
+//                 }
+//             }
+//
+//             // Calculate success rate for this program
+//             if($programAssessed && $undergradResults["attempted"][$program->id]>0)
+//                 $undergradResults["successRate"][$program->id]= round((float)$undergradResults["achieved"][$program->id]/$undergradResults["attempted"][$program->id]*100, 2).'%';
+//             else
+//                 $undergradResults["successRate"][$program->id]= 'N/M';
+//         }
+//
+//
+//         //Calculate performance for this outcome for each grad program
+//         $gradPrograms = Program::where('is_graduate','=', 1)
+//             ->where(function($query)
+//             {
+//                 if(Auth::user()->school_id)
+//                 {
+//                     $query->where('school_id', Auth::user()->school_id);
+//                 }
+//             })
+//             ->with(array('courses'=>function($query)
+//             {
+//                 $query->whereNotNull('outcomes_attempted');
+//             }))
+//             ->orderBy('name', 'asc')->get();
+//
+//         foreach($gradPrograms as $program)
+//         {
+//             $gradResults["names"][$program->id]=$program->name;
+//             $gradResults["schools"][$program->id]=$program->school->name;
+//
+//             $programAssessed=false;
+//
+//             $gradResults["attempted"][$program->id]=0;
+//             $gradResults["achieved"][$program->id]=0;
+//
+//             foreach($program->courses as $course)
+//             {
+//                 $course_outcomes_achieved = json_decode($course->outcomes_achieved, true);
+//                 $course_outcomes_attempted = json_decode($course->outcomes_attempted, true);
+//
+//                 $attemptedCriteriaCount=0;
+//                 $achievedCriteriaCount=0;
+//
+//                 // If this outcome was evaluated
+//                 if(
+//                     $course_outcomes_attempted
+//                     && array_key_exists($outcome->id, $course_outcomes_attempted)
+//                     && $course_outcomes_attempted[$outcome->id]!=0)
+//                 {
+//                     // Count +1 for attempted and achieved in the program
+//                     $attemptedCriteriaCount+=$course_outcomes_attempted[$outcome->id];
+//                     $achievedCriteriaCount+=$course_outcomes_achieved[$outcome->id];
+//                     $programAssessed=true;
+//
+//                     if($attemptedCriteriaCount>0  &&(float)$achievedCriteriaCount/$attemptedCriteriaCount*100 > $outcome->expected_outcome)
+//                     {
+//                         $gradResults["achieved"][$program->id]+=1;
+//                     }
+//                     $gradResults["attempted"][$program->id]+=1;
+//                 }
+//             }
+//
+//             // Calculate success rate for this program
+//             if($programAssessed && $gradResults["attempted"][$program->id]>0)
+//                 $gradResults["successRate"][$program->id]= round((float)$gradResults["achieved"][$program->id]/$gradResults["attempted"][$program->id]*100, 2).'%';
+//             else
+//                 $gradResults["successRate"][$program->id]= 'N/M';
+//         }
+//
+//         $title = "Outcome Results: ".$outcome->name;
+//
+//         return View::make('local.managers.admins.learning-outcome', compact('title', 'outcome', 'undergradResults', 'gradResults'));
+//     }
 
     // TODO: Clean up and verify relationships are correct
     public function newShow($id)
@@ -513,14 +518,78 @@ class OutcomesController extends \BaseController
 
     public function fetchOutcome()
     {
-        $id = Input::get('id');
+        // original code using models
+        // TODO: models have to be updated because of the database update
 
-        $outcome = Outcome::find($id);
+        $id = Input::get('id');
 
-        $outcome->criteria;
+        $outcome_info = DB::table('outcomes')
+            ->where('outcomes.id', $id)
+            ->get();
+        $outcome = $outcome_info[0];
+
+        $diferent_levels = DB::table('criterion_objective_outcome')
+            ->join('new_criteria', 'new_criteria.id', '=', 'criterion_objective_outcome.criterion_id')
+            ->join('objectives', 'objectives.id', '=', 'criterion_objective_outcome.objective_id')
+            ->where('criterion_objective_outcome.outcome_id', $id)
+            ->distinct('new_criteria.number_of_scales')
+            ->select('new_criteria.number_of_scales as levels')
+            ->orderBy('new_criteria.number_of_scales', 'asc')
+            ->get();
 
-        return array(
-            'outcome' => $outcome
+        $criteria_array = array();
+
+        $outcome->criteria = array();
+        foreach ($diferent_levels as $level) {
+          $level = $level->levels;
+
+          // buscar todos los criterios con el level y ponerlos en un array
+          $outcome_criterias = DB::table('criterion_objective_outcome')
+              ->join('new_criteria', 'new_criteria.id', '=', 'criterion_objective_outcome.criterion_id')
+              ->join('objectives', 'objectives.id', '=', 'criterion_objective_outcome.objective_id')
+              ->where('criterion_objective_outcome.outcome_id', $id)
+              ->where('new_criteria.number_of_scales', $level)
+              ->whereNull('new_criteria.deleted_at')
+              ->select('new_criteria.id','new_criteria.name')
+              ->orderBy('new_criteria.name', 'asc')
+              ->get();
+          $outcome_criterias = $outcome_criterias;
+
+          foreach ($outcome_criterias as $criteria_id) {
+
+            $scales =
+              DB::select(
+                  DB::raw("
+                  SELECT *
+                  FROM (
+                    SELECT new_criteria.id as criterion_id,
+                      ROW_NUMBER() OVER(PARTITION BY scales.id) rn,
+                      scales.position,
+                      scales.title, scales.description,
+                      criterion_objective_outcome.outcome_id,criterion_objective_outcome.objective_id,
+                      criterion_scale.scale_id
+                    FROM new_criteria,criterion_scale,scales, criterion_objective_outcome, objectives
+                    where new_criteria.id=criterion_scale.criterion_id
+                      and scales.id = criterion_scale.scale_id
+                      and new_criteria.id = criterion_objective_outcome.criterion_id
+                      and objectives.id = criterion_objective_outcome.objective_id
+                      and criterion_objective_outcome.outcome_id = $id
+                      and new_criteria.id = $criteria_id->id
+                    ORDER BY new_criteria.name ASC) a
+                  WHERE rn = 1
+                  ORDER BY `a`.`position` ASC
+                      ")
+              );
+              // insertar la informacion de los criterios con N niveles en el arreglo de arreglos
+              $criteria_id->scales = $scales;
+              // $i++;
+            }//ends foreach criteria_id
+            array_push($outcome->criteria, array($outcome_criterias,'amount_of_levels'=>$level));
+        }//ends foreach level
+
+        return array
+        (
+            'outcome' => $outcome,
         );
     }
 

app/routes.php

@@ -53,7 +53,8 @@ View::composer(array(
     'local.managers.shared.program',
     'local.managers.shared.rubrics',
     'global.view-learning-outcomes-criteria',
-    'global.view-learning-outcomes-criteria'
+    'global.view-learning-outcomes-criteria',
+    'global.view-three-year-plan'
 ), function ($view) {
     $view->with('role', Auth::user()->role);
 });
@@ -186,6 +187,10 @@ Route::group(array('before' => 'auth|has_access'), function () {
         'as' => 'delete',
         'uses' => 'CriteriaController@delete'
     ));
+    Route::post('delete', array(
+        'as' => 'delete',
+        'uses' => 'TransformativeActionsController@deleteTA'
+    ));
     // Fetch a criterion for a rubric
     Route::post('fetchCriterionWithTrashed', array(
         'as' => 'fetchCriterionWithTrashed',
@@ -238,6 +243,14 @@ Route::group(array('before' => 'auth|has_access'), function () {
     Route::get('my-assessment-reports', 'OutcomesController@professorAssessmentReports');
     Route::post('objectives/fetch', array('before' => 'csrf', 'uses' => 'ObjectivesController@fetch'));
 
+    // Transformative Actions for p-coordinators and professors
+    Route::get('transformativeAction', array('uses' => 'TransformativeActionsController@editTA'));
+    Route::post('transformativeAction/createTA', array('before' => 'csrf', 'uses' => 'TransformativeActionsController@createTA'));
+    Route::post('transformativeAction/selectTA', array('before' => 'csrf', 'uses' => 'TransformativeActionsController@selectTA'));
+    Route::post('transformativeAction/updateTA', array('before' => 'csrf', 'uses'=>'TransformativeActionsController@updateTA'));
+    Route::post('transformativeAction/filterTA', array('before' => 'csrf', 'uses'=>'TransformativeActionsController@filterTA'));
+    Route::post('transformativeAction/objectivesFromOutcome', array('before' => 'csrf', 'uses'=>'TransformativeActionsController@objectivesFromOutcome'));
+
     /**
      * Administrator Routes
      */
@@ -258,7 +271,6 @@ Route::group(array('before' => 'auth|has_access'), function () {
 
         Route::post('learning-outcomes/update', array('before' => 'csrf', 'uses' => 'OutcomesController@updateMore'));
         Route::post('learning-outcomes/update', array('before' => 'csrf', 'uses' => 'OutcomesController@update'));
-        Route::post('learning-outcomes/update', array('before' => 'csrf', 'uses' => 'OutcomesController@updateMore'));
         Route::post('crtiteria/update', array('before' => 'csrf', 'uses' => 'CriteriaController@update'));
         Route::delete('crtiteria/delete', array('before' => 'csrf', 'uses' => 'CriteriaController@destroy'));
 
@@ -295,6 +307,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
         Route::get('school/{id}', 'SchoolsController@show');
         Route::get('program/{id}', 'ProgramsController@show');
         Route::post('programs/report', 'ProgramsController@showReport');
+        // Route::post('storeTypInfo', 'OutcomesController@storeCycleInfo'); //TODO: where is this route supposed to be placed?
         Route::get('programs', 'ProgramsController@index');
         Route::get('template-list', 'TemplatesController@schoolCoordinatorIndex');
         Route::post('deleteObjective', 'Objective2Controller@delete');
@@ -307,6 +320,19 @@ Route::group(array('before' => 'auth|has_access'), function () {
         // Gabriel added this, so the school coordinator can add criterias and objectives
         Route::get('school-objective', 'Objective2Controller@editSchool');
         Route::get('school-criteria', 'CriteriaController@editSchool');
+
+        // Show users plan de tres a~nos
+        Route::get('three-years-plan', 'ThreeYearPlanController@threeYearsReport');
+        Route::post('fetchThreeYears', array('before' => 'csrf', 'uses'=>'ThreeYearPlanController@fetchThreeYears'));
+        Route::post('typ/lookUp', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@lookup_typ_semester_outcome'));
+        Route::post('section2_arrive', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@section2_arrive'));
+        Route::post('section2_on_change', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@section2_on_change'));
+        Route::post('section3_arrive', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@section3_arrive'));
+        Route::post('section3_on_change', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@section3_on_change'));
+        Route::post('typ/getObjectives', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@getObjectivesForTYP'));
+        Route::post('typ/updateOutcomeSemsters', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@typ_update_outcomes_semesters'));
+        Route::post('typ/update', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@update_typ_outcomes_semesters'));
+
     });
 
 
@@ -379,6 +405,22 @@ Route::group(array('before' => 'auth|has_access'), function () {
         Route::get('new-report/{id}', 'OutcomesController@newReport');
         Route::get('new-report-all', 'OutcomesController@newReportAll');
         Route::get('courses/{id}', 'CoursesController@newShow');
+
+        // Transformative Actions
+        Route::post('transformativeAction/approveTA', array('before' => 'csrf', 'uses'=>'TransformativeActionsController@approveTA'));
+
+        // Show users plan de tres a~nos
+        Route::get('three-years-plan', 'ThreeYearPlanController@threeYearsReport');
+        Route::post('fetchThreeYears', array('before' => 'csrf', 'uses'=>'ThreeYearPlanController@fetchThreeYears'));
+        Route::post('typ/lookUp', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@lookup_typ_semester_outcome'));
+        Route::post('section2_arrive', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@section2_arrive'));
+        Route::post('section2_on_change', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@section2_on_change'));
+        Route::post('section3_arrive', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@section3_arrive'));
+        Route::post('section3_on_change', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@section3_on_change'));
+        Route::post('typ/getObjectives', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@getObjectivesForTYP'));
+        Route::post('typ/updateOutcomeSemsters', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@typ_update_outcomes_semesters'));
+        Route::post('typ/update', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@update_typ_outcomes_semesters'));
+
     });