9/9/2021

app/controllers/CriteriaController.php

@@ -18,7 +18,7 @@ class CriteriaController extends \BaseController
         $userProgram = DB::select("select program_user.program_id from program_user where user_id = {$userProgram}");
         Log::info($userProgram);
         $title = "Criteria";
-        $outcomes = Outcome::where("deactivation_date", '=', null)->orderBy('name', 'ASC')->lists('name', 'id');
+        $outcomes = Outcome::whereNull("deactivation_date")->orderBy('name', 'ASC')->lists('name', 'id');
 
         $criteria = Criterion::withTrashed()->orderBy('name', 'ASC')->get();
         $programs = Program::where("id", "=", $userProgram[0]->program_id)->get();
@@ -30,7 +30,7 @@ class CriteriaController extends \BaseController
         $userSchool = Auth::user()['school_id'];
         Log::info($userSchool);
         $title = "Criteria";
-        $outcomes = Outcome::where("deactivation_date", '=', null)->orderBy('name', 'ASC')->lists('name', 'id');
+        $outcomes = Outcome::whereNull("deactivation_date")->orderBy('name', 'ASC')->lists('name', 'id');
 
         $schools = School::find($userSchool)->get();
         $criteria = Criterion::withTrashed()->orderBy('name', 'ASC')->get();
