cambios con administrador

.gitignore

 app/config/local/*
 app/config/app.php
 app/config/database.php
+node_modules/
+app/config/

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'));

app/controllers/OutcomesController.php

             $level = $level->levels;
 
             // buscar todos los criterios con el level y ponerlos en un array
+//             $outcome_criterias = DB::table('criterion_objective_outcome')
+//                 ->join('new_criteria', 'new_criteria.id', '=', 'criterion_objective_outcome.criterion_id')
+//                 ->join('objectives', 'objectives.id', '=', 'criterion_objective_outcome.objective_id')
+//                 ->where('criterion_objective_outcome.outcome_id', $id)
+//                 ->where('new_criteria.number_of_scales', $level)
+//                 ->whereNull('new_criteria.deleted_at')
+//                 ->select('new_criteria.id', 'new_criteria.name')
+//                 ->orderBy('new_criteria.name', 'asc')
+//                 ->get();
             $outcome_criterias = DB::table('criterion_objective_outcome')
-                ->join('new_criteria', 'new_criteria.id', '=', 'criterion_objective_outcome.criterion_id')
+                ->join('criteria', 'criteria.id', '=', 'criterion_objective_outcome.criterion_id')
                 ->join('objectives', 'objectives.id', '=', 'criterion_objective_outcome.objective_id')
                 ->where('criterion_objective_outcome.outcome_id', $id)
-                ->where('new_criteria.number_of_scales', $level)
-                ->whereNull('new_criteria.deleted_at')
-                ->select('new_criteria.id', 'new_criteria.name')
-                ->orderBy('new_criteria.name', 'asc')
+                ->where('criteria.number_of_scales', $level)
+                ->whereNull('criteria.deleted_at')
+                ->select('criteria.id', 'criteria.name')
+                ->orderBy('criteria.name', 'asc')
                 ->get();
             $outcome_criterias = $outcome_criterias;
 

app/models/Criterion.php

     use SoftDeletingTrait;
     protected $dates = ['deleted_at'];
 
-    protected $table = 'new_criteria';
+//     protected $table = 'new_criteria';
+    protected $table = 'criteria';
 
     public function outcomes()
     {
 
     public function rubrics()
     {
-        return $this->belongsToMany('Rubric', 'new_criterion_rubric');
+//         return $this->belongsToMany('Rubric', 'new_criterion_rubric');
+        return $this->belongsToMany('Rubric', 'criterion_rubric');
     }
 
 	/**
 		foreach($activities_criterions as $activity_criterion)
 		{
 		
-			 $students_attempted+=DB::table('new_assessments')
-				->join('activity_criterion', 'new_assessments.activity_criterion_id', '=', 'activity_criterion.id')
+// 			 $students_attempted+=DB::table('new_assessments')
+// 				->join('activity_criterion', 'new_assessments.activity_criterion_id', '=', 'activity_criterion.id')
+// 				->where('activity_criterion.id',$activity_criterion->id)
+// 				->count();
+		
+			 $students_attempted+=DB::table('assessments')
+				->join('activity_criterion', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
 				->where('activity_criterion.id',$activity_criterion->id)
 				->count();
 		}
 	public static function students_achieved($criterion_id,$activity_id)	
 	{
 		$students_achieved=0;
+// 		$activities_criterions=DB::table('activity_criterion')
+// 			->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+// 			->join('courses', 'activities.course_id', '=', 'courses.id')
+// 			->where('activities.id','=',$activity_id)
+// 			->where('activity_criterion.criterion_id','=',$criterion_id)
+// 			->select('activity_criterion.id','expected_student_score')
+// 			->distinct()
+// 			->get();
+
 		$activities_criterions=DB::table('activity_criterion')
 			->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
 			->join('courses', 'activities.course_id', '=', 'courses.id')
+			->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
+			->join('rubrics', 'rubric_activity.rubric_id', '=', 'rubrics.id')
 			->where('activities.id','=',$activity_id)
 			->where('activity_criterion.criterion_id','=',$criterion_id)
-			->select('activity_criterion.id','expected_student_score')
+			->select('activity_criterion.id','expected_points')
 			->distinct()
 			->get();
 			
 		{
 		
 // 			$expected_student_score=DB::table('new_criteria')->where('id',$criterion_id)->select('expected_student_score')->get();
-			 $students_achieved+=DB::table('new_assessments')
-				->join('activity_criterion', 'new_assessments.activity_criterion_id', '=', 'activity_criterion.id')
+// 			 $students_achieved+=DB::table('new_assessments')
+// 				->join('activity_criterion', 'new_assessments.activity_criterion_id', '=', 'activity_criterion.id')
+// 				->where('activity_criterion.id',$activity_criterion->id)
+// 				->where('new_assessments.score','>=',$activity_criterion->expected_student_score)
+// 				->count();
+
+			 $students_achieved+=DB::table('assessments')
+				->join('activity_criterion', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
 				->where('activity_criterion.id',$activity_criterion->id)
-				->where('new_assessments.score','>=',$activity_criterion->expected_student_score)
+				->where('assessments.score','>=',$activity_criterion->expected_points)
 				->count();
 		}
 		return $students_achieved;

app/models/Outcome.php

 // 		}
 // 		return $conteo;
 // 	}
-	public function active_by_semesters($selected_semesters, $level)
+	public static function active_by_semesters($selected_semesters, $level)
 	{
 		$min_start="9000-01-01 00:00:00";
 		$max_end="1000-01-01 00:00:00";
 		{
 			$semesters_array[]=$semester->id;
 		}
+// 		 $programs=DB::table('programs')
+// 	    	->join('courses', 'programs.id', '=', 'courses.program_id')
+// 	    	->join('activities', 'activities.course_id', '=', 'courses.id')
+// 	    	->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
+// 	    	->join('new_criteria', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
+// 	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
+// 	    	->where('criterion_objective_outcome.outcome_id','=',$this->id)
+// 	    	->whereIn('courses.semester_id',$semesters_array)
+// 	    	->distinct()
+// 	    	->select('programs.id')
+// 	    	->get()
+// 			;
 		 $programs=DB::table('programs')
 	    	->join('courses', 'programs.id', '=', 'courses.program_id')
 	    	->join('activities', 'activities.course_id', '=', 'courses.id')
 	    	->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
-	    	->join('new_criteria', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
-	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
+	    	->join('criteria', 'activity_criterion.criterion_id', '=', 'criteria.id')
+	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
 	    	->where('criterion_objective_outcome.outcome_id','=',$this->id)
 	    	->whereIn('courses.semester_id',$semesters_array)
 	    	->distinct()
 		{
 			$semesters_array[]=$semester->id;
 		}
-		 $criteria=DB::table('new_criteria')
-	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
+// 		 $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','=',$this->id)
+// 	    	->where('programs.is_graduate','=',$is_grad)
+// 	    	->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', '=', 'new_criteria.id')
+	    	->join('rubric_activity', 'activities.id', '=', 'rubric_activity.activity_id')
+	    	->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
+	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
 	    	->where('criterion_objective_outcome.outcome_id','=',$this->id)
 	    	->where('programs.is_graduate','=',$is_grad)
 	    	->whereIn('courses.semester_id',$semesters_array)
-	    	->select('new_criteria.id','expected_percentage_students_achieving','activity_criterion.activity_id')
+	    	->select('criteria.id','expected_percentage','activity_criterion.activity_id')
 	    	->distinct()
 	    	->get()
 			;
 // 		exit();
 			$courses_array[]=$course->id;
 		}
-		 $criteria=DB::table('new_criteria')
-	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
+// 		 $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','=',$this->id)
+// 	    	->whereIn('courses.id',$courses_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', '=', 'new_criteria.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','=',$this->id)
 	    	->whereIn('courses.id',$courses_array)
-	    	->select('new_criteria.id','expected_percentage_students_achieving','activity_criterion.activity_id')
+	    	->select('criteria.id','expected_percentage','activity_criterion.activity_id')
 	    	->distinct()
 	    	->get()
 			;
 			$courses_array[]=$course->id;
 		}
 
-		 $criteria=DB::table('new_criteria')
-	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
+// 		 $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','=',$this->id)
+// 	    	->whereIn('courses.id',$courses_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', '=', 'new_criteria.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','=',$this->id)
 	    	->whereIn('courses.id',$courses_array)
-	    	->select('new_criteria.id','expected_percentage_students_achieving','activity_criterion.activity_id')
+	    	->select('criteria.id','expected_percentage','activity_criterion.activity_id')
 	    	->distinct()
 	    	->get()
 			;
 		}
 
 //   DB::enableQueryLog();
-		 $criteria=DB::table('new_criteria')
-	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
+// 		 $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','=',$this->id)
+// 	    	->where('programs.is_graduate','=',$is_grad)
+// 	    	->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', '=', 'new_criteria.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','=',$this->id)
 	    	->where('programs.is_graduate','=',$is_grad)
 	    	->whereIn('courses.semester_id',$semesters_array)
-	    	->select('new_criteria.id','expected_percentage_students_achieving','activity_criterion.activity_id')
+	    	->select('criteria.id','expected_percentage','activity_criterion.activity_id')
 	    	->distinct()
 	    	->get()
 			;
 			{
 				$percentage_students_who_achieved=0;
 			}
-			if($percentage_students_who_achieved>=$criterion->expected_percentage_students_achieving)
+			if($percentage_students_who_achieved>=$criterion->expected_percentage)
 			{
 				$conteo++;
 			}

app/models/Program.php

 		
 //   DB::enableQueryLog();
 // 		dd(DB::getQueryLog());
-		 $criteria=DB::table('new_criteria')
-	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
+// 		 $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', '=', 'new_criteria.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('new_criteria.id','expected_percentage_students_achieving','activity_criterion.activity_id')
+	    	->select('criteria.id','expected_percentage','activity_criterion.activity_id')
 	    	->distinct()
 	    	->get()
 			;
+
 // 		dd(DB::getQueryLog());
 		 
 		$conteo=0;
 				{
 					$percentage_students_who_achieved=0;
 				}
-				if($percentage_students_who_achieved>=$criterion->expected_percentage_students_achieving)
+				if($percentage_students_who_achieved>=$criterion->expected_percentage)
 				{
 					$conteo++;
 				}
 		
 //   DB::enableQueryLog();
 // 		dd(DB::getQueryLog());
-		 $criteria=DB::table('new_criteria')
-	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
+// 		 $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', '=', 'new_criteria.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('new_criteria.id','expected_percentage_students_achieving','activity_criterion.activity_id')
+	    	->select('criteria.id','expected_percentage','activity_criterion.activity_id')
 	    	->distinct()
 	    	->get()
 			;
+
 // 		dd(DB::getQueryLog());
 		 
 		$conteo=0;
 				{
 					$percentage_students_who_achieved=0;
 				}
-				if($percentage_students_who_achieved>=$criterion->expected_percentage_students_achieving)
+				if($percentage_students_who_achieved>=$criterion->expected_percentage)
 				{
 					$conteo++;
 				}