Final Work

READMEPLEASE.txt

@@ -1,14 +0,0 @@
-NO CORRAN LOS MIGRATIONS QUE TIENEN. hay algunos migrations que los hice y creé otros migrations para cancelar esos por ignorancia. Ahora
-
-
-1. Añadí un objectiveController que se llama Objective2Controller. Las rutas
-	que tienen ese controller se tienen que añadir dentro del routes.php
-
-2. Añadí un objectives.blade.php para editar objective
-3. Edité criteria.blade.php
-4. Edité criteriaController.php
-5. No creé modelos que funcionan, preferí utilizar DB::select()
-
-6. edité criteria donde esta la tabla, apunta a new_criteria en vez de criteria
-7. Los outcomes, apuntan a outcomes, no a new_outcomes, descubrí eso el martes 11/17 y no me deja añadir a new_outcomes
-8. CUALQUIERO DUDA contactarme gabriel.santiago21@upr.edu  787-969-0474

app/controllers/CriteriaController.php

@@ -11,16 +11,62 @@ class CriteriaController extends \BaseController
      * 
      * @return Response
      */
+    public function editProgram()
+    {
+        $userProgram = Auth::user()['id'];
+
+        $userProgram = DB::select("select program_user.program_id from program_user where user_id = {$userProgram}");
+        Log::info($userProgram);
+        $title = "Criteria";
+        $outcomes = Outcome::orderBy('name', 'ASC')->lists('name', 'id');
+
+        $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'));
+    }
+
+    public function editSchool()
+    {
+        $userSchool = Auth::user()['school_id'];
+        Log::info($userSchool);
+        $title = "Criteria";
+        $outcomes = Outcome::orderBy('name', 'ASC')->lists('name', 'id');
+
+        $schools = School::find($userSchool)->get();
+        $criteria = Criterion::withTrashed()->orderBy('name', 'ASC')->get();
+        $programs = Program::where("school_id", "=", $userSchool)->orderBy('name', 'ASC')->get();
+        $listOfId = array();
+        foreach ($programs as $program) {
+
+            $listOfId[] = $program->id;
+        }
+
+        $objectives = DB::table('objectives')->whereIn('program_id', $listOfId)->orderBy('text', 'ASC')->lists('text', 'id');
+
+
+
+
+
+        return View::make('local.managers.sCoords.criteria', compact('title', 'outcomes', 'schools', 'criteria', 'programs', 'objectives'));
+    }
+
+
     public function fetchCriterion()
     {
         return Criterion::find(Input::get('id'));
     }
+    public function fetchAllCriterion()
+    {
+        $program_id = Input::get('program_fetch');
+        $outcome_id = Input::get('outcome_fetch');
+        $json = array();
+        $json['criterion'] = DB::select("SELECT * FROM `new_criteria` where id in (select criterion_id from criterion_objective_outcome where outcome_id ={$outcome_id}) and id in(select criterion_id from program_criterion where program_id = {$program_id})");
+        return json_encode($json);
+    }
     public function fetchObjectivesForSelect()
     {
-        //$alloutcome = Input::get('outcome');
-        //$array = array();
-        //foreach ($alloutcome as $outcome) {
-        $outcome = DB::select("select objectives.id, objectives.text from objectives, objective_outcome where objective_outcome.outcome_id =? and objective_outcome.objective_id = objectives.id and objectives.active=1", array(Input::get('id')));
+
+        $outcome = DB::select("select objectives.id, objectives.text, outcomes.name from objectives, objective_outcome, outcomes where  objective_outcome.outcome_id =? and objective_outcome.objective_id = objectives.id and objectives.active=1 and outcomes.id = objective_outcome.outcome_id", array(Input::get('id')));
         //
         return json_encode($outcome);
     }
@@ -29,22 +75,31 @@ class CriteriaController extends \BaseController
 
         $json = array();
         $json['criteria'] = DB::select(" select * from new_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", 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')));
-        $json['objectives_outcome'] = DB::select("select objectives.id, objectives.text, objective_outcome.outcome_id from objective_outcome, objectives where objective_outcome.outcome_id in(select  DISTINCT outcomes.id from outcomes , criterion_objective_outcome where criterion_objective_outcome.criterion_id = ? 
-        and outcomes.id = criterion_objective_outcome.outcome_id) and objectives.id = objective_outcome.objective_id ORDER BY outcome_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')));
+        $json['objectives_outcome'] = DB::select("select objectives.id, objectives.text, objective_outcome.outcome_id from objective_outcome, objectives where objective_outcome.outcome_id in(select  DISTINCT outcomes.id from outcomes , criterion_objective_outcome where criterion_objective_outcome.criterion_id = ? and outcomes.id = criterion_objective_outcome.outcome_id) and objectives.id = objective_outcome.objective_id ORDER BY outcome_id", array(Input::get('id')));
+        $json['scales'] = DB::select("select title, description, min_score, max_score from scales, criterion_scale where criterion_scale.scale_id = scales.id and criterion_id = ?", array(Input::get('id')));
+        $json['program'] = DB::select("select criterion_id, program_id from program_criterion where criterion_id =?", array(Input::get('id')));
+        $json['activity_criterion'] = DB::select("select * from assessments where activity_id  in (select activity_id from activity_criterion where criterion_id = ?)", array(Input::get('id')));
 
-
-        //foreach ($objectivesAll as $objective) {
-
-        //   $objectivesArray = (array) $objective;
-        ///    Log::info("Logging an array: " . print_r($objectivesArray, true));
-        ///    $json['objectives_outcome'][strval($objectivesArray['outcome_id'])] = array('id' => $objectivesArray['id'], 'text' => $objectivesArray['text'], 'outcome_id');
-        //}
         return json_encode($json);
     }
 
+    public function delete()
+    {
+        DB::delete("delete from new_criteria where id = ?", array(Input::get('id')));
+        $role = Auth::user()['role'];
+        switch ($role) {
+            case 1:
+                return Redirect::to('objective')->withInput();
 
+            case 2:
+                return Redirect::to('school-objective')->withInput();
+
+            case 3:
+                return Redirect::to('program-objective')->withInput();
+        }
+    }
     public function isCriterionUnique($input, $existing_criterion = NULL)
     {
         // dd($input);
@@ -59,10 +114,6 @@ class CriteriaController extends \BaseController
             ->where('name', '=', $input['name'])
             ->where('outcome_id', '=', $input['outcome_id'])
             ->where('program_id', '=', $program_id)
-            // ->where('description12', '=', $input['description12'])
-            // ->where('description34', '=', $input['description34'])
-            // ->where('description56', '=', $input['description56'])
-            // ->where('description78', '=', $input['description78'])
             ->first();
 
 
@@ -104,15 +155,17 @@ class CriteriaController extends \BaseController
 
 
 
-        $clean_input['program_id'] = trim(preg_replace('/\t+/', '', Input::get('program_id')));
-        $clean_input['description12'] = trim(preg_replace('/\t+/', '', Input::get('description12')));
-        $clean_input['description34'] = trim(preg_replace('/\t+/', '', Input::get('description34')));
-        $clean_input['description56'] = trim(preg_replace('/\t+/', '', Input::get('description56')));
-        $clean_input['description78'] = trim(preg_replace('/\t+/', '', Input::get('description78')));
+        $clean_input['program_id'] = Input::get('program_id');
+
         $clean_input['copyright'] = trim(preg_replace('/\t+/', '', Input::get('copyright')));
         $clean_input['notes'] = trim(preg_replace('/\t+/', '', Input::get('notes')));
-        $clean_input['maximum_score'] = 8;
-        $clean_input['number_of_scales'] = 4;
+        $clean_input['maximum_score'] =  (int) Input::get('maximum_score');
+        $clean_input['scale_title'] = Input::get('title');
+        $clean_input['scale_description'] = Input::get('Scales');
+        $clean_input['min_score'] = Input::get('min');
+        $clean_input['max_score'] = Input::get('max');
+
+        $clean_input['number_of_scales'] = sizeof($clean_input['scale_title']);
 
 
         return $clean_input;
@@ -126,30 +179,20 @@ class CriteriaController extends \BaseController
                 'name' => $clean_input['name'],
                 'subcriteria' => $clean_input['subcriteria'],
                 'outcome_id' => $clean_input['outcome_id'],
-                'description12' => $clean_input['description12'],
-                'description34' => $clean_input['description34'],
-                'description56' => $clean_input['description56'],
-                'description78' => $clean_input['description78'],
                 'notes' => $clean_input['notes'],
                 'copyright' => $clean_input['copyright'],
+                'maximum_score' => $clean_input['maximum_score']
             ),
             array(
                 'name' => 'required|string',
                 'subcriteria' => 'string',
                 'outcome_id' => 'required|array',
-                'description12' => 'required|string',
-                'description34' => 'required|string',
-                'description56' => 'required|string',
-                'description78' => 'required|string',
+
                 'notes' => 'string',
                 'copyright' => 'string',
-            ),
-            array(
-                'description12.required' => 'The Beginning (1-2) field is required.',
-                'description34.required' => 'The In Progress (3-4) field is required.',
-                'description56.required' => 'The Satisfactory (5-6) field is required.',
-                'description78.required' => 'The Excellent (7-8) field is required.',
+                'maximum_score' => 'required|integer'
             )
+
         );
     }
 
@@ -179,7 +222,17 @@ class CriteriaController extends \BaseController
             /** Send error message and old data */
             Session::flash('status', 'danger');
             Session::flash('message', $message);
-            return Redirect::to('criteria')->withInput();
+            $role = Auth::user()['role'];
+            switch ($role) {
+                case 1:
+                    return Redirect::to('objective')->withInput();
+
+                case 2:
+                    return Redirect::to('school-objective')->withInput();
+
+                case 3:
+                    return Redirect::to('program-objective')->withInput();
+            }
         } else {
             // Check criterion uniqueness
             /*if (!$this->isCriterionUnique($clean_input)) {
@@ -194,12 +247,11 @@ class CriteriaController extends \BaseController
             $criterion->name = $clean_input['name'];
             $criterion->subcriteria = $clean_input['subcriteria'];
 
-            $criterion->description12 = $clean_input['description12'];
-            $criterion->description34 = $clean_input['description34'];
-            $criterion->description56 = $clean_input['description56'];
-            $criterion->description78 = $clean_input['description78'];
+
             //gabriel añadió aqui
-            $criterion->objective_id = 1; //$clean_input['objective_id'];
+
+            $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'];
@@ -207,11 +259,6 @@ class CriteriaController extends \BaseController
             if (Input::get('notes'))
                 $criterion->notes = $clean_input['notes'];
 
-            // Set program
-            if (Input::get('program_id') != 0)
-                $criterion->program_id = $clean_input['program_id'];
-            else
-                $criterion->program_id = NULL;
 
 
             /** If criterion is saved, send success message */
@@ -220,30 +267,78 @@ class CriteriaController extends \BaseController
                 $criterionId = $criterion->id;
                 foreach ($clean_input['outcome_id'] as $outcome_id) {
                     foreach ($clean_input['objective_id'] as $objective_id) {
-                        //try{
+
                         DB::insert("insert into `criterion_objective_outcome` (`objective_id`, `outcome_id`, `criterion_id`, `objective_outcome_id`) values ({$objective_id},{$outcome_id}, {$criterionId}, 0)");
-                        // }
-                        //catch{
-                        //Session::flash('status', 'danger');
-                        //Session::flash('message', '<p>Error creating objective. Please try again later.</p>');
-                        //return Redirect::to('objective')->withInput();
-                        //}
                     }
                 }
+
+                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];
+                    $scale->min_score = $clean_input['min_score'][$i];
+                    $scale->max_score = $clean_input['max_score'][$i];
+
+                    if ($scale->save()) {
+                        DB::insert("insert into `criterion_scale` (`criterion_id`, `scale_id`) values({$criterionId},{$scale->id})");
+                    } else {
+                        Session::flash('status', 'danger');
+                        Session::flash('message', '<p>Error creating the Scales</p>');
+                        $role = Auth::user()['role'];
+                        switch ($role) {
+                            case 1:
+                                return Redirect::to('objective')->withInput();
+
+                            case 2:
+                                return Redirect::to('school-objective')->withInput();
+
+                            case 3:
+                                return Redirect::to('program-objective')->withInput();
+                        }
+                    }
+                }
+
+                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 . '".');
-                return Redirect::to('criteria')->withInput(Input::only('outcome_id'));
+                $role = Auth::user()['role'];
+                switch ($role) {
+                    case 1:
+                        return Redirect::to('objective')->withInput();
+
+                    case 2:
+                        return Redirect::to('school-objective')->withInput();
+
+                    case 3:
+                        return Redirect::to('program-objective')->withInput();
+                }
             }
 
             /** 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>');
-                return Redirect::to('learning-outcomes-criteria')->withInput();
+                $role = Auth::user()['role'];
+                switch ($role) {
+                    case 1:
+                        return Redirect::to('objective')->withInput();
+
+                    case 2:
+                        return Redirect::to('school-objective')->withInput();
+
+                    case 3:
+                        return Redirect::to('program-objective')->withInput();
+                }
             }
         }
     }
 
+
+
     public function edit()
     {
         $title = "Criteria";
@@ -257,6 +352,7 @@ class CriteriaController extends \BaseController
 
 
 
+
         return View::make('local.managers.admins.criteria', compact('title', 'outcomes', 'schools', 'criteria', 'programs', 'objectives'));
     }
 
@@ -291,15 +387,14 @@ class CriteriaController extends \BaseController
 
 
 
-        $clean_input['program_id'] = trim(preg_replace('/\t+/', '', Input::get('program_id')));
-        $clean_input['description12'] = trim(preg_replace('/\t+/', '', Input::get('description12')));
-        $clean_input['description34'] = trim(preg_replace('/\t+/', '', Input::get('description34')));
-        $clean_input['description56'] = trim(preg_replace('/\t+/', '', Input::get('description56')));
-        $clean_input['description78'] = trim(preg_replace('/\t+/', '', Input::get('description78')));
+        $clean_input['program_id'] = Input::get('program_id');
+
         $clean_input['copyright'] = trim(preg_replace('/\t+/', '', Input::get('copyright')));
         $clean_input['notes'] = trim(preg_replace('/\t+/', '', Input::get('notes')));
-        $clean_input['maximum_score'] = 8;
-        $clean_input['number_of_scales'] = 4;
+        $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']);
 
 
         return $clean_input;
@@ -328,7 +423,17 @@ class CriteriaController extends \BaseController
             /** Send error message and old data */
             Session::flash('status', 'danger');
             Session::flash('message', $message);
