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

Para entrar migrations nuevos

app/controllers/ActivitiesController.php

@@ -167,26 +167,26 @@ class ActivitiesController extends \BaseController
         $rubric = Rubric::find($activity->rubric[0]->id);
         Log::info($rubric);
         Log::info($activity);
-        $criterion_rubric = DB::table('criteria')
-            ->join("criterion_rubric", "criterion_rubric.criterion_id", "=", "criteria.id")
+        $rubric_criterion = DB::table('criteria')
+            ->join("rubric_criterion", "rubric_criterion.criterion_id", "=", "criteria.id")
             ->join("activity_criterion", "criteria.id", '=', 'activity_criterion.criterion_id')
             ->where("activity_criterion.activity_id", '=', $activity->id)
-            ->where('criterion_rubric.rubric_id', '=', $rubric->id)
+            ->where('rubric_criterion.rubric_id', '=', $rubric->id)
             ->select('criteria.name', 'criteria.id as criterion_id', 'criteria.subcriteria')
             ->addSelect('activity_criterion.activity_id', 'activity_criterion.weight', 'activity_criterion.id as activity_criterion_id')
-            ->addSelect('criterion_rubric.rubric_id', 'criterion_rubric.id as rubric_criterion_id')
-            ->addSelect('criterion_rubric.copyright', 'criterion_rubric.notes')
+            ->addSelect('rubric_criterion.rubric_id', 'rubric_criterion.id as rubric_criterion_id')
+            ->addSelect('rubric_criterion.copyright', 'rubric_criterion.notes')
             ->get();
-        Log::info($criterion_rubric);
-        foreach ($criterion_rubric as $index => $singleCR) {
+        Log::info($rubric_criterion);
+        foreach ($rubric_criterion as $index => $singleCR) {
             $singleCR->scales = json_encode(DB::table('scales')->join('rubric_criteria_scale', 'rubric_criteria_scale.scale_id', '=', 'scales.id')
                 ->where('rubric_criteria_scale.rubric_criterion_id', '=', $singleCR->rubric_criterion_id)
                 ->orderBy('position')
                 ->lists('description'));
         }
-        $criterion_rubric_ids = DB::table('criterion_rubric')->where('rubric_id', '=', $rubric->id)->lists('id');
+        $rubric_criterion_ids = DB::table('rubric_criterion')->where('rubric_id', '=', $rubric->id)->lists('id');
         Log::info($rubric);
-        Log::info($criterion_rubric);
+        Log::info($rubric_criterion);
 
 
 
@@ -213,7 +213,7 @@ class ActivitiesController extends \BaseController
         Log::info($scores_array);
 
 
-        return View::make('local.professors.assessment', compact('activity', 'title', 'students', 'course', 'criterion_rubric', 'assessments', 'scores_array', 'rubric'));
+        return View::make('local.professors.assessment', compact('activity', 'title', 'students', 'course', 'rubric_criterion', 'assessments', 'scores_array', 'rubric'));
     }
 
     public function saveAssessment()

app/controllers/AnnualPlansController.php

@@ -226,7 +226,7 @@ class AnnualPlansController extends \BaseController
       }
 
 
-      $typ_info['custom_transformative'][$objective->id] = DB::select("select * from transformative_actions where is_custom =1 and by_professor=0 and id in (select ta_id from transformative_objective_program where objective_id = {$objective->id})");
+      $typ_info['custom_transformative'][$objective->id] = DB::select("select * from transformative_actions where is_custom =1 and by_professor=0 and id in (select ta_id from transformative_objective_course where objective_id = {$objective->id})");
     }
     $typ_info['annual_plan'] = $annual_plan;
     Log::info($typ_info);

app/controllers/CriteriaController.php

@@ -22,7 +22,7 @@ class CriteriaController extends \BaseController
 
         $criteria = Criterion::withTrashed()->orderBy('name', 'ASC')->get();
         $programs = Program::where("id", "=", $userProgram[0]->program_id)->get();
-        return View::make('local.managers.pCoords.criteria', compact('title', 'outcomes', 'schools', 'criteria', 'programs', 'objectives'));
+        return View::make('local.managers.pCoords.new_criteria', compact('title', 'outcomes', 'schools', 'criteria', 'programs', 'objectives'));
     }
 
     public function editSchool()
@@ -63,7 +63,7 @@ class CriteriaController extends \BaseController
         } else {
             foreach ($json_to_send['outcomes'] as $index => $outcome) {
 
-                $outcomeStr .= $outcome->name . ', ';
+                $outcomeStr .= ($index + 1) . '. ' . $outcome->name . '<br>';
             }
             $outcomeStr = rtrim($outcomeStr, ',');
         }
@@ -100,21 +100,52 @@ class CriteriaController extends \BaseController
     }
     public function fetchObjectivesForSelect()
     {
-
         $json = array();
 
-        Log::info(Input::get('allOutcomes'));
-        foreach (Input::get('allOutcomes') as $id) {
-            $json['outcomes'][$id] = DB::select("select name from outcomes where id = {$id}");
-            $json['objectives'][$id] = DB::select("select objectives.id, objectives.text, outcomes.name from objectives, objective_outcome, outcomes where  objective_outcome.outcome_id ={$id} and objective_outcome.objective_id = objectives.id and objectives.active=1 and outcomes.id = objective_outcome.outcome_id");
-        }
-        Log::info(print_r($json, true));
+        $outcome_id = Input::get('outcomeID');
+
+        $json = DB::table('objectives')
+            ->join('objective_outcome', 'objective_outcome.objective_id', '=', 'objectives.id')
+            ->where('outcome_id', '=', $outcome_id)
+            ->get();
+
         return json_encode($json);
     }
     public function fetchCriterionWithTrashed()
     {
 
         $json = array();
+        $json['criteria'] = DB::table('criteria')->where('id', Input::get('id'))->get();
+
+
+        $assoc_outcomes = DB::table('criterion_objective_outcome')->where('criterion_id', Input::get('id'))->lists('outcome_id');
+        $json['outcomes'] = DB::table('outcomes')->whereIn('id', $assoc_outcomes)->get();
+        $criteria_id = Input::get('id');
+        foreach ($json['outcomes'] as $outcome) {
+            $id = $outcome->id;
+            $json['objectives'][$id] = DB::table('objectives')
+                ->join('criterion_objective_outcome', 'objectives.id', '=', 'criterion_objective_outcome.objective_id')
+                ->where('criterion_id', '=', $criteria_id)
+                ->where('outcome_id', '=', $id)
+                ->get();
+            $json['objectives_assoc'][$id] = DB::table('objectives')
+                ->join('objective_outcome', 'objective_outcome.objective_id', '=', 'objectives.id')
+                ->where('outcome_id', $id)
+                ->get();
+        }
+        $json['program'] = DB::table('program_criterion')->where('criterion_id', $criteria_id)->get();
+        $json['activity_criterion'] = DB::table('assessments')
+            ->join('activity_criterion', 'activity_criterion.id', '=', 'assessments.activity_criterion_id')
+            ->where('activity_criterion.criterion_id', $criteria_id)
+            ->get();
+        $json['scales'] = DB::table('criterion_scale')
+            ->join('scales', 'criterion_scale.scale_id', '=', 'scales.id')
+            ->where('criterion_id', $criteria_id)
+            ->orderBy('position')
+            ->get();
+
+
+        /*
         $json['criteria'] = DB::select(" select * from criteria where id = ?", array(Input::get('id')));
         $json['outcomes'] = DB::select("select  DISTINCT outcomes.id, outcomes.name from outcomes , criterion_objective_outcome where criterion_objective_outcome.criterion_id = ? and outcomes.id = criterion_objective_outcome.outcome_id order by outcomes.id", array(Input::get('id')));
         $json['objectives'] = DB::select("SELECT DISTINCT objectives.id, objectives.text FROM objectives, criterion_objective_outcome where criterion_objective_outcome.criterion_id = ? and criterion_objective_outcome.objective_id= objectives.id ", array(Input::get('id')));
@@ -126,7 +157,7 @@ class CriteriaController extends \BaseController
             $outId = $id->id;
             $json['outcomes_assoc'][$outId] = DB::select("select name from outcomes where id = {$outId}");
             $json['objectives_assoc'][$outId] = DB::select("select objectives.id, objectives.text, outcomes.name from objectives, objective_outcome, outcomes where  objective_outcome.outcome_id ={$outId} and objective_outcome.objective_id = objectives.id and objectives.active=1 and outcomes.id = objective_outcome.outcome_id");
-        }
+        }*/
 
         return json_encode($json);
     }
@@ -156,14 +187,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
@@ -197,6 +234,9 @@ class CriteriaController extends \BaseController
 
 
         $clean_input['objective_id'] = Input::get('objective');
