Merge branch 'Merge_gabriel_mayo' of https://git.ccom.uprrp.edu/CDCC/OLAS into Merge_gabriel_mayo

verificar cambios

app/config/app.php

 
 	//'debug' => $_ENV['APP_DEBUG'] ?: false,
 
-	'debug' => false,
+	'debug' => true,
 	/*
 	|--------------------------------------------------------------------------
 	| Application URL

app/controllers/ActivitiesController.php

             ->select('programs.is_graduate')
             ->first();
         $outcomes = Outcome::active_by_semesters(array($course->semester), $level->is_graduate);
+        //$outcomes = $activity->getOutcomeReport();
 
         $assessment = DB::table('assessments')
             ->join('activity_criterion', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
             ->join('activities', 'activities.id', '=', 'activity_criterion.activity_id')
             ->where('activity_id', $activity->id)
             ->get();
-        if ($assessment) {
-            $outcomes_achieved = $activity->o_ach_array;
-            $outcomes_attempted = $activity->o_att_array;
-        } else {
-            $outcomes_achieved = [];
-            $outcomes_attempted = [];
-        }
+        //if ($assessment) {
+        //    $outcomes_achieved = $activity->o_ach_array;
+        //    $outcomes_attempted = $activity->o_att_array;
+        //} else {
+        //   $outcomes_achieved = [];
+        //   $outcomes_attempted = [];
+        //}
 
-        Log::info($outcomes_achieved);
-        Log::info($outcomes_achieved);
+        //Log::info($outcomes_achieved);
+        //Log::info($outcomes_achieved);
+
+        $outcomes_activity = $activity->getOutcomeReport();
 
 
 
             ->join('transformative_actions', 'transformative_activity_criterion.trans_action_id', '=', 'transformative_actions.id')
             ->where('activity_criterion.activity_id', $id)
             ->get();
-        return View::make('local.professors.activity', compact('activity', 'transformative_actions', 'activity_criterion', 'title', 'outcomes', 'outcomes_achieved', 'outcomes_attempted', 'course', 'student_count', 'active_semesters'));
+        return View::make('local.professors.activity', compact('activity', 'outcomes_activity', 'transformative_actions', 'activity_criterion', 'title', 'outcomes', 'outcomes_achieved', 'outcomes_attempted', 'course', 'student_count', 'active_semesters'));
     }
 
 
             ->addSelect('activity_criterion.activity_id', 'activity_criterion.weight', 'activity_criterion.id as activity_criterion_id')
             ->addSelect('rubric_criterion.rubric_id', 'rubric_criterion.id as rubric_criterion_id')
             ->get();
-$total_weights=0;
+        $total_weights = 0;
         foreach ($rubric_criterion as $index => $singleCR) {
             $singleCR->scales = json_encode(DB::table('scales')
                 ->join('criterion_scale', 'criterion_scale.scale_id', '=', 'scales.id')
                 ->where('criterion_scale.criterion_id', '=', $singleCR->criterion_id)
                 ->orderBy('position')
                 ->lists('description'));
-             $total_weights+=$singleCR->weight;
-       }
+            $total_weights += $singleCR->weight;
+        }
         $rubric_criterion_ids = DB::table('rubric_criterion')->where('rubric_id', '=', $rubric->id)->lists('id');
 
 

app/controllers/AuthController.php

 
 		if (!$validator->fails()) {
 			//			TODO: Remove this for production environment
-// 			if (App::environment('local', 'staging')) {
-// 				return $this->processLogin();
-// 			}
+			if (App::environment('local', 'staging')) {
+				return $this->processLogin();
+			}
 			try {
 				// User input
 				$username = str_replace('@upr.edu', '', Input::get('email'));
 			}
 
 			// Redirect depending on user
-						return Redirect::intended('agreement');
+			return Redirect::intended('agreement');
 			switch (Auth::user()->role) {
 				case 1:
 					return Redirect::intended('administrator');
 
 				case 2:
 					return Redirect::intended('school-coordinator');
-// 					return Redirect::intended('agreement');
+					// 					return Redirect::intended('agreement');
 					break;
 
 				case 3:

app/controllers/CoursesController.php

     {
 
         $course = Course::with('semester')->where('id', $id)->first();
+        Log::info($course->student_report_for_outcome);
         $title = $course->code . $course->number . '-' . $course->section . ' <span class="small attention">(' . $course->semester->code . ')</span>';
 
         // If course does not exist, display 404
             case 1:
 
                 $programs = Program::with('school')->orderBy('name', 'asc')->get();
-                $professors = User::select(array('id', 'first_name', 'surnames'))->orderBy('surnames', 'asc')->orderBy('first_name', 'asc')->get();
+                $professors = User::select(array('users.id', 'first_name', 'surnames'))->orderBy('surnames', 'asc')->orderBy('first_name', 'asc')->get();
                 break;
             case 2:
                 $programs = Program::where("school_id", Auth::user()->school->id);
-                $professors = User::fromSchool(Auth::user()->school->id)->select(array('id', 'first_name', 'surnames'))->orderBy('surnames', 'asc')->orderBy('first_name', 'asc')->get();
+                $professors = User::fromSchool(Auth::user()->school->id)->select(array('users.id', 'first_name', 'surnames'))->orderBy('surnames', 'asc')->orderBy('first_name', 'asc')->get();
                 break;
             case 3:
                 $programs = Auth::user()->programs;
                     ->where('program_user.user_id', Auth::user()->id)
                     ->lists('programs.id');
 
-                $professors = User::fromPrograms($program_ids)->select(array('id', 'first_name', 'surnames'))->orderBy('surnames', 'asc')->orderBy('first_name', 'asc')->get();
+                $professors = User::fromPrograms($program_ids)->select(array('users.id', 'first_name', 'surnames'))->orderBy('surnames', 'asc')->orderBy('first_name', 'asc')->get();
                 break;
         }
         //$users = User::select(array('id', 'first_name', 'surnames'))->orderBy('surnames', 'asc')->orderBy('first_name', 'asc')->get();

app/controllers/Objective2Controller.php

 
 		/** Validation rules */
 		if ($clean_input['text'] == $Objective->text) {
-			$validator = $this->makeValidator($clean_input, false);
+			$validator = $this->makeValidator($clean_input, true);
 		} else
 			$validator = $this->makeValidator($clean_input, false);
 
 				//TODO
 
 				$objectiveId = $Objective->id;