-            return Redirect::back()->withInput();
+            $role = Auth::user()['role'];
+            switch ($role) {
+                case 1:
+                    return Redirect::to('objective')->withInput();
+
+                case 2:
+                    return Redirect::to('school-objective')->withInput();
+
+                case 3:
+                    return Redirect::to('program-objective')->withInput();
+            }
         } else {
 
             // // Check criterion uniqueness
@@ -343,11 +448,11 @@ class CriteriaController extends \BaseController
             /** Set info */
             $criterion->name = $clean_input['name'];
             $criterion->subcriteria = $clean_input['subcriteria'];
-            //$criterion->outcome_id = $clean_input['outcome_id'];
-            $criterion->description12 = $clean_input['description12'];
-            $criterion->description34 = $clean_input['description34'];
-            $criterion->description56 = $clean_input['description56'];
-            $criterion->description78 = $clean_input['description78'];
+
+
+
+            $criterion->number_of_scales = $clean_input['number_of_scales'];
+            $criterion->maximum_score = $clean_input['maximum_score'];
 
 
 
@@ -384,17 +489,64 @@ class CriteriaController extends \BaseController
                         DB::insert("insert into `criterion_objective_outcome` (`objective_id`, `outcome_id`, `criterion_id`,`objective_outcome_id`) values ({$objective_id},{$outcome_id}, {$criterionId}, 0)");
                     }
                 }
+                DB::delete("delete from `scales` where id in (select scale_id id from criterion_scale where criterion_id = {$criterionId})");
+
+                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})");
+                    } else {
+                        Session::flash('status', 'danger');
+                        Session::flash('message', '<p>Error creating the Scales</p>');
+                        $role = Auth::user()['role'];
+                        switch ($role) {
+                            case 1:
+                                return Redirect::to('objective')->withInput();
+
+                            case 2:
+                                return Redirect::to('school-objective')->withInput();
+
+                            case 3:
+                                return Redirect::to('program-objective')->withInput();
+                        }
+                    }
+                }
+
+
 
                 Session::flash('status', 'success');
                 Session::flash('message', 'Updated criterion: "' . $criterion->name . '"');
-                return Redirect::back();
+                $role = Auth::user()['role'];
+                switch ($role) {
+                    case 1:
+                        return Redirect::to('objective')->withInput();
+
+                    case 2:
+                        return Redirect::to('school-objective')->withInput();
+
+                    case 3:
+                        return Redirect::to('program-objective')->withInput();
+                }
             }
 
             /** If saving fails, send error message and old data */
             else {
                 Session::flash('status', 'danger');
                 Session::flash('message', 'Error updating the Criterion. Please try again later.');
-                return Redirect::back()->withInput();
+                $role = Auth::user()['role'];
+                switch ($role) {
+                    case 1:
+                        return Redirect::to('objective')->withInput();
+
+                    case 2:
+                        return Redirect::to('school-objective')->withInput();
+
+                    case 3:
+                        return Redirect::to('program-objective')->withInput();
+                }
             }
         }
     }
@@ -421,7 +573,17 @@ class CriteriaController extends \BaseController
                 Session::flash('status', 'danger');
                 Session::flash('message', 'Error deactivating criterion."' . $criterion->name . '"');
             }
-            return Redirect::back();
+            $role = Auth::user()['role'];
+            switch ($role) {
+                case 1:
+                    return Redirect::to('objective')->withInput();
+
+                case 2:
+                    return Redirect::to('school-objective')->withInput();
+
+                case 3:
+                    return Redirect::to('program-objective')->withInput();
+            }
         } else {
             try {
                 $criterion->restore();
@@ -431,7 +593,17 @@ class CriteriaController extends \BaseController
                 Session::flash('status', 'danger');
                 Session::flash('message', 'Error reactivating criterion: "' . $criterion->name . '".');
             }
-            return Redirect::back();
+            $role = Auth::user()['role'];
+            switch ($role) {
+                case 1:
+                    return Redirect::to('objective')->withInput();
+
+                case 2:
+                    return Redirect::to('school-objective')->withInput();
+
+                case 3:
+                    return Redirect::to('program-objective')->withInput();
+            }
         }
     }
 

app/controllers/Objective2Controller.php

@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Support\Facades\Auth;
+
 class Objective2Controller extends \BaseController
 {
 
@@ -104,11 +106,8 @@ class Objective2Controller extends \BaseController
 
 
 		$clean_input['outcome_id'] = Input::get('assoc_outcome');
-		$counter = Input::get('counter') + 0;
 
-		for ($i = 0; $i < $counter; $i++) {
-			$clean_input['outcome_id'][$i] = trim(preg_replace('/\t+/', '', $clean_input['outcome_id'][$i]));
-		}
+
 
 		$clean_input['program_id'] = trim(preg_replace('/\t+/', '', Input::get('program_id')));
 
@@ -151,14 +150,34 @@ class Objective2Controller extends \BaseController
 			/** Send error message and old data */
 			Session::flash('status', 'danger');
 			Session::flash('message', $message);
-			return Redirect::to('objective')->withInput();
+			$role = Auth::user()['role'];
+			switch ($role) {
+				case 1:
+					return Redirect::to('objective')->withInput();
+
+				case 2:
+					return Redirect::to('school-objective')->withInput();
+
+				case 3:
+					return Redirect::to('program-objective')->withInput();
+			}
 		} else {
 			// Check Objective uniqueness
 			if (!$this->isObjectiveUnique($clean_input)) {
 				/** Send error message and old data */
 				Session::flash('status', 'danger');
 				Session::flash('message', "This objective is a duplicate of an already saved Objective because it's and associated program are the same.");
-				return Redirect::to('objective')->withInput();
+				$role = Auth::user()['role'];
+				switch ($role) {
+					case 1:
+						return Redirect::to('objective')->withInput();
+
+					case 2:
+						return Redirect::to('school-objective')->withInput();
+
+					case 3:
+						return Redirect::to('program-objective')->withInput();
+				}
 			}
 
 			/** Instantiate new Objective */
@@ -190,14 +209,34 @@ class Objective2Controller extends \BaseController
 
 				Session::flash('status', 'success');
 				Session::flash('message', 'Objective created: "' . $objective->text . '".');
-				return Redirect::to('objective')->withInput(Input::only('outcome_id'));
+				$role = Auth::user()['role'];
+				switch ($role) {
+					case 1:
+						return Redirect::to('objective')->withInput(Input::only('outcome_id'));
+
+					case 2:
+						return Redirect::to('school-objective')->withInput(Input::only('outcome_id'));
+
+					case 3:
+						return Redirect::to('program-objective')->withInput(Input::only('outcome_id'));
+				}
 			}
 
 			/** If saving fails, send error message and old data */
 			else {
 				Session::flash('status', 'danger');
 				Session::flash('message', '<p>Error creating objective. Please try again later.</p>');
-				return Redirect::to('objective')->withInput();
+				$role = Auth::user()['role'];
+				switch ($role) {
+					case 1:
+						return Redirect::to('objective')->withInput();
+
+					case 2:
+						return Redirect::to('school-objective')->withInput();
+
+					case 3:
+						return Redirect::to('program-objective')->withInput();
+				}
 			}
 		}
 	}
@@ -241,9 +280,41 @@ class Objective2Controller extends \BaseController
 		return View::make('local.managers.admins.objectives', compact('title', 'outcomes', 'objectives', 'programs'));
 	}
 
+	public function editProgram()
+	{
+		$userProgram = Auth::user()['id'];
+		Log::info(Auth::user());
+
+		$userProgram = DB::select("select program_user.program_id from program_user where user_id = {$userProgram}");
+
+		$title = "Objective";
+		$outcomes = Outcome::orderBy('name', 'ASC')->lists('name', 'id');
+
+		$objectives = Objective::withTrashed()->orderBy('text', 'ASC')->get();
+
+		$programs = Program::where("id", '=', $userProgram[0]->program_id)->get();
+
 
 
 
+		return View::make('local.managers.pCoords.objectives', compact('title', 'outcomes', 'objectives', 'programs'));
+	}
+
+	public function editSchool()
+	{
+		$userSchool = Auth::user()['school_id'];
+		Log::info($userSchool);
+		$title = "Objective";
+		$outcomes = Outcome::orderBy('name', 'ASC')->lists('name', 'id');
+
+		$objectives = Objective::withTrashed()->orderBy('text', 'ASC')->get();
+		$programs = Program::where("school_id", "=", $userSchool)->orderBy('name', 'ASC')->get();
+
+
+
+		return View::make('local.managers.sCoords.objectives', compact('title', 'outcomes', 'objectives', 'programs'));
+	}
+
 	/**
 	 * Update the specified resource in storage.
 	 *
@@ -252,11 +323,15 @@ class Objective2Controller extends \BaseController
 	 */
 
 	public function update()
+
 	{
+
 		$Objective = Objective::withTrashed()->find(Input::get('id'));
 
 		$clean_input = $this->cleanAssocInput();
 
+		Log::info(print_r($clean_input, true));
+
 		/** Validation rules */
 		$validator = $this->makeValidator($clean_input);
 
@@ -274,7 +349,17 @@ class Objective2Controller extends \BaseController
 			/** Send error message and old data */
 			Session::flash('status', 'danger');
 			Session::flash('message', $message);
-			return Redirect::back()->withInput();
+			$role = Auth::user()['role'];
+			switch ($role) {
+				case 1:
+					return Redirect::to('objective')->withInput();
+
+				case 2:
+					return Redirect::to('school-objective')->withInput();
+
+				case 3:
+					return Redirect::to('program-objective')->withInput();
+			}
 		} else {
 
 
@@ -301,9 +386,20 @@ class Objective2Controller extends \BaseController
 
 				foreach ($clean_input['outcome_id'] as $outcome_id) {
 					DB::insert("insert into `objective_outcome` (objective_id, outcome_id) values ({$objectiveId}, {$outcome_id})");
-					Session::flash('status', 'success');
-					Session::flash('message', 'Updated Objective: "' . $Objective->text . '"');
-					return Redirect::back();
+				}
+
+				Session::flash('status', 'success');
+				Session::flash('message', 'Updated Objective: "' . $Objective->text . '"');
+				$role = Auth::user()['role'];
+				switch ($role) {
+					case 1:
+						return Redirect::to('objective')->withInput();
+
+					case 2:
+						return Redirect::to('school-objective')->withInput();
+
+					case 3:
+						return Redirect::to('program-objective')->withInput();
 				}
 			}
 
@@ -311,7 +407,17 @@ class Objective2Controller extends \BaseController
 			else {
 				Session::flash('status', 'danger');
 				Session::flash('message', 'Error updating the Objective. Please try again later.');
-				return Redirect::back()->withInput();
+				$role = Auth::user()['role'];
+				switch ($role) {
+					case 1:
+						return Redirect::to('objective')->withInput();
+
+					case 2:
+						return Redirect::to('school-objective')->withInput();
+
+					case 3:
+						return Redirect::to('program-objective')->withInput();
+				}
 			}
 		}
 	}

app/controllers/UsersController.php

@@ -1,6 +1,7 @@
 <?php
 