+        //Log::info('PA los periqueros');
+        //Log::info(Input::get('objective'));
+        //Log::info($clean_input['objective_id']);
 
 
 
@@ -227,16 +267,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'
             )
 
         );
@@ -250,14 +293,15 @@ class CriteriaController extends \BaseController
     public function create()
     {
         $clean_input = $this->cleanInput();
+        Log::info("POG???");
 
         /** Validation rules */
-        $validator = $this->makeValidator($clean_input);
+        //$validator = $this->makeValidator($clean_input);
 
         /** If validation fails */
-        if ($validator->fails()) {
-            /** Prepare error message */
-            $message = '<p>Error(s) creating a new Criterion:</p><ul>';
+        //if ($validator->fails()) {
+        /** Prepare error message */
+        /*    $message = '<p>Error(s) creating a new Criterion:</p><ul>';
 
             foreach ($validator->messages()->all('<li>:message</li>') as $validationError) {
                 $message .= $validationError;
@@ -266,7 +310,7 @@ class CriteriaController extends \BaseController
             $message .= '</ul>';
 
             /** Send error message and old data */
-            Session::flash('status', 'danger');
+        /* Session::flash('status', 'danger');
             Session::flash('message', $message);
             $role = Auth::user()['role'];
             switch ($role) {
@@ -281,44 +325,65 @@ class CriteriaController extends \BaseController
             }
         } else {
             // Check criterion uniqueness
-            /*if (!$this->isCriterionUnique($clean_input)) {
-                /** Send error message and old data
-                Session::flash('status', 'danger');
+            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();
-            }*/
 
-            /** Instantiate new criterion */
-            $criterion = new Criterion;
-            $criterion->name = $clean_input['name'];
-            $criterion->subcriteria = $clean_input['subcriteria'];
+                $role = Auth::user()['role'];
+                switch ($role) {
+                    case 1:
+                        return Redirect::to('criteria')->withInput();
 
+                    case 2:
+                        return Redirect::to('school-criteria')->withInput();
 
-            //gabriel añadió aqui
+                    case 3:
+                        return Redirect::to('program-criteria')->withInput();
+                }
+            }
+*/
+        /** Instantiate new criterion */
+        $criterion = new Criterion;
+        $criterion->name = $clean_input['name'];
+        $criterion->subcriteria = $clean_input['subcriteria'];
 
-            //$criterion->number_of_scales = $clean_input['number_of_scales'];
-            //$criterion->maximum_score = $clean_input['maximum_score'];
 
-            if (Input::get('copyright'))
-                $criterion->copyright = $clean_input['copyright'];
+        //gabriel añadió aqui
 
-            if (Input::get('notes'))
-                $criterion->notes = $clean_input['notes'];
+        $criterion->num_scales = sizeof($clean_input['scale_description']);
+        $criterion->max_score = $clean_input['maximum_score'];
 
+        if (Input::get('copyright'))
+            $criterion->copyright = $clean_input['copyright'];
 
+        if (Input::get('notes'))
+            $criterion->notes = $clean_input['notes'];
 
-            /** If criterion is saved, send success message */
-            if ($criterion->save()) {
 
-                $criterionId = $criterion->id;
-                foreach ($clean_input['outcome_id'] as $outcome_id) {
-                    foreach ($clean_input['objective_id'] as $objective_id) {
 
-                        DB::insert("insert into `criterion_objective_outcome` (`objective_id`, `outcome_id`, `criterion_id`) values ({$objective_id},{$outcome_id}, {$criterionId})");
-                    }
-                }
+        /** If criterion is saved, send success message */
+        if ($criterion->save()) {
 
-                for ($i = 0; $i < sizeof($clean_input['scale_description']); $i++) {
+            $criterionId = $criterion->id;
+            $parentesis = array('(', ')');
+
+            foreach ($clean_input['objective_id'] as $objective_id) {
+
+                $outcome_objective = str_replace($parentesis, '', $objective_id);
+
+                $outcome_objective = explode(',', $outcome_objective);
+                DB::insert("insert into `criterion_objective_outcome` (`objective_id`, `outcome_id`, `criterion_id`) values ({$outcome_objective[1]},{$outcome_objective[0]}, {$criterionId})");
+            }
+
+
+            for ($i = 0; $i < sizeof($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;
@@ -343,47 +408,48 @@ class CriteriaController extends \BaseController
                         }
                     }
                 }
+            }
 
-                foreach ($clean_input['program_id'] as $program_id) {
-                    DB::insert("insert into `program_criterion` (`criterion_id`, `program_id`) values({$criterionId},{$program_id})");
-                }
+            foreach ($clean_input['program_id'] as $program_id) {
+                DB::insert("insert into `program_criterion` (`criterion_id`, `program_id`) values({$criterionId},{$program_id})");
+            }
 
-                Session::flash('status', 'success');
-                Session::flash('message', 'Criterion created: "' . $criterion->name . '".');
-                $role = Auth::user()['role'];
-                switch ($role) {
-                    case 1:
-                        return Redirect::to('criteria')->withInput();
+            Session::flash('status', 'success');
+            Session::flash('message', 'Criterion created: "' . $criterion->name . '".');
+            $role = Auth::user()['role'];
+            switch ($role) {
+                case 1:
+                    return Redirect::to('criteria')->withInput();
 
-                    case 2:
-                        return Redirect::to('school-criteria')->withInput();
+                case 2:
+                    return Redirect::to('school-criteria')->withInput();
 
-                    case 3:
-                        return Redirect::to('program-criteria')->withInput();
-                }
+                case 3:
+                    return Redirect::to('program-criteria')->withInput();
             }
+        }
 
-            /** If saving fails, send error message and old data */
-            else {
-                Session::flash('status', 'danger');
-                Session::flash('message', '<p>Error creating Criterion. Please try again later.</p>');
-                $role = Auth::user()['role'];
-                switch ($role) {
-                    case 1:
-                        return Redirect::to('criteria')->withInput();
+        /** If saving fails, send error message and old data */
+        else {
+            Session::flash('status', 'danger');
+            Session::flash('message', '<p>Error creating Criterion. Please try again later.</p>');
+            $role = Auth::user()['role'];
+            switch ($role) {
+                case 1:
+                    return Redirect::to('criteria')->withInput();
 
-                    case 2:
-                        return Redirect::to('school-criteria')->withInput();
+                case 2:
+                    return Redirect::to('school-criteria')->withInput();
 
-                    case 3:
-                        return Redirect::to('program-criteria')->withInput();
-                }
+                case 3:
+                    return Redirect::to('program-criteria')->withInput();
             }
         }
     }
 
 
 
+
     public function edit()
     {
         $title = "Criteria";
@@ -423,11 +489,11 @@ class CriteriaController extends \BaseController
 
 
         $clean_input['subcriteria'] = $trimmed;
-        $clean_input['outcome_id'] = Input::get('assoc_outcome');
+        $clean_input['outcome_id'] = Input::get('outcome');
 
 
 
-        $clean_input['objective_id'] = Input::get('assoc_objective');
+        $clean_input['objective_id'] = Input::get('objective');
 
 
 
@@ -436,15 +502,32 @@ 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['scale_description'] = Input::get('assoc_scales');
-        $clean_input['number_of_scales'] = sizeof($clean_input['scale_title']);*/
+        $clean_input['maximum_score'] = (int) Input::get('maximum_score');
+        //$clean_input['scale_title'] = Input::get('assoc_title');
+        $clean_input['scale_description'] = Input::get('Scales');
+        $clean_input['number_of_scales'] = sizeof($clean_input['scale_description']);
 
 
         return $clean_input;
     }
 
+    public function changeStatus()
+    {
+        $criterion_id = Input::get('criterion_id');
+        $criterion = Criterion::find($criterion_id);
+
+        if (!$criterion->deleted_at) {
+            $criterion->deleted_at = date('Y-m-d H:i:s');
+            if ($criterion->save())
+                return "deleted";
+            else return 'error';
+        } else {
+            $criterion->deleted_at = NULL;
+            if ($criterion->save())
+                return "activated";
+            else return 'error';
+        }
+    }
     public function update()
     {
         $criterion = Criterion::withTrashed()->find(Input::get('id'));
@@ -471,30 +554,40 @@ class CriteriaController extends \BaseController
             $role = Auth::user()['role'];
             switch ($role) {
                 case 1:
-                    return Redirect::to('objective')->withInput();
+                    return Redirect::to('criteria')->withInput();
 
                 case 2:
-                    return Redirect::to('school-objective')->withInput();
+                    return Redirect::to('school-criteria')->withInput();
 
                 case 3:
-                    return Redirect::to('program-objective')->withInput();
+                    return Redirect::to('program-criteria')->withInput();
             }
         } 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('criteria')->withInput();
+
+                    case 2:
+                        return Redirect::to('school-criteria')->withInput();
+
+                    case 3:
+                        return Redirect::to('program-criteria')->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'];
 
 
 
@@ -524,42 +617,55 @@ class CriteriaController extends \BaseController
                 $criterion->notes = NULL;
 
             /** If criterion is updated, send success message */
+            $parentesis = array('(', ')');
             if ($criterion->save()) {
                 $criterionId = $criterion->id;
                 DB::delete("delete from `criterion_objective_outcome` where `criterion_id` ={$criterionId}");
                 DB::delete("delete from `program_criterion` where `criterion_id` ={$criterionId}");
 
-                foreach ($clean_input['outcome_id'] as $outcome_id) {
-                    foreach ($clean_input['objective_id'] as $objective_id) {
+                foreach ($clean_input['objective_id'] as $objective_id) {
 
-                        DB::insert("insert into `criterion_objective_outcome` (`objective_id`, `outcome_id`, `criterion_id`) values ({$objective_id},{$outcome_id}, {$criterionId})");
-                    }
+                    $outcome_objective = str_replace($parentesis, '', $objective_id);
+
+                    $outcome_objective = explode(',', $outcome_objective);
+                    DB::insert("insert into `criterion_objective_outcome` (`objective_id`, `outcome_id`, `criterion_id`) values ({$outcome_objective[1]},{$outcome_objective[0]}, {$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();
+                        $scale = new Scale;
 
-                            case 2:
-                                return Redirect::to('school-objective')->withInput();
+                        $position = $i;
+                        $scale->description = $clean_input['scale_description'][$i];
 
-                            case 3:
-                                return Redirect::to('program-objective')->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();
+                            }
                         }
                     }
-                }*/
+                }
                 foreach ($clean_input['program_id'] as $program_id) {
                     DB::insert("insert into `program_criterion` (`criterion_id`, `program_id`) values({$criterionId},{$program_id})");
                 }