+
+
+				//criteria_assoc, si le dan a 1, parea todos los criterios que esten pareado a este objetivo,
+				// a todos los criterios asociados de su programa
+
+				$criteria_assoc = DB::table('criterion_objective_outcome')
+					->join('program_criterion_objective_outcome as poco', 'poco.cri_obj_out_id', '=', 'criterion_objective_outcome.id')
+					//->join('program_criterion', 'program_criterion.criterion_id', '=', 'criterion_objective_outcome.criterion_id')
+					->whereIn('program_id', $clean_input['program_id'])
+					->where('objective_id', $objectiveId)
+					->groupBy('criterion_objective_outcome.criterion_id')
+					->select('criterion_objective_outcome.criterion_id')
+					->lists('criterion_objective_outcome.criterion_id');
 				//DB::delete("delete from `objective_outcome` where objective_id ={$objectiveId}");
 				DB::delete("delete from objective_program where objective_id = {$objectiveId}");
 
 				foreach ($clean_input['program_id'] as $program_id) {
 					DB::insert("insert into `objective_program`(objective_id, program_id) values ({$objectiveId},{$program_id})");
 				}
-				$criteria_assoc = DB::table('criterion_objective_outcome')
-					->join('program_criterion', 'program_criterion.criterion_id', '=', 'criterion_objective_outcome.criterion_id')
+
+				//borra todos los pareos de este objetivo de programas que no estan vinculados a este objetivo
+
+				$cri_obj_out_ids = DB::table('criterion_objective_outcome as cobo')
+					->where('objective_id', $objectiveId)
+					->lists('cobo.id');
+				DB::table("program_criterion_objective_outcome")
+					->whereIn('cri_obj_out_id', $cri_obj_out_ids)
+					->whereNotIn('program_id', $clean_input['program_id'])
+					->delete();
+
+				//el plan es, convertir todos los pareos de criterios-obj-out asociado a mi programa
+				//a holder primero
+
+				$cri_obj_out = DB::table('criterion_objective_outcome')
+					->join('program_criterion_objective_outcome as poco', 'poco.cri_obj_out_id', '=', 'criterion_objective_outcome.id')
 					->whereIn('program_id', $clean_input['program_id'])
 					->where('objective_id', $objectiveId)
-					->groupBy('program_criterion.criterion_id')
-					->select('program_criterion.criterion_id')
-					->lists('program_criterion.criterion_id');
+					->update(array(
+						'objective_id' => 0
+					));
+
+				//Luego por cada dominio que haya, chequea si existe ya el pareo
+				//si no existe insertalo.
+				//si insertaste, y pair_criteria == 1, parea todos los criterios bajo este programa con 
+				// ese dominio y outcome
+				// Luego por cada criterio que esta pareado a objetivo 0, en ese programa
+				//y en ese dominio, cambiale el objetivo a este. 
 
