Cambios a todo menos Criteria Objective_outcome

app/controllers/CriteriaController.php

@@ -156,14 +156,20 @@ class CriteriaController extends \BaseController
         else
             $program_id = NULL;
 
-        $saved_criterion = Criterion::withTrashed()
+        $saved_criterion = DB::table('criteria')
+            ->join('program_criterion', 'program_criterion.criterion_id', '=', 'criteria.id')
+            ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
+            ->whereIn('program_id', $input['program_id'])
+            ->whereIn('objective_id', $input['objective_id'])
+            ->whereIn('outcome_id', $input['outcome_id'])
             ->where('name', '=', $input['name'])
-            ->where('outcome_id', '=', $input['outcome_id'])
-            ->where('program_id', '=', $program_id)
+            ->where('subcriteria', '=', $input['subcriteria'])
             ->first();
 
 
 
+
+
         if ($saved_criterion)
             return false;
         else
@@ -227,16 +233,19 @@ class CriteriaController extends \BaseController
                 'outcome_id' => $clean_input['outcome_id'],
                 'notes' => $clean_input['notes'],
                 'copyright' => $clean_input['copyright'],
-                'maximum_score' => $clean_input['maximum_score']
+                'maximum_score' => $clean_input['maximum_score'],
+                'scales' => $clean_input['scale_description'],
+                'objective_id' => $clean_input['objective_id']
             ),
             array(
                 'name' => 'required|string',
                 'subcriteria' => 'string',
                 'outcome_id' => 'required|array',
-
+                'scales' => 'required|array',
                 'notes' => 'string',
                 'copyright' => 'string',
-                'maximum_score' => 'required|integer'
+                'maximum_score' => 'required|integer',
+                'objective_id' => 'required|array'
             )
 
         );
@@ -281,12 +290,23 @@ class CriteriaController extends \BaseController
             }
         } else {
             // Check criterion uniqueness
-            /*if (!$this->isCriterionUnique($clean_input)) {
-                /** Send error message and old data
+            if (!$this->isCriterionUnique($clean_input)) {
+                /** Send error message and old data*/
                 Session::flash('status', 'danger');
                 Session::flash('message', 'This criterion is a duplicate of an already saved criterion because its name and associated program are the same.');
-                return Redirect::to('criteria')->withInput();
-            }*/
+
+                $role = Auth::user()['role'];
+                switch ($role) {
+                    case 1:
+                        return Redirect::to('criteria')->withInput();
+
+                    case 2:
+                        return Redirect::to('school-criteria')->withInput();
+
+                    case 3:
+                        return Redirect::to('program-criteria')->withInput();
+                }
+            }
 
             /** Instantiate new criterion */
             $criterion = new Criterion;
@@ -296,8 +316,8 @@ class CriteriaController extends \BaseController
 
             //gabriel añadió aqui
 
-            //$criterion->number_of_scales = $clean_input['number_of_scales'];
-            //$criterion->maximum_score = $clean_input['maximum_score'];
+            $criterion->num_scales = $clean_input['number_of_scales'];
+            $criterion->max_score = $clean_input['maximum_score'];
 
             if (Input::get('copyright'))
                 $criterion->copyright = $clean_input['copyright'];