@@ -641,7 +747,8 @@ class CriteriaController extends \BaseController
         } elseif (Auth::user()->role == 2) {
             //buscar los objetivos de la departamento (school)
             $objectives = DB::table('program_user')
-                ->join('objectives', 'objectives.program_id', '=', 'program_user.program_id')
+                ->join('objective_program', 'objective_program.program_id', '=', 'program_user.program_id')
+                ->join('objectives', 'objectives.id', '=', 'objective_program.objective_id')
                 ->join('programs', 'programs.id', '=', 'program_user.program_id')
                 ->where('programs.school_id', Auth::user()->school_id)
                 ->select('objectives.id', 'objectives.text', 'programs.name')
@@ -650,7 +757,8 @@ class CriteriaController extends \BaseController
         } elseif ((Auth::user()->role == 3) || (Auth::user()->role == 4)) {
             //buscar los objetivos de los programas cuales el profesor esta
             $objectives = DB::table('program_user')
-                ->join('objectives', 'objectives.program_id', '=', 'program_user.program_id')
+                ->join('objective_program', 'objective_program.program_id', '=', 'program_user.program_id')
+                ->join('objectives', 'objectives.id', '=', 'objective_program.objective_id')
                 ->join('programs', 'programs.id', '=', 'program_user.program_id')
                 ->where('program_user.user_id', Auth::user()->id)
                 ->select('objectives.id', 'objectives.text', 'programs.name')

app/controllers/ObjectivesController.php

@@ -1,56 +1,47 @@
 <?php
 
-class ObjectivesController extends \BaseController {
-
-    /**
-     * Display a listing of the resource.
-     *
-     * @return Response
-     */
-    public function fetch()
-    {
-        try
-        {
-            $outcome_id = Input::get('outcome_id');
-            $program_id = Input::get('program_id');
-            $format = Input::get('format');
-
-
-            $objectives = Objective::select('id', 'outcome_id', 'program_id', 'text');
-
-            if($outcome_id)
-            {
-                $objectives->where('outcome_id', $outcome_id);
-            }
-
-            if($program_id)
-            {
-                $objectives->where('program_id', $program_id);
-            }
-
-            if($format == 'select')
-            {
-                $string = '';
-                foreach ($objectives->get() as $objective)
-                {
-                    $string.='<option value="'.$objective->id.'">'.$objective->text.'</option>';
-                }
-
-                echo $string;
-                return;
-            }
-            else
-            {
-                return $objectives->get();
-            }
-        }
-        catch (Exception $e)
-        {
-            echo $e->getMessage();
-            return;
+class ObjectivesController extends \BaseController
+{
+
+  /**
+   * Display a listing of the resource.
+   *
+   * @return Response
+   */
+  public function fetch()
+  {
+    try {
+      $outcome_id = Input::get('outcome_id');
+      $program_id = Input::get('program_id');
+      $format = Input::get('format');
+
+
+      $objectives = Objective::select('id', 'outcome_id', 'program_id', 'text');
+
+      if ($outcome_id) {
+        $objectives->where('outcome_id', $outcome_id);
+      }
+
+      if ($program_id) {
+        $objectives->where('program_id', $program_id);
+      }
+
+      if ($format == 'select') {
+        $string = '';
+        foreach ($objectives->get() as $objective) {
+          $string .= '<option value="' . $objective->id . '">' . $objective->text . '</option>';
         }
 
+        echo $string;
+        return;
+      } else {
+        return $objectives->get();
+      }
+    } catch (Exception $e) {
+      echo $e->getMessage();
+      return;
     }
+  }
 
   /**
    * Edit the learning objectives per learning outcome for a program
@@ -60,20 +51,15 @@ class ObjectivesController extends \BaseController {
     $role = Auth::user()->role;
 
     // Redirect users if they try to access forbidden page
-  	if($role == 2 && $program->school_id != Auth::user()->school_id)
-  	{
-		return Redirect::to('/');
-  	}
-  	else if($role == 3 && !in_array($program->id, Auth::user()->programs->lists('id')))
-  	{
-		return Redirect::to('/');
-  	}
-  	else if($role == 4)
-  	{
-		return Redirect::to('/');
-  	}
-
-    $title = 'Learning Objectives ('.$program->name.')';
+    if ($role == 2 && $program->school_id != Auth::user()->school_id) {
+      return Redirect::to('/');
+    } else if ($role == 3 && !in_array($program->id, Auth::user()->programs->lists('id'))) {
+      return Redirect::to('/');
+    } else if ($role == 4) {
+      return Redirect::to('/');
+    }
+
+    $title = 'Learning Objectives (' . $program->name . ')';
     $objectives = $program->objectives;
 
     // Eager load outcomes related to objectives
@@ -86,37 +72,34 @@ class ObjectivesController extends \BaseController {
 
   public function create()
   {
-    try
-    {
+    try {
       $outcome_id = Input::get('outcome_id');
       $program_id = Input::get('program_id');
       $learning_objective = trim(Input::get('learning_objective'));
 
 
       $validator = Validator::make(
-          array(
-              'outcome_id' => $outcome_id,
-              'program_id' => $program_id,
-              'learning_objective' => $learning_objective
-          ),
-          array(
-              'outcome_id' => 'required|integer',
-              'program_id' => 'required|integer',
-              'learning_objective' => 'required|min:1',
-          )
+        array(
+          'outcome_id' => $outcome_id,
+          'program_id' => $program_id,
+          'learning_objective' => $learning_objective
+        ),
+        array(
+          'outcome_id' => 'required|integer',
+          'program_id' => 'required|integer',
+          'learning_objective' => 'required|min:1',
+        )
       );
 
-      if($validator->fails())
-      {
+      if ($validator->fails()) {
         /** Prepare error message */
         $message = '<p>Error(s) creating a new Learning Objective: </p><ul>';
 
-        foreach ($validator->messages()->all('<li>:message</li>') as $validationError)
-        {
-            $message.=$validationError;
+        foreach ($validator->messages()->all('<li>:message</li>') as $validationError) {
+          $message .= $validationError;
         }
 
-        $message.='</ul>';
+        $message .= '</ul>';
 
         /** Send error message and old data */
         Session::flash('status', 'danger');
@@ -131,16 +114,14 @@ class ObjectivesController extends \BaseController {
       ));
 
       /** Send success message */
-        Session::flash('status', 'success');
-        Session::flash('message', 'New Learning Objective successfully created.');
-        return Redirect::back();
-    }
-    catch(Exception $e)
-    {
+      Session::flash('status', 'success');
+      Session::flash('message', 'New Learning Objective successfully created.');
+      return Redirect::back();
+    } catch (Exception $e) {
       /** Send error message and old data */
-        Session::flash('status', 'danger');
-        Session::flash('message', 'An error ocurred trying to create a new Learning Objective. Please try again later.'.$e->getMessage());
-        return Redirect::back()->withInput();
+      Session::flash('status', 'danger');
+      Session::flash('message', 'An error ocurred trying to create a new Learning Objective. Please try again later.' . $e->getMessage());
+      return Redirect::back()->withInput();
     }
   }
 
@@ -149,39 +130,36 @@ class ObjectivesController extends \BaseController {
    */
   public function update()
   {
-    try
-    {
+    try {
       $outcome_id = Input::get('edit_outcome_id');
       $objective_id = Input::get('edit_objective_id');
       $active = Input::get('edit_active');
       $learning_objective = trim(Input::get('edit_learning_objective'));
 
       $validator = Validator::make(
-          array(
-            'outcome_id' => $outcome_id,
-            'objective_id' => $objective_id,
-            'active' => $active,
-            'learning_objective' => $learning_objective
-          ),
-          array(
-            'outcome_id' => 'required|integer',
-            'objective_id' => 'required|integer',
-            'active' => 'required|integer|boolean',
-            'learning_objective' => 'required|min:1',
-          )
+        array(
+          'outcome_id' => $outcome_id,
+          'objective_id' => $objective_id,
+          'active' => $active,
+          'learning_objective' => $learning_objective
+        ),
+        array(
+          'outcome_id' => 'required|integer',
+          'objective_id' => 'required|integer',
+          'active' => 'required|integer|boolean',
+          'learning_objective' => 'required|min:1',
+        )
       );
 
-      if($validator->fails())
-      {
+      if ($validator->fails()) {
         /** Prepare error message */
         $message = '<p>Error(s) updating the Learning Objective: </p><ul>';
 
-        foreach ($validator->messages()->all('<li>:message</li>') as $validationError)
-        {
-            $message.=$validationError;
+        foreach ($validator->messages()->all('<li>:message</li>') as $validationError) {
+          $message .= $validationError;
         }
 
-        $message.='</ul>';
+        $message .= '</ul>';
 
         /** Send error message and old data */
         Session::flash('status', 'danger');
@@ -195,19 +173,17 @@ class ObjectivesController extends \BaseController {
           'outcome_id' => $outcome_id,
           'text' => $learning_objective,
           'active' => $active,
-      ));
+        ));
 
       /** Send success message */
-        Session::flash('status', 'success');
-        Session::flash('message', 'Learning Objective successfully updated.');
-        return Redirect::back();
-    }
-    catch(Exception $e)
-    {
-      	/** Send error message and old data */
-        Session::flash('status', 'danger');
-        Session::flash('message', 'An error ocurred trying to create a new Learning Objective. Please try again later.'.$e->getMessage());
-        return Redirect::back()->withInput();
+      Session::flash('status', 'success');
+      Session::flash('message', 'Learning Objective successfully updated.');
+      return Redirect::back();
+    } catch (Exception $e) {
+      /** Send error message and old data */
+      Session::flash('status', 'danger');
+      Session::flash('message', 'An error ocurred trying to create a new Learning Objective. Please try again later.' . $e->getMessage());
+      return Redirect::back()->withInput();
     }
   }
 
@@ -226,8 +202,7 @@ class ObjectivesController extends \BaseController {
       )
     );
 
-    if($validator->fails())
-    {
+    if ($validator->fails()) {
       return '';
     }
     $res = DB::table('objectives')->where('id', Input::get('objective_id'))->first();
@@ -237,16 +212,15 @@ class ObjectivesController extends \BaseController {
 
   public function fetchObjectiveForCriteria()
   {
-      $id = Input::get('id');
+    $id = Input::get('id');
 
-      $objective = Objective::find($id);
+    $objective = Objective::find($id);
 
-      $objective->program;
-      $objective->criteria;
+    //$objective->program;
+    //$objective->criteria;
 
-      return array
-      (
-          'objective' => $objective
-      );
+    return array(
+      'objective' => $objective
+    );
   }
 }

app/controllers/OutcomesController.php

@@ -553,15 +553,31 @@ class OutcomesController extends \BaseController
 
         $diferent_levels = DB::table('criterion_objective_outcome')
             ->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)
-            ->distinct('criteria.number_of_scales')
-            ->select('criteria.number_of_scales as levels')
-            ->orderBy('criteria.number_of_scales', 'asc')
+            ->distinct('criteria.num_scales')
+            ->select('criteria.num_scales as levels')
+            ->orderBy('criteria.num_scales', 'asc')
             ->get();
 
         $criteria_array = array();
 
+        // switch para el query, dependiendo del usuario
+
+        $role = Auth::user()['role'];
+
+        switch ($role) {
+            case 1:
+                $program_ids = DB::table('programs')->lists('id');
+                break;
+            case 2:
+                $school_id = Auth::user()['school_id'];
+                $program_ids = DB::table('programs')->where('school_id', $school_id)->lists('id');
+                break;
+            case 3:
+                $program_ids = DB::table('program_user')->where('user_id', Auth::user()['id'])->lists('program_id');
+                break;
+        }
+
         $outcome->criteria = array();
         foreach ($diferent_levels as $level) {
             $level = $level->levels;
@@ -578,18 +594,25 @@ class OutcomesController extends \BaseController
             //                 ->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')
+                ->join('program_criterion', 'program_criterion.criterion_id', '=', 'criteria.id')
+                ->whereIn('program_criterion.program_id', $program_ids)
                 ->where('criterion_objective_outcome.outcome_id', $id)
-                ->where('criteria.number_of_scales', $level)
-                ->whereNull('criteria.deleted_at')
-                ->select('criteria.id', 'criteria.name')
+                ->where('criteria.num_scales', $level)
+                ->select('criteria.id', 'criteria.name', 'criteria.deleted_at')
                 ->orderBy('criteria.name', 'asc')
                 ->get();
-            $outcome_criterias = $outcome_criterias;
+            // $outcome_criterias = $outcome_criterias;
 
             foreach ($outcome_criterias as $criteria_id) {
+                $scales = DB::select("select * FROM scales INNER join `criterion_scale` on `criterion_scale`.`scale_id` = `scales`.`id` where criterion_scale.criterion_id ={$criteria_id->id} ORDER BY position");
+
+                $programs = DB::table('programs')
+                    ->join('program_criterion', 'program_criterion.program_id', '=', 'programs.id')
+                    ->where('criterion_id', $criteria_id->id)
+                    ->lists('programs.name');
+                Log::info($scales);
 
-                $scales =
+                /* $scales =
                     DB::select(
                         DB::raw("
                   SELECT *
@@ -611,7 +634,8 @@ class OutcomesController extends \BaseController
                   WHERE rn = 1
                   ORDER BY `a`.`position` ASC
                       ")
-                    );
+                    );*/
+                $criteria_id->programs = $programs;
                 // insertar la informacion de los criterios con N niveles en el arreglo de arreglos
                 $criteria_id->scales = $scales;
                 // $i++;

app/controllers/RubricsController.php

@@ -108,9 +108,9 @@ class RubricsController extends \BaseController
 
             $rubricId = $rubric->id;
             foreach ($criteria as $index => $criterion_id) {
-                DB::insert("insert into criterion_rubric (`rubric_id`,`criterion_id`) values ({$rubricId},{$criterion_id})");
+                DB::insert("insert into rubric_criterion (`rubric_id`,`criterion_id`) values ({$rubricId},{$criterion_id})");
                 DB::commit();
-                $rubric_criterion_id = DB::table('criterion_rubric')->where('rubric_id', '=', $rubricId)
+                $rubric_criterion_id = DB::table('rubric_criterion')->where('rubric_id', '=', $rubricId)
                     ->where('criterion_id', '=', $criterion_id)->first();
 
 
@@ -270,16 +270,16 @@ class RubricsController extends \BaseController
 
         $course->save();
         Log::info('entré6???');
-        DB::delete("delete from criterion_rubric where rubric_id ={$rubric->id}");
+        DB::delete("delete from rubric_criterion where rubric_id ={$rubric->id}");
         DB::delete("delete from activity_criterion where activity_id = {$activity->id}");
         foreach ($criteria as $index => $criterion_id) {
             if (
 
-                DB::insert("insert into criterion_rubric (`rubric_id`, `criterion_id`) values ({$rubric->id}, {$criterion_id}) ")
+                DB::insert("insert into rubric_criterion (`rubric_id`, `criterion_id`) values ({$rubric->id}, {$criterion_id}) ")
                 &&  DB::insert("insert into `activity_criterion` (`activity_id`,`criterion_id`, `weight`) values ({$activity->id}, {$criterion_id}, {$defaultWeight})")
             ) {
 
-                $rubric_criterion_id =  DB::table('criterion_rubric')
+                $rubric_criterion_id =  DB::table('rubric_criterion')
                     ->where('rubric_id', '=', $rubric->id)
                     ->where('criterion_id', '=', $criterion_id)
                     ->first();
@@ -360,13 +360,13 @@ class RubricsController extends \BaseController
         Log::info($activity->rubric[0]->id);
 
         $rubric = Rubric::where('id', '=', $activity->rubric[0]->id)->firstOrFail();
-        $criterion_rubric = DB::table('criteria')
-            ->join('criterion_rubric', 'criterion_rubric.criterion_id', '=', 'criteria.id')
-            ->where('criterion_rubric.rubric_id', '=', $activity->rubric[0]->id)
+        $rubric_criterion = DB::table('criteria')
+            ->join('rubric_criterion', 'rubric_criterion.criterion_id', '=', 'criteria.id')
+            ->where('rubric_criterion.rubric_id', '=', $activity->rubric[0]->id)
             ->get();
-        Log::info($criterion_rubric);
+        Log::info($rubric_criterion);
 
-        foreach ($criterion_rubric as $single_cr) {
+        foreach ($rubric_criterion as $single_cr) {
             $single_cr->scales = json_encode(DB::table('scales')
                 ->join('rubric_criteria_scale', 'rubric_criteria_scale.scale_id', '=', 'scales.id')
                 ->where('rubric_criteria_scale.rubric_criterion_id', '=', $single_cr->id)
@@ -378,10 +378,10 @@ class RubricsController extends \BaseController
         }
 
 
-        Log::info($criterion_rubric);
+        Log::info($rubric_criterion);
 
         $title = $activity->name . ': ' . $rubric->name;
-        return View::make('local.professors.viewrubric', compact('rubric', 'activity', 'criterion_rubric', 'title', 'course'));
+        return View::make('local.professors.viewrubric', compact('rubric', 'activity', 'rubric_criterion', 'title', 'course'));
     }
 
     /**
@@ -439,9 +439,9 @@ class RubricsController extends \BaseController
         Log::info($rubric);
 
         $rubric["criteria"] = DB::table("criteria")
-            ->join("criterion_rubric", 'criterion_rubric.criterion_id', '=', 'criteria.id')
-            ->where("criterion_rubric.id", '=', Input::get('rubric_criterion_id'))
-            ->select('name', 'criterion_rubric.notes')
+            ->join("rubric_criterion", 'rubric_criterion.criterion_id', '=', 'criteria.id')
+            ->where("rubric_criterion.id", '=', Input::get('rubric_criterion_id'))
+            ->select('name', 'rubric_criterion.notes')
             ->first();
         return json_encode($rubric);
 

app/database/migrations/2021_06_01_000529_create_scales_table.php

@@ -12,8 +12,8 @@ class CreateScalesTable extends Migration
 			$table->increments('id');
 
 			$table->string('description');
-			$table->integer('min_score')->unsigned();
-			$table->integer('max_score')->unsigned();
+			//$table->integer('min_score')->unsigned();
+			//$table->integer('max_score')->unsigned();
 			$table->timestamps();
 		});
 	}

app/database/migrations/2021_06_01_235626_create_criteria_table.php

@@ -15,7 +15,8 @@ class CreateCriteriaTable extends Migration
 			$table->integer('user_id')->unsigned()->nullable();
 			$table->text('copyright')->nullable();
 			$table->text('notes')->nullable();
-
+			$table->integer('num_scales');
+			$table->integer('max_score');
 			$table->timestamps();
 			$table->timestamp('deleted_at')->nullable();
 

app/database/migrations/2021_06_02_000507_create_rubrics_table.php

@@ -16,8 +16,8 @@ class CreateRubricsTable extends Migration
 			$table->integer('expected_points');
 			$table->integer('user_id')->unsigned();
 			$table->timestamps();
-			$table->integer('num_scales')->unsigned();
-			$table->integer('max_score')->unsigned();
+			//$table->integer('num_scales')->unsigned();
+			//$table->integer('max_score')->unsigned();
 		});
 
 		Schema::table('rubrics', function (Blueprint $table) {

app/database/migrations/2021_06_03_001143_create_transformative_actions_table.php

@@ -17,6 +17,7 @@ class CreateTransformativeActionsTable extends Migration
 
 			$table->increments('id');
 			$table->timestamps();
+			$table->string('type_of_TA');
 			$table->boolean('is_custom');
 			$table->integer('user_id')->unsigned()->nullable();
 			$table->integer('program_id')->unsigned()->nullable();

app/database/migrations/2021_06_03_235944_create_courses_table.php

@@ -16,9 +16,9 @@ class CreateCoursesTable extends Migration
 			$table->integer('program_id')->unsigned();
 			$table->integer('user_id')->unsigned();
 			$table->timestamps();
-			$table->text('criteria_achieved')->nullable();
-			$table->text('outcomes_achieved')->nullable();
-			$table->text('outcomes_attempted')->nullable();
+			//$table->text('criteria_achieved')->nullable();
+			//$table->text('outcomes_achieved')->nullable();
+			//$table->text('outcomes_attempted')->nullable();
 			$table->char('number', 4)->default('0000');
 		});
 

app/database/migrations/2021_06_04_003757_create_activities_table.php

@@ -15,19 +15,19 @@ class CreateActivitiesTable extends Migration
 			$table->integer('course_id')->unsigned()->nullable();
 
 			$table->timestamps();
-			$table->text('criteria_achieved')->nullable();
-			$table->text('criteria_weights')->nullable();
-			$table->text('outcomes_achieved')->nullable();
-			$table->text('outcomes_attempted')->nullable();
+			//$table->text('criteria_achieved')->nullable();
+			//$table->text('criteria_weights')->nullable();
+			//$table->text('outcomes_achieved')->nullable();
+			//$table->text('outcomes_attempted')->nullable();
 
 			$table->text('assessment_comments')->nullable();
-			$table->text('transforming_actions')->nullable();
-			$table->text('criteria_achieved_percentage')->nullable();
+			//$table->text('transforming_actions')->nullable();
+			//$table->text('criteria_achieved_percentage')->nullable();
 
 			$table->date('date');
 			$table->boolean('draft')->default(0);
-			$table->text('criteria_participant_count')->nullable();
-			$table->text('criteria_achiever_count')->nullable();
+			//$table->text('criteria_participant_count')->nullable();
+			//$table->text('criteria_achiever_count')->nullable();
 
 			DB::statement('SET FOREIGN_KEY_CHECKS=1;');
 		});

app/database/migrations/2021_06_04_003810_create_activity_criterion_table.php

@@ -33,7 +33,7 @@ class CreateActivityCriterionTable extends Migration
 			$table->text('assessment_comments')->nullable();
 
 
-			$table->decimal('weight', 3, 2)->default(1.0);
+			$table->decimal('weight', 6, 2)->default(1.0);
 
 			$table->timestamps();
 		});

app/database/migrations/2021_06_05_235636_create_criterion_rubric.php

@@ -8,7 +8,7 @@ class CreateCriterionRubric extends Migration
 
 	public function up()
 	{
-		Schema::create('criterion_rubric', function (Blueprint $table) {
+		Schema::create('rubric_criterion', function (Blueprint $table) {
 			$table->increments('id');
 			$table->integer('criterion_id')->unsigned();
 			$table->integer('rubric_id')->unsigned();
@@ -26,6 +26,7 @@ class CreateCriterionRubric extends Migration
 				->on('rubrics')
 				->onDelete('cascade')
 				->onUpdate('cascade');
+			$table->integer('position');
 		});
 	}
 
@@ -37,6 +38,6 @@ class CreateCriterionRubric extends Migration
 	 */
 	public function down()
 	{
-		Schema::drop('criterion_rubric');
+		Schema::drop('rubric_criterion');
 	}
 }

app/database/migrations/2021_06_05_235749_create_objective_outcome_table.php

@@ -27,6 +27,7 @@ class CreateObjectiveOutcomeTable extends Migration
 				->onDelete('cascade')
 				->onUpdate('cascade');
 			$table->timestamps();
+			$table->unique(array('objective_id', 'outcome_id'));
 		});
 	}
 

app/database/migrations/2021_06_06_000025_create_criterion_objective_outcome_table.php

@@ -11,7 +11,7 @@ class CreateCriterionObjectiveOutcomeTable extends Migration
 		Schema::create('criterion_objective_outcome', function (Blueprint $table) {
 			$table->increments('id');
 			$table->integer('criterion_id')->unsigned();
-			$table->integer('objective_id')->unsigned()->nullable();
+			$table->integer('objective_id')->unsigned();
 			$table->integer('outcome_id')->unsigned();
 			$table
 				->foreign('criterion_id')
@@ -19,7 +19,7 @@ class CreateCriterionObjectiveOutcomeTable extends Migration
 				->on('criteria')
 				->onDelete('cascade')
 				->onUpdate('cascade');
-			$table
+			/*$table
 				->foreign('objective_id')
 				->references('id')
 				->on('objectives')
@@ -30,6 +30,11 @@ class CreateCriterionObjectiveOutcomeTable extends Migration
 				->references('id')
 				->on('outcomes')
 				->onDelete('cascade')
+				->onUpdate('cascade');*/
+			$table->foreign(array('objective_id', 'outcome_id'))
+				->references(array('objective_id', 'outcome_id'))
+				->on('objective_outcome')
+				->onDelete('cascade')
 				->onUpdate('cascade');
 			$table->timestamps();
 		});

app/database/migrations/2021_06_06_000518_create_rubric_criteria_scales_table.php

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

app/database/migrations/2021_06_06_001211_create_transformative_objective_program_table.php → app/database/migrations/2021_06_06_001211_create_transformative_objective_course_table.php

@@ -3,12 +3,12 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class CreateTransformativeObjectiveProgramTable extends Migration
+class CreateTransformativeObjectiveCourseTable extends Migration
 {
 
 	public function up()
 	{
-		Schema::create('transformative_objective_program', function (Blueprint $table) {
+		Schema::create('transformative_objective_course', function (Blueprint $table) {
 			$table->increments('id');
 			$table->timestamps();
 
@@ -26,12 +26,15 @@ class CreateTransformativeObjectiveProgramTable extends Migration
 				->onDelete('cascade')
 				->onUpdate('cascade');
 
-			$table->integer('program_id')->unsigned();
+			$table->string('course_code');
+			$table->string('course_number');
+
+			/*$table->integer('program_id')->unsigned();
 			$table->foreign('program_id')
 				->references('id')
 				->on('programs')
 				->onDelete('cascade')
-				->onUpdate('cascade');
+				->onUpdate('cascade');*/
 		});
 	}
 
@@ -42,6 +45,6 @@ class CreateTransformativeObjectiveProgramTable extends Migration
 	 */
 	public function down()
 	{
-		Schema::drop('transformative_objective_program');
+		Schema::drop('transformative_objective_course');
 	}
 }

app/database/migrations/2021_06_07_001028_create_templates_criterion_table.php

@@ -22,6 +22,7 @@ class CreateTemplatesCriterionTable extends Migration
 				->on('templates')
 				->onDelete('cascade')
 				->onUpdate('cascade');
+			$table->integer('position')->unsigned();
 		});
 	}
 

app/database/migrations/2021_06_07_001036_create_templates_criterion_scale_table.php

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

app/database/migrations/2021_06_15_235856_create_annual_plan_transformative_table.php

@@ -27,10 +27,10 @@ class CreateAnnualPlanTransformativeTable extends Migration
 				->on('annual_plans')
 				->onDelete('cascade')
 				->onUpdate('cascade');
-			$table->integer('typ_semester_objective_id')->unsigned();
-			$table->foreign('typ_semester_objective_id')
+			$table->integer('typ_semester_course_id')->unsigned();
+			$table->foreign('typ_semester_course_id')
 				->references('id')
-				->on('typ_semester_objectives')
+				->on('typ_semester_courses')
 				->onDelete('cascade')
 				->onUpdate('cascade');
 			$table->integer('proposing_coordinator_id')->unsigned();

app/database/migrations/2021_06_22_150017_delete_min_max_scales.php

@@ -1,34 +0,0 @@
-<?php
-
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Support\Facades\Blade;
-
-class DeleteMinMaxScales extends Migration
-{
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::table('scales', function (Blueprint $table) {
-			$table->dropColumn(array('min_score', 'max_score'));
-		});
-	}
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::table('scales', function (Blueprint $table) {
-			$table->integer('min_score')->unsigned();
-			$table->integer('max_score')->unsigned();
-		});
-	}
-}

app/database/migrations/2021_06_22_150108_add_copyright_notes_rubric_criterion.php

@@ -1,41 +0,0 @@
-<?php
-
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Support\Facades\Schema;
-
-class AddCopyrightNotesRubricCriterion extends Migration
-{
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::table('criterion_rubric', function (Blueprint $table) {
-			$table->text('copyright')->nullable();
-			$table->text('notes')->nullable();
-		});
-		Schema::table('template_criterion', function (Blueprint $table) {
-			$table->text('copyright')->nullable();
-			$table->text('notes')->nullable();
-		});
-	}
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::table('criterion_rubric', function (Blueprint $table) {
-			$table->dropColumn(array('copyright', 'notes'));
-		});
-		Schema::table('template_criterion', function (Blueprint $table) {
-			$table->dropColumn(array('copyright', 'notes'));
-		});
-	}
-}

app/database/migrations/2021_06_22_150135_change_weight_float.php

@@ -1,34 +0,0 @@
-<?php
-
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class ChangeWeightFloat extends Migration
-{
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::table('activity_criterion', function (Blueprint $table) {
-
-			DB::statement("ALTER TABLE `activity_criterion` MODIFY COLUMN `weight` decimal(6,2)");
-		});
-	}
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::table('activity_criterion', function (Blueprint $table) {
-
-			DB::statement("ALTER TABLE `activity_criterion` MODIFY COLUMN `weight` decimal(3,2)");
-		});
-	}
-}

