varios bugs resueltos

app/controllers/ActivitiesController.php

             $active_semesters[] = $active_semester->id;
         }
 
-        Log::info($active_semesters);
+//         Log::info($active_semesters);
         // Added the function htmlspecialchars to activity name string because it was corrupting Jquery code while using quotes on page rendering. - Carlos R Caraballo 1/18/2019
         $title = $course->code . $course->number . '-' . $course->section . ': ' . htmlspecialchars($activity->name, ENT_QUOTES) . ' <span class="small attention">(' . $course->semester->code . ')</span>';
 
             ->join('activity_criterion', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
             ->join('activities', 'activities.id', '=', 'activity_criterion.activity_id')
             ->where('activity_id', $activity->id)
+            ->whereNotNull('score')
             ->get();
         //if ($assessment) {
         //    $outcomes_achieved = $activity->o_ach_array;
             ->join('transformative_actions', 'transformative_activity_criterion.trans_action_id', '=', 'transformative_actions.id')
             ->where('activity_criterion.activity_id', $id)
             ->get();
+  
+          Log::info(json_encode($activity->cap_array));
+
         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'));
     }
 

app/controllers/AnnualPlansController.php

     $outcome = Outcome::where('id', $outcome_id)
       ->addSelect('outcomes.*', DB::raw("'{$typ_semester_outcome_id}' as typ_semester_outcome_id"), DB::raw("'{$semester_id}' as `semester_id`"), DB::raw("'{$program_id}' as `program_id`"))
       ->first();
-    $outcome->objectives = $outcome->fetchObjectivesReport($semester_id, $program_id);
+//     Log::info("Comments");    
+ Log::info('En AnnualPlansController antes'.json_encode($outcome->objectives));		//exit();
+ 	unset($outcome->objectives);
+    $outcome->objectives2 = $outcome->fetchObjectivesReport($semester_id, $program_id);
+    Log::info("En AnnualPlansController".$semester_id." ". $program_id); //exit();    
+ Log::info('En AnnualPlansController'.json_encode($outcome->objectives2));		//exit();
+    foreach ($outcome->objectives2 as $index => $objective) {
+      //       Log::info("Ella son besties");
+      //       Log::info(array($objective));
+      $objective->courses = Objective::getPlanReport($objective);
+//       $outcome->objectives[$index]->courses = Objective::getPlanReport($objective);
+    }
+   
     $outcome->outcome_program_goal = DB::table('target_outcomes_program')
       ->where('program_id', $program_id)
       ->where('semester_id', $semester_id)
     //  ->toSql());
     //Log::info($outcome->comments);
     $outcome->transformative_actions_categories_html = TransformativeAction::getCategoriesHtml($program_id);
-
-
-
-
-    foreach ($outcome->objectives as $index => $objective) {
-      //       Log::info("Ella son besties");
-      //       Log::info(array($objective));
-      $objective->courses = Objective::getPlanReport($objective);
-    }
+// 	Log::info("Ella son besties".json_encode($outcome->objectives));
+// exit();
 
     return $outcome;
   }