-				$criterion_array = [];
+
+
+				//los que se crearon nue
 				foreach ($clean_input['outcome_id'] as $outcome_id) {
 					$check_if_already_inserted = DB::table('objective_outcome')
 						->where('objective_id', $objectiveId)
 						->where('outcome_id', $outcome_id)
 						->first();
-
 					if (!isset($check_if_already_inserted)) {
 						DB::insert("insert into `objective_outcome` (objective_id, outcome_id) values ({$objectiveId}, {$outcome_id})");
 						if ($clean_input['pair_criteria'] == '1') {
 							foreach ($criteria_assoc as $criterion_id) {
 
-								DB::table('criterion_objective_outcome')
-									->insert(array(
+								$cob_id = DB::table('criterion_objective_outcome')
+									->insertGetId(array(
 										"criterion_id" => $criterion_id,
 										"objective_id" => $objectiveId,
 										"outcome_id" => $outcome_id
 									));
+								foreach ($clean_input['program_id'] as $program_id)
+									DB::table('program_criterion_objective_outcome')
+										->insert(array(
+											'cri_obj_out_id' => $cob_id,
+											'program_id' => $program_id
+										));
 							}
 						}
 					}
+
+					//aqui estoy diciendo, todos los pareos bajo estos programas que tienen objetivo 0, y este dominio,
+					//unelo a este objetivo. 
+					DB::table('criterion_objective_outcome')
+						->join("program_criterion_objective_outcome", 'program_criterion_objective_outcome.cri_obj_out_id', '=', 'criterion_objective_outcome.id')
+						->whereIn('program_id', $clean_input['program_id'])
+						->where('objective_id', 0)
+						->where('outcome_id', $outcome_id)
+						->update(array(
+							'objective_id' => $objectiveId
+						));
+
+
+
+
+
+
+
+
+
+
+					$criterion_array = [];
 				}
 
 				DB::table('objective_outcome')

app/controllers/ProfessorsController.php

     public function overview()
     {
         $title = 'My Courses';
-        $grouped_courses = Course::with('program')->where('user_id', Auth::user()->id)->whereIn('semester_id', Session::get('semesters_ids'))->groupBy(array('code', 'number', 'semester_id'))->get();
+        $grouped_courses = Course::with('program')
+            ->where('user_id', Auth::user()->id)
+            ->whereIn('semester_id', Session::get('semesters_ids'))
+            ->select("courses.*") //, 'programs.*')
+            ->addSelect(DB::raw("1 as grouped"))
+            ->groupBy(array('code', 'number', 'semester_id'))->get();
         $semesters = Session::get('semesters_ids');
         $semesters = DB::table('semesters')->whereIn('id', $semesters)->orderBy('start', 'ASC')->first();
         Log::info($semesters->start);
             ->orderBy('name', 'ASC')->get();
         $outcomeCount = count($outcomes);
 
-        Log::info($grouped_courses);
-        $grouped_outcomes_achieved_results = array();
-        $grouped_outcomes_attempted_results = array();
-        $grouped_sections = array();
+
+
+
+
 
         foreach ($grouped_courses as $index => $grouped_course) {
             // Blank outcomes for one course
 
         Log::info($program_courses);
 
-
+        /*
         foreach ($program_courses as $course) {
 
 
                     else $outcomes_attempted[$outcome] = $score;
                 }
             }
+        }*/
+
+        foreach ($program_courses as $course) {
+
+            $stu_ach = $course->student_report_for_outcome;
+
+
+            foreach ($stu_ach as $outcome => $outcome_score) {
+                if (array_key_exists($outcome, $outcomes_achieved))
+                    $outcomes_achieved[$outcome] += $outcome_score['calculations']['student_achieved'];
+                else $outcomes_achieved[$outcome] = $outcome_score['calculations']['student_achieved'];
+
+                if (array_key_exists($outcome, $outcomes_attempted))
+                    $outcomes_attempted[$outcome] += $outcome_score['calculations']['student_attempted'];
+                else $outcomes_attempted[$outcome] = $outcome_score['calculations']['student_attempted'];
+            }
         }
 
 
+
+
+
         // Program contact information
         $scoords = User::where('school_id', $program->school_id)
             ->where('role', 2)
 
         return View::make('local.managers.shared.general_studies_overview', compact('title', 'outcomes', 'schools', 'program_packs'));
     }
-}
+}

app/controllers/ProgramCoordinatorsController.php

       }
       */
 