app/database/migrations/2021_07_05_083455_create_titles.php

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateTitles extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('titles', function (Blueprint $table) {
+			$table->increments('id');
+			$table->string('text');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('titles');
+	}
+}

app/database/migrations/2021_07_06_075249_fix_activities.php

@@ -1,43 +0,0 @@
-<?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()
-	{
-		Schema::table('activities', function (Blueprint $table) {
-			$table->text('criteria_achieved')->nullable();
-			$table->text('criteria_weights')->nullable();
-			$table->text('outcomes_achieved')->nullable();
-			$table->text('outcomes_attempted')->nullable();
-			$table->text('criteria_achieved_percentage')->nullable();
-			$table->text('criteria_participant_count')->nullable();
-			$table->text('criteria_achiever_count')->nullable();
-		});
-	}
-}

app/database/migrations/2021_07_06_082232_rubric_titles.php

@@ -15,7 +15,12 @@ class RubricTitles extends Migration
 	{
 		Schema::create('rubric_title', function (Blueprint $table) {
 			$table->increments('id');
-			$table->string('title');
+			$table->integer('title_id')->unsigned();
+			$table->foreign('title_id')
+				->references('id')
+				->on('titles')
+				->onDelete('cascade')
+				->onUpdate('cascade');
 			$table->integer('position');
 			$table->integer('rubric_id')->unsigned();
 			$table->foreign('rubric_id')

app/database/migrations/2021_07_06_085513_template_titles.php

@@ -15,7 +15,12 @@ class TemplateTitles extends Migration
 	{
 		Schema::create('template_title', function (Blueprint $table) {
 			$table->increments('id');
-			$table->string('title');
+			$table->integer('title_id')->unsigned();
+			$table->foreign('title_id')
+				->references('id')
+				->on('titles')
+				->onDelete('cascade')
+				->onUpdate('cascade');
 			$table->integer('position');
 			$table->integer('template_id')->unsigned();
 			$table->foreign('template_id')

app/database/migrations/2021_07_06_130407_create_transformative_objective_activity.php → app/database/migrations/2021_07_22_092532_create_transformative_activity_criterion.php

@@ -3,7 +3,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class CreateTransformativeObjectiveActivity extends Migration
+class CreateTransformativeActivityCriterion extends Migration
 {
 
 	/**
@@ -13,24 +13,20 @@ class CreateTransformativeObjectiveActivity extends Migration
 	 */
 	public function up()
 	{
-		Schema::create('transformative_objective_activity', function (Blueprint $table) {
+		Schema::create('transformative_activity_criterion', function (Blueprint $table) {
 			$table->increments('id');
 			$table->integer('trans_action_id')->unsigned();
-			$table->integer('activity_id')->unsigned();
-			$table->integer('objective_id')->unsigned();
-			$table->foreign('objective_id')
-				->references('id')
-				->on('objectives')
-				->onDelete('cascade')
-				->onUpdate('cascade');
+			$table->integer('activity_criterion_id')->unsigned();
+
+
 			$table->foreign('trans_action_id')
 				->references('id')
 				->on('transformative_actions')
 				->onDelete('cascade')
 				->onUpdate('cascade');
-			$table->foreign('activity_id')
+			$table->foreign('activity_criterion_id')
 				->references('id')
-				->on('activities')
+				->on('activity_criterion')
 				->onDelete('cascade')
 				->onUpdate('cascade');
 		});
@@ -43,6 +39,6 @@ class CreateTransformativeObjectiveActivity extends Migration
 	 */
 	public function down()
 	{
-		Schema::drop('transformative_objective_activity');
+		Schema::drop('transformative_activity_criterion');
 	}
 }

app/database/old_migrations/2020_04_22_095649_create_new_criterion_rubric_table.php

@@ -13,7 +13,7 @@ class CreateNewCriterionRubricTable extends Migration
 	 */
 	public function up()
 	{
-		Schema::create('criterion_rubric', function (Blueprint $table) {
+		Schema::create('rubric_criterion', function (Blueprint $table) {
 			$table->increments('id');
 			$table->integer('criterion_id')->unsigned();
 			$table->integer('rubric_id')->unsigned();
@@ -42,6 +42,6 @@ class CreateNewCriterionRubricTable extends Migration
 	 */
 	public function down()
 	{
-		Schema::drop('criterion_rubric');
+		Schema::drop('rubric_criterion');
 	}
 }

app/database/old_migrations/2021_03_29_151507_create_transformative_objective_program.php

@@ -13,7 +13,7 @@ class CreateTransformativeObjectiveProgram extends Migration
 	 */
 	public function up()
 	{
-		Schema::create('transformative_objective_program', function (Blueprint $table) {
+		Schema::create('transformative_objective_course', function (Blueprint $table) {
 			$table->increments('id');
 			$table->timestamps();
 
@@ -47,6 +47,6 @@ class CreateTransformativeObjectiveProgram extends Migration
 	 */
 	public function down()
 	{
-		Schema::drop('transformative_objective_program');
+		Schema::drop('transformative_objective_course');
 	}
 }

app/database/old_migrations/2021_05_20_184230_create_rubric_scales.php

@@ -25,7 +25,7 @@ class CreateRubricScales extends Migration
 				->onUpdate('cascade');
 			$table->foreign('rubric_criterion_id')
 				->references('id')
-				->on('criterion_rubric')
+				->on('rubric_criterion')
 				->onDelete('cascade')
 				->onUpdate('cascade');
 			$table->integer('position');

app/database/seeds/FillNewAssessmentActivityCriterion.php

@@ -10,10 +10,10 @@ class FillNewAssessmentActivityCriterion extends Seeder
 		$activities = DB::table('activities')
 			->join('rubric_activity', 'activities.id', '=', 'rubric_activity.activity_id')
 			->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
-			->join('criterion_rubric', 'rubrics.id', '=', 'criterion_rubric.rubric_id')
-			->select('activities.*', 'rubrics.expected_percentage', 'rubrics.expected_points', 'criterion_rubric.criterion_id')
+			->join('rubric_criterion', 'rubrics.id', '=', 'rubric_criterion.rubric_id')
+			->select('activities.*', 'rubrics.expected_percentage', 'rubrics.expected_points', 'rubric_criterion.criterion_id')
 			->orderBy('activities.id')
-			->orderBy('criterion_rubric.criterion_id')
+			->orderBy('rubric_criterion.criterion_id')
 			->get();
 		//   DB::enableQueryLog();
 		// 		dd(DB::getQueryLog());
@@ -83,9 +83,9 @@ class FillNewAssessmentActivityCriterion extends Seeder
 					// 					var_dump($criterion_id);
 					var_dump($assessment);
 					// 					$activities=DB::table('activities')->where('id', $activity_id)->first();
-					// 					$criterion_rubric=DB::table('criterion_rubric')->where('criterion_id', $criterion_id)->first();
+					// 					$rubric_criterion=DB::table('rubric_criterion')->where('criterion_id', $criterion_id)->first();
 					// 					var_dump($activities);
-					// 					var_dump($criterion_rubric);
+					// 					var_dump($rubric_criterion);
 					// 					exit();
 					$activity_criterion_id = DB::table('activity_criterion')->insertGetId(
 						array(

app/database/seeds/FillNewCriterionRubric.php

@@ -59,9 +59,9 @@ class FillNewCriterionRubric extends Seeder
 					if (empty($existe2)) {
 						DB::table('criteria')->insert($criterion);
 					}
-					$existe3 = (array)DB::table('criterion_rubric')->where('criterion_id', $criterion["id"])->where('rubric_id', $rubric->id)->first();
+					$existe3 = (array)DB::table('rubric_criterion')->where('criterion_id', $criterion["id"])->where('rubric_id', $rubric->id)->first();
 					if (empty($existe3)) {
-						DB::table('criterion_rubric')->insert(
+						DB::table('rubric_criterion')->insert(
 							array('criterion_id' => $dato["id"], 'rubric_id' => $rubric->id)
 						);
 					}

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/models/Course.php

@@ -33,12 +33,14 @@ class Course extends Eloquent
 
   public function assessedActivities()
   {
-    return $this->hasMany('Activity')->whereNotNull('activities.outcomes_attempted')->orderBy('date', 'asc');
+    // return $this->hasMany('Activity')->whereNotNull('activities.outcomes_attempted')->orderBy('date', 'asc');
+    return $this->hasMany('Activity')->where('activities.draft', 0)->orderBy('date', 'asc');
   }
 
   public function publishedActivities()
   {
-    return $this->hasMany('Activity')->whereNotNull('activities.outcomes_attempted')->where('activities.draft', 0)->orderBy('date', 'asc');
+    //return $this->hasMany('Activity')->whereNotNull('activities.outcomes_attempted')->where('activities.draft', 0)->orderBy('date', 'asc');
+    return $this->hasMany('Activity')->where('activities.draft', 0)->orderBy('date', 'asc');
   }
 
   public function outcomes_attempted()

app/models/Criterion.php

@@ -7,8 +7,8 @@ class Criterion extends Eloquent
 	use SoftDeletingTrait;
 	protected $dates = ['deleted_at'];
 
-//     protected $table = 'new_criteria';
-    protected $table = 'criteria';
+	//     protected $table = 'new_criteria';
+	protected $table = 'criteria';
 
 	public function outcomes()
 	{
@@ -23,11 +23,11 @@ class Criterion extends Eloquent
 		return $this->belongsToMany('Objective');
 	}
 
-    public function rubrics()
-    {
-//         return $this->belongsToMany('Rubric', 'new_criterion_rubric');
-        return $this->belongsToMany('Rubric', 'criterion_rubric');
-    }
+	public function rubrics()
+	{
+		//         return $this->belongsToMany('Rubric', 'new_rubric_criterion');
+		return $this->belongsToMany('Rubric', 'rubric_criterion');
+	}
 
 	/**
 	 * Return the program that the criterion belongs to
@@ -63,18 +63,17 @@ class Criterion extends Eloquent
 			->select('activity_criterion.id')
 			->distinct()
 			->get();
-			
-		foreach($activities_criterions as $activity_criterion)
-		{
-		
-// 			 $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')
+
+		foreach ($activities_criterions as $activity_criterion) {
+
+			// 			 $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)
+				->where('activity_criterion.id', $activity_criterion->id)
 				->count();
 		}
 		return $students_attempted;
@@ -82,41 +81,40 @@ class Criterion extends Eloquent
 
 	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')
+		$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_points')
+			->where('activities.id', '=', $activity_id)
+			->where('activity_criterion.criterion_id', '=', $criterion_id)
+			->select('activity_criterion.id', 'expected_points')
 			->distinct()
 			->get();
-			
-		foreach($activities_criterions as $activity_criterion)
-		{
-		
-// 			$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')
-// 				->where('activity_criterion.id',$activity_criterion->id)
-// 				->where('new_assessments.score','>=',$activity_criterion->expected_student_score)
-// 				->count();
-
-			 $students_achieved+=DB::table('assessments')
+
+		foreach ($activities_criterions as $activity_criterion) {
+
+			// 			$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')
+			// 				->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('assessments.score','>=',$activity_criterion->expected_points)
+				->where('activity_criterion.id', $activity_criterion->id)
+				->where('assessments.score', '>=', $activity_criterion->expected_points)
 				->count();
 		}
 		return $students_achieved;

app/models/Objective.php

@@ -5,7 +5,7 @@ use Illuminate\Database\Eloquent\SoftDeletingTrait;
 class Objective extends Eloquent
 {
     use SoftDeletingTrait;
-    protected $fillable = array('text', 'outcome_id', 'program_id', 'active');
+    protected $fillable = array('text', 'outcome_id',  'active');
     protected $table = 'objectives';
 
     /**

app/routes.php

@@ -166,6 +166,11 @@ Route::group(array('before' => 'auth|has_access'), function () {
     /**
      * Shared Routes
      */
+
+    Route::post('changeStatusOfCriterion', array(
+        'as' => 'changeStatusOfCriterion',
+        'uses' => 'CriteriaController@changeStatus'
+    ));
     Route::post('createThreeYearCycle', array(
         'as' => 'createThreeYearCycle',
         'uses' => 'ThreeYearPlanController@create'

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/managers/shared/rubrics.blade.php

@@ -195,12 +195,19 @@
             <form>
                 <div class="form-group">
                     <label>Select a Learning Outcome</label>
-                    <select id="select-outcome" class="form-control selectpicker">
+                    <select id="select-outcome" class="form-control selectpicker" onchange="fetchObjective(this)">
                         @foreach ($outcomes as $outcome)
                         <option data-outcome-id="{{ $outcome->id }}">{{ $outcome->name }}</option>
                         @endforeach
                     </select>
                 </div>
+                <div class="form-group">
+                    <label>Select an Objective</label>
+                    <select id="select-objective" class="form-control selectpicker" onchange="fetchCriteria($('#select-outcome'), this)">
+                        
+                    </select>
+                </div>
+
                     <div class="form-group">
                         <label>Select the Maximum Score</label>
                     <select id="max_score" class="form-control selectpicker">
@@ -310,8 +317,28 @@
 // Functions
 // --------------------------------------------------------------------------
 
+function fetchObjective(outcome){
+    $.post(
+        "{{URL::route('fetchObjectivesForSelect')}}",
+        {
+            outcomeID:$(outcome).find(':selected').data('outcome-id'),
+        },
+        function(data){
+            options = '';
+            for(objective_index in data){
+                options += '<option value = "'+data[objective_index].objective_id+'">'+data[objective_index].text+'</option>';
+
+            }
+            $('#select-objective').html(options);
+            $('#select-objective').selectpicker('refresh');
+            fetchCriteria($('#select-outcome'), $('#select-objective'));
+
+        }, 'json',
+    );
+
+}
 // Fetch criteria associated to a specific learning outcome
-function fetchCriteria(outcome)
+function fetchCriteria(outcome, objective)
 {
     $.post
     (
@@ -428,7 +455,7 @@ function addCriterion()
 
             if(notes)
             {
-                str+='<span><em data-toggle="tooltip" data-placement="top" title="'+notes+'">'+name+'</em></span><sup></sup>'+subcriteria+'</td>';
+                str+='<span><em data-toggle="tooltip" data-placement="top" title="'+notes+'">'+data.criterion.name+'</em></span><sup></sup>'+subcriteria+'</td>';
             }
             else
             {
@@ -446,17 +473,15 @@ function addCriterion()
                 str+='<td class="editable" data-type="textarea"></td>';
             }
         }
-        if(copyright== null) copyright= '';
-        if(notes == null)notes ='';
-        str += '<td class = "editable nullable" data-type = "textarea">'+copyright+'</td>';
-        str+= '<td class = "editable nullable" data-type = "textarea">'+notes+'</td>';
+        str+= '<td>'+data.outcomes+'</td>'
+        
 
             str +='<th><span class="glyphicon glyphicon-remove icon-btn" aria-hidden="true"></span></th></tr>';
 
             $('table tbody').append(str);
 
             // Build copyright list
-            buildOutcomeList();
+            buildCopyrightList();
 
             // Enable X-Edtable on this new row
             $('.editable').editable({
@@ -506,7 +531,7 @@ function fetchCriterion(criterion)
 }
 
 // Build list from copyright info in rubric
-function buildOutcomeList()
+function buildCopyrightList()
 {
     // Empty the copyright list
     $('#copyright-list').empty();
@@ -515,15 +540,15 @@ function buildOutcomeList()
     {
         var criterion = $(this);
         // If there's copyright info
-        if(criterion.data('outcomes')!=null){
-            var outcomes = criterion.data('outcomes');
+        if(criterion.data('copyright')!=null){
+            var copyright = criterion.data('copyright');
             if($('#copyright-list li').length>0)
             {
                 var found = false;
                 $('#copyright-list li').each(function()
                 {
                     // If found, give the string its number
-                    if(outcomes==$(this).find('span').text())
+                    if(copyright==$(this).find('span').text())
                     {
 
                         copyrightNumber = Number.parseInt($(this).find('sup').text());
@@ -548,13 +573,13 @@ function buildOutcomeList()
                     console.log(criterion.children('td:nth-child(2)').find('sup').length);
 
                     criterion.children('td:nth-child(2)').find('sup').text(copyrightNumber);
-                    $('#copyright-list').append('<li><sup>'+copyrightNumber+' </sup><span>'+outcomes+'<span></li>');
+                    $('#copyright-list').append('<li><sup>'+copyrightNumber+' </sup><span>'+copyright+'<span></li>');
                 }
             }
             else
             {
                 criterion.children('td:nth-child(2)').find('sup').text('1');
-                $('#copyright-list').append('<li><sup>1 </sup><span>'+outcomes+'<span></li>');
+                $('#copyright-list').append('<li><sup>1 </sup><span>'+copyright+'<span></li>');
             }
         }
     });
@@ -825,7 +850,7 @@ function loadTemplate()
                 $('table tbody').append(str);
 
                 // Build copyright list
-                buildOutcomeList();
+                buildCopyrightList();
 
                 // Enable X-Edtable on this new row
                 $('.editable').editable({
@@ -850,7 +875,7 @@ function loadTemplate()
             });
 
             // Build Copyright List
-            buildOutcomeList();
+            buildCopyrightList();
 
             var selected = $('#select-template').find(':selected');
         var programs = {{ json_encode(Auth::user()->programs->lists('id')) }};
@@ -1033,7 +1058,7 @@ function changeTable(){
                 counter++;
             }
             }
-            newScaleHeaders += '<th>Copyright</th><th>Notes</th><th></th>';
+            newScaleHeaders += '<th>Outcomes</th><th></th>';
             
             $("#criterion-header").html(newScaleHeaders);
             $('#allCriteria').html(' ');
@@ -1079,11 +1104,11 @@ $('#number_of_scales').on('change', function(){
     changeTable();
 })
 // When a learning outcome changes, update its criteria
-$('#select-outcome, input[name=criteria-filter]').on('change', function()
+/*$('#select-outcome, input[name=criteria-filter]').on('change', function()
 {
     fetchCriteria($('#select-outcome'));
 });
-
+*/
 // When the add button is clicked
 $('#button-add-criterion').on('click', function(e)
 {
@@ -1267,7 +1292,7 @@ $('table').on('click', 'span.glyphicon-remove', function(e)
         $('#rubric-container').hide();
     }
 
-    buildOutcomeList();
+    buildCopyrightList();
 });
 
 // When print button is clicked, redirect to print page

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

@@ -103,7 +103,7 @@
                 <tr>
                     <th>
                     </th>
-                    @foreach ($criterion_rubric as $index => $criterion)
+                    @foreach ($rubric_criterion as $index => $criterion)
                     <th  data-criterion-id="{{{ $criterion->criterion_id }}}" ><div class="th-box">
                         
                         Weight<input class="form-control" id="weight-{{$index}}" name='weight[]' type="text"  value="{{$criterion->weight}}" data-activity-criterion-id="{{$criterion->activity_criterion_id}}">
@@ -116,7 +116,7 @@
                                 Student
                             </div>
                         </th>
-                        @foreach ($criterion_rubric as $criterion)
+                        @foreach ($rubric_criterion as $criterion)
                             <th class="criterion-field" data-activity-criterion-id = "{{$criterion->activity_criterion_id}}"data-rubric-criterion-id = "{{$criterion->rubric_criterion_id}}" data-criterion-id="{{{ $criterion->criterion_id }}}" ><div class="th-box">{{ $criterion->name}}</div></th>
                         @endforeach
                         <th>Student Percentage</th>
@@ -137,7 +137,7 @@
                         </td>
 
                         <!-- For each criterion in the rubric, there's a score field -->
-                        @for ($i = 0; $i<sizeof($criterion_rubric); $i++)
+                        @for ($i = 0; $i<sizeof($rubric_criterion); $i++)
                             <td class="score-field">
                                 <select name="" id="" class="form-control" data-toggle="tooltip" data-placement="right" title="{{{ $student->name }}}">
                                 <!-- Option from 0-8 -->
@@ -170,7 +170,7 @@
                 @foreach ($students as $student)
                     <tr class="student-row">
                         <td class="student-field" data-student-id={{ $student->id }}>{{{ $student->name }}}</td>
-                        @for ($i = 0; $i<sizeof($criterion_rubric); $i++)
+                        @for ($i = 0; $i<sizeof($rubric_criterion); $i++)
                             <td class="score-field" data-weight = '1'>
                                 <select name="" id="" class="form-control" data-toggle="tooltip" data-placement="right" title="{{{ $student->name }}}">
                                     @for($j=0; $j<=$rubric->max_score; $j++)
@@ -192,7 +192,7 @@
                     <td>
                         <strong>Passed Criteria Percentage </strong>
                     </td>
-                    @for ($i = 0; $i<sizeof($criterion_rubric); $i++)
+                    @for ($i = 0; $i<sizeof($rubric_criterion); $i++)
                         <td class="total"><strong><span class="total-value"></span><span class="percent-sign">%</span></strong>
                         </td>
                     @endfor

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)

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

@@ -39,7 +39,7 @@
           </tr>
         </thead>
         <tbody>
-        @foreach($criterion_rubric as $index => $criterion)
+        @foreach($rubric_criterion as $index => $criterion)
           <tr data-criterion-copyright="{{ $criterion->copyright }}" data-criterion-notes="{{ $criterion->notes }}">
             <td>{{ $index + 1 }}.</td>
             @if(isset($criterion->notes))