@@ -319,27 +339,34 @@ class CriteriaController extends \BaseController
                 }
 
                 for ($i = 0; $i < sizeof($clean_input['scale_description']); $i++) {
-                    $scale = new Scale;
 
-                    $position = $i;
-                    $scale->description = $clean_input['scale_description'][$i];
+                    $existing_scale = DB::table('scales')->where('description', $clean_input['scale_description'][$i])
+                        ->first();
+                    if ($existing_scale) {
+                        DB::insert("insert_into `criterion_scale` (`criterion_id`, `scale_id`, `position`) values({$criterionId},{$existing_scale->id},{$i})");
+                    } else {
+                        $scale = new Scale;
 
+                        $position = $i;
+                        $scale->description = $clean_input['scale_description'][$i];
 
-                    if ($scale->save()) {
-                        DB::insert("insert into `criterion_scale` (`criterion_id`, `scale_id`, `position`) values({$criterionId},{$scale->id}, {$position})");
-                    } else {
-                        Session::flash('status', 'danger');
-                        Session::flash('message', '<p>Error creating the Scales</p>');
-                        $role = Auth::user()['role'];
-                        switch ($role) {
-                            case 1:
-                                return Redirect::to('criteria')->withInput();
-
-                            case 2:
-                                return Redirect::to('school-criteria')->withInput();
-
-                            case 3:
-                                return Redirect::to('program-criteria')->withInput();
+
+                        if ($scale->save()) {
+                            DB::insert("insert into `criterion_scale` (`criterion_id`, `scale_id`, `position`) values({$criterionId},{$scale->id}, {$position})");
+                        } else {
+                            Session::flash('status', 'danger');
+                            Session::flash('message', '<p>Error creating the Scales</p>');
+                            $role = Auth::user()['role'];
+                            switch ($role) {
+                                case 1:
+                                    return Redirect::to('criteria')->withInput();
+
+                                case 2:
+                                    return Redirect::to('school-criteria')->withInput();
+
+                                case 3:
+                                    return Redirect::to('program-criteria')->withInput();
+                            }
                         }
                     }
                 }
@@ -436,10 +463,10 @@ class CriteriaController extends \BaseController
 
         $clean_input['copyright'] = trim(preg_replace('/\t+/', '', Input::get('copyright')));
         $clean_input['notes'] = trim(preg_replace('/\t+/', '', Input::get('notes')));
-        /* $clean_input['maximum_score'] = (int) Input::get('assoc_maximum_score');
-        $clean_input['scale_title'] = Input::get('assoc_title');
+        $clean_input['maximum_score'] = (int) Input::get('assoc_maximum_score');
+        //$clean_input['scale_title'] = Input::get('assoc_title');
         $clean_input['scale_description'] = Input::get('assoc_scales');
-        $clean_input['number_of_scales'] = sizeof($clean_input['scale_title']);*/
+        $clean_input['number_of_scales'] = sizeof($clean_input['scale_description']);
 
 
         return $clean_input;
@@ -482,19 +509,29 @@ class CriteriaController extends \BaseController
         } else {
 
             // // Check criterion uniqueness
-            // if(!$this->isCriterionUnique($clean_input, $criterion))
-            // {
-            //     /** Send error message and old data */
-            //     Session::flash('status', 'danger');
-            //     Session::flash('message', 'This criterion is a duplicate of an already saved criterion because its name, assoaciated school or program, and progress indicators are the same.');
-            //     return Redirect::to('criteria')->withInput();
-            // }
+            if (!$this->isCriterionUnique($clean_input, $criterion)) {
+                /** Send error message and old data */
+                Session::flash('status', 'danger');
+                Session::flash('message', 'This criterion is a duplicate of an already saved criterion because its name, assoaciated school or program, and progress indicators are the same.');
+                $role = Auth::user()['role'];
+                switch ($role) {
+                    case 1:
+                        return Redirect::to('objective')->withInput();
+
+                    case 2:
+                        return Redirect::to('school-objective')->withInput();
+
+                    case 3:
+                        return Redirect::to('program-objective')->withInput();
+                }
+            }
 
             /** Set info */
             $criterion->name = $clean_input['name'];
             $criterion->subcriteria = $clean_input['subcriteria'];
 
-
+            $criterion->num_scales = $clean_input['number_of_scales'];
+            $criterion->max_score = $clean_input['maximum_score'];
 
 
 
@@ -535,31 +572,42 @@ class CriteriaController extends \BaseController
                         DB::insert("insert into `criterion_objective_outcome` (`objective_id`, `outcome_id`, `criterion_id`) values ({$objective_id},{$outcome_id}, {$criterionId})");
                     }
                 }