+
     foreach ($programs as $program) {
       //Log::info($program);
       $program_array = array();
       //Log::info($program_array);
 
       $program_array['program_courses'] = $program->courses;
-      //Log::info($program_array);
-      //Log::info('grouped_objectives, 1.variable, 2.array');
 
-      ////Log::info(array($program->objectives()));
-      // $program_array['grouped_objectives'] = $program->objectives();
+
+      $program_array['assessed_courses_count'] = 0;
+      foreach ($program->courses as $course) {
+
+        $student_report = $course->student_report_for_outcome;
+
+        if ($student_report) {
+
+          foreach ($student_report as $outcome_id => $score) {
+            if (array_key_exists($outcome_id, $program_array['outcomes_attempted']))  $program_array['outcomes_attempted'][$outcome_id] += $student_report[$outcome_id]['calculations']['student_attempted'];
+            else $program_array['outcomes_attempted'][$outcome_id] = $student_report[$outcome_id]['calculations']['student_attempted'];
+
+            if (array_key_exists($outcome_id, $program_array['outcomes_achieved']))  $program_array['outcomes_achieved'][$outcome_id] += $student_report[$outcome_id]['calculations']['student_achieved'];
+            else $program_array['outcomes_achieved'][$outcome_id] = $student_report[$outcome_id]['calculations']['student_achieved'];
+          }
+
+
+          $program_array['assessed_courses_count'] += 1;
+        }
+      }
+
+
+      /*foreach ($programs as $program) {
+      //Log::info($program);
+      $program_array = array();
+      $program_object = new \stdClass();
+      $program_object->name = $program->name;
+      $program_object->school = $program->school->name;
+      $program_object->id = $program->id;
+      $program_array['program'] = $program_object;
       //Log::info($program_array);
-      //Log::info("program_courses");
-      //Log::info($program_array['program_courses']);
+
+      $program_array['outcomes_achieved'] = [];
+      $program_array['outcomes_attempted'] = [];
       //Log::info($program_array);
 
+      $program_array['program_courses'] = $program->courses;
+
+
       $program_array['assessed_courses_count'] = 0;
+
+
       foreach ($program_array['program_courses'] as $course) {
+
+        //$student_report = $course->student_report_for_outcome;
         //Log::info($program_array);
 
         $program_array['course_outcomes_achieved'] = $course->outcomes_ach();
         //Log::info("course_outcomes_achieved");
         //Log::info($program_array['course_outcomes_achieved']);
         //Log::info($program_array);
-        if (($program_array['course_outcomes_achieved'])) {
+        if ($program_array['course_outcomes_achieved']) {
+          //(($program_array['course_outcomes_achieved'])) {
           $program_array['course_outcomes_achieved'] = $course->outcomes_ach();
           $program_array['course_outcomes_attempted'] = $course->outcomes_att();
           //Log::info('course_outcomes_achieved');
           //Log::info($program_array['course_outcomes_achieved']);
           //Log::info($program_array);
 
-          foreach ($program_array['course_outcomes_achieved'] as $i => $score) {
-            if (array_key_exists($i, $program_array['outcomes_achieved']))  $program_array['outcomes_achieved'][$i] += $program_array['course_outcomes_achieved'][$i];
-            else $program_array['outcomes_achieved'][$i] = $program_array['course_outcomes_achieved'][$i];
+          foreach ($program_array['course_outcomes_achieved'] as $outcome_id => $score) {
+            if (array_key_exists($outcome_id, $program_array['outcomes_achieved']))  $program_array['outcomes_achieved'][$outcome_id] += $score;
+            else $program_array['outcomes_achieved'][$outcome_id] = $score;
             //Log::info('program["outcomes_achieved"]');
             //Log::info($program_array['outcomes_achieved'][$i]);
             //Log::info($program_array);
 
           $program_array['assessed_courses_count'] += 1;
         }
-      }
+      }*/
+
 
       /**
        * List of grouped courses (grouped sections)
 
     return View::make('local.managers.pCoords.overview', compact('title', 'programs', 'outcomes', 'programs_array', 'programs_contact'));
   }
-}
+}

app/models/Activity.php

       ->distinct()
       ->get();
     $rubric = $this->rubric[0];
+    $outcomes_dict = [];
+    foreach ($outcomes as $outcome) {
+      $outcomes_dict[$outcome->id] = $outcome;
+    }
 
     /*
 
 
 
 
-    foreach ($outcomes as $outcome) {
+    foreach ($outcomes_dict as $outcome) {
       $ac_criteria = DB::table('criterion_objective_outcome as cobo')
         ->join('activity_criterion as ac', 'ac.criterion_id', '=', 'cobo.criterion_id')
         ->where("outcome_id", $outcome->id)
 
 
 
+
+
       /*foreach ($students_attempted as $student) {
         $student_criteria[$student];
       }
           ->get();
       }*/
     }
-    return $outcomes;
+    return $outcomes_dict;
   }
   // o_ach_array
   public function getOAchArrayAttribute($value)

app/models/Course.php

   {
     return $this->getStudentReportForOutcome($this);
   }