app/controllers/OutcomesController.php

 
 
         $annual_plans = DB::select("
-    
         select 
           academic_year, 
           semester_start, 
         from annual_plans 
         join annual_cycle on annual_cycle_id = annual_cycle.id 
         where program_id = {$program_id} 
-        
-        
           order by semester_start desc");
         $program = DB::table('programs')
             ->where('id', $program_id)

app/controllers/ThreeYearPlanController.php

   {
 
     $path = DB::table('paths_for_three_year_plans')->where('id', $path_id)->first();
+    Log::info($path->path_to_pdf);
 
-    if (isset($path)) {
+    if (isset($path) and file_exists($path->path_to_pdf)) {
 
       $path = trim($path->path_to_pdf, app_path() . "/views/three_year_plan_htmls/");
+//     Log::info($path);
       $path = trim($path, ".blade.php");
-      return View::make("three_year_plan_htmls." . $path);
+//     Log::info($path);
+//       if (file_exists("three_year_plan_htmls." .$path)) 
+      {
+	      return View::make("three_year_plan_htmls." . $path);
+      }
     }
     Session::flash('status', 'warning');
     Session::flash('message', 'Error loading typ. Please try again later.');

app/database/seeds/CourseStudentTableSeeder.php

         $time_start = microtime(true);
 
         // Open file
-        if($file = fopen('app/database/csv/estusLabC21.txt', 'r'))
+        if($file = fopen('app/database/csv/estusEspaIngl.txt', 'r'))
         {
             // Initialize count variables
             $read = 0;
             }
 
             // Delete all inactive users for current term
-            DB::table('course_student')
-                ->where('updated_at', '<', date('Y-m-d'))
-                ->where('semester_id', $semester_id)
-                ->delete();
+//             DB::table('course_student')
+//                 ->where('updated_at', '<', date('Y-m-d'))
+//                 ->where('semester_id', $semester_id)
+//                 ->delete();
 
             // Stop time
             $time_end = microtime(true);

app/models/Activity.php

     return  DB::table('students')
     	-> join('assessments','assessments.student_id','=','students.id')    
     	-> join('activity_criterion','assessments.activity_criterion_id','=','activity_criterion.id')
-      ->where('activity_criterion.activity_id', '=', $this->id)
-      ->select('students.*')
-      ->distinct()
-      ->get();;
+ 		->whereNotNull('score')
+     	->where('activity_criterion.activity_id', '=', $this->id)
+      	->select('students.*')
+      	->distinct()
+      	->get();;
   }
   
   public function student_scores($student_id)
 //       ->orderBy('criterion_id')
 //       ->get();
     $activity_id=$this->id;
-    $assessments=DB::select(DB::raw("select id,  COALESCE(score,0) score from 
-    	(select activity_criterion_id, score from`assessments` where student_id= $student_id) a right OUTER join 
+//     $assessments=DB::select(DB::raw("select id,  COALESCE(score,0) score from 
+    $assessments=DB::select(DB::raw("select id,  score from 
+    	(select activity_criterion_id, score from`assessments` where score is not null and student_id= $student_id) a right OUTER join 
     	(select id from `activity_criterion` where `activity_criterion`.`activity_id` = $activity_id) b on a.activity_criterion_id = b.id"));
   
     
 //       ->get();
       //rubrics->expected_points
     $activity_id=$this->id;
- $percentage=DB::select(DB::raw("select COALESCE(ROUND(100*sum(score*weight)/sum(max_score*weight),2),0) percentage from (select activity_criterion_id, score from`assessments` where
-  student_id= $student_id) a right OUTER join 
+//  $percentage=DB::select(DB::raw("select COALESCE(ROUND(100*sum(score*weight)/sum(max_score*weight),2),0) percentage from (select activity_criterion_id, score from`assessments` where
+ $percentage=DB::select(DB::raw("select (ROUND(100*sum(score*weight)/sum(max_score*weight),2)) percentage from (select activity_criterion_id, score from`assessments` where
+  score is not null  and student_id= $student_id) a right OUTER join 
   (select id, weight, activity_id from `activity_criterion` where `activity_criterion`.`activity_id` = $activity_id) b on a.activity_criterion_id = b.id join 
   rubric_activity on rubric_activity.activity_id=b.activity_id join rubrics on rubrics.id=rubric_activity.rubric_id"));
     
   {
 
     $activity_criterion = DB::table('activity_criterion')->where('activity_id', '=', $this->id)->lists('id');
-    $amount_of_students = DB::table('assessments')->whereIn('activity_criterion_id', $activity_criterion)->lists('student_id');
+    $amount_of_students = DB::table('assessments')->whereNotNull('score')->whereIn('activity_criterion_id', $activity_criterion)->lists('student_id');
 
     return count($amount_of_students);
   }
 
 
       $assessments_passed = count(DB::table('assessments')
+        ->whereNotNull('score')
         ->where('score', '>=', $this->rubric[0]->expected_points)
         ->where('activity_criterion_id', '=', $single_ac->id)
         ->lists('student_id'));
       $assessments_attempted = count(DB::table('assessments')
+        ->whereNotNull('score')
         ->where('activity_criterion_id', '=', $single_ac->id)
         ->lists('student_id'));
 
       ->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)
+      ->whereNotNull('score')
       ->select(
         array(
           'activity_criterion.id as id',
         ->where('criterion_id', '=', $single_crit->criterion_id)
         ->lists('outcome_id'));
       $amount_of_students = count(DB::table('assessments')
-        ->where("activity_criterion_id", '=', $single_crit->id)
+        ->whereNotNull('score')
+	    ->where("activity_criterion_id", '=', $single_crit->id)
         ->lists('student_id'));
 
 
       $student_pass = DB::table('assessments')
         ->where("activity_criterion_id", '=', $single_crit->id)
         ->where('score', '>=', $this->rubric[0]->expected_points)
+        ->whereNotNull('score')
         ->lists('student_id');
       $amount_of_students_passed = count(DB::table('assessments')
         ->where("activity_criterion_id", '=', $single_crit->id)
+        ->whereNotNull('score')
         ->where('score', '>=', $this->rubric[0]->expected_points)
         ->lists('student_id'));
 
       $students_attempted = DB::table('assessments as a')
         ->whereIn('a.activity_criterion_id', $ac_criteria)
         ->groupBy('a.student_id')
+        ->whereNotNull('score')
         ->select(
           'a.student_id',
           DB::raw('count(`a`.`activity_criterion_id`) attempted'),
       ->lists('id');
 
     $assessments = DB::table('assessments')
+      ->whereNotNull('score')
       ->whereIn('activity_criterion_id', $all_criterion)
       ->lists('id');
 
     return DB::table('activities')
       ->join('activity_criterion as ac', 'ac.activity_id', '=', 'activities.id')
       ->join('assessments', 'assessments.activity_criterion_id', '=', 'ac.id')
+      ->whereNotNull('score')
       ->where('activity_id', $this->id)
       ->where('student_id', $student_id)
       ->count();
 
     $all_criterion = DB::table('activity_criterion')
       ->join('assessments', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
-      ->where('activity_criterion.activity_id', '=', $this->id)
+      ->whereNotNull('score')
+	  ->where('activity_criterion.activity_id', '=', $this->id)
       ->groupBy('criterion_id')
 
       ->lists('criterion_id');

app/models/Course.php

         $join->on("assessments.student_id", '=', 'program_student_semester.student_id')
           ->on('assessments.activity_criterion_id', '=', 'activity_criterion.id');
       })
+      ->whereNotNull('score')
       ->where('courses.semester_id', $this->semester_id)
       ->whereIn('courses.program_id', $program_ids)
       ->where('courses.code', $this->code)
     $activitiesAssessed = DB::table('activities')
       ->join('activity_criterion as ac', 'ac.activity_id', '=', 'activities.id')
       ->join('assessments', 'assessments.activity_criterion_id', '=', 'ac.id')
+	  ->whereNotNull('score')
       ->where('activities.course_id', $this->id)
       ->select('activities.id')
       ->distinct()
     $activitiesAssessed = DB::table('activities')
       ->join('activity_criterion as ac', 'ac.activity_id', '=', 'activities.id')
       ->join('assessments', 'assessments.activity_criterion_id', '=', 'ac.id')
+	  ->whereNotNull('score')
       ->where('activities.course_id', $this->id)
       ->where('activities.draft', 0)
       ->where('activities.diagnostic', 0)
     $activitiesAssessed = DB::table('activities')
       ->join('activity_criterion as ac', 'ac.activity_id', '=', 'activities.id')
       ->join('assessments', 'assessments.activity_criterion_id', '=', 'ac.id')
+	  ->whereNotNull('score')
       ->where('activities.course_id', $this->id)
       ->where('activities.draft', 0)
       ->where('activities.diagnostic', 1)
           $join->on("assessments.student_id", '=', 'program_student_semester.student_id')
             ->on('assessments.activity_criterion_id', '=', 'activity_criterion.id');
         })
+  	    ->whereNotNull('score')
         ->where('courses.semester_id', $course_code->semester_id)
         ->whereIn('courses.program_id', $program_ids)
         ->where('courses.code', $course_code->code)
         ->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
         ->join('semesters', 'semesters.id', '=', 'courses.semester_id')
         ->join('outcomes', 'criterion_objective_outcome.outcome_id', '=', 'outcomes.id')
+	    ->whereNotNull('score')
         ->whereIn('students.program_id', $program_ids)
         ->where('semester_id', $course_code->semester_id)
         ->where('semesters.is_visible', '=', 1)
           $join->on("assessments.student_id", '=', 'course_student.student_id')
             ->on('assessments.activity_criterion_id', '=', 'activity_criterion.id');
         })
+	    ->whereNotNull('score')
         ->where('activities.draft', 0)
         ->where('activities.diagnostic', 0);
 
        count(case when assessments.score >= rubrics.expected_points then 1 else NULL end) as achieved,
        criteria.*"
       ))
+	  ->whereNotNull('score')
       ->where('courses.id', $this->id)
       ->groupBy('criteria.id')
       ->get();
         count(case when assessments.score >= rubrics.expected_points then 1 else null end) as achieved"
         )
       )
