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/controllers/AnnualPlansController.php

@@ -1,6 +1,10 @@
 <?php
 
-class AnnualPlansController extends \BaseController {
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Input;
+
+class AnnualPlansController extends \BaseController
+{
 
   /**
    * Checks whether a user has permission to view a page in this controller
@@ -16,7 +20,7 @@ class AnnualPlansController extends \BaseController {
         $programs = $user->programs->lists('id');
 
         // If program does not belong to user, show 403
-        if(!in_array($program_id, $programs))
+        if (!in_array($program_id, $programs))
           return false;
 
         break;
@@ -25,7 +29,7 @@ class AnnualPlansController extends \BaseController {
         $programs = Program::where('school_id', $user->school_id)->lists('id');
 
         // If program is not in user's school, show 403
-        if(!in_array($program_id, $programs))
+        if (!in_array($program_id, $programs))
           return false;
 
         break;
@@ -36,6 +40,15 @@ class AnnualPlansController extends \BaseController {
     return true;
   }
 
+  public function viewAllPlans($program_id)
+  {
+    $title = "Annual Plans";
+    $annual_plans = DB::select("select * from annual_plans order by id desc");
+
+
+    return View::make('local.managers.sCoords.view-annual-plans', compact('title', 'program_id', 'annual_plans'));
+  }
+
   /**
    * Lists annual plans by year and program
    * @var string $title     Title for page
@@ -44,13 +57,50 @@ class AnnualPlansController extends \BaseController {
    * @var Quinquennium $quinquenniums      All current or past quinquenniums
    * @var Quinquennium $current_quinquennium      Current quinquennium
    */
+
+  public function postReport()
+  {
+    $program_id = Input::get('program_id') + 0;
+    $realized = Input::get('realized');
+    $logrado = Input::get('logrado');
+    $continued = Input::get('continued');
+    $semester = Input::get('semester');
+    $typ_objective = Input::get('typ_objective');
+    $transformative = Input::get('transformative');
+    $annual_id = Input::get("annual_id") + 0;
+    $id = Auth::user()['id'];
+
+    for ($i = 0; $i < count($semester); $i++) {
+      $real = $realized[$i] + 0;
+      $logr = $logrado[$i] + 0;
+      $cont = $continued[$i] + 0;
+      $obj = $typ_objective[$i] + 0;
+      $trans = $transformative[$i] + 0;
+      $sem = $semester[$i] + 0;
+
+      //if it was continued
+      if ($real == 1) $real = 2;
+      else $real = 1;
+      if ($cont == 1) $cont = $sem + 1;
+      else $cont = "NULL";
+      $annual_trans_id = DB::select("select id from annual_plan_transformative where annual_plan_id ={$annual_id} and trans_id = {$trans} and typ_semester_objective_id = {$obj}")[0]->id;
+
+
+      $queryUpdate = DB::select("select * from annual_report_transformative where annual_trans_id = {$annual_trans_id}");
+      if (!count($queryUpdate)) {
+        DB::insert("insert into annual_report_transformative (accomplished, cycle_of_life, semester_used, semester_continue, annual_trans_id, supervised_coordinator_id) values ({$logr},{$real},{$sem},{$cont},{$annual_trans_id}, {$id})");
+      } else {
+        DB::update("update annual_report_transformative set accomplished = {$logr}, cycle_of_life ={$real}, semester_used ={$sem}, semester_continue={$cont}, supervised_coordinator_id={$id} where annual_trans_id ={$annual_trans_id}");
+      }
+    }
+    return;
+  }
   public function index()
   {
     $title = 'Annual Plans';
     $user = Auth::user();
-    $quinquenniums = Quinquennium::where('start_date','<=', date('Y-m-d'))->get();
-    $current_quinquennium = Quinquennium::
-      where('start_date', '<=', date('Y-m-d'))
+    $quinquenniums = Quinquennium::where('start_date', '<=', date('Y-m-d'))->get();
+    $current_quinquennium = Quinquennium::where('start_date', '<=', date('Y-m-d'))
       ->where('end_date', '>=', date('Y-m-d'))
       ->first();
 
@@ -71,6 +121,41 @@ class AnnualPlansController extends \BaseController {
 
     return View::make('local.managers.shared.index_annual_plans', compact('title', 'quinquenniums', 'programs', 'current_quinquennium'));
   }
+  public function adminIndex($school_id)
+  {
+    $title = "Annual Plans";
+    $programs = Program::where("school_id", $school_id)->get();
+
+    return View::make('local.managers.admins.appraisal-program', compact('title', 'programs'));
+  }
+
+  public function showPlan($program_id, $typ_id = null)
+  {
+    $title = "Annual Plans";
+    //$typ_parts = DB::select("select * from typ_parts");
+    if (!$typ_id) {
+      $current_typ = DB::select("select * from three_year_plan where year_start <=" . date('Y') . " and year_end >=" . date('Y'))[0]->id;
+    } else {
+      $current_typ = DB::select("select * from three_year_plan where id ={$typ_id}")[0]->id;
+    }
+    Log::info($current_typ);
+
+    $program = Program::where('id', '=', $program_id)->first();
+    $annual_plans = DB::select("select * from annual_plans where program_id = {$program_id} order by id desc limit 5");
+    Log::info($annual_plans);
+    $outcomes = array();
+    $allSemesterOrder = array();
+    foreach ($annual_plans as $an_plan) {
+      Log::info($an_plan->id);
+      $outcomes[$an_plan->id]["first"] = DB::select("select * from outcomes where id in (select outcome_id from typ_semester_outcome where semester_id = {$an_plan->semester_start} and typ_program_id in (select id from typ_program where program_id ={$an_plan->program_id} and three_year_plan_id ={$current_typ} ))");
+      $allSemesterOrder[$an_plan->id]["first"] = DB::select("select * from semesters where id = {$an_plan->semester_start}")[0];
+      $outcomes[$an_plan->id]["second"] = DB::select("select * from outcomes where id in (select outcome_id from typ_semester_outcome where semester_id ={$an_plan->semester_end} and typ_program_id in (select id from typ_program where program_id ={$an_plan->program_id} and three_year_plan_id = {$current_typ} ))");
+      $allSemesterOrder[$an_plan->id]["second"] = DB::select("select * from semesters where id = {$an_plan->semester_end}")[0];
+    }
+    $alltyp = DB::select('select * from three_year_plan order by id desc');
+
+    return View::make('local.managers.sCoords.annual-plans', compact('title', 'annual_plans', 'current_typ', 'program', 'outcomes', 'allSemesterOrder', 'alltyp'));
+  }
 
   /**
    * Page to create a new plan for the current quinquennium
@@ -80,33 +165,229 @@ class AnnualPlansController extends \BaseController {
    * @var User $user      Currently logged user
    * @var Course $courses      Courses for a particular program
    */
+  public function fetchTYP($program_id)
+  {
+    $typ_info = array();
+    $semester = DB::select("select * from semesters where id=?", array(Input::get('semester')))[0];
+
+
+    //$typ_info['courses'] = DB::select("select * from courses where id in (select course_id from typ_semester_courses where typ_semester_outcome_id in (select id from typ_semester_outcome where semester_id ={$semester->id} and typ_program_id in (select id from typ_program where program_id ={$program_id} )and outcome_id = ?))", array(Input::get('id')));
+    //foreach ($typ_info['courses'] as $course) {
+    //  $typ_info['courses_objective'][$course->id] = DB::select("select * from objectives where id in (select objective_id from typ_semester_objectives where typ_semester_course_id in (select id from typ_semester_courses where typ_semester_outcome_id in (select id from typ_semester_outcome where semester_id = {$semester->id} and typ_program_id in (select id from typ_program where program_id ={$program_id}))and course_id ={$course->id}))");
+    //  foreach ($typ_info['courses_objective'][$course->id] as $objective) {
+    //    $typ_info['criteria'][$objective->id] = DB::select("select * from new_criteria where id in (select criterion_id from criterion_objective_outcome where outcome_id = ? and objective_id = {$objective->id})", array(Input::get('id')));
+    //  }
+    //}
+    //$typ_info['courses'] = DB::select("select * from courses where id in (select course_id from typ_semester_courses where typ_semester_objective_id in (select id from typ_semester_objectives where typ_semester_outcome_id in (select id from type_semester_outcome where semester_id ={$semester->id} and typ_program_id in (select id from typ_program where program_id ={$program_id} )and outcome_id = ?)))", array(Input::get('id')));
+    //$typ_info['unique_objective'] = DB::select("select * from objectives where id in (select distinct objective_id from typ_semester_objectives where  typ_semester_outcome_id in (select id from typ_semester_outcome where semester_id = {$semester->id} and outcome_id =? and typ_program_id in (select id from typ_program where program_id ={$program_id})))", array(Input::get('id')));
+    //foreach ($typ_info['unique_objective'] as $objective) {
+    //  $typ_info['courses_objective'][$objective->id] = DB::select("select * from courses where id in (SELECT course_id from typ_semester_courses where typ_semester_outcome_id in (select id from typ_semester_outcome where semester_id={$semester->id} and outcome_id =? and typ_program_id in (select id from typ_program where program_id = {$program_id})) and id in (select typ_semester_course_id from typ_semester_objectives where objective_id  = {$objective->id}))", array(Input::get('id')));
+    //  $typ_info['criteria'][$objective->id] = DB::select("select * from new_criteria where id in (select criterion_id from criterion_objective_outcome where outcome_id = ? and objective_id = {$objective->id})", array(Input::get('id')));
+    //}
+    $annual_plan = DB::select("select id from annual_plans where (semester_start = {$semester->id} or semester_end ={$semester->id}) and program_id ={$program_id}")[0];
+    $typ_info['objectives'] = DB::select("select * from objectives where id in (select objective_id from typ_semester_objectives where typ_semester_outcome_id in(select id from typ_semester_outcome where outcome_id = ? and semester_id = {$semester->id} and typ_program_id in (select id from typ_program where program_id ={$program_id})))", array(Input::get('id')));
+    $typ_info['transformative_actions'] = DB::select("select * from transformative_actions where by_professor =0 and is_custom=0");
+    foreach ($typ_info['objectives'] as $objective) {
+
+      $typ_info['courses'][$objective->id] = DB::select("select c.id, c.number, c.code, typ.id typ_course_id from courses c, typ_semester_courses typ, (select course_id, id  from typ_semester_courses where typ_semester_objective_id in (select id from typ_semester_objectives where objective_id ={$objective->id} and typ_semester_outcome_id in (select id from typ_semester_outcome where outcome_id =? and semester_id ={$semester->id} and typ_program_id in(select id from typ_program where program_id ={$program_id})))) rel where typ.course_id =c.id and rel.course_id = c.id and typ.id = rel.id ", array(Input::get('id')));
+
+      $typ_info['criteria'][$objective->id] = DB::select("select * from new_criteria where id in (select criterion_id from criterion_objective_outcome where outcome_id = ? and objective_id = {$objective->id})", array(Input::get('id')));
+      Log::info($typ_info['criteria'][$objective->id]);
+      $typ_info['typ_objective_id'][$objective->id] = DB::select("select id from typ_semester_objectives where objective_id = {$objective->id} and typ_semester_outcome_id in (select id from typ_semester_outcome where outcome_id =? and semester_id ={$semester->id} and typ_program_id in (select id from typ_program where program_id ={$program_id}))", array(Input::get('id')));
+      Log::info($typ_info['typ_objective_id'][$objective->id]);
+      $typ_info['typ_objective_id'][$objective->id] = $typ_info['typ_objective_id'][$objective->id][0];
+
+      Log::info($typ_info['typ_objective_id'][$objective->id]->id);
+      Log::info($annual_plan->id);
+      $typ_info['annual_plans_transformative'][$objective->id] = DB::select("select trans_id from annual_plan_transformative where annual_plan_id={$annual_plan->id} and typ_semester_objective_id ={$typ_info['typ_objective_id'][$objective->id]->id}");
+      foreach ($typ_info['courses'][$objective->id] as $course) {
+        $typ_info['selected_criteria'][$objective->id][$course->id] = DB::select("select criteria_id, typ_semester_course_id typ_course_id from annual_plan_objective where annual_plan_id ={$annual_plan->id} and typ_semester_course_id ={$course->typ_course_id} ");
+      }
+
+
+      $typ_info['custom_transformative'][$objective->id] = DB::select("select * from transformative_actions where is_custom =1 and by_professor=0 and id in (select ta_id from transformative_objective_program where objective_id = {$objective->id})");
+    }
+    $typ_info['annual_plan'] = $annual_plan;
+    Log::info($typ_info);
+
+    return json_encode($typ_info);
+  }
+  public function deleteTA()
+  {
+    $annual_id = Input::get('annual_id') + 0;
+    $typ_id = Input::get('typ_id') + 0;
+    $trans_id = Input::get('TA_id') + 0;
+
+    DB::delete("delete from `annual_plan_transformative` where annual_plan_id ={$annual_id} and typ_semester_objective_id ={$typ_id} and trans_id={$trans_id}");
+    return;
+  }
+
+  public function postTA()
+  {
+    $annual_id = Input::get('annual_id') + 0;
+    $TA_id = Input::get('TA_id') + 0;
+    $typ_id = Input::get('typ_id') + 0;
+    $old_ta = Input::get('old_ta') + 0;
+    $id = Auth::user()['id'];
+    $date = date('Y-m-d');
+    $date = strtotime($date);
+
+
+    $query = DB::select("select * from annual_plan_transformative where annual_plan_id ={$annual_id} and trans_id ={$old_ta} and typ_semester_objective_id ={$typ_id}");
+
+    if (!count($query)) {
+      DB::insert("insert into `annual_plan_transformative` (`annual_plan_id`,`trans_id`, `typ_semester_objective_id`, `proposing_coordinator_id`, `proposed_date`) values({$annual_id},{$TA_id},{$typ_id}, {$id}, now() ) ");
+      return "Insert Successful";
+    } else {
+      if ($TA_id == 0) {
+        DB::delete("delete from annual_plan_transformative where trans_id={$TA_id} and annual_plan_id ={$annual_id} and typ_semester_objective_id ={$typ_id}");
+        return "deleted";
+      } else {
+        DB::update("update annual_plan_transformative set trans_id = {$TA_id}, proposing_coordinator_id = {$id}, proposed_date = now() where trans_id={$old_ta} and annual_plan_id ={$annual_id} and typ_semester_objective_id ={$typ_id}");
+        return "updated";
+      }
+    }
+  }
+  public function transformativeReport()
+  {
+    $json_to_send = array();
+    $annual_id = Input::get('an_id');
+    $transformative_action_info = DB::select("select * from transformative_actions where id in (select distinct trans_id from annual_plan_transformative where annual_plan_id = {$annual_id}) ");
+    foreach ($transformative_action_info as $trans) {
+      $json_to_send['Trans_act'][$trans->id] = $trans;
+      $json_to_send['outcomes'][$trans->id] = DB::select("select * from outcomes where id in (select outcome_id from typ_semester_outcome where id in(select typ_semester_outcome_id from typ_semester_objectives where id in (select typ_semester_objective_id from annual_plan_transformative where trans_id ={$trans->id} and annual_plan_id = {$annual_id})))");
+      $json_to_send['typ_objective'][$trans->id] = DB::select("select * from typ_semester_objectives where id in (select typ_semester_objective_id from annual_plan_transformative where annual_plan_id ={$annual_id} and trans_id = {$trans->id})");
+      foreach ($json_to_send['typ_objective'][$trans->id] as $typ) {
+        $json_to_send['objective'][$typ->id][$trans->id] = DB::select("select * from objectives where id = {$typ->objective_id}");
+        $json_to_send['coordinator'][$typ->id][$trans->id] = DB::select("select * from users where id in (select proposing_coordinator_id from annual_plan_transformative where typ_semester_objective_id = {$typ->id} and annual_plan_id = {$annual_id} and trans_id = {$trans->id})");
+        $json_to_send['proposed_date'][$typ->id][$trans->id] = DB::select("select proposed_date from annual_plan_transformative where typ_semester_objective_id = {$typ->id} and annual_plan_id = {$annual_id} and trans_id = {$trans->id} ");
+        $json_to_send['all_info_report'][$typ->id][$trans->id] = DB::select("select art.accomplished, art.cycle_of_life, semesters.name, art.semester_continue,  art.annual_trans_id, art.supervised_coordinator_id  from annual_report_transformative art, (select id from annual_plan_transformative where typ_semester_objective_id = {$typ->id} and annual_plan_id = {$annual_id} and trans_id = {$trans->id} ) apt, semesters  where art.annual_trans_id = apt.id and semesters.id = art.semester_used");
+      }
+
+      if ($trans->user_id) {
+        $json_to_send['suggested'][$trans->id] = DB::select("select * from users where id = {$trans->user_id}");
+      }
+    }
+    return json_encode($json_to_send);
+  }
+
+  public function deleteCriteria()
+  {
+    $criteria = Input::get('criteria') + 0;
+    $typ_course_id = Input::get('typ_course_id') + 0;
+    $annual_plan = Input::get('annual_plan') + 0;
+    $old_criteria = Input::get('old_criteria') + 0;
+    $message = '';
+
+    DB::delete("delete from annual_plan_objective where annual_plan_id ={$annual_plan} and typ_semester_course_id ={$typ_course_id} and criteria_id={$criteria}");
+    return;
+  }
+
+  public function fetchAllTables()
+  {
+    $annual_plan = array();
+    $an_id = Input::get('id');
+    $program_id = Input::get('program_id');
+
+    $an_semesters = DB::select("select semester_start, semester_end, program_id from annual_plans where id ={$an_id} and program_id ={$program_id}")[0];
+
+    $annual_plan['first']['outcomes'] = DB::select("select * from outcomes where id in (select outcome_id from typ_semester_outcome where semester_id = {$an_semesters->semester_start} and typ_program_id in(select id from typ_program where program_id ={$an_semesters->program_id}))");
+
+    $annual_plan['second']['outcomes'] = DB::select("select * from outcomes where id in (select outcome_id from typ_semester_outcome where semester_id = {$an_semesters->semester_end} and typ_program_id in(select id from typ_program where program_id ={$an_semesters->program_id}))");
+
+    $annual_plan['first']['semester'] = array('id' => $an_semesters->semester_start);
+    $annual_plan['second']['semester'] = array('id' => $an_semesters->semester_end);
+    foreach ($annual_plan['first']['outcomes'] as $outcomes) {
+
+      $annual_plan['first']['objectives'][$outcomes->id] = DB::select("select * from objectives where id in (select objective_id from typ_semester_objectives where typ_semester_outcome_id in(select id from typ_semester_outcome where outcome_id = {$outcomes->id} and semester_id = {$an_semesters->semester_start} and typ_program_id in (select id from typ_program where program_id ={$an_semesters->program_id})))");
+
+      foreach ($annual_plan['first']['objectives'][$outcomes->id] as $objective) {
+        $annual_plan['first']['typ_objective_id'][$objective->id] = DB::select("select id from typ_semester_objectives where objective_id = {$objective->id} and  typ_semester_outcome_id in (select id from typ_semester_outcome where outcome_id ={$outcomes->id} and semester_id ={$an_semesters->semester_start} and typ_program_id in(select id from typ_program where program_id ={$an_semesters->program_id})) ")[0];
+        $annual_plan['first']['courses'][$objective->id] = DB::select("select typ.id typ_id, typ.course_id, c.code, c.number from (select course_id, id from typ_semester_courses where typ_semester_objective_id in (select id from typ_semester_objectives where objective_id ={$objective->id} and typ_semester_outcome_id in (select id from typ_semester_outcome where outcome_id ={$outcomes->id} and semester_id ={$an_semesters->semester_start} and typ_program_id in(select id from typ_program where program_id ={$an_semesters->program_id})))) typ, courses c where c.id = typ.course_id");
+        foreach ($annual_plan['first']['courses'][$objective->id] as $course) {
+          $annual_plan['first']['criteria'][$objective->id][$course->course_id] = DB::select("select * from new_criteria where id in(select criteria_id from annual_plan_objective where annual_plan_id = {$an_id} and typ_semester_course_id = {$course->typ_id} )");
+        }
+
+        $annual_plan['first']['trans_actions'][$objective->id] = DB::select("select * from transformative_actions where id in (select trans_id from annual_plan_transformative where typ_semester_objective_id in (select id from typ_semester_objectives where objective_id ={$objective->id} and typ_semester_outcome_id in (select id from typ_semester_outcome where outcome_id ={$outcomes->id} and semester_id ={$an_semesters->semester_start} and typ_program_id in(select id from typ_program where program_id ={$an_semesters->program_id}))))");
+        foreach ($annual_plan['first']['trans_actions'][$objective->id] as $trans) {
+          $annual_plan['fill_info'][$annual_plan['first']['typ_objective_id'][$objective->id]->id][$trans->id] = DB::select("select * from annual_report_transformative where annual_trans_id in (select id from annual_plan_transformative where trans_id = {$trans->id} and typ_semester_objective_id ={$annual_plan['first']['typ_objective_id'][$objective->id]->id} and annual_plan_id = {$an_id} )")[0];
+        }
+      }
+    }
+    foreach ($annual_plan['second']['outcomes'] as $outcomes) {
+      $annual_plan['second']['objectives'][$outcomes->id] = DB::select("select * from objectives where id in (select objective_id from typ_semester_objectives where typ_semester_outcome_id in(select id from typ_semester_outcome where outcome_id = {$outcomes->id} and semester_id = {$an_semesters->semester_end} and typ_program_id in (select id from typ_program where program_id ={$an_semesters->program_id})))");
+      foreach ($annual_plan['second']['objectives'][$outcomes->id] as $objective) {
+        $annual_plan['second']['typ_objective_id'][$objective->id] = DB::select("select id from typ_semester_objectives where objective_id = {$objective->id} and  typ_semester_outcome_id in (select id from typ_semester_outcome where outcome_id ={$outcomes->id} and semester_id ={$an_semesters->semester_end} and typ_program_id in(select id from typ_program where program_id ={$an_semesters->program_id})) ")[0];
+
+        $annual_plan['second']['courses'][$objective->id] = DB::select("select typ.id typ_id, typ.course_id, c.code, c.number from (select course_id, id from typ_semester_courses where typ_semester_objective_id in (select id from typ_semester_objectives where objective_id ={$objective->id} and typ_semester_outcome_id in (select id from typ_semester_outcome where outcome_id ={$outcomes->id} and semester_id ={$an_semesters->semester_end} and typ_program_id in(select id from typ_program where program_id ={$an_semesters->program_id})))) typ, courses c where c.id = typ.course_id");
+        foreach ($annual_plan['second']['courses'][$objective->id] as $course) {
+          $annual_plan['second']['criteria'][$objective->id][$course->course_id] = DB::select("select * from new_criteria where id in(select criteria_id from annual_plan_objective where annual_plan_id = {$an_id} and typ_semester_course_id ={$course->typ_id})");
+        }
+
+        $annual_plan['second']['trans_actions'][$objective->id] = DB::select("select * from transformative_actions where id in (select trans_id from annual_plan_transformative where typ_semester_objective_id in (select id from typ_semester_objectives where objective_id ={$objective->id} and typ_semester_outcome_id in (select id from typ_semester_outcome where outcome_id ={$outcomes->id} and semester_id ={$an_semesters->semester_end} and typ_program_id in(select id from typ_program where program_id ={$an_semesters->program_id}))))");
+        Log::info($annual_plan['second']['typ_objective_id'][$objective->id]->id);
+        foreach ($annual_plan['second']['trans_actions'][$objective->id] as $trans) {
+          $annual_plan['fill_info'][$annual_plan['second']['typ_objective_id'][$objective->id]->id][$trans->id] = DB::select("select * from annual_report_transformative where annual_trans_id in (select id from annual_plan_transformative where trans_id = {$trans->id} and typ_semester_objective_id ={$annual_plan['second']['typ_objective_id'][$objective->id]->id} and annual_plan_id = {$an_id} )")[0];
+        }
+      }
+    }
+
+    return json_encode($annual_plan);
+  }
+
+  public function postAnnualPlan()
+  {
+    $criteria = Input::get('criteria') + 0;
+    $typ_course_id = Input::get('typ_course_id') + 0;
+    $annual_plan = Input::get('annual_plan') + 0;
+    $old_criteria = Input::get('old_criteria') + 0;
+    $message = '';
+    $query = DB::select("select * from annual_plan_objective where annual_plan_id ={$annual_plan} and typ_semester_course_id = {$typ_course_id} and criteria_id ={$old_criteria}");
+    if (!count($query)) {
+      $query = DB::select("select * from annual_plan_objective where annual_plan_id ={$annual_plan} and typ_semester_course_id = {$typ_course_id} and criteria_id ={$criteria}");
+
+      if (!count($query)) {
+
+        DB::insert("insert into `annual_plan_objective` (`annual_plan_id`, `typ_semester_course_id`, `criteria_id`) values ({$annual_plan}, {$typ_course_id}, {$criteria})");
+        $message = "inserting was a success";
+      } else {
+        $message = "Duplicate entry, please choose another criteria.";
+      }
+    } else {
+      $query = DB::select("select * from annual_plan_objective where annual_plan_id ={$annual_plan} and typ_semester_course_id = {$typ_course_id} and criteria_id ={$criteria}");
+
+      if (!count($query)) {
+        DB::update("update `annual_plan_objective` set criteria_id = {$criteria} where annual_plan_id = {$annual_plan} and typ_semester_course_id ={$typ_course_id} and criteria_id = {$old_criteria} ");
+        $message = "Updating was a success";
+      } else {
+        $message = "Duplicate entry, please choose another criteria.";
+      }
+    }
+    return $message;
+  }
   public function create(Program $program)
   {
-    $title = 'New Annual Plan for '.$program->name;
+    $title = 'New Annual Plan for ' . $program->name;
     $user = Auth::user();
     $outcomes = Outcome::orderBy('name')->get();
 
-    $current_quinquennium = Quinquennium::
-      where('start_date', '<=', date('Y-m-d'))
+    $current_quinquennium = Quinquennium::where('start_date', '<=', date('Y-m-d'))
       ->where('end_date', '>=', date('Y-m-d'))
       ->first();
 
-    $courses = Course::
-      select('id', 'code', 'number', 'name')
+    $courses = Course::select('id', 'code', 'number', 'name')
       ->where('program_id', $program->id)
       ->groupBy('name')
-      ->orderBy('code','ASC')
-      ->orderBy('number','ASC')
-      ->orderBy('name','ASC')
+      ->orderBy('code', 'ASC')
+      ->orderBy('number', 'ASC')
+      ->orderBy('name', 'ASC')
       ->get();
 
     // Check if user can create a plan
-    if(!$this->userHasAccess($program->id))
-    {
+    if (!$this->userHasAccess($program->id)) {
       return View::make('global.403');
     }
 
     return View::make('local.managers.shared.create_annual_plan', compact('title', 'program', 'current_quinquennium', 'outcomes', 'courses'));
   }
-
 }

app/controllers/ProgramCoordinatorsController.php

@@ -1,109 +1,101 @@
 <?php
 
-class ProgramCoordinatorsController extends \BaseController {
-
-    public function overview()
-    {
-        //TODO Find a better way to prevent non-scoords from reaching the page
-        switch(Auth::user()->role)
-        {
-            case 1:
-                return Redirect::to('administrator');
-                break;
-            case 2:
-                return Redirect::to('school-coordinator');
-                break;
-        }
-
-        $title = 'Program Coordinator Overview';
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Log;
+
+class ProgramCoordinatorsController extends \BaseController
+{
+
+  public function overview()
+  {
+    //TODO Find a better way to prevent non-scoords from reaching the page
+    switch (Auth::user()->role) {
+      case 1:
+        return Redirect::to('administrator');
+        break;
+      case 2:
+        return Redirect::to('school-coordinator');
+        break;
+    }
+    Log::info(Auth::user()->programs);
+    $title = 'Program Coordinator Overview';
 
-        $programs = Auth::user()->programs;
+    $programs = Auth::user()->programs;
 
-        $outcomes = Outcome::orderBy('name', 'asc')->get();
-        $outcomeCount = Outcome::all()->count();
+    $outcomes = Outcome::orderBy('name', 'asc')->get();
+    $outcomeCount = Outcome::all()->count();
 
-        $programs_array = array();
-        $programs_contact = array();
+    $programs_array = array();
+    $programs_contact = array();
 
-        foreach ($programs as $program)
-        {
-          $program_array = array();
+    foreach ($programs as $program) {
+      $program_array = array();
 
-          $program_array['program'] = $program;
+      $program_array['program'] = $program;
 
-          $program_array['outcomes_achieved'] = array_fill(1, $outcomeCount, 0);
-          $program_array['outcomes_attempted'] = array_fill(1, $outcomeCount, 0);
+      $program_array['outcomes_achieved'] = array_fill(1, $outcomeCount, 0);
+      $program_array['outcomes_attempted'] = array_fill(1, $outcomeCount, 0);
 
-          $program_array['program_courses'] = $program->courses;
-          $program_array['grouped_objectives'] = $program->objectives();
+      $program_array['program_courses'] = $program->courses;
+      $program_array['grouped_objectives'] = $program->objectives();
 
-          $program_array['assessed_courses_count']=0;
-          foreach ($program_array['program_courses'] as $course)
-          {
-            if($course->outcomes_achieved!=NULL)
-            {
-              $program_array['course_outcomes_achieved'] =json_decode($course->outcomes_achieved, true);
-              $program_array['course_outcomes_attempted'] =json_decode($course->outcomes_attempted, true);
-              for($i=1; $i<=count($program_array['outcomes_attempted']); $i++)
-              {
-                $program_array['outcomes_achieved'][$i]+=$program_array['course_outcomes_achieved'][$i];
-                $program_array['outcomes_attempted'][$i]+=$program_array['course_outcomes_attempted'][$i];
-              }
-              $program_array['assessed_courses_count']+=1;
-            }
+      $program_array['assessed_courses_count'] = 0;
+      foreach ($program_array['program_courses'] as $course) {
+        if ($course->outcomes_achieved != NULL) {
+          $program_array['course_outcomes_achieved'] = json_decode($course->outcomes_achieved, true);
+          $program_array['course_outcomes_attempted'] = json_decode($course->outcomes_attempted, true);
+          for ($i = 1; $i <= count($program_array['outcomes_attempted']); $i++) {
+            $program_array['outcomes_achieved'][$i] += $program_array['course_outcomes_achieved'][$i];
+            $program_array['outcomes_attempted'][$i] += $program_array['course_outcomes_attempted'][$i];
           }
-
-          /**
-           * List of grouped courses (grouped sections)
-           */
-
-          $program_array['grouped_courses'] = Course::
-            select(DB::raw('name, code, number, max(outcomes_attempted) as outcomes_attempted, semester_id, program_id'))
-            ->with('semester')
-            ->with('program')
-            ->where('program_id', $program->id)
-            ->whereIn('semester_id', Session::get('semesters_ids'))
-            ->groupBy(array('code', 'number', 'semester_id'))
-            ->orderBy('code')
-            ->orderBy('number')
-            ->orderBy('semester_id')
-            ->get();
-
-
-          $programs_array[] = $program_array;
-
-
-          // Program contact information
-          $users = User::
-              select('users.*')
-              ->leftJoin('program_user', 'users.id', '=', 'program_user.user_id')
-              ->where(function($query) use($program)
-              {
-                $query
-                    ->where('school_id', $program->school_id)
-                    ->where('role', 2);
-              })
-              ->orWhere(function($query) use($program)
-              {
-                $query
-                    ->where('role', 3)
-                    ->where('program_id', $program->id);
-              })
-              ->orWhere(function($query) use($program)
-              {
-                $query
-                    ->where('role', 4)
-                    ->where('program_id', $program->id);
-              })
-              ->get();
-
-
-            $programs_contact[] = $users;
-
+          $program_array['assessed_courses_count'] += 1;
         }
-
-
-        return View::make('local.managers.pCoords.overview', compact('title', 'programs', 'outcomes', 'programs_array', 'programs_contact'));
+      }
+
+      /**
+       * List of grouped courses (grouped sections)
+       */
+
+      $program_array['grouped_courses'] = Course::select(DB::raw('name, code, number, max(outcomes_attempted) as outcomes_attempted, semester_id, program_id'))
+        ->with('semester')
+        ->with('program')
+        ->where('program_id', $program->id)
+        ->whereIn('semester_id', Session::get('semesters_ids'))
+        ->groupBy(array('code', 'number', 'semester_id'))
+        ->orderBy('code')
+        ->orderBy('number')
+        ->orderBy('semester_id')
+        ->get();
+
+
+      $programs_array[] = $program_array;
+
+
+      // Program contact information
+      $users = User::select('users.*')
+        ->leftJoin('program_user', 'users.id', '=', 'program_user.user_id')
+        ->where(function ($query) use ($program) {
+          $query
+            ->where('school_id', $program->school_id)
+            ->where('role', 2);
+        })
+        ->orWhere(function ($query) use ($program) {
+          $query
+            ->where('role', 3)
+            ->where('program_id', $program->id);
+        })
+        ->orWhere(function ($query) use ($program) {
+          $query
+            ->where('role', 4)
+            ->where('program_id', $program->id);
+        })
+        ->get();
+
+
+      $programs_contact[] = $users;
     }
 
+
+    return View::make('local.managers.pCoords.overview', compact('title', 'programs', 'outcomes', 'programs_array', 'programs_contact'));
+  }
 }

app/controllers/ThreeYearPlanController.php

@@ -329,12 +329,12 @@ class ThreeYearPlanController extends \BaseController
           }
 
           // lookup available objectives
-          $result_objectives = DB::table('criterion_objective_outcome')
-              ->join('outcomes','outcomes.id','=','criterion_objective_outcome.outcome_id')
-              ->join('objectives','objectives.id','=','criterion_objective_outcome.objective_id')
+          $result_objectives = DB::table('objective_outcome')
+              ->join('outcomes','outcomes.id','=','objective_outcome.outcome_id')
+              ->join('objectives','objectives.id','=','objective_outcome.objective_id')
               ->join('objective_program','objective_program.objective_id','=','objectives.id')
               ->where('objective_program.program_id',$program_id)
-              ->where('criterion_objective_outcome.outcome_id',$outcome_id)
+              ->where('objective_outcome.outcome_id',$outcome_id)
               ->select('objectives.id','objectives.text','outcomes.name as outcome_name')
               ->orderBy('objectives.text', 'asc')
               ->get();
@@ -407,8 +407,6 @@ class ThreeYearPlanController extends \BaseController
         // buscar info sobre selected_semsters
         $outcome_->selected_semesters = array();
         foreach ($result_semesters as $semesters_) {
-          $semester_id = $semesters_->semester_id;
-
           $typ_semester_outcome_id = $semesters_->id;
           $result_objectives = DB::table('typ_semester_objectives')
               ->join('objectives','objectives.id','=','typ_semester_objectives.objective_id')
@@ -419,19 +417,13 @@ class ThreeYearPlanController extends \BaseController
 
           $semesters_->selected_objectives = array();
           foreach ($result_objectives as $objectives_) {
-            $objective_id = $objectives_->objective_id;
-            $program_id = $objectives_->program_id;
-            $result_courses = DB::table('objective_program')
-                ->join('objectives','objectives.id','=','objective_program.objective_id')
-                ->join('courses','courses.program_id','=','objective_program.program_id')
-                ->where('objective_program.objective_id', $objective_id)
-                ->where('objective_program.program_id', $program_id)
-                ->where('courses.semester_id', $semester_id)
-                ->distinct('courses.name','courses.code')
-                ->select('courses.id as course_id','courses.name','courses.code','objective_program.objective_id','objective_program.program_id')
+            $result_courses = DB::table('courses')
+                ->where('courses.program_id', $program_id)
+                ->select('courses.id as course_id','courses.name','courses.code','courses.program_id')
                 ->orderBy('courses.name', 'asc')
                 ->groupBy('courses.name','courses.code')
                 ->get();
+            #los cursos resultantes creo que deberian ser: todos los que se estan dando en mi programa
 
             $objectives_->available_courses = array();
             foreach ($result_courses as $courses_) {

app/database/migrations/2016_07_15_084851_create_annual_plans_table.php → app/database/migrations/2021_03_03_084851_create_annual_plans_table.php

@@ -3,7 +3,8 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateAnnualPlansTable extends Migration {
+class CreateAnnualPlansTable extends Migration
+{
 
 	/**
 	 * Run the migrations.
@@ -12,25 +13,23 @@ class CreateAnnualPlansTable extends Migration {
 	 */
 	public function up()
 	{
-		Schema::create('annual_plans', function(Blueprint $table)
-		{
-			$table->engine = 'InnoDB';
+		Schema::create('annual_plans', function (Blueprint $table) {
+
 			$table->increments('id');
-			$table->integer('quinquennium_id')->unsigned();
-			$table
-				->foreign('quinquennium_id')
+			$table->string('academic_year');
+			$table->integer('semester_start')->unsigned();
+			$table->foreign('semester_start')
 				->references('id')
-				->on('quinquenniums')
+				->on('semesters')
 				->onDelete('cascade')
 				->onUpdate('cascade');
-			$table->integer('program_id')->unsigned();
-			$table->integer('semester_id')->unsigned();
-			$table
-				->foreign('semester_id')
+			$table->integer('semester_end')->unsigned();
+			$table->foreign('semester_end')
 				->references('id')
 				->on('semesters')
 				->onDelete('cascade')
 				->onUpdate('cascade');
+			$table->integer('program_id')->unsigned();
 			$table
 				->foreign('program_id')
 				->references('id')
@@ -53,5 +52,4 @@ class CreateAnnualPlansTable extends Migration {
 	{
 		Schema::drop('annual_plans');
 	}
-
 }

app/database/migrations/2016_07_15_090217_create_annual_plan_outcomes_table.php → app/database/migrations/2021_03_03_090217_create_annual_plan_objective_table.php

@@ -3,7 +3,8 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateAnnualPlanOutcomesTable extends Migration {
+class CreateAnnualPlanObjectiveTable extends Migration
+{
 
 	/**
 	 * Run the migrations.
@@ -12,9 +13,8 @@ class CreateAnnualPlanOutcomesTable extends Migration {
 	 */
 	public function up()
 	{
-		Schema::create('annual_plan_outcomes', function(Blueprint $table)
-		{
-			$table->engine = 'InnoDB';
+		Schema::create('annual_plan_objective', function (Blueprint $table) {
+
 			$table->increments('id');
 			$table->integer('annual_plan_id')->unsigned();
 			$table
@@ -23,21 +23,22 @@ class CreateAnnualPlanOutcomesTable extends Migration {
 				->on('annual_plans')
 				->onDelete('cascade')
 				->onUpdate('cascade');
-			$table->integer('outcome_id')->unsigned();
+			$table->integer('typ_semester_course_id')->unsigned();
 			$table
-				->foreign('outcome_id')
+				->foreign('typ_semester_course_id')
 				->references('id')
-				->on('outcomes')
+				->on('typ_semester_courses')
 				->onDelete('cascade')
 				->onUpdate('cascade');
-			$table->text('objectives')->nullable();
-			$table->text('courses')->nullable();
-			$table->text('methods')->nullable();
-			$table->tinyInteger('display_order');
+			$table->integer('criteria_id')->unsigned();
+			$table->foreign('criteria_id')
+				->references('id')
+				->on('new_criteria')
+				->onUpdate('cascade')
+				->onDelete('cascade');
+
 			$table->timestamps();
 		});
-
-		DB::statement("ALTER TABLE `fyp_part_outcomes` comment 'Outcomes for the annual plans'");
 	}
 
 
@@ -48,7 +49,6 @@ class CreateAnnualPlanOutcomesTable extends Migration {
 	 */
 	public function down()
 	{
-		Schema::drop('annual_plan_outcomes');
+		Schema::drop('annual_plan_objective');
 	}
-
 }

app/database/migrations/2021_03_29_154844_create_annual_plan_transformative.php

@@ -15,18 +15,31 @@ class CreateAnnualPlanTransformative extends Migration
 	{
 		Schema::create('annual_plan_transformative', function (Blueprint $table) {
 			$table->increments('id');
-			$table->integer('annual_plan')->unsigned();
-			$table->integer('trans_op_id')->unsigned();
-			$table->foreign('trans_op_id')
+			$table->integer('annual_plan_id')->unsigned();
+			$table->integer('trans_id')->unsigned();
+			$table->foreign('trans_id')
 				->references('id')
-				->on('transformative_objective_program')
+				->on('transformative_actions')
 				->onDelete('cascade')
 				->onUpdate('cascade');
-			$table->foreign('annual_plan')
+			$table->foreign('annual_plan_id')
 				->references('id')
 				->on('annual_plans')
 				->onDelete('cascade')
 				->onUpdate('cascade');
+			$table->integer('typ_semester_objective_id')->unsigned();
+			$table->foreign('typ_semester_objective_id')
+				->references('id')
+				->on('typ_semester_objectives')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->integer('proposing_coordinator_id')->unsigned();
+			$table->foreign('proposing_coordinator_id')
+				->references('id')
+				->on('users')
+				->onDelete('restrict')
+				->onUpdate('restrict');
+			$table->dateTime('proposed_date');
 		});
 	}
 

app/database/migrations/2021_03_29_155542_create_annual_report_transformative.php

@@ -0,0 +1,57 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Schema;
+
+class CreateAnnualReportTransformative extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('annual_report_transformative', function (Blueprint $table) {
+			$table->increments('id');
+			$table->boolean('accomplished');
+			$table->integer('cycle_of_life');
+			$table->integer("semester_used")->unsigned();
+			$table->integer('semester_continue')->unsigned()->nullable();
+			$table->integer('annual_trans_id')->unsigned();
+			$table->foreign('annual_trans_id')
+				->references('id')
+				->on('annual_plan_transformative')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->foreign('semester_used')
+				->references('id')
+				->on('semesters')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->foreign('semester_continue')
+				->references('id')
+				->on('semesters')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->integer('supervised_coordinator_id')->unsigned();
+			$table->foreign('supervised_coordinator_id')
+				->references('id')
+				->on('users')
+				->onDelete('restrict')
+				->onUpdate('restrict');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('annual_report_transformative');
+	}
+}

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/database/migrations/2021_02_16_142832_create_cycles_semesters_table.php → app/database/unusedMigrations/2021_02_17_190111_create_three_year_plans_table.php

@@ -3,7 +3,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class CreateCyclesSemestersTable extends Migration {
+class CreateThreeYearPlansTable extends Migration
+{
 
 	/**
 	 * Run the migrations.
@@ -12,30 +13,31 @@ class CreateCyclesSemestersTable extends Migration {
 	 */
 	public function up()
 	{
-		Schema::create('cycles_semesters', function(Blueprint $table)
-		{
-			// id unico
-			$table->increments('id');
-			// id del ciclo que pertenece
+		Schema::create('three_year_plans', function (Blueprint $table) {
+
+			$table->increments('id')->unsigned();
 			$table->integer('cycle_id')->unsigned();
-			// semestre n
-			$table->integer('semester_id')->unsigned();
 			$table
 				->foreign('cycle_id')
 				->references('id')
 				->on('cycles')
 				->onDelete('cascade')
 				->onUpdate('cascade');
+			$table->integer('program_id')->unsigned();
 			$table
-				->foreign('semester_id')
+				->foreign('program_id')
 				->references('id')
-				->on('semesters')
+				->on('programs')
 				->onDelete('cascade')
 				->onUpdate('cascade');
+			$table->boolean('is_submitted')->default(0);
+			$table->dateTime('submitted_on')->nullable();
 			$table->timestamps();
 		});
 	}
 
+
+
 	/**
 	 * Reverse the migrations.
 	 *
@@ -43,8 +45,6 @@ class CreateCyclesSemestersTable extends Migration {
 	 */
 	public function down()
 	{
-		//
-		Schema::drop('cycles_semesters');
+		Schema::drop('three_year_plans');
 	}
-
 }

app/database/unusedMigrations/2021_02_17_190118_create_typ_parts_table.php

@@ -0,0 +1,48 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateTypPartsTable extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('typ_parts', function (Blueprint $table) {
+
+			$table->increments('id')->unsigned();
+			$table->integer('three_year_plan_id')->unsigned();
+			$table
+				->foreign('three_year_plan_id')
+				->references('id')
+				->on('three_year_plans')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->integer('semester_id')->unsigned();
+			$table
+				->foreign('semester_id')
+				->references('id')
+				->on('semesters')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->timestamps();
+		});
+
+		// DB::statement("ALTER TABLE `typ_parts` comment 'Annual plans that are part of a three-year plan'");
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('typ_parts');
+	}
+}

app/database/unusedMigrations/2021_02_17_190124_create_typ_part_outcomes_table.php

@@ -0,0 +1,63 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateTypPartOutcomesTable extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('typ_part_outcomes', function (Blueprint $table) {
+
+			$table->increments('id')->unsigned();
+			$table->integer('typ_part_id')->unsigned();
+			$table
+				->foreign('typ_part_id')
+				->references('id')
+				->on('typ_parts')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->integer('outcome_id')->unsigned();
+			$table
+				->foreign('outcome_id')
+				->references('id')
+				->on('outcomes')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->integer('objective_id')->unsigned()->nullable();
+			$table
+				->foreign('objective_id')
+				->references('id')
+				->on('objectives')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->integer('course_id')->unsigned()->nullable();
+			$table
+				->foreign('course_id')
+				->references('id')
+				->on('courses')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->tinyInteger('display_order');
+			$table->timestamps();
+		});
+
+		// DB::statement("ALTER TABLE typ_part_outcomes comment 'Outcomes for the annual plans of the three year plans'");
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('typ_part_outcomes');
+	}
+}

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',
@@ -315,11 +317,25 @@ Route::group(array('before' => 'auth|has_access'), function () {
         Route::get('print_school/{id}', 'SchoolsController@print_school');
 
         // Assessment reports
+
         Route::get('school-assessment-report/{outcome_id}', 'OutcomesController@schoolAssessmentReport');
 
         // Gabriel added this, so the school coordinator can add criterias and objectives
+        Route::post('createCriterion', array('before' => 'csrf', 'uses' => 'CriteriaController@create'));
         Route::get('school-objective', 'Objective2Controller@editSchool');
         Route::get('school-criteria', 'CriteriaController@editSchool');
+        //Show users annual plan
+        Route::get('annual-plan-program/{program_id}/{typ_id?}', 'AnnualPlansController@showPlan');
+        Route::post('annual-plan-fetchTYP/{program_id}/{typ_id}', 'AnnualPlansController@fetchTYP');
+        Route::post('annual-plan-postOnChange', 'AnnualPlansController@postAnnualPlan');
+        Route::post('annual-plan-deleteCriteria', 'AnnualPlansController@deleteCriteria');
+        Route::get('annual-plan-show/{program_id}', 'AnnualPlansController@viewAllPlans');
+        Route::post('fetchAllTables', 'AnnualPlansController@fetchAllTables');
+        Route::post('annual-plan-postTA', 'AnnualPlansController@postTA');
+        Route::post('annual-report-post', 'AnnualPlansController@postReport');
+        Route::post('annual-plan-deleteTA', 'AnnualPlansController@deleteTA');
+        Route::post('annual-plan-trans-report', 'AnnualPlansController@transformativeReport');
+
 
         // Show users plan de tres a~nos
         Route::get('three-years-plan', 'ThreeYearPlanController@threeYearsReport');
@@ -349,7 +365,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
         Route::get('course/{id}', 'CoursesController@showLimited');
         Route::get('rubrics/{template_id}/download', 'TemplatesController@download');
         Route::post('program/fetch', array('before' => 'csrf', 'uses' => 'ProgramsController@fetch'));
-
+        Route::post('createCriterion', array('before' => 'csrf', 'uses' => 'CriteriaController@create'));
         Route::get('printRubric/{id}', 'TemplatesController@printview');
         Route::get('rubric/{rubric_id}', 'RubricsController@show_limited');
         Route::get('grouped_course/{code}/{number}/{semester_code}', 'CoursesController@showGrouped');
@@ -406,6 +422,25 @@ Route::group(array('before' => 'auth|has_access'), function () {
         Route::get('new-report-all', 'OutcomesController@newReportAll');
         Route::get('courses/{id}', 'CoursesController@newShow');
 
+        Route::get('annual-plan-program/{program_id}/{typ_id?}', 'AnnualPlansController@showPlan');
+        Route::post('annual-plan-fetchTYP/{program_id}', 'AnnualPlansController@fetchTYP');
+        Route::post('annual-plan-postOnChange', 'AnnualPlansController@postAnnualPlan');
+        Route::post('annual-plan-deleteCriteria', 'AnnualPlansController@deleteCriteria');
+
+        //Gabriel added this
+
+        Route::get('annual-plan-program/{program_id}/{typ_id?}', 'AnnualPlansController@showPlan');
+        Route::post('annual-plan-fetchTYP/{program_id}/{typ_id}', 'AnnualPlansController@fetchTYP');
+        Route::post('annual-plan-postOnChange', 'AnnualPlansController@postAnnualPlan');
+        Route::post('annual-plan-deleteCriteria', 'AnnualPlansController@deleteCriteria');
+        Route::get('annual-plan-show/{program_id}', 'AnnualPlansController@viewAllPlans');
+        Route::post('fetchAllTables', 'AnnualPlansController@fetchAllTables');
+        Route::post('annual-plan-postTA', 'AnnualPlansController@postTA');
+        Route::post('annual-report-post', 'AnnualPlansController@postReport');
+        Route::post('annual-plan-deleteTA', 'AnnualPlansController@deleteTA');
+        Route::post('annual-plan-trans-report', 'AnnualPlansController@transformativeReport');
+
+
         // Transformative Actions
         Route::post('transformativeAction/approveTA', array('before' => 'csrf', 'uses'=>'TransformativeActionsController@approveTA'));
 
@@ -421,6 +456,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
         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'));
 
+
     });
 
 

app/views/global/_datatables_js.blade.php

@@ -8,4 +8,4 @@
 <script src="{{ asset('vendor/bower_components/datatables.net-buttons/js/buttons.html5.min.js') }}"></script>
 <script src="{{ asset('vendor/bower_components/datatables.net-buttons/js/buttons.print.min.js') }}"></script>
 <script src="{{ asset('vendor/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js') }}"></script>
-<script src="{{ asset('vendor/bower_components/datatables.net-buttons-bs/js/buttons.bootstrap.min.js') }}"></script>
+<script src="{{ asset('vendor/bower_components/datatables.net-buttons-bs/js/buttons.bootstrap.min.js') }}"></script>

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,6 +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">
@@ -45,6 +45,7 @@
           @endforeach
         </ul>
       </li>
+
       @endif
 
       <li class="dropdown">
@@ -53,6 +54,7 @@
           <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/appraisal-program.blade.php

@@ -0,0 +1,30 @@
+@extends('layouts.master')
+
+@section('navigation')
+    @if(Auth::user()->role==1)
+        @include('local.managers.admins._navigation')
+    @elseif(Auth::user()->role==2)
+        @include('local.managers.sCoords._navigation')
+    @elseif(Auth::user()->role==3)
+        @include('local.managers.pCoords._navigation')
+    @endif
+@stop
+
+@section('main')
+    <div class="row">
+        <div class="col-md-12">
+            <p>Click the links below to see annual appraisal plans for a specific program with assessed courses:</p>
+            
+            
+            <ol id="table-of-contents" class="upper-roman">
+            @foreach($programs as $program)
+                <li>
+                    <a href="{{ URL::action('AnnualPlansController@showPlan', array($program->id))}}">
+                        {{ $program->name }}
+                    </a>
+                </li>
+            @endforeach
+            </ol>
+        </div>
+    </div>
+@stop

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

@@ -642,7 +642,7 @@
         $("#" + objectiveGroup + ' select').each(function() {
             var temp = {
                 id: this.attr('id'),
-                value: this.find(":selected").val();
+                value: this.val()
             }
             array_push(allObjectives, temp);
         })

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

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

@@ -11,6 +11,7 @@
 
       <li>{{ HTML::linkAction('Objective2Controller@editProgram', 'Objectives')}}</li>
       <li>{{ HTML::linkAction('CriteriaController@editProgram', 'Criteria') }}</li>
+      <li><a href="{{ URL::action('AnnualPlansController@showPlan', Auth::user()->programs[0]->id)}}">Annual Plan</a><li>
       <li class="dropdown">
         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Learning and Criterias<span class="caret"></span></a>
         <ul class="dropdown-menu" role="menu">
@@ -57,6 +58,7 @@
           <li>{{ HTML::linkAction('AuthController@logout', 'Log out ('.Auth::user()->email.')') }}</li>
         </ul>
       </li>
+      <li>
     </ul>
   </div>
 </div>

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

@@ -36,6 +36,13 @@
           @endif
         </ul>
       </li>
+      <li class='dropdown'>
+        <a href ='#' class ='dropdown-toggle' data-toggle='dropdown' role='button' aria-expanded="false"> Annual Plans<span class="caret"></span></a>
+        <ul class ='dropdown-menu' role='menu'>
+          @foreach (Auth::user()->school->programs as $program)
+          <li><a href ="{{ URL::action('AnnualPlansController@showPlan', array($program->id))}}" >{{$program->name}}</a></li>
+          @endforeach
+        </ul></li>
 
       <li class="dropdown">
         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Help<span class="caret"></span></a>

app/views/local/managers/sCoords/annual-plans.blade.php

@@ -0,0 +1,510 @@
+@extends('layouts.master-2')
+
+@section('navigation')
+    @if(Auth::user()->role==1)
+      @include('local.managers.admins._navigation')
+    @elseif(Auth::user()->role==2)
+      @include('local.managers.sCoords._navigation')
+    @elseif(Auth::user()->role==3)
+      @include('local.managers.pCoords._navigation')
+    @elseif(Auth::user()->role==4)
+      @include('local.professors._navigation')
+    @endif
+@stop
+@section('main')
+
+  {{-- TODO: look where to place this script.
+          if placed inside .ready() or before it,
+            an error that the function is not defined occurs. --}}
+  {{-- TODO: no reconoce acentos --}}
+
+
+  <div class="row">
+    <div class="col-md-3">
+      <a role ="button" class="btn btn-secondary" href="{{URL::action("AnnualPlansController@viewAllPlans", array($program->id))}}">View Plans</a>
+
+
+      @foreach ($annual_plans as $an_plan)
+      <h4>Plan for {{$an_plan->academic_year}}</h4>
+      <div class="list-group" id='list'>
+        <h5 style="padding-left: 10px">First Semester {{$an_plan->academic_year}}</h6>
+        @foreach ($outcomes[$an_plan->id]["first"] as $outcome)
+
+            @if($outcome)
+              
+              <li style="padding-left: 25px" data-annual-plan = "{{$an_plan->id}}" data-semester-id = "{{$allSemesterOrder[$an_plan->id]["first"]->id}}" data-outcome-id="{{ $outcome->id }}" data-outcome-name ="{{$outcome->name}}"class="list-group-item">{{ $outcome->name }} </li>
+            @endif
+          
+        @endforeach
+        <h5  style="padding-left: 10px">Second Semester {{$an_plan->academic_year}}</h6>
+        @foreach ($outcomes[$an_plan->id]["second"] as $outcome)
+
+        @if($outcome)
+          
+          <li style="padding-left: 25px" data-semester-id = "{{$allSemesterOrder[$an_plan->id]["second"]->id}}" data-outcome-id="{{ $outcome->id }}" data-outcome-name ="{{$outcome->name}}"class="list-group-item">{{ $outcome->name }} </li>
+        @endif
+      
+    @endforeach
+      </div>
+        @endforeach
+      </div>
+    
+
+    <div class="col-md-9">
+      <div id="outcome-display" class="panel panel-default">
+        <div class="panel-heading">
+          <h4 class=" panel-title" style="cursor:auto!important;">
+            Primer Semestre 2019-2020
+          </h4>
+        </div>
+        <div class="panel-body">
+          <p class="outcome-definition "></p>
+            <div class="table-responsive">
+                <table class="table table-striped table-condensed datatable" style="table-layout: fixed ; width : 100%">
+                  <thead><tr><th>Objectives for courses</th><th>Criteria per Course</th><th>Transformative Actions</th></tr></thead>
+                  <tbody>
+                  </tbody>
+
+                </table>
+                
+            </div>
+
+        </div>
+      </div>
+    </div>
+
+
+    <div class="col-md-9">
+      <div class="no-outcome alert alert-info">
+        <p>Select a Learning Outcome to view its information</p>
+      </div>
+    </div>
+
+  </div>
+  <script>
+   function nextChar(c) {
+    return String.fromCharCode(c.charCodeAt(0) + 1);
+}
+changed = false;
+
+$(document).ready(function()
+{
+  // --------------------------------------------------------------------------
+  // Page load
+  // --------------------------------------------------------------------------
+
+  // Hide accordion panel contents by default
+  $('.panel-group .panel-body').hide();
+
+  $('#outcome-display').parent().hide();
+
+  // --------------------------------------------------------------------------
+  // Functions
+  // --------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------
+  // Events
+  // --------------------------------------------------------------------------
+
+  $('.datatable').append($('<tfoot/>',{
+          "style":'padding-top:10px;',
+          'align':'right'
+        }).html("<td></td><td></td><td><a href='{{ URL::action('CriteriaController@editSchool')}}'>Add A New Criteria</a></td>"));
+  // When list item is clicked, load corresponding info
+  $('.list-group-item').on('click', function()
+  {
+    var id = $(this).data('outcome-id');
+    var name = $(this).data('outcome-name');
+    var semester = $(this).data('semester-id');
+    var annual_plan = $(this).data('annual-plan');
+    $('#theChange').data('annual-plan', annual_plan);
+    $.post(
+    "../annual-plan-fetchTYP/{{$program->id}}",
+    { id: id,
+    semester: semester
+  },
+    function(json)
+    {
+        // Retrieve datatable instance
+        
+        
+
+        var table = $('.datatable').DataTable();
+        
+        table.clear();
+        
+
+
+       
+        var objectives = json.objectives;
+        var courses = json.courses;
+        var criteria = json.criteria;
+        var selected_criteria = json.selected_criteria;
+        var nextLetter ="A";
+        if(courses)
+        {
+          $('table').show();
+          $('#outcome-display').parent().show();
+        $('.no-outcome').parent().hide();
+
+        //Display title and definition
+        $('#outcome-display .panel-title').html(name);
+     
+
+        //Empty table
+        table.clear();
+        
+        for(objective in objectives){
+        
+        var objectivesHTML = '';
+        var courseshtml = '';
+        
+       
+
+        var criteriaHTML = '';
+          objectivesHTML += '<strong>' + nextLetter +'.    '+objectives[objective].text+'</strong>';
+         // courseshtml += "<strong>Objective "+nextLetter+"</strong>";
+         // courseshtml += '<ul>';
+          criteriaHTML +="<strong>Objective "+nextLetter+"</strong>";
+          //criteriaHTML+= '<ol>';
+          
+          var typ_objective_id = json.typ_objective_id[objectives[objective].id].id;
+          nextLetter= nextChar(nextLetter);
+          for(course in courses[objectives[objective].id]){
+            
+            courseshtml += ' &#8226; '+courses[objectives[objective].id][course].code+' '+courses[objectives[objective].id][course].number+'<br>'
+            $divForEach =$('<div/>',{
+            'id':'objective-'+objectives[objective].id
+          });
+          $divForSelects = $('<div/>', {
+            'id' : 'forObjective-'+objectives[objective].id+'-course-'+courses[objectives[objective].id][course].id,
+            'data-amount-select':'0',
+            'class':'form-group',
+            'data-annual-plan': json.annual_plan.id
+          });
+          options = "<option value = '0' >Nothing Selected</option>"
+          for (criterion in criteria[objectives[objective].id]){
+            options += "<option value='"+criteria[objectives[objective].id][criterion].id+"'>"+criteria[objectives[objective].id][criterion].name+"</option>";
+          } 
+           var $button = $('<button/>', {
+           'type': 'button',
+      'class': 'btn btn-secondary',
+      'onclick': 'addObjectiveTest("forObjective-'+objectives[objective].id+"-course-"+courses[objectives[objective].id][course].id+'", "'+objectives[objective].id+"-course-"+courses[objectives[objective].id][course].id+'", '+courses[objectives[objective].id][course].typ_course_id+', null, "'+options+'")'
+  });
+           
+          $button.append("+ Add criteria");
+ 
+          $divForEach.append($divForSelects);
+          $divForEach.append("<br>")
+          $divForEach.append($button);
+          courseshtml += $divForEach[0].innerHTML +"<br><br>";
+          }
+
+
+          //for(criterion in selected_criteria[objectives[objective].id]){
+          //  criteriaHTML += '<li>'+selected_criteria[objectives[objective].id][criterion].name+'</li>';
+          //}
+          //criteriaHTML +='</ol>';
+          //courseshtml +="</ul>";
+         
+
+
+
+          
+          /*$divForSelects = $('<div/>', {
+            'id' : 'forObjective-'+objectives[objective].id,
+            'data-amount-select':'0',
+            'class':'form-group',
+            'data-annual-plan': json.annual_plan.id
+          });*/
+
+
+
+
+          
+          var annual_plan = json.annual_plan.id;
+          $divForTA = $('<div/>',{
+            'id':'objectiveTA-'+objectives[objective].id
+          });
+          $divForTASelects = $('<div/>', {
+            'id': 'forTA-objective-'+objectives[objective].id,
+            'class':'form-group',
+            'data-amount-ta':'0'
+          });
+
+          var optionsForTa = "<option value = '0'>Nothing Selected</option>";
+          transformativeDefault = json.transformative_actions;
+          optionsForTa+= "<optgroup label='Default'>";
+          for(trans in transformativeDefault){
+            optionsForTa+= "<option value='"+transformativeDefault[trans].id+"'>"+transformativeDefault[trans].at_text+"</option> ";
+            
+          }
+          optionsForTa+='</optgroup>';
+          
+          transformativeDefault = json.custom_transformative[objectives[objective].id];
+          if(transformativeDefault!= undefined){
+          optionsForTa+="<optgroup label = 'Custom'>";
+            for(trans in transformativeDefault){
+            optionsForTa+= "<option value='"+transformativeDefault[trans].id+"'>"+transformativeDefault[trans].at_text+"</option> ";
+            
+          }
+          }
+          var $buttonTA = $('<button/>', {
+           'type': 'button',
+      'class': 'btn btn-secondary',
+      'onclick': 'addTAselect("'+optionsForTa+'", "forTA-objective-'+objectives[objective].id+'", '+annual_plan+', '+objectives[objective].id+', '+typ_objective_id+', 0)'
+  });
+           
+          $buttonTA.append("+ Add TA");
+
+
+          
+          
+
+          
+
+
+          $divForTA.append($divForTASelects);
+          
+          $divForTA.append($buttonTA)
+          $divForTA.append('<br>');
+
+
+           table.row.add([
+                objectivesHTML,
+                courseshtml,
+                
+                $divForTA[0].innerHTML
+                
+              ]);
+              table.draw();
+          if(json.annual_plans_transformative[objectives[objective].id].length){
+            for(i=0; i<json.annual_plans_transformative[objectives[objective].id].length; i++){
+              selected_ta = json.annual_plans_transformative[objectives[objective].id][i].trans_id;
+              addTAselect(optionsForTa, "forTA-objective-"+objectives[objective].id, annual_plan, objectives[objective].id, typ_objective_id, selected_ta);
+              
+            }
+          }
+            else{
+              addTAselect(optionsForTa, "forTA-objective-"+objectives[objective].id, annual_plan, objectives[objective].id, typ_objective_id, 0);
+            }
+        for(course in courses[objectives[objective].id]){ 
+        course_id = courses[objectives[objective].id][course].id
+        if(json.selected_criteria[objectives[objective].id][course_id].length){
+         
+         
+            
+            for(i =0; i<json.selected_criteria[objectives[objective].id][course_id].length; i++){
+              addObjectiveTest("forObjective-"+objectives[objective].id+"-course-"+course_id, ""+objectives[objective].id+"-course-"+course_id, ""+json.selected_criteria[objectives[objective].id][course_id][i].typ_course_id+"", i, options);
+              $('#criteriaFor'+objectives[objective].id+"-course-"+course_id+'_'+i).val(json.selected_criteria[objectives[objective].id][course_id][i].criteria_id);
+              $('#criteriaFor'+objectives[objective].id+"-course-"+course_id+'_'+i).data('old-criteria', json.selected_criteria[objectives[objective].id][course_id][i].criteria_id);
+              $('#criteriaFor'+objectives[objective].id+"-course-"+course_id+'_'+i).selectpicker('refresh');
+
+            } // Update display
+      
+          }
+       
+          else{
+           
+            addObjectiveTest("forObjective-"+objectives[objective].id+"-course-"+course_id, ""+objectives[objective].id+"-course-"+course_id+"", ""+courses[objectives[objective].id][course].typ_course_id+"", 0, options);
+            $('#criteriaFor'+objectives[objective].id+"-course-"+course_id+'_0').val(0);
+              $('#criteriaFor'+objectives[objective].id+"-course-"+course_id+'_0').data('old-criteria', 0);
+              $('#criteriaFor'+objectives[objective].id+"-course-"+course_id+'_0').selectpicker('refresh');
+              
+          } 
+           }
+            
+        }
+                table.draw();
+
+
+        }
+
+        else
+        {
+          $('table').hide();
+        }
+
+       
+
+    
+
+    
+        
+        
+ 
+    },
+    'json'
+    );
+
+  })
+});
+function posttoTransAnnual(annual_id, selectTransId, typ_id){
+  ta = $("#"+selectTransId).val();
+  old_ta = $("#"+selectTransId).data('old-TA');
+  if(ta == "0")return;
+  $.post("../annual-plan-postTA",
+  {annual_id : annual_id,
+  TA_id:ta,
+  typ_id : typ_id,
+  old_ta:old_ta
+  },
+  function(message){
+    
+      $("#"+selectTransId).data('old-TA', ta);
+    
+  }
+  )
+}
+function addTAselect(options, master_div, annual_plan_id, objective_id, typ_objective_id, selected_ta){
+  var $div = $('<div/>', {
+      
+      'class': 'form-group '
+  });
+  counter = parseInt($('#'+master_div).data('amount-ta'));
+  
+  var selectTA = $('<select/>',{
+            'class': "selectpicker form-control",
+            'data-live-search':'true',
+            'data-old-TA' :'0',
+            'data-width': '180px',
+            
+            'id': 'transformativeForObjective'+objective_id+'_'+counter,
+            'onchange':'posttoTransAnnual('+annual_plan_id+', "transformativeForObjective'+objective_id+'_'+counter+'", '+typ_objective_id+')'
+
+          });
+          selectTA.append(options);
+          
+          selectTA.appendTo($div);
+          selectTA.val(selected_ta);
+          selectTA.data('old-TA', selected_ta);
+          selectTA.selectpicker('refresh');
+          $span = $('<span/>', {
+    'id':'close',
+    'onclick':'  postDeleteTA('+annual_plan_id+', "transformativeForObjective'+objective_id+'_'+counter+'", '+typ_objective_id+'); this.parentNode.parentNode.removeChild(this.parentNode);return false;'
+  }).html('x');
+  $span.appendTo($div);
+  $div.append("<br><br>");
+  $div.appendTo('#'+master_div);
+  $('#'+master_div).data('amount-ta', counter+1);
+
+
+}
+function postDeleteTA(annual_id, selectTransId, typ_id){
+  ta = $("#"+selectTransId).val();
+
+  
+  if(ta == "0")return;
+  $.post("../annual-plan-deleteTA",
+  {annual_id : annual_id,
+  TA_id:ta,
+  typ_id : typ_id,
+
+  }
+  );
+  parent = $("#"+selectTransId).parent().parent().parent();
+  counter = parseInt(parent.data('amount-ta'));
+  parent.data('amount-ta', counter-1);
+}
+function postToAnnualPlans(typ_course_id, criteria_select){
+  var criteria = $('#'+criteria_select).val();
+  var oldCriteria = $('#'+criteria_select).data('old-criteria');
+  var criteriaNode = document.getElementById(criteria_select).parentNode.parentNode.parentNode;
+  
+  var annual = criteriaNode.dataset.annualPlan;
+  $.post("../annual-plan-postOnChange",
+  {criteria : criteria, 
+  typ_course_id : typ_course_id,
+  annual_plan : annual,
+  old_criteria :oldCriteria
+  },
+  function(message){
+    if(message =="Duplicate entry, please choose another criteria."){
+      alert(message)
+    }
+    else{
+        $('#'+criteria_select).data('old-criteria', criteria);  
+    changed = true;
+    }
+
+  })
+}
+
+
+function addObjectiveTest(div, new_id_for_select, typ_course_id, i=null, options) {
+  
+  if(!i) amount_select = $('#'+div).data("amount-select");
+  else amount_select = i;
+  $select = $('<select/>',{
+            'class': "selectpicker form-control",
+            'data-live-search':'true',
+            'data-old-criteria' :'0',
+            'data-width': '180px',
+            
+            'id': 'criteriaFor'+new_id_for_select+'_'+amount_select,
+            'onchange':'postToAnnualPlans('+typ_course_id+', "criteriaFor'+new_id_for_select+'_'+amount_select+'")'
+
+          })
+
+  var $div = $('<div/>', {
+      'id': 'courseSelect_' + new_id_for_select +'_'+amount_select,
+      'class': 'form-group '
+  });
+
+  $select.append(options);
+  $select.appendTo($div);
+  $span = $('<span/>', {
+    'id':'close',
+    'onclick':'  postDelete('+typ_course_id+', "criteriaFor'+new_id_for_select+'_'+amount_select+'"); this.parentNode.parentNode.removeChild(this.parentNode);return false;'
+  }).html('x');
+  $div.append($span);
+ $div.append("<br><br>")
+  $div.appendTo($("#forObjective-"+new_id_for_select));
+  
+
+  
+          $select.selectpicker('refresh');
+  
+  
+
+ 
+  $("#forObjective-"+new_id_for_select).data("amount-select", amount_select+1);
+
+}
+
+function postDelete(typ_course_id, criteria_select){
+  var criteria = $('#'+criteria_select).val();
+  var oldCriteria = $('#'+criteria_select).data('old-criteria');
+  var criteriaNode = document.getElementById(criteria_select).parentNode.parentNode.parentNode;
+  
+  var annual = criteriaNode.dataset.annualPlan;
+  $.post("../annual-plan-deleteCriteria",
+  {criteria : criteria, 
+  typ_course_id : typ_course_id,
+  annual_plan : annual,
+  old_criteria :oldCriteria
+  });
+
+}
+
+
+
+function deleteObjective(objectiveSelectDiv, closeObj){
+
+  $('#'+objectiveSelectDiv).remove();
+  $('#'+closeObj).remove();
+  $('#'+div).data("amount-select", $('#'+div).data("amount-select")-1);
+
+}
+</script>
+
+
+  
+
+@stop
+
+@section('included-js')
+    @include('global._datatables_js')
+@stop
+
+

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

@@ -0,0 +1,163 @@
+<script>
+
+$(document).ready(function()
+{
+  // --------------------------------------------------------------------------
+  // Page load
+  // --------------------------------------------------------------------------
+
+  // Hide accordion panel contents by default
+  $('.panel-group .panel-body').hide();
+
+  $('#outcome-display').parent().hide();
+
+  // --------------------------------------------------------------------------
+  // Functions
+  // --------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------
+  // Events
+  // --------------------------------------------------------------------------
+
+  // When list item is clicked, load corresponding info
+  $('.list-group-item').on('click', function()
+  {
+    var id = $(this).data('outcome-id');
+    var name = $(this).data('outcome-name');
+    var semester = $(this).data('semester-id');
+    $.post(
+    "../annual-plan-fetchTYP/{{$program->id}}",
+    { id: id,
+    semester: semester
+  },
+    function(json)
+    {
+        // Retrieve datatable instance
+        var table = $('.datatable').DataTable();
+        alert(json);
+        
+        var objectives = json.unique_objective;
+        var courses = json.courses;
+        var courseHTML = '<ol>';
+        var objectiveHTML = '';
+        var criteria = json.criteria
+        nextLetter ="@";
+        counter = 1;
+        for(course in courses){
+          courseHTML+='<li>'+courses[course].code+' '+courses[course].number+'</li>';
+        }
+        courseHTML += "</ol>"
+        courses = json.courses_objective;
+        for(objective in objectives){
+          for(course in courses[objectives[objective].id]){
+            objectiveHTML += "<strong>"+courses[objectives[objective].id][course].code+" "+courses[objectives[objective].id][course].number +", </strong>";
+          }
+          
+          objectiveHTML += "<ol type ='A' start='"+counter.toString()+"'>";
+          objectiveHTML += "<li>"+objectives[objective].text+"</li>";
+          objectiveHTML += "</ol>";
+          counter++;
+        }
+    
+        for(objective in objectives){
+          $divForEach =$('<div/>',{
+            'id':'objective #'+objectives[objective]
+          });
+
+          $objective = "<h4>"+objectives[objective].text+"</h4>";
+          
+
+          $divForEach.append($objective)
+          $select = $('<select/>',{
+            'class': "selectpicker form-control",
+            'name' : "criteriaFor["+objectives[objective].id+"]",
+            'data-live-search':'true',
+            'id': 'criteriaFor'+objectives[objective].id+'_0'
+
+          })
+          options = ''
+          for (criterion in criteria[objectives[objective].id]){
+            options += "<option value='"+criteria[objectives[objective].id][criterion].id+"'>"+criteria[objectives[objective].id][criterion].name+"</option>";
+          }
+          $select.append(options);
+          $divForEach.append($select);
+          $divForEach.appendTo('#theChange');
+          $select.selectpicker('refresh');
+          
+        }
+        
+        $('#outcome-display').parent().show();
+        $('.no-outcome').parent().hide();
+
+        //Display title and definition
+        $('#outcome-display .panel-title').html(name);
+     
+
+        //Empty table
+        table.clear();
+
+        // Add new criteria
+        if(courses)
+        {
+          $('table').show();
+          
+          
+              table.row.add([
+                courseHTML,
+                objectiveHTML
+              ]);
+        
+        }
+        else
+        {
+          $('table').hide();
+        }
+
+        // Update display
+        table.draw();
+    },
+    'json'
+    );
+
+  })
+});
+
+function addObjectiveTest() {
+  selectObj = document.getElementById('objective_0').innerHTML;
+  var $select = $('<select/>', {
+      'class': "selectpicker form-control",
+      'name': "objective[]",
+      'data-live-search': 'true',
+      'id': 'objective_' + counterObj.toString()
+
+  });
+  var $div = $('<div/>', {
+      'id': 'objectiveForm' + counterObj.toString(),
+      'class': 'form-group col-md-11'
+  });
+  var $divForButton = $('<div/>', {
+      'class': 'col-md-1',
+      'id': 'closeObj' + counterObj.toString()
+
+  });
+  var $button = $('<button/>', {
+      'type': 'button',
+      'class': 'btn btn-primary',
+      'onclick': 'deleteObjective("objectiveForm' + counterObj.toString() + '", "closeObj' + counterObj.toString() + '")'
+  });
+
+  $button.append('X');
+  $divForButton.append($button);
+
+  $div.appendTo('#objectiveGroup')
+  $select.append(selectObj);
+
+  $select.appendTo('#objectiveForm' + counterObj.toString()).selectpicker('refresh');
+  counterObj += 1;
+
+  $divForButton.appendTo('#objectiveGroup');
+  $('#counterObjective').val(counterObj)
+}
+
+</script>
+

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

@@ -386,12 +386,13 @@
 
     //Add outcome Button
     function addOutcomeTest() {
+        counter = parseInt($('#outcomeGroup').data("value"));
         var $select = $('<select/>', {
             'class': "selectpicker form-control",
             'name': "outcome[]",
             'data-live-search': 'true',
             'id': 'outcome' + counter.toString(),
-            'onchange': 'fetchObjectiveForSelect("outcome' + counter.toString() + '")'
+            'onchange': 'fetchObjectiveForSelect("outcomeGroup", "objectiveGroup")'
 
         });
         var $div = $('<div/>', {
@@ -407,7 +408,7 @@
         var $button = $('<button/>', {
             'type': 'button',
             'class': 'btn btn-primary',
-            'onclick': 'deleteLast("outcomeForm' + counter.toString() + '", "' + outcomeString + (counter).toString() + '", "close' + counter.toString() + '","objective_")'
+            'onclick': 'deleteLast("outcomeForm'+counter.toString()+'", "outcomeGroup", "close' + counter.toString() + '", "objectiveGroup")'
         });
 
         $button.append('X');
@@ -417,11 +418,13 @@
         $select.append(selectOptions);
 
         $select.appendTo('#outcomeForm' + counter.toString()).selectpicker('refresh');
-        fetchObjectiveForSelect('outcome' + counter.toString());
-        counter += 1;
+        
+        $('#outcomeGroup').data("value", counter +1);
+        fetchObjectiveForSelect('outcomeGroup', "objectiveGroup");
+        
         $divForButton.appendTo('#outcomeGroup');
 
-        $('#counterOutcome').val(counter)
+       
 
 
     }
@@ -430,27 +433,29 @@
 
     //Delete Outcome and OptGroup associated
 
-    function deleteLast(outcomeForm, outcomeOptGroup, closeButton, objective) {
-        $div = document.getElementById(outcomeForm);
+    function deleteLast(outcomeForm, outcomeDiv, closeButton, objectiveGroup) {
+        $div = document.getElementById(outcomeForm );
         $div.remove();
-        $div = document.getElementById(outcomeOptGroup);
-        $div.remove();
-        $div = document.getElementById(closeButton)
+        $div = document.getElementById(closeButton);
         $div.remove();
+        if(outcomeDiv =='outcomeGroup'){
+        $('#' + outcomeDiv).data('value',parseInt($('#' + outcomeDiv).data('value')) - 1);
+        fetchObjectiveForSelect(outcomeDiv, objectiveGroup);}
+        
+
 
-        for (var i = 0; i < counterObj; i++) {
 
 
-            $('#' + objective + i.toString()).selectpicker('refresh');
-        }
 
     }
     //Delete Objective
-    function deleteObjective(objectiveForm, closeObj) {
+    function deleteObjective(objectiveForm, closeObj, objectiveGroup) {
         $div = document.getElementById(objectiveForm);
         $div.remove();
         $div = document.getElementById(closeObj);
         $div.remove();
+        counter = parseInt($('#'+objectiveGroup).data("value"));
+        $('#'+objectiveGroup).data("value", counter-1);
 
 
     }
@@ -459,6 +464,7 @@
 
     function addAssocObjective() {
         selectObj = document.getElementById('assoc_objective_0').innerHTML;
+        assocObjectiveCounter = parseInt($('#assoc_objectiveGroup').data('value'));
         var $select = $('<select/>', {
             'class': "selectpicker form-control",
             'name': "assoc_objective[]",
@@ -479,7 +485,7 @@
         var $button = $('<button/>', {
             'type': 'button',
             'class': 'btn btn-primary',
-            'onclick': 'deleteObjective("assoc_objectiveForm' + assocObjectiveCounter.toString() + '", "assoc_closeObj' + assocObjectiveCounter.toString() + '")'
+            'onclick': 'deleteObjective("assoc_objectiveForm' + assocObjectiveCounter.toString() + '", "assoc_closeObj' + assocObjectiveCounter.toString() + ', assoc_objectiveGroup")'
         });
 
         $button.append('X');
@@ -489,7 +495,7 @@
         $select.append(selectObj);
 
         $select.appendTo('#assoc_objectiveForm' + assocObjectiveCounter.toString()).selectpicker('refresh');
-        counterObj += 1;
+        $('#assoc_objectiveGroup').data("value", assocObjectiveCounter +1);
 
         $divForButton.appendTo('#assoc_objectiveGroup');
 
@@ -499,26 +505,28 @@
     //Add objective when creating a criteria
     function addObjectiveTest() {
         selectObj = document.getElementById('objective_0').innerHTML;
+        counter = $("#objectiveGroup").data('value');
+        $('#objectiveGroup')
         var $select = $('<select/>', {
             'class': "selectpicker form-control",
             'name': "objective[]",
             'data-live-search': 'true',
-            'id': 'objective_' + counterObj.toString()
+            'id': 'objective_' + counter.toString()
 
         });
         var $div = $('<div/>', {
-            'id': 'objectiveForm' + counterObj.toString(),
+            'id': 'objectiveForm' + counter.toString(),
             'class': 'form-group col-md-11'
         });
         var $divForButton = $('<div/>', {
             'class': 'col-md-1',
-            'id': 'closeObj' + counterObj.toString()
+            'id': 'closeObj' + counter.toString()
 
         });
         var $button = $('<button/>', {
             'type': 'button',
             'class': 'btn btn-primary',
-            'onclick': 'deleteObjective("objectiveForm' + counterObj.toString() + '", "closeObj' + counterObj.toString() + '")'
+            'onclick': 'deleteObjective("objectiveForm' + counter.toString() + '", "closeObj' + counter.toString() + '","objectiveGroup")'
         });
 
         $button.append('X');
@@ -527,11 +535,10 @@
         $div.appendTo('#objectiveGroup')
         $select.append(selectObj);
 
-        $select.appendTo('#objectiveForm' + counterObj.toString()).selectpicker('refresh');
-        counterObj += 1;
-
+        $select.appendTo('#objectiveForm' + counter.toString()).selectpicker('refresh');
+        
         $divForButton.appendTo('#objectiveGroup');
-        $('#counterObjective').val(counterObj)
+        $('#objectiveGroup').data('value', counter +1);
     }
 
     //Create outcome for editing
@@ -540,6 +547,7 @@
 
 
     function addAssocOutcome() {
+        assocOutcomeCounter = parseInt($('#assocOutcomeGroup').data('value'));
         var $select = $('<select/>', {
             'class': "selectpicker form-control",
             'name': "assoc_outcome[]",
@@ -561,7 +569,7 @@
         var $button = $('<button/>', {
             'type': 'button',
             'class': 'btn btn-primary',
-            'onclick': 'deleteLast("assoc_outcomeForm' + assocOutcomeCounter.toString() + '", "' + 'Associated_Outcome' + (assocOutcomeCounter).toString() + '", "assoc_close' + assocOutcomeCounter.toString() + '","assoc_objective_")'
+            'onclick': 'deleteLast("assoc_outcomeForm' + assocOutcomeCounter.toString() + '", "assocOutcomeGroup", "assoc_close' + assocOutcomeCounter.toString() + '","assoc_objectiveGroup")'
         });
 
         $button.append('X');
@@ -571,8 +579,10 @@
         $select.append(selectOptions);
 
         $select.appendTo('#assoc_outcomeForm' + assocOutcomeCounter.toString()).selectpicker('refresh');
-        //fetchAssocObjective('assoc_outcome_' + assocOutcomeCounter.toString());
+        
         assocOutcomeCounter += 1;
+        $('#assocOutcomeGroup').data('value', assocOutcomeCounter);
+
         $divForButton.appendTo('#assocOutcomeGroup');
 
 
@@ -584,37 +594,64 @@
 
     var assocObjectiveCounter = 1;
 
-    function fetchAssocObjective(outcomeId) {
-        var id = $('#' + outcomeId).find(':selected').val();
+    function fetchAssocObjective(outcomeDiv, objectiveGroup) {
+        var count = $('#'+outcomeDiv).data('value');
+        var allOutcomes =[];
+
+         $("#" + outcomeDiv + ' select').each(function() {
+            allOutcomes.push( this.value);
+
+        })
+        var allObjectives = [];
+        $("#" + objectiveGroup + ' select').each(function() {
+            var temp = {
+                id: this.id,
+                value: this.value
+            }
+            allObjectives.push(temp);
+        })
 
 
         $.post(
             "{{ URL::action('CriteriaController@fetchObjectivesForSelect') }}", {
-                id: id
+                allOutcomes: allOutcomes
             },
 
             function(json) {
 
-                var optionName = '<optgroup id="' + 'Associated_Outcome' + (assocOutcomeCounter - 1).toString() + '"label="' + 'Associated Outcome' + (assocOutcomeCounter).toString() + '"';
-                for (var i = 0; i < json.length; i++) {
-                    var option = '<option value ="' + json[i].id.toString() + '">' + json[i].text + '</option>'
-                    optionName += (option)
-
-                }
-                optGroup = document.getElementById('Associated_Outcome' + (assocOutcomeCounter - 1).toString());
-                if (optGroup != null) {
-                    optGroup.remove()
-
+                optionName = '';
+                for(outcome in varArray.outcomes){
+                    optionName += '<optgroup label="' + varArray.outcomes[outcome][0].name + '"';
+                    var objectiveForOutcome = varArray.objectives;
+                    var objectives = objectiveForOutcome[outcome];
+                    for (objective in objectives) {
+                
+
+                        var obj= objectives[objective];
+                        var option = '<option value ="' + obj.id + '">' +obj.text + '</option>';
+                        optionName += (option);
+                    }
                 }
 
 
-                $('#assoc_objective_0').append(optionName);
+                $('#assoc_objective_0').html(optionName);
                 $('#assoc_objective_0').selectpicker('refresh');
+                if($("#assoc_objective_0 option[value='"+allObjectives[0].value+"']").length>0){
+                    $("#assoc_objective_0").val(allObjectives[0].value);
+                    $('#assoc_objective_0').selectpicker('refresh');
+                }
 
-                for (var i = assocObjectiveCounter - 1; i > 0; i--) {
-                    deleteObjective('assoc_objectiveForm' + i.toString(), 'assoc_closeObj' + i.toString())
+                for (var i = allObjectives.length - 1; i > 0; i--) {
+                    deleteObjective('assoc_objectiveForm' + i.toString(), 'assoc_closeObj' + i.toString(), 'assoc_objectiveGroup');
+                }
+                for(var i=1; i<allObjectives.length; i++){
+                    addAssocObjective();
+                    $('#assoc_objective_'+i.toString()).selectpicker('refresh');
+                    if($("#assoc_objective_"+i.toString()+" option[value='"+allObjectives[i].value+"']").length>0){
+                    $("#assoc_objective_"+i.toString()).val(allObjectives[i].value);
+                    $("#assoc_objective_"+i.toString()).selectpicker("refresh");
+                    }
                 }
-                assocObjectiveCounter = 1;
 
 
 
@@ -626,37 +663,66 @@
     //Fetch objective at creating criteria
     counterForPost = 0;
 
-    function fetchObjectiveForSelect(outcomeInput) {
-
-
-        var id = $('#' + outcomeInput).find(':selected').val();
+    function fetchObjectiveForSelect(outcomeDiv, objectiveGroup) {
+        var count = $("#" + outcomeDiv).data('value');
+        var allOutcomes = [];
+        $("#" + outcomeDiv + ' select').each(function() {
+            allOutcomes.push( this.value);
+
+        })
+        var allObjectives = [];
+        $("#" + objectiveGroup + ' select').each(function() {
+            var temp = {
+                id: this.id,
+                value: this.value
+            }
+            allObjectives.push(temp);
+        })
 
         $.post(
             "{{ URL::action('CriteriaController@fetchObjectivesForSelect') }}", {
-                id: id
+                allOutcomes: allOutcomes
             },
             function(varArray) {
-
-                var optionName = '<optgroup id="' + outcomeString + (counter - 1).toString() + '"label="' + varArray[0].name + '"';
-                for (var i = 0; i < varArray.length; i++) {
-                    var option = '<option value ="' + varArray[i].id.toString() + '">' + varArray[i].text + '</option>'
-                    optionName += (option)
-
-                }
-                optGroup = document.getElementById(outcomeString + (counter - 1).toString());
-                if (optGroup != null) {
-                    optGroup.remove()
-
+                counterOutcome =0;
+                optionName = '';
+                for(outcome in varArray.outcomes){
+                    optionName += '<optgroup label="' + varArray.outcomes[outcome][0].name + '"';
+                    var objectiveForOutcome = varArray.objectives;
+                    var objectives = objectiveForOutcome[outcome];
+                    for (objective in varArray.objectives[outcome]) {
+                
+
+                        var obj= objectives[objective];
+                        var option = '<option value ="' + obj.id + '">' +obj.text + '</option>';
+                        optionName += (option);
+                    }
                 }
+                
 
+                
 
-                $('#objective_0').append(optionName);
+                $('#objective_0').html(optionName);
                 $('#objective_0').selectpicker('refresh');
+                if($("#objective_0 option[value='"+allObjectives[0].value+"']").length>0){
+                    $("#objective_0").val(allObjectives[0].value);
+                    $('#objective_0').selectpicker('refresh');
+                }
+                
 
-                for (var i = counterObj - 1; i > 0; i--) {
-                    deleteObjective('objectiveForm' + i.toString(), 'closeObj' + i.toString())
+                for (var i = allObjectives.length - 1; i > 0; i--) {
+                    deleteObjective('objectiveForm' + i.toString(), 'closeObj' + i.toString(), 'objectiveGroup');
+                }
+                for(var i =1; i<allObjectives.length; i++){
+                    addObjectiveTest();
+                    $('#objective_'+i.toString()).selectpicker('refresh');
+                    if($("#objective_"+i.toString()+" option[value='"+allObjectives[i].value+"']").length>0){
+                    $("#objective_"+i.toString()).val(allObjectives[i].value);
+                    $("#objective_"+i.toString()).selectpicker("refresh");
+                }
                 }
-                counterObj = 1;
+
+                
 
 
 
@@ -718,9 +784,10 @@
 
                 if (!(json.activity_criterion.length)) {
 
-                    var button = "<button type='button' class ='btn btn-primary btn-block' onclick ='deleteCriterion()'>Delete Criterion</button><br><br>"
-                    $('#delete').html(button)
+                    $('#DeleteButton').prop('disabled', true);
 
+                } else {
+                    $('#DeleteButton').prop('enabled', true);
                 }
 
                 if (!(json.criteria.length)) {
@@ -737,9 +804,16 @@
                     var name = json.criteria[0].name;
                     if (json.criteria[0].subcriteria) {
                         subcriteria = JSON.parse(json.criteria[0].subcriteria).join('\n');
+                    } else {
+                        subcriteria = "";
                     }
-                    var copyright = json.criteria[0].copyright;
-                    var notes = json.criteria[0].notes;
+                    if (json.criteria[0].copyright) {
+                        var copyright = json.criteria[0].copyright;
+                    } else {
+                        var copyright = ''
+                    }
+                    if (json.criteria[0].notes) notes = json.criteria[0].notes;
+                    else notes = '';
 
                     // Display info
                     $('#criterion_name').val(name);
@@ -756,16 +830,12 @@
                 }
 
 
-                if (copyright) {
-                    $('#criterion_copyright').text(copyright);
-                } else {
-                    $('#criterion_copyright').text('');
-                }
-                if (notes) {
-                    $('#criterion_notes').text(notes);
-                } else {
-                    $('#criterion_notes').text('');
-                }
+
+                $('#criterion_copyright').text(copyright);
+
+
+                $('#criterion_notes').text(notes);
+
 
 
 
@@ -774,8 +844,9 @@
 
                 // Select associated outcome
                 try {
+                    assocOutcomeCounter= parseInt($("#assocOutcomeGroup").data('value'));
                     for (var i = assocOutcomeCounter - 1; i > 0; i--) {
-                        deleteLast("assoc_outcomeForm" + (i).toString(), 'Associated_Outcome' + (i).toString(), "assoc_close" + (i).toString(), "assoc_objective_");
+                        deleteLast("assoc_outcomeForm" + i.toString() , "assocOutcomeGroup", "assoc_close" + i.toString() ,"assoc_objectiveGroup");
                     }
                 } catch (err) {
                     var Notran = true;
@@ -800,15 +871,17 @@
 
 
 
+                counterObj =$('#assoc_objectiveGroup').data('value');
+                
 
                 try {
                     for (var i = counterObj - 1; i > 0; i--) {
-                        deleteObjective('objectiveForm' + i.toString(), 'closeObj' + i.toString())
+                        deleteObjective('assoc_objectiveForm' + i.toString(), 'assoc_closeObj' + i.toString(), 'assoc_objectiveGroup')
                     }
                 } catch (err) {
                     var noEntro = true;
                 }
-                counterObj = 1;
+                $('#assoc_objectiveGroup').data('value', 1);
 
 
 
@@ -816,34 +889,24 @@
 
                 assocOutcomeCounter = 0;
                 var i = 0;
-                for (var j = 0; j < json.outcomes.length; j++) {
-                    assocOutcomeCounter += 1;
-                    var optionName = '<optgroup id="' + 'Associated_Outcome' + (assocOutcomeCounter - 1).toString() + '"label="' + json.outcomes[j].name + '"';
-                    for (; i < json.objectives_outcome.length; i++) {
-                        if (json.objectives_outcome[i].outcome_id != json.outcomes[j].id) break;
-
-                        var option = '<option value ="' + json.objectives_outcome[i].id.toString() + '">' + json.objectives_outcome[i].text + '</option>'
-                        optionName += (option)
-
-                    }
-                    optGroup = document.getElementById('Associated_Outcome' + (assocOutcomeCounter - 1).toString());
-                    if (optGroup != null) {
-                        optGroup.remove()
-
+                optionName = '';
+                for(outcome in json.outcomes_assoc){
+                    optionName += '<optgroup label="' + json.outcomes_assoc[outcome][0].name + '"';
+                    var objectiveForOutcome = json.objectives_assoc;
+                    var objectives = objectiveForOutcome[outcome];
+                    for (objective in objectives) {
+                
+
+                        var obj= objectives[objective];
+                        var option = '<option value ="' + obj.id + '">' +obj.text + '</option>';
+                        optionName += (option);
                     }
-                    $('#assoc_objective_0').append(optionName);
-                    $('#assoc_objective_0').selectpicker('refresh');
                 }
 
 
-
-
-                for (var i = assocObjectiveCounter - 1; i > 0; i--) {
-                    deleteObjective('assoc_objectiveForm' + i.toString(), 'assoc_closeObj' + i.toString())
-                }
-                assocObjectiveCounter = 1;
-
-
+                $('#assoc_objective_0').html(optionName);
+                $('#assoc_objective_0').selectpicker('refresh');
+                
 
 
 
@@ -855,7 +918,7 @@
                         $('#assoc_objective_0').val(0);
                         $('#assoc_objective_0').selectpicker('refresh');
                     }
-                    var thereIsNoObjective = true;
+                 
                 }
 
                 for (var i = 1; i < json.objectives.length; i++) {
@@ -863,7 +926,7 @@
                     $('#assoc_objective_' + i.toString()).val(json.objectives[i].id);
                     $('#assoc_objective_' + i.toString()).selectpicker('refresh');
                 }
-                assocObjectiveCounter = json.objectives.length;
+                $('assoc_objectiveGroup').data('value',json.objectives.length);
 
 
 
@@ -947,8 +1010,7 @@
             'json'
         );
     }
-</script>
-@stop
+</script>@stop
 
 @section('javascript')
 
@@ -962,7 +1024,7 @@ $('.panel-group .panel-body').hide();
 $('#outcome-display').parent().hide();
 
 fetchCriterionForEditing();
-fetchObjectiveForSelect('outcome0');
+fetchObjectiveForSelect('outcomeGroup', 'objectiveGroup');
 // setCriterionStatus();
 
 
@@ -1012,10 +1074,10 @@ $('.panel-group .panel-heading').on('click', function()
 $(this).next().stop().slideToggle();
 })
 
-$('#outcome[0]').on('change', function(){
-fetchObjectiveForSelect(0);
-$('.selectpicker').selectpicker('refresh');
-})
+//$('#outcome[0]').on('change', function(){
+//fetchObjectiveForSelect(0);
+//$('.selectpicker').selectpicker('refresh');
+//})
 // When list item is clicked, load corresponding info
 
 

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

@@ -362,10 +362,7 @@
             'json'
         );
     }
-    },
-    'json'
-    );
-    }
+    
 
     function deleteLastAssoc() {
 

composer.json

@@ -26,7 +26,10 @@
 			"app/database/migrations",
 			"app/database/seeds",
 			"app/tests/TestCase.php"
-		]
+		],
+		"psr-4": {
+			"Acme\\controllers\\": "app/controllers"
+		}
 	},
 	"scripts": {
 		"post-install-cmd": [