-  public static function getStudentReportForOutcome($course_code = null)
+  //user id is for groupped professor sections. so el query es  code, number, semester y user_id
+  public static function getStudentReportForOutcome($course_code = null, $user_id = null)
   {
     if ($course_code) {
       //Log::info('entré');
-      $criteria_id = DB::table('annual_plan_objective')
-        ->where('typ_semester_course_id', $course_code->typ_semester_course_id)
-        ->lists('criteria_id');
-      Log::info($criteria_id);
+
+      //Si entra aqui, significa que son los criterios dentro del annual plan, bajo un dominio en particular. 
+
+
+      if (isset($course_code->typ_semester_course_id)) {
+        $criteria_id = DB::table('annual_plan_objective')
+          ->where('typ_semester_course_id', $course_code->typ_semester_course_id)
+          ->lists('criteria_id');
+      }
+      //si entra aqui, estamos buscando del curso (o grupo de cursos independientes
+
+      else {
+        $criteria_id = DB::table('courses')
+          ->join('activities', 'courses.id', '=', 'activities.course_id')
+          ->join('activity_criterion', 'activities.id', '=', 'activity_criterion.activity_id');
+
+        //if this is 1, significa que son todos los cursos de ese semestre con nombre. 
+        if (isset($course_code->grouped)) {
+          $criteria_id = $criteria_id->where('courses.name', $course_code->name)
+            ->where('courses.code', $course_code->code)
+            ->where('courses.number', $course_code->number)
+            ->where('courses.semester_id', $course_code->semester_id);
+
+          //if user_id is set, this means its goruped courses of said professor.
+          if ($user_id) {
+            $criteria_id = $criteria_id->where('courses.user_id', $user_id);
+          }
+          $criteria_id = $criteria_id
+            ->groupBy('activity_criterion.criterion_id')
+            ->lists('activity_criterion.criterion_id');
+        }
+
+        //si es un solo curso. 
+        else {
+          $criteria_id = $criteria_id->where('courses.id', $course_code->id)
+            ->groupBy('activity_criterion.criterion_id')
+            ->lists('activity_criterion.criterion_id');
+        }
+      }
+      //Log::info($criteria_id);
       $program = Program::where('id', $course_code->program_id)->first();
       // // Log::info($program->code);
       if ($program->code == "") {
       *
       *
       */
-      $table_per_student = DB::table('program_student_semester')
-        ->join('course_student', 'program_student_semester.student_id', '=', 'course_student.student_id')
+
+
+      $table_per_student = DB::table('course_student')
+
+        //->join('program_student_semester', 'program_student_semester.student_id', '=', 'course_student.student_id')
         ->join("students", 'course_student.student_id', '=', 'students.id')
         ->join('courses', 'courses.id', '=', 'course_student.course_id')
         ->join('activities', 'activities.course_id', '=', 'courses.id')
         ->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
 
         ->join('assessments', function ($join) {
-          $join->on("assessments.student_id", '=', 'program_student_semester.student_id')
+          $join->on("assessments.student_id", '=', 'course_student.student_id')
             ->on('assessments.activity_criterion_id', '=', 'activity_criterion.id');
-        })
-        ->where('courses.semester_id', $course_code->semester_id)
-        ->whereIn('courses.program_id', $program_ids)
-        ->where('courses.code', $course_code->code)
-        ->where('courses.number', $course_code->number)
-        ->whereIn('program_student_semester.program_id', $program_ids)
-        ->whereIn('activity_criterion.criterion_id', $criteria_id)
-        ->where('program_student_semester.semester_id', $course_code->semester_id)
+        });
+
+
+      // si typ_semester_course esta prendido, then significa que es de los estudiantes del programa
+      //
+
+      if (isset($course_code->typ_semester_course_id)) {
+        $table_per_student = $table_per_student->join('program_student_semester', 'program_student_semester.student_id', '=', 'course_student.student_id')
+          ->whereIn('program_student_semester.program_id', $program_ids)
+          ->where('program_student_semester.semester_id', $course_code->semester_id);
+      }
+      //si entra aqui, no especifica dominio, y hay que join todos los dominios
+      else {
+        $table_per_student = $table_per_student->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'activity_criterion.criterion_id');
+        //->join('program_criterion_objective_outcome', 'program_criterion_objective_outcome.cri_obj_out_id', '=', 'criterion_objective_outcome.id')
+        //->whereIn('program_criterion_objective_outcome.program_id', $program_ids);
+      }
+      //si estan grouped
+      if (isset($course_code->grouped)) {
+        $table_per_student = $table_per_student->where('courses.semester_id', $course_code->semester_id)
+          ->where('courses.code', $course_code->code)
+          ->where('courses.number', $course_code->number);
+      }
+      //si estan solo
+      else {
+        $table_per_student = $table_per_student->where('courses.id', $course_code->id);
+      }
+      ///// significa que depende
+      /////->where('courses.semester_id', $course_code->semester_id)
+      //->whereIn('courses.program_id', $program_ids)
+      /////->where('courses.code', $course_code->code)
+      /////->where('courses.number', $course_code->number)
+      //->whereIn('program_student_semester.program_id', $program_ids)
+      $table_per_student = $table_per_student->whereIn('activity_criterion.criterion_id', $criteria_id)
+        //->where('program_student_semester.semester_id', $course_code->semester_id)
         ->select('students.number as student_id')
         ->addSelect(DB::raw('count(assessments.activity_criterion_id) as criteria_attempted'))
-        ->addSelect(DB::raw('count(case when assessments.score>=rubrics.expected_points then 1 else NULL end) as criteria_achieved'))
-        ->groupBy('students.id');
+        ->addSelect(DB::raw('count(case when assessments.score>=rubrics.expected_points then 1 else NULL end) as criteria_achieved'));
+
+
+
+      //si entra aqui, significa que va agrupar los estudiantes para un solo dominio. 
+      if (isset($course_code->typ_semester_course_id)) {
+
+        $table_per_student = $table_per_student->groupBy('students.id');
+        $students = $table_per_student->get();
+      } else {
+        $table_per_student = $table_per_student->addSelect('outcome_id')
+          ->groupBy(array('students.id', 'outcome_id'));
+
+        Log::info($table_per_student->toSql());
+        Log::info($criteria_id);
+        Log::info("Amiga ponle a br");
+
+        $query = $table_per_student->get();
+
+
+
+        //Aqui queremos crear un arreglo que sea
+        /*
+          students = {
+            outcome_id: { 
+              'students':{
+              {student x,  crit_atttempted, crit_achieved},
+              {student x2, crit_attempted, crit_achieved},
+              ...
+              }
+              'calculation':{
+                student_achieved, student_attempted
+              }
+
+            }
+            outcome_id2:
+            { 
+              'students':{
+              {student x,  crit_atttempted, crit_achieved},
+              {student x2, crit_attempted, crit_achieved},
+              ...
+              }
+              'calculation':{
+                student_achieved, student_attempted
+              }
+            },
+          }
+          */
+
+        $students = [];
+
+        foreach ($query as $q) {
+
+          if (array_key_exists($q->outcome_id, $students)) {
+            $students[$q->outcome_id]['students'][] = $q;
+          } else {
+            $students[$q->outcome_id]['students'] = [];
+            $students[$q->outcome_id]['students'][] = $q;
+          }
+
+          $criteria_attempted = $q->criteria_attempted;
+          $criteria_achieved = $q->criteria_achieved;
+
+          //PREGUNTA??? ES 66.67??????
+
+          $achieved = 0;
+          if ($criteria_attempted != 0 && $criteria_achieved / $criteria_attempted * 100 >= 66.67) {
+            $achieved = 1;
+          }
+
+
+          if (isset($students[$q->outcome_id]['calculations']) && $criteria_attempted) {
+            $students[$q->outcome_id]['calculations']['student_attempted'] += 1;
+            $students[$q->outcome_id]['calculations']['student_achieved'] += $achieved;
+          } else if ($criteria_attempted) {
+            $students[$q->outcome_id]['calculations']['student_attempted'] = 1;
+            $students[$q->outcome_id]['calculations']['student_achieved'] = $achieved;
+          }
+        }
+      }
+
 
 
 
 
 
       //Log::info($criteria_id);