+
                 /*DB::delete("delete from `scales` where id in (select scale_id id from criterion_scale where criterion_id = {$criterionId})");
+*/
+                DB::delete("delete from criterion_scale where criterion_id = {$criterionId}");
+                for ($i = 0; $i < sizeof($clean_input['scale_description']); $i++) {
 
-                for ($i = 0; $i < sizeof($clean_input['scale_title']); $i++) {
-                    $scale = new Scale;
-                    $scale->title = $clean_input['scale_title'][$i];
-                    $scale->position = $i + 1;
-                    $scale->description = $clean_input['scale_description'][$i];
-                    if ($scale->save()) {
-                        DB::insert("insert into `criterion_scale` (`criterion_id`, `scale_id`) values({$criterionId},{$scale->id})");
+                    $existing_scale = DB::table('scales')->where('description', $clean_input['scale_description'][$i])
+                        ->first();
+                    if ($existing_scale) {
+                        DB::insert("insert_into `criterion_scale` (`criterion_id`, `scale_id`, `position`) values({$criterionId},{$existing_scale->id},{$i})");
                     } else {
-                        Session::flash('status', 'danger');
-                        Session::flash('message', '<p>Error creating the Scales</p>');
-                        $role = Auth::user()['role'];
-                        switch ($role) {
-                            case 1:
-                                return Redirect::to('objective')->withInput();
-
-                            case 2:
-                                return Redirect::to('school-objective')->withInput();
-
-                            case 3:
-                                return Redirect::to('program-objective')->withInput();
+                        $scale = new Scale;
+
+                        $position = $i;
+                        $scale->description = $clean_input['scale_description'][$i];
+
+
+                        if ($scale->save()) {
+                            DB::insert("insert into `criterion_scale` (`criterion_id`, `scale_id`, `position`) values({$criterionId},{$scale->id}, {$position})");
+                        } else {
+                            Session::flash('status', 'danger');
+                            Session::flash('message', '<p>Error creating the Scales</p>');
+                            $role = Auth::user()['role'];
+                            switch ($role) {
+                                case 1:
+                                    return Redirect::to('criteria')->withInput();
+
+                                case 2:
+                                    return Redirect::to('school-criteria')->withInput();
+
+                                case 3:
+                                    return Redirect::to('program-criteria')->withInput();
+                            }
                         }
                     }
-                }*/
+                }
                 foreach ($clean_input['program_id'] as $program_id) {
                     DB::insert("insert into `program_criterion` (`criterion_id`, `program_id`) values({$criterionId},{$program_id})");
                 }

app/database/migrations/2021_07_08_093000_add_max_num_to_criteria.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddMaxNumToCriteria extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('criteria', function (Blueprint $table) {
+			$table->integer('num_scales');
+			$table->integer('max_score');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('criteria', function (Blueprint $table) {
+			$table->dropColumn(array('num_scales', 'max_score'));
+		});
+	}
+}

app/database/migrations/2021_07_09_150656_edit_template_criterion.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class EditTemplateCriterion extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('template_criterion', function (Blueprint $table) {
+			$table->integer('position');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('template_criterion', function (Blueprint $table) {
+			$table->dropColumn('position');
+		});
+	}
+}

app/database/migrations/2021_07_09_150819_edit_rubric_criterion.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class EditRubricCriterion extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('criterion_rubric', function (Blueprint $table) {
+			$table->integer('position');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('criterion_rubric', function (Blueprint $table) {
+			$table->dropColumn('position');
+		});
+	}
+}

app/models/Activity.php

@@ -31,6 +31,35 @@ class Activity extends Eloquent
 
     return count($amount_of_students);
   }
+
+  public function criteria_achieved()
+  {
+
+    $activity_criterion = DB::table('activity_criterion')
+      ->where('activity_id', '=', $this->id)
+      ->get();
+    $criteria_achieved = [];
+    foreach ($activity_criterion as $index => $single_ac) {
+
+      $assessments_passed = count(DB::table('assessments')
+        ->where('score', '>=', $this->rubric[0]->expected_points)
+        ->where('activity_criterion_id', '=', $single_ac->id)
+        ->lists('student_id'));
+      $assessments_attempted = count(DB::table('assessments')
+        ->where('activity_criterion_id', '=', $single_ac->id)
+        ->lists('student_id'));
+
+      if ((($assessments_passed / $assessments_attempted) * 100) >= $this->rubric[0]->expected_percentage) {
+        $criteria_achieved[$single_ac->criterion_id] = 1;
+      } else {
+        $criteria_achieved[$single_ac->criterion_id] = 0;
+      }
+    }
+    return  $criteria_achieved;
+  }
+
+
+
   // cap_array
   public function getCapArrayAttribute()
   {
@@ -85,6 +114,7 @@ class Activity extends Eloquent
   // o_ach_array
   public function getOAchArrayAttribute($value)
   {
+    /*
     $outcomes_achieved = [];
     $all_criterion = DB::table('activity_criterion')
       ->where('activity_criterion.activity_id', '=', $this->id)
@@ -129,11 +159,39 @@ class Activity extends Eloquent
       }
     }
 
+    return $outcomes_achieved;*/
+
+    $outcomes_achieved = [];
+
+    $criteria_achieved = $this->criteria_achieved();
+
+
+    $all_outcomes = DB::table('outcomes')->lists('id');
+
+    foreach ($all_outcomes as $outcome_id) {
+      $outcomes_achieved[$outcome_id] = 0;
+    }
+
+    foreach ($criteria_achieved as $criterion_id => $passed) {
+
+      if ($passed == 1) {
+        $outcomes_related = DB::table('criterion_objective_outcome')
+          ->where("criterion_id", '=', $criterion_id)
+          ->select('outcome_id')
+          ->distinct()
+          ->lists('outcome_id');
+
+        foreach ($outcomes_related as $index => $outcome_id) {
+
+          $outcomes_achieved[$outcome_id] += 1;
+        }
+      }
+    }
     return $outcomes_achieved;
   }
 
   // o_att_array
-  public function getOAttArrayAttribute($value)
+  public function getOAttArrayAttribute()
   {
 
 

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

@@ -284,37 +284,62 @@
         $('#' + select).html(options);
         $('#' + select).val(previousvalue);
         $('#' + select).selectpicker('refresh');
+        $('#'+select).trigger('change');
     }
 
     function numberOfAssoc(string, Scales) {
         var maximum = $('#assoc_maximum_score').val();
         var amountOfScale = parseInt($('#' + string).val());
         var dataValue = parseInt($('#' + Scales).attr('data-value'));
+        var division = maximum/amountOfScale;
         //add
-        if (dataValue < amountOfScale) {
+        
 
             fullDiv = '';
-
+        if(division ==1){
             for (var i = dataValue; i < amountOfScale; i++) {
                 div = '<div id="assoc_eval' + i.toString() + Scales + '">' +
                     '<div class ="form-group">' +
-                    '<label for ="descripcion' + i.toString() + '">Descripción de evaluación</label>' +
-                    '<textarea class="form-control" rows="2" aria-labelledby="descripcion' + i.toString() + '" name="assoc_scales[]" cols="50" ></textarea></div></div>';
+                    '<label for ="assoc_descripcion' + i.toString() + '">Scale Description ('+(i+1)+')</label>' +
+                    '<textarea class="form-control" rows="2" aria-labelledby="assoc_descripcion' + i.toString() + '" name="assoc_scales[]" cols="50" ></textarea></div></div>';
                 fullDiv += div;
 
 
             }
+        }
+        else if(division == maximum){
+            div = '<div id="assoc_eval' +0 + Scales + '">' +
+                    '<div class ="form-group">' +
+                    '<label for ="assoc_descripcion' + 0 + '">Scale Description ('+1+' - '+maximum+') </label>' +
+                    '<textarea class="form-control" rows="2" aria-labelledby="assoc_descripcion' + 0 + '" name="assoc_scales[]" cols="50" ></textarea></div></div>';
+                fullDiv += div;
+        }
+        else{
+            for (var i = 0; i < amountOfScale; i++) {
 
-            $('#' + Scales).append(fullDiv);
-            $('#' + Scales).attr('data-value', amountOfScale);
-        } else {
-            for (var i = dataValue; i > amountOfScale; i--) {
-                $('#assoc_eval' + (i - 1).toString()).remove();
-            }
+            div = '<div id="assoc_eval' + i.toString() + Scales + '">' +
+                    '<div class ="form-group">' +
+                    '<label for ="assoc_descripcion' + i.toString() + '">Scale Description ('+(1+(i*division))+' - '+((1+i)*division)+')</label>' +
+                    '<textarea class="form-control" rows="2" aria-labelledby="assoc_descripcion' + i.toString() + '" name="assoc_scales[]" cols="50" ></textarea></div></div>';
+                fullDiv += div;
+        }
         }
-        $('#' + Scales).attr('data-value', amountOfScale);
 
-    }
+            $('#' + Scales).html(fullDiv);
+            $('#' + Scales).attr('data-value', amountOfScale);
+        } 
+    
+        
+
+        
+        
+        //add
+    
+
+
+
+
+
    
     function numberOfScales(string, Scales) {
         var maximum = parseInt($('#maximum_score').val());

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

@@ -119,6 +119,7 @@ Log::info('aqui papi');?>
                                                 $o_ach_array = $activity->o_ach_array;
                                                 Log::info($o_att_array);
                                                 Log::info($o_ach_array);
+                                                Log::info('los outcomes');
                                                 $percentage = ($o_ach_array[$outcome->id]/$o_att_array[$outcome->id])*100;
                                             ?>
                                             @if($percentage >= 100)