Antes de buscar criterios

app/controllers/ActivitiesController.php

@@ -195,13 +195,16 @@ class ActivitiesController extends \BaseController
         // Get results
         $activity_criterion_ids = DB::table('activity_criterion')->where("activity_id", '=', $activity->id)->lists('id');
         Log::info($activity_criterion_ids);
-        $assessments = DB::table('assessments')->join('students', 'assessments.student_id', '=', 'students.id')->whereIn('activity_criterion_id', $activity_criterion_ids)->orderBy('assessments.id', 'asc')->get();
+        $assessments = DB::table('assessments')
+            ->join('students', 'assessments.student_id', '=', 'students.id')
+            ->whereIn('activity_criterion_id', $activity_criterion_ids)
+            ->orderBy('assessments.id', 'asc')->get();
         Log::info($assessments);
         // Decode the scores (blade workaround)
         $scores_array = array();
 
         foreach ($assessments as $index => $assessment) {
-            $scores_array[$assessment->student_id][$index] = $assessment->score;
+            $scores_array[$assessment->student_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/OutcomesController.php

@@ -567,15 +567,15 @@ class OutcomesController extends \BaseController
             $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('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('criteria', 'criteria.id', '=', 'criterion_objective_outcome.criterion_id')
                 ->join('objectives', 'objectives.id', '=', 'criterion_objective_outcome.objective_id')
@@ -779,14 +779,32 @@ class OutcomesController extends \BaseController
         if (!$outcome)
             App::abort('404');
         $title = "My Courses' Assessment Report: " . $outcome->name;
+        $activity_criterion = DB::table('assessments')->lists('activity_criterion_id');
+        $courses = DB::table("courses")
+            ->join('activities', 'activities.course_id', '=', 'courses.id')
+            ->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
+            ->whereIn('activity_criterion.id', $activity_criterion)
+            ->where('courses.user_id', '=', Auth::user()->id)
+            ->where('activities.draft', '=', 0)
+            ->whereIn('courses.semester_id', Session::get('semesters_ids'))
+            ->groupBy(array('code', 'number'))
+            ->get();
+        /*$courses = Course::has('activites')
+            ->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
+            ->where('user_id', Auth::user()->id)
+            ->where('activities.draft', '=', 0)
+            ->whereIn('semester_id', Semester::get('semester_ids'))
+            ->whereIn('activity_criterion.id', $activity_criterion)
+            ->groupBy(array('code', 'number'))
+            ->get();*/
 
-
-        $courses = Course::where('user_id', Auth::user()->id)
+        /*$courses = Course::where('user_id', Auth::user()->id)
             ->has('activities')
-            ->whereNotNull('outcomes_attempted')
+            //->whereNotNull('outcomes_attempted')
             ->whereIn('semester_id', Session::get('semesters_ids'))
             ->groupBy(array('code', 'number'))
-            ->get();
+            ->get();*/
+
 
         return View::make('local.professors.assessment_report', compact('title', 'outcome', 'courses'));
     }

app/database/migrations/2021_07_06_075249_fix_activities.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class FixActivities extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('activities', function (Blueprint $table) {
+			$table->dropColumn(array(
+				'criteria_achieved',
+				'outcomes_attempted', 'outcomes_achieved',
+				'criteria_weights', 'criteria_achieved_percentage',
+				'criteria_participant_count', 'criteria_achiever_count'
+			));
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+	}
+}

app/database/migrations/2021_07_06_075356_criterion_scale.php

@@ -0,0 +1,42 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CriterionScale extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('criterion_scale', function (Blueprint $table) {
+			$table->increments('id')->unsigned();
+			$table->integer('criterion_id')->unsigned();
+			$table->foreign('criterion_id')
+				->references('id')
+				->on('criteria')
+				->onUpdate('cascade')
+				->onDelete('cascade');
+			$table->integer('scale_id')->unsigned();
+			$table->foreign('scale_id')
+				->references('id')
+				->on('scales')
+				->onUpdate('cascade')
+				->onDelete('cascade');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('criterion_scale');
+	}
+}

app/models/Activity.php

@@ -23,22 +23,142 @@ class Activity extends Eloquent
   {
     return $this->belongsToMany('Student', 'assessments')->withPivot('scores', 'percentage')->withTimestamps();
   }
+  public function amount_of_assessed_students()
+  {
+
+    $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');
 
+    return count($amount_of_students);
+  }
   // cap_array
-  public function getCapArrayAttribute($value)
+  public function getCapArrayAttribute()
   {
-    return json_decode($this->criteria_achieved_percentage, true);
+    $criteria_achieved_percentage = [];
+
+
+    $criterias = DB::table('criteria')
+      ->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'criteria.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'
+      )
+      ->addSelect('criteria.name', 'criteria.subcriteria')
+      ->get();
+    Log::info($criterias);
+    Log::info($this->rubric);
+    Log::info("this is rubric");
+    foreach ($criterias as $index => $single_crit) {
+
+
+      $single_crit->outcome_id = json_encode(DB::table('criterion_objective_outcome')
+        ->where('criterion_id', '=', $single_crit->criterion_id)
+        ->lists('outcome_id'));
+      Log::info(json_decode($single_crit->outcome_id));
+      $amount_of_students = count(DB::table('assessments')
+        ->where("activity_criterion_id", '=', $single_crit->id)
+        ->lists('student_id'));
+      Log::info($amount_of_students);
+      Log::info($single_crit->id);
+      Log::info('lmaoOOOO');
+
+      $student_pass = DB::table('assessments')
+        ->where("activity_criterion_id", '=', $single_crit->id)
+        ->where('score', '>=', $this->rubric[0]->expected_points)
+        ->lists('student_id');
+      Log::info($student_pass);
+      $amount_of_students_passed = count(DB::table('assessments')
+        ->where("activity_criterion_id", '=', $single_crit->id)
+        ->where('score', '>=', $this->rubric[0]->expected_points)
+        ->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("?");
+    }
+    return $criteria_achieved_percentage;
   }
 
   // o_ach_array
   public function getOAchArrayAttribute($value)
   {
-    return json_decode($this->outcomes_achieved, true);
+    $outcomes_achieved = [];
+    $all_criterion = DB::table('activity_criterion')
+      ->where('activity_criterion.activity_id', '=', $this->id)
+      ->get();
+
+    $attempted_criteria = 0;
+    $passed_criteria = 0;
+
+    $all_outcomes = DB::table('outcomes')->get();
+
+
+    foreach ($all_criterion as $index => $activity_crit) {
+
+      $amount_of_outcomes_attempted = DB::table('criterion_objective_outcome')
+        ->join('outcomes', 'outcomes.id', '=', 'criterion_objective_outcome.outcome_id')
+        ->where('criterion_id', '=', $activity_crit->criterion_id)
+        ->select('criterion_objective_outcome.outcome_id')
+        ->distinct()
+        ->orderBy('criterion_objective_outcome.outcome_id')
+        ->select('outcomes.id', 'outcomes.expected_outcome')
+        ->get();
+      $passed_criteria = count(DB::table('assessments')
+        ->where('activity_criterion_id', '=', $activity_crit->id)
+        ->where('score', '>=', $this->rubric[0]->expected_points)
+        ->lists('student_id'));
+      $attempted_criteria = count(DB::table('assessments')
+        ->where('activity_criterion_id', '=', $activity_crit->id)
+        ->lists('student_id'));
+      Log::info("For activity_crit " . ($activity_crit->id));
+      $percent_for_criteria = ($passed_criteria / $attempted_criteria) * 100;
+      Log::info('Percent calculated' . $percent_for_criteria);
+
+
+      $percent_for_criteria = ($passed_criteria / $attempted_criteria) * 100;
+
+      foreach ($amount_of_outcomes_attempted as $index2 => $outcome) {
+
+        if ($percent_for_criteria >= $this->rubric[0]->expected_percentage) {
+          if (array_key_exists($outcome->id, $outcomes_achieved)) $outcomes_achieved[$outcome->id] += 1;
+          else $outcomes_achieved[$outcome->id] = 1;
+        }
+      }
+    }
+
+    return $outcomes_achieved;
   }
 
   // o_att_array
   public function getOAttArrayAttribute($value)
   {
-    return json_decode($this->outcomes_attempted, true);
+
+
+    $outcomes_attempted = [];
+
+    $all_criterion = DB::table('activity_criterion')
+      ->where('activity_criterion.activity_id', '=', $this->id)
+      ->lists('criterion_id');
+
+    foreach ($all_criterion as $index => $criterion_id) {
+
+      $amount_of_outcomes = DB::table('criterion_objective_outcome')
+        ->where('criterion_id', '=', $criterion_id)
+        ->select('criterion_objective_outcome.outcome_id')
+        ->distinct()
+        ->orderBy('criterion_objective_outcome.outcome_id')
+        ->lists('outcome_id');
+
+      foreach ($amount_of_outcomes as $index2 => $outcome_id) {
+        if (array_key_exists($outcome_id, $outcomes_attempted)) $outcomes_attempted[$outcome_id] += 1;
+        else $outcomes_attempted[$outcome_id] = 1;
+      }
+    }
+
+    //return json_decode($this->outcomes_attempted, true);
+    return $outcomes_attempted;
   }
 }

app/models/Course.php

@@ -63,10 +63,16 @@ class Course extends Eloquent
     $criteria = DB::table('criteria')
       ->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'criteria.id')
       ->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+      ->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