@@ -454,7 +454,7 @@ class CriteriaController extends \BaseController
     public function edit()
     {
         $title = "Criteria";
-        $outcomes = Outcome::where("deactivation_date", '=', null)->orderBy('name', 'ASC')->lists('name', 'id');
+        $outcomes = Outcome::whereNull("deactivation_date")->orderBy('name', 'ASC')->lists('name', 'id');
 
         $schools = School::orderBy('name', 'ASC')->get();
         $criteria = Criterion::withTrashed()->orderBy('name', 'ASC')->get();

app/controllers/Objective2Controller.php

@@ -11,16 +11,6 @@ class Objective2Controller extends \BaseController
 	 * @return Response
 	 */
 
-	public function index()
-	{
-
-		$title = "Learning Outcomes and Criteria";
-		$outcomes = Outcome::orderBy('name', 'ASC')->get();
-		$schools = School::orderBy('name', 'ASC')->get();
-		$objectives = Objective::withTrashed()->orderBy('text', 'ASC')->get();
-
-		return View::make('global.view-learning-outcomes-criteria', compact('title', 'outcomes', 'schools', 'objectives'));
-	}
 
 
 
@@ -304,7 +294,7 @@ class Objective2Controller extends \BaseController
 	public function edit()
 	{
 		$title = "Objective";
-		$outcomes = Outcome::where('deactivation_date', '=', null)->orderBy('name', 'ASC')->lists('name', 'id');
+		$outcomes = Outcome::whereNull("deactivation_date")->orderBy('name', 'ASC')->lists('name', 'id');
 
 		$objectives = Objective::withTrashed()->orderBy('text', 'ASC')->get();
 		$programs = Program::orderBy('name', 'ASC')->get();
@@ -320,7 +310,7 @@ class Objective2Controller extends \BaseController
 		$userProgram = DB::select("select program_user.program_id from program_user where user_id = {$userProgram}");
 
 		$title = "Objective";
-		$outcomes = Outcome::where('deactivation_date', '=', null)->orderBy('name', 'ASC')->lists('name', 'id');
+		$outcomes = Outcome::whereNull("deactivation_date")->orderBy('name', 'ASC')->lists('name', 'id');
 
 		$objectives = Objective::withTrashed()->orderBy('text', 'ASC')->get();
 
@@ -337,7 +327,7 @@ class Objective2Controller extends \BaseController
 		$userSchool = Auth::user()['school_id'];
 		Log::info($userSchool);
 		$title = "Objective";
-		$outcomes = Outcome::where('deactivation_date', '=', null)->orderBy('name', 'ASC')->lists('name', 'id');
+		$outcomes = Outcome::whereNull("deactivation_date")->orderBy('name', 'ASC')->lists('name', 'id');
 
 		$objectives = Objective::withTrashed()->orderBy('text', 'ASC')->get();
 		$programs = Program::where("school_id", "=", $userSchool)->orderBy('name', 'ASC')->get();

app/controllers/ProfessorsController.php

@@ -3,79 +3,96 @@
 class ProfessorsController extends \BaseController
 {
 
-	private $grouped_courses;
+    private $grouped_courses;
 
-	public function __construct()
+    public function __construct()
     {
         $this->courses = Auth::user()->courses;
     }
 
-	public function overview()
-	{
-        $title='My Courses';
+    public function overview()
+    {
+        $title = 'My Courses';
         $grouped_courses = Course::where('user_id', Auth::user()->id)->whereIn('semester_id', Session::get('semesters_ids'))->groupBy(array('code', 'number', 'semester_id'))->get();
-        $outcomes = Outcome::orderBy('name', 'asc')->get();
-        $outcomeCount = Outcome::all()->count();
+        $semesters = Session::get('semesters_ids');
+        $semesters = DB::table('semesters')->whereIn('id', $semesters)->orderBy('start', 'ASC')->first();
+        Log::info($semesters->start);
+        $outcomes = Outcome::select(array('id', 'name', 'expected_outcome'))
+            ->whereNull('deleted_at')
+            ->whereRaw("(deactivation_date IS NULL or deactivation_date >= '{$semesters->start}')")
+            ->orderBy('name', 'ASC')->get();
+        $outcomeCount = count($outcomes);
 
 
         $grouped_outcomes_achieved_results = array();
         $grouped_outcomes_attempted_results = array();
         $grouped_sections = array();
 
-        foreach ($grouped_courses as $index => $grouped_course)
-        {
+        foreach ($grouped_courses as $index => $grouped_course) {
             // Blank outcomes for one course
-            $outcomes_achieved = array_fill(1, $outcomeCount, 0);
-            $outcomes_attempted = array_fill(1, $outcomeCount, 0);
+
+            //$outcomes_achieved = array_fill(1, $outcomeCount, 0);
+            //$outcomes_attempted = array_fill(1, $outcomeCount, 0);
+
+            $outcomes_achieved = [];
+            $outcomes_attempted = [];
 
             // Find sections belonging to user with identifier of one course
-            $sections = Course::where('user_id', Auth::user()->id)->where('code', $grouped_course->code)->whereIn('semester_id', Session::get('semesters_ids'))->where('number', $grouped_course->number)->where('semester_id', $grouped_course->semester_id)->get();
+            $sections = Course::where('user_id', Auth::user()->id)
+                ->where('code', $grouped_course->code)
+                ->whereIn('semester_id', Session::get('semesters_ids'))
+                ->where('number', $grouped_course->number)
+                ->where('semester_id', $grouped_course->semester_id)
+                ->get();
 
             // For each of the professor's course sections, add the attempted and achieved criteria per outcome
-            foreach ($sections as $section)
-            {
-                if($section->outcomes_achieved!=NULL)
-                {
-                    $section_outcomes_achieved =json_decode($section->outcomes_achieved, true);
-                    $section_outcomes_attempted =json_decode($section->outcomes_attempted, true);
-                    for($i=1; $i<=count($outcomes_attempted); $i++)
-                    {
-                        $outcomes_achieved[$i]+=$section_outcomes_achieved[$i];
-                        $outcomes_attempted[$i]+=$section_outcomes_attempted[$i];
+            foreach ($sections as $section) {
+
+                $section_outcomes_achieved = $section->outcomes_ach();
+                $section_outcomes_attempted = $section->outcomes_att();
+
+                //if ($section->outcomes_achieved != NULL) {
+                if (!empty($section_outcomes_achieved)) {
+                    //$section_outcomes_achieved = json_decode($section->outcomes_achieved, true);
+                    //$section_outcomes_attempted = json_decode($section->outcomes_attempted, true);
+                    foreach ($section_outcomes_attempted as $outcome_id => $score) {
+
+                        if (array_key_exists($outcome_id, $outcomes_achieved)) $outcomes_achieved[$outcome_id] += $section_outcomes_achieved[$outcome_id];
+                        else $outcomes_achieved[$outcome_id] = $section_outcomes_achieved[$outcome_id];
+                        if (array_key_exists($outcome_id, $outcomes_attempted)) $outcomes_attempted[$outcome_id] +=  $section_outcomes_attempted[$outcome_id];
+                        else $outcomes_attempted[$outcome_id] =  $section_outcomes_attempted[$outcome_id];
+                        //$outcomes_achieved[$outcome_id] += $section_outcomes_achieved[$outcome_id];
+                        //$outcomes_attempted[$outcome_id] += $section_outcomes_attempted[$outcome_id];
                     }
                 }
             }
 
-            $grouped_outcomes_achieved_results[]=$outcomes_achieved;
-            $grouped_outcomes_attempted_results[]=$outcomes_attempted;
+            $grouped_outcomes_achieved_results[] = $outcomes_achieved;
+            $grouped_outcomes_attempted_results[] = $outcomes_attempted;
             $grouped_sections[] = $sections;
-
         }
 
-		return View::make('local.professors.overview', compact('title', 'grouped_courses', 'outcomes', 'grouped_outcomes_attempted_results', 'grouped_outcomes_achieved_results', 'grouped_sections'));
-	}
+        return View::make('local.professors.overview', compact('title', 'grouped_courses', 'outcomes', 'grouped_outcomes_attempted_results', 'grouped_outcomes_achieved_results', 'grouped_sections'));
+    }
 
     public function program()
     {
         $program =  Auth::user()->programs[0];
-        $title='Your Program: '.$program->name;
-        $program_courses = Course::where('program_id','=', $program->id)->whereIn('semester_id', Session::get('semesters_ids'))->get();
+        $title = 'Your Program: ' . $program->name;
+        $program_courses = Course::where('program_id', '=', $program->id)->whereIn('semester_id', Session::get('semesters_ids'))->get();
         $outcomes = Outcome::orderBy('name', 'asc')->get();
         $outcomeCount = Outcome::all()->count();
 
         $outcomes_achieved = array_fill(1, $outcomeCount, 0);
         $outcomes_attempted = array_fill(1, $outcomeCount, 0);
 
-        foreach ($program_courses as $course)
-        {
-            if($course->outcomes_achieved!=NULL)
-            {
-                $course_outcomes_achieved =json_decode($course->outcomes_achieved, true);
-                $course_outcomes_attempted =json_decode($course->outcomes_attempted, true);
-                for($i=1; $i<=count($outcomes_attempted); $i++)
-                {
-                    $outcomes_achieved[$i]+=$course_outcomes_achieved[$i];
-                    $outcomes_attempted[$i]+=$course_outcomes_attempted[$i];
+        foreach ($program_courses as $course) {
+            if ($course->outcomes_achieved != NULL) {
+                $course_outcomes_achieved = json_decode($course->outcomes_achieved, true);
+                $course_outcomes_attempted = json_decode($course->outcomes_attempted, true);
+                for ($i = 1; $i <= count($outcomes_attempted); $i++) {
+                    $outcomes_achieved[$i] += $course_outcomes_achieved[$i];
+                    $outcomes_attempted[$i] += $course_outcomes_attempted[$i];
                 }
             }
         }
@@ -84,8 +101,7 @@ class ProfessorsController extends \BaseController
         $scoords = User::where('school_id', $program->school_id)
             ->where('role', 2)
             ->get();
-        $pcoords = User::
-            select('users.*')
+        $pcoords = User::select('users.*')
             ->join('program_user', 'users.id', '=', 'program_user.user_id')
             ->where('role', 3)
             ->where('program_id', $program->id)
@@ -95,28 +111,26 @@ class ProfessorsController extends \BaseController
     }
 
 
-    public function generalStudiesOverview(){
+    public function generalStudiesOverview()
+    {
 
-        $title='General Component Assessment Overview';
+        $title = 'General Component Assessment Overview';
 
-        try{
+        try {
             $programs = Program::generalComponentPrograms();
-        }
-        catch(Exception $e){
+        } catch (Exception $e) {
             dd('Unable to find general component programs');
         }
 
         $outcomes = Outcome::orderBy('name', 'asc')->get();
         $schools = School::all();
         $program_packs = array();
-        if(!$programs->isEmpty()){
+        if (!$programs->isEmpty()) {
             foreach ($programs as $program) {
-                $program_packs[]= $program->assessmentOverview();
+                $program_packs[] = $program->assessmentOverview();
             }
         }
 
         return View::make('local.managers.shared.general_studies_overview', compact('title', 'outcomes', 'schools', 'program_packs'));
-
-
     }
 }

app/controllers/ProgramCoordinatorsController.php

@@ -22,8 +22,16 @@ class ProgramCoordinatorsController extends \BaseController
 
     $programs = Auth::user()->programs;
 
-    $outcomes = Outcome::orderBy('name', 'asc')->get();
-    $outcomeCount = Outcome::all()->count();
+    //$outcomes = Outcome::orderBy('name', 'asc')->get();
+
+    $semesters = Session::get('semesters_ids');
+    $semesters = DB::table('semesters')->whereIn('id', $semesters)->orderBy('start', 'ASC')->first();
+    Log::info($semesters->start);
+    $outcomes = Outcome::select(array('id', 'name', 'expected_outcome'))
+      ->whereNull('deleted_at')
+      ->whereRaw("(deactivation_date IS NULL or deactivation_date >= '{$semesters->start}')")
+      ->orderBy('name', 'ASC')->get();
+    $outcomeCount = count($outcomes);
 
     $programs_array = array();
     $programs_contact = array();

app/controllers/ThreeYearPlanController.php

@@ -602,4 +602,51 @@ class ThreeYearPlanController extends \BaseController
       $yearStartPlusOne++;
     }
   }
+
+  public function print($program_id, $typ)
+  {
+
+    $program = DB::table('programs')->where('id', $program_id)->first();
+    $three_year_plan = DB::table('three_year_plan')->where('id', $typ)->first();
+
+    $typ_program_id = DB::table('typ_program')->where('three_year_plan_id', $three_year_plan->id)
+      ->where('program_id', $program->id)
+      ->first()->id;
+
+    $typ_semesters = DB::table('semesters')
+      ->join('typ_semesters', 'semesters.id', '=', 'typ_semesters.semester_id')
+      ->where('typ_id', $three_year_plan->id)
+      ->orderBy('semester_id')
+      ->get();
+
+
+    foreach ($typ_semesters as $semester) {
+      $typ_semester_outcome[$semester->semester_id] = DB::table('typ_semester_outcome')
+        ->join('outcomes', 'outcomes.id', '=', 'typ_semester_outcome.outcome_id')
+        ->where('typ_program_id', $typ_program_id)
+        ->where('semester_id', $semester->semester_id)
+        ->select('typ_semester_outcome.id as typ_id')
+        ->addSelect('outcomes.id as outcome_id', 'outcomes.name')
+        ->get();
+
+      foreach ($typ_semester_outcome[$semester->semester_id] as $outcome) {
+        $outcome->objectives = DB::table('typ_semester_objectives')
+          ->join('objectives', 'objectives.id', '=', 'typ_semester_objectives.objective_id')
+          ->where('typ_semester_outcome_id', $outcome->typ_id)
+          ->select('typ_semester_objectives.id as typ_obj_id')
+          ->addSelect('objectives.text', 'objectives.id as objective_id')
+          ->get();
+        foreach ($outcome->objectives as $objective) {
+          $objective->courses = DB::table('typ_semester_courses')
+            ->join('courses', 'courses.id', '=', 'typ_semester_courses.course_id')
+            ->where('typ_semester_objective_id', $objective->typ_obj_id)
+            ->get();
+        }
+      }
+    }
+    Log::info($typ_semester_outcome);
+
+
+    return View::make('global.print_three_year_plan', compact('typ_semesters', 'program', 'three_year_plan', 'typ_semesters', 'typ_semester_outcome'));
+  }
 }

app/controllers/TransformativeActionsController.php

@@ -1,6 +1,7 @@
 <?php
 
 use Illuminate\Support\Facades\Input;
+use Illuminate\Support\Facades\Session;
 
 class TransformativeActionsController extends \BaseController
 {
@@ -1160,4 +1161,123 @@ class TransformativeActionsController extends \BaseController
       return Redirect::to("professor/activities/{$activity_id}");
     }
   }
+
+  public function viewFormativeActions()
+  {
+    $title = "Formative Actions";
+    $semesters = Session::get('semesters_ids');
+    $semesters = DB::table('semesters')->whereIn('id', $semesters)->orderBy('start', 'ASC')->first();
+    Log::info($semesters->start);
+    $outcomes = Outcome::select(array('id', 'name', 'expected_outcome'))
+      ->whereNull('deleted_at')
+      ->whereRaw("(deactivation_date IS NULL or deactivation_date >= '{$semesters->start}')")
+      ->orderBy('name', 'ASC')->get();
+    $semesters = DB::table('semesters')->where('is_visible', 1)->orderBy('end', 'DESC')->get();
+    $role = Auth::user()->role;
+    switch ($role) {
+      case 1:
+        $schools = DB::table('schools')->get();
+        $programs = DB::table('programs')->get();
+        break;
+
+      case 2:
+        $schools = DB::table('schools')->where('id', Auth::user()->school_id)->first();
+        $programs = DB::table('programs')->where('school_id', $schools->id)->get();
+        break;
+      case 3:
+        $programs = DB::table('programs')
+          ->join('program_user', 'programs.id', '=', 'program_user.program_id')
+          ->where('user_id', Auth::user()->id)
+          ->select('programs.*')
+          ->get();
+        $schools = DB::table('schools')->where('id', $programs[0]->school_id)->get();
+        break;
+    }
+    return View::make('local.managers.shared.view_formative', compact('title', 'outcomes', 'schools', 'programs', 'semesters'));
+  }
+
+  public function fetchCourses()
+  {
+
+    $school = Input::get('schools');
+
+    $programs = Input::get('programs');
+    $semesters = Input::get('semesters');
+    $outcome_id = Input::get('id');
+
+    Log::info($programs);
+    Log::info($semesters);
+
+
+    if (in_array(0, $semesters)) {
+      $semesters = DB::table('semesters')->where('is_visible', 1)->lists('id');
+    }
+
+    if (in_array(0, $programs)) {
+
+      $role = Auth::user()->role;
+
+      switch ($role) {
+        case 1:
+          $programs = DB::table('programs')->lists('id');
+          break;
+        case 2:
+          $programs = DB::table('programs')->where('school_id', Auth::user()->school_id)->lists('id');
+          break;
+        case 3:
+          $programs = DB::table('program_user')->where('user_id', Auth::user()->id)->lists('program_id');
+          break;
+      }
+    }
+
+    $grouped_courses = DB::table('courses')
+      ->whereIn('program_id', $programs)
+      ->whereIn('semester_id', $semesters)
+      ->join('activities', 'activities.course_id', '=', 'courses.id')
+      ->select('courses.*')
+      ->groupBy(array('courses.code', 'courses.name', 'courses.semester_id'))
+      ->get();
+
+
+
+    foreach ($grouped_courses as $course_name) {
+      $course_name->sections = DB::table('courses')
+        ->where('code', $course_name->code)
+        ->where('name', $course_name->name)
+        ->where('semester_id', $course_name->semester)
+        ->where('program_id', $course_name->program_id)
+        ->get();
+      foreach ($course_name->sections as $section) {
+
+        $section->activities = DB::table('activities')
+          ->join('activity_criterion', 'activities.id', '=', 'activity_criterion.activity_id')
+          ->join('transformative_activity_criterion', 'transformative_activity_criterion.activity_criterion_id', '=', 'activity_criterion.id')
+          ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'activity_criterion.criterion_id')
+          ->join('transformative_actions', 'transformative_activity_criterion.trans_action_id', '=', 'transformative_actions.id')
+          ->where('activities.course_id', $section->id)
+          ->where('criterion_objective_outcome.outcome_id', $outcome_id)
+          ->select('activities.id as activity_id', 'activities.name')
+          ->addSelect('transformative_actions.*', 'transformative_activity_criterion.trans_action_id as trans_action_id')
+          ->groupBy('transformative_actions.id')
+          ->get();
+        foreach ($section->activities as $activity) {
+          $activity->objectives = DB::table('transformative_objective')
+            ->join('objectives', 'transformative_objective.objective_id', '=', 'objectives.id')
+            ->where('ta_id', $activity->trans_action_id)
+            ->get();
+          foreach ($activity->objectives as $objective) {
+            $objective->criterion = DB::table('criterion_objective_outcome')
+              ->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'criterion_objective_outcome.criterion_id')
+              ->join('criteria', 'criteria.id', '=', 'activity_criterion.criteria_id')
+              ->where('activity_criterion.activity_id', $activity->activity_id)
+              ->where('objective_id', $objective->objective_id)
+              ->select('criteria.*')
+              ->distinct()
+              ->get();
+          }
+        }
+      }
+    }
+    Log::info($grouped_courses);
+  }
 }

app/models/Course.php

@@ -59,6 +59,84 @@ class Course extends Eloquent
     //   	SELECT distinct cr.outcome_id FROM  courses c, activities a, activity_criterion ac, criteria cr WHERE c.id=a.course_id and a.id=ac.activity_id and ac.criterion_id=cr.id and c.id=1
     // 	return $this->id;
   }
+  public function outcomes_att()
+  {
+    $criteria_attempted = DB::table('courses')
+      ->join('activities', 'activities.course_id', '=', 'courses.id')
+      ->join('activity_criterion', 'activities.id', '=', 'activity_criterion.activity_id')
+      ->select('criterion_id', 'activity_criterion.id as activity_criterion_id')
+      ->where('courses.id', $this->id)
+      ->where('draft', 0)
+      ->get();
+
+    // Old data was formed like { "outcome1": cuantity_of_criteria_associated, "outcome2":cuantity_of_criteria}
+    $outcomes_attempted = [];
+
+
+
+    foreach ($criteria_attempted as $criterion) {
+      $outcomes = DB::table('criterion_objective_outcome')
+        ->where('criterion_id', $criterion->criterion_id)
+        ->select('outcome_id')
+        ->distinct()
+        ->lists('outcome_id');
+
+      foreach ($outcomes as $outcome_id) {
+        if (array_key_exists($outcome_id, $outcomes_attempted)) $outcomes_attempted[$outcome_id] += 1;
+        else $outcomes_attempted[$outcome_id] = 1;
+      }
+    }
+
+    return $outcomes_attempted;
+  }
+
+  public function outcomes_ach()
+  {
+    $criteria = DB::table('criteria')
+      ->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'criteria.id')
+      ->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+      ->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
+      ->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
+      ->join('courses', 'activities.course_id', '=', 'courses.id')
+      ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
+      ->where('courses.id', '=', $this->id)
+      ->where('activities.draft', 0)
+      ->select(
+        'criteria.id',
+        'rubrics.expected_percentage as expected_percentage_students_achieving'/*'expected_percentage_students_achieving',*/,
+        'activity_criterion.activity_id'
+      )
+      ->distinct()
+      ->get();
+    // Old data was formed like { "outcome1": cuantity_of_criteria_associated_passed, "outcome2":cuantity_of_criteria}
+
+    $outcomes_achieved = [];
+
+    foreach ($criteria as $criterion) {
+      $students_attempted = Criterion::students_attempted($criterion->id, $criterion->activity_id);
+      $students_achieved = Criterion::students_achieved($criterion->id, $criterion->activity_id);
+
+      if ($students_attempted) {
+        $percentage_students_who_achieved = 100.0 * $students_achieved / $students_attempted;
+      } else {
+        $percentage_students_who_achieved = 0;
+      }
+      if ($percentage_students_who_achieved >= $criterion->expected_percentage_students_achieving) {
+        $outcomes = DB::table('criterion_objective_outcome')
+          ->where('criterion_id', $criterion->id)
+          ->select('outcome_id')
+          ->distinct()
+          ->lists('outcome_id');
+        foreach ($outcomes as $outcome_id) {
+          if (array_key_exists($outcome_id, $outcomes_achieved)) $outcomes_achieved[$outcome_id] += 1;
+          else $outcomes_achieved[$outcome_id] = 1;
+        }
+      }
+    }
+    return $outcomes_achieved;
+  }
+
+
 
   public function outcomes_achieved()
   {
@@ -66,13 +144,13 @@ class Course extends Eloquent
       ->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'criteria.id')
       ->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
       ->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
-      ->join('rubric', 'rubric.id', '=', 'rubric_activity.rubric_id')
+      ->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
       ->join('courses', 'activities.course_id', '=', 'courses.id')
       ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
       ->where('courses.id', '=', $this->id)
       ->select(
         'criteria.id',
-        'rubric.expected_percentage as expected_percentage_students_achieving'/*'expected_percentage_students_achieving',*/,
+        'rubrics.expected_percentage as expected_percentage_students_achieving'/*'expected_percentage_students_achieving',*/,
         'activity_criterion.activity_id'
       )
       ->distinct()

app/routes.php

@@ -178,6 +178,10 @@ Route::group(array('before' => 'auth|has_access'), function () {
         'as' => 'createThreeYearCycle',
         'uses' => 'ThreeYearPlanController@create'
     ));
+    Route::get('printThreeYear/{program_id}/{typ}', array(
+        'as' => 'printThreeYear/{program_id}/{typ}',
+        'uses' => 'ThreeYearPlanController@print'
+    ));
     // Fetch all criteria associated to an outcome
     Route::post('fetchInfo', array(
         'as' => 'fetchInfo',
@@ -191,6 +195,10 @@ Route::group(array('before' => 'auth|has_access'), function () {
         'as' => 'fetchCriterionWithTemplate',
         'uses' => 'CriteriaController@fetchCriterionWithTemplate'
     ));
+    Route::post('fetchFormative', array(
+        'as' => 'fetchFormative',
+        'uses' => 'TransformativeActionsController@fetchCourses'
+    ));
 
     // Fetch a criterion for a rubric
     Route::post('fetchCriterion', array(
@@ -207,6 +215,11 @@ Route::group(array('before' => 'auth|has_access'), function () {
         'uses' => 'CriteriaController@delete'
     ));
 
+    Route::get('viewFormative', array(
+        'as' => 'viewFormative',
+        'uses' => 'TransformativeActionsController@viewFormativeActions'
+    ));
+
 
     Route::post('delete', array(
         'as' => 'delete',

app/views/global/print_three_year_plan.blade.php

@@ -0,0 +1,167 @@
+<?php
+
+echo '<html>';
+echo '<body>';
+
+//Inline styles (only for printing)
+echo
+'<style type="text/css">
+    body
+    {
+        font-family: "Arial", sans-serif;
+        width:90%;
+        margin: 0 auto;
+    }
+    .header-text
+    {
+        text-align:center;
+        font-weight: bold;
+        margin:0;
+    }
+
+    h1.header-text
+    {
+      margin: 15px auto;
+      width:75%;
+      font-size: 25px;
+    }
+
+    table
+    {
+        border-collapse: collapse;
+        border: 1px solid black;
+        width: 100%;
+        margin: 30px auto;
+        font-size:1.5vw;
+    }
+    td, th
+    {
+        border: 1px solid black;
+        padding: 5px;
+    }
+
+    .activity-name-row
+    {
+      background:black;
+      color:white;
+    }
+
+    .activity-headers-row
+    {
+      background:lightgrey;
+      font-weight:bold;
+    }
+
+    .report-info
+    {
+      margin:5px 0;
+      font-size: 16px;
+    }
+
+    .criterion-field
+    {
+      text-align:left;
+    }
+
+    .score-field, .total, .percentage
+    {
+      text-align:center;
+    }
+
+    .header
+    {
+      margin: 30px 0;
+    }
+
+    .content
+    {
+      font-size: 12px;
+    }
+
+    .logo
+    {
+      position:absolute;
+      right:0;
+      top: 30px;
+      width: 100px;
+    }
+
+    ul{
+      list-style-type:none;
+    }
+
+    @media print{@page {size: landscape}}
+</style>';
+
+echo '<style type="text/css" media="print">
+  @page { size: landscape; }
+</style>';
+
+?>
+<img class="logo" src="{{ asset('images/logo_uprrp_bw.png') }}" alt="UPRRP Logo">
+
+<div class="header"><p class="header-text">University of Puerto Rico, Río Piedras Campus</p>
+<p class="header-text">Online Learning Assessment System</p>
+
+<h1 class="header-text">Three Year Plan for {{$program->name}} from {{$three_year_plan->year_start}} to {{$three_year_plan->year_end}}</h1></div>
+
+
+
+@foreach($typ_semesters as $semester)
+    <br>
+    <br>
+    <h2 class ='header-text'>{{$semester->name}}</h2>
+    <br>
+    @foreach($typ_semester_outcome[$semester->semester_id] as $outcome)
+
+    <span><h3>{{$outcome->name}}</h3></span>
+    <table class="table table-striped table-condensed" style = "table-layout: fixed">
+    <thead>
+        <tr>
+        
+        <th>Objectives</th>
+        <th>Courses</th>
+        
+        </tr>
+    </thead>
+    <tbody>
+
+        @foreach($outcome->objectives as $index=> $objective)
+        <tr>
+       
+        <td>
+            {{ $index + 1 }}. {{$objective->text}}
+        </td>
+        <td>
+            <ol>
+            @foreach($objective->courses as $course)
+            
+    <li>[{{$course->code}}] {{$course->name}}</li>
+            
+            @endforeach
+        </ol>
+
+        </tr>     
+          @endforeach
+
+    </tbody>
+    </table>
+    <br>
+    <br>
+  
+
+@endforeach
+
+@endforeach
+
+<?php
+
+echo '</body>';
+echo '</html>';
+?>
+
+<script type="text/javascript">
+
+window.print();
+
+</script>

app/views/global/view-three-year-plan.blade.php

@@ -92,6 +92,7 @@
   </script>
 
   <div class="row">
+ 
     <div class="col-md-3">
       <input class="form-control" type="text" id="userInput" onkeyup="filterCycles()" placeholder="Search for Cycles..">
       <div class="list-group" id='list'>
@@ -138,6 +139,9 @@
     </div>
 
     <div class="col-md-9">
+      <div class="btn-group pull-right">
+        <a href="" id= "print_button" class="btn btn-default" target="_blank" rel="noopener noreferrer">Print</a>
+   </div>
       <div id="cycle-display" class="panel panel-default">
         <div class="panel-heading">
           <h4 class=" panel-title" style="cursor:auto!important;">
@@ -383,8 +387,13 @@ $('.go-to-temp').on('click', function(){
     //section 1
     $('.list-group-item').on('click', function()
     {
+      
+      $('#three_year_button').hide();
       var id = $(this).data('cycle-id');
       $('#table-cycles').data('typ-id',id);
+      $('#print_button').show();
+      $('#print_button').attr("href", "{{URL::action('ThreeYearPlanController@print', [$program_id])}}"+
+      '/'+ $(this).data('cycle-id'));
       $('#section1').show();
       $('#section2').hide();
       $('#section3').hide();

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

@@ -5,18 +5,27 @@
     </div>-->
     <ul class="nav navbar-nav navbar-right">
       <li>{{ HTML::linkAction('ProgramCoordinatorsController@overview', 'Overview') }}</li>
-      <li>{{ HTML::linkAction('TemplatesController@newTemplate', 'Rubrics') }}</li>
-      <li>{{ HTML::linkAction('ThreeYearPlanController@threeYearsReport', 'Three Years Plan') }}</li>
+      <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Management<span class="caret"></span></a>
+        <ul class="dropdown-menu" role="menu">
+          <li>{{ HTML::linkAction('TemplatesController@newTemplate', 'Rubrics') }}</li>
+        <li>{{ HTML::linkAction('Objective2Controller@editProgram', 'Objectives')}}</li>
+      <li>{{ HTML::linkAction('CriteriaController@editProgram', 'Criteria') }}</li>
       <li>{{ HTML::linkAction('TransformativeActionsController@editTA', 'Transformative Actions') }}</li>
 
-      <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><a href="{{ URL::action('AnnualPlansController@showPlan', Auth::user()->programs[0]->id)}}">Annual Plan</a><li>
+        <li>{{ HTML::linkAction('ThreeYearPlanController@threeYearsReport', 'Three Years Plan') }}</li>
+      </ul>
+      </li>
+     
+      
       <li class="dropdown">
         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Learning and Criterias<span class="caret"></span></a>
         <ul class="dropdown-menu" role="menu">
           <li>{{ HTML::linkAction('CriteriaController@index', 'Outcomes and Criteria') }}</li>
           <li>{{ HTML::linkAction('CriteriaController@objectivesIndex', 'Objectives and Criteria') }}</li>
+          <li>{{ HTML::linkAction('TransformativeActionsController@viewFormativeActions', 'Tranformative and Formative Actions')}}
         </ul>
       </li>
       @if(count(Auth::user()->courses))

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

@@ -173,6 +173,13 @@ function loadGraphs() {
                 },
                 data:[
                     @foreach($outcomes as $outcome)
+                    <?php
+Log::info($grouped_outcomes_attempted_results[$index]);
+Log::info(array_key_exists($outcome->id, $grouped_outcomes_attempted_results[$index]));
+
+Log::info($grouped_outcomes_attempted_results[$index][$outcome->id]);
+                         
+                    ?>
                         @if(
                             is_array($grouped_outcomes_attempted_results[$index])
                             && array_key_exists($outcome->id, $grouped_outcomes_attempted_results[$index])

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

@@ -172,7 +172,7 @@ echo '<style type="text/css" media="print">
 </table>
 
 
-<?
+<?php
 
 echo '</body>';
 echo '</html>';