+	  ->whereNotNull('score')
       ->where('courses.id', $this->id)
       ->groupBy(array('outcome_id', 'student_id'))
       ->get();
         'program_id',
         $this->program_id
       )
+	  ->whereNotNull('score')
       ->where('activities.draft', 0)
       ->where('activities.diagnostic', 0)
       ->groupBy('courses.id')
     $assessed = DB::table('assessments')
       ->join('activity_criterion', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
       ->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+	  ->whereNotNull('score')
       ->where('activities.course_id', $this->id)
       ->count();
     //             Log::info("aqui".$assessed);

app/models/Criterion.php

 
 			$students_achieved += DB::table('assessments')
 				->join('activity_criterion', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
+				->whereNotNull('score')
 				->where('activity_criterion.id', $activity_criterion->id)
 				->where('assessments.score', '>=', $activity_criterion->expected_points)
 				->count();

app/models/Objective.php

     // 
     public static function getPlanReport($objective)
     {
+        Log::info("getPlanReport". json_encode($objective));//exit();
         $course_codes = DB::table('typ_semester_courses')
             ->join('courses', 'courses.id', '=', 'typ_semester_courses.course_id')
             ->where('typ_semester_objective_id', $objective->typ_semester_objective_id)
             ->select('courses.code', 'courses.number', 'courses.id as course_id', 'typ_semester_courses.id as typ_semester_course_id', DB::raw("{$objective->semester_id} as semester_id"), "courses.program_id")
             ->get();
         //Log::info($course_codes);
-        Log::info("No es aqui");
+//         Log::info("No es aqui");
 
         //$course_codes['studentPerOutcome'] = array();
 

app/models/Outcome.php

 			->select('objectives.id as objective_id', 'objectives.text', 'typ_semester_objectives.id as typ_semester_objective_id', 'program_id', 'semester_id')
 			->distinct();
 
-		Log::info('agooooo me');
-		////Log::info($objectives->toSql());
+// 		Log::info('agooooo me');
+// 		Log::info($objectives->toSql());exit();
 		//Log::info('semester_program_outcome' . $semester_id . ',' . $program_id . ',' . $this->id);
 
 		if ($with_model) {
 			return $objectives;
 		}
 
-
-		return $objectives->get();
+// 		Log::info('agooooo me');
+		$objectives_result=$objectives->get();
+ Log::info('En fetchObjectivesReport'.json_encode($objectives_result));		//exit();
+		return $objectives_result;
+// 		return $objectives;
 	}
 
 	//Intento de get objectives pareados en un plan

app/models/Program.php

 			->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
 			->join('semesters', 'semesters.id', '=', 'courses.semester_id')
 			->join('outcomes', 'criterion_objective_outcome.outcome_id', '=', 'outcomes.id')
+      		->whereNotNull('score')
 			->where('students.program_id', $this->id)
 			->whereIn('semester_id', Session::get('semesters_ids'))
 			->where('semesters.is_visible', '=', 1)
 	public function getCoursesWithAssessmentCountAttribute()
 	{
 		return DB::table('courses')
-			->join(DB::raw("(SELECT distinct courses.* from courses join activities on activities.course_id = courses.id join activity_criterion on activity_criterion.activity_id = activities.id join assessments on activity_criterion.id = assessments.activity_criterion_id) as q"), function ($j) {
+			->join(DB::raw("(SELECT distinct courses.* from courses join activities on activities.course_id = courses.id join activity_criterion on activity_criterion.activity_id = activities.id join assessments on activity_criterion.id = assessments.activity_criterion_id and score is not null) as q"), function ($j) {
 				$j->on('q.semester_id', '=', 'courses.semester_id')
 					->on('q.program_id', '=', 'courses.program_id');
 			})
 			->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
 			->join('semesters', 'semesters.id', '=', 'courses.semester_id')
 			->join('outcomes', 'criterion_objective_outcome.outcome_id', '=', 'outcomes.id')
+      		->whereNotNull('score')
 			->where('courses.program_id', $this->id)
 			->whereIn('semester_id', Session::get('semesters_ids'))
 			->where('semesters.is_visible', '=', 1)
 		foreach ($this->publishedActivities as $activity) {
 			$assessed = DB::table('activity_criterion')
 				->join('assessments', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
+     		 	->whereNotNull('score')
 				->where('activity_id', $activity->id)
 				->first();
 			if (!$assessed) continue;

app/models/School.php

 			->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
 			->join('outcomes', 'criterion_objective_outcome.outcome_id', '=', 'outcomes.id')
 			->join('semesters', 'semesters.id', '=', 'courses.semester_id')
+      		->whereNotNull('score')
 			->whereIn('courses.program_id', $this->undergraduate_programs->lists('id'))
 			->whereIn('semester_id', Session::get('semesters_ids'))
 			->where('semesters.is_visible', '=', 1)
 			->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
 			->join('semesters', 'semesters.id', '=', 'courses.semester_id')
 			->join('outcomes', 'criterion_objective_outcome.outcome_id', '=', 'outcomes.id')
+	      	->whereNotNull('score')
 			->whereIn('courses.program_id', $this->graduate_programs->lists('id'))
 			->whereIn('semester_id', Session::get('semesters_ids'))
 			->where('semesters.is_visible', '=', 1)
 			->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
 			->join('semesters', 'semesters.id', '=', 'courses.semester_id')
 			->join('outcomes', 'criterion_objective_outcome.outcome_id', '=', 'outcomes.id')
+	      	->whereNotNull('score')
 			->whereIn('students.program_id', $this->undergraduate_programs->lists('id'))
 			->whereIn('semester_id', Session::get('semesters_ids'))
 			->where('semesters.is_visible', '=', 1)
 			->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
 			->join('semesters', 'semesters.id', '=', 'courses.semester_id')
 			->join('outcomes', 'criterion_objective_outcome.outcome_id', '=', 'outcomes.id')
+	      	->whereNotNull('score')
 			->whereIn('students.program_id', $this->graduate_programs->lists('id'))
 			->whereIn('semester_id', Session::get('semesters_ids'))
 			->where('semesters.is_visible', '=', 1)

app/routes.php

         'uses' => 'AnnualPlansController@selectProgramPlan'
     ));
 
-    Route::post("fetchReportWithOutcome", array(
-        'as' => 'fetchReportWithOutcome',
-        'uses' => 'AnnualPlansController@fetchReportWithOutcome'
-    ));
+    Route::post("fetchReportWithOutcome", 'AnnualPlansController@fetchReportWithOutcome');
+
+//     Route::post("fetchReportWithOutcome", array(
+//         'as' => 'fetchReportWithOutcome',
+//         'uses' => 'AnnualPlansController@fetchReportWithOutcome'
+//     ));
 
     Route::get('annual_plan_report/{program_id}', array(
         'as' => 'annual_plan_report/{program_id}',

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

                     typ_semester_outcome_id: typ_semester_outcome_id
                 },
                 function(outcome) {
-                    if (outcome.objectives) {
+                        console.log("outcome: " + JSON.stringify(outcome));                
+                    if (outcome.objectives2) {
                         $('table').show();
                         $('#outcome-display').parent().show();
                         $('#outcome-display .panel-title').html(name);
                         $('#allLists').empty();
                         $('#levelTabs').empty();
                         $('.no-outcome').hide();
+//                         console.log("outcome: " + outcome.jSon());
                         if (outcome.outcome_program_goal) {
                             outcome.outcome_program_goal = outcome.outcome_program_goal.expected_target;
                         } else {
                             '<th>Percentage</th>' +
                             '<th>Outcome Achieved</th>' +
                             '</tr></thead><tbody></tbody>');
-                        first_objective_id = outcome.objectives[0].id;
-                        $.each(outcome.objectives, function(index, objective) {
+                        first_objective_id = outcome.objectives2[0].id;
+                        $.each(outcome.objectives2, function(index, objective) {
 
                             li = $('<li/>', {
                                 'role': 'presentation',