final push

app/controllers/ActivitiesController.php

         $scores_array = array();
 
         foreach ($assessments as $index => $assessment) {
-            $scores_array[$assessment->student_id][$assessment->activity_criterion_id][] = $assessment->score;
+            $scores_array[$assessment->student_id][$assessment->activity_criterion_id] = $assessment->score;
             $scores_array[$assessment->student_id]['comments'] = DB::table('activity_student')->where('student_id', '=', $assessment->student_id)
                 ->where("activity_id", '=', $activity->id)
                 ->select('comments')->first()->comments;
             ->addSelect('rubric_criterion.rubric_id', 'rubric_criterion.id as rubric_criterion_id')
             ->get();
         $rubric->titles = DB::table('titles')
-            ->join('rubric_title', 'rubric_title.titles_id', '=', 'titles.id')
+            ->join('rubric_title', 'rubric_title.title_id', '=', 'titles.id')
             ->where('rubric_id', $rubric->id)
             ->orderBy("position", 'ASC')
             ->lists('text');
 
         foreach ($assessments as $index => $assessment) {
 
-            $scores_array[$assessment->student_id][] = $assessment->score;
+            $scores_array[$assessment->student_id][$assessment->activity_criterion_id] = $assessment->score;
             $scores_array[$assessment->student_id]['comments'] = DB::table('activity_student')->where('student_id', '=', $assessment->student_id)
                 ->where("activity_id", '=', $activity->id)
                 ->select('comments')->first()->comments;

app/controllers/AnnualPlansController.php

 
       $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 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['criteria'][$objective->id] = DB::select("select * from criteria where deleted_at IS NULL and 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]);
         $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_course_id, typ.course_id, c.code, c.number from (select course_id, id from typ_semester_courses where typ_semester_objective_id = {$annual_plan['first']['typ_objective_id'][$objective->id]->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->typ_course_id] = DB::select("select * from criteria where id in(select criteria_id from annual_plan_objective where annual_plan_id = {$an_id} and typ_semester_course_id = {$course->typ_course_id} )");
+          $annual_plan['first']['criteria'][$objective->id][$course->typ_course_id] = DB::select("select * from criteria where  id in(select criteria_id from annual_plan_objective where annual_plan_id = {$an_id} and typ_semester_course_id = {$course->typ_course_id} )");
           $annual_plan['first']['trans_actions'][$objective->id][$course->typ_course_id] = DB::select("select * from transformative_actions where id in (select trans_id from annual_plan_transformative where typ_semester_course_id = {$course->typ_course_id})");
         }
 

app/controllers/OutcomesController.php

             ->with(array('courses' => function ($query) {
                 $query
                     ->has('activities')
-                    ->whereNotNull('outcomes_attempted')
+                    //->whereNotNull('outcomes_attempted')
+
                     ->whereIn('semester_id', Session::get('semesters_ids'))
                     ->groupBy(array('code', 'number'));
             }))
             ->first();
+        Log::info($program);
 
         return View::make('local.managers.pCoords.assessment_report', compact('title', 'outcome', 'program'));
     }
         $semesters = DB::table('semesters')->whereIn('id', $semesters)->orderBy('start', 'ASC')->first();
         Log::info($semesters->start);
         $outcomes = Outcome::select(array('id', 'name', 'expected_outcome'))
-            ->where('deleted_at', '=', NULL)
-            ->whereRaw("(deactivation_date = NULL or deactivation_date >= '{$semesters->start}')")
+            ->whereNull('deleted_at')
+            ->whereRaw("(deactivation_date IS NULL or deactivation_date >= '{$semesters->start}')")
             ->orderBy('name', 'ASC')->get();
+
+        Log::info($outcomes);
         $title = "My Courses' Assessment Reports";
 
         return View::make('local.professors.assessment_reports', compact('title', 'outcomes'));

app/controllers/RubricsController.php

         Log::info('entré6???');
         DB::delete("delete from rubric_criterion where rubric_id ={$rubric->id}");
         DB::delete("delete from activity_criterion where activity_id = {$activity->id}");
+        DB::delete("delete from rubric_title where rubric_id = {$rubric->id}");
         foreach ($criteria as $index => $criterion_id) {
 
 

app/controllers/ThreeYearPlanController.php

   public function create()
   {
     try {
+      DB::beginTransaction();
       $yearStart = Input::get('years') + 0;
       $yearEnd = $yearStart + 3;
       DB::insert("insert into three_year_plan (`year_start`, `year_end`) values ({$yearStart}, {$yearEnd})");
-      DB::commit();
+
       $typ = DB::table('three_year_plan')->where('year_start', '=', $yearStart)
         ->where('year_end', '=', $yearEnd)
         ->first();
         Log::info($typ->id);
         DB::insert("insert into typ_semesters (typ_id, semester_id) values ({$typ->id}, {$Firstsemester->id}), ({$typ->id}, {$secondSemester->id})");
       }
-
+      DB::commit();
       Session::flash('status', 'success');
       Session::flash('message', '<p> Cycle created.</p>');
       return Redirect::to('three-years-plan');
       Session::flash('status', 'danger');
       Session::flash('message', "<p>Could not create cycle</p>");
       Log::info($e);
+      DB::rollback();
       return Redirect::to('three-years-plan');;
     }
   }
   {
     $user_id = Auth::user()->id;
 
-    $last_year = DB::table('three_year_plan')->select('year_start')
-      ->orderBy('year_start', 'desc')->first();
+    $last_year = DB::table('three_year_plan')->select('year_end')
+      ->orderBy('year_end', 'desc')->first();
     if (!$last_year) {
-      $last_year = date('Y');
+      // $last_year = date('Y');
+      $last_year = 2019;
     } else {
-      $last_year = $last_year->year_start;
+      $last_year = $last_year->year_end;
     }
 
+
     // el ID de los semestres que el usuario tiene seleccionado.
     $semesters_ids = Session::get('semesters_ids');
     // buscar informacion de los semestres seleccionados

app/controllers/TransformativeActionsController.php

         ->get();
       $outcome_filter_editPanel = DB::table('transformative_actions')
         ->join('transformative_objective', 'transformative_objective.ta_id', '=', 'transformative_actions.id')
-        ->join('criterion_objective_outcome', 'criterion_objective_outcome.objective_id', '=', 'transformative_objective.objective_id')
-        ->join('outcomes', 'outcomes.id', '=', 'criterion_objective_outcome.outcome_id')
+        ->join('objective_outcome', 'objective_outcome.objective_id', '=', 'transformative_objective.objective_id')
+        ->join('outcomes', 'outcomes.id', '=', 'objective_outcome.outcome_id')
         ->where('transformative_actions.is_custom', 1)
         ->where('transformative_actions.program_id', $program_id)
         ->where('transformative_actions.by_professor', 0)
             array(
               'ta_id' => $ta_id,
               'objective_id' => $new_id,
-              'created_at' => $current_timestamp,
+              // 'created_at' => $current_timestamp,
             )
           );
         } else {
   public function selectTA()
   {
     $ta_id = Input::get("ta_id");
-    $user_id = Auth::user()->id;
-    $program_id = DB::table('program_user')
-      ->where('user_id', $user_id)
-      ->select('program_id')
-      ->get();
-    $program_id = $program_id[0]->program_id;
+    $user_role = Auth::user()->role;
+    switch ($user_role) {
+      case 1:
+
+        $program_ids = DB::table('programs')->lists('id');
+        break;
+      case 2:
+        $user_school = Auth::user()->school_id;
+        $program_ids = DB::table('programs')
+          ->where('school_id', $user_school)
+          ->lists('id');
+        break;
+
+      case 3:
+        $user_id = Auth::user()->id;
+        $program_ids = DB::table('program_user')
+          ->where('user_id', $user_id)
+          ->select('program_id')
+          ->lists('program_id');
+        break;
+    }
+    //$program_id = DB::table('program_user')
+    //  ->where('user_id', $user_id)
+    //  ->select('program_id')
+    //  ->get();
+    //$program_id = $program_id[0]->program_id;
 
     $objectives = DB::table('transformative_actions')
       ->join('transformative_objective', 'transformative_objective.ta_id', '=', 'transformative_actions.id')
       ->select('objectives.text as text', 'objectives.id as id')
       ->orderBy('objectives.text', 'ASC')
       ->get();
+    $objective_ids = DB::table('transformative_actions')
+      ->join('transformative_objective', 'transformative_objective.ta_id', '=', 'transformative_actions.id')
+      ->join('objectives', 'objectives.id', '=', 'transformative_objective.objective_id')
+      ->where('transformative_actions.id', $ta_id)
+      ->select('objectives.text as text', 'objectives.id as id')
+      ->orderBy('objectives.text', 'ASC')
+      ->lists('objectives.id');
     Log::info($ta_id);
 
-    $an_objective = $objectives[0]->id;
-    $outcome_id = DB::table('criterion_objective_outcome')
-      ->where('criterion_objective_outcome.objective_id', $an_objective)
-      ->select('criterion_objective_outcome.outcome_id')
-      ->get();
-    $outcome_id = $outcome_id[0]->outcome_id;
-
-
+    //$an_objective = $objectives[0]->id;
+    $outcome_ids = DB::table('objective_outcome')
+      ->whereIn('objective_outcome.objective_id', $objective_ids)
+      ->select('objective_outcome.outcome_id')
+      ->lists('outcome_id');
+    //$outcome_id = $outcome_id[0]->outcome_id;
+    Log::info("outcomes");
+    Log::info($outcome_ids);
     $objectives_from_outcome = DB::table('objectives')
       ->join('objective_program', 'objective_program.objective_id', '=', 'objectives.id')
-      ->join('criterion_objective_outcome', 'criterion_objective_outcome.objective_id', '=', 'objectives.id')
-      ->where('criterion_objective_outcome.outcome_id', $outcome_id)
-      ->where('objective_program.program_id', $program_id)
+      ->join('objective_outcome', 'objective_outcome.objective_id', '=', 'objectives.id')
+      ->whereIn('objective_outcome.outcome_id', $outcome_ids)
+      ->whereIn('objective_program.program_id', $program_ids)
       ->orderBy('objectives.text', 'ASC')
       ->select('objectives.text as text', 'objectives.id as id')
+      ->distinct()
       ->get();
+
     $selected_courses = DB::table('ta_course')
       ->join('courses', function ($join) {
         $join->on('courses.number', '=', 'ta_course.course_number');
   // load the available objectieves from an outcome when creating a Tranformative Action
   public function objectivesFromOutcome()
   {
-    $user_id = Auth::user()->id;
-    $program_id = DB::table('program_user')
-      ->where('user_id', $user_id)
-      ->select('program_id')
-      ->get();
-    $program_id = $program_id[0]->program_id;
+    $user_role = Auth::user()->role;
+
+
+    switch ($user_role) {
+      case 1:
+
+        $program_ids = DB::table('programs')->lists('id');
+        break;
+
+      case 2:
+        $user_school = Auth::user()->school_id;
+        $program_ids = DB::table('programs')
+          ->where('school_id', $user_school)
+          ->lists('id');
+        break;
+      case 3:
+        $user_id = Auth::user()->id;
+        $program_ids = DB::table('program_user')
+          ->where('user_id', $user_id)
+          ->select('program_id')
+          ->lists('program_id');
+        break;
+    }
+
+    //$program_id = DB::table('program_user')
+    //  ->where('user_id', $user_id)
+    //  ->select('program_id')
+    //  ->get();
+    //$program_id = $program_id[0]->program_id;
     $ta_id = Input::get("ta_id");
     $outcome_id = Input::get("outcome_id");
 
       ->join('objective_program', 'objective_program.objective_id', '=', 'objectives.id')
       ->join('objective_outcome', 'objective_outcome.objective_id', '=', 'objectives.id')
       ->where('objective_outcome.outcome_id', $outcome_id)
-      ->where('objective_program.program_id', $program_id)
+      ->whereIn('objective_program.program_id', $program_ids)
       ->orderBy('objectives.text', 'ASC')
       ->select('objectives.text as text', 'objectives.id as id')
       ->get();
       if ($outcome_id == 0) {
         $outcomes = DB::table('transformative_actions')
           ->join('transformative_objective', 'transformative_objective.ta_id', '=', 'transformative_actions.id')
-          ->join('criterion_objective_outcome', 'criterion_objective_outcome.objective_id', '=', 'transformative_objective.objective_id')
-          ->join('outcomes', 'outcomes.id', '=', 'criterion_objective_outcome.outcome_id')
+          ->join('objective_outcome', 'objective_outcome.objective_id', '=', 'transformative_objective.objective_id')
+          ->join('outcomes', 'outcomes.id', '=', 'objective_outcome.outcome_id')
           ->where('transformative_actions.is_custom', 1)
           ->where('transformative_actions.program_id', $program_id)
           ->where('transformative_actions.by_professor', 1)
       $filtered_at = DB::table('transformative_actions')
         ->join('ta_course', 'ta_course.ta_id', '=', 'transformative_actions.id')
         ->join('transformative_objective', 'transformative_objective.ta_id', '=', 'transformative_actions.id')
-        ->join('criterion_objective_outcome', 'criterion_objective_outcome.objective_id', '=', 'transformative_objective.objective_id')
+        ->join('objective_outcome', 'objective_outcome.objective_id', '=', 'transformative_objective.objective_id')
         ->where('transformative_actions.user_id', Auth::user()->id)
         ->where('transformative_actions.is_custom', 1)
         ->where('transformative_actions.program_id', $program_id)
         ->where('transformative_actions.by_professor', 1)
-        ->whereIn('criterion_objective_outcome.outcome_id', $outcome_id)
+        ->whereIn('objective_outcome.outcome_id', $outcome_id)
         ->whereIn('ta_course.course_code', $course_id['code'])
         ->whereIn('ta_course.course_number', $course_id['number'])
         ->select('transformative_actions.*')

app/models/Activity.php

     $activity_criterion = DB::table('activity_criterion')
       ->where('activity_id', '=', $this->id)
       ->get();
+    Log::info('activity_criterion');
+    Log::info($activity_criterion);
+
     $criteria_achieved = [];
     foreach ($activity_criterion as $index => $single_ac) {
 
+
       $assessments_passed = count(DB::table('assessments')
         ->where('score', '>=', $this->rubric[0]->expected_points)
         ->where('activity_criterion_id', '=', $single_ac->id)
         ->where('activity_criterion_id', '=', $single_ac->id)
         ->lists('student_id'));
 
-      if ((($assessments_passed / $assessments_attempted) * 100) >= $this->rubric[0]->expected_percentage) {
+      if ($assessments_attempted != 0 && (($assessments_passed / $assessments_attempted) * 100) >= $this->rubric[0]->expected_percentage) {
         $criteria_achieved[$single_ac->criterion_id] = 1;
       } else {
         $criteria_achieved[$single_ac->criterion_id] = 0;
 
     $criterias = DB::table('criteria')
       ->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'criteria.id')
+      ->join('assessments', 'activity_criterion.id', '=', 'assessments.activity_criterion_id')
       ->where('activity_criterion.activity_id', '=', $this->id)
       ->select(
-        'activity_criterion.id as id',
-        'activity_criterion.criterion_id as criterion_id',
-        'activity_criterion.activity_id as activity_id'
+        array(
+          'activity_criterion.id as id',
+          'activity_criterion.criterion_id as criterion_id',
+          'activity_criterion.activity_id as activity_id'
+        )
       )
       ->addSelect('criteria.name', 'criteria.subcriteria')
       ->get();
         ->lists('student_id'));
       Log::info($amount_of_students_passed);
       Log::info('es aqui');
+
       $single_crit->score_percentage = ($amount_of_students_passed / $amount_of_students) * 100;
       $criteria_achieved_percentage[$single_crit->criterion_id] = $single_crit;
       Log::info("?");

app/models/Program.php

 
 	public function publishedActivities()
 	{
-		return $this->hasManyThrough('Activity', 'Course')->whereNotNull('activities.outcomes_attempted')->where('activities.draft', 0)->whereIn('semester_id', Session::get('semesters_ids'));
+
+		return $this->hasManyThrough('Activity', 'Course')
+			//->whereNotNull('activities.outcomes_attempted')
+			->where('activities.draft', 0)->whereIn('semester_id', Session::get('semesters_ids'));
 	}
 
 	public function assessesOutcome($outcome_id)
 	{
 
 		foreach ($this->publishedActivities as $activity) {
+			$assessed = DB::table('activity_criterion')
+				->join('assessments', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
+				->where('activity_id', $activity->id)
+				->first();
+			if (!$assessed) continue;
 			$outcomes_attempted = (array)$activity->o_att_array;
 			if (array_key_exists($outcome_id, $outcomes_attempted) && $outcomes_attempted[$outcome_id] != 0) {
 				return true;
 		foreach ($semesters as $semester) {
 			$semesters_array[] = $semester->id;
 		}
-		
-//   DB::enableQueryLog();
-// 		dd(DB::getQueryLog());
-// 		 $criteria=DB::table('new_criteria')
-// 	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
-// 	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
-// 	    	->join('courses', 'activities.course_id', '=', 'courses.id')
-// 	    	->join('programs', 'programs.id', '=', 'courses.program_id')
-// 	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
-// 	    	->where('criterion_objective_outcome.outcome_id','=',$outcome_id)
-// 	    	->where('programs.id','=',$this->id)
-// 	    	->whereIn('courses.semester_id',$semesters_array)
-// 	    	->select('new_criteria.id','expected_percentage_students_achieving','activity_criterion.activity_id')
-// 	    	->distinct()
-// 	    	->get()
-// 			;
-
-		 $criteria=DB::table('criteria')
-	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'criteria.id')
-	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
-	    	->join('courses', 'activities.course_id', '=', 'courses.id')
-	    	->join('programs', 'programs.id', '=', 'courses.program_id')
-	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
+
+		//   DB::enableQueryLog();
+		// 		dd(DB::getQueryLog());
+		// 		 $criteria=DB::table('new_criteria')
+		// 	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
+		// 	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+		// 	    	->join('courses', 'activities.course_id', '=', 'courses.id')
+		// 	    	->join('programs', 'programs.id', '=', 'courses.program_id')
+		// 	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
+		// 	    	->where('criterion_objective_outcome.outcome_id','=',$outcome_id)
+		// 	    	->where('programs.id','=',$this->id)
+		// 	    	->whereIn('courses.semester_id',$semesters_array)
+		// 	    	->select('new_criteria.id','expected_percentage_students_achieving','activity_criterion.activity_id')
+		// 	    	->distinct()
+		// 	    	->get()
+		// 			;
+
+		$criteria = DB::table('criteria')
+			->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'criteria.id')
+			->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+			->join('courses', 'activities.course_id', '=', 'courses.id')
+			->join('programs', 'programs.id', '=', 'courses.program_id')
+			->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
 			->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
 			->join('rubrics', 'rubric_activity.rubric_id', '=', 'rubrics.id')
-	    	->where('criterion_objective_outcome.outcome_id','=',$outcome_id)
-	    	->where('programs.id','=',$this->id)
-	    	->whereIn('courses.semester_id',$semesters_array)
-	    	->select('criteria.id','expected_percentage','activity_criterion.activity_id')
-	    	->distinct()
-	    	->get()
-			;
-
-// 		dd(DB::getQueryLog());
-		 
-		$conteo=0;
-		$attempted_criteria_per_program_array=[];
-// 		$students_attempted=0;
-// 		$students_achieved=0;
-		foreach($criteria as $criterion)
-		{	
-			if(!isset($students_attempted[$criterion->id]))$students_attempted[$criterion->id]=0;
-			if(!isset($students_achieved[$criterion->id]))$students_achieved[$criterion->id]=0;
-			$attempted_criteria_per_program_array[$criterion->id]=1;
-			$students_attempted[$criterion->id]+=Criterion::students_attempted($criterion->id, $criterion->activity_id);
-			$students_achieved[$criterion->id]+=Criterion::students_achieved($criterion->id, $criterion->activity_id);
+			->where('criterion_objective_outcome.outcome_id', '=', $outcome_id)
+			->where('programs.id', '=', $this->id)
+			->whereIn('courses.semester_id', $semesters_array)
+			->select('criteria.id', 'expected_percentage', 'activity_criterion.activity_id')
+			->distinct()
+			->get();
+
+		// 		dd(DB::getQueryLog());
+
+		$conteo = 0;
+		$attempted_criteria_per_program_array = [];
+		// 		$students_attempted=0;
+		// 		$students_achieved=0;
+		foreach ($criteria as $criterion) {
+			if (!isset($students_attempted[$criterion->id])) $students_attempted[$criterion->id] = 0;
+			if (!isset($students_achieved[$criterion->id])) $students_achieved[$criterion->id] = 0;
+			$attempted_criteria_per_program_array[$criterion->id] = 1;
+			$students_attempted[$criterion->id] += Criterion::students_attempted($criterion->id, $criterion->activity_id);
+			$students_achieved[$criterion->id] += Criterion::students_achieved($criterion->id, $criterion->activity_id);
 		}
 		// 		var_dump($outcome_id);
 		// 		var_dump($this->id);
 			foreach ($students_attempted as $criteria_id => $students_attempted_n) {
 				if ($students_attempted_n) {
 					$percentage_students_who_achieved = 100.0 * $students_achieved[$criteria_id] / $students_attempted[$criteria_id];
-				} 
-				else
-				{
-					$percentage_students_who_achieved=0;
+				} else {
+					$percentage_students_who_achieved = 0;
 				}
-				if($percentage_students_who_achieved>=$criterion->expected_percentage)
-				{
+				if ($percentage_students_who_achieved >= $criterion->expected_percentage) {
 					$conteo++;
 				}
 			}
 		foreach ($semesters as $semester) {
 			$semesters_array[] = $semester->id;
 		}
-		
-//   DB::enableQueryLog();
-// 		dd(DB::getQueryLog());
-// 		 $criteria=DB::table('new_criteria')
-// 	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
-// 	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
-// 	    	->join('courses', 'activities.course_id', '=', 'courses.id')
-// 	    	->join('programs', 'programs.id', '=', 'courses.program_id')
-// 	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
-// 	    	->where('criterion_objective_outcome.outcome_id','=',$outcome_id)
-// 	    	->where('programs.id','=',$this->id)
-// 	    	->whereIn('courses.semester_id',$semesters_array)
-// 	    	->select('new_criteria.id','expected_percentage_students_achieving','activity_criterion.activity_id')
-// 	    	->distinct()
-// 	    	->get()
-// 			;
-			
-		 $criteria=DB::table('criteria')
-	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'criteria.id')
-	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
-	    	->join('courses', 'activities.course_id', '=', 'courses.id')
-	    	->join('programs', 'programs.id', '=', 'courses.program_id')
-	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
+
+		//   DB::enableQueryLog();
+		// 		dd(DB::getQueryLog());
+		// 		 $criteria=DB::table('new_criteria')
+		// 	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
+		// 	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+		// 	    	->join('courses', 'activities.course_id', '=', 'courses.id')
+		// 	    	->join('programs', 'programs.id', '=', 'courses.program_id')
+		// 	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
+		// 	    	->where('criterion_objective_outcome.outcome_id','=',$outcome_id)
+		// 	    	->where('programs.id','=',$this->id)
+		// 	    	->whereIn('courses.semester_id',$semesters_array)
+		// 	    	->select('new_criteria.id','expected_percentage_students_achieving','activity_criterion.activity_id')
+		// 	    	->distinct()
+		// 	    	->get()
+		// 			;
+
+		$criteria = DB::table('criteria')
+			->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'criteria.id')
+			->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+			->join('courses', 'activities.course_id', '=', 'courses.id')
+			->join('programs', 'programs.id', '=', 'courses.program_id')
+			->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
 			->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
 			->join('rubrics', 'rubric_activity.rubric_id', '=', 'rubrics.id')
-	    	->where('criterion_objective_outcome.outcome_id','=',$outcome_id)
-	    	->where('programs.id','=',$this->id)
-	    	->whereIn('courses.semester_id',$semesters_array)
-	    	->select('criteria.id','expected_percentage','activity_criterion.activity_id')
-	    	->distinct()
-	    	->get()
-			;
-
-// 		dd(DB::getQueryLog());
-		 
-		$conteo=0;
-		$attempted_criteria_per_program_array=[];
-// 		$students_attempted=0;
-// 		$students_achieved=0;
-		foreach($criteria as $criterion)
-		{	
-			if(!isset($students_attempted[$criterion->id]))$students_attempted[$criterion->id]=0;
-			if(!isset($students_achieved[$criterion->id]))$students_achieved[$criterion->id]=0;
-			$attempted_criteria_per_program_array[$criterion->id]=1;
-			$students_attempted[$criterion->id]+=Criterion::students_attempted($criterion->id, $criterion->activity_id);
-			$students_achieved[$criterion->id]+=Criterion::students_achieved($criterion->id, $criterion->activity_id);
+			->where('criterion_objective_outcome.outcome_id', '=', $outcome_id)
+			->where('programs.id', '=', $this->id)
+			->whereIn('courses.semester_id', $semesters_array)
+			->select('criteria.id', 'expected_percentage', 'activity_criterion.activity_id')
+			->distinct()
+			->get();
+
+		// 		dd(DB::getQueryLog());
+
+		$conteo = 0;
+		$attempted_criteria_per_program_array = [];
+		// 		$students_attempted=0;
+		// 		$students_achieved=0;
+		foreach ($criteria as $criterion) {
+			if (!isset($students_attempted[$criterion->id])) $students_attempted[$criterion->id] = 0;
+			if (!isset($students_achieved[$criterion->id])) $students_achieved[$criterion->id] = 0;
+			$attempted_criteria_per_program_array[$criterion->id] = 1;
+			$students_attempted[$criterion->id] += Criterion::students_attempted($criterion->id, $criterion->activity_id);
+			$students_achieved[$criterion->id] += Criterion::students_achieved($criterion->id, $criterion->activity_id);
 		}
 		// 		var_dump($this->id);
 		// 		if(isset($students_attempted))var_dump($students_attempted);
 			foreach ($students_attempted as $criteria_id => $students_attempted_n) {
 				if ($students_attempted_n) {
 					$percentage_students_who_achieved = 100.0 * $students_achieved[$criteria_id] / $students_attempted[$criteria_id];
-				} 
-				else
-				{
-					$percentage_students_who_achieved=0;
+				} else {
+					$percentage_students_who_achieved = 0;
 				}
-				if($percentage_students_who_achieved>=$criterion->expected_percentage)
-				{
+				if ($percentage_students_who_achieved >= $criterion->expected_percentage) {
 					$conteo++;
 				}
 			}

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

         {{ Form::open(array('action' => 'ThreeYearPlanController@create' )) }}
         <p>Select a new cycle. You cannot choose a cycle that has been created before</p>
         <select name = 'years' class="form-control selectpicker">
-          @for ($i = (int)$last_year; $i<2100; $i++)
           
-          <option value='{{$i}}' >{{$i}} - {{$i+3}} </option>
-          @endfor
+          
+          <option value='{{$last_year}}' >{{$last_year}} - {{$last_year+3}} </option>
+          <option value='{{$last_year+3}}' >{{$last_year+3}} - {{$last_year+6}} </option>
+          
+          
       </select>
       </div>
       <div class="modal-footer">

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

                         @endforeach
                     </select>
                 </div>
+                <hr>
 
                 <!-- Associated Outcome -->
 
                         {{ Form::select('outcome[]', $outcomes, null, ['class'=>'form-control selectpicker', 'id'=>'assoc_outcome0']) }}
 
                     </div>
+                    
                 </div>
+                
+                
                 <button id='button-add-assoc-outcome' class='btn btn-md btn-secondary' onclick='addAssoc()'>
                     <span class='glyphicon glyphicon-plus'>
 

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

                 <div class="form-group col-md-11 editCourse">
                   <select name="courseid" id = "edit_course" class="form-control selectpicker">
                     @foreach ($courses_create as $course)
-                      <option value="({{$course->code}},{{$course->number}})">{{$course->code}}[{{$course->code}}]</option>
+                      <option value="({{$course->code}},{{$course->number}})">{{$course->code}} {{$course->number}}</option>
                     @endforeach
                   </select>
                 </div>

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

                                     {{ $program->school->name }}: {{ $program->name }}
                                 </h4>
                             </th>
-                        </tr>
+                        </tr> 
                     </thead>
                     <tbody>
                         @if($program->assessesOutcome($outcome->id))
 
                                     <?php
 
-                                        $sections_evaluating = Course::has('activities')
+                                        /*$sections_evaluating = Course::has('activities')
                                         ->whereNotNull('outcomes_attempted')
                                         ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
                                         ->with(array('activities'=>function($query) use(&$outcome){
                                             $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
                                         ->where('code', $course->code)->where('number',$course->number)
                                         ->whereIn('semester_id', Session::get('semesters_ids'))
-                                        ->get();
+                                        ->get();*/
+
+
+                                        $sections_evaluating = Course::has('activities')
+                            
+                            //->whereNotNull('outcomes_attempted')
+                            //->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
+                            ->with(array('activities'=>function($query) use(&$outcome, &$course){
+                                $activities = DB::table('activities')
+                                ->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
+                                ->join('assessments', 'assessments.activity_criterion_id', '=','activity_criterion.id')
+                                ->join('criterion_objective_outcome', 'activity_criterion.criterion_id', '=', 'criterion_objective_outcome.criterion_id')
+                                ->where('course_id', $course->id)
+                                ->where('criterion_objective_outcome.outcome_id', $outcome->id)
+                                ->select('activity_id')
+                                ->lists('activity_id');
+
+                                //$query->whereNotNull('outcomes_attempted');
+                                //$query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');
+                            $query->whereIn('id', $activities);
+                        } ))
+                                
+
+                            ->where('code', $course->code)->where('number',$course->number)
+                            ->whereIn('semester_id', Session::get('semesters_ids'))
+                            ->get();
+                            
+                            
                                     ?>
 
                                     @if(count($sections_evaluating))
                                                 @foreach($section->activities as $index4 => $activity)
 
                                                     <!-- If activity has a rubric and the rubric has the outcome being evaluated -->
-                                                    @if(array_key_exists($outcome->id, (array)$activity->o_att_array) && $activity->o_att_array[$outcome->id] >=1)
+                                                    @if($activity->draft ==0 && array_key_exists($outcome->id, (array)$activity->o_att_array) && $activity->o_att_array[$outcome->id] >=1)
                                                         <h5>Measure {{ $index4 + 1 }}</h5>
                                                         <p>A rubric was used in the {{ $section->code }}-{{ $section->number }} ({{ $section->name }}) course ({{ date('M Y', strtotime($course->updated_at))}}) to assess students’ <u>{{ strtolower($outcome->name) }}</u> in the activity: "<strong>{{ $activity->name }}</strong>". N= {{ count($section->students) }}. </p>
-                                                        <p>The expected performance level was that <strong>{{ $activity->rubric->expected_percentage }}%</strong> of students participating in the activity would score <strong>{{ $activity->rubric->expected_points }} points</strong> or more in the 1-8 point scale used.</p>
+                                                        <p>The expected performance level was that <strong>{{ $activity->rubric[0]->expected_percentage }}%</strong> of students participating in the activity would score <strong>{{ $activity->rubric[0]->expected_points }} points</strong> or more in the 1-8 point scale used.</p>
                                                         <p>The results for each criterion were as follows:</p>
 
                                                         <table class="table table-condensed table-bordered">
-                                                            @foreach((array)$activity->cap_array as $index5 => $cap)
-                                                                <?php
-                                                                    $criterion = Criterion::find($index5);
-                                                                ?>
-
-                                                                @if($criterion['outcome_id'] == $outcome->id && $cap >= $activity->rubric->expected_percentage )
+                                                            @foreach((array)$activity->cap_array as $criterion_id => $criterion)
+                                                                @if(in_array($outcome->id, json_decode($criterion->outcome_id))  /*== $outcome->id*/ && $criterion->score_percentage >= $activity->rubric[0]->expected_percentage )
                                                                     <tr>
-                                                                        <td>{{ $criterion['name'] }}</td>
-                                                                        <td class="col-md-1 success">{{ $cap }}%</td>
+                                                                        <td>{{ $criterion->name }}</td>
+                                                                        <td class="col-md-1 success">{{ $criterion->score_percentage }}%</td>
                                                                     </tr>
-                                                                @elseif($criterion['outcome_id'] == $outcome->id && $cap < $activity->rubric->expected_percentage )
+                                                                @elseif(in_array($outcome->id, json_decode($criterion->outcome_id)) && $criterion->score_percentage < $activity->rubric[0]->expected_percentage )
                                                                     <tr>
-                                                                        <td>{{ $criterion['name'] }}</td>
-                                                                        <td class="col-md-1 danger">{{ $cap }}%</td>
+                                                                        <td>{{ $criterion->name }}</td>
+                                                                        <td class="col-md-1 danger">{{ $criterion->score_percentage }}%</td>
                                                                     </tr>
-                                                                @endif
+                                                                @endif  
                                                             @endforeach
                                                         </table>
 
                                                         @endif
                                                         <br><br>
 
-                                                    @else
+                                                    @elseif($activity->draft ==0)
                                                         <h5>Measure {{ $index4 + 1 }}</h5>
                                                         <em>Outcome not measured.</em>
+                                                    @else
+                                                    
                                                     @endif
                                                 @endforeach
                                             @endforeach

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

             <div class="panel-heading">
                 Edit
             </div>
-            <button class="btn btn-md btn-secondary filterButton">
+            
+
+            <div class="panel-body">
+                <button class="btn btn-md btn-secondary filterButton">
                 <span class="glyphicon glyphicon-plus">
                 </span>
                 Filters
               </button>
-            <div class="panel-body">
                 <div class='filterSection'>
             
                     {{ Form::open(array('action' => 'Objective2Controller@update')) }}
     
                     </div>
                       </div>
+                      <hr>
 
                 <div class="form-group">
                     {{ Form::label('objective_id', 'Objectives') }}
                         <label>Associated Outcome</label>
 
                         {{ Form::select("assoc_outcome[]", $outcomes, null, ['class'=>'form-control selectpicker', 'id'=>'assoc_outcome0']) }}
-
+<br><br>
                     </div>
+                    
                 </div>
+                
                 <button id='button-add-assoc-outcome' class='btn btn-md btn-secondary' onclick='addAssoc()'>
                     <span class='glyphicon glyphicon-plus'>
 
 
     function deleteLastAssoc() {
 
-        div = document.getElementById('assocOutcomeForm' + (counterAssoc).toString());
+        div = document.getElementById('assocOutcomeForm' + (i).toString());
         div.remove();
-        button = document.getElementById('closeAssoc' + (counterAssoc).toString());
+        button = document.getElementById('closeAssoc' + (i).toString());
         button.remove();
         counterAssoc -= 1;
 

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

             var $button = $('<button/>', {
             'type': 'button',
             'class': 'btn btn-secondary',
-            'onclick': 'addCriteriaTest("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+'")'
+            'onclick': 'addCriteriaTest("forObjective-'+objectives[objective].id+"-course-"+courses[objectives[objective].id][course].typ_course_id+'", "'+objectives[objective].id+"-course-"+courses[objectives[objective].id][course].typ_course_id+'", '+courses[objectives[objective].id][course].typ_course_id+', null, "'+options+'")'
             });
            
             $button.append("+ Add criteria");
   }).html('x');
   $div.append($span);
  $div.append("<br><br>")
- $("#forObjective-"+new_id_for_select).append("<br>");
-  $div.appendTo($("#forObjective-"+new_id_for_select));
+ $('#'+div).append("<br>");
+  $div.appendTo($("#"+div));
   
 
   
   
 
  
-  $("#forObjective-"+new_id_for_select).data("amount-select", amount_select+1);
+  $("#"+div).data("amount-select", amount_select+1);
 
 }
 $('#allOutcomes').hide();

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

             <div class="panel-heading">
                 Edit
             </div>
-            <button class="btn btn-md btn-secondary filterButton">
+            
+              <div class="panel-body">
+                  <button class="btn btn-md btn-secondary filterButton">
                 <span class="glyphicon glyphicon-plus">
                 </span>
                 Filters
               </button>
-              <div class="panel-body">
               <div class='filterSection'>
             
                 {{ Form::open(array('action' => 'Objective2Controller@update')) }}
 
                 </div>
                   </div>
+                  <hr>
                 <div class="form-group">
                     {{ Form::label('objective_id', 'Objectives') }}
                     <select id="select-objective" name="id" class="form-control selectpicker">
                     </select>
                 </div>
 
+
                 <!-- Associated Outcome -->
 
                 <div class="form-group">

app/views/local/managers/shared/rubrics.blade.php

                 </div>
                 <div class="form-group">
                     <label>Select an Objective</label>
-                    <select id="select-objective" class="form-control selectpicker" onchange="fetchCriteria($('#select-outcome'), $(this))">
+                    <select id="select-objective" class="form-control selectpicker" >
                         
                     </select>
                 </div>
                 </div>
                 <div class="form-group">
                     <label>Select the Type of Rubric</label>
-                <select id="number_of_scales" class="form-control selectpicker" onchange ="fetchCriteria($('#select-outcome'), $('#select-objective'))">
+                <select id="number_of_scales" class="form-control selectpicker" >
                     @for($i = 1; $i <= 20; $i++)
                     @if(8%$i == 0)
                     @if($i==1)
     </div>
 </div>
 <script>
-  
+
     </script>
 @stop
 
     );
 
 }
-// Fetch criteria associated to a specific learning outcome
+// Fetch criteria associated to a specific learning outcome 
+
 function fetchCriteria(outcome, objective)
 {
     amount_of_scales = parseInt($('#number_of_scales').find(':selected').val());
     $(this).siblings('.panel-body').stop().slideToggle();
 });
 
+// Fetch criteria everytime something changes 
+$('#select-objective').on('change', function(){
+    fetchCriteria($('#select-outcome'), $('#select-objective'));
+})
+
+$("#number_of_scales").on('change', function(){
+    fetchCriteria($('#select-outcome'), $('#select-objective'));
+})
+
 
 // When trying to change the template, ask the user to confirm and reset the
 // rubric if s/he does

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

 Log::info("this is the cap_array for ". $activity->name);
 Log::info($activity->cap_array);
 Log::info('aqui papi');?>
-                                        <!-- If activity has a rubric and the rubric has the outcome being evaluated -->
-                                        @if(array_key_exists($outcome->id, (array)$activity->o_att_array))
+
+                                        <!-- If activity is not draft, has a rubric and the rubric has the outcome being evaluated -->
+                                        @if($activity->draft ==0 && array_key_exists($outcome->id, (array)$activity->o_att_array))
                                             <h5>Measure {{ $index4 + 1 }}</h5>
                                             <p>A rubric was used in the {{ $section->code }}-{{ $section->number }} ({{ $section->name }}) course ({{ date('M Y', strtotime($course->updated_at))}}) to assess students’ <u>{{ strtolower($outcome->name) }}</u> in the activity: "<strong>{{ $activity->name }}</strong>". At the time of assessment there were {{ $activity->amount_of_assessed_students() }} students in the section.</p>
                                             <p>The expected performance level was that <strong>{{ $activity->rubric[0]->expected_percentage }}%</strong> of students participating in the activity would score <strong>{{ $activity->rubric[0]->expected_points }} points</strong>  or more in the 1-{{$activity->rubric[0]->max_score}} point scale used.</p>
                                                 None
                                             @endif
 
-                                        @else
+                                        @elseif ($activity->draft == 0)
                                             <h5>Measure {{ $index4 + 1 }}</h5>
                                             <em>Outcome not measured.</em>
-                                        @endif
+                                        @else
+                                        
+                                            @endif
+
                                     @endforeach
                                 @endforeach
                                 </td>

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

                         <th>Student</th>
                         @foreach ($rubric_contents as $index=>$criterion)
                             <th class="criterion-field" data-criterion-id="{{{ $criterion->criterion_id }}}">{{ $criterion->name}}</th>
-                            <input type="hidden" id="weight-{{$index}}" val = "{{$criterion->weight}}">
+                            <input type="hidden" id="weight-{{$index}}" value = "{{$criterion->weight}}">
                         @endforeach
                         <th>Student Percentage</th>
                         <th>Student % per Weight<th>
                         <!-- For each criterion in the rubric, there's a score field -->
                         @for ($i = 0; $i<sizeof($rubric_contents); $i++)
                             <td class="score-field">
-                                @if(array_key_exists($student->id, $scores_array)&& isset($scores_array[$student->id][$i]))
-                                {{ $scores_array[$student->id][$i] }}
+                                @if(array_key_exists($student->id, $scores_array)&& isset($scores_array[$student->id][$rubric_contents[$i]->activity_criterion_id]))
+                                {{ $scores_array[$student->id][$rubric_contents[$i]->activity_criterion_id] }}
                                 @else
                                 N/A
                                 @endif
 </div>
 
 
-<?
+<?php
 
 echo '</body>';
 echo '</html>';
             {
                 sum += val;
                 total+=1;
+              
+
                 per_of_weight += val * parseInt($('#weight-'+index).val()); 
             sum_of_weight += parseInt($('#weight-'+index).val());
             }
         percentage_per_weight ="0.00";
 
         row.find('.percentage').html('<strong>'+percentage+'%</strong>');
-        row.find('.percentage-per-weight').html('<strong>'+percentage+'%</strong>');
+        row.find('.percentage-per-weight').html('<strong>'+percentage_per_weight+'%</strong>');
 
     }
   });

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

                     <!-- For each criterion in the rubric, there's a score field -->
                     @for ($i = 0; $i<sizeof($rubric_criterion); $i++)
                         <td class="score-field text-center">
-                            @if(array_key_exists($student->id, $scores_array) && isset($scores_array[$student->id][$i]))
-                            {{$scores_array[$student->id][$i]}}
+                            @if(array_key_exists($student->id, $scores_array) && isset($scores_array[$student->id][$rubric_criterion[$i]->activity_criterion_id]))
+                            {{$scores_array[$student->id][$rubric_criterion[$i]->activity_criterion_id]}}
                             @else
                             N/A
                             @endif