-class UsersController extends \BaseController {
+class UsersController extends \BaseController
+{
 
 	/**
 	 * Display a listing of the users.
@@ -9,10 +10,9 @@ class UsersController extends \BaseController {
 	 */
 	public function index()
 	{
-		$title="Users";
+		$title = "Users";
 
-		$users = User::
-			with('programs', 'school')
+		$users = User::with('programs', 'school')
 			->orderBy('surnames')
 			->orderBy('first_name')
 			->get();
@@ -32,6 +32,7 @@ class UsersController extends \BaseController {
 	public function edit()
 	{
 		$user = Auth::user();
+		Log::info($user);
 		$title = "Profile";
 		$schools = School::orderBy('name', 'asc')->get();
 		$programs = $user->programs;
@@ -45,140 +46,129 @@ class UsersController extends \BaseController {
 	 * @return Response
 	 */
 	public function store()
-    {
-    	$user = Auth::user();
-	    if(Input::get('submit_new_user') && Auth::user()->role==1)
-	    {
-
-	    	$first_name = strtoupper(Input::get('new_first_name'));
-	    	$surnames = strtoupper(Input::get('new_surnames'));
-	    	$email = strtolower(Input::get('new_email'));
-	    	$school_id = Input::get('new_school');
-
-	    	// Validation rules
-	        $validator = Validator::make(
-	            array(
-	                'first_name' => $first_name,
-	                'surnames' => $surnames,
-	                'email' => $email,
-	                'school_id' => $school_id,
-	            ),
-	            array(
-	                'first_name' => 'required',
-	                'surnames' => 'required',
-	                'email' => 'required|email',
-	                'school_id' => 'integer',
-	            )
-	        );
-
-	        /** If validation fails */
-	        if ($validator->fails())
-	        {
-	            /** Prepare error message */
-	            $message = 'Error(s) creating a user:<ul>';
-
-	            foreach ($validator->messages()->all('<li>:message</li>') as $validationError)
-	            {
-	                $message.=$validationError;
-	            }
-
-	            $message.='</ul>';
-
-	            /** Send error message and old data */
-	            Session::flash('status', 'danger');
-	            Session::flash('message', $message);
-	            return Redirect::back()->withInput();
-	        }
-
-
-	        DB::beginTransaction();
-	        try
-	        {
-                switch (Input::get('new_role'))
-                {
-                	case '1':
-
-                		User::create(array(
-                			'first_name' => $first_name,
-                			'surnames' => $surnames,
-                			'email'=> $email,
-                			'role'=> 1,
-                			'school_id'=> NULL,
-                			'has_access' => 1
-                		));
-                		break;
-
-                	case '2':
-                		User::create(array(
-                			'first_name' => $first_name,
-                			'surnames' => $surnames,
-                			'email'=> $email,
-                			'role'=> 2,
-                			'school_id'=> (int)Input::get('new_school'), // como que aqui
-                			'has_access' => 1
-                		));
-
-                		break;
-
-                	case '3':
-                		$user = User::create(array(
-                			'first_name' => $first_name,
-                			'surnames' => $surnames,
-                			'email'=> $email,
-                			'role'=> 3,
-                			'school_id'=> NULL,
-                			'has_access' => 1
-                		));
-
-                		// Attach new programs
-                		foreach (Input::get('programs') as $key => $program_id)
-                		{
-                			$user->programs()->attach($program_id);
-                		}
-
-                		$user->save();
-                		break;
-
-                	case '4':
-
-                		$user = User::create(array(
-                			'first_name' => $first_name,
-                			'surnames' => $surnames,
-                			'email'=> $email,
-                			'role'=> 4,
-                			'school_id'=> NULL,
-                			'has_access' => 1
-                		));
-
-                		// Attach new programs
-                		foreach (Input::get('new_programs') as $key => $program_id)
-                		{
-                			$user->programs()->attach($program_id);
-                		}
-                		$user->save();
-                		break;
-                }
-
-	            DB::commit();
-
-                Session::flash('status', 'success');
-                Session::flash('message', 'User created ('.date('m/d/y h:i:s A').')');
-                return Redirect::back();
-
-	        }
-	        catch(Exception $e)
-	        {
-	        	DB::rollBack();
-
-	            Session::flash('status', 'danger');
-	            Session::flash('message', 'Error creating. Try again later or contact the system administrator.');
-
-	            return Redirect::back();
-	        }
-	    }
-	    else
-	    	App::abort('404');
-    }
+	{
+		$user = Auth::user();
+		if (Input::get('submit_new_user') && Auth::user()->role == 1) {
+
+			$first_name = strtoupper(Input::get('new_first_name'));
+			$surnames = strtoupper(Input::get('new_surnames'));
+			$email = strtolower(Input::get('new_email'));
+			$school_id = Input::get('new_school');
+
+			// Validation rules
+			$validator = Validator::make(
+				array(
+					'first_name' => $first_name,
+					'surnames' => $surnames,
+					'email' => $email,
+					'school_id' => $school_id,
+				),
+				array(
+					'first_name' => 'required',
+					'surnames' => 'required',
+					'email' => 'required|email',
+					'school_id' => 'integer',
+				)
+			);
+
+			/** If validation fails */
+			if ($validator->fails()) {
+				/** Prepare error message */
+				$message = 'Error(s) creating a user:<ul>';
+
+				foreach ($validator->messages()->all('<li>:message</li>') as $validationError) {
+					$message .= $validationError;
+				}
+
+				$message .= '</ul>';
+
+				/** Send error message and old data */
+				Session::flash('status', 'danger');
+				Session::flash('message', $message);
+				return Redirect::back()->withInput();
+			}
+
+
+			DB::beginTransaction();
+			try {
+				switch (Input::get('new_role')) {
+					case '1':
+
+						User::create(array(
+							'first_name' => $first_name,
+							'surnames' => $surnames,
+							'email' => $email,
+							'role' => 1,
+							'school_id' => NULL,
+							'has_access' => 1
+						));
+						break;
+
+					case '2':
+						User::create(array(
+							'first_name' => $first_name,
+							'surnames' => $surnames,
+							'email' => $email,
+							'role' => 2,
+							'school_id' => (int)Input::get('new_school'), // como que aqui
+							'has_access' => 1
+						));
+
+						break;
+
+					case '3':
+						$user = User::create(array(
+							'first_name' => $first_name,
+							'surnames' => $surnames,
+							'email' => $email,
+							'role' => 3,
+							'school_id' => NULL,
+							'has_access' => 1
+						));
+
+						// Attach new programs
+						foreach (Input::get('programs') as $key => $program_id) {
+							$user->programs()->attach($program_id);
+						}
+
+						$user->save();
+						break;
+
+					case '4':
+
+						$user = User::create(array(
+							'first_name' => $first_name,
+							'surnames' => $surnames,
+							'email' => $email,
+							'role' => 4,
+							'school_id' => NULL,
+							'has_access' => 1
+						));
+
+						// Attach new programs
+						foreach (Input::get('new_programs') as $key => $program_id) {
+							$user->programs()->attach($program_id);
+						}
+						$user->save();
+						break;
+				}
+
+				DB::commit();
+
+				Session::flash('status', 'success');
+				Session::flash('message', 'User created (' . date('m/d/y h:i:s A') . ')');
+				return Redirect::back();
+			} catch (Exception $e) {
+				DB::rollBack();
+
+				Session::flash('status', 'danger');
+				Session::flash('message', 'Error creating. Try again later or contact the system administrator.');
+
+				return Redirect::back();
+			}
+		} else
+			App::abort('404');
+	}
 
 	/**
 	 * Update the user in storage.
@@ -187,230 +177,197 @@ class UsersController extends \BaseController {
 	 * @return Response
 	 */
 	public function update()
-    {
-    	$user = Auth::user();
-        if(Input::get('submit_contact_info'))
-    	{
-	        // Validation rules
-	        $validator = Validator::make(
-	            array(
-                    'office_phone' => Input::get('office_phone'),
-                    'office_extension' => Input::get('office_extension'),
-	                'cell_phone' => Input::get('cell_phone'),
-	            ),
-	            array(
-                    'office_phone' => 'string|max:20|required_with:office_extension',
-	                'office_extension' => 'digits_between:1,5|required_with:office_phone|unique:users,office_extension,'.$user->id,
-                    'cell_phone' => 'string|max:20'
-	            )
-	        );
-
-	        /** If validation fails */
-	        if ($validator->fails())
-	        {
-	            /** Prepare error message */
-	            $message = 'Error(s) updating your Contact nformation<ul>';
-
-	            foreach ($validator->messages()->all('<li>:message</li>') as $validationError)
-	            {
-	                $message.=$validationError;
-	            }
-
-	            $message.='</ul>';
-
-	            /** Send error message and old data */
-	            Session::flash('status', 'danger');
-	            Session::flash('message', $message);
-	            return Redirect::back()->withInput();
-	        }
-	        else
-	        {
-	            /** Set new contact info */
-	            if(Input::get('office_phone'))
-                {
-                    $user->office_phone = Input::get('office_phone');
-                    $user->office_extension = Input::get('office_extension');
-                }
-				else
-				{
+	{
+		$user = Auth::user();
+		if (Input::get('submit_contact_info')) {
+			// Validation rules
+			$validator = Validator::make(
+				array(
+					'office_phone' => Input::get('office_phone'),
+					'office_extension' => Input::get('office_extension'),
+					'cell_phone' => Input::get('cell_phone'),
+				),
+				array(
+					'office_phone' => 'string|max:20|required_with:office_extension',
+					'office_extension' => 'digits_between:1,5|required_with:office_phone|unique:users,office_extension,' . $user->id,
+					'cell_phone' => 'string|max:20'
+				)
+			);
+
+			/** If validation fails */
+			if ($validator->fails()) {
+				/** Prepare error message */
+				$message = 'Error(s) updating your Contact nformation<ul>';
+
+				foreach ($validator->messages()->all('<li>:message</li>') as $validationError) {
+					$message .= $validationError;
+				}
+
+				$message .= '</ul>';
+
+				/** Send error message and old data */
+				Session::flash('status', 'danger');
+				Session::flash('message', $message);
+				return Redirect::back()->withInput();
+			} else {
+				/** Set new contact info */
+				if (Input::get('office_phone')) {
+					$user->office_phone = Input::get('office_phone');
+					$user->office_extension = Input::get('office_extension');
+				} else {
 					$user->office_phone = NULL;
-                    $user->office_extension = NULL;
+					$user->office_extension = NULL;
+				}
+
+				if (Input::get('cell_phone')) {
+					$user->cell_phone = Input::get('cell_phone');
+				} else {
+					$user->cell_phone = NULL;
+				}
+
+				/** If alt email is updated, send success message */
+				if ($user->save()) {
+					Session::flash('status', 'success');
+					Session::flash('message', 'Contact Information updated.');
+					return Redirect::back();
 				}
 
-                if(Input::get('cell_phone'))
-                {
-                    $user->cell_phone = Input::get('cell_phone');
-                }
-				else
-				{
-                    $user->cell_phone = NULL;
+				/** If saving fails, send error message and old data */
+				else {
+					Session::flash('status', 'warning');
+					Session::flash('message', 'Error updating your Contact Information. Please try again later.');
+					return Redirect::back()->withInput();
 				}
+			}
+		} else if (Input::get('submit_roles') && Auth::user()->role == 1) {
+			try {
+				$exception = DB::transaction(function () {
+					$user = User::find(Input::get('id'));
+
+					switch (Input::get('role')) {
+						case '1':
+							$user->role = 1;
+							$user->school_id = NULL;
+
+							// Delete all programs associated to the user
+							$user->programs()->detach();
 
-	            /** If alt email is updated, send success message */
-	            if($user->save())
-	            {
-	                Session::flash('status', 'success');
-	                Session::flash('message', 'Contact Information updated.');
-	                return Redirect::back();
-	            }
-
-	            /** If saving fails, send error message and old data */
-	            else
-	            {
-	                Session::flash('status', 'warning');
-	                Session::flash('message', 'Error updating your Contact Information. Please try again later.');
-	                return Redirect::back()->withInput();
-	            }
-	        }
-	    }
-
-	    else if(Input::get('submit_roles') && Auth::user()->role==1)
-	    {
-	        try
-	        {
-	            $exception = DB::transaction(function()
-	            {
-                    $user = User::find(Input::get('id'));
-
-                    switch (Input::get('role')) {
-                    	case '1':
-                    		$user->role = 1;
-                    		$user->school_id = NULL;
-
-                    		// Delete all programs associated to the user
-                    		$user->programs()->detach();
-
-                    		$user->has_access = 1;
-
-                    		break;
-
-                    	case '2':
-                    		$user->role = 2;
-                    		$user->school_id = Input::get('school');
-
-                    		// Delete all programs associated to the user
-                    		$user->programs()->detach();
-
-
-                    		break;
-
-                    	case '3':
-                    		$user->role = 3;
-                    		$user->school_id = NULL;
-
-                    		// Delete all programs associated to the user
-                    		$user->programs()->detach();
-
-                    		// Attach new programs
-                    		foreach (Input::get('programs') as $key => $program_id)
-                    		{
-                    			$user->programs()->attach($program_id);
-                    		}
-                    		// $user->program_id = Input::get('program');
-
-                    		break;
-
-                    	case '4':
-                    		$user->role = 4;
-                    		$user->school_id = NULL;
-
-                    		// Delete all programs associated to the user
-                    		$user->programs()->detach();
-
-                    		// Attach new programs
-                    		foreach (Input::get('programs') as $key => $program_id)
-                    		{
-                    			$user->programs()->attach($program_id);
-                    		}
-                    		// $user->program_id = Input::get('program');
-
-                    		break;
-                    }
-
-                    $user->has_access = Input::get('has_access');
-                    $user->save();
-
-	            });
-
-	            if(is_null($exception))
-	            {
-	                Session::flash('status', 'success');
-	                Session::flash('message', 'User <b>'.User::find(Input::get('id'))->email.'</b> updated ('.date('m/d/y h:i:s A').'). To ensure proper access, click \'Update\' in the \'Access Level\' section at the bottom of the page.');
-	                return Redirect::back();
-	            }
-
-	        }
-	        catch(Exception $e)
-	        {
-	            Session::flash('status', 'danger');
-	            Session::flash('message', 'Error updating users. Try again later.');
-
-	            return Redirect::back();
-	        }
-	    }
-	    else
-	    	App::abort('403');
-    }
-
-    public function updateAccess()
-    {
-    	try
-        {
-            $exception = DB::transaction(function()
-            {
-                switch (Input::get('access_level')) {
-		    		case '1':
-		    			DB::table('users')
-			            ->whereIn('role', array(1))
-			            ->update(array('has_access' => 1));
-
-			            DB::table('users')
-			            ->whereIn('role', array(2, 3, 4))
-			            ->update(array('has_access' => 0));
-		    			break;
-
-		    		case '2':
-		    			DB::table('users')
-			            ->whereIn('role', array(1, 2))
-			            ->update(array('has_access' => 1));
-
-			            DB::table('users')
-			            ->whereIn('role', array(3, 4))
-			            ->update(array('has_access' => 0));
-		    			break;
-
-		    		case '3':
-		    			DB::table('users')
-			            ->whereIn('role', array(1, 2, 3))
-			            ->update(array('has_access' => 1));
-
-			            DB::table('users')
-			            ->whereIn('role', array(4))
-			            ->update(array('has_access' => 0));
-		    			break;
-
-		    		case '4':
-		    			DB::table('users')
-			            ->whereIn('role', array(1, 2, 3, 4))
-			            ->update(array('has_access' => 1));
-		    			break;
-		    	}
-            });
-
-            if(is_null($exception))
-            {
-                Session::flash('status', 'success');
-                Session::flash('message', 'Access level updated ('.date('m/d/y, h:i:s a').').');
-            }
-
-        }
-        catch(Exception $e)
-        {
-            Session::flash('status', 'danger');
-            Session::flash('message', 'Error updating access level. Try again later ('.date('m/d/y, h:i:s a').').');
-        }
-
-        return Redirect::back();
-    }
+							$user->has_access = 1;
 
+							break;
+
+						case '2':
+							$user->role = 2;
+							$user->school_id = Input::get('school');
+
+							// Delete all programs associated to the user
+							$user->programs()->detach();
+
+
+							break;
+
+						case '3':
+							$user->role = 3;
+							$user->school_id = NULL;
+
+							// Delete all programs associated to the user
+							$user->programs()->detach();
+
+							// Attach new programs
+							foreach (Input::get('programs') as $key => $program_id) {
+								$user->programs()->attach($program_id);
+							}
+							// $user->program_id = Input::get('program');
+
+							break;
+
+						case '4':
+							$user->role = 4;
+							$user->school_id = NULL;
+
+							// Delete all programs associated to the user
+							$user->programs()->detach();
+
+							// Attach new programs
+							foreach (Input::get('programs') as $key => $program_id) {
+								$user->programs()->attach($program_id);
+							}
+							// $user->program_id = Input::get('program');
+
+							break;
+					}
+
+					$user->has_access = Input::get('has_access');
+					$user->save();
+				});
+
+				if (is_null($exception)) {
+					Session::flash('status', 'success');
+					Session::flash('message', 'User <b>' . User::find(Input::get('id'))->email . '</b> updated (' . date('m/d/y h:i:s A') . '). To ensure proper access, click \'Update\' in the \'Access Level\' section at the bottom of the page.');
+					return Redirect::back();
+				}
+			} catch (Exception $e) {
+				Session::flash('status', 'danger');
+				Session::flash('message', 'Error updating users. Try again later.');
+
+				return Redirect::back();
+			}
+		} else
+			App::abort('403');
+	}
+
+	public function updateAccess()
+	{
+		try {
+			$exception = DB::transaction(function () {
+				switch (Input::get('access_level')) {
+					case '1':
+						DB::table('users')
+							->whereIn('role', array(1))
+							->update(array('has_access' => 1));
+
+						DB::table('users')
+							->whereIn('role', array(2, 3, 4))
+							->update(array('has_access' => 0));
+						break;
+
+					case '2':
+						DB::table('users')
+							->whereIn('role', array(1, 2))
+							->update(array('has_access' => 1));
+
+						DB::table('users')
+							->whereIn('role', array(3, 4))
+							->update(array('has_access' => 0));
+						break;
+
+					case '3':
+						DB::table('users')
+							->whereIn('role', array(1, 2, 3))
+							->update(array('has_access' => 1));
+
+						DB::table('users')
+							->whereIn('role', array(4))
+							->update(array('has_access' => 0));
+						break;
+
+					case '4':
+						DB::table('users')
+							->whereIn('role', array(1, 2, 3, 4))
+							->update(array('has_access' => 1));
+						break;
+				}
+			});
+
+			if (is_null($exception)) {
+				Session::flash('status', 'success');
+				Session::flash('message', 'Access level updated (' . date('m/d/y, h:i:s a') . ').');
+			}
+		} catch (Exception $e) {
+			Session::flash('status', 'danger');
+			Session::flash('message', 'Error updating access level. Try again later (' . date('m/d/y, h:i:s a') . ').');
+		}
+
+		return Redirect::back();
+	}
 }

app/database/migrations/2020_11_11_201214_dropForeignObjOut.php

@@ -1,31 +0,0 @@
-<?php
-
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class DropForeignObjOut extends Migration
-{
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::table('criterion_objective_outcome', function (Blueprint $table) {
-			$table->dropForeign('criterion_objective_outcome_objective_outcome_id_foreign');
-			$table->foreign('outcome_id')->references('id')->on('outcomes')->onDelete('cascade')->onUpdate('cascade');
-		});
-	}
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		//
-	}
-}

app/database/migrations/2020_12_04_111708_dropDescriptionInCriteria.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class DropDescriptionInCriteria extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('new_criteria', function (Blueprint $table) {
+
+			$table->dropColumn('description12');
+			$table->dropColumn('description34');
+			$table->dropColumn('description56');
+			$table->dropColumn('description78');
+			$table->dropColumn('objective_id');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+	}
+}

app/database/migrations/2020_12_10_175517_createProgramCriterion2.php

@@ -0,0 +1,44 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateProgramCriterion2 extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('program_criterion', function (Blueprint $table) {
+			$table->increments('id');
+			$table->timestamps();
+			$table->integer('program_id')->nullable()->unsigned();
+			$table->foreign('program_id')
+				->references('id')
+				->on('programs')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->integer('criterion_id')->unsigned();
+			$table
+				->foreign('criterion_id')
+				->references('id')
+				->on('new_criteria')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('program_criterion');
+	}
+}

app/database/migrations/2020_12_10_223135_addMinMaxInScales.php

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

app/models/Scale.php

@@ -0,0 +1,17 @@
+<?php
+
+use Illuminate\Database\Eloquent\SoftDeletingTrait;
+
+class Scale extends Eloquent
+{
+    use SoftDeletingTrait;
+    protected $dates = ['deleted_at'];
+
+    protected $table = 'scales';
+
+    public function outcomes()
+    {
+        //	  
+
+    }
+}

app/routes.php

@@ -177,7 +177,15 @@ Route::group(array('before' => 'auth|has_access'), function () {
         'as' => 'fetchCriterion',
         'uses' => 'CriteriaController@fetchCriterion'
     ));
-
+    // Fetch Criterions associated to programs
+    Route::post('fetchAllCriterion', array(
+        'as' => 'fetchAllCriterion',
+        'uses' => 'CriteriaController@fetchAllCriterion'
+    ));
+    Route::post('delete', array(
+        'as' => 'delete',
+        'uses' => 'CriteriaController@delete'
+    ));
     // Fetch a criterion for a rubric
     Route::post('fetchCriterionWithTrashed', array(
         'as' => 'fetchCriterionWithTrashed',
@@ -285,8 +293,13 @@ Route::group(array('before' => 'auth|has_access'), function () {
 
         // Assessment reports
         Route::get('school-assessment-report/{outcome_id}', 'OutcomesController@schoolAssessmentReport');
+
+        // Gabriel added this, so the school coordinator can add criterias and objectives
+        Route::get('school-objective', 'Objective2Controller@editSchool');
+        Route::get('school-criteria', 'CriteriaController@editSchool');
     });
 
+
     /**
      * Program Coordinator Routes
      */
@@ -297,7 +310,6 @@ Route::group(array('before' => 'auth|has_access'), function () {
         Route::post('saveTemplate', array('before' => 'csrf', 'uses' => 'TemplatesController@create'));
         Route::post('updateTemplate', array('before' => 'csrf', 'uses' => 'TemplatesController@update'));
         Route::post('deleteTemplate', array('before' => 'csrf', 'uses' => 'TemplatesController@destroy'));
-        Route::get('criteria', 'CriteriaController@edit');
         Route::get('course/{id}', 'CoursesController@showLimited');
         Route::get('rubrics/{template_id}/download', 'TemplatesController@download');
         Route::post('program/fetch', array('before' => 'csrf', 'uses' => 'ProgramsController@fetch'));
@@ -306,6 +318,10 @@ Route::group(array('before' => 'auth|has_access'), function () {
         Route::get('rubric/{rubric_id}', 'RubricsController@show_limited');
         Route::get('grouped_course/{code}/{number}/{semester_code}', 'CoursesController@showGrouped');
 
+        //Criteria and objectives
+        Route::get('program-criteria', 'CriteriaController@editProgram');
+        Route::get('program-objective', 'Objective2Controller@editProgram');
+
         // Print program report
         Route::get('print_program/{id}', 'ProgramsController@print_program');
 

app/views/local/managers/admins/_navigation.blade.php

@@ -8,7 +8,7 @@
         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Management<span class="caret"></span></a>
         <ul class="dropdown-menu" role="menu">
           <li>{{ HTML::linkAction('CoursesController@reassign', 'Courses') }}</li>
-          <li>{{ HTML::linkAction('Objective2Controller@edit', 'Objectives')}}
+          <li>{{ HTML::linkAction('Objective2Controller@edit', 'Objectives')}}</li>
           <li>{{ HTML::linkAction('CriteriaController@edit', 'Criteria') }}</li>
           <li>{{ HTML::linkAction('OutcomesController@index', 'Learning Outcomes') }}</li>
           <li>{{ HTML::linkAction('TemplatesController@newTemplate', 'Rubric Builder') }}</li>

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

@@ -47,13 +47,15 @@
 
                 <!-- Associated Program -->
                 <div class="form-group">
-                    {{ Form::label('program_id', 'Associated Program') }}
-                    <select id="program_id" name="program_id" class="form-control selectpicker">
-                        <option value="0">All</option>
-                        @foreach ($programs as $program)
-                        <option value="{{ $program->id }}">{{ $program->name }} [{{ $program->school->name }}]</option>
-                        @endforeach
-                    </select>
+                    {{ Form::label('program_id', 'Associated Program') }}<br>
+                    <br>
+
+                    @foreach ($programs as $program)
+
+                    <input type="checkbox" id="{{ $program->name }}" name="program_id[]" value="{{$program->id}}">
+                    <label for="{{ $program->name }}"> {{ $program->name }} [{{ $program->school->name }}]</label><br>
+                    @endforeach
+
                 </div>
 
                 <div class="form-group">
@@ -66,27 +68,21 @@
                     <p class="help-block"><strong>Manually add</strong> bullets or numbering.</p>
                     {{ Form::textarea('subcriteria', '', array('class' => 'form-control', 'rows'=>3, 'aria-labelledby'=>'subcriteria')) }}
                 </div>
-
                 <div class="form-group">
-                    {{ Form::label('description12', 'Beginning (1-2)') }}
-                    {{ Form::textarea('description12', '', array('class' => 'form-control', 'rows'=>2, 'aria-labelledby'=>'description12')) }}
+                    {{ Form::label('maximum_score', 'Maximum Score') }}
+                    {{ Form::text('maximum_score', '1', array('class' => 'form-control', 'id'=>'maximum_score', 'oninput'=>'addOptions("Num_scale", "maximum_score", "Scales")')) }}
                 </div>
-
                 <div class="form-group">
-                    {{ Form::label('description34', 'In Progress (3-4)') }}
-                    {{ Form::textarea('description34', '', array('class' => 'form-control', 'rows'=>2, 'aria-labelledby'=>'description34')) }}
-                </div>
+                    {{ Form::label('scales', 'Number of Scales') }}
+                    <select id="Num_scale" name="scales" class="form-control selectpicker" onchange='numberOfScales("Num_scale", "Scales")'>
 
-                <div class="form-group">
-                    {{ Form::label('description56', 'Satisfactory (5-6)') }}
-                    {{ Form::textarea('description56', '', array('class' => 'form-control', 'rows'=>2, 'aria-labelledby'=>'description56')) }}
+                    </select>
                 </div>
+                <div id='Scales' data-value="0">
 
-                <div class="form-group">
-                    {{ Form::label('description78', 'Excellent (7-8)') }}
-                    {{ Form::textarea('description78', '', array('class' => 'form-control', 'rows'=>2, 'aria-labelledby'=>'description78')) }}
                 </div>
 
+
                 <div class="form-group">
                     {{ Form::label('copyright', 'Copyright') }}
                     {{ Form::textarea('copyright', '', array('class' => 'form-control', 'rows'=>2, 'placeholder'=>'(optional)', 'aria-labelledby'=>'copyright')) }}
@@ -111,6 +107,21 @@
             <div class="panel-body">
                 {{ Form::open(array('action' => 'CriteriaController@update')) }}
 
+
+                <div class="form-group">
+                    {{ Form::label('program_id2', 'Associated Program')}}
+                    <select id='select-program' class="form-control selectpicker" onchange='fetchAllCriterion("select-program", "assoc_outcomes_fetch")'>
+                        @foreach ($programs as $program)
+                        <option value='{{$program->id}}' data-subtext="{{$program->code}}">{{$program->name}}</option>
+                        @endforeach
+                    </select>
+                </div>
+                <div class="form-group">
+                    <label>Associated Outcome</label>
+                    {{ Form::select('assoc_outcome_fetch', $outcomes, null, ['class'=>'form-control selectpicker', 'id'=>'assoc_outcomes_fetch', 'onchange'=>'fetchAllCriterion("select-program", "assoc_outcomes_fetch")']) }}
+
+                </div>
+
                 <div class="form-group">
                     {{ Form::label('criterion_id', 'Criterion') }}
                     <select id="select-criterion" name="id" class="form-control selectpicker" onchange='fetchCriterionForEditing()'>
@@ -161,13 +172,13 @@
 
                 <!-- Associated Program -->
                 <div class="form-group">
-                    {{ Form::label('program_id2', 'Associated Program') }}
-                    <select id="program_id2" name="program_id" class="form-control selectpicker">
-                        <option value="0">All</option>
-                        @foreach ($programs as $program)
-                        <option value="{{ $program->id }}">{{ $program->name }} [{{ $program->school->name }}]</option>
-                        @endforeach
-                    </select>
+
+                    {{ Form::label('program_id2', 'Associated Program') }}<br><br>
+                    @foreach ($programs as $program)
+
+                    <input type="checkbox" id="assoc_program_id_{{ $program->id }}" name="program_id[]" value="{{$program->id}}">
+                    <label for="assoc_program_id_{{ $program->id }}"> {{ $program->name }} <sub>[{{ $program->school->name }}]</sub></label><br>
+                    @endforeach
                 </div>
 
 
@@ -182,6 +193,8 @@
                     </select>
                 </div>
 
+
+
                 <div class="form-group">
                     {{ Form::label('name', 'Name') }}
                     {{ Form::text('name', Input::old('name'), array('class' => 'form-control', 'id'=>'criterion_name')) }}
@@ -194,25 +207,22 @@
                 </div>
 
                 <div class="form-group">
-                    {{ Form::label('description12', 'Beginning (1-2)') }}
-                    {{ Form::textarea('description12', Input::old('description12'), array('class' => 'form-control', 'rows'=>2, 'id'=>'criterion_description12')) }}
+                    {{ Form::label('assoc_maximum_score', 'Maximum Score') }}
+                    {{ Form::text('assoc_maximum_score', '', array('class' => 'form-control', 'id'=>'assoc_maximum_score', 'oninput'=>'addOptions("Num_assoc_scale", "assoc_maximum_score", "Assoc_Scales")')) }}
                 </div>
 
-                <div class="form-group">
-                    {{ Form::label('description34', 'In Progress (3-4)') }}
-                    {{ Form::textarea('description34', Input::old('description34'), array('class' => 'form-control', 'rows'=>2, 'id'=>'criterion_description34')) }}
-                </div>
 
                 <div class="form-group">
-                    {{ Form::label('description56', 'Satisfactory (5-6)') }}
-                    {{ Form::textarea('description56', Input::old('description56'), array('class' => 'form-control', 'rows'=>2, 'id'=>'criterion_description56')) }}
+                    {{ Form::label('scales', 'Number of Scales') }}
+                    <select id="Num_assoc_scale" class="form-control selectpicker" onchange='numberOfAssoc("Num_assoc_scale", "Assoc_Scales")'>
+
+                    </select>
                 </div>
+                <div id='Assoc_Scales' data-value="0">
 
-                <div class="form-group">
-                    {{ Form::label('description78', 'Excellent (7-8)') }}
-                    {{ Form::textarea('description78', Input::old('description78'), array('class' => 'form-control', 'rows'=>2, 'id'=>'criterion_description78')) }}
                 </div>
 
+
                 <div class="form-group">
                     {{ Form::label('copyright', 'Copyright Information') }}
                     {{ Form::textarea('copyright', Input::old('copyright'), array('class' => 'form-control', 'rows'=>2, 'id'=>'criterion_copyright', 'placeholder'=>'(optional)')) }}
@@ -222,9 +232,13 @@
                     {{ Form::label('notes', 'Additional Notes') }}
                     {{ Form::textarea('notes', Input::old('notes'), array('class' => 'form-control', 'rows'=>2, 'id'=>'criterion_notes', 'placeholder'=>'(optional)')) }}
                 </div>
+                <div id='delete'>
 
+                </div>
                 {{ Form::submit('Update', array('class' => 'btn btn-primary btn-block')) }}
                 {{ Form::close() }}
+
+
             </div>
         </div>
     </div>
@@ -235,10 +249,142 @@
     var counter = 1;
     var counterObj = 1;
     var outcomeString = 'OutcomeGroup_';
+    $(document).ready(function() {
+        addOptions('Num_scale', 'maximum_score', 'Scales');
+        numberOfScales('Num_scale', 'Scales');
+    });
+
+
+    function numberOfAssoc(string, Scales) {
+        var maximum = $('#assoc_maximum_score').val();
+        var amountOfScale = parseInt($('#' + string).val());
+        var dataValue = parseInt($('#' + Scales).attr('data-value'));
+        //add
+        if (dataValue < amountOfScale) {
+
+            fullDiv = '';
+
+            for (var i = dataValue; i < amountOfScale; i++) {
+                div = '<div id="assoc_eval' + i.toString() + Scales + '">' +
+                    '<div class ="form-row">' +
+                    '<label for="header' + (i).toString() + '">Evaluación ' + (i + 1).toString() + '</label><br><br>' +
+                    '<input type="hidden"  id="header' + i.toString() + '">' +
+                    '<div class="form-group col-md-8" >' +
+                    '<label for="title' + i.toString() + '">Nombre de Evaluación ' + (i + 1).toString() + '</label>' +
+                    '<input class="form-control" name="assoc_title[]" type="text"  id="title' + i.toString() + '" placeholder ="Nombre de evaluacion" ></div>' +
+                    '<div class ="form-group col-md-2">' +
+                    '<label for="min' + i.toString() + '">Mínimo </label>' +
+                    '<input class="form-control" type="number" id="assoc_min' + i.toString() + '" min="1" max = "' + maximum + '" oninput ="changedMin(' + "'assoc_min" + i.toString() + "', '" + i.toString() + "', 'Assoc_Scales' " + ')" name = "assoc_min[]"></div>' +
+                    '<div class ="form-group col-md-2">' +
+                    '<label for="max' + i.toString() + '">Máximo </label>' +
+                    '<input class="form-control" type="number" id="assoc_max' + i.toString() + '" min="1" max = "' + maximum + '" oninput ="changedMax(' + "'assoc_max" + i.toString() + "', '" + i.toString() + "', 'Assoc_Scales' " + ')" name = "assoc_max[]"></div></div>' +
+                    '<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>';
+                fullDiv += div;
+
+
+            }
+
+            $('#' + Scales).append(fullDiv);
+            $('#' + Scales).attr('data-value', amountOfScale);
+        } else {
+            for (var i = dataValue; i > amountOfScale; i--) {
+                $('#assoc_eval' + (i - 1).toString()).remove();
+            }
+        }
+        $('#' + Scales).attr('data-value', amountOfScale);
 
+    }
 
-    //Add outcome Button
+    function addOptions(select, max, scaleDiv) {
+        var maxscore = parseInt($('#' + max).val())
+        options = '';
+        for (var i = 1; i <= maxscore; i++) {
+            options += '<option value="' + i.toString() + '">' + i.toString() + '</option>';
+
+        }
+
+        var previousvalue = parseInt($('#' + select).val());
+        $('#' + select).html(options);
+        $('#' + select).val(previousvalue);
+        $('#' + select).selectpicker('refresh');
+
+        var attribute = parseInt($('#' + scaleDiv).attr('data-value'));
+
+        for (var i = 0; i < attribute; i++) {
+            $('#max' + i.toString()).attr('max', maxscore);
+            $('#min' + i.toString()).attr('max', maxscore);
+        }
+
+    }
+
+
+
+    function numberOfScales(string, Scales) {
+        var maximum = $('#maximum_score').val();
+        var amountOfScale = parseInt($('#' + string).val());
+        var dataValue = parseInt($('#' + Scales).attr('data-value'));
+        //add
+        if (dataValue < amountOfScale) {
+
+            fullDiv = '';
+
+            for (var i = dataValue; i < amountOfScale; i++) {
+                div = '<div id="eval' + i.toString() + Scales + '">' +
+                    '<div class ="form-row">' +
+                    '<label for="header' + (i).toString() + '">Evaluación ' + (i + 1).toString() + '</label><br><br>' +
+                    '<input type="hidden"  id="header' + i.toString() + '">' +
+                    '<div class="form-group col-md-8" >' +
+                    '<label for="title' + i.toString() + '">Nombre de Evaluación ' + (i + 1).toString() + '</label>' +
+                    '<input class="form-control" name="title[]" type="text"  id="title' + i.toString() + '" placeholder ="Nombre de evaluacion" ></div>' +
+                    '<div class ="form-group col-md-2">' +
+                    '<label for="min' + i.toString() + '">Mínimo </label>' +
+                    '<input class="form-control" type="number" id="min' + i.toString() + '" min="1" max = "' + maximum + '" oninput ="changedMin(' + "'min" + i.toString() + "', '" + i.toString() + "', 'Scales' " + ')" name = "min[]"></div>' +
+                    '<div class ="form-group col-md-2">' +
+                    '<label for="max' + i.toString() + '">Máximo </label>' +
+                    '<input class="form-control" type="number" id="max' + i.toString() + '" min="1" max = "' + maximum + '" oninput ="changedMax(' + "'max" + i.toString() + "', '" + i.toString() + "', 'Scales' " + ')" name = "max[]"></div></div>' +
+                    '<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="' + Scales + '[]" cols="50" ></textarea></div></div>';
+                fullDiv += div;
+            }
+
+            $('#' + Scales).append(fullDiv);
+
+        } else {
+            for (var i = dataValue; i > amountOfScale; i--) {
+                $('#eval' + (i - 1).toString() + Scales).remove();
+            }
+        }
+        $('#' + Scales).attr('data-value', amountOfScale);
+
+    }
+
+    function changedMin(min, index, scaleDiv) {
+        var maximum = parseInt($('#' + min).val()) + 1;
+        var maxScaleScore = parseInt($('#' + scaleDiv).attr('data-value'));
+
+        for (var i = parseInt(index); i < maxScaleScore; i++) {
+            $('#max' + i).attr('min', maximum);
+
+        }
+
+    }
+
+    function changedMax(max, index, scaleDiv) {
+        var maximum = parseInt($('#' + max).val()) + 1;
+        var maxScaleScore = parseInt($('#' + scaleDiv).attr('data-value'));
 
+        for (var i = parseInt(index) + 1; i < maxScaleScore; i++) {
+            $('#min' + i).attr('min', maximum)
+
+        }
+
+
+    }
+
+    //Add outcome Button
     function addOutcomeTest() {
         var $select = $('<select/>', {
             'class': "selectpicker form-control",
@@ -281,6 +427,7 @@
     }
 
 
+
     //Delete Outcome and OptGroup associated
 
     function deleteLast(outcomeForm, outcomeOptGroup, closeButton, objective) {
@@ -490,7 +637,7 @@
             },
             function(varArray) {
 
-                var optionName = '<optgroup id="' + outcomeString + (counter - 1).toString() + '"label="' + outcomeString + (counter).toString() + '"';
+                var optionName = '<optgroup id="' + outcomeString + (counter - 1).toString() + '"label="' + varArray[0].name + '"';
                 for (var i = 0; i < varArray.length; i++) {
                     var option = '<option value ="' + varArray[i].id.toString() + '">' + varArray[i].text + '</option>'
                     optionName += (option)
@@ -521,8 +668,45 @@
 
     //after post
 
-
+    fetchAllCriterion("select-program", "assoc_outcomes_fetch");
     //For editing criterion
+    function fetchAllCriterion(program, outcome) {
+        var program_id_fetch = $('#' + program).find(':selected').val();
+        var outcome_fetch = $('#' + outcome).find(':selected').val();
+        $.post(
+            "{{URL::action('CriteriaController@fetchAllCriterion')}}", {
+                program_fetch: program_id_fetch,
+                outcome_fetch: outcome_fetch
+            },
+            function(json) {
+                json_length = (json.criterion.length);
+                fullHTML = '';
+                for (var i = 0; i < json_length; i++) {
+                    fullHTML += '<option value="' + json.criterion[i].id + '">' + json.criterion[i].name + '</option>';
+                }
+                $('#select-criterion').html(fullHTML);
+                $('#select-criterion').selectpicker('refresh');
+                fetchCriterionForEditing()
+
+            },
+            'json'
+        );
+    }
+
+    function deleteCriterion() {
+        var id = $('#select-criterion').find(':selected').val()
+
+        $.post(
+            "{{ URL::action('CriteriaController@delete')}}", {
+                id: id
+            },
+            function() {
+                window.location.reload(true)
+            }
+        )
+    }
+
+
     function fetchCriterionForEditing() {
         var id = $('#select-criterion').find(':selected').val();
 
@@ -531,30 +715,47 @@
                 id: id
             },
             function(json) {
-                var name = json.criteria[0].name;
 
+                if (!(json.activity_criterion.length)) {
+
+                    var button = "<button type='button' class ='btn btn-primary btn-block' onclick ='deleteCriterion()'>Delete Criterion</button><br><br>"
+                    $('#delete').html(button)
+
+                }
+
+                if (!(json.criteria.length)) {
+                    name = ' ';
+                    var subcriteria = '';
+                    copyright = null;
+                    notes = null;
+                    $('#status').val(0);
+                    maximum = 1;
+                    $('#assoc_maximum_score').val(1);
+
+
+                } else {
+                    var name = json.criteria[0].name;
+                    if (json.criteria[0].subcriteria) {
+                        subcriteria = JSON.parse(json.criteria[0].subcriteria).join('\n');
+                    }
+                    var copyright = json.criteria[0].copyright;
+                    var notes = json.criteria[0].notes;
+
+                    // Display info
+                    $('#criterion_name').val(name);
+                    $('#criterion_subcriteria').text(subcriteria);
+                    if (json.criteria[0].deleted_at)
+                        $('#status').val(0);
+                    else
+                        $('#status').val(1);
+                    $('#assoc_maximum_score').val(json.criteria[0].maximum_score);
+                    var maximum = json.criteria[0].maximum_score;
+
+                    // If copyright or notes aren't empty, load them
 
-                var subcriteria = '';
-                if (json.criteria[0].subcriteria) {
-                    subcriteria = JSON.parse(json.criteria[0].subcriteria).join('\n');
                 }
 
-                var description12 = json.criteria[0].description12;
-                var description34 = json.criteria[0].description34;
-                var description56 = json.criteria[0].description56;
-                var description78 = json.criteria[0].description78;
-                var copyright = json.criteria[0].copyright;
-                var notes = json.criteria[0].notes;
-
-                // Display info
-                $('#criterion_name').val(name);
-                $('#criterion_subcriteria').text(subcriteria);
-                $('#criterion_description12').text(description12);
-                $('#criterion_description34').text(description34);
-                $('#criterion_description56').text(description56);
-                $('#criterion_description78').text(description78);
-
-                // If copyright or notes aren't empty, load them
+
                 if (copyright) {
                     $('#criterion_copyright').text(copyright);
                 } else {
@@ -565,6 +766,12 @@
                 } else {
                     $('#criterion_notes').text('');
                 }
+
+
+
+
+
+
                 // Select associated outcome
                 try {
                     for (var i = assocOutcomeCounter - 1; i > 0; i--) {
@@ -574,9 +781,13 @@
                     var Notran = true;
                 }
 
-
-                $('#assoc_outcome_0').val(json.outcomes[0].id);
-                $('#assoc_outcome_0').selectpicker('refresh');
+                if (json.outcomes.length) {
+                    $('#assoc_outcome_0').val(json.outcomes[0].id);
+                    $('#assoc_outcome_0').selectpicker('refresh');
+                } else {
+                    $('#assoc_outcome_0').val($('#assoc_outcomes_fetch').find(':selected').val());
+                    $('#assoc_outcome_0').selectpicker('refresh');
+                }
 
 
 
@@ -607,7 +818,7 @@
                 var i = 0;
                 for (var j = 0; j < json.outcomes.length; j++) {
                     assocOutcomeCounter += 1;
-                    var optionName = '<optgroup id="' + 'Associated_Outcome' + (assocOutcomeCounter - 1).toString() + '"label="' + 'Associated Outcome' + (assocOutcomeCounter).toString() + '"';
+                    var optionName = '<optgroup id="' + 'Associated_Outcome' + (assocOutcomeCounter - 1).toString() + '"label="' + json.outcomes[j].name + '"';
                     for (; i < json.objectives_outcome.length; i++) {
                         if (json.objectives_outcome[i].outcome_id != json.outcomes[j].id) break;
 
@@ -640,6 +851,10 @@
                     $('#assoc_objective_0').val(json.objectives[0].id);
                     $('#assoc_objective_0').selectpicker('refresh');
                 } catch (err) {
+                    if (!json.objectives.length) {
+                        $('#assoc_objective_0').val(0);
+                        $('#assoc_objective_0').selectpicker('refresh');
+                    }
                     var thereIsNoObjective = true;
                 }
 
@@ -656,21 +871,78 @@
 
 
                 // Select associated program
-                if (json.criteria[0].program_id) {
-                    $('#program_id2').val(json.criteria[0].program_id);
+                var program_length = json.program.length;
+                $('input[type=checkbox]').prop('checked', false);
+
+                for (var i = 0; i < program_length; i++) {
+                    $('#assoc_program_id_' + json.program[i].program_id).prop("checked", true);
+                }
+
 
+                // Select status
+
+
+                scaleLength = json.scales.length;
+                fullDiv = '';
+                if (!scaleLength) {
+                    div = '<div id="assoc_eval 0"">' +
+                        '<div class ="form-row">' +
+                        '<label for="header0">Evaluación 1</label><br><br>' +
+                        '<input type="hidden"  id="header0">' +
+                        '<div class="form-group col-md-8" >' +
+                        '<label for="title0">Nombre de Evaluación 1</label>' +
+                        '<input class="form-control" name="assoc_title[]" value =" "type="text"  id="title0" placeholder ="Nombre de evaluacion" ></div>' +
+                        '<div class ="form-group col-md-2">' +
+                        '<label for="min0">Mínimo </label>' +
+                        '<input class="form-control" type="number" id="assoc_min0" min="1" max = "1" value =" " name = "assoc_min[]"></div>' +
+                        '<div class ="form-group col-md-2">' +
+                        '<label for="max">Máximo </label>' +
+                        '<input class="form-control" type="number" id="assoc_max" min="1" max = "" value =" " name = "assoc_max[]"></div></div>' +
+                        '<div class ="form-group">' +
+                        '<label for ="descripcion">Descripción de evaluación</label>' +
+                        '<textarea class="form-control" rows="2" aria-labelledby="descripcion" name="assoc_scales[]" cols="50" ></textarea></div></div>';
+                    fullDiv += div;
                 } else {
-                    $('#program_id2').val(0);
+                    var dataValue = parseInt($('#Assoc_Scales').attr('data-value'));
+                    $('#assoc_maximum_score').val(json.criteria[0].maximum_score);
+                    var maximum = json.criteria[0].maximum_score;
+
+
+                    $('#Assoc_Scales').html(' ');
+                    for (var i = 0; i < scaleLength; i++) {
+
+                        div = '<div id="assoc_eval' + i.toString() + '">' +
+                            '<div class ="form-row">' +
+                            '<label for="header' + (i).toString() + '">Evaluación ' + (i + 1).toString() + '</label><br><br>' +
+                            '<input type="hidden"  id="header' + i.toString() + '">' +
+                            '<div class="form-group col-md-8" >' +
+                            '<label for="title' + i.toString() + '">Nombre de Evaluación ' + (i + 1).toString() + '</label>' +
+                            '<input class="form-control" name="assoc_title[]" value ="' + json.scales[i].title + '"type="text"  id="title' + i.toString() + '" placeholder ="Nombre de evaluacion" ></div>' +
+                            '<div class ="form-group col-md-2">' +
+                            '<label for="min' + i.toString() + '">Mínimo </label>' +
+                            '<input class="form-control" type="number" id="assoc_min' + i.toString() + '" min="1" max = "' + maximum + '" value ="' + json.scales[i].min_score + '"oninput ="changedMin(' + "'assoc_min" + i.toString() + "', '" + i.toString() + "', 'Assoc_Scales' " + ')" name = "assoc_min[]"></div>' +
+                            '<div class ="form-group col-md-2">' +
+                            '<label for="max' + i.toString() + '">Máximo </label>' +
+                            '<input class="form-control" type="number" id="assoc_max' + i.toString() + '" min="1" max = "' + maximum + '" value ="' + json.scales[i].max_score + '"oninput ="changedMax(' + "'assoc_max" + i.toString() + "', '" + i.toString() + "', 'Assoc_Scales' " + ')" name = "assoc_max[]"></div></div>' +
+                            '<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" >' + json.scales[i].description + '</textarea></div></div>';
+                        fullDiv += div;
+
+                    }
                 }
 
-                $('#program_id2').selectpicker('refresh');
+                addOptions('Num_assoc_scale', 'assoc_maximum_score');
+
+                $('#Assoc_Scales').append(fullDiv);
+                $('#Assoc_Scales').attr('data-value', scaleLength);
+                $('#Num_assoc_scale').val(scaleLength);
+                $('#Num_assoc_scale').selectpicker('refresh')
+
+
+
 
 
-                // Select status
-                if (json.criteria[0].deleted_at)
-                    $('#status').val(0);
-                else
-                    $('#status').val(1);
             },
             'json'
         );

app/views/local/managers/admins/objectives.blade.php

@@ -91,7 +91,7 @@
                     <div id='assocOutcomeGroup'>
                         <label>Associated Outcome</label>
 
-                        {{ Form::select('assoc_outcome[0]', $outcomes, null, ['class'=>'form-control selectpicker', 'id'=>'assoc_outcome0']) }}
+                        {{ Form::select('assoc_outcome[]', $outcomes, null, ['class'=>'form-control selectpicker', 'id'=>'assoc_outcome0']) }}
 
                     </div>
                 </div>
@@ -245,7 +245,7 @@
                 for (var i = 1; i < length; i++) {
                     var $select = $('<select />', {
                         'class': "selectpicker form-control",
-                        'name': "assoc_outcome[" + i.toString() + "]",
+                        'name': "assoc_outcome[]",
                         'data-live-search': 'true',
                         'id': 'assoc_outcome' + i.toString()
 
@@ -314,10 +314,10 @@
 
     function addAssoc() {
 
-        counterAssoc += 1;
+
         var $select = $('<select />', {
             'class': "selectpicker form-control",
-            'name': "assoc_outcome[" + counterAssoc.toString() + "]",
+            'name': "assoc_outcome[]",
             'data-live-search': 'true',
             'id': 'assoc_outcome' + counterAssoc.toString()
 
@@ -347,7 +347,7 @@
 
 
         ran = true;
-
+        counterAssoc += 1;
 
 
     }

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

@@ -7,14 +7,16 @@
       <li>{{ HTML::linkAction('ProgramCoordinatorsController@overview', 'Overview') }}</li>
       <li>{{ HTML::linkAction('TemplatesController@newTemplate', 'Rubrics') }}</li>
       <li>{{ HTML::linkAction('CriteriaController@index', 'Learning Outcomes and Criteria') }}</li>
+      <li>{{ HTML::linkAction('Objective2Controller@editProgram', 'Objectives')}}</li>
+      <li>{{ HTML::linkAction('CriteriaController@editProgram', 'Criteria') }}</li>
       @if(count(Auth::user()->courses))
       <li> {{ HTML::linkAction('ProfessorsController@overview', 'My Courses', NULL) }}</li>
       <li class="dropdown">
         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Sections<span class="caret"></span></a>
         <ul class="dropdown-menu" role="menu">
-        @foreach ($courses as $course)
+          @foreach ($courses as $course)
           <li> {{ HTML::linkAction('CoursesController@show', $course->code.$course->number.'-'.$course->section.' ('.$course->semester->code.')', array('id'=>$course->id)) }}</li>
-        @endforeach
+          @endforeach
         </ul>
       </li>
       @endif
@@ -22,30 +24,30 @@
       <li class="dropdown">
         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Reports<span class="caret"></span></a>
         <ul class="dropdown-menu" role="menu">
-            <li>{{ HTML::linkAction('OutcomesController@managerAssessmentReports', 'Program Reports') }}</li>
-            @if(count(Auth::user()->courses))
-              <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReports', 'My Courses\' Reports') }}</li>
-            @endif
+          <li>{{ HTML::linkAction('OutcomesController@managerAssessmentReports', 'Program Reports') }}</li>
+          @if(count(Auth::user()->courses))
+          <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReports', 'My Courses\' Reports') }}</li>
+          @endif
         </ul>
       </li>
 
       <li class="dropdown">
         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Help<span class="caret"></span></a>
         <ul class="dropdown-menu" role="menu">
-            <li>{{ HTML::linkAction('FeedbackController@create', 'Feedback') }}</li>
-            <!-- <li><a href="{{ asset('files/OLAS-intro.pdf') }}">Introduction to OLAS</a></li> -->
-            <li><a href="{{ asset('files/intro-avaluo.pdf') }}">Introduction to Assessment</a></li>
-            <!-- <li><a href="{{ asset('files/OLAS-coords.pdf') }}">OLAS for Coordinators</a></li> -->
-            <li><a href="http://oeae.uprrp.edu/wp-content/uploads/2019/01/Brochure-de-OLAS-rev.-agosto-2018.pdf">Brochure</a></li>
+          <li>{{ HTML::linkAction('FeedbackController@create', 'Feedback') }}</li>
+          <!-- <li><a href="{{ asset('files/OLAS-intro.pdf') }}">Introduction to OLAS</a></li> -->
+          <li><a href="{{ asset('files/intro-avaluo.pdf') }}">Introduction to Assessment</a></li>
+          <!-- <li><a href="{{ asset('files/OLAS-coords.pdf') }}">OLAS for Coordinators</a></li> -->
+          <li><a href="http://oeae.uprrp.edu/wp-content/uploads/2019/01/Brochure-de-OLAS-rev.-agosto-2018.pdf">Brochure</a></li>
         </ul>
       </li>
       <li class="dropdown">
         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Account<span class="caret"></span></a>
         <ul class="dropdown-menu" role="menu">
-            <li>{{ HTML::linkAction('UsersController@edit', 'Profile') }}</li>
-            <li>{{ HTML::linkAction('AuthController@logout', 'Log out ('.Auth::user()->email.')') }}</li>
+          <li>{{ HTML::linkAction('UsersController@edit', 'Profile') }}</li>
+          <li>{{ HTML::linkAction('AuthController@logout', 'Log out ('.Auth::user()->email.')') }}</li>
         </ul>
       </li>
     </ul>
   </div>
-</div>
+</div>

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

@@ -0,0 +1,419 @@
+@extends('layouts.master')
+
+@section('navigation')
+@include('local.managers.pCoords._navigation')
+@stop
+@section('main')
+
+<div class="row">
+    <div class="col-md-6">
+        <!-- Form to add a new objective -->
+        <div class="panel panel-default panel-button">
+            <div class="panel-heading">
+                Create
+            </div>
+            <div class="panel-body">
+                {{ Form::open(array('action' => 'Objective2Controller@create' )) }}
+                <div id='outcomeGroup'>
+                    <label> Associated Outcome</label>
+                    <div class="form-group col-md-11" id='outcomeForm'>
+
+
+                        {{ Form::select('outcome[0]', $outcomes, null, ['class'=>'form-control selectpicker', 'id' =>'outcome[0]']) }}
+
+                    </div>
+
+                </div>
+                <input type='hidden' name='counter' id='counter' value=1>
+                <button id='button-add-outcome' class='btn btn-md btn-secondary' onclick='addOutcomeTest()'>
+                    <span class='glyphicon glyphicon-plus'>
+
+                    </span>
+                    Add another Outcome
+                </button>
+
+                <!-- Associated Program -->
+
+
+                <div class="form-group">
+                    {{ Form::label('program_id', 'Associated Program') }}
+                    <select id="program_id" name="program_id" class="form-control selectpicker">
+
+                        <option value="{{ $programs[0]->id }}">{{ $programs[0]->name }} [{{ $programs[0]->school->name }}]</option>
+
+                    </select>
+                </div>
+
+
+                <div class="form-group">
+                    {{ Form::label('text', 'Text') }}
+                    {{ Form::text('text', '', array('class' => 'form-control')) }}
+                </div>
+
+
+
+                {{ Form::submit('Create', array('class' => 'btn btn-primary btn-block')) }}
+                {{ Form::close() }}
+            </div>
+        </div>
+    </div>
+
+    <div class="col-md-6">
+        <div class="panel panel-default panel-button">
+            <div class="panel-heading">
+                Edit
+            </div>
+            <div class="panel-body">
+                {{ Form::open(array('action' => 'Objective2Controller@update')) }}
+
+                <div class="form-group">
+                    {{ Form::label('objective_id', 'Objectives') }}
+                    <select id="select-objective" name="id" class="form-control selectpicker">
+                        @foreach ($objectives as $objective)
+                        <option value="{{ $objective->id }}" data-subtext="
+                                        @if($objective->program)
+                                            &nbsp;&nbsp;&nbsp;[{{ $objective->program->name }}]
+                                        @endif
+                                        ">
+                            {{ $objective->text }}
+
+
+
+                        </option>
+                        @endforeach
+                    </select>
+                </div>
+
+                <!-- Associated Outcome -->
+
+                <div class="form-group">
+                    <div id='assocOutcomeGroup'>
+                        <label>Associated Outcome</label>
+
+                        {{ Form::select('assoc_outcome[]', $outcomes, null, ['class'=>'form-control selectpicker', 'id'=>'assoc_outcome0']) }}
+
+                    </div>
+                </div>
+                <button id='button-add-assoc-outcome' class='btn btn-md btn-secondary' onclick='addAssoc()'>
+                    <span class='glyphicon glyphicon-plus'>
+
+                    </span>
+                    Add another Outcome
+                </button>
+
+
+                <!-- Associated Program -->
+                <div class="form-group">
+                    {{ Form::label('program_id2', 'Associated Program') }}
+                    <select id="program_id2" name="program_id" class="form-control selectpicker">
+
+
+                        <option value="{{ $programs[0]->id }}">{{ $programs[0]->name }} [{{ $programs[0]->school->name }}]</option>
+
+                    </select>
+                </div>
+
+                <!-- Status -->
+                <div class="form-group">
+                    {{ Form::label('status', 'Status') }}
+                    <span data-toggle="tooltip" data-placement="top" title="Use this option to deactivate or reactivate objectives. Inactive objective will stay in the system, but will not be available to use in new rubrics." class="glyphicon glyphicon-question-sign"></span>
+
+                    <select id="status" name="status" class="form-control">
+                        <option value="1">Active</option>
+                        <option value="0">Inactive</option>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    {{ Form::label('text', 'Text') }}
+                    {{ Form::text('text', Input::old('text'), array('class' => 'form-control', 'id'=>'objective-text')) }}
+                </div>
+                {{ Form::submit('Update', array('class' => 'btn btn-primary btn-block')) }}
+                {{ Form::close() }}
+            </div>
+
+
+
+
+        </div>
+    </div>
+</div>
+<script>
+    var outcomeHTML = document.getElementById('outcomeGroup').innerHTML;
+    var selectOptions = document.getElementById('outcome[0]').innerHTML;
+    var ran = false;
+
+    var counter = 1;
+    var counterAssoc = 1;
+    //Add Another Outcome
+
+    function changeOutcomeHtml() {
+        var outcomeHTML = document.getElementById('outcomeGroup').innerHTML;
+
+        outcomeHTML = outcomeHTML.replace('outcome[' + counter.toString() + ']', 'outcome[' + (counter + 1).toString() + ']');
+        counter += 1;
+        document.getElementById("outcomeGroup").innerHTML += outcomeHTML;
+
+
+
+
+        document.getElementById('button-add-outcome').onclick = addOutcome;
+    }
+
+    function addOutcome() {
+        outcomeHTML = outcomeHTML.replace('outcome[' + counter.toString() + ']', 'outcome[' + (counter + 1).toString() + ']');
+        counter += 1;
+
+        document.getElementById("outcomeGroup").innerHTML += outcomeHTML;
+    }
+
+    function addOutcomeTest() {
+        var $select = $('<select/>', {
+            'class': "selectpicker form-control",
+            'name': "outcome[" + counter.toString() + "]",
+            'data-live-search': 'true'
+
+        });
+        var $div = $('<div/>', {
+            'id': 'outcomeForm' + counter.toString(),
+            'class': 'form-group col-md-11'
+        });
+        var $divForButton = $('<div/>', {
+            'class': 'col-md-1',
+            'id': 'close' + counter.toString()
+
+        });
+        var $button = $('<button/>', {
+            'type': 'button',
+            'class': 'btn btn-primary',
+            'onclick': 'deleteLast()'
+        });
+        $button.append('X');
+        $divForButton.append($button);
+
+        $div.appendTo('#outcomeGroup')
+        $select.append(selectOptions);
+
+        $select.appendTo('#outcomeForm' + counter.toString()).selectpicker('refresh');
+        $divForButton.appendTo('#outcomeGroup');
+        counter += 1;
+        $('#counter').val(counter);
+
+    }
+
+    function deleteLast() {
+
+        div = document.getElementById('outcomeForm' + (counter - 1).toString());
+        div.remove();
+        button = document.getElementById('close' + (counter - 1).toString());
+        button.remove();
+        counter -= 1;
+        $('#counter').val(counter);
+    }
+
+    function fetchObjectiveForEditing() {
+        var id = $('#select-objective').find(':selected').val();
+
+        $.post(
+            "{{ URL::action('Objective2Controller@fetchObjectiveWithTrashed') }}", {
+                id: id
+            },
+            function(json) {
+
+                var text = json[0].text;
+
+
+
+                // Display info
+                $('#objective-text').val(text);
+
+
+                // Select associated outcome
+                var outcome_id = json[0].outcome_id;
+                $('#assoc_outcome0').val(outcome_id);
+                $('#assoc_outcome0').selectpicker('refresh');
+
+                var length = json.length;
+                if (ran == true) {
+                    for (var i = counterAssoc; i != 0; i--) {
+                        deleteLastAssoc(i);
+
+                    }
+                    counterAssoc = 1
+                }
+                for (var i = 1; i < length; i++) {
+                    var $select = $('<select />', {
+                        'class': "selectpicker form-control",
+                        'name': "assoc_outcome[]",
+                        'data-live-search': 'true',
+                        'id': 'assoc_outcome' + i.toString()
+
+                    });
+                    var $div = $('<div />', {
+                        'id': 'assocOutcomeForm' + i.toString(),
+                        'class': 'form-group col-md-11'
+                    });
+                    var $divForButton = $('<div />', {
+                        'class': 'col-md-1',
+                        'id': 'closeAssoc' + i.toString()
+
+                    });
+                    var $button = $('<button />', {
+                        'type': 'button',
+                        'class': 'btn btn-primary',
+                        'onclick': 'deleteLastAssoc()'
+                    });
+                    $button.append('X');
+                    $divForButton.append($button);
+
+                    $div.appendTo('#assocOutcomeGroup')
+                    $select.append(selectOptions);
+
+                    $select.appendTo('#assocOutcomeForm' + i.toString()).selectpicker('refresh');
+                    $divForButton.appendTo('#assocOutcomeGroup');
+
+                    $('#assoc_outcome' + i.toString()).val(json[i].outcome_id);
+                    $('#assoc_outcome' + i.toString()).selectpicker('refresh');
+
+                    counterAssoc = i;
+                    ran = true;
+
+                }
+
+                // Select associated program
+                if (json[0].program_id) {
+                    $('#program_id2').val(json[0].program_id);
+
+                } else {
+                    $('#program_id2').val(0);
+                }
+
+                $('#program_id2').selectpicker('refresh');
+
+
+                // Select status
+                if (json[0].deleted_at)
+                    $('#status').val(0);
+                else
+                    $('#status').val(1);
+            },
+            'json'
+        );
+    }
+
+    function deleteLastAssoc() {
+
+        div = document.getElementById('assocOutcomeForm' + (counterAssoc).toString());
+        div.remove();
+        button = document.getElementById('closeAssoc' + (counterAssoc).toString());
+        button.remove();
+        counterAssoc -= 1;
+
+    }
+
+    function addAssoc() {
+
+
+        var $select = $('<select />', {
+            'class': "selectpicker form-control",
+            'name': "assoc_outcome[]",
+            'data-live-search': 'true',
+            'id': 'assoc_outcome' + counterAssoc.toString()
+
+        });
+        var $div = $('<div />', {
+            'id': 'assocOutcomeForm' + counterAssoc.toString(),
+            'class': 'form-group col-md-11'
+        });
+        var $divForButton = $('<div />', {
+            'class': 'col-md-1',
+            'id': 'closeAssoc' + counterAssoc.toString()
+
+        });
+        var $button = $('<button />', {
+            'type': 'button',
+            'class': 'btn btn-primary',
+            'onclick': 'deleteLastAssoc()'
+        });
+        $button.append('X');
+        $divForButton.append($button);
+
+        $div.appendTo('#assocOutcomeGroup')
+        $select.append(selectOptions);
+
+        $select.appendTo('#assocOutcomeForm' + counterAssoc.toString()).selectpicker('refresh');
+        $divForButton.appendTo('#assocOutcomeGroup');
+
+
+        ran = true;
+        counterAssoc += 1;
+
+
+    }
+</script>
+@stop
+
+@section('javascript')
+
+// --------------------------------------------------------------------------
+// Page load
+// --------------------------------------------------------------------------
+
+// Hide accordion panel contents by default
+$('.panel-group .panel-body').hide();
+
+$('#outcome-display').parent().hide();
+
+fetchObjectiveForEditing();
+// setCriterionStatus();
+
+
+
+
+// --------------------------------------------------------------------------
+// Functions
+// --------------------------------------------------------------------------
+
+// Fetch criterion info for editing
+
+$('#button-add-outcome').on('click', function(e) {
+// Prevent the default action of the clicked item. In this case that is submit
+e.preventDefault();
+
+
+return false;
+});
+$('#button-add-assoc-outcome').on('click', function(e) {
+// Prevent the default action of the clicked item. In this case that is submit
+e.preventDefault();
+
+
+return false;
+});
+
+// --------------------------------------------------------------------------
+// Events
+// --------------------------------------------------------------------------
+
+// When panel heading is clicked, toggle it
+$('.panel-group .panel-heading').on('click', function()
+{
+$(this).next().stop().slideToggle();
+})
+
+
+// When list item is clicked, load corresponding info
+$('#select-objective').on('change', function()
+{
+fetchObjectiveForEditing();
+$('.selectpicker').selectpicker('refresh');
+});
+
+// When list item is clicked, load corresponding info
+$('.selectpicker').on('change', function()
+{
+//alert($(this).find(':selected').val());
+$('.selectpicker').selectpicker('refresh');
+});
+
+@stop

app/views/local/managers/sCoords/_navigation.blade.php

@@ -7,14 +7,16 @@
       <li>{{ HTML::linkAction('SchoolCoordinatorsController@overview', 'Overview') }}</li>
       <li>{{ HTML::linkAction('TemplatesController@newTemplate', 'Rubrics') }}</li>
       <li>{{ HTML::linkAction('CriteriaController@index', 'Learning Outcomes and Criteria') }}</li>
+      <li>{{ HTML::linkAction('Objective2Controller@editSchool', 'Objectives')}}</li>
+      <li>{{ HTML::linkAction('CriteriaController@editSchool', 'Criteria') }}</li>
       @if(count(Auth::user()->courses))
       <li> {{ HTML::linkAction('ProfessorsController@overview', 'My Courses', NULL) }}</li>
       <li class="dropdown">
         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Sections<span class="caret"></span></a>
         <ul class="dropdown-menu" role="menu">
-        @foreach ($courses as $course)
+          @foreach ($courses as $course)
           <li> {{ HTML::linkAction('CoursesController@show', $course->code.$course->number.'-'.$course->section.' ('.$course->semester->code.')', array('id'=>$course->id)) }}</li>
-        @endforeach
+          @endforeach
         </ul>
       </li>
       @endif
@@ -22,30 +24,30 @@
       <li class="dropdown">
         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Reports<span class="caret"></span></a>
         <ul class="dropdown-menu" role="menu">
-            <li>{{ HTML::linkAction('OutcomesController@managerAssessmentReports', 'School Reports') }}</li>
-            @if(count(Auth::user()->courses))
-              <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReports', 'My Courses\' Reports') }}</li>
-            @endif
+          <li>{{ HTML::linkAction('OutcomesController@managerAssessmentReports', 'School Reports') }}</li>
+          @if(count(Auth::user()->courses))
+          <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReports', 'My Courses\' Reports') }}</li>
+          @endif
         </ul>
       </li>
 
       <li class="dropdown">
         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Help<span class="caret"></span></a>
         <ul class="dropdown-menu" role="menu">
-            <li>{{ HTML::linkAction('FeedbackController@create', 'Feedback') }}</li>
-            <!-- <li><a href="{{ asset('files/OLAS-intro.pdf') }}">Introduction to OLAS</a></li> -->
-            <li><a href="{{ asset('files/intro-avaluo.pdf') }}">Introduction to Assessment</a></li>
-            <!-- <li><a href="{{ asset('files/OLAS-coords.pdf') }}">OLAS for Coordinators</a></li> -->
-            <li><a href="http://oeae.uprrp.edu/wp-content/uploads/2019/01/Brochure-de-OLAS-rev.-agosto-2018.pdf">Brochure</a></li>
+          <li>{{ HTML::linkAction('FeedbackController@create', 'Feedback') }}</li>
+          <!-- <li><a href="{{ asset('files/OLAS-intro.pdf') }}">Introduction to OLAS</a></li> -->
+          <li><a href="{{ asset('files/intro-avaluo.pdf') }}">Introduction to Assessment</a></li>
+          <!-- <li><a href="{{ asset('files/OLAS-coords.pdf') }}">OLAS for Coordinators</a></li> -->
+          <li><a href="http://oeae.uprrp.edu/wp-content/uploads/2019/01/Brochure-de-OLAS-rev.-agosto-2018.pdf">Brochure</a></li>
         </ul>
       </li>
       <li class="dropdown">
         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Account<span class="caret"></span></a>
         <ul class="dropdown-menu" role="menu">
-            <li>{{ HTML::linkAction('UsersController@edit', 'Profile') }}</li>
-            <li>{{ HTML::linkAction('AuthController@logout', 'Log out ('.Auth::user()->email.')') }}</li>
+          <li>{{ HTML::linkAction('UsersController@edit', 'Profile') }}</li>
+          <li>{{ HTML::linkAction('AuthController@logout', 'Log out ('.Auth::user()->email.')') }}</li>
         </ul>
       </li>
     </ul>
   </div>
-</div>
+</div>

app/views/local/managers/sCoords/objectives.blade.php

@@ -0,0 +1,420 @@
+@extends('layouts.master')
+
+@section('navigation')
+@include('local.managers.sCoords._navigation')
+@stop
+@section('main')
+
+<div class="row">
+    <div class="col-md-6">
+        <!-- Form to add a new objective -->
+        <div class="panel panel-default panel-button">
+            <div class="panel-heading">
+                Create
+            </div>
+            <div class="panel-body">
+                {{ Form::open(array('action' => 'Objective2Controller@create' )) }}
+                <div id='outcomeGroup'>
+                    <label> Associated Outcome</label>
+                    <div class="form-group col-md-11" id='outcomeForm'>
+
+
+                        {{ Form::select('outcome[0]', $outcomes, null, ['class'=>'form-control selectpicker', 'id' =>'outcome[0]']) }}
+
+                    </div>
+
+                </div>
+                <input type='hidden' name='counter' id='counter' value=1>
+                <button id='button-add-outcome' class='btn btn-md btn-secondary' onclick='addOutcomeTest()'>
+                    <span class='glyphicon glyphicon-plus'>
+
+                    </span>
+                    Add another Outcome
+                </button>
+
+                <!-- Associated Program -->
+
+
+                <div class="form-group">
+                    {{ Form::label('program_id', 'Associated Program') }}
+                    <select id="program_id" name="program_id" class="form-control selectpicker">
+                        <option value="0">All</option>
+                        @foreach ($programs as $program)
+                        <option value="{{ $program->id }}">{{ $program->name }} [{{ $program->school->name }}]</option>
+                        @endforeach
+                    </select>
+                </div>
+
+
+                <div class="form-group">
+                    {{ Form::label('text', 'Text') }}
+                    {{ Form::text('text', '', array('class' => 'form-control')) }}
+                </div>
+
+
+
+                {{ Form::submit('Create', array('class' => 'btn btn-primary btn-block')) }}
+                {{ Form::close() }}
+            </div>
+        </div>
+    </div>
+
+    <div class="col-md-6">
+        <div class="panel panel-default panel-button">
+            <div class="panel-heading">
+                Edit
+            </div>
+            <div class="panel-body">
+                {{ Form::open(array('action' => 'Objective2Controller@update')) }}
+
+                <div class="form-group">
+                    {{ Form::label('objective_id', 'Objectives') }}
+                    <select id="select-objective" name="id" class="form-control selectpicker">
+                        @foreach ($objectives as $objective)
+                        <option value="{{ $objective->id }}" data-subtext="
+                                        @if($objective->program)
+                                            &nbsp;&nbsp;&nbsp;[{{ $objective->program->name }}]
+                                        @endif
+                                        ">
+                            {{ $objective->text }}
+
+
+
+                        </option>
+                        @endforeach
+                    </select>
+                </div>
+
+                <!-- Associated Outcome -->
+
+                <div class="form-group">
+                    <div id='assocOutcomeGroup'>
+                        <label>Associated Outcome</label>
+
+                        {{ Form::select('assoc_outcome[]', $outcomes, null, ['class'=>'form-control selectpicker', 'id'=>'assoc_outcome0']) }}
+
+                    </div>
+                </div>
+                <button id='button-add-assoc-outcome' class='btn btn-md btn-secondary' onclick='addAssoc()'>
+                    <span class='glyphicon glyphicon-plus'>
+
+                    </span>
+                    Add another Outcome
+                </button>
+
+
+                <!-- Associated Program -->
+                <div class="form-group">
+                    {{ Form::label('program_id2', 'Associated Program') }}
+                    <select id="program_id2" name="program_id" class="form-control selectpicker">
+                        <option value="0">All</option>
+                        @foreach ($programs as $program)
+                        <option value="{{ $program->id }}">{{ $program->name }} [{{ $program->school->name }}]</option>
+                        @endforeach
+                    </select>
+                </div>
+
+                <!-- Status -->
+                <div class="form-group">
+                    {{ Form::label('status', 'Status') }}
+                    <span data-toggle="tooltip" data-placement="top" title="Use this option to deactivate or reactivate objectives. Inactive objective will stay in the system, but will not be available to use in new rubrics." class="glyphicon glyphicon-question-sign"></span>
+
+                    <select id="status" name="status" class="form-control">
+                        <option value="1">Active</option>
+                        <option value="0">Inactive</option>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    {{ Form::label('text', 'Text') }}
+                    {{ Form::text('text', Input::old('text'), array('class' => 'form-control', 'id'=>'objective-text')) }}
+                </div>
+                {{ Form::submit('Update', array('class' => 'btn btn-primary btn-block')) }}
+                {{ Form::close() }}
+            </div>
+
+
+
+
+        </div>
+    </div>
+</div>
+<script>
+    var outcomeHTML = document.getElementById('outcomeGroup').innerHTML;
+    var selectOptions = document.getElementById('outcome[0]').innerHTML;
+    var ran = false;
+
+    var counter = 1;
+    var counterAssoc = 1;
+    //Add Another Outcome
+
+    function changeOutcomeHtml() {
+        var outcomeHTML = document.getElementById('outcomeGroup').innerHTML;
+
+        outcomeHTML = outcomeHTML.replace('outcome[' + counter.toString() + ']', 'outcome[' + (counter + 1).toString() + ']');
+        counter += 1;
+        document.getElementById("outcomeGroup").innerHTML += outcomeHTML;
+
+
+
+
+        document.getElementById('button-add-outcome').onclick = addOutcome;
+    }
+
+    function addOutcome() {
+        outcomeHTML = outcomeHTML.replace('outcome[' + counter.toString() + ']', 'outcome[' + (counter + 1).toString() + ']');
+        counter += 1;
+
+        document.getElementById("outcomeGroup").innerHTML += outcomeHTML;
+    }
+
+    function addOutcomeTest() {
+        var $select = $('<select/>', {
+            'class': "selectpicker form-control",
+            'name': "outcome[" + counter.toString() + "]",
+            'data-live-search': 'true'
+
+        });
+        var $div = $('<div/>', {
+            'id': 'outcomeForm' + counter.toString(),
+            'class': 'form-group col-md-11'
+        });
+        var $divForButton = $('<div/>', {
+            'class': 'col-md-1',
+            'id': 'close' + counter.toString()
+
+        });
+        var $button = $('<button/>', {
+            'type': 'button',
+            'class': 'btn btn-primary',
+            'onclick': 'deleteLast()'
+        });
+        $button.append('X');
+        $divForButton.append($button);
+
+        $div.appendTo('#outcomeGroup')
+        $select.append(selectOptions);
+
+        $select.appendTo('#outcomeForm' + counter.toString()).selectpicker('refresh');
+        $divForButton.appendTo('#outcomeGroup');
+        counter += 1;
+        $('#counter').val(counter);
+
+    }
+
+    function deleteLast() {
+
+        div = document.getElementById('outcomeForm' + (counter - 1).toString());
+        div.remove();
+        button = document.getElementById('close' + (counter - 1).toString());
+        button.remove();
+        counter -= 1;
+        $('#counter').val(counter);
+    }
+
+    function fetchObjectiveForEditing() {
+        var id = $('#select-objective').find(':selected').val();
+
+        $.post(
+            "{{ URL::action('Objective2Controller@fetchObjectiveWithTrashed') }}", {
+                id: id
+            },
+            function(json) {
+
+                var text = json[0].text;
+
+
+
+                // Display info
+                $('#objective-text').val(text);
+
+
+                // Select associated outcome
+                var outcome_id = json[0].outcome_id;
+                $('#assoc_outcome0').val(outcome_id);
+                $('#assoc_outcome0').selectpicker('refresh');
+
+                var length = json.length;
+                if (ran == true) {
+                    for (var i = counterAssoc; i != 0; i--) {
+                        deleteLastAssoc(i);
+
+                    }
+                    counterAssoc = 1
+                }
+                for (var i = 1; i < length; i++) {
+                    var $select = $('<select />', {
+                        'class': "selectpicker form-control",
+                        'name': "assoc_outcome[]",
+                        'data-live-search': 'true',
+                        'id': 'assoc_outcome' + i.toString()
+
+                    });
+                    var $div = $('<div />', {
+                        'id': 'assocOutcomeForm' + i.toString(),
+                        'class': 'form-group col-md-11'
+                    });
+                    var $divForButton = $('<div />', {
+                        'class': 'col-md-1',
+                        'id': 'closeAssoc' + i.toString()
+
+                    });
+                    var $button = $('<button />', {
+                        'type': 'button',
+                        'class': 'btn btn-primary',
+                        'onclick': 'deleteLastAssoc()'
+                    });
+                    $button.append('X');
+                    $divForButton.append($button);
+
+                    $div.appendTo('#assocOutcomeGroup')
+                    $select.append(selectOptions);
+
+                    $select.appendTo('#assocOutcomeForm' + i.toString()).selectpicker('refresh');
+                    $divForButton.appendTo('#assocOutcomeGroup');
+
+                    $('#assoc_outcome' + i.toString()).val(json[i].outcome_id);
+                    $('#assoc_outcome' + i.toString()).selectpicker('refresh');
+
+                    counterAssoc = i;
+                    ran = true;
+
+                }
+
+                // Select associated program
+                if (json[0].program_id) {
+                    $('#program_id2').val(json[0].program_id);
+
+                } else {
+                    $('#program_id2').val(0);
+                }
+
+                $('#program_id2').selectpicker('refresh');
+
+
+                // Select status
+                if (json[0].deleted_at)
+                    $('#status').val(0);
+                else
+                    $('#status').val(1);
+            },
+            'json'
+        );
+    }
+
+    function deleteLastAssoc() {
+
+        div = document.getElementById('assocOutcomeForm' + (counterAssoc).toString());
+        div.remove();
+        button = document.getElementById('closeAssoc' + (counterAssoc).toString());
+        button.remove();
+        counterAssoc -= 1;
+
+    }
+
+    function addAssoc() {
+
+
+        var $select = $('<select />', {
+            'class': "selectpicker form-control",
+            'name': "assoc_outcome[]",
+            'data-live-search': 'true',
+            'id': 'assoc_outcome' + counterAssoc.toString()
+
+        });
+        var $div = $('<div />', {
+            'id': 'assocOutcomeForm' + counterAssoc.toString(),
+            'class': 'form-group col-md-11'
+        });
+        var $divForButton = $('<div />', {
+            'class': 'col-md-1',
+            'id': 'closeAssoc' + counterAssoc.toString()
+
+        });
+        var $button = $('<button />', {
+            'type': 'button',
+            'class': 'btn btn-primary',
+            'onclick': 'deleteLastAssoc()'
+        });
+        $button.append('X');
+        $divForButton.append($button);
+
+        $div.appendTo('#assocOutcomeGroup')
+        $select.append(selectOptions);
+
+        $select.appendTo('#assocOutcomeForm' + counterAssoc.toString()).selectpicker('refresh');
+        $divForButton.appendTo('#assocOutcomeGroup');
+
+
+        ran = true;
+        counterAssoc += 1;
+
+
+    }
+</script>
+@stop
+
+@section('javascript')
+
+// --------------------------------------------------------------------------
+// Page load
+// --------------------------------------------------------------------------
+
+// Hide accordion panel contents by default
+$('.panel-group .panel-body').hide();
+
+$('#outcome-display').parent().hide();
+
+fetchObjectiveForEditing();
+// setCriterionStatus();
+
+
+
+
+// --------------------------------------------------------------------------
+// Functions
+// --------------------------------------------------------------------------
+
+// Fetch criterion info for editing
+
+$('#button-add-outcome').on('click', function(e) {
+// Prevent the default action of the clicked item. In this case that is submit
+e.preventDefault();
+
+
+return false;
+});
+$('#button-add-assoc-outcome').on('click', function(e) {
+// Prevent the default action of the clicked item. In this case that is submit
+e.preventDefault();
+
+
+return false;
+});
+
+// --------------------------------------------------------------------------
+// Events
+// --------------------------------------------------------------------------
+
+// When panel heading is clicked, toggle it
+$('.panel-group .panel-heading').on('click', function()
+{
+$(this).next().stop().slideToggle();
+})
+
+
+// When list item is clicked, load corresponding info
+$('#select-objective').on('change', function()
+{
+fetchObjectiveForEditing();
+$('.selectpicker').selectpicker('refresh');
+});
+
+// When list item is clicked, load corresponding info
+$('.selectpicker').on('change', function()
+{
+//alert($(this).find(':selected').val());
+$('.selectpicker').selectpicker('refresh');
+});
+
+@stop