+      ->join('rubric', 'rubric.id', '=', 'rubric_activity.rubric_id')
       ->join('courses', 'activities.course_id', '=', 'courses.id')
       ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
       ->where('courses.id', '=', $this->id)
-      ->select('criteria.id', 'expected_percentage_students_achieving', 'activity_criterion.activity_id')
+      ->select(
+        'criteria.id',
+        'rubric.expected_percentage as expected_percentage_students_achieving'/*'expected_percentage_students_achieving',*/,
+        'activity_criterion.activity_id'
+      )
       ->distinct()
       ->get();
 

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

@@ -45,23 +45,30 @@
                         <!-- If grouped course has activities that evaluate the outcome -->
 
                         <?php
+
+
                             $sections_evaluating = Course::has('activities')
-                            ->whereNotNull('outcomes_attempted')
-                            ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
-                            ->with(array('activities'=>function($query) use(&$outcome){
-                                $query->whereNotNull('outcomes_attempted');
-                                $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
+                            
+                            //->whereNotNull('outcomes_attempted')
+                            //->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
+                            //->with(array('activities'=>function($query) use(&$outcome){
+                            //    $query->whereNotNull('outcomes_attempted');
+                            //    $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();
+                            
+                            $semester_code = DB::table('semesters')->where('id', '=', $course->semester_id)->first();
+                            $program = DB::table('programs')->where('id', $course->program_id)->first();
+                            
                         ?>
 
                         @if(count($sections_evaluating))
                             <tr>
                                 <td>
-                                    {{ $course->code}}-{{ $course->number }} ({{ $course->semester->code }})
+                                    {{ $course->code}}-{{ $course->number }} ({{ $semester_code->code }})
                                 </td>
-                                <td>{{ $course->program->name }}</td>
+                                <td>{{ $program->name }}</td>
                                 <td>
                                 <!-- For each section -->
                                 @foreach($sections_evaluating as $index3 => $section)
@@ -69,29 +76,34 @@
 
                                     <!-- For each activity in the section -->
                                     @foreach($section->activities as $index4 => $activity)
-
+<?php Log::info($section); Log::info($section->activities) ;
+Log::info($activity->o_att_array);
+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) && $activity->o_att_array[$outcome->id] >=1)
+                                        @if(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->assessed_students()->count() }} students in the section.</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>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>
                                             <p>The results for each criterion were as follows:</p>
 
                                             <table class="table table-condensed table-bordered datatable">
-                                                @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($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
                                                 @endforeach
@@ -105,6 +117,8 @@
                                             <?php
                                                 $o_att_array = $activity->o_att_array;
                                                 $o_ach_array = $activity->o_ach_array;
+                                                Log::info($o_att_array);
+                                                Log::info($o_ach_array);
                                                 $percentage = ($o_ach_array[$outcome->id]/$o_att_array[$outcome->id])*100;
                                             ?>
                                             @if($percentage >= 100)