Gabriel, trabajo hasta 11/17

Añadí un readmePLease.txt que creo que abarca lo más importante.

READMEPLEASE.txt

@@ -0,0 +1,14 @@
+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/config/app.php

@@ -13,8 +13,9 @@ return array(
 	|
 	*/
 
-	'debug' => $_ENV['APP_DEBUG'] ?: false,
+	//'debug' => $_ENV['APP_DEBUG'] ?: false,
 
+	'debug' => true,
 	/*
 	|--------------------------------------------------------------------------
 	| Application URL
@@ -24,9 +25,9 @@ return array(
 	| the Artisan command line tool. You should set this to the root of
 	| your application so that it is used when running Artisan tasks.
 	|
-	*/
+	*/ //$_ENV['APP_URL'] ?:
 
-	'url' => $_ENV['APP_URL'] ?: 'http://localhost',
+	'url' =>  'https://localhost',
 
 	/*
 	|--------------------------------------------------------------------------
@@ -139,7 +140,7 @@ return array(
 	|
 	*/
 
-	'manifest' => storage_path().'/meta',
+	'manifest' => storage_path() . '/meta',
 
 	/*
 	|--------------------------------------------------------------------------
@@ -193,7 +194,7 @@ return array(
 		'Validator'         => 'Illuminate\Support\Facades\Validator',
 		'View'              => 'Illuminate\Support\Facades\View',
 		'PDF'				=> 'Barryvdh\DomPDF\Facade',
-        'Entrust' => 'Zizaco\Entrust\EntrustFacade'
+		'Entrust' => 'Zizaco\Entrust\EntrustFacade'
 
 
 	),

app/config/database.php

@@ -47,15 +47,16 @@ return array(
 	'connections' => array(
 
 		'mysql' => array(
+
 			'driver'    => 'mysql',
-			'host'      => $_ENV['MYSQL_HOST'] ?: 'localhost',
-			'database'  => $_ENV['MYSQL_DATABASE'] ?: 'laravel',
-			'username'  => $_ENV['MYSQL_USERNAME'] ?: 'root',
-			'password'  => $_ENV['MYSQL_PASSWORD'] ?: '',
+			'host'      =>  '127.0.0.1',
+			'database'  =>  'trabajoolas5',
+			'username'  =>  'root',
+			'password'  =>  '',
 			'charset'   => 'utf8',
 			'collation' => 'utf8_unicode_ci',
 			'prefix'    => '',
-            'engine'    => 'InnoDB',
+			'engine'    => 'InnoDB',
 		),
 	),
 

app/controllers/ActivitiesController.php

@@ -2,7 +2,8 @@
 
 use Illuminate\Database\Eloquent\Collection;
 
-class ActivitiesController extends \BaseController {
+class ActivitiesController extends \BaseController
+{
 
     /**
      * Save a new activity
@@ -13,55 +14,51 @@ class ActivitiesController extends \BaseController {
     public function create($id)
     {
         /** Validation rules */
+
         $validator = Validator::make(
             array(
                 'name' => Input::get('name'),
                 'description' => Input::get('description')
             ),
             array(
-                'name' => 'required|unique:activities,course_id,'.$id,
+                'name' => 'required|unique:activities,course_id,' . $id,
                 'description' => 'required|min:10'
             )
         );
 
+
         /** If validation fails */
-        if ($validator->fails())
-        {
+        if ($validator->fails()) {
             /** Prepare error message */
             $message = 'Error(s) creating a new Activity<ul>';
 
-            foreach ($validator->messages()->all('<li>:message</li>') as $validationError)
-            {
-                $message.=$validationError;
+            foreach ($validator->messages()->all('<li>:message</li>') as $validationError) {
+                $message .= $validationError;
             }
 
-            $message.='</ul>';
+            $message .= '</ul>';
 
             /** Send error message and old data */
             Session::flash('status', 'danger');
             Session::flash('message', $message);
             return Redirect::back()->withInput();
-        }
-        else
-        {
+        } else {
             /** Instantiate new activity */
             $activity = new Activity;
-            $activity->name= Input::get('name');
+            $activity->name = Input::get('name');
             $activity->description = Input::get('description');
             $activity->course_id = $id;
             $activity->date = date('Y-m-d');
 
             /** If activity is saved, send success message */
-            if($activity->save())
-            {
+            if ($activity->save()) {
                 Session::flash('status', 'success');
                 Session::flash('message', 'Activity created.');
                 return Redirect::action('ActivitiesController@show', array($activity->id));
             }
 
             /** If saving fails, send error message and old data */
-            else
-            {
+            else {
                 Session::flash('status', 'warning');
                 Session::flash('message', 'Error adding Activity. Please try again later.');
                 return Redirect::back()->withInput();
@@ -76,24 +73,25 @@ class ActivitiesController extends \BaseController {
         $instruments = Rubric::all();
         $courses = Course::where('user_id', Auth::user()->id)->get();
         $outcomes = Outcome::with('objectives')->get();
-//        var_dump($outcomes[0]->objectives);
+        //        var_dump($outcomes[0]->objectives);
         $objectives_by_outcome = Collection::make([]);
-        $outcomes->each(function($outcome) use (&$objectives_by_outcome) {
-//            var_dump($outcome->objectives);
+        $outcomes->each(function ($outcome) use (&$objectives_by_outcome) {
+            //            var_dump($outcome->objectives);
             $objectives_by_outcome->put($outcome->id, $outcome->objectives);
-//            var_dump($objectives);
+            //            var_dump($objectives);
         });
         $criteria_by_objective = Collection::make([]);
-        $objectives_by_outcome->each(function($objectives) use (&$criteria_by_objective) {
-            $objectives->each(function($objective) use (&$criteria_by_objective) {
+        $objectives_by_outcome->each(function ($objectives) use (&$criteria_by_objective) {
+            $objectives->each(function ($objective) use (&$criteria_by_objective) {
                 $criteria_by_objective->put($objective->id, $objective->criteria);
             });
         });
         $transforming_actions = [];
         $course = Course::find($course_id);
-//        var_dump($criteria_by_objective);
-//        return $objectives->toJson();
-        return View::make('local.managers.admins.new-activity-create',
+        //        var_dump($criteria_by_objective);
+        //        return $objectives->toJson();
+        return View::make(
+            'local.managers.admins.new-activity-create',
             compact(
                 'title',
                 'course',
@@ -116,7 +114,7 @@ class ActivitiesController extends \BaseController {
         $activity = Activity::find($id);
 
         // If activity does not exist, display 404
-        if(!$activity)
+        if (!$activity)
             App::abort('404');
 
         // Get activity's course
@@ -127,16 +125,14 @@ class ActivitiesController extends \BaseController {
             App::abort('403', 'Access Forbidden');
 
         // Get active semesters
-        $active_semesters= array();
+        $active_semesters = array();
         $active_semesters_collection = Semester::select('id')->where('is_visible', 1)->where('start', '<=', date('Y-m-d H:i:s'))->where('end', '>=', date('Y-m-d H:i:s'))->get();
-        foreach ($active_semesters_collection as $active_semester)
-        {
-            $active_semesters[]=$active_semester->id;
+        foreach ($active_semesters_collection as $active_semester) {
+            $active_semesters[] = $active_semester->id;
         }
-            // Added the function htmlspecialchars to activity name string because it was corrupting Jquery code while using quotes on page rendering. - Carlos R Caraballo 1/18/2019
-        $title = $course->code.$course->number.'-'.$course->section.': '.htmlspecialchars($activity->name, ENT_QUOTES).' <span class="small attention">('.$course->semester->code.')</span>';
-        //$outcomes = Outcome::orderBy('name', 'asc')->get();
-        $outcomes = Outcome::active();
+        // Added the function htmlspecialchars to activity name string because it was corrupting Jquery code while using quotes on page rendering. - Carlos R Caraballo 1/18/2019
+        $title = $course->code . $course->number . '-' . $course->section . ': ' . htmlspecialchars($activity->name, ENT_QUOTES) . ' <span class="small attention">(' . $course->semester->code . ')</span>';
+        $outcomes = Outcome::orderBy('name', 'asc')->get();
         $outcomes_achieved = json_decode($activity->outcomes_achieved, true);
         $outcomes_attempted = json_decode($activity->outcomes_attempted, true);
 
@@ -149,7 +145,7 @@ class ActivitiesController extends \BaseController {
         $activity = Activity::find($id);
 
         // If activity does not exist, display 404
-        if(!$activity)
+        if (!$activity)
             App::abort('404');
 
         // Get activity's course
@@ -167,12 +163,11 @@ class ActivitiesController extends \BaseController {
         $rubric_contents = json_decode($rubric->contents);
 
         // Get results
-        $assessments = DB::table('assessments')->join('students', 'assessments.student_id','=','students.id')->where('activity_id', '=', $activity->id)->orderBy('assessments.id', 'asc')->get();
+        $assessments = DB::table('assessments')->join('students', 'assessments.student_id', '=', 'students.id')->where('activity_id', '=', $activity->id)->orderBy('assessments.id', 'asc')->get();
 
         // Decode the scores (blade workaround)
         $scores_array = array();
-        foreach ($assessments as $index=>$assessment)
-        {
+        foreach ($assessments as $index => $assessment) {
             $scores_array[$assessment->id] = json_decode($assessment->scores, true);
         }
 
@@ -181,12 +176,9 @@ class ActivitiesController extends \BaseController {
 
     public function saveAssessment()
     {
-        try
-        {
-            $exception = DB::transaction(function()
-            {
-                DB::transaction(function()
-                {
+        try {
+            $exception = DB::transaction(function () {
+                DB::transaction(function () {
                     // Student assessment data
                     $student_data = json_decode(Input::get('student_scores'));
 
@@ -198,51 +190,42 @@ class ActivitiesController extends \BaseController {
                     $activity = Activity::find(Input::get('activity_id'));
 
                     // Create or update student scores
-                    if($activity->outcomes_attempted==NULL)
-                    {
+                    if ($activity->outcomes_attempted == NULL) {
                         // For each student, save her/his assessment in the db
-                        foreach ($student_data as $single_student_data)
-                        {
+                        foreach ($student_data as $single_student_data) {
                             // Find student by id
                             $student = Student::find($single_student_data->student_id);
 
                             $comments = trim($single_student_data->comments);
-                            if($comments=='')
-                            {
+                            if ($comments == '') {
                                 $comments = NULL;
                             }
 
                             // Add the assessment to the pivot table
                             $student->assessed_activities()->attach($activity->id, array(
                                 'scores' => json_encode($single_student_data->scores),
-                                'percentage'=>$single_student_data->percentage,
+                                'percentage' => $single_student_data->percentage,
                                 'comments' => $single_student_data->comments
                             ));
                         }
-                    }
-                    else
-                    {
+                    } else {
                         // For each student, save her/his assessment in the db
-                        foreach ($student_data as $single_student_data)
-                        {
+                        foreach ($student_data as $single_student_data) {
                             // Find student by id
                             $student = Student::find($single_student_data->student_id);
 
                             $comments = trim($single_student_data->comments);
-                            if($comments=='')
-                            {
+                            if ($comments == '') {
                                 $comments = NULL;
                             }
 
                             // Update the assessment in the pivot table
                             $student->assessed_activities()->updateExistingPivot($activity->id, array(
                                 'scores' => json_encode($single_student_data->scores),
-                                'percentage'=>$single_student_data->percentage,
+                                'percentage' => $single_student_data->percentage,
                                 'comments' => $single_student_data->comments
                             ));
-
                         }
-
                     }
 
 
@@ -256,43 +239,37 @@ class ActivitiesController extends \BaseController {
                     $course_outcomes_attempted = NULL;
                     $course_outcomes_achieved = NULL;
 
-                    if($course->outcomes_attempted==NULL)
-                    {
+                    if ($course->outcomes_attempted == NULL) {
                         $course_outcomes_attempted = array_fill(1, $outcomeCount, 0);
                         $course_outcomes_achieved = array_fill(1, $outcomeCount, 0);
-                    }
-                    else
-                    {
+                    } else {
                         // the second argument is necessary to convert it into an array
                         $course_outcomes_attempted = json_decode($course->outcomes_attempted, true);
                         $course_outcomes_achieved = json_decode($course->outcomes_achieved, true);
                     }
 
 
-                    foreach($criteria_achievement as $criterion_id=>$criterion_achieved)
-                    {
+                    foreach ($criteria_achievement as $criterion_id => $criterion_achieved) {
                         // Find corresponding learning outcome
                         $criterion = Criterion::withTrashed()->find($criterion_id);
                         $outcome = Outcome::find($criterion->outcome_id);
 
                         // If criterion is achieved (1), add 1 to all arrays
-                        if($criterion_achieved===1)
-                        {
-                            $outcomes_attempted[$outcome->id]+=1;
-                            $outcomes_achieved[$outcome->id]+=1;
-                            $course_outcomes_attempted[$outcome->id]+=1;
-                            $course_outcomes_achieved[$outcome->id]+=1;
+                        if ($criterion_achieved === 1) {
+                            $outcomes_attempted[$outcome->id] += 1;
+                            $outcomes_achieved[$outcome->id] += 1;
+                            $course_outcomes_attempted[$outcome->id] += 1;
+                            $course_outcomes_achieved[$outcome->id] += 1;
                         }
                         // Else if it's 0, only add to the attempted outcomes arrays
-                        elseif($criterion_achieved===0)
-                        {
-                            $outcomes_attempted[$outcome->id]+=1;
-                            $course_outcomes_attempted[$outcome->id]+=1;
+                        elseif ($criterion_achieved === 0) {
+                            $outcomes_attempted[$outcome->id] += 1;
+                            $course_outcomes_attempted[$outcome->id] += 1;
                         }
                     }
 
                     // If all values are 0, throw exception
-                    if(count(array_unique($outcomes_attempted))==1 && $outcomes_attempted[1]==0)
+                    if (count(array_unique($outcomes_attempted)) == 1 && $outcomes_attempted[1] == 0)
                         throw new Exception("Error Processing Request", 1);
 
 
@@ -305,18 +282,14 @@ class ActivitiesController extends \BaseController {
 
 
                     // Publish results if not a draft. That is, update the activity's course.
-                    if(Input::get('draft')==false)
-                    {
+                    if (Input::get('draft') == false) {
                         // Update course
                         $course->outcomes_achieved = json_encode($course_outcomes_achieved);
                         $course->outcomes_attempted = json_encode($course_outcomes_attempted);
                         $course->save();
 
                         $activity->draft = false;
-
-                    }
-                    else
-                    {
+                    } else {
                         // Set draft to true
                         $activity->draft = true;
                     }
@@ -334,18 +307,15 @@ class ActivitiesController extends \BaseController {
 
                     // Check if any assessed activities remain
                     $remainingAssessed = false;
-                    foreach ($activities as $activity1)
-                    {
-                        if($activity1->outcomes_attempted!=NULL)
-                        {
-                            $remainingAssessed =true;
+                    foreach ($activities as $activity1) {
+                        if ($activity1->outcomes_attempted != NULL) {
+                            $remainingAssessed = true;
                             break;
                         }
                     }
 
                     //If there are still evaluated activities in the course, recalculate course outcomes
-                    if(count($activities) && $remainingAssessed)
-                    {
+                    if (count($activities) && $remainingAssessed) {
                         $outcomeCount = Outcome::all()->count();
 
                         // Variables to hold recalculated outcomes for the course
@@ -353,29 +323,24 @@ class ActivitiesController extends \BaseController {
                         $course_outcomes_achieved = array_fill(1, $outcomeCount, 0);
 
                         // For each activity
-                        foreach ($activities as $activity2)
-                        {
+                        foreach ($activities as $activity2) {
                             // If activity has been assessed
-                            if($activity2->outcomes_attempted!=NULL)
-                            {
+                            if ($activity2->outcomes_attempted != NULL) {
                                 // Get the achieved criteria
                                 $criteria_achievement = json_decode($activity2->criteria_achieved, true);
-                                foreach($criteria_achievement as $criterion_id=>$criterion_achieved)
-                                {
+                                foreach ($criteria_achievement as $criterion_id => $criterion_achieved) {
                                     // Find corresponding learning outcome;
                                     $criterion = Criterion::withTrashed()->find($criterion_id);
                                     $outcome = Outcome::find($criterion->outcome_id);
 
                                     // If criterion is achieved (1), add 1 to both arrays
-                                    if($criterion_achieved === 1)
-                                    {
-                                        $course_outcomes_attempted[$outcome->id]+=1;
-                                        $course_outcomes_achieved[$outcome->id]+=1;
+                                    if ($criterion_achieved === 1) {
+                                        $course_outcomes_attempted[$outcome->id] += 1;
+                                        $course_outcomes_achieved[$outcome->id] += 1;
                                     }
                                     // Else, only add to the attempted outcomes arrays
-                                    elseif($criterion_achieved === 0)
-                                    {
-                                        $course_outcomes_attempted[$outcome->id]+=1;
+                                    elseif ($criterion_achieved === 0) {
+                                        $course_outcomes_attempted[$outcome->id] += 1;
                                     }
                                 }
                             }
@@ -383,54 +348,46 @@ class ActivitiesController extends \BaseController {
 
                         // Update course
                         DB::table('courses')
-                        ->where('id', $course->id)
-                        ->update(array(
-                            'outcomes_attempted'=> json_encode($course_outcomes_attempted),
-                            'outcomes_achieved'=> json_encode($course_outcomes_achieved),
-                            'updated_at' => date('Y-m-d H:i:s'))
-                        );
+                            ->where('id', $course->id)
+                            ->update(array(
+                                'outcomes_attempted' => json_encode($course_outcomes_attempted),
+                                'outcomes_achieved' => json_encode($course_outcomes_achieved),
+                                'updated_at' => date('Y-m-d H:i:s')
+                            ));
                     }
                     // Otherwise, set them all to NULL
-                    else
-                    {
+                    else {
                         DB::table('courses')
-                        ->where('id', $course->id)
-                        ->update(array(
-                            'outcomes_attempted'=> NULL,
-                            'outcomes_achieved'=> NULL,
-                            'updated_at' => date('Y-m-d H:i:s'))
-                        );
+                            ->where('id', $course->id)
+                            ->update(array(
+                                'outcomes_attempted' => NULL,
+                                'outcomes_achieved' => NULL,
+                                'updated_at' => date('Y-m-d H:i:s')
+                            ));
                     }
-
                 });
             });
 
-            if(is_null($exception))
-            {
+            if (is_null($exception)) {
                 Session::flash('status', 'success');
                 Session::flash('message', 'Assessment Saved. To add transforming actions click "Transforming Actions".');
                 return action('ActivitiesController@show', array(Input::get('activity_id')));
             }
-
-        }
-        catch(Exception $e)
-        {
-            Log::info('e:'.$e);
+        } catch (Exception $e) {
+            Log::info('e:' . $e);
+            echo $e->getMessage();
             Session::flash('status', 'danger');
             Session::flash('message', 'Error saving assessment. Try again later.');
 
             return action('ActivitiesController@show', array(Input::get('activity_id')));
-
         }
     }
 
     public function deleteAssessment()
     {
 
-        try
-        {
-            $exception = DB::transaction(function()
-            {
+        try {
+            $exception = DB::transaction(function () {
                 $activity = DB::table('activities')->where('id', Input::get('id'))->first();
 
                 $course = DB::table('courses')->where('id', $activity->course_id)->first();
@@ -441,14 +398,14 @@ class ActivitiesController extends \BaseController {
                     ->where('id', Input::get('id'))
                     ->update(array(
                         'draft' => 0,
-                        'outcomes_attempted'=> NULL,
-                        'outcomes_achieved'=> NULL,
-                        'criteria_achieved'=> NULL,
-                        'transforming_actions'=> NULL,
-                        'assessment_comments'=> NULL,
-                        'criteria_achieved_percentage'=> NULL,
-                        'updated_at' => date('Y-m-d H:i:s'))
-                    );
+                        'outcomes_attempted' => NULL,
+                        'outcomes_achieved' => NULL,
+                        'criteria_achieved' => NULL,
+                        'transforming_actions' => NULL,
+                        'assessment_comments' => NULL,
+                        'criteria_achieved_percentage' => NULL,
+                        'updated_at' => date('Y-m-d H:i:s')
+                    ));
 
                 // Delete students score
                 DB::table('assessments')->where('activity_id', $activity->id)->delete();
@@ -462,18 +419,15 @@ class ActivitiesController extends \BaseController {
 
                 // Check if any assessed activties remain
                 $remainingAssessed = false;
-                foreach ($activities as $activity)
-                {
-                    if($activity->outcomes_attempted!=NULL)
-                    {
-                        $remainingAssessed =true;
+                foreach ($activities as $activity) {
+                    if ($activity->outcomes_attempted != NULL) {
+                        $remainingAssessed = true;
                         break;
                     }
                 }
 
                 //If there are still evaluated activities in the course, recalculate course outcomes
-                if(count($activities) && $remainingAssessed)
-                {
+                if (count($activities) && $remainingAssessed) {
                     $outcomeCount = Outcome::all()->count();
 
                     // Variables to hold recalculated outcomes for the course
@@ -481,29 +435,24 @@ class ActivitiesController extends \BaseController {
                     $course_outcomes_achieved = array_fill(1, $outcomeCount, 0);
 
                     // For each activity
-                    foreach ($activities as $activity)
-                    {
+                    foreach ($activities as $activity) {
                         // If activity has been assessed
-                        if($activity->outcomes_attempted!=NULL)
-                        {
+                        if ($activity->outcomes_attempted != NULL) {
                             // Get the achieved criteria
                             $criteria_achievement = json_decode($activity->criteria_achieved, true);
-                            foreach($criteria_achievement as $criterion_id=>$criterion_achieved)
-                            {
+                            foreach ($criteria_achievement as $criterion_id => $criterion_achieved) {
                                 // Find corresponding learning outcome;
                                 $criterion = Criterion::withTrashed()->find($criterion_id);
                                 $outcome = Outcome::find($criterion->outcome_id);
 
                                 // If criterion is achieved (1), add 1 to both arrays
-                                if($criterion_achieved === 1)
-                                {
-                                    $course_outcomes_attempted[$outcome->id]+=1;
-                                    $course_outcomes_achieved[$outcome->id]+=1;
+                                if ($criterion_achieved === 1) {
+                                    $course_outcomes_attempted[$outcome->id] += 1;
+                                    $course_outcomes_achieved[$outcome->id] += 1;
                                 }
                                 // Else, only add to the attempted outcomes arrays
-                                elseif($criterion_achieved === 0)
-                                {
-                                    $course_outcomes_attempted[$outcome->id]+=1;
+                                elseif ($criterion_achieved === 0) {
+                                    $course_outcomes_attempted[$outcome->id] += 1;
                                 }
                             }
                         }
@@ -511,36 +460,31 @@ class ActivitiesController extends \BaseController {
 
                     // Update course
                     DB::table('courses')
-                    ->where('id', $course->id)
-                    ->update(array(
-                        'outcomes_attempted'=> json_encode($course_outcomes_attempted),
-                        'outcomes_achieved'=> json_encode($course_outcomes_achieved),
-                        'updated_at' => date('Y-m-d H:i:s'))
-                    );
+                        ->where('id', $course->id)
+                        ->update(array(
+                            'outcomes_attempted' => json_encode($course_outcomes_attempted),
+                            'outcomes_achieved' => json_encode($course_outcomes_achieved),
+                            'updated_at' => date('Y-m-d H:i:s')
+                        ));
                 }
                 // Otherwise, set them all to NULL
-                else
-                {
+                else {
                     DB::table('courses')
-                    ->where('id', $course->id)
-                    ->update(array(
-                        'outcomes_attempted'=> NULL,
-                        'outcomes_achieved'=> NULL,
-                        'updated_at' => date('Y-m-d H:i:s'))
-                    );
+                        ->where('id', $course->id)
+                        ->update(array(
+                            'outcomes_attempted' => NULL,
+                            'outcomes_achieved' => NULL,
+                            'updated_at' => date('Y-m-d H:i:s')
+                        ));
                 }
             });
 
-            if(is_null($exception))
-            {
+            if (is_null($exception)) {
                 Session::flash('status', 'success');
                 Session::flash('message', 'Assessment deleted.');
                 return Redirect::back();
             }
-
-        }
-        catch (Exception $e)
-        {
+        } catch (Exception $e) {
             Session::flash('status', 'danger');
             Session::flash('message', 'Error saving  assessment. Try again later.');
 
@@ -552,25 +496,21 @@ class ActivitiesController extends \BaseController {
     {
         $course = Activity::find($id)->course;
 
-        if(Activity::destroy($id))
-        {
+        if (Activity::destroy($id)) {
             // Recalculate course outcomes
             $activities = $course->activities;
 
             // Check if any assessed activties remain
             $remainingAssessed = false;
-            foreach ($course->activities as $activity)
-            {
-                if($activity->outcomes_attempted!=NULL)
-                {
-                    $remainingAssessed =true;
+            foreach ($course->activities as $activity) {
+                if ($activity->outcomes_attempted != NULL) {
+                    $remainingAssessed = true;
                     break;
                 }
             }
 
             //If there are still evaluated activities in the course, recalculate course outcomes
-            if(!$course->activities->isEmpty() && $remainingAssessed )
-            {
+            if (!$course->activities->isEmpty() && $remainingAssessed) {
                 $outcomeCount = Outcome::all()->count();
 
                 // Variables to hold recalculated outcomes for the course
@@ -578,60 +518,48 @@ class ActivitiesController extends \BaseController {
                 $course_outcomes_achieved = array_fill(1, $outcomeCount, 0);
 
                 // For each activity
-                foreach ($activities as $activity)
-                {
-                  // If activity has been assessed
-                  if($activity->outcomes_attempted!=NULL)
-                  {
-                    // Get the achieved criteria
-                    $criteria_achievement = json_decode($activity->criteria_achieved, true);
-                    foreach($criteria_achievement as $criterion_id=>$criterion_achieved)
-                    {
-                      // Find corresponding learning outcome;
-                      $criterion = Criterion::withTrashed()->find($criterion_id);
-                      $outcome = Outcome::find($criterion->outcome_id);
-
-                      // If criterion is achieved (1), add 1 to both arrays
-                      if($criterion_achieved === 1)
-                      {
-                        $course_outcomes_attempted[$outcome->id]+=1;
-                        $course_outcomes_achieved[$outcome->id]+=1;
-                      }
-                      // Else, only add to the attempted outcomes arrays
-                      elseif($criterion_achieved === 0)
-                      {
-                        $course_outcomes_attempted[$outcome->id]+=1;
-                      }
+                foreach ($activities as $activity) {
+                    // If activity has been assessed
+                    if ($activity->outcomes_attempted != NULL) {
+                        // Get the achieved criteria
+                        $criteria_achievement = json_decode($activity->criteria_achieved, true);
+                        foreach ($criteria_achievement as $criterion_id => $criterion_achieved) {
+                            // Find corresponding learning outcome;
+                            $criterion = Criterion::withTrashed()->find($criterion_id);
+                            $outcome = Outcome::find($criterion->outcome_id);
+
+                            // If criterion is achieved (1), add 1 to both arrays
+                            if ($criterion_achieved === 1) {
+                                $course_outcomes_attempted[$outcome->id] += 1;
+                                $course_outcomes_achieved[$outcome->id] += 1;
+                            }
+                            // Else, only add to the attempted outcomes arrays
+                            elseif ($criterion_achieved === 0) {
+                                $course_outcomes_attempted[$outcome->id] += 1;
+                            }
+                        }
                     }
-                  }
                 }
 
                 // Update course
                 $course->outcomes_achieved = json_encode($course_outcomes_achieved);
                 $course->outcomes_attempted = json_encode($course_outcomes_attempted);
-            }
-            else
-            {
+            } else {
                 $course->outcomes_achieved = NULL;
                 $course->outcomes_attempted = NULL;
             }
 
-            if($course->save())
-            {
+            if ($course->save()) {
                 Session::flash('status', 'success');
                 Session::flash('message', 'Activity deleted.');
-            }
-            else
-            {
+            } else {
                 Session::flash('status', 'danger');
                 Session::flash('message', 'Error deleting activity. Try again later.');
                 return Redirect::back();
             }
 
             return Redirect::action('CoursesController@show', array($course->id));
-        }
-        else
-        {
+        } else {
             Session::flash('status', 'danger');
             Session::flash('message', 'Error deleting activity. Try again later.');
             return Redirect::back();
@@ -640,12 +568,10 @@ class ActivitiesController extends \BaseController {
 
     public function update($id)
     {
-        try
-        {
+        try {
             $activity = Activity::find($id);
 
-            if(Input::has('update_activity_information'))
-            {
+            if (Input::has('update_activity_information')) {
                 /** Validation rules */
                 $validator = Validator::make(
                     array(
@@ -654,27 +580,25 @@ class ActivitiesController extends \BaseController {
                         'date' => Input::get('date'),
                     ),
                     array(
-                        'name' => 'required|unique:activities,course_id,'.$id,
+                        'name' => 'required|unique:activities,course_id,' . $id,
                         'description' => 'required|min:10',
                         'date' => 'required|dateFormat:Y-m-d'
                     ),
                     array(
-                        'date.dateFormat'=>'The date does not match the correct format: yyyy-mm-dd.'
+                        'date.dateFormat' => 'The date does not match the correct format: yyyy-mm-dd.'
                     )
                 );
 
                 /** If validation fails */
-                if ($validator->fails())
-                {
+                if ($validator->fails()) {
                     /** Prepare error message */
                     $message = 'Error(s) updating the Activity<ul>';
 
-                    foreach ($validator->messages()->all('<li>:message</li>') as $validationError)
-                    {
-                        $message.=$validationError;
+                    foreach ($validator->messages()->all('<li>:message</li>') as $validationError) {
+                        $message .= $validationError;
                     }
 
-                    $message.='</ul>';
+                    $message .= '</ul>';
 
                     /** Send error message and old data */
                     Session::flash('status', 'warning');
@@ -686,23 +610,17 @@ class ActivitiesController extends \BaseController {
                 $activity->name = Input::get('name');
                 $activity->description = Input::get('description');
                 $activity->date = Input::get('date');
-            }
-            elseif(Input::has('update_transforming_actions'))
-            {
-                if(trim(Input::get('transforming_actions')) !="")
+            } elseif (Input::has('update_transforming_actions')) {
+                if (trim(Input::get('transforming_actions')) != "")
                     $activity->transforming_actions = Input::get('transforming_actions');
                 else
                     $activity->transforming_actions = NULL;
-            }
-            elseif(Input::has('update_assessment_comments'))
-            {
-                if(trim(Input::get('assessment_comments')) !="")
+            } elseif (Input::has('update_assessment_comments')) {
+                if (trim(Input::get('assessment_comments')) != "")
                     $activity->assessment_comments = Input::get('assessment_comments');
                 else
                     $activity->assessment_comments = NULL;
-            }
-            else
-            {
+            } else {
                 Session::flash('status', 'danger');
                 Session::flash('message', 'Error updating Activity. Please try again later.');
                 return Redirect::action('ActivitiesController@show', array($activity->id));
@@ -714,15 +632,11 @@ class ActivitiesController extends \BaseController {
             Session::flash('status', 'success');
             Session::flash('message', 'Activity succesfully updated.');
             return Redirect::action('ActivitiesController@show', array($activity->id));
-
-        }
-        catch(Exception $e)
-        {
+        } catch (Exception $e) {
             Session::flash('status', 'warning');
             Session::flash('message', 'Error updating Activity. Please try again later.');
             return Redirect::action('ActivitiesController@show', array($activity->id));
         }
-
     }
 
     //TODO the code in the next 2 functions is the same as the assess function except for the view returned. try to refactor this to avoid copying code.
@@ -732,7 +646,7 @@ class ActivitiesController extends \BaseController {
         $activity = Activity::find($id);
 
         // If activity does not exist, display 404
-        if(!$activity)
+        if (!$activity)
             App::abort('404');
 
         // Get activity's course
@@ -756,8 +670,7 @@ class ActivitiesController extends \BaseController {
 
         // Decode the scores (blade workaround)
         $scores_array = array();
-        foreach ($assessments as $index=>$assessment)
-        {
+        foreach ($assessments as $index => $assessment) {
             $scores_array[$assessment->id] = json_decode($assessment->scores, true);
         }
 
@@ -769,7 +682,7 @@ class ActivitiesController extends \BaseController {
         $activity = Activity::find($id);
 
         // If activity does not exist, display 404
-        if(!$activity)
+        if (!$activity)
             App::abort('404');
 
         // Get activity's course
@@ -793,13 +706,10 @@ class ActivitiesController extends \BaseController {
 
         // Decode the scores (blade workaround)
         $scores_array = array();
-        foreach ($assessments as $index=>$assessment)
-        {
+        foreach ($assessments as $index => $assessment) {
             $scores_array[$assessment->id] = json_decode($assessment->scores, true);
         }
 
         return View::make('local.professors.print_assessment', compact('activity', 'title', 'students', 'course', 'rubric_contents', 'assessments', 'scores_array', 'rubric'));
     }
-
-
 }

app/controllers/CriteriaController.php

@@ -1,20 +1,47 @@
 <?php
 
-class CriteriaController extends \BaseController {
+use Illuminate\Support\Facades\Input;
+
+class CriteriaController extends \BaseController
+{
 
     /**
      * Display a listing of the resource.
      *
+     * 
      * @return Response
      */
     public function fetchCriterion()
     {
         return Criterion::find(Input::get('id'));
     }
-
+    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')));
+        //
+        return json_encode($outcome);
+    }
     public function fetchCriterionWithTrashed()
     {
-        return Criterion::withTrashed()->find(Input::get('id'));
+
+        $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')));
+
+
+        //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);
     }
 
 
@@ -23,13 +50,12 @@ class CriteriaController extends \BaseController {
         // dd($input);
         Log::info('isCriterionUnique');
 
-        if(Input::get('program_id')!=0)
+        if (Input::get('program_id') != 0)
             $program_id = $input['program_id'];
         else
             $program_id = NULL;
 
-        $saved_criterion = Criterion::
-            withTrashed()
+        $saved_criterion = Criterion::withTrashed()
             ->where('name', '=', $input['name'])
             ->where('outcome_id', '=', $input['outcome_id'])
             ->where('program_id', '=', $program_id)
@@ -39,9 +65,9 @@ class CriteriaController extends \BaseController {
             // ->where('description78', '=', $input['description78'])
             ->first();
 
-    
 
-        if($saved_criterion)
+
+        if ($saved_criterion)
             return false;
         else
             return true;
@@ -56,21 +82,28 @@ class CriteriaController extends \BaseController {
 
         $trimmed = trim(preg_replace('/\t+/', '', Input::get('subcriteria')));
 
-        Log::info('trimmed 1 -->'.$trimmed.'<--');
+        Log::info('trimmed 1 -->' . $trimmed . '<--');
 
 
-        if($trimmed ==''){
+        if ($trimmed == '') {
             $trimmed = NULL;
-        }
-        else{
+        } else {
             $trimmed = json_encode(preg_split('/\r\n/', $trimmed));
         }
 
-        Log::info('trimmed 2 -->'.$trimmed.'<--');
+        Log::info('trimmed 2 -->' . $trimmed . '<--');
 
 
         $clean_input['subcriteria'] = $trimmed;
-        $clean_input['outcome_id'] = trim(preg_replace('/\t+/', '', Input::get('outcome_id')));
+        $clean_input['outcome_id'] = Input::get('outcome');
+
+
+
+        $clean_input['objective_id'] = Input::get('objective');
+
+
+
+
         $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')));
@@ -78,6 +111,9 @@ class CriteriaController extends \BaseController {
         $clean_input['description78'] = trim(preg_replace('/\t+/', '', Input::get('description78')));
         $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;
+
 
         return $clean_input;
     }
@@ -100,7 +136,7 @@ class CriteriaController extends \BaseController {
             array(
                 'name' => 'required|string',
                 'subcriteria' => 'string',
-                'outcome_id' => 'required|numeric|integer',
+                'outcome_id' => 'required|array',
                 'description12' => 'required|string',
                 'description34' => 'required|string',
                 'description56' => 'required|string',
@@ -130,68 +166,77 @@ class CriteriaController extends \BaseController {
         $validator = $this->makeValidator($clean_input);
 
         /** If validation fails */
-        if ($validator->fails())
-        {
+        if ($validator->fails()) {
             /** Prepare error message */
             $message = '<p>Error(s) creating a new Criterion:</p><ul>';
 
-            foreach ($validator->messages()->all('<li>:message</li>') as $validationError)
-            {
-                $message.=$validationError;
+            foreach ($validator->messages()->all('<li>:message</li>') as $validationError) {
+                $message .= $validationError;
             }
 
-            $message.='</ul>';
+            $message .= '</ul>';
 
             /** Send error message and old data */
             Session::flash('status', 'danger');
             Session::flash('message', $message);
             return Redirect::to('criteria')->withInput();
-        }
-        else
-        {
+        } else {
             // Check criterion uniqueness
-            if(!$this->isCriterionUnique($clean_input))
-            {
-                /** Send error message and old data */
+            /*if (!$this->isCriterionUnique($clean_input)) {
+                /** Send error message and old data 
                 Session::flash('status', 'danger');
                 Session::flash('message', 'This criterion is a duplicate of an already saved criterion because its name and associated program are the same.');
                 return Redirect::to('criteria')->withInput();
-            }
+            }*/
 
             /** Instantiate new criterion */
             $criterion = new Criterion;
-            $criterion->name= $clean_input['name'];
+            $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'];
+            //gabriel añadió aqui
+            $criterion->objective_id = 1; //$clean_input['objective_id'];
 
-            if(Input::get('copyright'))
+            if (Input::get('copyright'))
                 $criterion->copyright = $clean_input['copyright'];
 
-            if(Input::get('notes'))
+            if (Input::get('notes'))
                 $criterion->notes = $clean_input['notes'];
 
             // Set program
-            if(Input::get('program_id')!=0)
+            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 */
-            if($criterion->save())
-            {
+            if ($criterion->save()) {
+
+                $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();
+                        //}
+                    }
+                }
                 Session::flash('status', 'success');
-                Session::flash('message', 'Criterion created: "'.$criterion->name.'".');
+                Session::flash('message', 'Criterion created: "' . $criterion->name . '".');
                 return Redirect::to('criteria')->withInput(Input::only('outcome_id'));
             }
 
             /** If saving fails, send error message and old data */
-            else
-            {
+            else {
                 Session::flash('status', 'danger');
                 Session::flash('message', '<p>Error creating Criterion. Please try again later.</p>');
                 return Redirect::to('learning-outcomes-criteria')->withInput();
@@ -202,43 +247,89 @@ class CriteriaController extends \BaseController {
     public function edit()
     {
         $title = "Criteria";
-        $outcomes = Outcome::orderBy('name', 'ASC')->get();
+        $outcomes = Outcome::orderBy('name', 'ASC')->lists('name', 'id');
+
         $schools = School::orderBy('name', 'ASC')->get();
         $criteria = Criterion::withTrashed()->orderBy('name', 'ASC')->get();
         $programs = Program::orderBy('name', 'ASC')->get();
+        $objectives = DB::table('objectives')->orderBy('text', 'ASC')->lists('text', 'id');
 
-        return View::make('local.managers.admins.criteria', compact('title', 'outcomes', 'schools', 'criteria', 'programs'));
+
+
+
+        return View::make('local.managers.admins.criteria', compact('title', 'outcomes', 'schools', 'criteria', 'programs', 'objectives'));
+    }
+
+    private function cleanInputEdit()
+    {
+        $clean_input = array();
+
+        $clean_input['name'] = trim(preg_replace('/\t+/', '', Input::get('name')));
+
+
+        $trimmed = trim(preg_replace('/\t+/', '', Input::get('subcriteria')));
+
+        Log::info('trimmed 1 -->' . $trimmed . '<--');
+
+
+        if ($trimmed == '') {
+            $trimmed = NULL;
+        } else {
+            $trimmed = json_encode(preg_split('/\r\n/', $trimmed));
+        }
+
+        Log::info('trimmed 2 -->' . $trimmed . '<--');
+
+
+        $clean_input['subcriteria'] = $trimmed;
+        $clean_input['outcome_id'] = Input::get('assoc_outcome');
+
+
+
+        $clean_input['objective_id'] = Input::get('assoc_objective');
+
+
+
+
+        $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['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;
+
+
+        return $clean_input;
     }
 
     public function update()
     {
         $criterion = Criterion::withTrashed()->find(Input::get('id'));
 
-        $clean_input = $this->cleanInput();
+        $clean_input = $this->cleanInputEdit();
 
         /** Validation rules */
         $validator = $this->makeValidator($clean_input);
 
         /** If validation fails */
-        if ($validator->fails())
-        {
+        if ($validator->fails()) {
             /** Prepare error message */
             $message = 'Error(s) updating the Criterion: <ul>';
 
-            foreach ($validator->messages()->all('<li>:message</li>') as $validationError)
-            {
-                $message.=$validationError;
+            foreach ($validator->messages()->all('<li>:message</li>') as $validationError) {
+                $message .= $validationError;
             }
 
-            $message.='</ul>';
+            $message .= '</ul>';
 
             /** Send error message and old data */
             Session::flash('status', 'danger');
             Session::flash('message', $message);
             return Redirect::back()->withInput();
-        }
-        else
-        {
+        } else {
 
             // // Check criterion uniqueness
             // if(!$this->isCriterionUnique($clean_input, $criterion))
@@ -250,47 +341,57 @@ class CriteriaController extends \BaseController {
             // }
 
             /** Set info */
-            $criterion->name= $clean_input['name'];
+            $criterion->name = $clean_input['name'];
             $criterion->subcriteria = $clean_input['subcriteria'];
-            $criterion->outcome_id= $clean_input['outcome_id'];
+            //$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'];
 
+
+
             // Set program
-            if(Input::get('program_id')!=0)
+            if (Input::get('program_id') != 0)
                 $criterion->program_id = Input::get('program_id');
             else
                 $criterion->program_id = NULL;
 
             // Set status
-            if(Input::get('status')==0)
+            if (Input::get('status') == 0)
                 $criterion->deleted_at = date('Y-m-d H:i:s');
             else
                 $criterion->deleted_at = NULL;
 
-            if(Input::get('copyright'))
+            if (Input::get('copyright'))
                 $criterion->copyright = $clean_input['copyright'];
             else
-                $criterion->copyright=NULL;
+                $criterion->copyright = NULL;
 
-            if(Input::get('notes'))
+            if (Input::get('notes'))
                 $criterion->notes = $clean_input['notes'];
             else
-                $criterion->notes=NULL;
+                $criterion->notes = NULL;
 
             /** If criterion is updated, send success message */
-            if($criterion->save())
-            {
+            if ($criterion->save()) {
+                $criterionId = $criterion->id;
+                DB::delete("delete from `criterion_objective_outcome` where `criterion_id` ={$criterionId}");
+
+                foreach ($clean_input['outcome_id'] as $outcome_id) {
+                    foreach ($clean_input['objective_id'] as $objective_id) {
+
+                        DB::insert("insert into `criterion_objective_outcome` (`objective_id`, `outcome_id`, `criterion_id`,`objective_outcome_id`) values ({$objective_id},{$outcome_id}, {$criterionId}, 0)");
+                    }
+                }
+
                 Session::flash('status', 'success');
-                Session::flash('message', 'Updated criterion: "'.$criterion->name.'"');
+                Session::flash('message', 'Updated criterion: "' . $criterion->name . '"');
                 return Redirect::back();
             }
 
             /** If saving fails, send error message and old data */
-            else
-            {
+            else {
                 Session::flash('status', 'danger');
                 Session::flash('message', 'Error updating the Criterion. Please try again later.');
                 return Redirect::back()->withInput();
@@ -306,76 +407,60 @@ class CriteriaController extends \BaseController {
         $criteria = Criterion::withTrashed()->orderBy('name', 'ASC')->get();
 
         return View::make('global.view-learning-outcomes-criteria', compact('title', 'outcomes', 'schools', 'criteria'));
-
     }
 
     public function destroy()
     {
         $criterion = Criterion::withTrashed()->find(Input::get('id'));
-        if(!$criterion->trashed())
-        {
-            try
-            {
+        if (!$criterion->trashed()) {
+            try {
                 $criterion->delete();
                 Session::flash('status', 'success');
-                Session::flash('message', 'Deactivated criterion: "'.$criterion->name.'"');
-            }
-            catch (Exception $e)
-            {
+                Session::flash('message', 'Deactivated criterion: "' . $criterion->name . '"');
+            } catch (Exception $e) {
                 Session::flash('status', 'danger');
-                Session::flash('message', 'Error deactivating criterion."'.$criterion->name.'"');
+                Session::flash('message', 'Error deactivating criterion."' . $criterion->name . '"');
             }
             return Redirect::back();
-        }
-        else
-        {
-            try
-            {
+        } else {
+            try {
                 $criterion->restore();
                 Session::flash('status', 'success');
-                Session::flash('message', 'Reactivated criterion: "'.$criterion->name.'"');
-            }
-            catch (Exception $e)
-            {
+                Session::flash('message', 'Reactivated criterion: "' . $criterion->name . '"');
+            } catch (Exception $e) {
                 Session::flash('status', 'danger');
-                Session::flash('message', 'Error reactivating criterion: "'.$criterion->name.'".');
+                Session::flash('message', 'Error reactivating criterion: "' . $criterion->name . '".');
             }
             return Redirect::back();
-
         }
     }
 
     public function filterCriteria()
     {
-        switch (Input::get('filter'))
-        {
+        switch (Input::get('filter')) {
             case 'all':
                 return Criteria::all();
                 break;
 
             case 'school':
                 // If scoord
-                if(Auth::user()->role == '2')
-                {
+                if (Auth::user()->role == '2') {
 
                     // Fetch all the programs whose school is the user's
                     $program_ids = DB::table('programs')->where('school_id', Auth::user()->school_id)->lists('id');
 
                     // Return all criteria belonging to any of those programs
-                    return Criterion::
-                        whereIn('program_id', $program_ids)
+                    return Criterion::whereIn('program_id', $program_ids)
                         ->orderBy('name', 'ASC')
                         ->get();
                 }
 
                 // If pcoord
-                else
-                {
+                else {
                     // Fetch all the programs from the user's school;
                     $program_ids = DB::table('programs')->where('school_id', Auth::user()->programs[0]->school->id)->lists('id');
 
-                    return Criterion::
-                        whereIn('program_id', $program_ids)
+                    return Criterion::whereIn('program_id', $program_ids)
                         ->orderBy('name', 'ASC')
                         ->get();
                 }
@@ -383,8 +468,7 @@ class CriteriaController extends \BaseController {
                 break;
 
             case 'program':
-                return Criterion::
-                    whereIn('program_id', Auth::user()->programs->lists('id'))
+                return Criterion::whereIn('program_id', Auth::user()->programs->lists('id'))
                     ->orderBy('name', 'ASC')
                     ->get();
                 break;

app/controllers/Objective2Controller.php

@@ -0,0 +1,331 @@
+<?php
+
+class Objective2Controller extends \BaseController
+{
+
+	/**
+	 * Display a listing of the resource.
+	 *
+	 * @return Response
+	 */
+
+	public function index()
+	{
+
+		$title = "Learning Outcomes and Criteria";
+		$outcomes = Outcome::orderBy('name', 'ASC')->get();
+		$schools = School::orderBy('name', 'ASC')->get();
+		$objectives = Objective::withTrashed()->orderBy('text', 'ASC')->get();
+
+		return View::make('global.view-learning-outcomes-criteria', compact('title', 'outcomes', 'schools', 'objectives'));
+	}
+
+
+
+	/**
+	 * Show the form for creating a new resource.
+	 *
+	 * @return Response
+	 */
+	public function isObjectiveUnique($input, $existing_Objective = NULL)
+	{
+
+		Log::info('isObjectiveUnique');
+
+		if (Input::get('program_id') != 0)
+			$program_id = $input['program_id'];
+		else
+			$program_id = NULL;
+
+		$saved_Objective = Objective::withTrashed()
+			->where('text', '=', $input['text'])
+			->where('outcome_id', '=', $input['outcome_id'])
+			->where('program_id', '=', $program_id)
+
+			->first();
+
+
+
+		if ($saved_Objective)
+			return false;
+		else
+			return true;
+	}
+
+
+	private function makeValidator($clean_input)
+	{
+		/** Validation rules */
+		return Validator::make(
+			array(
+				'text' => $clean_input['text'],
+
+				'outcome_id' => $clean_input['outcome_id'],
+				'program_id' => $clean_input['program_id']
+
+			),
+			array(
+				'text' => 'required|string',
+
+				'outcome_id' => 'required|array',
+				'program_id' => 'required|numeric|integer'
+
+			)
+
+		);
+	}
+
+
+	private function cleanInput()
+	{
+		$clean_input = array();
+
+		$clean_input['text'] = trim(preg_replace('/\t+/', '', Input::get('text')));
+
+
+		$clean_input['outcome_id'] = Input::get('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')));
+
+
+		return $clean_input;
+	}
+
+	private function cleanAssocInput()
+	{
+		$clean_input = array();
+
+		$clean_input['text'] = trim(preg_replace('/\t+/', '', Input::get('text')));
+
+
+		$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')));
+
+
+		return $clean_input;
+	}
+	public function fetchObjective()
+	{
+		return Objective::find(Input::get('id'));
+	}
+
+	public function fetchObjectiveWithTrashed()
+	{
+		return json_encode(DB::select('select o.id, o.program_id, o.text, outc.outcome_id outcome_id from objectives o, objective_outcome outc where o.id = ? and o.id = outc.objective_id', array(Input::get('id'))));
+	}
+	/**
+	 * Create a new Objective.
+	 *
+	 * @return Redirect Redirect back to form page
+	 */
+	public function create()
+	{
+
+		$clean_input = $this->cleanInput();
+
+		/** Validation rules */
+		$validator = $this->makeValidator($clean_input);
+
+		/** If validation fails */
+		if ($validator->fails()) {
+			/** Prepare error message */
+			$message = '<p>Error(s) creating a new Objective:</p><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::to('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();
+			}
+
+			/** Instantiate new Objective */
+			$objective = new Objective;
+			$objective->text = $clean_input['text'];
+
+
+
+
+			// Set program
+			if (Input::get('program_id') != 0)
+				$objective->program_id = $clean_input['program_id'];
+			else
+				$objective->program_id = NULL;
+
+
+			/** If Objective is saved, send success message */
+			if ($objective->save()) {
+				$objectiveId = $objective->id;
+				foreach ($clean_input['outcome_id'] as $outcome_id) {
+					DB::insert("insert into `objective_outcome` (objective_id, outcome_id) values ({$objectiveId}, {$outcome_id})");
+
+					/*if (!($objectiveOutcome->save())) {
+						Session::flash('status', 'danger');
+						Session::flash('message', '<p>Error creating objective. Please try again later.</p>');
+						return Redirect::to('objective')->withInput();
+					}*/
+				}
+
+				Session::flash('status', 'success');
+				Session::flash('message', 'Objective created: "' . $objective->text . '".');
+				return Redirect::to('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();
+			}
+		}
+	}
+	/**
+	 * Store a newly created resource in storage.
+	 *
+	 * @return Response
+	 */
+	public function store()
+	{
+		//
+	}
+
+
+	/**
+	 * Display the specified resource.
+	 *
+	 * @param  int  $id
+	 * @return Response
+	 */
+	public function show($id)
+	{
+		//
+	}
+
+
+	/**
+	 * Show the form for editing the specified resource.
+	 *
+	 * @param  int  $id
+	 * @return Response
+	 */
+	public function edit()
+	{
+		$title = "Objective";
+		$outcomes = Outcome::orderBy('name', 'ASC')->lists('name', 'id');
+
+		$objectives = Objective::withTrashed()->orderBy('text', 'ASC')->get();
+		$programs = Program::orderBy('name', 'ASC')->get();
+
+		return View::make('local.managers.admins.objectives', compact('title', 'outcomes', 'objectives', 'programs'));
+	}
+
+
+
+
+	/**
+	 * Update the specified resource in storage.
+	 *
+	 * @param  int  $id
+	 * @return Response
+	 */
+
+	public function update()
+	{
+		$Objective = Objective::withTrashed()->find(Input::get('id'));
+
+		$clean_input = $this->cleanAssocInput();
+
+		/** Validation rules */
+		$validator = $this->makeValidator($clean_input);
+
+		/** If validation fails */
+		if ($validator->fails()) {
+			/** Prepare error message */
+			$message = 'Error(s) updating the Objective: <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 info */
+			$Objective->text = $clean_input['text'];
+
+
+
+			// Set program
+			if (Input::get('program_id') != 0)
+				$Objective->program_id = Input::get('program_id');
+			else
+				$Objective->program_id = NULL;
+
+			// Set status
+
+
+			/** If Objective is updated, send success message */
+			if ($Objective->save()) {
+
+				$objectiveId = $Objective->id;
+				DB::delete("delete from `objective_outcome` where objective_id ={$objectiveId}");
+
+				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();
+				}
+			}
+
+			/** If saving fails, send error message and old data */
+			else {
+				Session::flash('status', 'danger');
+				Session::flash('message', 'Error updating the Objective. Please try again later.');
+				return Redirect::back()->withInput();
+			}
+		}
+	}
+
+
+
+	/**
+	 * Remove the specified resource from storage.
+	 *
+	 * @param  int  $id
+	 * @return Response
+	 */
+	public function destroy($id)
+	{
+		//
+	}
+}

app/controllers/Objective_OutcomeController.php

@@ -0,0 +1,86 @@
+<?php
+
+class Objective_OutcomeController extends \BaseController {
+
+	/**
+	 * Display a listing of the resource.
+	 *
+	 * @return Response
+	 */
+	public function index()
+	{
+		//
+	}
+
+
+	/**
+	 * Show the form for creating a new resource.
+	 *
+	 * @return Response
+	 */
+	public function create()
+	{
+		//
+	}
+
+
+	/**
+	 * Store a newly created resource in storage.
+	 *
+	 * @return Response
+	 */
+	public function store()
+	{
+		//
+	}
+
+
+	/**
+	 * Display the specified resource.
+	 *
+	 * @param  int  $id
+	 * @return Response
+	 */
+	public function show($id)
+	{
+		//
+	}
+
+
+	/**
+	 * Show the form for editing the specified resource.
+	 *
+	 * @param  int  $id
+	 * @return Response
+	 */
+	public function edit($id)
+	{
+		//
+	}
+
+
+	/**
+	 * Update the specified resource in storage.
+	 *
+	 * @param  int  $id
+	 * @return Response
+	 */
+	public function update($id)
+	{
+		//
+	}
+
+
+	/**
+	 * Remove the specified resource from storage.
+	 *
+	 * @param  int  $id
+	 * @return Response
+	 */
+	public function destroy($id)
+	{
+		//
+	}
+
+
+}

app/controllers/RubricsController.php

@@ -1,6 +1,7 @@
 <?php
 
-class RubricsController extends \BaseController {
+class RubricsController extends \BaseController
+{
 
     /**
      * Show the form for creating a new rubric
@@ -15,20 +16,18 @@ class RubricsController extends \BaseController {
         if (!$activity)
             App::abort('404');
 
-        $title = 'Rubric for <em>'.$activity->name.'</em>';
+        $title = 'Rubric for <em>' . $activity->name . '</em>';
 
         // Select templates that belong to everyone or belong to the activity's course's school
-        $templates = Template::
-        where('is_visible', '=', 1)
-        ->where(function($query) use ($activity)
-        {
-            if(Auth::user()->role != 1){
-                $query
-                ->where('school_id', $activity->course->program->school->id)
-                ->orWhere('school_id', '=', NULL);
-            }
-        })
-        ->orderBy('name', 'ASC')->get();
+        $templates = Template::where('is_visible', '=', 1)
+            ->where(function ($query) use ($activity) {
+                if (Auth::user()->role != 1) {
+                    $query
+                        ->where('school_id', $activity->course->program->school->id)
+                        ->orWhere('school_id', '=', NULL);
+                }
+            })
+            ->orderBy('name', 'ASC')->get();
 
         $rubrics = Auth::user()->rubrics;
         $outcomes = Outcome::orderBy('name', 'ASC')->get();
@@ -48,10 +47,9 @@ class RubricsController extends \BaseController {
 
         DB::beginTransaction();
 
-        try
-        {
+        try {
             // Get rubric contents
-            $rubric_contents= json_decode(Input::get('contents'));
+            $rubric_contents = json_decode(Input::get('contents'));
 
             // Process rubric
             $rubric = new Rubric;
@@ -73,14 +71,12 @@ class RubricsController extends \BaseController {
             Session::flash('message', 'Rubric assigned.');
 
             return action('ActivitiesController@show', array($activity->id));
+        } catch (Exception $e) {
 
-
-        }
-        catch(Exception $e)
-        {
             DB::rollBack();
-            Session::flash('status', 'danger');
-            Session::flash('message', 'Error creating Rubric. Try again later.');
+            echo $e->getMessage();
+            //Session::flash('status', 'danger');
+            //Session::flash('message', 'Error creating Rubric. Try again later.');
         }
     }
 
@@ -111,17 +107,15 @@ class RubricsController extends \BaseController {
 
         try {
             // Get associated activity
-            $activity= Activity::where('rubric_id', '=', $rubric->id)->first();
+            $activity = Activity::where('rubric_id', '=', $rubric->id)->first();
 
             // If the associated activity has been assessed, delete the records
-            if($activity->outcomes_attempted!=NULL)
-            {
+            if ($activity->outcomes_attempted != NULL) {
                 DB::table('assessments')->where('activity_id', '=', $activity->id)->delete();
-                $activity->criteria_achieved_percentage= NULL;
-                $activity->criteria_achieved= NULL;
-                $activity->outcomes_achieved=NULL;
-                $activity->outcomes_attempted=NULL;
-
+                $activity->criteria_achieved_percentage = NULL;
+                $activity->criteria_achieved = NULL;
+                $activity->outcomes_achieved = NULL;
+                $activity->outcomes_attempted = NULL;
             }
 
             $rubric->save();
@@ -133,46 +127,38 @@ class RubricsController extends \BaseController {
 
             // Check if any assessed activities remain
             $remainingAssessed = false;
-            foreach ($course->activities as $activity)
-            {
-                if($activity->outcomes_attempted!=NULL)
-                {
-                    $remainingAssessed =true;
+            foreach ($course->activities as $activity) {
+                if ($activity->outcomes_attempted != NULL) {
+                    $remainingAssessed = true;
                     break;
                 }
             }
 
             //If there are still evaluated activities in the course, recalculate course outcomes
-            if(!$activities->isEmpty() && $remainingAssessed)
-            {
+            if (!$activities->isEmpty() && $remainingAssessed) {
                 // Variables to hold recalculated outcomes for the course
                 $course_outcomes_attempted = array_fill(1, Outcome::all()->count(), 0);
                 $course_outcomes_achieved = array_fill(1, Outcome::all()->count(), 0);
 
                 // For each activity
-                foreach ($activities as $activity)
-                {
+                foreach ($activities as $activity) {
                     // If activity has been assessed
-                    if($activity->outcomes_attempted!=NULL)
-                    {
+                    if ($activity->outcomes_attempted != NULL) {
                         // Get the achieved criteria
                         $criteria_achievement = json_decode($activity->criteria_achieved, true);
-                        foreach($criteria_achievement as $criterion_id=>$criterion_achieved)
-                        {
+                        foreach ($criteria_achievement as $criterion_id => $criterion_achieved) {
                             // Find corresponding learning outcome;
                             $criterion = Criterion::find($criterion_id);
                             $outcome = Outcome::find($criterion->outcome_id);
 
                             // If criterion is achieved (1), add 1 to both arrays
-                            if($criterion_achieved === 1)
-                            {
-                                $course_outcomes_attempted[$outcome->id]+=1;
-                                $course_outcomes_achieved[$outcome->id]+=1;
+                            if ($criterion_achieved === 1) {
+                                $course_outcomes_attempted[$outcome->id] += 1;
+                                $course_outcomes_achieved[$outcome->id] += 1;
                             }
                             // Else, only add to the attempted outcomes arrays
-                            elseif($criterion_achieved === 0)
-                            {
-                                $course_outcomes_attempted[$outcome->id]+=1;
+                            elseif ($criterion_achieved === 0) {
+                                $course_outcomes_attempted[$outcome->id] += 1;
                             }
                         }
                     }
@@ -181,14 +167,10 @@ class RubricsController extends \BaseController {
                 // Update course
                 $course->outcomes_achieved = json_encode($course_outcomes_achieved);
                 $course->outcomes_attempted = json_encode($course_outcomes_attempted);
-
-            }
-            else
-            {
+            } else {
                 // Update course
                 $course->outcomes_achieved = NULL;
                 $course->outcomes_attempted = NULL;
-
             }
 
             $course->save();
@@ -198,9 +180,7 @@ class RubricsController extends \BaseController {
             Session::flash('message', 'Rubric updated.');
 
             return action('ActivitiesController@show', array($activity->id));
-        }
-        catch (Exception $e)
-        {
+        } catch (Exception $e) {
             DB::rollBack();
             Session::flash('status', 'danger');
             Session::flash('message', 'Error: The rubric could not be updated. Try again later.');
@@ -216,13 +196,10 @@ class RubricsController extends \BaseController {
     {
         $rubric = Rubric::find(Input::get('id'));
 
-        if($rubric->delete())
-        {
+        if ($rubric->delete()) {
             Session::flash('status', 'success');
             Session::flash('message', 'Rubric deleted.');
-        }
-        else
-        {
+        } else {
             Session::flash('status', 'danger');
             Session::flash('message', 'Error: The rubric could not be deleted. Try again later.');
         }
@@ -243,10 +220,10 @@ class RubricsController extends \BaseController {
 
         // If activity does not belong to the requesting user, display 403
         if ($course->user_id != Auth::id())
-                App::abort('403', 'Access Forbidden');
+            App::abort('403', 'Access Forbidden');
 
         $rubric = Rubric::where('id', '=', $activity->rubric_id)->firstOrFail();
-        $title = $activity->name.': '.$rubric->name;
+        $title = $activity->name . ': ' . $rubric->name;
         return View::make('local.professors.viewrubric', compact('rubric', 'activity', 'title', 'course'));
     }
 
@@ -259,7 +236,7 @@ class RubricsController extends \BaseController {
     {
         // If user is a professor, display 403.
         if (Auth::user()->role == 4)
-                App::abort('403', 'Access Forbidden');
+            App::abort('403', 'Access Forbidden');
 
         $rubric = Rubric::where('id', '=', $rubric_id)->firstOrFail();
         $title = $rubric->name;
@@ -275,10 +252,10 @@ class RubricsController extends \BaseController {
 
         // If activity does not belong to the requesting user, display 403
         if ($course->user_id != Auth::id())
-                App::abort('403', 'Access Forbidden');
+            App::abort('403', 'Access Forbidden');
 
         $rubric = Rubric::where('id', '=', $activity->rubric_id)->firstOrFail();
-        $title = $activity->name.': '.$rubric->name;
+        $title = $activity->name . ': ' . $rubric->name;
         return View::make('local.professors.downloadrubric', compact('rubric', 'activity', 'title', 'course'));
     }
 
@@ -290,10 +267,10 @@ class RubricsController extends \BaseController {
 
         // If activity does not belong to the requesting user, display 403
         if ($course->user_id != Auth::id())
-                App::abort('403', 'Access Forbidden');
+            App::abort('403', 'Access Forbidden');
 
         $rubric = Rubric::where('id', '=', $activity->rubric_id)->firstOrFail();
-        $title = $activity->name.': '.$rubric->name;
+        $title = $activity->name . ': ' . $rubric->name;
         return View::make('local.professors.printrubric', compact('rubric', 'activity', 'title', 'course'));
     }
 
@@ -304,13 +281,10 @@ class RubricsController extends \BaseController {
 
         $rubric_contents = json_decode($rubric->contents);
 
-        foreach ($rubric_contents as $key => $criterion)
-        {
-            if($criterion->id == $criterion_id)
-            {
+        foreach ($rubric_contents as $key => $criterion) {
+            if ($criterion->id == $criterion_id) {
                 return json_encode($criterion);
             }
         }
     }
-
 }

app/database/migrations/2020_10_04_142756_create_new_assessments_table.php

@@ -0,0 +1,47 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateNewAssessmentsTable extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('new_assessments', function(Blueprint $table)
+		{
+			$table->increments('id');
+			$table->integer('student_id')->unsigned();
+			$table->integer('activity_criterion_id')->unsigned();
+			$table->integer('score');
+			$table
+				->foreign('student_id')
+				->references('id')
+				->on('students')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table
+				->foreign('activity_criterion_id')
+				->references('id')
+				->on('activity_criterion')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->timestamps();
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('new_assessments');
+	}
+
+}

app/database/migrations/2020_10_05_124915_create_activity_criterion_table.php

@@ -0,0 +1,52 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateActivityCriterionTable extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('activity_criterion', function(Blueprint $table)
+		{
+			$table->increments('id');
+			$table->integer('activity_id')->unsigned();
+			$table->integer('criterion_id')->unsigned();
+			$table
+				->foreign('activity_id')
+				->references('id')
+				->on('activities')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table
+				->foreign('criterion_id')
+				->references('id')
+				->on('criteria')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->text('transformative_actions')->nullable();
+			$table->integer('expected_student_score')->nullable();
+			$table->decimal('expected_percentage_students_achieving', 5, 2)->nullable();
+			$table->decimal('percentage_students_who_achieved', 5, 2)->nullable();
+			$table->decimal('weight', 3, 2)->default(1.0);
+			$table->timestamps();
+		});
+	
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('activity_criterion');
+	}
+
+}

app/database/migrations/2020_10_05_130252_add_max_score_num_scales_new_criteria_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddMaxScoreNumScalesNewCriteriaTable extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('new_criteria', function(Blueprint $table)
+		{
+			$table->integer('maximum_score')->after('name');;
+			$table->integer('number_of_scales')->after('maximum_score');;
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('new_criteria', function(Blueprint $table)
+		{
+    		$table->dropColumn(array('maximum_score', 'number_of_scales'));
+		});
+	}
+
+}

app/database/migrations/2020_10_05_142424_create_scales_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateScalesTable extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('scales', function(Blueprint $table)
+		{
+			$table->increments('id');
+			$table->integer('position');
+			$table->string('title');
+			$table->string('description');
+			$table->timestamps();
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('scales');
+	}
+
+}

app/database/migrations/2020_10_05_142912_create_criterion_scale_table.php

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

app/database/migrations/2020_10_05_232429_add_assessment_comments_to_activity_criterion.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddAssessmentCommentsToActivityCriterion extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('activity_criterion', function(Blueprint $table)
+		{
+			$table->text('assessment_comments')->after('transformative_actions')->nullable();
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('activity_criterion', function(Blueprint $table)
+		{
+			$table->drop('assessment_comments');
+		});
+	}
+
+}

app/database/migrations/2020_10_09_131800_add_level_activation_date_to_outcomes.php

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddLevelActivationDateToOutcomes extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('outcomes', function(Blueprint $table)
+		{
+			$table->smallInteger('level');
+			$table->date('activation_date');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('outcomes', function(Blueprint $table)
+		{
+			$table->drop('level')->default(1);
+			$table->drop('activation_date');
+		});
+	}
+
+}

app/database/migrations/2020_10_16_190923_create_criterion_objective_outcome_table.php

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

app/database/migrations/2020_10_18_145108_create_outcome_performance_table.php

@@ -0,0 +1,57 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateOutcomePerformanceTable extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('outcome_performance', function(Blueprint $table)
+		{
+			$table->increments('id');
+			$table->integer('criterion_id')->unsigned();
+			$table->integer('outcome_id')->unsigned();
+			$table->integer('semester_id')->unsigned();
+			$table->integer('students_attempted');
+			$table->integer('students_achieved');
+			$table->smallInteger('level');
+			$table
+				->foreign('criterion_id')
+				->references('id')
+				->on('criteria')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table
+				->foreign('outcome_id')
+				->references('id')
+				->on('outcomes')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table
+				->foreign('semester_id')
+				->references('id')
+				->on('semesters')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+
+			$table->timestamps();
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('outcome_performance');
+	}
+
+}

app/database/migrations/2020_10_29_122332_MakeOutcomeNullable.php

@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class MakeOutcomeNullable extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('objectives', function (Blueprint $table) {
+			$table->dropForeign('objectives_outcome_id_foreign');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+	}
+}

app/database/migrations/2020_10_29_195413_MakeObjectiveNullable.php

@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class MakeObjectiveNullable extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('new_criteria', function (Blueprint $table) {
+			$table->dropForeign('new_criteria_objective_id_foreign');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+	}
+}

app/database/migrations/2020_10_29_224846_Make_criterion_objective_outcome_changeForeignKey.php

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

app/database/migrations/2020_11_06_011242_changeCriteriaObjOutcome.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Schema;
+
+class ChangeCriteriaObjOutcome extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('criterion_objective_outcome', function (Blueprint $table) {
+			//$table->dropForeign('criterion_objective_outcome_objective_id_foreign');
+			//$table->dropForeign('criterion_objective_outcome_outcome_id_foreign');
+			//$table->integer('objective_outcome_id');
+			DB::statement("ALTER TABLE `criterion_objective_outcome` CHANGE COLUMN `objective_outcome_id` `objective_outcome_id` INT(10) UNSIGNED NOT NULL");
+			$table->foreign('objective_outcome_id')->references('id')->on('objective_outcome')->onDelete('cascade')->onUpdate('cascade');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+	}
+}

app/database/migrations/2020_11_11_201214_dropForeignObjOut.php

@@ -0,0 +1,31 @@
+<?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/emails/feedback-email-copy.blade.php

@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html lang="en-US">
+	<head>
+		<meta charset="utf-8">
+	</head>
+	<body style="width: 960px;">
+		<div>{{HTML::image('/images/olas-email-header.png', 'OLAS Header Image', array('class'=>'logo img-responsive'))}}</div>		
+		<div>
+			<h2 style="color: #E70033;">Copy of your feedback for OLAS (no-reply)</h2>
+			
+			<hr style="border: 0; height: 0; border-top: 1px solid rgba(0, 0, 0, 0.1); border-bottom: 1px solid rgba(255, 255, 255, 0.3);">
+			<h3>Type: </h3>
+			<p>{{ $type }}</p>
+
+			<h3>Email: </h3>
+			<p>{{ $email }}</p>
+
+			<h3>Comment: </h3>
+			<p>{{ $comment }}</p>
+			<hr style="border: 0; height: 0; border-top: 1px solid rgba(0, 0, 0, 0.1); border-bottom: 1px solid rgba(255, 255, 255, 0.3);">
+
+			<p>This is an automatic email message. Please do not reply, as the inbox is not monitored.</p>
+
+			<p>Regards,</p>
+			<p style="color: #E70033;"><strong>OLAS UPRRP Administration<strong></p><br/>
+			
+
+		</div>
+	</body>
+</html>

app/database/migrations/2018_08_28_140328_remove_outcome_id_from_objectives_table.php → app/database/unusedMigrations/2018_08_28_140328_remove_outcome_id_from_objectives_table.php

@@ -3,7 +3,8 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class RemoveOutcomeIdFromObjectivesTable extends Migration {
+class RemoveOutcomeIdFromObjectivesTable extends Migration
+{
 
 	/**
 	 * Run the migrations.
@@ -12,9 +13,8 @@ class RemoveOutcomeIdFromObjectivesTable extends Migration {
 	 */
 	public function up()
 	{
-		Schema::table('objectives', function(Blueprint $table)
-		{
-            $table->dropForeign('objectives_outcome_id_foreign');
+		Schema::table('objectives', function (Blueprint $table) {
+			$table->dropForeign('objectives_outcome_id_foreign');
 			$table->dropColumn('outcome_id');
 		});
 	}
@@ -27,12 +27,11 @@ class RemoveOutcomeIdFromObjectivesTable extends Migration {
 	 */
 	public function down()
 	{
-		Schema::table('objectives', function(Blueprint $table)
-		{
-            $table
-                ->integer('outcome_id')
-                ->after('id')
-                ->unsigned();
+		Schema::table('objectives', function (Blueprint $table) {
+			$table
+				->integer('outcome_id')
+				->after('id')
+				->unsigned();
 			$table
 				->foreign('outcome_id')
 				->references('id')
@@ -41,5 +40,4 @@ class RemoveOutcomeIdFromObjectivesTable extends Migration {
 				->onUpdate('cascade');
 		});
 	}
-
 }

app/database/unusedMigrations/2020_10_05_124915_create_activity_criterion_table.php

@@ -0,0 +1,52 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateActivityCriterionTable extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('activity_criterion', function(Blueprint $table)
+		{
+			$table->increments('id');
+			$table->integer('activity_id')->unsigned();
+			$table->integer('criterion_id')->unsigned();
+			$table
+				->foreign('activity_id')
+				->references('id')
+				->on('activities')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table
+				->foreign('criterion_id')
+				->references('id')
+				->on('criteria')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->text('transformative_actions')->nullable();
+			$table->integer('expected_student_score')->nullable();
+			$table->decimal('expected_percentage_students_achieving', 5, 2)->nullable();
+			$table->decimal('percentage_students_who_achieved', 5, 2)->nullable();
+			$table->decimal('weight', 3, 2)->default(1.0);
+			$table->timestamps();
+		});
+	
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('activity_criterion');
+	}
+
+}

app/database/unusedMigrations/2020_10_05_130252_add_max_score_num_scales_new_criteria_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddMaxScoreNumScalesNewCriteriaTable extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('new_criteria', function(Blueprint $table)
+		{
+			$table->integer('maximum_score')->after('name');;
+			$table->integer('number_of_scales')->after('maximum_score');;
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('new_criteria', function(Blueprint $table)
+		{
+    		$table->dropColumn(array('maximum_score', 'number_of_scales'));
+		});
+	}
+
+}

app/database/unusedMigrations/2020_10_05_142424_create_scales_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateScalesTable extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('scales', function(Blueprint $table)
+		{
+			$table->increments('id');
+			$table->integer('position');
+			$table->string('title');
+			$table->string('description');
+			$table->timestamps();
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('scales');
+	}
+
+}

app/database/unusedMigrations/2020_10_05_142912_create_criterion_scale_table.php

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

app/database/unusedMigrations/2020_10_05_232429_add_assessment_comments_to_activity_criterion.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddAssessmentCommentsToActivityCriterion extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('activity_criterion', function(Blueprint $table)
+		{
+			$table->text('assessment_comments')->after('transformative_actions')->nullable();
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('activity_criterion', function(Blueprint $table)
+		{
+			$table->drop('assessment_comments');
+		});
+	}
+
+}

app/database/unusedMigrations/2020_10_08_203557_create_new_criteria_table2.php

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Schema;
+
+class CreateNewCriteriaTable2 extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('new_criteria', function ($table) {
+			$table->integer('outcome_id')->unsigned();
+
+			$table->foreign('outcome_id')->references('id')->on('outcomes')->onDelete('cascade')->onUpdate('cascade');
+		});
+	}
+
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('new_criteria', function ($table) {
+			$table->dropColumn('outcome_id');
+		});
+	}
+}

app/database/unusedMigrations/2020_10_08_215013_drop_objective_id_new_criteria.php

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

app/database/unusedMigrations/2020_10_09_085334_add_activities_rubric_id.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddActivitiesRubricId extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('activities', function ($table) {
+			$table->integer('rubric_id')->unsigned();
+
+			//$table->foreign('rubric_id')->references('id')->on('rubrics')->onDelete('cascade')->onUpdate('cascade');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('activities', function ($table) {
+			$table->dropColumn('rubric_id');
+		});
+	}
+}

app/database/unusedMigrations/2020_10_09_092810_drop_assessment_criteria.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class DropAssessmentCriteria extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('assessments', function ($table) {
+			$table->dropForeign('assessments_criterion_id_foreign');
+			$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::table('assessments', function ($table) {
+			$table->dropForeign('criterion_id');
+		});
+	}
+}

app/database/unusedMigrations/2020_10_09_094503_add_criterion_to_assessment.php

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

app/database/unusedMigrations/2020_10_09_095246_drop_foreign_assesment_criterion.php

@@ -0,0 +1,29 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class DropForeignAssesmentCriterion extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('assessments', function ($table) {
+			$table->dropForeign('assessments_criterion_id_foreign');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+	}
+}

app/database/unusedMigrations/2020_10_09_131800_add_level_activation_date_to_outcomes.php

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddLevelActivationDateToOutcomes extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('outcomes', function(Blueprint $table)
+		{
+			$table->smallInteger('level');
+			$table->date('activation_date');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('outcomes', function(Blueprint $table)
+		{
+			$table->drop('level')->default(1);
+			$table->drop('activation_date');
+		});
+	}
+
+}

app/filters.php

@@ -11,19 +11,16 @@
 |
 */
 
-App::before(function($request)
-{
-	Log::debug('START '.Request::getClientIp().': '.Request::method().' '.Request::path());
-
-	if( ! Request::secure())
-    {
-        return Redirect::secure(Request::path());
-    }
+App::before(function ($request) {
+	Log::debug('START ' . Request::getClientIp() . ': ' . Request::method() . ' ' . Request::path());
+
+	//if (!Request::secure()) {
+	//	return Redirect::secure(Request::path());
+	//}
 });
 
 
-App::after(function($request, $response)
-{
+App::after(function ($request, $response) {
 	//
 });
 
@@ -38,37 +35,28 @@ App::after(function($request, $response)
 |
 */
 
-Route::filter('auth', function()
-{
-	if (Auth::guest())
-	{
-		if (Request::ajax())
-		{
+Route::filter('auth', function () {
+	if (Auth::guest()) {
+		if (Request::ajax()) {
 			return Response::make('Unauthorized', 401);
-		}
-		else
-		{
+		} else {
 			return Redirect::guest('/');
 		}
 	}
 });
 
 
-Route::filter('auth.basic', function()
-{
+Route::filter('auth.basic', function () {
 	return Auth::basic();
 });
 
-Route::filter('has_access', function()
-{
-	if(!Auth::user()->has_access)
-	{
+Route::filter('has_access', function () {
+	if (!Auth::user()->has_access) {
 		Session::flash('status', 'info');
 		Session::flash('message', 'At this time, access to OLAS is limited to some users. Check back later or contact an administrator.');
 		Auth::logout();
 		return Redirect::action('AuthController@showLogin');
 	}
-
 });
 /*
 |--------------------------------------------------------------------------
@@ -81,10 +69,8 @@ Route::filter('has_access', function()
 |
 */
 
-Route::filter('guest', function()
-{
-	if (Auth::check())
-	{
+Route::filter('guest', function () {
+	if (Auth::check()) {
 		switch (Auth::user()->role) {
 			case 1:
 				return Redirect::to('administrator');
@@ -115,10 +101,8 @@ Route::filter('guest', function()
 |
 */
 
-Route::filter('admin', function()
-{
-	if (Auth::user()->role !=1)
-	{
+Route::filter('admin', function () {
+	if (Auth::user()->role != 1) {
 		switch (Auth::user()->role) {
 			case 2:
 				return Redirect::to('school-coordinator');
@@ -145,13 +129,10 @@ Route::filter('admin', function()
 |
 */
 
-Route::filter('scoord', function()
-{
+Route::filter('scoord', function () {
 
-	if (!(Auth::user()->role ==2 || Auth::user()->role ==1))
-	{
-		switch (Auth::user()->role)
-		{
+	if (!(Auth::user()->role == 2 || Auth::user()->role == 1)) {
+		switch (Auth::user()->role) {
 
 			case 3:
 				return Redirect::to('program-coordinator');
@@ -174,10 +155,8 @@ Route::filter('scoord', function()
 |
 */
 
-Route::filter('pcoord', function()
-{
-	if (!(Auth::user()->role ==3 || Auth::user()->role ==2 || Auth::user()->role ==1))
-	{
+Route::filter('pcoord', function () {
+	if (!(Auth::user()->role == 3 || Auth::user()->role == 2 || Auth::user()->role == 1)) {
 		return Redirect::to('professor');
 	}
 });
@@ -192,12 +171,10 @@ Route::filter('pcoord', function()
 |
 */
 
-Route::filter('prof', function()
-{
+Route::filter('prof', function () {
 	// If user has no courses then s/he is not a professor
 	// and must be redirected to her/his overview page
-	if (!count(Auth::user()->courses))
-	{
+	if (!count(Auth::user()->courses)) {
 		switch (Auth::user()->role) {
 			case 1:
 				return Redirect::to('administrator');
@@ -225,11 +202,9 @@ Route::filter('prof', function()
 |
 */
 
-Route::filter('csrf', function()
-{
+Route::filter('csrf', function () {
 	$token = Request::ajax() ? Request::header('X-CSRF-Token') : Input::get('_token');
-	if (Session::token() !== $token)
-	{
-	  throw new Illuminate\Session\TokenMismatchException;
+	if (Session::token() !== $token) {
+		throw new Illuminate\Session\TokenMismatchException;
 	}
 });

app/models/Objective.php

@@ -1,43 +1,46 @@
 <?php
 
+use Illuminate\Database\Eloquent\SoftDeletingTrait;
+
 class Objective extends Eloquent
 {
+    use SoftDeletingTrait;
+    protected $fillable = array('text', 'outcome_id', 'program_id', 'active');
+    protected $table = 'objectives';
 
-  protected $fillable = array('text', 'outcome_id', 'program_id', 'active');
+    /**
+     * Return the program that the objective belongs to
+     *
+     * @return Illuminate\Database\Eloquent\Model
+     */
+    public function program()
+    {
+        return $this->belongsTo('Program');
+    }
 
-  /**
-   * Return the program that the objective belongs to
-   *
-   * @return Illuminate\Database\Eloquent\Model
-   */
-  public function program()
-  {
-  	return $this->belongsTo('Program');
-  }
+    /**
+     * Return the outcomes that the objective belongs to
+     *
+     * @return Illuminate\Database\Eloquent\Model
+     */
 
-  /**
-   * Return the outcomes that the objective belongs to
-   *
-   * @return Illuminate\Database\Eloquent\Model
-   */
-  public function outcomes()
-  {
-  	return $this->belongsToMany('Outcome', 'objective_outcome', 'objective_id', 'outcome_id');
-  }
+    public function outcomes()
+    {
+        return $this->belongsToMany('Outcome', 'objective_outcome', 'objective_id', 'outcome_id');
+    }
 
-  public function outcome()
-  {
-      return $this->belongsTo('Outcome');
-  }
+    public function outcome()
+    {
+        return $this->belongsTo('Outcome');
+    }
 
     /**
      * Return the program that the objective belongs to
      *
      * @return Illuminate\Database\Eloquent\Model
      */
-    public function criteria()
+    public function outcome_id()
     {
-        return $this->hasMany('Criterion');
+        return $this->hasMany('Objective_Outcome', 'objective_id');
     }
-
 }

app/models/Objective_Outcome.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Eloquent\SoftDeletingTrait;
+
+class Objective_Outcome extends Eloquent
+{
+    use SoftDeletingTrait;
+    protected $fillable = array('outcome_id', 'objective_id');
+    protected $table = 'objective_outcome';
+
+    /**
+     * Return the program that the objective belongs to
+     *
+     * @return Illuminate\Database\Eloquent\Model
+     */
+    public function outcome()
+    {
+        return $this->belongsTo('Outcome');
+    }
+
+    /**
+     * Return the outcomes that the objective belongs to
+     *
+     * @return Illuminate\Database\Eloquent\Model
+     */
+
+
+
+    /**
+     * Return the program that the objective belongs to
+     *
+     * @return Illuminate\Database\Eloquent\Model
+     */
+    public function objective()
+    {
+        return $this->belongsTo('Objective');
+    }
+}

app/models/Outcome.php

@@ -24,11 +24,4 @@ class Outcome extends Eloquent
 	    return $this->hasMany('Objective');
 //		return $this->belongsToMany('Objective', 'objective_outcome');
 	}
-
-	public static function active()
-    {
-        //TODO: Check when semester doesnt exist or session is empty
-        $selected_semester = Semester::find(Session::get('semesters_ids')[0]);
-        return Outcome::withTrashed()->where('deactivation_date', '>=', $selected_semester->start)->orWhere('deactivation_date', null)->orderBy('name', 'ASC')->get();
-    }
 }

app/models/User.php

@@ -7,7 +7,8 @@ use Illuminate\Auth\Reminders\RemindableInterface;
 
 use Zizaco\Entrust\HasRole;
 
-class User extends Eloquent implements UserInterface, RemindableInterface {
+class User extends Eloquent implements UserInterface, RemindableInterface
+{
 
 	use UserTrait, RemindableTrait, HasRole;
 
@@ -31,17 +32,17 @@ class User extends Eloquent implements UserInterface, RemindableInterface {
 	protected $fillable = array('ssn', 'first_name', 'surnames', 'email', 'role', 'school_id', 'has_access', 'cell_phone', 'office_phone', 'office_extension');
 
 	/**
-     * Searchable rules.
-     *
-     * @var array
-     */
-    protected $searchable = [
-        'columns' => [
-            'first_name' => 10,
-            'surnames' => 10,
-            'email' => 2,
-        ],
-    ];
+	 * Searchable rules.
+	 *
+	 * @var array
+	 */
+	protected $searchable = [
+		'columns' => [
+			'first_name' => 10,
+			'surnames' => 10,
+			'email' => 2,
+		],
+	];
 
 
 	public function program()

app/routes.php

@@ -33,8 +33,7 @@ View::composer(array(
     'local.managers.admins._navigation',
     'local.managers.sCoords._navigation',
     'local.managers.pCoords._navigation',
-    ), function($view)
-{
+), function ($view) {
     // Get user's courses' numbers
     $courses = Auth::user()->courses;
 
@@ -54,10 +53,10 @@ View::composer(array(
     'local.managers.shared.program',
     'local.managers.shared.rubrics',
     'global.view-learning-outcomes-criteria',
-    'global.view-learning-outcomes-criteria'), function($view)
-    {
-        $view->with('role', Auth::user()->role);
-    });
+    'global.view-learning-outcomes-criteria'
+), function ($view) {
+    $view->with('role', Auth::user()->role);
+});
 
 
 /*
@@ -66,33 +65,29 @@ View::composer(array(
 
 /** Use modified guest filter to redirect logged in user */
 Route::get('/', array('before' => 'guest', 'uses' => 'AuthController@showLogin'));
-Route::post('/login', array('uses'=>'AuthController@login'));
+Route::post('/login', array('uses' => 'AuthController@login'));
 
 /**
  * Protected Routes
  */
-Route::group(array('before' => 'auth|has_access'), function()
-{
+Route::group(array('before' => 'auth|has_access'), function () {
 
     /**
      * Recalculate course outcomes
      *
-    */
+     */
 
-    Route::get('recalculateCourses', function()
-    {
+    Route::get('recalculateCourses', function () {
 
         DB::disableQueryLog();
 
-        if(Auth::user()->id!=58)
+        if (Auth::user()->id != 58)
             Redirect::action('AuthController@showLogin');
 
-        try
-        {
+        try {
             $courses = Course::all();
 
-            foreach ($courses as $course)
-            {
+            foreach ($courses as $course) {
                 echo $course->id;
                 // Recalculate course outcomes
                 $activities = Activity::where('course_id', $course->id)
@@ -102,8 +97,7 @@ Route::group(array('before' => 'auth|has_access'), function()
 
 
                 //If there are still evaluated activities in the course, recalculate course outcomes
-                if(!$activities->isEmpty())
-                {
+                if (!$activities->isEmpty()) {
                     $outcomeCount = Outcome::all()->count();
 
                     // Variables to hold recalculated outcomes for the course
@@ -111,104 +105,100 @@ Route::group(array('before' => 'auth|has_access'), function()
                     $course_outcomes_achieved = array_fill(1, $outcomeCount, 0);
 
                     // For each activity
-                    foreach ($activities as $activity2)
-                    {
+                    foreach ($activities as $activity2) {
                         // If activity has been assessed
-                        if($activity2->outcomes_attempted!=NULL)
-                        {
+                        if ($activity2->outcomes_attempted != NULL) {
                             echo '<ul>';
                             // Get the achieved criteria
                             $criteria_achievement = json_decode($activity2->criteria_achieved, true);
-                            foreach($criteria_achievement as $criterion_id=>$criterion_achieved)
-                            {
+                            foreach ($criteria_achievement as $criterion_id => $criterion_achieved) {
                                 // Find corresponding learning outcome;
                                 $criterion = Criterion::withTrashed()->where('id', $criterion_id)->first();
 
-                                print '<li>'.$criterion->id.'</li>';
+                                print '<li>' . $criterion->id . '</li>';
 
 
                                 $outcome = Outcome::find($criterion->outcome_id);
 
                                 // If criterion is achieved (1), add 1 to both arrays
-                                if($criterion_achieved === 1)
-                                {
-                                    $course_outcomes_attempted[$outcome->id]+=1;
-                                    $course_outcomes_achieved[$outcome->id]+=1;
+                                if ($criterion_achieved === 1) {
+                                    $course_outcomes_attempted[$outcome->id] += 1;
+                                    $course_outcomes_achieved[$outcome->id] += 1;
                                 }
                                 // Else, only add to the attempted outcomes arrays
-                                elseif($criterion_achieved === 0)
-                                {
-                                    $course_outcomes_attempted[$outcome->id]+=1;
+                                elseif ($criterion_achieved === 0) {
+                                    $course_outcomes_attempted[$outcome->id] += 1;
                                 }
                             }
 
                             echo '</ul>';
-
                         }
                     }
 
                     // Update course
                     DB::table('courses')
-                    ->where('id', $course->id)
-                    ->update(array(
-                        'outcomes_attempted'=> json_encode($course_outcomes_attempted),
-                        'outcomes_achieved'=> json_encode($course_outcomes_achieved),
-                        'updated_at' => date('Y-m-d H:i:s'))
-                    );
+                        ->where('id', $course->id)
+                        ->update(array(
+                            'outcomes_attempted' => json_encode($course_outcomes_attempted),
+                            'outcomes_achieved' => json_encode($course_outcomes_achieved),
+                            'updated_at' => date('Y-m-d H:i:s')
+                        ));
                 }
                 // Otherwise, set them all to NULL
-                else
-                {
+                else {
                     DB::table('courses')
-                    ->where('id', $course->id)
-                    ->update(array(
-                        'outcomes_attempted'=> NULL,
-                        'outcomes_achieved'=> NULL,
-                        'updated_at' => date('Y-m-d H:i:s'))
-                    );
+                        ->where('id', $course->id)
+                        ->update(array(
+                            'outcomes_attempted' => NULL,
+                            'outcomes_achieved' => NULL,
+                            'updated_at' => date('Y-m-d H:i:s')
+                        ));
                 }
             }
 
             return 'success';
-        }
-        catch(Exception $e)
-        {
-            return 'failure ('.$e->getLine().'): '.$e->getMessage();
+        } catch (Exception $e) {
+            return 'failure (' . $e->getLine() . '): ' . $e->getMessage();
         }
     });
 
     /**
-    * Shared Routes
-    */
+     * Shared Routes
+     */
 
     // Fetch all criteria associated to an outcome
-    Route::post( 'fetchCriteria', array(
+    Route::post('fetchCriteria', array(
         'as' => 'fetchCriteria',
         'uses' => 'OutcomesController@fetchCriteria'
-    ) );
+    ));
 
     // Fetch a criterion for a rubric
-    Route::post( 'fetchCriterion', array(
+    Route::post('fetchCriterion', array(
         'as' => 'fetchCriterion',
         'uses' => 'CriteriaController@fetchCriterion'
-    ) );
+    ));
 
     // Fetch a criterion for a rubric
-    Route::post( 'fetchCriterionWithTrashed', array(
+    Route::post('fetchCriterionWithTrashed', array(
         'as' => 'fetchCriterionWithTrashed',
         'uses' => 'CriteriaController@fetchCriterionWithTrashed'
-    ) );
+    ));
+    //Fetch objectives for criteria when outcome is chosen
+    Route::post('fetchObjectivesForSelect', array(
+        'as' => 'fetchObjectivesForSelect',
+        'uses' => 'CriteriaController@fetchObjectivesForSelect'
+    ));
 
     // Fetch a criterion for a rubric with custom content
-    Route::post( 'fetchRubricCriterion', array(
+    Route::post('fetchRubricCriterion', array(
         'as' => 'fetchRubricCriterion',
         'uses' => 'RubricsController@fetchRubricCriterion'
-    ) );
+    ));
 
     // Load a rubric template
-    Route::post('loadTemplate', array('uses'=>'TemplatesController@fetch'));
+    Route::post('loadTemplate', array('uses' => 'TemplatesController@fetch'));
 
-    Route::post('filterSemesters', array('uses'=>'SemestersController@filterSemesters'));
+    Route::post('filterSemesters', array('uses' => 'SemestersController@filterSemesters'));
 
 
     // Log out user
@@ -216,49 +206,51 @@ Route::group(array('before' => 'auth|has_access'), function()
 
     // Edit and update user profile
     Route::get('profile', 'UsersController@edit');
-    Route::post('profile/update', array('before' => 'csrf', 'uses'=>'UsersController@update'));
+    Route::post('profile/update', array('before' => 'csrf', 'uses' => 'UsersController@update'));
 
     // Allows users to give feeback
-    Route::post('feedback/send', array('before' => 'csrf', 'uses'=>'FeedbackController@send'));
-    Route::resource('feedback', 'FeedbackController',
-                array('only' => array('create')));
+    Route::post('feedback/send', array('before' => 'csrf', 'uses' => 'FeedbackController@send'));
+    Route::resource(
+        'feedback',
+        'FeedbackController',
+        array('only' => array('create'))
+    );
 
     // Show users all learning outcomes and criteria
     Route::get('learning-outcomes-criteria', 'CriteriaController@index');
-    Route::post('fetchOutcome', array('before' => 'csrf', 'uses'=>'OutcomesController@fetchOutcome'));
+    Route::post('fetchOutcome', array('before' => 'csrf', 'uses' => 'OutcomesController@fetchOutcome'));
 
     // Show professor overview to users with courses
     Route::get('professor', 'ProfessorsController@overview');
 
     // Assessment reports for users' courses
     Route::get('my-assessment-reports', 'OutcomesController@professorAssessmentReports');
-    Route::post('objectives/fetch', array('before' => 'csrf', 'uses'=>'ObjectivesController@fetch'));
+    Route::post('objectives/fetch', array('before' => 'csrf', 'uses' => 'ObjectivesController@fetch'));
 
     /**
      * Administrator Routes
      */
-    Route::group( array('before' => 'admin'), function()
-    {
+    Route::group(array('before' => 'admin'), function () {
         Route::get('/administrator', 'AdministratorsController@overview');
-        Route::post( 'administrator/rubrics', array(
+        Route::post('administrator/rubrics', array(
             'as' => 'rubrics',
             'before' => 'csrf',
             'uses' => 'CriteriaController@fetch'
-        ) );
-        Route::post('createOutcome', array('before' => 'csrf', 'uses'=>'OutcomesController@create'));
-        Route::post('createCriterion', array('before' => 'csrf', 'uses'=>'CriteriaController@create'));
+        ));
+        Route::post('createOutcome', array('before' => 'csrf', 'uses' => 'OutcomesController@create'));
+        Route::post('createCriterion', array('before' => 'csrf', 'uses' => 'CriteriaController@create'));
 
         Route::get('learning-outcomes', 'OutcomesController@index');
         // TODO: Change later
         Route::get('new-learning-outcomes', 'OutcomesController@newIndex');
         Route::post('learning-outcomes/update', array('before' => 'csrf', 'uses' => 'OutcomesController@update'));
-        Route::post('crtiteria/update', array('before' => 'csrf', 'uses'=>'CriteriaController@update'));
-        Route::delete('crtiteria/delete', array('before' => 'csrf', 'uses'=>'CriteriaController@destroy'));
+        Route::post('crtiteria/update', array('before' => 'csrf', 'uses' => 'CriteriaController@update'));
+        Route::delete('crtiteria/delete', array('before' => 'csrf', 'uses' => 'CriteriaController@destroy'));
 
         Route::get('administrator/users/{query?}', 'UsersController@index');
 
-        Route::post('administrator/updateAccess', array('before' => 'csrf', 'uses'=>'UsersController@updateAccess'));
-        Route::post('administrator/users/store', array('before' => 'csrf', 'uses'=>'UsersController@store'));
+        Route::post('administrator/updateAccess', array('before' => 'csrf', 'uses' => 'UsersController@updateAccess'));
+        Route::post('administrator/users/store', array('before' => 'csrf', 'uses' => 'UsersController@store'));
 
 
         Route::get('administrator/semesters', 'SemestersController@edit');
@@ -273,17 +265,15 @@ Route::group(array('before' => 'auth|has_access'), function()
         Route::get('template/{template}', 'TemplatesController@show');
 
         Route::get('courses/reassign', 'CoursesController@reassign');
-        Route::post('courses/update', array('before' => 'csrf', 'uses'=>'CoursesController@update'));
+        Route::post('courses/update', array('before' => 'csrf', 'uses' => 'CoursesController@update'));
 
         Route::get('activities/create', 'ActivitiesController@newCreate');
-
     });
 
     /**
      * School Coordinator Routes
      */
-    Route::group( array('before' => 'scoord'), function()
-    {
+    Route::group(array('before' => 'scoord'), function () {
         Route::get('school-coordinator', 'SchoolCoordinatorsController@overview');
         Route::get('school/{id}', 'SchoolsController@show');
         Route::get('program/{id}', 'ProgramsController@show');
@@ -300,20 +290,19 @@ Route::group(array('before' => 'auth|has_access'), function()
     /**
      * Program Coordinator Routes
      */
-    Route::group( array('before' => 'pcoord'), function()
-    {
+    Route::group(array('before' => 'pcoord'), function () {
         Route::get('program-coordinator', 'ProgramCoordinatorsController@overview');
 
         Route::get('rubrics', 'TemplatesController@newTemplate');
-        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::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'));
+        Route::post('program/fetch', array('before' => 'csrf', 'uses' => 'ProgramsController@fetch'));
 
-        Route::get('printRubric/{id}', 'TemplatesController@printview' );
+        Route::get('printRubric/{id}', 'TemplatesController@printview');
         Route::get('rubric/{rubric_id}', 'RubricsController@show_limited');
         Route::get('grouped_course/{code}/{number}/{semester_code}', 'CoursesController@showGrouped');
 
@@ -329,19 +318,25 @@ Route::group(array('before' => 'auth|has_access'), function()
 
         // Learning Objectives
         Route::get('program/{program}/objectives', 'ObjectivesController@index');
-        Route::post('updateObjective', array('before' => 'csrf', 'uses'=>'ObjectivesController@update'));
-        Route::post('program/{id}/createObjective', array('before' => 'csrf', 'uses'=>'ObjectivesController@create'));
-        Route::post('fetchObjective', array('before' => 'csrf', 'uses'=>'ObjectivesController@fetchObjective'));
-        Route::post('fetchObjectivesForCriteria', array('before' => 'csrf', 'uses'=>'ObjectivesController@fetchObjectivesForCriteria'));
-
-        // Five year plans
+        Route::post('updateObjective', array('before' => 'csrf', 'uses' => 'ObjectivesController@update'));
+        Route::post('program/{id}/createObjective', array('before' => 'csrf', 'uses' => 'ObjectivesController@create'));
+        Route::post('fetchObjective', array('before' => 'csrf', 'uses' => 'ObjectivesController@fetchObjective'));
+        Route::post('fetchObjectivesForCriteria', array('before' => 'csrf', 'uses' => 'ObjectivesController@fetchObjectivesForCriteria'));
+
+        //Objectives por Gabriel
+        Route::get('objective', 'Objective2Controller@edit');
+        Route::post('createObjective', array('before' => 'csrf', 'uses' => 'Objective2Controller@create'));
+        Route::post('updateObjective', array('before' => 'csrf', 'uses' => 'Objective2Controller@update'));
+        Route::post('fetchObjectiveWithTrashed', array('before' => 'csrf', 'uses' => 'Objective2Controller@fetchObjectiveWithTrashed'));
+
+        // Five year plans, 
         Route::get('five-year-plans', 'FiveYearPlansController@index');
         Route::get('program/{program}/five-year-plans/create', 'FiveYearPlansController@create');
         Route::get('program/{program}/five-year-plans/{five_year_plan}', 'FiveYearPlansController@show');
         Route::get('program/{program}/five-year-plans/{five_year_plan}/edit', 'FiveYearPlansController@edit');
         Route::get('five-year-plans/{five_year_plan}/ms-word', 'FiveYearPlansController@msWord');
-        Route::post('five-year-plans/store', array('before' => 'csrf', 'uses'=>'FiveYearPlansController@store'));
-        Route::post('five-year-plans/update', array('before' => 'csrf', 'uses'=>'FiveYearPlansController@update'));
+        Route::post('five-year-plans/store', array('before' => 'csrf', 'uses' => 'FiveYearPlansController@store'));
+        Route::post('five-year-plans/update', array('before' => 'csrf', 'uses' => 'FiveYearPlansController@update'));
 
 
         // Annual plans
@@ -349,8 +344,8 @@ Route::group(array('before' => 'auth|has_access'), function()
         Route::get('program/{program}/annual-plans/create', 'AnnualPlansController@create');
         Route::get('program/{program}/annual-plans/{five_year_plan}', 'AnnualPlansController@show');
         Route::get('program/{program}/annual-plans/{five_year_plan}/edit', 'AnnualPlansController@edit');
-        Route::post('annual-plans/store', array('before' => 'csrf', 'uses'=>'AnnualPlansController@store'));
-        Route::post('annual-plans/update', array('before' => 'csrf', 'uses'=>'AnnualPlansController@update'));
+        Route::post('annual-plans/store', array('before' => 'csrf', 'uses' => 'AnnualPlansController@store'));
+        Route::post('annual-plans/update', array('before' => 'csrf', 'uses' => 'AnnualPlansController@update'));
 
         Route::get('learning-outcomes/show/{id}', 'OutcomesController@show');
         // TODO: Change route name
@@ -364,9 +359,8 @@ Route::group(array('before' => 'auth|has_access'), function()
     /**
      * Professor Routes
      */
-    Route::group(array('prefix' => 'professor', 'before'=>'prof'), function()
-    {
-        Route::post('program', array('before' => 'csrf', 'uses'=>'ProfessorsController@program'));
+    Route::group(array('prefix' => 'professor', 'before' => 'prof'), function () {
+        Route::post('program', array('before' => 'csrf', 'uses' => 'ProfessorsController@program'));
         Route::get('activities/{activity_id}/rubrics', 'RubricsController@newRubric');
         Route::get('activities/{activity_id}/rubric', 'RubricsController@show');
         Route::get('activities/{activity_id}/rubric/{rubric_id}/download', 'RubricsController@download');
@@ -374,23 +368,23 @@ Route::group(array('before' => 'auth|has_access'), function()
         Route::get('activities/{activity_id}/assess', 'ActivitiesController@assess');
         Route::get('activities/{activity_id}/view_assessment', 'ActivitiesController@viewAssessment');
         Route::get('activities/{activity_id}/print_assessment', 'ActivitiesController@printAssessment');
-        Route::post('activities/saveAssessment', array('before'=>'csrf', 'uses'=>'ActivitiesController@saveAssessment'));
-        Route::post('activities/deleteAssessment', array('before'=>'csrf', 'uses'=>'ActivitiesController@deleteAssessment'));
+        Route::post('activities/saveAssessment', array('before' => 'csrf', 'uses' => 'ActivitiesController@saveAssessment'));
+        Route::post('activities/deleteAssessment', array('before' => 'csrf', 'uses' => 'ActivitiesController@deleteAssessment'));
         Route::delete('activities/{activity_id}/delete', 'ActivitiesController@destroy');
-        Route::post('activities/{activity_id}/update', array('before' => 'csrf', 'uses'=>'ActivitiesController@update'));
+        Route::post('activities/{activity_id}/update', array('before' => 'csrf', 'uses' => 'ActivitiesController@update'));
         Route::get('courses/{id}', 'CoursesController@show');
         Route::get('courses/{semester}/{id}/students/{number}', 'StudentsController@show');
         Route::get('courses/{semester}/{id}/students/{number}/print_report', 'StudentsController@printStudentReport');
         Route::get('activities/{id}', 'ActivitiesController@show');
-        Route::post('activities/{id}', array('before' => 'csrf', 'uses'=>'ActivitiesController@create'));
+        Route::post('activities/{id}', array('before' => 'csrf', 'uses' => 'ActivitiesController@create'));
         Route::get('students', 'StudentsController@students');
         Route::get('program', 'ProfessorsController@program');
         Route::get('personal-information', 'ProfessorsController@personalInformation');
         Route::get('manual', 'ProfessorsController@manual');
-        Route::post('loadRubric', array('before' => 'csrf', 'uses'=>'RubricsController@fetch'));
-        Route::post('saveRubric', array('before' => 'csrf', 'uses'=>'RubricsController@create'));
-        Route::post('updateRubric', array('before' => 'csrf', 'uses'=>'RubricsController@update'));
-        Route::post('deleteRubric', array('before' => 'csrf', 'uses'=>'RubricsController@destroy'));
+        Route::post('loadRubric', array('before' => 'csrf', 'uses' => 'RubricsController@fetch'));
+        Route::post('saveRubric', array('before' => 'csrf', 'uses' => 'RubricsController@create'));
+        Route::post('updateRubric', array('before' => 'csrf', 'uses' => 'RubricsController@update'));
+        Route::post('deleteRubric', array('before' => 'csrf', 'uses' => 'RubricsController@destroy'));
         Route::get('learning-outcomes-criteria', 'CriteriaController@index');
         Route::get('export_grades/{id}', 'CoursesController@exportGrades');
 
@@ -399,8 +393,5 @@ Route::group(array('before' => 'auth|has_access'), function()
         Route::get('professor-assessment-reports', 'OutcomesController@professorAssessmentReports');
 
         Route::get('general-studies-overview', 'ProfessorsController@generalStudiesOverview');
-
-
     });
-
 });

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

@@ -8,6 +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('CriteriaController@edit', 'Criteria') }}</li>
           <li>{{ HTML::linkAction('OutcomesController@index', 'Learning Outcomes') }}</li>
           <li>{{ HTML::linkAction('TemplatesController@newTemplate', 'Rubric Builder') }}</li>
@@ -21,7 +22,7 @@
         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Colleges and Schools<span class="caret"></span></a>
         <ul class="dropdown-menu" role="menu">
           @foreach ($schools as $school)
-            <li>{{ HTML::linkAction('SchoolsController@show', $school->name, array($school->id)) }}</li>
+          <li>{{ HTML::linkAction('SchoolsController@show', $school->name, array($school->id)) }}</li>
           @endforeach
         </ul>
       </li>
@@ -31,9 +32,9 @@
       <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
@@ -41,37 +42,38 @@
       <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', 'Campus Reports') }}</li>
-            @if(count(Auth::user()->courses))
-              <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReports', 'My Courses\' Reports') }}</li>
-            @endif
+          <li>{{ HTML::linkAction('OutcomesController@managerAssessmentReports', 'Campus 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>
       <li class="dropdown">
         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">NEW<span class="caret"></span></a>
         <ul class="dropdown-menu" role="menu">
           <li>{{ HTML::linkAction('OutcomesController@newIndex', 'New Index') }}</li>
-{{--          <li>{{ HTML::linkAction('AuthController@logout', 'Log out ('.Auth::user()->email.')') }}</li>--}}
-        </ul>
-      </li>
+          {{-- <li>{{ HTML::linkAction('AuthController@logout', 'Log out ('.Auth::user()->email.')') }}
+      </li>--}}
+    </ul>
+    </li>
     </ul>
   </div>
-</div>
+</div>

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

@@ -0,0 +1,420 @@
+@extends('layouts.master')
+
+@section('navigation')
+@include('local.managers.admins._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[0]', $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[" + i.toString() + "]",
+                        '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() {
+
+        counterAssoc += 1;
+        var $select = $('<select />', {
+            'class': "selectpicker form-control",
+            'name': "assoc_outcome[" + counterAssoc.toString() + "]",
+            '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;
+
+
+
+    }
+</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

bootstrap/start.php

@@ -26,7 +26,7 @@ $app = new Illuminate\Foundation\Application;
 
 $env = $app->detectEnvironment(array(
 
-	'local' => array(gethostname(), 'ubuntu', 'RPV20111.rrp.campus', 'homestead'),
+	'local' => array(gethostname(), 'RPV20111.rrp.campus', 'homestead'),
     'production' => array('*.com', '*.edu', '*.org'),
 
 ));

public/.htaccess

@@ -12,4 +12,5 @@
     RewriteCond %{REQUEST_FILENAME} !-d
     RewriteCond %{REQUEST_FILENAME} !-f
     RewriteRule ^ index.php [L]
+
 </IfModule>