-      Log::info('los courseCode');
+      // Log::info('los courseCode');
       // Log::info(array($course_code));
-      Log::info('los programas');
-      Log::info($program_ids);
+      //Log::info('los programas');
+      //Log::info($program_ids);
+      //Log::info("crit");
+      //Log::info($criteria_id);
+
+      //Log::info($table_per_student->toSql());
+
+      //Log::info($students);
 
-      Log::info($table_per_student->toSql());
-      $students = $table_per_student->get();
 
 
       return $students;
       $students_attempted = Criterion::students_attempted($criterion->id, $criterion->activity_id);
       $students_achieved = Criterion::students_achieved($criterion->id, $criterion->activity_id);
 
-      Log::info('estamos aqui');
+      //Log::info('estamos aqui');
       Log::info($students_attempted);
 
       if ($students_attempted) {

app/models/Objective.php

                 ->select('transformative_actions.*')
                 ->get();
             $course_code->future_typ_course_id = Course::getFutureTypSemesterCourses($course_code->typ_semester_course_id, $course_code->program_id);
-
+            $course_code->grouped = 1;
 
             $course_code->students = Course::getStudentReportForOutcome($course_code);
             //Log::info(array($course_code));

app/models/Outcome.php

 		$whole_dict = [];
 		foreach ($this->annual_objectives as $objective) {
 			foreach ($objective->grouped_annual_course as $course_code) {
-				Log::info("Existen los cursos");
-				Log::info(json_encode($course_code));
+
+				$course_code->grouped = 1;
 				foreach ($course_code->student_report_for_outcome as $student) {
 
 					//If is not defined, define

app/views/global/view-objectives-criteria.blade.php

                         select.find('div.remove-btn').hide()
                         prog_div.append(select);
                         $('select.criteria_select').selectpicker('refresh');
-                        if(selected_options){
+                        if(selected_options.length>0){
                             $.each(selected_options, function(ind, cri){
 
                                 the_picker = select.find('select.criteria_select').first();

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

             xAxis: {
                 categories: [
                     @foreach($outcomes as $outcome)
-                        "{{{ $outcome->name }}}",
-                    @endforeach
+                        @if(is_array($program_item['outcomes_attempted'])
+                        && array_key_exists($outcome->id, $program_item['outcomes_attempted'])
+                        && array_key_exists($outcome->id, $program_item['outcomes_achieved'])
+                        && $program_item['outcomes_attempted'][$outcome->id]!=0)
+
+                        "{{{ $outcome->name }}}<br> (N = {{$program_item['outcomes_attempted'][$outcome->id]}}, {{$program_item['outcomes_achieved'][$outcome->id]}})",
+                    @else
+                        "{{$outcome->name}}<br> (N = 0, 0)",
+
+                        @endif
+                    
+                        @endforeach
                 ],
                 labels: {
                     style: {
                 min: 0,
                 max: 100,
                 title: {
-                    text: 'Percentage'
-                }
+                text: 'Percentage'
+                }, 
+                
+                        plotLines:[{
+                    value:66.67,
+                    color: '#000',
+                    width:3,
+                    zIndex:4,
+                    label:{
+                        text: 'Goal (66.67%)',
+                        style: {
+                            color: '#000',
+                            fontSize: '14px',
+                        }
+            
+                    }
+                }]
             },
             tooltip: {
                 headerFormat: '<span style="font-size:10px">{point.key}</span><table>',
                 groupPadding: 0.075
                 },
             },
-            series: [{
+            series: [{{--{
                 name: 'Expected Value',
                 color: '#555555',
                 dataLabels: {
                     },
                     y:-1
                 }, 
-                <?php
-                Log::info('program_item');
-                Log::info($program_item);
 
-                ?>
+            
                 data: [
                     @foreach($outcomes as $index => $outcome)
                         @if(
                     @endforeach
                 ]
 
-            },{
+            },--}}{
                 name: 'Obtained Value',
                 color: '#e70033',
                 dataLabels: {

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

                     // Select associated outcome
                     $(".removable-outcome").remove();
                     $('.warning-objective').remove();
+                    $("#assoc_outcome0").attr('data-old-outcome-id',json.outcome[0].outcome_id);
                     $('#assoc_outcome0').val(json.outcome[0].outcome_id);
 
                     disabled = 0;
-                    if (json.outcome[0].typ_semester_outcome_id != null || json.outcome[0].count_criterion_id != 0) {
+
+                    //se va a disable cuando pertenece a un plan. 
+                    if (json.outcome[0].typ_semester_outcome_id != null){ //|| json.outcome[0].count_criterion_id != 0) {
                         $('#assoc_outcome0').attr('disabled', true);
                         disabled = 1;
                     } else $('#assoc_outcome0').attr('disabled', false);
                             'name': "assoc_outcome[]",
                             'data-live-search': 'true',
                             'id': 'assoc_outcome' + i.toString(),
+                            'data-old-outcome-id': json.outcome[i].outcome_id
 
 
                         });
 
                         $div.appendTo('#assocOutcomeGroup')
                         $select.append(selectOptions);
-                        if (json.outcome[i].typ_semester_outcome_id != null || json.outcome[i].count_criterion_id !=
-                            0) {
+                        if (json.outcome[i].typ_semester_outcome_id != null //|| json.outcome[i].count_criterion_id != 0
+                            ) {
                             $select.attr('disabled', true);
                             $button.attr('disabled', true);
                             disabled = 1;
                         }).html('<span aria-hidden="true">×</span>');
                         alert.append(button);
                         alert.append(
-                            '<strong>If you wish to edit the disabled Learning Outcomes you need to detach the Objective from every Criteria paired to it and this Objectvie cannot be in any annual plan with that Learning Outcome</strong>'
+                            '<strong>If you wish to edit the disabled Learning Outcomes, you need to detach this Objective from the desired Learning Outcome in every Three Year Plan.</strong>'
                         )
 
                         alert.appendTo($('#message_to_disconnect'))
             e.preventDefault();
             newOutcomes = [];
             $('#assocOutcomeGroup').find('select').each(function() {
-                if ($(this).data('new-outcome') == true) {
+                if ($(this).data('new-outcome') == true || $(this).data('old-outcome-id') != $(this).val()) {
                     option = $(this).find(':selected');
                     newOutcomes.push(option[0].text);
                 }
         })
         //Terrible notation but
 
+
         pair_every_criteria_with_objective = 0;
         $('#update_button').on('click', function(e) {
             e.preventDefault();

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

     {
             $('#js-error-row').hide();
     }
+
+    /*
     program_id = $('#select-program').find(':selected').data('program-id')
     if(program_id == 0){
         $('#modal-title-rubric').html("All criteria will be associated with this school's programs");
         });
     }
     
-    $('#rubric-modal').modal('toggle');
+    $('#rubric-modal').modal('toggle');*/
     $('#saveButton').data('button-id',$(this).attr('id'));
 
 
+    saveTemplate()
+
+
 });
 
 // When the confirm  delete button is clicked

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

             {{ Auth::user()->role }}==1
             || ({{ Auth::user()->role }}==2 && selected.data('admin')!=1)
             || ({{ Auth::user()->role }}==3
-                && programs.includes(selected.data('template-program-id').toString())
+                && programs.includes(selected.data('template-program-id'))
 
                 && selected.data('admin')!=1
             )
     {
             $('#js-error-row').hide();
     }
+    /*
     program_id = $('#select-program').find(':selected').data('program-id')
     if(program_id == 0){
         $('#modal-title-rubric').html("All criteria will be associated with this school's programs");
         });
     }
     
-    $('#rubric-modal').modal('toggle');
+    $('#rubric-modal').modal('toggle');*/
     $('#saveButton').data('button-id',$(this).attr('id'));
 
 
+    saveTemplate();
 });
 
 // When the confirm  delete button is clicked

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

     text: 'Performance by Learning Outcome Criteria in {{ $title }}'
     },
     xAxis: {
-    categories: [
+    categories: [ 
     @foreach ($outcomes as $outcome)
-        @if(is_array($outcomes_attempted) &&
-        array_key_exists($outcome->id, $outcomes_attempted) &&
-        $outcomes_attempted[$outcome->id] != 0)
+        @if( array_key_exists($outcome->id, $outcomes_activity) &&
+        $outcomes_activity[$outcome->id]  //&&
+        //array_key_exists($outcome->id, $outcomes_attempted) &&
+        //$outcomes_attempted[$outcome->id] != 0
+        )
+        
             <?php
-            $attempted = $outcomes_attempted[$outcome->id];
-            $achieved = $outcomes_achieved[$outcome->id];
+            $attempted = $outcomes_activity[$outcome->id]->attempted;
+            $achieved = $outcomes_activity[$outcome->id]->achieved;
             ?>
 
         @else
     },
     data:[
     @foreach ($outcomes as $index => $outcome)
-        @if (is_array($outcomes_attempted) && array_key_exists($outcome->id, $outcomes_attempted) && $outcomes_attempted[$outcome->id] != 0)
-            {{ ($outcomes_achieved[$outcome->id] / $outcomes_attempted[$outcome->id]) * 100 }},
+        @if( array_key_exists($outcome->id, $outcomes_activity) &&
+        $outcomes_activity[$outcome->id])
+            {{$outcomes_activity[$outcome->id]->achieved / $outcomes_activity[$outcome->id]->attempted * 100}}
+            {{-- ($outcomes_achieved[$outcome->id] / $outcomes_attempted[$outcome->id]) * 100 --}},
+        {{--@if (is_array($outcomes_attempted) && array_key_exists($outcome->id, $outcomes_attempted) && $outcomes_attempted[$outcome->id] != 0) --}}
+        {{--    {{ ($outcomes_achieved[$outcome->id] / $outcomes_attempted[$outcome->id]) * 100 }}, --}}
         @else
             0,
         @endif

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

 @stop
 
 @section('javascript')
+
+<?php
+$student_ach = $course->student_report_for_outcome;
+?>
 $(function () {
     $('#graph').highcharts({
         chart: {
                 @foreach($outcomes as $outcome)
 
                 @if(
-                        is_array($outcomes_attempted)
-                        && array_key_exists($outcome->id, $outcomes_attempted)
-                        && $outcomes_attempted[$outcome->id]!=0)
+                        is_array($student_ach)
+                        && array_key_exists($outcome->id, $student_ach)
+                        && $student_ach[$outcome->id]['calculations']['student_attempted']!=0)
                     <?php
-                        $attempted = $outcomes_attempted[$outcome->id];
+                        $attempted = $student_ach[$outcome->id]['calculations']['student_attempted'];
                         
-                        if( isset($outcomes_achieved[$outcome->id]))
-                            $achieved =$outcomes_achieved[$outcome->id];
+                        if( isset($student_ach[$outcome->id]['calculations']['student_achieved']))
+                            $achieved =$student_ach[$outcome->id]['calculations']['student_achieved'];
 
                         else $achieved = 0;
                     ?>
             data:[
                 @foreach($outcomes as $index => $outcome)
                     @if(
-                        is_array($outcomes_attempted)
-                        && array_key_exists($outcome->id, $outcomes_attempted)
-                        && array_key_exists($outcome->id, $outcomes_achieved)
-                        && $outcomes_attempted[$outcome->id]!=0)
-                        {{{ ($outcomes_achieved[$outcome->id]/$outcomes_attempted[$outcome->id])*100 }}},
+                        is_array($student_ach)
+                        && array_key_exists($outcome->id, $student_ach)
+                        && $student_ach[$outcome->id]['calculations']['student_attempted']!=0
+                        && $student_ach[$outcome->id]['calculations']['student_achieved'])
+
+
+                        {{{ ($student_ach[$outcome->id]['calculations']['student_achieved']/$student_ach[$outcome->id]['calculations']['student_attempted'])*100 }}},
                     @else
                         0,
                     @endif

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

 function loadGraphs() {
 
     @foreach($grouped_courses as $index=>$grouped_course)
+
+        <?php
+
+            $student_in_course = $grouped_course->getStudentReportForOutcome($grouped_course, Auth::user()->id);
+            Log::info($student_in_course);
+        ?>
         // Load grad charts after clicking tab, so they are sized correctly.  
         $('#graph-{{ $index }}').highcharts({
             chart: {
                     	@if($outcome->level==3 || ($grouped_course->program->is_graduate==0 && $outcome->level==1))
 
                             @if(
-                                is_array($grouped_outcomes_attempted_results[$index])
-                                && array_key_exists($outcome->id, $grouped_outcomes_attempted_results[$index])
-                                && $grouped_outcomes_attempted_results[$index][$outcome->id]!=0)
+                                is_array($student_in_course)
+                                && array_key_exists($outcome->id, $student_in_course)
+                                && $student_in_course[$outcome->id]['calculations']['student_attempted']!=0)
                                 <?php
-                                    $attempted = $grouped_outcomes_attempted_results[$index][$outcome->id];
+                                    $attempted = $student_in_course[$outcome->id]['calculations']['student_attempted'];
                                     
-                                    if( isset($grouped_outcomes_achieved_results[$index][$outcome->id]))
-                                        $achieved =$grouped_outcomes_achieved_results[$index][$outcome->id];
+                                    if( isset($student_in_course[$outcome->id]['calculations']['student_achieved']))
+                                        $achieved =$student_in_course[$outcome->id]['calculations']['student_achieved'];
 
                                     else $achieved = 0;
                                 ?>
                     ?>
 					@if($outcome->level==3 || ($grouped_course->program->is_graduate==0 && $outcome->level==1))
                         @if(
-                            is_array($grouped_outcomes_attempted_results[$index])
-                            && array_key_exists($outcome->id, $grouped_outcomes_attempted_results[$index])
-                            && $grouped_outcomes_attempted_results[$index][$outcome->id]!=0)
-                            {{{ ($grouped_outcomes_achieved_results[$index][$outcome->id]/$grouped_outcomes_attempted_results[$index][$outcome->id])*100 }}},
+                                is_array($student_in_course)
+                                && array_key_exists($outcome->id, $student_in_course)
+                                && $student_in_course[$outcome->id]['calculations']['student_attempted']!=0)
+                               
+                            {{{ ($student_in_course[$outcome->id]['calculations']['student_achieved']/$student_in_course[$outcome->id]['calculations']['student_attempted'])*100 }}},
                         @else
                             0,
                         @endif