-Deleted code that was commented.
-Change the order of function definition in the controller.
-Fixed the use of clean input and validator in the controller.

.gitignore

@@ -8,3 +8,5 @@ composer.lock
 Thumbs.db
 app/database/csv/*
 app/config/local/*
+app/config/app.php
+app/config/database.php

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' =>  'http://localhost',
 
 	/*
 	|--------------------------------------------------------------------------
@@ -124,6 +125,7 @@ return array(
 		'Illuminate\Workbench\WorkbenchServiceProvider',
 		'Way\Generators\GeneratorsServiceProvider',
 		'Barryvdh\DomPDF\ServiceProvider',
+		// 'Cornford\Backup\Providers\BackupServiceProvider',
 		'Zizaco\Entrust\EntrustServiceProvider'
 
 	),
@@ -139,7 +141,7 @@ return array(
 	|
 	*/
 
-	'manifest' => storage_path().'/meta',
+	'manifest' => storage_path() . '/meta',
 
 	/*
 	|--------------------------------------------------------------------------
@@ -157,6 +159,7 @@ return array(
 		'App'               => 'Illuminate\Support\Facades\App',
 		'Artisan'           => 'Illuminate\Support\Facades\Artisan',
 		'Auth'              => 'Illuminate\Support\Facades\Auth',
+		//'Backup'	        => 'Cornford\Backup\Facades\Backup',
 		'Blade'             => 'Illuminate\Support\Facades\Blade',
 		'Cache'             => 'Illuminate\Support\Facades\Cache',
 		'ClassLoader'       => 'Illuminate\Support\ClassLoader',
@@ -193,7 +196,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/config/packages/cornford/backup/config.php

@@ -0,0 +1,73 @@
+<?php
+
+return array(
+
+	/*
+	|--------------------------------------------------------------------------
+	| Enable Backup
+	|--------------------------------------------------------------------------
+	|
+	| Enable database backup.
+	|
+	*/
+	'enabled' => true,
+
+	/*
+	|--------------------------------------------------------------------------
+	| Path
+	|--------------------------------------------------------------------------
+	|
+	| A database backup path, absolute path, or path relative from public
+	| directory, a trailing slash is required.
+	|
+	*/
+	'path' => '../app/storage/backup/',
+
+	/*
+	|--------------------------------------------------------------------------
+	| Filename
+	|--------------------------------------------------------------------------
+	|
+	| A database export filename to use when exporting databases.
+	|
+	*/
+	'filename' => 'backup-' . date('Ymd-His'),
+
+	/*
+	|--------------------------------------------------------------------------
+	| Enable Compression
+	|--------------------------------------------------------------------------
+	|
+	| Enable backup compression using gzip. Requires gzencode/gzdecode.
+	|
+	*/
+	'compress' => true,
+
+	/*
+	|--------------------------------------------------------------------------
+	| Database Engine Processors
+	|--------------------------------------------------------------------------
+	|
+	| Set the database engines processor location, trailing slash is required.
+	|
+	*/
+	'processors' => array(
+		'mysql' => array(
+			'export' => '/usr/bin/',
+			'restore' => '/usr/bin/'
+		),
+		'pqsql' => array(
+			'export' => '/usr/bin/',
+			'restore' => '/usr/bin/'
+		),
+		'sqlite' => array(
+			'export' => null,
+			'restore' => null
+		),
+		'sqlsrv' => array(
+			'export' => '/usr/bin/',
+			'restore' => '/usr/bin/'
+		),
+	),
+
+);

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,27 +114,25 @@ 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
         $course = Course::where('id', '=', $activity->course_id)->firstOrFail();
 
         // If activity does not belong to the requesting user, display 403
-        if ($course->user_id != Auth::id())
+        if ($course->user_id != Auth::id() and Auth::user()->role==4)
             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/AdministratorsController.php

@@ -1,207 +1,306 @@
 <?php
 
 class AdministratorsController extends \BaseController
-{
+{	
+	private function outcomes_semesters($selected_semesters, $level)
+	{
+		$min_start="9000-01-01 00:00:00";
+		$max_end="1000-01-01 00:00:00";
+		foreach($selected_semesters as $semester)
+		{
+			if($min_start>$semester->start)
+			{
+				$min_start=$semester->start;
+			}
+			if($max_end<$semester->end)
+			{
+				$max_end=$semester->end;
+			}
+		}
+		$outcomes = Outcome::where(function($query) use ($min_start)
+								   {
+										$query->where('deactivation_date', '>=', $min_start)
+											  ->orWhere('deactivation_date', null);
+								   })
+							->where('activation_date', '<=', $max_end)
+							->where(function($query2) use ($level)
+									{
+										$query2->where("level", $level+1)
+											   ->orWhere("level",3);
+									})
+							->orderBy('name', 'ASC')
+							->get();
+        $outcomeCount = Outcome::where(function($query) use ($min_start)
+									   {
+											$query->where('deactivation_date', '>=', $min_start)
+												  ->orWhere('deactivation_date', null);
+										})
+							->where('activation_date', '<=', $max_end)
+							->where(function($query2) use ($level)
+										{
+											$query2->where("level",$level+1)
+												   ->orWhere("level",3);
+										})
+								->count();
+	
+		foreach($outcomes as $outcome)
+		{
+			
+// 		var_dump($outcome->id);
+// 		print "<br>";
+			$outcomes_attempted[$outcome->id]=$outcome->attempted($selected_semesters, $level);
+			$outcomes_achieved[$outcome->id]=$outcome->achieved($selected_semesters, $level);	
+		}
+
+        $uhs_school_id = School::where('name', 'LIKE', '%UHS%')->first()->id;
+        $uhs_program_id = Program::where('name', 'LIKE', '%UHS%')->first()->id;
+
+        foreach ($outcomes as $outcome)
+        {
+			$achievedProgramsPerOutcome[$outcome->id]=0;         // For each program with courses that do assessment
+			$attemptedProgramsPerOutcome[$outcome->id]=0;         // For each program with courses that do assessment
+            foreach (Program::with(array('courses' => function($query){
+//                 $query->whereNotNull('outcomes_attempted');
+                $query->where('code', '!=', 'TEST');
+                $query->whereIn('semester_id', Session::get('semesters_ids'));
+            }))->where('is_graduate', $level)->where('school_id', '!=', $uhs_school_id)->orderBy('name', 'asc')->get() as $program)
+            {
+				$achieved_outcomes_per_program[$program->id]=0;
+				$attempted_outcomes_per_program[$program->id]=0;
+            	$participating_programs[$program->id]=(object)array('id'=>$program->id, 'name'=>$program->name, 'is_graduate'=> $program->is_graduate, 'school_id'=>$program->school_id);
+
+// 				SELECT ac.id activity_criterion_id, ac.activity_id, ac.expected_student_score, ac.expected_percentage_students_achieving, co.program_id FROM activity_criterion ac, new_criteria c, activities a, objectives o, courses co where co.id=a.course_id and co.semester_id=13 and a.id=ac.activity_id and c.id = ac.criterion_id and o.id=c.objective_id and o.outcome_id = 2 order by program_id
+				$program_attempted_outcome=$program->attempted_outcome($outcome->id, $selected_semesters);
+				$attempted_outcomes_per_program[$program->id]+=$program_attempted_outcome;
+// 				var_dump($program_attempted_outcome);
+// 				exit();
+				if($program_attempted_outcome)
+				{
+					$program_achieved_outcome=$program->achieved_outcome($outcome->id, $selected_semesters);
+					$achieved_outcomes_per_program[$program->id]+=$program_achieved_outcome;
+
+                    $attemptedProgramsPerOutcome[$outcome->id]+=$program_attempted_outcome;
+//                     $attemptedProgramsPerOutcome[$outcome->id]+=1;
+					$achievedProgramsPerOutcome[$outcome->id]+=$program_achieved_outcome;
+// 					$achieved_outcomes_per_program[$outcome->id]=$program->achieved_outcome($outcome->id, $selected_semesters);
+// 					if($attempted_outcomes_per_program[$outcome->id]!=0 && 100.0*$achieved_outcomes_per_program[$outcome->id]/$attempted_outcomes_per_program[$outcome->id] >= $outcome->expected_outcome)
+// 					{
+// 						$achievedProgramsPerOutcome[$outcome->id]+=1;
+// 						// $output[]= 'END OF PROGRAM: '.$program->name.'-'.json_encode($achievedProgramsPerOutcome);
+// 					}
+				}
+			}
+		}
+	
+		return array('outcomes'=>$outcomes,'outcomes_attempted'=>$outcomes_attempted, 'outcomes_achieved'=>$outcomes_achieved, 'attemptedProgramsPerOutcome'=>$attemptedProgramsPerOutcome, 'achievedProgramsPerOutcome'=>$achievedProgramsPerOutcome,'participating_programs'=>$participating_programs);
+	
+	
+	
+	}
     public function overview()
     {
+    
+        $selected_semesters = Semester::find(Session::get('semesters_ids'));
+        
+		$subgraduado=$this->outcomes_semesters($selected_semesters,0);
+        $outcomes_subgrad=$subgraduado['outcomes'];
+        $undergrad_outcomes_achieved=$subgraduado['outcomes_achieved']; 
+        $undergrad_outcomes_attempted=$subgraduado['outcomes_attempted']; 
+        $attemptedUndergradProgramsPerOutcome=$subgraduado['attemptedProgramsPerOutcome']; 
+        $achievedUndergradProgramsPerOutcome=$subgraduado['achievedProgramsPerOutcome']; 
+        $participating_undergrad_programs=$subgraduado['participating_programs']; 
+		
+		
+		$graduado=$this->outcomes_semesters($selected_semesters,1);
+        $outcomes_grad=$graduado['outcomes'];
+        $grad_outcomes_achieved=$graduado['outcomes_achieved']; 
+        $grad_outcomes_attempted=$graduado['outcomes_attempted']; 
+        $attemptedGradProgramsPerOutcome=$graduado['attemptedProgramsPerOutcome']; 
+        $achievedGradProgramsPerOutcome=$graduado['achievedProgramsPerOutcome']; 
+        $participating_grad_programs=$graduado['participating_programs']; 
+		
         //Total amount of learning outcomes
-        $outcomeCount = Outcome::withTrashed()->count();
-
+//         $outcomeCount = Outcome::withTrashed()->count();
+//         $selected_semester = Semester::find(Session::get('semesters_ids')[0]);
+//         $outcomes_subgrad = Outcome::where(function($query) use ($selected_semester)
+//         								   {
+// 												$query->where('deactivation_date', '>=', $selected_semester->start)
+// 													  ->orWhere('deactivation_date', null);
+//         								   })
+//         							->where('activation_date', '<=', $selected_semester->end)
+//         							->where(function($query2)
+//         								    {
+// 												$query2->where("level",1)
+// 													   ->orWhere("level",3);
+//         									})
+//         							->orderBy('name', 'ASC')
+//         							->get();
+//         $outcomeCount_subgrad = Outcome::where(function($query) use ($selected_semester)
+//         									   {
+//         									   		$query->where('deactivation_date', '>=', $selected_semester->start)
+//         									   			  ->orWhere('deactivation_date', null);
+//         									   	})
+//            							->where('activation_date', '<=', $selected_semester->end)
+//      								->where(function($query2)
+//         									    {
+//         									    	$query2->where("level",1)
+//         									    		   ->orWhere("level",3);
+//         									    })
+//         								->count();
+// 
+//         $outcomes_grad = Outcome::where(function($query) use ($selected_semester){$query->where('deactivation_date', '>=', $selected_semester->start)->orWhere('deactivation_date', null);})->where(function($query2){$query2->where("level",2)->orWhere("level",3);})->orderBy('name', 'ASC')->get();
+//         $outcomeCount_grad = Outcome::where(function($query) use ($selected_semester){$query->where('deactivation_date', '>=', $selected_semester->start)->orWhere('deactivation_date', null);})->where(function($query2){$query2->where("level",2)->orWhere("level",3);})->count();
+
+// 		print($outcomeCount_subgrad);
+// 		print($outcomeCount_grad);
         // Id for excluding UHS from records
         $uhs_school_id = School::where('name', 'LIKE', '%UHS%')->first()->id;
-        $uhs_program_id = Program::where('name', 'LIKE', '%UHS%')->first()->id;
+//         $uhs_program_id = Program::where('name', 'LIKE', '%UHS%')->first()->id;
 
         $schools = School::where('id', '!=', $uhs_school_id)->orderBy('name', 'asc')->get();
         $title = 'Campus Overview';
-        $outcomes = Outcome::withTrashed()->select('id', 'name', 'expected_outcome')->orderBy('name', 'asc')->get();
-
-        $undergrad_outcomes_achieved = array_fill(1, $outcomeCount, 0);
-        $undergrad_outcomes_attempted = array_fill(1, $outcomeCount, 0);
-        $grad_outcomes_achieved = array_fill(1, $outcomeCount, 0);
-        $grad_outcomes_attempted = array_fill(1, $outcomeCount, 0);
-
+        
+        
         /**
-         * Calculate campus wide outcome performance
+         * Calculate campus wide outcome performance by counting the number of students
+         $undergrad_outcomes_attempted will have the number of criteria that was assessed in undergradute courses during the selected semester 
+         $undergrad_outcomes_achieved will have the number of criteria that was assessed in undergradute courses  during the selected semester 
+            where the percentage of students that obtained a better or equal score than the expected_student_score established in the
+            activity_criterion table is greater or equal than the expected_percentage_students_achieving also established in the
+            activity_criterion table         
          */
 
-        // Calculate campus wide outcome performance for undergrad and grad
-        foreach (Course::with('program')
-            ->where('program_id', '!=', $uhs_program_id)
-            ->where('code', '!=', 'TEST')
-            ->whereNotNull('outcomes_achieved')
-            ->whereIn('semester_id', Session::get('semesters_ids'))->get() as $course)
-        {
-            if(!$course->program->is_graduate)
-            {
-                $course_outcomes_achieved =json_decode($course->outcomes_achieved, true);
-                $course_outcomes_attempted =json_decode($course->outcomes_attempted, true);
-                for($i=1; $i<=count($undergrad_outcomes_attempted); $i++)
-                {
-
-                    $undergrad_outcomes_achieved[$i]+=$course_outcomes_achieved[$i];
-                    $undergrad_outcomes_attempted[$i]+=$course_outcomes_attempted[$i];
-                }
-            }
-            else
-            {
-                $course_outcomes_achieved =json_decode($course->outcomes_achieved, true);
-                $course_outcomes_attempted =json_decode($course->outcomes_attempted, true);
-                for($i=1; $i<=count($grad_outcomes_attempted); $i++)
-                {
-
-                    $grad_outcomes_achieved[$i]+=$course_outcomes_achieved[$i];
-                    $grad_outcomes_attempted[$i]+=$course_outcomes_attempted[$i];
-                }
-            }
-
-        }
+// 		foreach($outcomes_subgrad as $outcome)
+// 		{
+// 			$undergrad_outcomes_attempted[$outcome->id]=$outcome->attempted($selected_semester->id,0);
+// 			$undergrad_outcomes_achieved[$outcome->id]=$outcome->achieved($selected_semester->id,0);	
+// 		}
+// 		var_dump($undergrad_outcomes_attempted);
+// 		print"<br>";
+// 		var_dump($undergrad_outcomes_achieved);
+// 		print"<br>";
+// 		foreach($outcomes_grad as $outcome)
+// 		{
+// 			$grad_outcomes_attempted[$outcome->id]=$outcome->attempted($selected_semester->id,1);
+// 			$grad_outcomes_achieved[$outcome->id]=$outcome->achieved($selected_semester->id,1);			
+// 		}
 
         /**
          * Calculate how many programs achieved and attempted each outcome
          */
 
         // Number of programs that achieved a particular learning outcome
-        $achievedUndergradProgramsPerOutcome = array_fill(1, $outcomeCount, 0);
+//         $achievedUndergradProgramsPerOutcome = array_fill(1, $outcomeCount_subgrad, 0);
 
         // Number of programs that attempted a particular learning outcome
-        $attemptedUndergradProgramsPerOutcome = array_fill(1, $outcomeCount, 0);
+//         $attemptedUndergradProgramsPerOutcome = array_fill(1, $outcomeCount_subgrad, 0);
 
         // Names of programs doing assessment
         // Fetch programs with participation
-        $participating_undergrad_programs = DB::table('VIEW_participating_programs')
-            ->whereIn('semester_id', Session::get('semesters_ids'))
-            ->where('is_graduate', 0)
-            ->groupBy('id')
-            ->orderBy('name', 'asc')
-            ->get();
-
-        $output = array();
-
-
-        // For each outcome
-        foreach ($outcomes as $outcome)
-        {
-            // For each program with courses that do assessment
-            foreach (Program::with(array('courses' => function($query){
-                $query->whereNotNull('outcomes_attempted');
-                $query->where('code', '!=', 'TEST');
-                $query->whereIn('semester_id', Session::get('semesters_ids'));
-            }))->where('is_graduate', 0)->orderBy('name', 'asc')->get() as $program)
-            {
-                // To acummulate all criteria for one program
-                $achieved_outcomes_per_undergrad_program = array_fill(1, $outcomeCount, 0);
-                $attempted_outcomes_per_undergrad_program = array_fill(1, $outcomeCount, 0);
-
-                //Flag for counting programs
-                $flag =false;
-
-                // For each course in the program
-                foreach ($program->courses as $course)
-                {
-                    // If the outcome in question is being evaluated
-                    $course_outcomes_attempted2 = json_decode($course->outcomes_attempted, true);
-                    $course_outcomes_achieved2 = json_decode($course->outcomes_achieved, true);
-                    if(array_key_exists($outcome->id, $course_outcomes_attempted2 )
-                        && $course_outcomes_attempted2[$outcome->id]>0)
-                    {
-                        $achieved_outcomes_per_undergrad_program[$outcome->id]+=$course_outcomes_achieved2[$outcome->id];
-                        $attempted_outcomes_per_undergrad_program[$outcome->id]+=$course_outcomes_attempted2[$outcome->id];
-
-
-                        // Add one to the programs assessing, if it wasn't added before
-                        if(!$flag)
-                        {
-                            $attemptedUndergradProgramsPerOutcome[$outcome->id]+=1;
-                            $flag= true;
-                        }
-                    }
-
-                    // $output[] = 'ACHIEVED: '.$program->name.'-'.json_encode($achieved_outcomes_per_undergrad_program);
-                    // $output[] = 'ATTEMPTED: '.$program->name.'-'.json_encode($attempted_outcomes_per_undergrad_program);
-
-                }
-                //If the accumulated achieved criteria for a specific outcome in a program divided by the accumulated attempted criteria for a specific outcome in a program is greated than the expected outcome
-                if($attempted_outcomes_per_undergrad_program[$outcome->id]!=0 && (float)$achieved_outcomes_per_undergrad_program[$outcome->id]/$attempted_outcomes_per_undergrad_program[$outcome->id]*100 >= $outcome->expected_outcome)
-                {
-                    $achievedUndergradProgramsPerOutcome[$outcome->id]+=1;
-                    // $output[]= 'END OF PROGRAM: '.$program->name.'-'.json_encode($achievedUndergradProgramsPerOutcome);
-                }
-            }
-        }
-
+//         $participating_undergrad_programs = DB::table('VIEW_participating_programs')
+//             ->whereIn('semester_id', Session::get('semesters_ids'))
+//             ->where('is_graduate', 0)
+//             ->groupBy('id')
+//             ->orderBy('name', 'asc')
+//             ->get();
+//         $output = array();
 
         /**
-         * Calculate how many programs achieved and attempted each outcome
+         * Calculate how many undergrad programs achieved and attempted each outcome
+         */
+//         foreach ($outcomes_subgrad as $outcome)
+//         {
+//  			$achieved_outcomes_per_undergrad_program[$outcome->id]=0;
+// 			$attempted_outcomes_per_undergrad_program[$outcome->id]=0;
+// 			$achievedUndergradProgramsPerOutcome[$outcome->id]=0;         // For each program with courses that do assessment
+// 			$attemptedUndergradProgramsPerOutcome[$outcome->id]=0;         // For each program with courses that do assessment
+//             foreach (Program::with(array('courses' => function($query){
+// //                 $query->whereNotNull('outcomes_attempted');
+//                 $query->where('code', '!=', 'TEST');
+//                 $query->whereIn('semester_id', Session::get('semesters_ids'));
+//             }))->where('is_graduate', 0)->where('school_id', '!=', $uhs_school_id)->orderBy('name', 'asc')->get() as $program)
+//             {
+//             	$participating_undergrad_programs[$program->id]=(object)array('id'=>$program->id, 'name'=>$program->name, 'is_graduate'=> $program->is_graduate, 'school_id'=>$program->school_id,'semestre_id',$selected_semester);
+// 
+// // 				SELECT ac.id activity_criterion_id, ac.activity_id, ac.expected_student_score, ac.expected_percentage_students_achieving, co.program_id FROM activity_criterion ac, new_criteria c, activities a, objectives o, courses co where co.id=a.course_id and co.semester_id=13 and a.id=ac.activity_id and c.id = ac.criterion_id and o.id=c.objective_id and o.outcome_id = 2 order by program_id
+// 				$program_attempted_outcome=$program->attempted_outcome($outcome->id, $selected_semester->id);
+// 				$attempted_outcomes_per_undergrad_program[$outcome->id]+=$program_attempted_outcome;
+// // 				var_dump($program_attempted_outcome);
+// // 				exit();
+// 				if($program_attempted_outcome)
+// 				{
+//                     $attemptedUndergradProgramsPerOutcome[$outcome->id]+=1;
+// 					$achieved_outcomes_per_undergrad_program[$outcome->id]=$program->achieved_outcome($outcome->id, $selected_semester->id);
+// 					if($attempted_outcomes_per_undergrad_program[$outcome->id]!=0 && 100.0*$achieved_outcomes_per_undergrad_program[$outcome->id]/$attempted_outcomes_per_undergrad_program[$outcome->id] >= $outcome->expected_outcome)
+// 					{
+// 						$achievedUndergradProgramsPerOutcome[$outcome->id]+=1;
+// 						// $output[]= 'END OF PROGRAM: '.$program->name.'-'.json_encode($achievedUndergradProgramsPerOutcome);
+// 					}
+// 				}
+// 			}
+// 		}
+// 		var_dump($attempted_outcomes_per_undergrad_program);
+// 		print"<br>";
+// 		var_dump($achieved_outcomes_per_undergrad_program);
+// 		print"<br>";
+// 		var_dump($attemptedUndergradProgramsPerOutcome);
+// 		print"<br>";
+// 		var_dump($achievedUndergradProgramsPerOutcome);
+// 		print"<br>";
+// 		exit();
+        /**
+         * Calculate how many grad programs achieved and attempted each outcome
+         $grad_outcomes_attempted will have the number of criteria that was assessed in gradute courses during the selected semester 
+         $grad_outcomes_achieved will have the number of criteria that was assessed in gradute courses  during the selected semester 
+            where the percentage of students that obtained a better or equal score than the expected_student_score established in the
+            activity_criterion table is greater or equal than the expected_percentage_students_achieving also established in the
+            activity_criterion table         
          */
 
-        // Number of programs that achieved a particular learning outcome
-        $achievedGradProgramsPerOutcome = array_fill(1, $outcomeCount, 0);
-
-        // Number of programs that attempted a particular learning outcome
-        $attemptedGradProgramsPerOutcome = array_fill(1, $outcomeCount, 0);
 
         // Names of programs doing assessment
-        $participating_grad_programs = DB::table('VIEW_participating_programs')
-            ->whereIn('semester_id', Session::get('semesters_ids'))
-            ->where('is_graduate', 1)
-            ->groupBy('id')
-            ->orderBy('name', 'asc')
-            ->get();
-
-        $output = array();
-
-
-        // For each outcome
-        foreach ($outcomes as $outcome)
-        {
-            // For each program with courses that do assessment
-            foreach (Program::with(array('courses' => function($query){
-                $query->whereNotNull('outcomes_attempted');
-                $query->where('code', '!=', 'TEST');
-                $query->whereIn('semester_id', Session::get('semesters_ids'));
-            }))->where('is_graduate', 1)->orderBy('name', 'asc')->get() as $program)
-            {
-                // To acummulate all criteria for one program
-                $achieved_outcomes_per_grad_program = array_fill(1, $outcomeCount, 0);
-                $attempted_outcomes_per_grad_program = array_fill(1, $outcomeCount, 0);
-
-                //Flag for counting programs
-                $flag =false;
-
-                // For each course in the program
-                foreach ($program->courses as $course)
-                {
-                    // If the outcome in question is being evaluated
-                    $course_outcomes_attempted2 = json_decode($course->outcomes_attempted, true);
-                    $course_outcomes_achieved2 = json_decode($course->outcomes_achieved, true);
-                    if(array_key_exists($outcome->id, $course_outcomes_attempted2 )
-                        && $course_outcomes_attempted2[$outcome->id]>0)
-                    {
-                        $achieved_outcomes_per_grad_program[$outcome->id]+=$course_outcomes_achieved2[$outcome->id];
-                        $attempted_outcomes_per_grad_program[$outcome->id]+=$course_outcomes_attempted2[$outcome->id];
-
-
-                        // Add one to the programs assessing, if it wasn't added before
-                        if(!$flag)
-                        {
-                            $attemptedGradProgramsPerOutcome[$outcome->id]+=1;
-                            $flag= true;
-                        }
-                    }
-
-                    // $output[] = 'ACHIEVED: '.$program->name.'-'.json_encode($achieved_outcomes_per_grad_program);
-                    // $output[] = 'ATTEMPTED: '.$program->name.'-'.json_encode($attempted_outcomes_per_grad_program);
-
-                }
-                //If the accumulated achieved criteria for a specific outcome in a program divided by the accumulated attempted criteria for a specific outcome in a program is greated than the expected outcome
-                if($attempted_outcomes_per_grad_program[$outcome->id]!=0 && (float)$achieved_outcomes_per_grad_program[$outcome->id]/$attempted_outcomes_per_grad_program[$outcome->id]*100 >= $outcome->expected_outcome)
-                {
-                    $achievedGradProgramsPerOutcome[$outcome->id]+=1;
-                    // $output[]= 'END OF PROGRAM: '.$program->name.'-'.json_encode($achievedGradProgramsPerOutcome);
-                }
-            }
-        }
-
-        return View::make('local.managers.admins.overview', compact('title', 'schools', 'outcomes', 'undergrad_outcomes_achieved', 'undergrad_outcomes_attempted', 'grad_outcomes_achieved', 'grad_outcomes_attempted', 'attemptedUndergradProgramsPerOutcome', 'participating_undergrad_programs', 'achievedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'participating_grad_programs', 'achievedGradProgramsPerOutcome'));
+//         $participating_grad_programs = DB::table('VIEW_participating_programs')
+//             ->whereIn('semester_id', Session::get('semesters_ids'))
+//             ->where('is_graduate', 1)
+//             ->groupBy('id')
+//             ->orderBy('name', 'asc')
+//             ->get();
+
+
+//         foreach ($outcomes_grad as $outcome)
+//         {
+//  			$achieved_outcomes_per_grad_program[$outcome->id]=0;
+// 			$attempted_outcomes_per_grad_program[$outcome->id]=0;
+// 			$achievedGradProgramsPerOutcome[$outcome->id]=0;         // For each program with courses that do assessment
+// 			$attemptedGradProgramsPerOutcome[$outcome->id]=0;         // For each program with courses that do assessment
+//             foreach (Program::with(array('courses' => function($query){
+//                 $query->whereNotNull('outcomes_attempted');
+//                 $query->where('code', '!=', 'TEST');
+//                 $query->whereIn('semester_id', Session::get('semesters_ids'));
+//             }))->where('is_graduate', 1)->where('school_id', '!=', $uhs_school_id)->orderBy('name', 'asc')->get() as $program)
+//             {
+//             	$participating_grad_programs[$program->id]=(object)array('id'=>$program->id, 'name'=>$program->name, 'is_graduate'=> $program->is_graduate, 'school_id'=>$program->school_id,'semestre_id',$selected_semester);
+// // 				SELECT ac.id activity_criterion_id, ac.activity_id, ac.expected_student_score, ac.expected_percentage_students_achieving, co.program_id FROM activity_criterion ac, new_criteria c, activities a, objectives o, courses co where co.id=a.course_id and co.semester_id=13 and a.id=ac.activity_id and c.id = ac.criterion_id and o.id=c.objective_id and o.outcome_id = 2 order by program_id
+// 				$program_attempted_outcome=$program->attempted_outcome($outcome->id, $selected_semester->id);
+// 				$attempted_outcomes_per_grad_program[$outcome->id]+=$program_attempted_outcome;
+// // 				var_dump($attempted_outcomes_per_undergrad_program);
+// // 				exit();
+// 				if($program_attempted_outcome)
+// 				{
+//                     $attemptedGradProgramsPerOutcome[$outcome->id]+=1;
+// 					$achieved_outcomes_per_grad_program[$outcome->id]=$program->achieved_outcome($outcome->id, $selected_semester->id);
+// 					if($attempted_outcomes_per_grad_program[$outcome->id]!=0 && (float)$achieved_outcomes_per_grad_program[$outcome->id]/$attempted_outcomes_per_grad_program[$outcome->id]*100 >= $outcome->expected_outcome)
+// 					{
+// 						$achievedGradProgramsPerOutcome[$outcome->id]+=1;
+// 						// $output[]= 'END OF PROGRAM: '.$program->name.'-'.json_encode($achievedUndergradProgramsPerOutcome);
+// 					}
+// 				}
+// 			}
+// 		}
+// 		var_dump($grad_outcomes_attempted);
+// 		print("<br>");
+// 		var_dump($grad_outcomes_achieved);
+// 		exit();
+        return View::make('local.managers.admins.overview', compact('title', 'schools', 'outcomes_subgrad', 'outcomes_grad', 'undergrad_outcomes_achieved', 'undergrad_outcomes_attempted', 'grad_outcomes_achieved', 'grad_outcomes_attempted', 'attemptedUndergradProgramsPerOutcome', 'participating_undergrad_programs', 'achievedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'participating_grad_programs', 'achievedGradProgramsPerOutcome'));
     }
 }

app/controllers/CoursesController.php

@@ -77,9 +77,25 @@ CoursesController extends \BaseController {
 		$activities = $course->activities;
 		$students = $course->students;
 
-		$outcomes = Outcome::orderBy('name', 'asc')->get();
-		$outcomes_achieved = json_decode($course->outcomes_achieved, true);
-        $outcomes_attempted = json_decode($course->outcomes_attempted, true);
+		$level=DB::table('courses')
+			->join('programs','programs.id','=','courses.program_id')
+			->where('courses.id', $id)
+        	->select('programs.is_graduate')
+        	->first();
+
+		$outcomes = Outcome::active_by_semesters(array($course->semester),$level->is_graduate);
+// 		$outcomeCount = count((array)$outcomes);
+		
+		$course = Course::where('id', $id)->first();
+		foreach($outcomes as $outcome)
+		{
+			$outcomes_attempted[$outcome->id]=$outcome->courses_attempted(array($course));
+			$outcomes_achieved[$outcome->id]=$outcome->courses_achieved(array($course));
+		}
+
+// 		$outcomes = Outcome::orderBy('name', 'asc')->get();
+// 		$outcomes_achieved = json_decode($course->outcomes_achieved, true);
+//         $outcomes_attempted = json_decode($course->outcomes_attempted, true);
 
         $schools = School::all();
 
@@ -104,44 +120,77 @@ CoursesController extends \BaseController {
 	{
         $title=$code.$number.' ('.$semester_code.')';
         $semester = Semester::where('code', $semester_code)->first();
+//         $selected_semesters = Semester::find(Session::get('semesters_ids'));
         $role = Auth::user()->role;
-
+		$level=DB::table('courses')
+			->join('programs','programs.id','=','courses.program_id')
+			->where('courses.code', $code)
+        	->where('courses.number', $number)
+        	->where('courses.semester_id', $semester->id)
+        	->select('programs.is_graduate')
+        	->first();
+//         var_dump($level);
+//         exit();
         $grouped_courses = Course::
         	where('code', $code)
         	->where('number', $number)
         	->where('semester_id', $semester->id)
         	->groupBy(array('code', 'number'))->get();
 
-        $outcomes = Outcome::orderBy('name', 'asc')->get();
-        $outcomeCount = Outcome::all()->count();
-
+//         $outcomes = Outcome::orderBy('name', 'asc')->get();
+//         $outcomeCount = Outcome::all()->count();
+		$outcomes = Outcome::active_by_semesters(array($semester),$level->is_graduate);
+		$outcomeCount = count((array)$outcomes);
+		
+		foreach($outcomes as $outcome)
+		{
+			$outcomes_attempted[$outcome->id]=$outcome->courses_attempted($grouped_courses);
+			$outcomes_achieved[$outcome->id]=$outcome->courses_achieved($grouped_courses);
+		}
+		
+		var_dump($outcomes_attempted);
+		print "<br>";
+		var_dump($outcomes_achieved);
+		print "<br>";
         foreach ($grouped_courses as $index => $grouped_course)
         {
-            // Blank outcomes for one course
-            $outcomes_achieved = array_fill(1, $outcomeCount, 0);
-            $outcomes_attempted = array_fill(1, $outcomeCount, 0);
-
-            // Find sections for this course
+//             // Blank outcomes for one course
+//             $outcomes_achieved = array_fill(1, $outcomeCount, 0);
+//             $outcomes_attempted = array_fill(1, $outcomeCount, 0);
+// 
+//             // Find sections for this course
             $sections = Course::
             	where('code', $grouped_course->code)
             	->where('number', $grouped_course->number)
             	->where('semester_id', $grouped_course->semester_id)
             	->get();
-
-            // For each of the sections, add the attempted and achieved criteria per outcome
-            foreach ($sections as $section)
-            {
-                if($section->outcomes_achieved!=NULL)
-                {
-                    $section_outcomes_achieved =json_decode($section->outcomes_achieved, true);
-                    $section_outcomes_attempted =json_decode($section->outcomes_attempted, true);
-                    for($i=1; $i<=count($outcomes_attempted); $i++)
-                    {
-                        $outcomes_achieved[$i]+=$section_outcomes_achieved[$i];
-                        $outcomes_attempted[$i]+=$section_outcomes_attempted[$i];
-                    }
-                }
-            }
+// 
+//             // For each of the sections, add the attempted and achieved criteria per outcome
+//             foreach ($sections as $section)
+//             {
+//                 if($section->outcomes_achieved!=NULL)
+//                 {
+//                     $section_outcomes_achieved =count($section->outcomes_attempted());
+// //                     var_dump($section_outcomes_achieved);
+// //                     exit();
+//                     $section_outcomes_attempted =count($section->outcomes_achieved());
+// //                     $section_outcomes_achieved =json_decode($section->outcomes_achieved, true);
+// //                     $section_outcomes_attempted =json_decode($section->outcomes_attempted, true);
+// 					foreach($outcomes as $outcome)
+// 					{
+// 						if(!isset($outcomes_achieved[$outcome->id]))$outcomes_achieved[$outcome->id]=0;
+// 						if(!isset($outcomes_attempted[$outcome->id]))$outcomes_attempted[$outcome->id]=0;
+//                         $outcomes_achieved[$outcome->id]+=$section_outcomes_achieved[$i];
+//                         $outcomes_attempted[$outcome->id]+=$section_outcomes_attempted[$i];					
+// 					
+// 					}
+// //                     for($i=1; $i<=count($outcomes_attempted); $i++)
+// //                     {
+// //                         $outcomes_achieved[$i]+=$section_outcomes_achieved[$i];
+// //                         $outcomes_attempted[$i]+=$section_outcomes_attempted[$i];
+// //                     }
+//                 }
+//             }
         }
 
         $section_ids = Course::

app/controllers/CriteriaController.php

@@ -1,47 +1,136 @@
 <?php
 
-class CriteriaController extends \BaseController {
+use Illuminate\Support\Facades\Input;
+
+class CriteriaController extends \BaseController
+{
 
     /**
      * Display a listing of the resource.
      *
+     *
      * @return Response
      */
+    public function editProgram()
+    {
+        $userProgram = Auth::user()['id'];
+
+        $userProgram = DB::select("select program_user.program_id from program_user where user_id = {$userProgram}");
+        Log::info($userProgram);
+        $title = "Criteria";
+        $outcomes = Outcome::orderBy('name', 'ASC')->lists('name', 'id');
+
+        $criteria = Criterion::withTrashed()->orderBy('name', 'ASC')->get();
+        $programs = Program::where("id", "=", $userProgram[0]->program_id)->get();
+        return View::make('local.managers.pCoords.criteria', compact('title', 'outcomes', 'schools', 'criteria', 'programs', 'objectives'));
+    }
+
+    public function editSchool()
+    {
+        $userSchool = Auth::user()['school_id'];
+        Log::info($userSchool);
+        $title = "Criteria";
+        $outcomes = Outcome::orderBy('name', 'ASC')->lists('name', 'id');
+
+        $schools = School::find($userSchool)->get();
+        $criteria = Criterion::withTrashed()->orderBy('name', 'ASC')->get();
+        $programs = Program::where("school_id", "=", $userSchool)->orderBy('name', 'ASC')->get();
+        $listOfId = array();
+        foreach ($programs as $program) {
+
+            $listOfId[] = $program->id;
+        }
+
+        $objectives = DB::table('objectives')->whereIn('program_id', $listOfId)->orderBy('text', 'ASC')->lists('text', 'id');
+
+
+
+
+
+        return View::make('local.managers.sCoords.criteria', compact('title', 'outcomes', 'schools', 'criteria', 'programs', 'objectives'));
+    }
+
+
     public function fetchCriterion()
     {
         return Criterion::find(Input::get('id'));
     }
+    public function fetchAllCriterion()
+    {
+        $program_id = Input::get('program_fetch');
+        $outcome_id = Input::get('outcome_fetch');
+        $json = array();
+        $json['criterion'] = DB::select("SELECT * FROM `new_criteria` where id in (select criterion_id from criterion_objective_outcome where outcome_id ={$outcome_id}) and id in(select criterion_id from program_criterion where program_id = {$program_id})");
+        return json_encode($json);
+    }
+    public function fetchObjectivesForSelect()
+    {
 
+        $json = array();
+        Log::info("GET COCKEd");
+        Log::info(Input::get('allOutcomes'));
+        foreach (Input::get('allOutcomes') as $id) {
+            $json['outcomes'][$id] = DB::select("select name from outcomes where id = {$id}");
+            $json['objectives'][$id] = DB::select("select objectives.id, objectives.text, outcomes.name from objectives, objective_outcome, outcomes where  objective_outcome.outcome_id ={$id} and objective_outcome.objective_id = objectives.id and objectives.active=1 and outcomes.id = objective_outcome.outcome_id");
+        }
+        Log::info(print_r($json, true));
+        return json_encode($json);
+    }
     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 order by outcomes.id", array(Input::get('id')));
+        $json['objectives'] = DB::select("SELECT DISTINCT objectives.id, objectives.text FROM objectives, criterion_objective_outcome where criterion_objective_outcome.criterion_id = ? and criterion_objective_outcome.objective_id= objectives.id ", array(Input::get('id')));
+        $json['objectives_outcome'] = DB::select("select objectives.id, objectives.text, objective_outcome.outcome_id from objective_outcome, objectives where objective_outcome.outcome_id in(select  DISTINCT outcomes.id from outcomes , criterion_objective_outcome where criterion_objective_outcome.criterion_id = ? and outcomes.id = criterion_objective_outcome.outcome_id) and objectives.id = objective_outcome.objective_id ORDER BY outcome_id", array(Input::get('id')));
+        $json['scales'] = DB::select("select title, description, min_score, max_score from scales, criterion_scale where criterion_scale.scale_id = scales.id and criterion_id = ?", array(Input::get('id')));
+        $json['program'] = DB::select("select criterion_id, program_id from program_criterion where criterion_id =?", array(Input::get('id')));
+        $json['activity_criterion'] = DB::select("select * from new_assessments where activity_criterion_id  in (select id from activity_criterion where criterion_id = ?)", array(Input::get('id')));
+
+        foreach ($json['outcomes'] as $id) {
+            $outId = $id->id;
+            $json['outcomes_assoc'][$outId] = DB::select("select name from outcomes where id = {$outId}");
+            $json['objectives_assoc'][$outId] = DB::select("select objectives.id, objectives.text, outcomes.name from objectives, objective_outcome, outcomes where  objective_outcome.outcome_id ={$outId} and objective_outcome.objective_id = objectives.id and objectives.active=1 and outcomes.id = objective_outcome.outcome_id");
+        }
+
+        return json_encode($json);
     }
 
+    public function delete()
+    {
+        DB::delete("delete from new_criteria where id = ?", array(Input::get('criterion_delete')));
+        $role = Auth::user()['role'];
+        switch ($role) {
+            case 1:
+                return Redirect::to('criteria')->withInput();
+
+            case 2:
+                return Redirect::to('school-criteria')->withInput();
 
+            case 3:
+                return Redirect::to('program-criteria')->withInput();
+        }
+    }
     public function isCriterionUnique($input, $existing_criterion = NULL)
     {
         // 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)
-            // ->where('description12', '=', $input['description12'])
-            // ->where('description34', '=', $input['description34'])
-            // ->where('description56', '=', $input['description56'])
-            // ->where('description78', '=', $input['description78'])
             ->first();
 
-    
 
-        if($saved_criterion)
+
+        if ($saved_criterion)
             return false;
         else
             return true;
@@ -56,28 +145,40 @@ 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['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['outcome_id'] = Input::get('outcome');
+
+
+
+        $clean_input['objective_id'] = Input::get('objective');
+
+
+
+
+        $clean_input['program_id'] = Input::get('program_id');
+
         $clean_input['copyright'] = trim(preg_replace('/\t+/', '', Input::get('copyright')));
         $clean_input['notes'] = trim(preg_replace('/\t+/', '', Input::get('notes')));
+        $clean_input['maximum_score'] =  (int) Input::get('maximum_score');
+        $clean_input['scale_title'] = Input::get('title');
+        $clean_input['scale_description'] = Input::get('Scales');
+        $clean_input['min_score'] = Input::get('min');
+        $clean_input['max_score'] = Input::get('max');
+
+        $clean_input['number_of_scales'] = sizeof($clean_input['scale_title']);
+
 
         return $clean_input;
     }
@@ -90,30 +191,20 @@ class CriteriaController extends \BaseController {
                 'name' => $clean_input['name'],
                 'subcriteria' => $clean_input['subcriteria'],
                 'outcome_id' => $clean_input['outcome_id'],
-                'description12' => $clean_input['description12'],
-                'description34' => $clean_input['description34'],
-                'description56' => $clean_input['description56'],
-                'description78' => $clean_input['description78'],
                 'notes' => $clean_input['notes'],
                 'copyright' => $clean_input['copyright'],
+                'maximum_score' => $clean_input['maximum_score']
             ),
             array(
                 'name' => 'required|string',
                 'subcriteria' => 'string',
-                'outcome_id' => 'required|numeric|integer',
-                'description12' => 'required|string',
-                'description34' => 'required|string',
-                'description56' => 'required|string',
-                'description78' => 'required|string',
+                'outcome_id' => 'required|array',
+
                 'notes' => 'string',
                 'copyright' => 'string',
-            ),
-            array(
-                'description12.required' => 'The Beginning (1-2) field is required.',
-                'description34.required' => 'The In Progress (3-4) field is required.',
-                'description56.required' => 'The Satisfactory (5-6) field is required.',
-                'description78.required' => 'The Excellent (7-8) field is required.',
+                'maximum_score' => 'required|integer'
             )
+
         );
     }
 
@@ -130,115 +221,232 @@ 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
-        {
+            $role = Auth::user()['role'];
+            switch ($role) {
+                case 1:
+                    return Redirect::to('criteria')->withInput();
+
+                case 2:
+                    return Redirect::to('school-criteria')->withInput();
+
+                case 3:
+                    return Redirect::to('program-criteria')->withInput();
+            }
+        } 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'];
 
-            if(Input::get('copyright'))
+
+            //gabriel añadió aqui
+
+            $criterion->number_of_scales = $clean_input['number_of_scales'];
+            $criterion->maximum_score = $clean_input['maximum_score'];
+
+            if (Input::get('copyright'))
                 $criterion->copyright = $clean_input['copyright'];
 
-            if(Input::get('notes'))
+            if (Input::get('notes'))
                 $criterion->notes = $clean_input['notes'];
 
-            // Set program
-            if(Input::get('program_id')!=0)
-                $criterion->program_id = $clean_input['program_id'];
-            else
-                $criterion->program_id = NULL;
 
 
             /** If criterion is saved, send success message */
-            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) {
+
+                        DB::insert("insert into `criterion_objective_outcome` (`objective_id`, `outcome_id`, `criterion_id`, `objective_outcome_id`) values ({$objective_id},{$outcome_id}, {$criterionId}, 0)");
+                    }
+                }
+
+                for ($i = 0; $i < sizeof($clean_input['scale_title']); $i++) {
+                    $scale = new Scale;
+                    $scale->title = $clean_input['scale_title'][$i];
+                    $scale->position = $i + 1;
+                    $scale->description = $clean_input['scale_description'][$i];
+                    $scale->min_score = $clean_input['min_score'][$i];
+                    $scale->max_score = $clean_input['max_score'][$i];
+
+                    if ($scale->save()) {
+                        DB::insert("insert into `criterion_scale` (`criterion_id`, `scale_id`) values({$criterionId},{$scale->id})");
+                    } else {
+                        Session::flash('status', 'danger');
+                        Session::flash('message', '<p>Error creating the Scales</p>');
+                        $role = Auth::user()['role'];
+                        switch ($role) {
+                            case 1:
+                                return Redirect::to('criteria')->withInput();
+
+                            case 2:
+                                return Redirect::to('school-criteria')->withInput();
+
+                            case 3:
+                                return Redirect::to('program-criteria')->withInput();
+                        }
+                    }
+                }
+
+                foreach ($clean_input['program_id'] as $program_id) {
+                    DB::insert("insert into `program_criterion` (`criterion_id`, `program_id`) values({$criterionId},{$program_id})");
+                }
+
                 Session::flash('status', 'success');
-                Session::flash('message', 'Criterion created: "'.$criterion->name.'".');
-                return Redirect::to('criteria')->withInput(Input::only('outcome_id'));
+                Session::flash('message', 'Criterion created: "' . $criterion->name . '".');
+                $role = Auth::user()['role'];
+                switch ($role) {
+                    case 1:
+                        return Redirect::to('criteria')->withInput();
+
+                    case 2:
+                        return Redirect::to('school-criteria')->withInput();
+
+                    case 3:
+                        return Redirect::to('program-criteria')->withInput();
+                }
             }
 
             /** 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();
+                $role = Auth::user()['role'];
+                switch ($role) {
+                    case 1:
+                        return Redirect::to('criteria')->withInput();
+
+                    case 2:
+                        return Redirect::to('school-criteria')->withInput();
+
+                    case 3:
+                        return Redirect::to('program-criteria')->withInput();
+                }
             }
         }
     }
 
+
+
     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', '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'] = Input::get('program_id');
+
+        $clean_input['copyright'] = trim(preg_replace('/\t+/', '', Input::get('copyright')));
+        $clean_input['notes'] = trim(preg_replace('/\t+/', '', Input::get('notes')));
+        $clean_input['maximum_score'] = (int) Input::get('assoc_maximum_score');
+        $clean_input['scale_title'] = Input::get('assoc_title');
+        $clean_input['scale_description'] = Input::get('assoc_scales');
+        $clean_input['number_of_scales'] = sizeof($clean_input['scale_title']);
 
-        return View::make('local.managers.admins.criteria', compact('title', 'outcomes', 'schools', 'criteria', 'programs'));
+
+        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
-        {
+            $role = Auth::user()['role'];
+            switch ($role) {
+                case 1:
+                    return Redirect::to('objective')->withInput();
+
+                case 2:
+                    return Redirect::to('school-objective')->withInput();
+
+                case 3:
+                    return Redirect::to('program-objective')->withInput();
+            }
+        } else {
 
             // // Check criterion uniqueness
             // if(!$this->isCriterionUnique($clean_input, $criterion))
@@ -250,50 +458,107 @@ 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->description12 = $clean_input['description12'];
-            $criterion->description34 = $clean_input['description34'];
-            $criterion->description56 = $clean_input['description56'];
-            $criterion->description78 = $clean_input['description78'];
+
+
+
+            $criterion->number_of_scales = $clean_input['number_of_scales'];
+            $criterion->maximum_score = $clean_input['maximum_score'];
+
+
 
             // 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)");
+                    }
+                }
+                DB::delete("delete from `scales` where id in (select scale_id id from criterion_scale where criterion_id = {$criterionId})");
+
+                for ($i = 0; $i < sizeof($clean_input['scale_title']); $i++) {
+                    $scale = new Scale;
+                    $scale->title = $clean_input['scale_title'][$i];
+                    $scale->position = $i + 1;
+                    $scale->description = $clean_input['scale_description'][$i];
+                    if ($scale->save()) {
+                        DB::insert("insert into `criterion_scale` (`criterion_id`, `scale_id`) values({$criterionId},{$scale->id})");
+                    } else {
+                        Session::flash('status', 'danger');
+                        Session::flash('message', '<p>Error creating the Scales</p>');
+                        $role = Auth::user()['role'];
+                        switch ($role) {
+                            case 1:
+                                return Redirect::to('objective')->withInput();
+
+                            case 2:
+                                return Redirect::to('school-objective')->withInput();
+
+                            case 3:
+                                return Redirect::to('program-objective')->withInput();
+                        }
+                    }
+                }
+
+
+
                 Session::flash('status', 'success');
-                Session::flash('message', 'Updated criterion: "'.$criterion->name.'"');
-                return Redirect::back();
+                Session::flash('message', 'Updated criterion: "' . $criterion->name . '"');
+                $role = Auth::user()['role'];
+                switch ($role) {
+                    case 1:
+                        return Redirect::to('objective')->withInput();
+
+                    case 2:
+                        return Redirect::to('school-objective')->withInput();
+
+                    case 3:
+                        return Redirect::to('program-objective')->withInput();
+                }
             }
 
             /** If saving fails, send error message and old data */
-            else
-            {
+            else {
                 Session::flash('status', 'danger');
                 Session::flash('message', 'Error updating the Criterion. Please try again later.');
-                return Redirect::back()->withInput();
+                $role = Auth::user()['role'];
+                switch ($role) {
+                    case 1:
+                        return Redirect::to('objective')->withInput();
+
+                    case 2:
+                        return Redirect::to('school-objective')->withInput();
+
+                    case 3:
+                        return Redirect::to('program-objective')->withInput();
+                }
             }
         }
     }
@@ -303,52 +568,57 @@ class CriteriaController extends \BaseController {
         // el ID de los semestres que el usuario tiene seleccionado.
         $semesters_ids = Session::get('semesters_ids');
         // buscar informacion de los semestres seleccionados
-        $semesters = Semester::whereIn('id',$semesters_ids)->get();
+        $semesters = Semester::whereIn('id', $semesters_ids)->get();
 
         $title = "Learning Outcomes and Criteria";
         $outcomes = Outcome::orderBy('name', 'ASC')->get();
+        // $outcomes = DB::table('outcomes')
+        //     ->orderBy('name', 'asc')
+        //     ->get();
         $schools = School::orderBy('name', 'ASC')->get();
+        // $schools = DB::table('schools')
+        //     ->orderBy('name', 'asc')
+        //     ->get();
         $criteria = Criterion::withTrashed()->orderBy('name', 'ASC')->get();
+        // $criteria = DB::table('criteria')
+        //     ->orderBy('name', 'asc')
+        //     ->get();
 
         // se annadio la nueva variable
         return View::make('global.view-learning-outcomes-criteria', compact('title', 'outcomes', 'schools', 'criteria', 'semesters'));
 
     }
 
+
     // copie index() y lo edite
     public function objectivesIndex()
     {
-        if(Auth::user()->role==1)
-        {
-          //uscar todos los objetivos
-          $objectives = DB::table('program_user')
-                                ->join('objectives','objectives.program_id','=','program_user.program_id')
-                                ->join('programs','programs.id','=','program_user.program_id')
-                                ->select('objectives.id','objectives.text','programs.name')
-                                ->orderBy('objectives.text', 'asc')
-                                ->get();
-        }
-        elseif(Auth::user()->role==2)
-        {
-          //buscar los objetivos de la departamento (school)
-          $objectives = DB::table('program_user')
-                                ->join('objectives','objectives.program_id','=','program_user.program_id')
-                                ->join('programs','programs.id','=','program_user.program_id')
-                                ->where('programs.school_id',Auth::user()->school_id)
-                                ->select('objectives.id','objectives.text','programs.name')
-                                ->orderBy('objectives.text', 'asc')
-                                ->get();
-        }
-        elseif((Auth::user()->role==3) || (Auth::user()->role==4))
-        {
-          //buscar los objetivos de los programas cuales el profesor esta
-          $objectives = DB::table('program_user')
-                                ->join('objectives','objectives.program_id','=','program_user.program_id')
-                                ->join('programs','programs.id','=','program_user.program_id')
-                                ->where('program_user.user_id',Auth::user()->id)
-                                ->select('objectives.id','objectives.text','programs.name')
-                                ->orderBy('objectives.text', 'asc')
-                                ->get();
+        if (Auth::user()->role == 1) {
+            //uscar todos los objetivos
+            $objectives = DB::table('program_user')
+                ->join('objectives', 'objectives.program_id', '=', 'program_user.program_id')
+                ->join('programs', 'programs.id', '=', 'program_user.program_id')
+                ->select('objectives.id', 'objectives.text', 'programs.name')
+                ->orderBy('objectives.text', 'asc')
+                ->get();
+        } elseif (Auth::user()->role == 2) {
+            //buscar los objetivos de la departamento (school)
+            $objectives = DB::table('program_user')
+                ->join('objectives', 'objectives.program_id', '=', 'program_user.program_id')
+                ->join('programs', 'programs.id', '=', 'program_user.program_id')
+                ->where('programs.school_id', Auth::user()->school_id)
+                ->select('objectives.id', 'objectives.text', 'programs.name')
+                ->orderBy('objectives.text', 'asc')
+                ->get();
+        } elseif ((Auth::user()->role == 3) || (Auth::user()->role == 4)) {
+            //buscar los objetivos de los programas cuales el profesor esta
+            $objectives = DB::table('program_user')
+                ->join('objectives', 'objectives.program_id', '=', 'program_user.program_id')
+                ->join('programs', 'programs.id', '=', 'program_user.program_id')
+                ->where('program_user.user_id', Auth::user()->id)
+                ->select('objectives.id', 'objectives.text', 'programs.name')
+                ->orderBy('objectives.text', 'asc')
+                ->get();
         }
 
         $title = "Learning Objectives and Criteria";
@@ -359,70 +629,75 @@ class CriteriaController extends \BaseController {
     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
-            {
+            $role = Auth::user()['role'];
+            switch ($role) {
+                case 1:
+                    return Redirect::to('objective')->withInput();
+
+                case 2:
+                    return Redirect::to('school-objective')->withInput();
+
+                case 3:
+                    return Redirect::to('program-objective')->withInput();
+            }
+        } else {
+            try {
                 $criterion->restore();
                 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();
+            $role = Auth::user()['role'];
+            switch ($role) {
+                case 1:
+                    return Redirect::to('objective')->withInput();
 
+                case 2:
+                    return Redirect::to('school-objective')->withInput();
+
+                case 3:
+                    return Redirect::to('program-objective')->withInput();
+            }
         }
     }
 
     public function 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();
                 }
@@ -430,8 +705,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,465 @@
+<?php
+
+use Illuminate\Support\Facades\Auth;
+
+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|array'
+
+			)
+
+		);
+	}
+
+
+	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'] = 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');
+
+
+
+		$clean_input['program_id'] = Input::get('program_id');
+
+
+		return $clean_input;
+	}
+	public function fetchObjective()
+	{
+		return Objective::find(Input::get('id'));
+	}
+
+	public function fetchObjectiveWithTrashed()
+	{
+		$json = array();
+
+		$json['program'] = DB::select("select program_id from objective_program where objective_id = ?", array(Input::get('id')));
+		$json['outcome'] = DB::select("select outcome_id from objective_outcome outc where outc.objective_id = ?", array(Input::get('id')));
+		$json['objective'] = DB::select("select text, id from objectives where id =?", array(Input::get('id')));
+		$json['assessment'] = DB::select("select * from assessments where activity_id  in (select activity_id from activity_criterion where criterion_id in (select criterion_id from criterion_objective_outcome where objective_id = ?))", array(Input::get('id')));
+		$json['assoc_criteria'] = DB::select("select name from criteria where id in(select criterion_id from criterion_objective_outcome where objective_id =?)", array(Input::get('id')));
+		return json_encode($json);
+	}
+	public function fetchAllobjectives()
+	{
+		$program_id = Input::get('program_fetch');
+		$outcome_id = Input::get('outcome_fetch');
+		$json = array();
+		$json['objective'] = DB::select("SELECT * FROM `objectives` where id in (select objective_id from criterion_objective_outcome where outcome_id ={$outcome_id}) and id in(select objective_id from objective_program where program_id = {$program_id})");
+		return json_encode($json);
+	}
+	public function delete()
+	{
+		DB::delete("delete from objectives where id = ?", array(Input::get('deleteObj')));
+		$role = Auth::user()['role'];
+		switch ($role) {
+			case 1:
+				return Redirect::to('objectives')->withInput();
+
+			case 2:
+				return Redirect::to('school-objectives')->withInput();
+
+			case 3:
+				return Redirect::to('program-objectives')->withInput();
+		}
+	}
+	/**
+	 * 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);
+			$role = Auth::user()['role'];
+			switch ($role) {
+				case 1:
+					return Redirect::to('objective')->withInput();
+
+				case 2:
+					return Redirect::to('school-objective')->withInput();
+
+				case 3:
+					return Redirect::to('program-objective')->withInput();
+			}
+		} else {
+			// Check Objective uniqueness
+			if (!$this->isObjectiveUnique($clean_input)) {
+				/** Send error message and old data */
+				Session::flash('status', 'danger');
+				Session::flash('message', "This objective is a duplicate of an already saved Objective because it's and associated program are the same.");
+				$role = Auth::user()['role'];
+				switch ($role) {
+					case 1:
+						return Redirect::to('objective')->withInput();
+
+					case 2:
+						return Redirect::to('school-objective')->withInput();
+
+					case 3:
+						return Redirect::to('program-objective')->withInput();
+				}
+			}
+
+			/** Instantiate new Objective */
+			$objective = new Objective;
+			$objective->text = $clean_input['text'];
+
+
+
+
+
+
+
+			/** If Objective is saved, send success message */
+			if ($objective->save()) {
+				$objectiveId = $objective->id;
+				foreach ($clean_input['program_id'] as $program_id) {
+					DB::insert("insert into objective_program (objective_id, program_id) values({$objectiveId},{$program_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 . '".');
+				$role = Auth::user()['role'];
+				switch ($role) {
+					case 1:
+						return Redirect::to('objective')->withInput(Input::only('outcome_id'));
+
+					case 2:
+						return Redirect::to('school-objective')->withInput(Input::only('outcome_id'));
+
+					case 3:
+						return Redirect::to('program-objective')->withInput(Input::only('outcome_id'));
+				}
+			}
+
+			/** If saving fails, send error message and old data */
+			else {
+				Session::flash('status', 'danger');
+				Session::flash('message', '<p>Error creating objective. Please try again later.</p>');
+				$role = Auth::user()['role'];
+				switch ($role) {
+					case 1:
+						return Redirect::to('objective')->withInput();
+
+					case 2:
+						return Redirect::to('school-objective')->withInput();
+
+					case 3:
+						return Redirect::to('program-objective')->withInput();
+				}
+			}
+		}
+	}
+	/**
+	 * 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'));
+	}
+
+	public function editProgram()
+	{
+		$userProgram = Auth::user()['id'];
+		Log::info(Auth::user());
+
+		$userProgram = DB::select("select program_user.program_id from program_user where user_id = {$userProgram}");
+
+		$title = "Objective";
+		$outcomes = Outcome::orderBy('name', 'ASC')->lists('name', 'id');
+
+		$objectives = Objective::withTrashed()->orderBy('text', 'ASC')->get();
+
+		$programs = Program::where("id", '=', $userProgram[0]->program_id)->get();
+
+
+
+
+		return View::make('local.managers.pCoords.objectives', compact('title', 'outcomes', 'objectives', 'programs'));
+	}
+
+	public function editSchool()
+	{
+		$userSchool = Auth::user()['school_id'];
+		Log::info($userSchool);
+		$title = "Objective";
+		$outcomes = Outcome::orderBy('name', 'ASC')->lists('name', 'id');
+
+		$objectives = Objective::withTrashed()->orderBy('text', 'ASC')->get();
+		$programs = Program::where("school_id", "=", $userSchool)->orderBy('name', 'ASC')->get();
+
+
+
+		return View::make('local.managers.sCoords.objectives', compact('title', 'outcomes', 'objectives', 'programs'));
+	}
+
+	/**
+	 * Update the specified resource in storage.
+	 *
+	 * @param  int  $id
+	 * @return Response
+	 */
+
+	public function update()
+
+	{
+
+		$Objective = Objective::withTrashed()->find(Input::get('id'));
+
+		$clean_input = $this->cleanAssocInput();
+
+		Log::info(print_r($clean_input, true));
+
+		/** Validation rules */
+		$validator = $this->makeValidator($clean_input);
+
+		/** 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);
+			$role = Auth::user()['role'];
+			switch ($role) {
+				case 1:
+					return Redirect::to('objective')->withInput();
+
+				case 2:
+					return Redirect::to('school-objective')->withInput();
+
+				case 3:
+					return Redirect::to('program-objective')->withInput();
+			}
+		} else {
+
+
+
+			/** Set info */
+			$Objective->text = $clean_input['text'];
+
+
+
+
+			// 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}");
+				DB::delete("delete from objective_program where objective_id = {$objectiveId}");
+
+				foreach ($clean_input['program_id'] as $program_id) {
+					DB::insert("insert into `objective_program`(objective_id, program_id) values ({$objectiveId},{$program_id})");
+				}
+				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 . '"');
+				$role = Auth::user()['role'];
+				switch ($role) {
+					case 1:
+						return Redirect::to('objective')->withInput();
+
+					case 2:
+						return Redirect::to('school-objective')->withInput();
+
+					case 3:
+						return Redirect::to('program-objective')->withInput();
+				}
+			}
+
+			/** If saving fails, send error message and old data */
+			else {
+				Session::flash('status', 'danger');
+				Session::flash('message', 'Error updating the Objective. Please try again later.');
+				$role = Auth::user()['role'];
+				switch ($role) {
+					case 1:
+						return Redirect::to('objective')->withInput();
+
+					case 2:
+						return Redirect::to('school-objective')->withInput();
+
+					case 3:
+						return Redirect::to('program-objective')->withInput();
+				}
+			}
+		}
+	}
+
+
+
+	/**
+	 * 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/OutcomesController.php

@@ -2,7 +2,8 @@
 
 use Illuminate\Database\Eloquent\Collection;
 
-class OutcomesController extends \BaseController {
+class OutcomesController extends \BaseController
+{
 
 
     /**
@@ -25,7 +26,7 @@ class OutcomesController extends \BaseController {
     public function newIndex()
     {
         $title = "Learning Outcomes";
-//        TODO: Check when semester doesnt exist or session is empty
+        //        TODO: Check when semester doesnt exist or session is empty
         $selected_semester = Semester::find(Session::get('semesters_ids')[0]);
         $outcomes = Outcome::withTrashed()->where('deactivation_date', '>=', $selected_semester->start)->orWhere('deactivation_date', null)->orderBy('name', 'ASC')->get();
         $schools = School::orderBy('name', 'ASC')->get();
@@ -35,141 +36,186 @@ class OutcomesController extends \BaseController {
 
     public function show($id)
     {
-        DB::disableQueryLog();
         $outcome = Outcome::find($id);
+        $selected_semesters = Semester::find(Session::get('semesters_ids'));
+        $programs = $outcome->programs_attempted($selected_semesters);
+
+        $undergradResults = array("names" => array(), "schools" => array(), "achieved" => array(), "attempted" => array(), "successRate" => array());
+        $gradResults = array("names" => array(), "schools" => array(), "achieved" => array(), "attempted" => array(), "successRate" => array());
+        foreach ($programs as $program_id) {
+ //        	var_dump($program_id);
+//         	exit();
+        	$program = Program::where('id', '=', $program_id->id)->first();
+        	$school = School::where('id', '=', $program->school_id)->first();
+        	if($program->is_graduate)
+        	{
+        		$gradResults['names'][] = $program->name;
+        		$gradResults['schools'][] = $school->name;
+        		$attempted = $program->attempted_criteria_by_outcome($id, $selected_semesters);
+        		$gradResults['attempted'][] = $attempted;
+        		$achieved = $program->achieved_criteria_by_outcome($id, $selected_semesters);
+        		$gradResults['achieved'][] = $achieved;
+        		$gradResults['successRate'][] = sprintf("%.2f",100*$achieved/$attempted);
+
+        	}
+        	else
+        	{
+        		$undergradResults['names'][] = $program->name;
+        		$undergradResults['schools'][] = $school->name;
+        		$attempted = $program->attempted_criteria_by_outcome($id,$selected_semesters);
+        		$undergradResults['attempted'][] = $attempted;
+        		$achieved = $program->achieved_criteria_by_outcome($id,$selected_semesters);
+        		$undergradResults['achieved'][] = $achieved;
+        		$undergradResults['successRate'][] = sprintf("%.2f",100*$achieved/$attempted);
+        	}
 
-        $undergradResults=array("names"=>array(), "schools"=>array(), "achieved"=>array(), "attempted"=>array(), "successRate"=>array());
-        $gradResults = array("names"=>array(), "schools"=>array(), "achieved"=>array(), "attempted"=>array(), "successRate"=>array());
-
-        //Calculate performance for this outcome for each undergrad program
-        $undergradPrograms = Program::where('is_graduate','=', 0)
-            ->where(function($query)
-            {
-                if(Auth::user()->school_id)
-                {
-                    $query->where('school_id', Auth::user()->school_id);
-                }
-            })
-            ->with('courses')
-            ->orderBy('name', 'asc')->get();
-
-        foreach($undergradPrograms as $program)
-        {
-            $undergradResults["names"][$program->id]=$program->name;
-            $undergradResults["schools"][$program->id]=$program->school->name;
-            $programAssessed=false;
-
-            $undergradResults["attempted"][$program->id]=0;
-            $undergradResults["achieved"][$program->id]=0;
-
-            foreach($program->courses as $course)
-            {
-                $course_outcomes_achieved = json_decode($course->outcomes_achieved, true);
-                $course_outcomes_attempted = json_decode($course->outcomes_attempted, true);
-
-                $attemptedCriteriaCount=0;
-                $achievedCriteriaCount=0;
-
-                // If this outcome was evaluated
-                if(
-                    $course_outcomes_attempted
-                    && array_key_exists($outcome->id, $course_outcomes_attempted)
-                    && $course_outcomes_attempted[$outcome->id]!=0)
-                {
-                    // Count +1 for attempted and achieved in the program
-                    $attemptedCriteriaCount+=$course_outcomes_attempted[$outcome->id];
-                    $achievedCriteriaCount+=$course_outcomes_achieved[$outcome->id];
-                    $programAssessed=true;
-
-                    if($attemptedCriteriaCount>0  &&(float)$achievedCriteriaCount/$attemptedCriteriaCount*100 > $outcome->expected_outcome)
-                    {
-                        $undergradResults["achieved"][$program->id]+=1;
-                    }
-                    $undergradResults["attempted"][$program->id]+=1;
-                }
-            }
-
-            // Calculate success rate for this program
-            if($programAssessed && $undergradResults["attempted"][$program->id]>0)
-                $undergradResults["successRate"][$program->id]= round((float)$undergradResults["achieved"][$program->id]/$undergradResults["attempted"][$program->id]*100, 2).'%';
-            else
-                $undergradResults["successRate"][$program->id]= 'N/M';
         }
 
+	   	$title = "Outcome Results: ".$outcome->name;
 
-        //Calculate performance for this outcome for each grad program
-        $gradPrograms = Program::where('is_graduate','=', 1)
-            ->where(function($query)
-            {
-                if(Auth::user()->school_id)
-                {
-                    $query->where('school_id', Auth::user()->school_id);
-                }
-            })
-            ->with(array('courses'=>function($query)
-            {
-                $query->whereNotNull('outcomes_attempted');
-            }))
-            ->orderBy('name', 'asc')->get();
-
-        foreach($gradPrograms as $program)
-        {
-            $gradResults["names"][$program->id]=$program->name;
-            $gradResults["schools"][$program->id]=$program->school->name;
-
-            $programAssessed=false;
-
-            $gradResults["attempted"][$program->id]=0;
-            $gradResults["achieved"][$program->id]=0;
-
-            foreach($program->courses as $course)
-            {
-                $course_outcomes_achieved = json_decode($course->outcomes_achieved, true);
-                $course_outcomes_attempted = json_decode($course->outcomes_attempted, true);
-
-                $attemptedCriteriaCount=0;
-                $achievedCriteriaCount=0;
-
-                // If this outcome was evaluated
-                if(
-                    $course_outcomes_attempted
-                    && array_key_exists($outcome->id, $course_outcomes_attempted)
-                    && $course_outcomes_attempted[$outcome->id]!=0)
-                {
-                    // Count +1 for attempted and achieved in the program
-                    $attemptedCriteriaCount+=$course_outcomes_attempted[$outcome->id];
-                    $achievedCriteriaCount+=$course_outcomes_achieved[$outcome->id];
-                    $programAssessed=true;
-
-                    if($attemptedCriteriaCount>0  &&(float)$achievedCriteriaCount/$attemptedCriteriaCount*100 > $outcome->expected_outcome)
-                    {
-                        $gradResults["achieved"][$program->id]+=1;
-                    }
-                    $gradResults["attempted"][$program->id]+=1;
-                }
-            }
-
-            // Calculate success rate for this program
-            if($programAssessed && $gradResults["attempted"][$program->id]>0)
-                $gradResults["successRate"][$program->id]= round((float)$gradResults["achieved"][$program->id]/$gradResults["attempted"][$program->id]*100, 2).'%';
-            else
-                $gradResults["successRate"][$program->id]= 'N/M';
-        }
 
-        $title = "Outcome Results: ".$outcome->name;
+//  		$undergradResults["successRate"]
 
-        return View::make('local.managers.admins.learning-outcome', compact('title', 'outcome', 'undergradResults', 'gradResults'));
+        return View::make('local.managers.admins.learning-outcome_new', compact('title', 'outcome', 'undergradResults', 'gradResults'));
     }
 
+//     public function show($id)
+//     {
+//         DB::disableQueryLog();
+//         $outcome = Outcome::find($id);
+//
+//         $undergradResults=array("names"=>array(), "schools"=>array(), "achieved"=>array(), "attempted"=>array(), "successRate"=>array());
+//         $gradResults = array("names"=>array(), "schools"=>array(), "achieved"=>array(), "attempted"=>array(), "successRate"=>array());
+//
+//         //Calculate performance for this outcome for each undergrad program
+//         $undergradPrograms = Program::where('is_graduate','=', 0)
+//             ->where(function($query)
+//             {
+//                 if(Auth::user()->school_id)
+//                 {
+//                     $query->where('school_id', Auth::user()->school_id);
+//                 }
+//             })
+//             ->with('courses')
+//             ->orderBy('name', 'asc')->get();
+//
+//         foreach($undergradPrograms as $program)
+//         {
+//             $undergradResults["names"][$program->id]=$program->name;
+//             $undergradResults["schools"][$program->id]=$program->school->name;
+//             $programAssessed=false;
+//
+//             $undergradResults["attempted"][$program->id]=0;
+//             $undergradResults["achieved"][$program->id]=0;
+//
+//             foreach($program->courses as $course)
+//             {
+//                 $course_outcomes_achieved = json_decode($course->outcomes_achieved, true);
+//                 $course_outcomes_attempted = json_decode($course->outcomes_attempted, true);
+//
+//                 $attemptedCriteriaCount=0;
+//                 $achievedCriteriaCount=0;
+//
+//                 // If this outcome was evaluated
+//                 if(
+//                     $course_outcomes_attempted
+//                     && array_key_exists($outcome->id, $course_outcomes_attempted)
+//                     && $course_outcomes_attempted[$outcome->id]!=0)
+//                 {
+//                     // Count +1 for attempted and achieved in the program
+//                     $attemptedCriteriaCount+=$course_outcomes_attempted[$outcome->id];
+//                     $achievedCriteriaCount+=$course_outcomes_achieved[$outcome->id];
+//                     $programAssessed=true;
+//
+//                     if($attemptedCriteriaCount>0  &&(float)$achievedCriteriaCount/$attemptedCriteriaCount*100 > $outcome->expected_outcome)
+//                     {
+//                         $undergradResults["achieved"][$program->id]+=1;
+//                     }
+//                     $undergradResults["attempted"][$program->id]+=1;
+//                 }
+//             }
+//
+//             // Calculate success rate for this program
+//             if($programAssessed && $undergradResults["attempted"][$program->id]>0)
+//                 $undergradResults["successRate"][$program->id]= round((float)$undergradResults["achieved"][$program->id]/$undergradResults["attempted"][$program->id]*100, 2).'%';
+//             else
+//                 $undergradResults["successRate"][$program->id]= 'N/M';
+//         }
+//
+//
+//         //Calculate performance for this outcome for each grad program
+//         $gradPrograms = Program::where('is_graduate','=', 1)
+//             ->where(function($query)
+//             {
+//                 if(Auth::user()->school_id)
+//                 {
+//                     $query->where('school_id', Auth::user()->school_id);
+//                 }
+//             })
+//             ->with(array('courses'=>function($query)
+//             {
+//                 $query->whereNotNull('outcomes_attempted');
+//             }))
+//             ->orderBy('name', 'asc')->get();
+//
+//         foreach($gradPrograms as $program)
+//         {
+//             $gradResults["names"][$program->id]=$program->name;
+//             $gradResults["schools"][$program->id]=$program->school->name;
+//
+//             $programAssessed=false;
+//
+//             $gradResults["attempted"][$program->id]=0;
+//             $gradResults["achieved"][$program->id]=0;
+//
+//             foreach($program->courses as $course)
+//             {
+//                 $course_outcomes_achieved = json_decode($course->outcomes_achieved, true);
+//                 $course_outcomes_attempted = json_decode($course->outcomes_attempted, true);
+//
+//                 $attemptedCriteriaCount=0;
+//                 $achievedCriteriaCount=0;
+//
+//                 // If this outcome was evaluated
+//                 if(
+//                     $course_outcomes_attempted
+//                     && array_key_exists($outcome->id, $course_outcomes_attempted)
+//                     && $course_outcomes_attempted[$outcome->id]!=0)
+//                 {
+//                     // Count +1 for attempted and achieved in the program
+//                     $attemptedCriteriaCount+=$course_outcomes_attempted[$outcome->id];
+//                     $achievedCriteriaCount+=$course_outcomes_achieved[$outcome->id];
+//                     $programAssessed=true;
+//
+//                     if($attemptedCriteriaCount>0  &&(float)$achievedCriteriaCount/$attemptedCriteriaCount*100 > $outcome->expected_outcome)
+//                     {
+//                         $gradResults["achieved"][$program->id]+=1;
+//                     }
+//                     $gradResults["attempted"][$program->id]+=1;
+//                 }
+//             }
+//
+//             // Calculate success rate for this program
+//             if($programAssessed && $gradResults["attempted"][$program->id]>0)
+//                 $gradResults["successRate"][$program->id]= round((float)$gradResults["achieved"][$program->id]/$gradResults["attempted"][$program->id]*100, 2).'%';
+//             else
+//                 $gradResults["successRate"][$program->id]= 'N/M';
+//         }
+//
+//         $title = "Outcome Results: ".$outcome->name;
+//
+//         return View::make('local.managers.admins.learning-outcome', compact('title', 'outcome', 'undergradResults', 'gradResults'));
+//     }
+
     // TODO: Clean up and verify relationships are correct
     public function newShow($id)
     {
-//        DB::disableQueryLog();
-//        $outcome = null;
+        //        DB::disableQueryLog();
+        //        $outcome = null;
         if ($id === 'all') {
             $outcome = Outcome::with('objectives.criteria')->get();
             $title = 'All Outcomes';
-            $criteria = $outcome->reduce(function($carry, $outcome) {
+            $criteria = $outcome->reduce(function ($carry, $outcome) {
                 return $carry->merge($outcome->criteria);
             }, Collection::make([]));
             $report_link = URL::action('OutcomesController@newReportAll');
@@ -180,26 +226,26 @@ class OutcomesController extends \BaseController {
             $report_link = URL::action('OutcomesController@newReport', ['id' => $outcome->id]);
         }
 
-//        $objectives = $outcome->objectives;
-//        var_dump(get_class_methods($criteria));
-//        var_dump($criteria);
-        $rubrics = $criteria->reduce(function($carry, $crit) {
+        //        $objectives = $outcome->objectives;
+        //        var_dump(get_class_methods($criteria));
+        //        var_dump($criteria);
+        $rubrics = $criteria->reduce(function ($carry, $crit) {
             return $carry->merge($crit->rubrics);
         }, Collection::make([]))->load('activities');
-        $activities = $rubrics->reduce(function($carry, $rubric) {
+        $activities = $rubrics->reduce(function ($carry, $rubric) {
             return $carry->merge($rubric->activities);
         }, Collection::make([]));
-        $courses = $activities->reduce(function($carry, $activity) {
+        $courses = $activities->reduce(function ($carry, $activity) {
             if ($activity->course !== null) {
                 $carry->push($activity->course);
             }
             return $carry;
         }, Collection::make([]));
-        $activities = $activities->filter(function($activity) {
+        $activities = $activities->filter(function ($activity) {
             return ($activity->course === null);
         });
 
-//        var_dump(DB::getQueryLog());
+        //        var_dump(DB::getQueryLog());
         return View::make('local.managers.admins.new-learning-outcome', compact('title', 'outcome', 'courses', 'activities', 'report_link'));
     }
 
@@ -208,14 +254,19 @@ class OutcomesController extends \BaseController {
         $outcome = Outcome::find($id);
         $objectives = $outcome->objectives;
         $criteria = $outcome->criteria;
-        $programs = $objectives->map(function ($objective) { return $objective->program; })
-            ->merge($criteria->map(function ($criteria) { return $criteria->program; }))
-            ->filter(function ($program) { return $program->users->contains(Auth::user()); });
+        $programs = $objectives->map(function ($objective) {
+            return $objective->program;
+        })
+            ->merge($criteria->map(function ($criteria) {
+                return $criteria->program;
+            }))
+            ->filter(function ($program) {
+                return $program->users->contains(Auth::user());
+            });
         $title = $outcome->name . ' Report';
 
 
         return View::make('local.managers.admins.new-report', compact('title', 'outcome', 'objectives'));
-
     }
 
     public function newReportAll()
@@ -224,7 +275,6 @@ class OutcomesController extends \BaseController {
         $title = 'All Outcomes Report';
 
         return View::make('local.managers.admins.new-report-all', compact('title', 'outcomes'));
-
     }
 
     public function update()
@@ -233,8 +283,7 @@ class OutcomesController extends \BaseController {
         Session::flash('status', 'success');
         Session::flash('message', 'Learning Outcomes updated.');
 
-        foreach ($outcomeArray as $outcomeObject)
-        {
+        foreach ($outcomeArray as $outcomeObject) {
 
 
             $validator = Validator::make(
@@ -250,12 +299,10 @@ class OutcomesController extends \BaseController {
                 )
             );
 
-            if(!$validator->fails())
-            {
-                try
-                {
+            if (!$validator->fails()) {
+                try {
                     $outcome = Outcome::withTrashed()
-                        ->where('id','=', $outcomeObject['id'])
+                        ->where('id', '=', $outcomeObject['id'])
                         ->firstOrFail();
                     $outcome->name = $outcomeObject['name'];
                     $outcome->definition = $outcomeObject['definition'];
@@ -263,30 +310,24 @@ class OutcomesController extends \BaseController {
                     $outcome->save();
 
                     // If delete is 1, and outcome isn't already trashed, delete
-                    if($outcomeObject['delete']==1 && !$outcome->trashed())
+                    if ($outcomeObject['delete'] == 1 && !$outcome->trashed())
                         $outcome->delete();
                     // If delete is 0, and outcome is already trashed, restore
-                    elseif($outcomeObject['delete']==0 && $outcome->trashed())
+                    elseif ($outcomeObject['delete'] == 0 && $outcome->trashed())
                         $outcome->restore();
-                }
-
-                catch(Exception $e)
-                {
+                } catch (Exception $e) {
 
                     Session::flash('message', $e->getMessage());
                 }
-            }
-            else
-            {
+            } else {
                 /** Prepare error message */
                 $message = 'Error(s) updating the Learning Outcomes: <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');
@@ -299,16 +340,15 @@ class OutcomesController extends \BaseController {
     }
 
     /**
-    *Copy of update(), but also updates activation_date, deactivation_date and level
-    */
+     *Copy of update(), but also updates activation_date, deactivation_date and level
+     */
     public function updateMore()
     {
         $outcomeArray = json_decode(Input::get('outcomeArray'), true);
         Session::flash('status', 'success');
         Session::flash('message', 'Learning Outcomes updated.');
 
-        foreach ($outcomeArray as $outcomeObject)
-        {
+        foreach ($outcomeArray as $outcomeObject) {
 
 
             $validator = Validator::make(
@@ -326,12 +366,10 @@ class OutcomesController extends \BaseController {
                 )
             );
 
-            if(!$validator->fails())
-            {
-                try
-                {
+            if (!$validator->fails()) {
+                try {
                     $outcome = Outcome::withTrashed()
-                        ->where('id','=', $outcomeObject['id'])
+                        ->where('id', '=', $outcomeObject['id'])
                         ->firstOrFail();
                     $outcome->name = $outcomeObject['name'];
                     $outcome->definition = $outcomeObject['definition'];
@@ -342,30 +380,24 @@ class OutcomesController extends \BaseController {
                     $outcome->save();
 
                     // If delete is 1, and outcome isn't already trashed, delete
-                    if($outcomeObject['delete']==1 && !$outcome->trashed())
+                    if ($outcomeObject['delete'] == 1 && !$outcome->trashed())
                         $outcome->delete();
                     // If delete is 0, and outcome is already trashed, restore
-                    elseif($outcomeObject['delete']==0 && $outcome->trashed())
+                    elseif ($outcomeObject['delete'] == 0 && $outcome->trashed())
                         $outcome->restore();
-                }
-
-                catch(Exception $e)
-                {
+                } catch (Exception $e) {
 
                     Session::flash('message', $e->getMessage());
                 }
-            }
-            else
-            {
+            } else {
                 /** Prepare error message */
                 $message = 'Error(s) updating the Learning Outcomes: <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');
@@ -380,40 +412,33 @@ class OutcomesController extends \BaseController {
     public function fetchCriteria()
     {
 
-        if(Input::get('filter'))
-        {
-            switch (Input::get('filter'))
-            {
+        if (Input::get('filter')) {
+            switch (Input::get('filter')) {
                 case 'all':
                     return Outcome::find(Input::get('id'))->criteria;
                     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::
-                            where('outcome_id', Input::get('id'))
+                        return Criterion::where('outcome_id', Input::get('id'))
                             ->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::
-                            where('outcome_id', Input::get('id'))
+                        return Criterion::where('outcome_id', Input::get('id'))
                             ->whereIn('program_id', $program_ids)
                             ->orderBy('name', 'ASC')
                             ->get();
@@ -422,8 +447,7 @@ class OutcomesController extends \BaseController {
                     break;
 
                 case 'program':
-                    return Criterion::
-                        where('outcome_id', Input::get('id'))
+                    return Criterion::where('outcome_id', Input::get('id'))
                         ->whereIn('program_id', Auth::user()->programs->lists('id'))
                         ->orderBy('name', 'ASC')
                         ->get();
@@ -433,9 +457,7 @@ class OutcomesController extends \BaseController {
                     return Outcome::find(Input::get('id'))->criteria;
                     break;
             }
-        }
-        else
-        {
+        } else {
             return Outcome::find(Input::get('id'))->criteria;
         }
     }
@@ -458,41 +480,35 @@ class OutcomesController extends \BaseController {
         );
 
         /** If validation fails */
-        if ($validator->fails())
-        {
+        if ($validator->fails()) {
             /** Prepare error message */
             $message = '<p>Error(s) creating a new Learning Outcome</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', 'warning');
             Session::flash('message', $message);
             return Redirect::to('learning-outcomes')->withInput();
-        }
-        else
-        {
+        } else {
             /** Instantiate new outcome */
             $outcome = new Outcome;
-            $outcome->name= Input::get('name');
+            $outcome->name = Input::get('name');
             $outcome->definition = Input::get('definition');
 
             /** If outcome is saved, send success message */
-            if($outcome->save())
-            {
+            if ($outcome->save()) {
                 Session::flash('status', 'success');
                 Session::flash('message', '<p>Learning Outcome added.</p>');
                 return Redirect::to('learning-outcomes');
             }
 
             /** If saving fails, send error message and old data */
-            else
-            {
+            else {
                 Session::flash('status', 'warning');
                 Session::flash('message', '<p>Error adding Learning Outcome. Please try again later.</p>');
                 return Redirect::to('learning-outcomes')->withInput();
@@ -502,15 +518,78 @@ class OutcomesController extends \BaseController {
 
     public function fetchOutcome()
     {
+        // original code using models
+        // TODO: models have to be updated because of the database update
+
         $id = Input::get('id');
 
-        $outcome = Outcome::find($id);
+        $outcome_info = DB::table('outcomes')
+            ->where('outcomes.id', $id)
+            ->get();
+        $outcome = $outcome_info[0];
+
+        $diferent_levels = DB::table('criterion_objective_outcome')
+            ->join('new_criteria', 'new_criteria.id', '=', 'criterion_objective_outcome.criterion_id')
+            ->join('objectives', 'objectives.id', '=', 'criterion_objective_outcome.objective_id')
+            ->where('criterion_objective_outcome.outcome_id', $id)
+            ->distinct('new_criteria.number_of_scales')
+            ->select('new_criteria.number_of_scales as levels')
+            ->orderBy('new_criteria.number_of_scales', 'asc')
+            ->get();
 
-        $outcome->criteria;
+        $criteria_array = array();
+
+        $outcome->criteria = array();
+        foreach ($diferent_levels as $level) {
+          $level = $level->levels;
+
+          // buscar todos los criterios con el level y ponerlos en un array
+          $outcome_criterias = DB::table('criterion_objective_outcome')
+              ->join('new_criteria', 'new_criteria.id', '=', 'criterion_objective_outcome.criterion_id')
+              ->join('objectives', 'objectives.id', '=', 'criterion_objective_outcome.objective_id')
+              ->where('criterion_objective_outcome.outcome_id', $id)
+              ->where('new_criteria.number_of_scales', $level)
+              ->whereNull('new_criteria.deleted_at')
+              ->select('new_criteria.id','new_criteria.name')
+              ->orderBy('new_criteria.name', 'asc')
+              ->get();
+          $outcome_criterias = $outcome_criterias;
+
+          foreach ($outcome_criterias as $criteria_id) {
+
+            $scales =
+              DB::select(
+                  DB::raw("
+                  SELECT *
+                  FROM (
+                    SELECT new_criteria.id as criterion_id,
+                      ROW_NUMBER() OVER(PARTITION BY scales.id) rn,
+                      scales.position,
+                      scales.title, scales.description,
+                      criterion_objective_outcome.outcome_id,criterion_objective_outcome.objective_id,
+                      criterion_scale.scale_id
+                    FROM new_criteria,criterion_scale,scales, criterion_objective_outcome, objectives
+                    where new_criteria.id=criterion_scale.criterion_id
+                      and scales.id = criterion_scale.scale_id
+                      and new_criteria.id = criterion_objective_outcome.criterion_id
+                      and objectives.id = criterion_objective_outcome.objective_id
+                      and criterion_objective_outcome.outcome_id = $id
+                      and new_criteria.id = $criteria_id->id
+                    ORDER BY new_criteria.name ASC) a
+                  WHERE rn = 1
+                  ORDER BY `a`.`position` ASC
+                      ")
+              );
+              // insertar la informacion de los criterios con N niveles en el arreglo de arreglos
+              $criteria_id->scales = $scales;
+              // $i++;
+            }//ends foreach criteria_id
+            array_push($outcome->criteria, array($outcome_criterias,'amount_of_levels'=>$level));
+        }//ends foreach level
 
         return array
         (
-            'outcome' => $outcome
+            'outcome' => $outcome,
         );
     }
 
@@ -536,7 +615,6 @@ class OutcomesController extends \BaseController {
                 App::abort('404');
                 break;
         }
-
     }
 
     /**
@@ -546,26 +624,25 @@ class OutcomesController extends \BaseController {
     {
         $outcome = Outcome::find($outcome_id);
 
-        if(!$outcome)
+        if (!$outcome)
             App::abort('404');
-        $title = "Assessment Report: ".$outcome->name;
+        $title = "Assessment Report: " . $outcome->name;
 
 
-        $schools = School::
-            has('courses')
-            ->with(array('programs'=>function($query) use($outcome_id){
+        $schools = School::has('courses')
+            ->with(array('programs' => function ($query) use ($outcome_id) {
                 $query
-                ->has('courses')
-                ->with(array('courses'=>function($query2) use($outcome_id){
-                    $query2
-                    ->has('activities')
-                    ->whereNotNull('outcomes_attempted')
-                    // ->where('outcomes_attempted', 'NOT LIKE', '%"'.$outcome_id.'":0%')
-                    ->whereIn('semester_id', Session::get('semesters_ids'))
-                    ->groupBy(array('code', 'number'));
-                }));
+                    ->has('courses')
+                    ->with(array('courses' => function ($query2) use ($outcome_id) {
+                        $query2
+                            ->has('activities')
+                            ->whereNotNull('outcomes_attempted')
+                            // ->where('outcomes_attempted', 'NOT LIKE', '%"'.$outcome_id.'":0%')
+                            ->whereIn('semester_id', Session::get('semesters_ids'))
+                            ->groupBy(array('code', 'number'));
+                    }));
             }))
-         ->get();
+            ->get();
 
         return View::make('local.managers.admins.assessment_report', compact('title', 'outcome', 'schools'));
     }
@@ -575,16 +652,15 @@ class OutcomesController extends \BaseController {
     {
         $outcome = Outcome::find($outcome_id);
 
-        if(!$outcome)
+        if (!$outcome)
             App::abort('404');
-        $title = "Assessment Report: ".$outcome->name;
+        $title = "Assessment Report: " . $outcome->name;
 
-        $schools = School::
-        has('courses')
-            ->with(array('programs'=>function($query) use($outcome_id){
+        $schools = School::has('courses')
+            ->with(array('programs' => function ($query) use ($outcome_id) {
                 $query
                     ->has('courses')
-                    ->with(array('courses'=>function($query2) use($outcome_id){
+                    ->with(array('courses' => function ($query2) use ($outcome_id) {
                         $query2
                             ->has('activities')
                             ->whereNotNull('outcomes_attempted')
@@ -605,26 +681,25 @@ class OutcomesController extends \BaseController {
     {
         $outcome = Outcome::find($outcome_id);
 
-        if(!$outcome)
+        if (!$outcome)
             App::abort('404');
-        $title = "Assessment Report: ".$outcome->name;
+        $title = "Assessment Report: " . $outcome->name;
 
 
-        $school = School::
-            where('id', Auth::user()->school_id)
-            ->has('courses')
-            ->with(array('programs'=>function($query){
-            $query
+        $school = School::where('id', Auth::user()->school_id)
             ->has('courses')
-            ->with(array('courses'=>function($query2){
-                $query2
-                ->has('activities')
-                ->whereNotNull('outcomes_attempted')
-                ->whereIn('semester_id', Session::get('semesters_ids'))
-                ->groupBy(array('code', 'number'));
-            }));
-         }))
-         ->first();
+            ->with(array('programs' => function ($query) {
+                $query
+                    ->has('courses')
+                    ->with(array('courses' => function ($query2) {
+                        $query2
+                            ->has('activities')
+                            ->whereNotNull('outcomes_attempted')
+                            ->whereIn('semester_id', Session::get('semesters_ids'))
+                            ->groupBy(array('code', 'number'));
+                    }));
+            }))
+            ->first();
 
         return View::make('local.managers.sCoords.assessment_report', compact('title', 'outcome', 'school'));
     }
@@ -636,20 +711,19 @@ class OutcomesController extends \BaseController {
     {
         $outcome = Outcome::find($outcome_id);
 
-        if(!$outcome)
+        if (!$outcome)
             App::abort('404');
-        $title = "Assessment Report: ".$outcome->name;
+        $title = "Assessment Report: " . $outcome->name;
 
 
-        $program = Program::
-            where('id', $program_id)
+        $program = Program::where('id', $program_id)
             ->has('courses')
-            ->with(array('courses'=>function($query){
+            ->with(array('courses' => function ($query) {
                 $query
-                ->has('activities')
-                ->whereNotNull('outcomes_attempted')
-                ->whereIn('semester_id', Session::get('semesters_ids'))
-                ->groupBy(array('code', 'number'));
+                    ->has('activities')
+                    ->whereNotNull('outcomes_attempted')
+                    ->whereIn('semester_id', Session::get('semesters_ids'))
+                    ->groupBy(array('code', 'number'));
             }))
             ->first();
 
@@ -663,7 +737,6 @@ class OutcomesController extends \BaseController {
         $title = "My Courses' Assessment Reports";
 
         return View::make('local.professors.assessment_reports', compact('title', 'outcomes'));
-
     }
 
 
@@ -672,13 +745,12 @@ class OutcomesController extends \BaseController {
     {
         $outcome = Outcome::find($outcome_id);
 
-        if(!$outcome)
+        if (!$outcome)
             App::abort('404');
-        $title = "My Courses' Assessment Report: ".$outcome->name;
+        $title = "My Courses' Assessment Report: " . $outcome->name;
 
 
-        $courses = Course::
-            where('user_id', Auth::user()->id)
+        $courses = Course::where('user_id', Auth::user()->id)
             ->has('activities')
             ->whereNotNull('outcomes_attempted')
             ->whereIn('semester_id', Session::get('semesters_ids'))

app/controllers/ProgramsController.php

@@ -6,36 +6,79 @@ class ProgramsController extends \BaseController
   /**
    * Shows a particular program
    */
+
   public function show($id)
   {
 
     $program = Program::find($id);
     $title= $program->school->name.': '.$program->name;
     $program_courses = $program->courses;
-    $outcomes = Outcome::orderBy('name', 'asc')->get();
+//     $outcomes = Outcome::orderBy('name', 'asc')->get();
     $schools = School::all();
-    $outcomeCount = Outcome::all()->count();
-
-
-    $outcomes_achieved = array_fill(1, $outcomeCount, 0);
-    $outcomes_attempted = array_fill(1, $outcomeCount, 0);
-
-    $assessed_courses_count=0;
-    foreach ($program_courses as $course)
-    {
-        if($course->outcomes_achieved!=NULL)
-        {
-            $course_outcomes_achieved =json_decode($course->outcomes_achieved, true);
-            $course_outcomes_attempted =json_decode($course->outcomes_attempted, true);
-            for($i=1; $i<=count($outcomes_attempted); $i++)
-            {
-                $outcomes_achieved[$i]+=$course_outcomes_achieved[$i];
-                $outcomes_attempted[$i]+=$course_outcomes_attempted[$i];
-            }
-            $assessed_courses_count+=1;
-        }
-    }
-
+//     $outcomeCount = Outcome::all()->count();
+
+    $selected_semesters = Semester::find(Session::get('semesters_ids'));
+
+	$level=$program->is_graduate;
+	$min_start="9000-01-01 00:00:00";
+	$max_end="1000-01-01 00:00:00";
+	foreach($selected_semesters as $semester)
+	{
+		if($min_start>$semester->start)
+		{
+			$min_start=$semester->start;
+		}
+		if($max_end<$semester->end)
+		{
+			$max_end=$semester->end;
+		}
+	}
+	$outcomes = Outcome::where(function($query) use ($min_start)
+							   {
+									$query->where('deactivation_date', '>=', $min_start)
+										  ->orWhere('deactivation_date', null);
+							   })
+						->where('activation_date', '<=', $max_end)
+						->where(function($query2) use ($level)
+								{
+									$query2->where("level", $level+1)
+										   ->orWhere("level",3);
+								})
+						->orderBy('name', 'ASC')
+						->get();
+	$outcomeCount = Outcome::where(function($query) use ($min_start)
+								   {
+										$query->where('deactivation_date', '>=', $min_start)
+											  ->orWhere('deactivation_date', null);
+									})
+						->where('activation_date', '<=', $max_end)
+						->where(function($query2) use ($level)
+									{
+										$query2->where("level",$level+1)
+											   ->orWhere("level",3);
+									})
+							->count();
+
+	foreach($outcomes as $outcome)
+	{
+		$outcomes_attempted[$outcome->id]=$program->attempted_outcome($outcome->id, $selected_semesters);
+		if($outcomes_attempted[$outcome->id])$outcomes_achieved[$outcome->id]=$program->achieved_outcome($outcome->id, $selected_semesters);
+	}
+
+	foreach($outcomes as $outcome)
+	{
+		$assessed_courses[$outcome->id]=DB::table('activity_criterion')
+	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+	    	->join('courses', 'activities.course_id', '=', 'courses.id')
+	    	->join('programs', 'programs.id', '=', 'courses.program_id')
+	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'activity_criterion.criterion_id')
+	    	->where('criterion_objective_outcome.outcome_id','=',$outcome->id)
+	    	->where('programs.id','=',$program->id)
+	    	->where('courses.semester_id','=',$semester)
+	    	->count(DB::raw('DISTINCT courses.id'))
+			;
+	}
+	$assessed_courses_count=array_sum($assessed_courses);
     /**
      * List of grouped courses (grouped sections)
      */
@@ -76,10 +119,15 @@ class ProgramsController extends \BaseController
         })
         ->get();
 
+// 	var_dump($outcomes_attempted);
+// 	print "<br>";
+// 	var_dump($outcomes_achieved);
+// 	print "<br>";
     return View::make('local.managers.shared.program', compact('title', 'outcomes', 'outcomes_attempted', 'outcomes_achieved', 'schools', 'program_courses', 'assessed_courses_count', 'grouped_courses', 'program', 'users'));
 
 }
 
+
 public function showReport()
 {
 
@@ -171,6 +219,81 @@ public function showReport()
    return View::make('local.managers.shared.program_report', compact('title','programs_info','selected_divulgaciones','selected_semesters','tables_names'));
 }
 
+//   public function show($id)
+//   {
+//
+//     $program = Program::find($id);
+//     $title= $program->school->name.': '.$program->name;
+//     $program_courses = $program->courses;
+//     $outcomes = Outcome::orderBy('name', 'asc')->get();
+//     $schools = School::all();
+//     $outcomeCount = Outcome::all()->count();
+//
+//
+//     $outcomes_achieved = array_fill(1, $outcomeCount, 0);
+//     $outcomes_attempted = array_fill(1, $outcomeCount, 0);
+//
+//     $assessed_courses_count=0;
+//     foreach ($program_courses as $course)
+//     {
+//         if($course->outcomes_achieved!=NULL)
+//         {
+//             $course_outcomes_achieved =json_decode($course->outcomes_achieved, true);
+//             $course_outcomes_attempted =json_decode($course->outcomes_attempted, true);
+//             for($i=1; $i<=count($outcomes_attempted); $i++)
+//             {
+//                 $outcomes_achieved[$i]+=$course_outcomes_achieved[$i];
+//                 $outcomes_attempted[$i]+=$course_outcomes_attempted[$i];
+//             }
+//             $assessed_courses_count+=1;
+//         }
+//     }
+//
+//     /**
+//      * List of grouped courses (grouped sections)
+//      */
+//
+//     $grouped_courses = Course::
+//       select(DB::raw('name, code, number, max(outcomes_attempted) as outcomes_attempted, semester_id, program_id'))
+//       ->with('semester')
+//       ->with('program')
+//       ->where('program_id', $program->id)
+//       ->whereIn('semester_id', Session::get('semesters_ids'))
+//       ->groupBy(array('code', 'number', 'semester_id'))
+//       ->orderBy('code')
+//       ->orderBy('number')
+//       ->orderBy('semester_id')
+//       ->get();
+//
+//     // Program contact information
+//     $users = User::
+//         select('users.*')
+//         ->leftJoin('program_user', 'users.id', '=', 'program_user.user_id')
+//         ->where(function($query) use($program)
+//         {
+//             $query
+//                 ->where('school_id', $program->school_id)
+//                 ->where('role', 2);
+//         })
+//         ->orWhere(function($query) use($program)
+//         {
+//             $query
+//                 ->where('role', 3)
+//                 ->where('program_id', $program->id);
+//         })
+//         ->orWhere(function($query) use($program)
+//         {
+//             $query
+//                 ->where('role', 4)
+//                 ->where('program_id', $program->id);
+//         })
+//         ->get();
+//
+//     return View::make('local.managers.shared.program', compact('title', 'outcomes', 'outcomes_attempted', 'outcomes_achieved', 'schools', 'program_courses', 'assessed_courses_count', 'grouped_courses', 'program', 'users'));
+//
+// }
+
+
   /**
    * Info to print a program
    */

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,6 +16,35 @@ class RubricsController extends \BaseController {
         if (!$activity)
             App::abort('404');
 
+        $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();
+
+        $rubrics = Auth::user()->rubrics;
+        $outcomes = Outcome::orderBy('name', 'ASC')->get();
+        $criteria = Criterion::orderBy('name', 'ASC')->get();
+        $rubric = $activity->rubric;
+
+        return View::make('local.professors.rubrics', compact('title', 'templates', 'outcomes', 'criteria', 'rubrics', 'activity', 'rubric'));
+    }
+
+    public function newOtherMethod($activity_id)
+    {
+        $activity = Activity::find($activity_id);
+
+        // If activity does not exist, display 404
+        if (!$activity)
+            App::abort('404');
+
         $title = 'Rubric for <em>'.$activity->name.'</em>';
 
         // Select templates that belong to everyone or belong to the activity's course's school
@@ -48,10 +78,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;
@@ -63,24 +92,21 @@ class RubricsController extends \BaseController {
             $rubric->save();
 
             // Process activity
-            $activity = Activity::find(Input::get('activity_id'));
-            $activity->rubric_id = $rubric->id;
-            $activity->save();
+//             $activity = Activity::find(Input::get('activity_id'));
+//             $activity->rubric_id = $rubric->id;
+//             $activity->save();
 
+			DB::table('new_rubric_activity')->insert(array('activity_id'=>Input::get('activity_id'),'rubric_id'=> $rubric->id));
             DB::commit();
 
             Session::flash('status', 'success');
             Session::flash('message', 'Rubric assigned.');
 
-            return action('ActivitiesController@show', array($activity->id));
-
+            return action('ActivitiesController@show', array(Input::get('activity_id')));
 
-        }
-        catch(Exception $e)
-        {
             DB::rollBack();
             Session::flash('status', 'danger');
-            Session::flash('message', 'Error creating Rubric. Try again later.');
+            Session::flash('message', 'Error creating Rubric. Try again later.'.$e);
         }
     }
 
@@ -111,17 +137,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 +157,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 +197,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 +210,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 +226,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 +250,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 +266,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 +282,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 +297,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 +311,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/controllers/ThreeYearPlanController.php

@@ -0,0 +1,555 @@
+<?php
+
+use Illuminate\Database\Eloquent\Collection;
+
+class ThreeYearPlanController extends \BaseController
+{
+
+  public function threeYearsReport()
+  {
+      $user_id = auth::user()->id;
+
+      // el ID de los semestres que el usuario tiene seleccionado.
+      $semesters_ids = Session::get('semesters_ids');
+      // buscar informacion de los semestres seleccionados
+      $semesters = Semester::whereIn('id',$semesters_ids)->get();
+
+      $title = "Three Year Plans Planning";
+      $outcomes = Outcome::orderBy('name', 'ASC')
+          ->where('deactivation_date','=','0000-00-00')
+          ->orWhereNull('deactivation_date')
+          ->get();
+      // $outcomes = DB::table('outcomes')
+      //     ->orderBy('name', 'asc')
+      //     ->get();
+      $typs = DB::table('three_year_plan')
+          ->orderBy('year_start', 'asc')
+          ->get();
+      $criteria = Criterion::withTrashed()->orderBy('name', 'ASC')->get();
+      // $criteria = DB::table('criteria')
+      //     ->orderBy('name', 'asc')
+      //     ->get();
+      $program_id = DB::table('program_user')
+      ->where('user_id',$user_id)
+      // ->where('user_id',8) //voy a usar 8 porque user 60 no tiene
+      ->select('program_id')
+      ->get();
+      $program_id = $program_id[0]->program_id; //program id 15 debido al user 8
+
+      // se annadio la nueva variable
+      return View::make('global.view-three-year-plan', compact('title', 'outcomes', 'typs', 'criteria', 'semesters', 'program_id'));
+
+  }
+
+
+  public function fetchThreeYears()
+  {
+      $id = Input::get('id');
+
+      $semesters = DB::table('typ_semesters')
+          ->join('semesters','semesters.id','=','typ_semesters.semester_id')
+          ->where('typ_semesters.typ_id',$id)
+          // ->select('semesters.*')
+          ->orderBy('typ_semesters.semester_id', 'asc')
+          ->get();
+      $typs = DB::table('three_year_plan')
+          ->where('id',$id)
+          ->orderBy('year_start', 'asc')
+          ->get();
+
+      $typs  = $typs[0];
+      $typs->semesters = $semesters;
+
+      return array
+      (
+          'typ' => $typs,
+      );
+  }
+
+  public function update_typ_outcomes_semesters()
+  {
+    $outcomeSemesterArray = json_decode(Input::get('outcomeSemesterArray'), true);
+    $typ_id = Input::get('typ_id');
+
+    $user_id = auth::user()->id; //ya, tester es 60
+    $program_id = DB::table('program_user')
+    ->where('user_id',$user_id)
+    // ->where('user_id',8) //voy a usar 8 porque user 60 no tiene
+    ->select('program_id')
+    ->get();
+    $program_id = $program_id[0]->program_id; //program id 15 debido al user 8
+
+
+    $result = DB::table('typ_program')
+        ->where('three_year_plan_id',$typ_id)
+        ->where('program_id',$program_id)
+        ->get();
+
+    // create the relation if it doesnt exist
+    if(count($result) == 0){
+      $typ_program_id = DB::table('typ_program')->insertGetId(
+          array('three_year_plan_id' => $typ_id,
+                'program_id' => $program_id)
+      );
+    } else {
+      $typ_program_id = $result[0]->id;
+    }
+
+
+
+    //go through array
+    foreach ($outcomeSemesterArray as $outcome_semester) {
+
+      // foreach of the 6 semesters
+      foreach ($outcome_semester["semesters"] as $semester) {
+        $insert = $semester[1];
+
+        $outcome_id = explode("-sem",$semester[0])[0];
+
+        $semester_code = explode("-sem",$semester[0])[1];
+        $result = DB::table('semesters')
+            ->where('code',$semester_code)
+            ->select('id')
+            ->get();
+        if(count($result) == 0){
+          continue;
+        }
+        $semester_id = $result[0]->id;
+
+        // verify if it exists
+        $result = DB::table('typ_semester_outcome')
+            ->where('typ_program_id',$typ_program_id)
+            ->where('semester_id',$semester_id)
+            ->where('outcome_id',$outcome_id)
+            ->get();
+
+        // if true, it should get inserted
+        if ($insert == true) {
+          // if == 0, then insert
+          if(count($result) == 0){
+            $_ = DB::table('typ_semester_outcome')->insertGetId(
+                array('typ_program_id' => $typ_program_id,
+                      'semester_id' => $semester_id,
+                      'outcome_id' => $outcome_id)
+            );
+
+          }
+          //if exists, then do nothing
+
+        }
+        // if false, it should get deleted
+        else { //value == false
+
+          // if == 0, it doesnt exist. we do nothing
+          if(count($result) == 0){
+            //pass
+          }
+          //if exists, then do nothing
+          else {
+            DB::table('typ_semester_outcome')
+                ->where('typ_program_id', $typ_program_id)
+                ->where('semester_id', $semester_id)
+                ->where('outcome_id', $outcome_id)
+                ->delete();
+          }
+        }
+      }
+    }
+    return;
+  }
+
+  public function lookup_typ_semester_outcome()
+  {
+    $box_value = array();
+
+    $info = Input::get('info');
+
+    foreach ($info as $values) {
+      $outcome_id = $values[0];
+      $semester_code = $values[1];
+      $program_id = $values[2];
+      $box_id = $values[3];
+      $typ_id = $values[4];
+
+      //buscar id del typ
+      $result = DB::table('typ_program')
+          ->where('three_year_plan_id',$typ_id)
+          ->where('program_id',$program_id)
+          ->get();
+      $typ_program_id = $result[0]->id;
+
+      // buscar si existe el outcome_semester
+      $result = DB::table('typ_semester_outcome')
+          ->join('semesters','semesters.id','=','typ_semester_outcome.semester_id')
+          ->where('typ_program_id',$typ_program_id)
+          ->where('semesters.code',$semester_code)
+          ->where('outcome_id',$outcome_id)
+          ->get();
+
+      // if it doesnt exist
+      if (count($result)==0){
+        array_push($box_value,array($box_id,0));
+      } else {
+        array_push($box_value,array($box_id,1));
+      }
+
+    }
+    return array
+    (
+      'box_value' => ($box_value)
+    );
+  }
+
+  public function section2_on_change()
+  {
+    $typ_id = Input::get('typ_id');
+    // typ_id: (typ_id),
+    $outcome_id = Input::get('outcome_id');
+    // outcome_id: (outcome_id),
+    $semester_id = Input::get('semester_id');
+    // semester_id: (semester_id),
+    $previous_objective_id = Input::get('previous_objective_id');
+    // previous_objective_id: (previous_objective_id),
+    $new_objective_id = Input::get('new_objective_id');
+    // new_objective_id: (new_objective_id)
+
+    // get program_id
+    $user_id = auth::user()->id; //ya, tester es 60
+    $program_id = DB::table('program_user')
+        ->where('user_id',$user_id)
+        // ->where('user_id',8) //voy a usar 8 porque user 60 no tiene
+        ->select('program_id')
+        ->get();
+    $program_id = $program_id[0]->program_id; //program id 15 debido al user 8
+
+    // get typ_program_id
+    $result = DB::table('typ_program')
+        ->where('three_year_plan_id',$typ_id)
+        ->where('program_id',$program_id)
+        ->get();
+    $typ_program_id = $result[0]->id;
+
+    // get typ_semester_outcome_id
+    $result = DB::table('typ_semester_outcome')
+        ->where('typ_program_id',$typ_program_id)
+        ->where('semester_id',$semester_id)
+        ->where('outcome_id',$outcome_id)
+        ->get();
+    $typ_semester_outcome_id = $result[0]->id;
+
+    //delete old objective relation if it exists
+    if ($previous_objective_id != 'nothing_selected') {
+      $result = DB::table('typ_semester_objectives')
+          ->where('typ_semester_outcome_id',$typ_semester_outcome_id)
+          ->where('objective_id',$previous_objective_id)
+          ->get();
+      if (count($result) != 0) {
+        DB::table('typ_semester_objectives')
+            ->where('typ_semester_outcome_id', $typ_semester_outcome_id)
+            ->where('objective_id', $previous_objective_id)
+            ->delete();
+      }
+    }
+
+    //create new objective relation
+    if ($new_objective_id != 'nothing_selected') {
+      $result = DB::table('typ_semester_objectives')
+          ->where('typ_semester_outcome_id',$typ_semester_outcome_id)
+          ->where('objective_id',$new_objective_id)
+          ->get();
+      if (count($result) == 0) {
+        $_ = DB::table('typ_semester_objectives')->insertGetId(
+            array(
+              'typ_semester_outcome_id' => $typ_semester_outcome_id,
+              'objective_id' => $new_objective_id)
+        );
+      }
+    }
+    return 'update was succes';
+  }
+
+  public function section2_arrive()
+  {
+    // get program_id
+    $user_id = auth::user()->id; //ya, tester es 60
+    $program_id = DB::table('program_user')
+        ->where('user_id',$user_id)
+        // ->where('user_id',8) //voy a usar 8 porque user 60 no tiene
+        ->select('program_id')
+        ->get();
+    $program_id = $program_id[0]->program_id; //program id 15 debido al user 8
+
+    // get typ_program_id
+    $typ_id = Input::get('typ_id');
+    $result = DB::table('typ_program')
+        ->where('three_year_plan_id',$typ_id)
+        ->where('program_id',$program_id)
+        ->get();
+    $typ_program_id = $result[0]->id;
+
+
+    //search selected outcomes,semesters and get their objectives
+    $selected_outcomes = DB::table('typ_semester_outcome')
+        ->join('outcomes','outcomes.id','=','typ_semester_outcome.outcome_id')
+        ->where('typ_semester_outcome.typ_program_id',$typ_program_id)
+        ->distinct('typ_semester_outcome.outcome_id')
+        ->select('typ_semester_outcome.outcome_id')
+        ->orderBy('outcomes.name', 'asc')
+        ->get();
+
+    $selected_objectives_array = array();
+    $outcomes_info_array = array();
+    // $objectives_info_array = array();
+    $semesters_array = array();
+
+    $info = array();
+    foreach ($selected_outcomes as $outcome) {
+
+
+      $outcome_id = $outcome->outcome_id;
+      $result_outcomes = DB::table('outcomes')
+          ->where('outcomes.id',$outcome_id)
+          ->orderBy('outcomes.name', 'asc')
+          ->get();
+
+      foreach ($result_outcomes as $outcome_) {
+
+        $result_semesters = DB::table('typ_semester_outcome')
+            ->join('semesters','semesters.id','=','typ_semester_outcome.semester_id')
+            ->where('typ_semester_outcome.typ_program_id',$typ_program_id)
+            ->where('typ_semester_outcome.outcome_id',$outcome_->id)
+            ->select('typ_semester_outcome.id','typ_semester_outcome.semester_id','semesters.code','semesters.name')
+            ->get();
+        // buscar info sobre selected_semsters
+        $outcome_->selected_semesters = array();
+        foreach ($result_semesters as $semesters_) {
+          $typ_semester_outcome_id = $semesters_->id;
+
+          // lookup previusly selected objectives
+          $result_objectives = DB::table('typ_semester_objectives')
+              ->join('objectives','objectives.id','=','typ_semester_objectives.objective_id')
+              ->where('typ_semester_objectives.typ_semester_outcome_id', $typ_semester_outcome_id)
+              ->orderBy('typ_semester_objectives.id', 'asc')
+              ->get();
+
+          $semesters_->selected_objectives = array();
+          foreach ($result_objectives as $objectives_) {
+
+            array_push($semesters_->selected_objectives, $objectives_);
+          }
+
+          // lookup available objectives
+          $result_objectives = DB::table('criterion_objective_outcome')
+              ->join('outcomes','outcomes.id','=','criterion_objective_outcome.outcome_id')
+              ->join('objectives','objectives.id','=','criterion_objective_outcome.objective_id')
+              ->join('objective_program','objective_program.objective_id','=','objectives.id')
+              ->where('objective_program.program_id',$program_id)
+              ->where('criterion_objective_outcome.outcome_id',$outcome_id)
+              ->select('objectives.id','objectives.text','outcomes.name as outcome_name')
+              ->orderBy('objectives.text', 'asc')
+              ->get();
+
+          $semesters_->available_objectives = array();
+          foreach ($result_objectives as $objectives_) {
+
+            array_push($semesters_->available_objectives, $objectives_);
+          }
+
+          array_push($outcome_->selected_semesters, $semesters_);
+        }
+        array_push($info, $outcome_);
+      }
+    }
+    return $info;
+  }
+
+  public function section3_arrive()
+  {
+    // get program_id
+    $user_id = auth::user()->id; //ya, tester es 60
+    $program_id = DB::table('program_user')
+        ->where('user_id',$user_id)
+        // ->where('user_id',8) //voy a usar 8 porque user 60 no tiene
+        ->select('program_id')
+        ->get();
+    $program_id = $program_id[0]->program_id; //program id 15 debido al user 8
+
+    // get typ_program_id
+    $typ_id = Input::get('typ_id');
+    $result = DB::table('typ_program')
+        ->where('three_year_plan_id',$typ_id)
+        ->where('program_id',$program_id)
+        ->get();
+    $typ_program_id = $result[0]->id;
+
+
+    //search selected outcomes,semesters and get their objectives
+    $selected_outcomes = DB::table('typ_semester_outcome')
+        ->join('outcomes','outcomes.id','=','typ_semester_outcome.outcome_id')
+        ->where('typ_semester_outcome.typ_program_id',$typ_program_id)
+        ->distinct('typ_semester_outcome.outcome_id')
+        ->select('typ_semester_outcome.outcome_id')
+        ->orderBy('outcomes.name', 'asc')
+        ->get();
+
+    $selected_objectives_array = array();
+    $outcomes_info_array = array();
+    // $objectives_info_array = array();
+    $semesters_array = array();
+
+    $info = array();
+    foreach ($selected_outcomes as $outcome) {
+
+
+      $outcome_id = $outcome->outcome_id;
+      $result_outcomes = DB::table('outcomes')
+          ->where('outcomes.id',$outcome_id)
+          ->get();
+
+      foreach ($result_outcomes as $outcome_) {
+
+        $result_semesters = DB::table('typ_semester_outcome')
+            ->join('semesters','semesters.id','=','typ_semester_outcome.semester_id')
+            ->where('typ_semester_outcome.typ_program_id',$typ_program_id)
+            ->where('typ_semester_outcome.outcome_id',$outcome_->id)
+            ->select('typ_semester_outcome.id','typ_semester_outcome.semester_id','semesters.code','semesters.name')
+            ->get();
+        // buscar info sobre selected_semsters
+        $outcome_->selected_semesters = array();
+        foreach ($result_semesters as $semesters_) {
+          $semester_id = $semesters_->semester_id;
+
+          $typ_semester_outcome_id = $semesters_->id;
+          $result_objectives = DB::table('typ_semester_objectives')
+              ->join('objectives','objectives.id','=','typ_semester_objectives.objective_id')
+              ->where('typ_semester_objectives.typ_semester_outcome_id', $typ_semester_outcome_id)
+              ->select('typ_semester_objectives.id as typ_semester_objectives_id','objectives.*','typ_semester_objectives.*')
+              ->orderBy('typ_semester_objectives.id', 'asc')
+              ->get();
+
+          $semesters_->selected_objectives = array();
+          foreach ($result_objectives as $objectives_) {
+            $objective_id = $objectives_->objective_id;
+            $program_id = $objectives_->program_id;
+            $result_courses = DB::table('objective_program')
+                ->join('objectives','objectives.id','=','objective_program.objective_id')
+                ->join('courses','courses.program_id','=','objective_program.program_id')
+                ->where('objective_program.objective_id', $objective_id)
+                ->where('objective_program.program_id', $program_id)
+                ->where('courses.semester_id', $semester_id)
+                ->distinct('courses.name','courses.code')
+                ->select('courses.id as course_id','courses.name','courses.code','objective_program.objective_id','objective_program.program_id')
+                ->orderBy('courses.name', 'asc')
+                ->groupBy('courses.name','courses.code')
+                ->get();
+
+            $objectives_->available_courses = array();
+            foreach ($result_courses as $courses_) {
+              array_push($objectives_->available_courses, $courses_);
+            }
+
+            // search for previusly selected courses
+            $typ_semester_objective_id = $objectives_->typ_semester_objectives_id;
+            $result_courses = DB::table('typ_semester_courses')
+                ->join('courses','courses.id','=','typ_semester_courses.course_id')
+                ->where('typ_semester_courses.typ_semester_objective_id', $typ_semester_objective_id)
+                ->select('courses.id as course_id','courses.*','typ_semester_courses.*')
+                ->orderBy('courses.name', 'asc')
+                ->get();
+
+            $objectives_->selected_courses = array();
+            foreach ($result_courses as $courses_) {
+              array_push($objectives_->selected_courses, $courses_);
+            }
+
+            array_push($semesters_->selected_objectives, $objectives_);
+          }
+
+          array_push($outcome_->selected_semesters, $semesters_);
+        }
+        array_push($info, $outcome_);
+      }
+    }
+    return $info;
+  }
+
+
+  public function section3_on_change()
+  {
+    $typ_id = Input::get('typ_id');
+    // typ_id: (typ_id),
+    $outcome_id = Input::get('outcome_id');
+    // outcome_id: (outcome_id),
+    $semester_id = Input::get('semester_id');
+    // semester_id: (semester_id),
+    $objective_id = Input::get('objective_id');
+    // objective_id: (objective_id),
+    $previous_course_id = Input::get('previous_course_id');
+    // previous_course_id: (previous_course_id),
+    $new_course_id = Input::get('new_course_id');
+    // new_course_id: (new_course_id)
+
+    // get program_id
+    $user_id = auth::user()->id; //ya, tester es 60
+    $program_id = DB::table('program_user')
+        ->where('user_id',$user_id)
+        // ->where('user_id',8) //voy a usar 8 porque user 60 no tiene
+        ->select('program_id')
+        ->get();
+    $program_id = $program_id[0]->program_id; //program id 15 debido al user 8
+
+    // get typ_program_id
+    $result = DB::table('typ_program')
+        ->where('three_year_plan_id',$typ_id)
+        ->where('program_id',$program_id)
+        ->get();
+    $typ_program_id = $result[0]->id;
+
+    // get typ_semester_outcome_id
+    $result = DB::table('typ_semester_outcome')
+        ->where('typ_program_id',$typ_program_id)
+        ->where('semester_id',$semester_id)
+        ->where('outcome_id',$outcome_id)
+        ->get();
+    $typ_semester_outcome_id = $result[0]->id;
+
+    // get typ_semester_objective_id
+    $result = DB::table('typ_semester_objectives')
+        ->where('typ_semester_outcome_id',$typ_semester_outcome_id)
+        ->where('objective_id',$objective_id)
+        ->get();
+    $typ_semester_objective_id = $result[0]->id;
+
+    //delete old objective relation if it exists
+    if ($previous_course_id != 'nothing_selected') {
+      $result = DB::table('typ_semester_courses')
+          ->where('typ_semester_objective_id',$typ_semester_objective_id)
+          ->where('course_id',$previous_course_id)
+          ->get();
+      if (count($result) != 0) {
+        DB::table('typ_semester_courses')
+            ->where('typ_semester_objective_id', $typ_semester_objective_id)
+            ->where('course_id', $previous_course_id)
+            ->delete();
+      }
+    }
+
+    //create new objective relation
+    if ($new_course_id != 'nothing_selected') {
+      $result = DB::table('typ_semester_courses')
+          ->where('typ_semester_objective_id',$typ_semester_objective_id)
+          ->where('course_id',$new_course_id)
+          ->get();
+      if (count($result) == 0) {
+        $_ = DB::table('typ_semester_courses')->insertGetId(
+            array(
+              'typ_semester_objective_id' => $typ_semester_objective_id,
+              'course_id' => $new_course_id)
+        );
+      }
+    }
+    return 'update succes?';
+  }
+
+
+}

app/controllers/TransformativeActionsController.php

@@ -0,0 +1,928 @@
+<?php
+
+use Illuminate\Support\Facades\Input;
+
+class TransformativeActionsController extends \BaseController
+{
+
+    public function editTA()
+    {
+        $title = "Transformative Action";
+        $role = Auth::user()['role'];
+        $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();
+        $user_id = auth::user()->id;
+
+        $program_id = DB::table('program_user')
+            ->where('user_id',$user_id)
+            ->select('program_id')
+            ->get();
+        $program_id = $program_id[0]->program_id; //program id 15 debido al user 8
+        $outcomes = Outcome::orderBy('name', 'ASC')
+                    ->where('deactivation_date','=','0000-00-00')
+                    ->orWhereNull('deactivation_date')
+                    ->get();
+        $objectives = array();
+
+        // if user is program coordinator
+        if ($role == 3){
+          //1 edit panel: load the TA that
+          //    are custom ('transformative_actions.by_professor' == 0)
+          //    were approved in past ('transformative_actions.is_custom' == 1)
+          $ta_edit_panel = DB::table('transformative_actions')
+                          ->where('transformative_actions.is_custom', 1)
+                          ->where('transformative_actions.program_id', $program_id)
+                          ->where('transformative_actions.by_professor', 0)
+                          ->orderBy('at_text', 'ASC')
+                          ->get();
+          //2 approve panel: load TAs that
+          //    can be approved ('transformative_actions.by_professor' == 1)
+          $ta_approval_panel = DB::table('transformative_actions')
+                            ->where('transformative_actions.is_custom', 1)
+                            ->where('transformative_actions.program_id', $program_id)
+                            ->where('transformative_actions.by_professor',1)
+                            ->orderBy('at_text', 'ASC')
+                            ->get();
+          //2.1 approve panel: load the filter options.
+          // the "->where()" should be the same from $ta_approval_panel,
+          //  but with aditional joins and different select
+          //
+          // get the names of the professors
+          $professor_filter_approvePanel = DB::table('transformative_actions')
+                            ->join('users','users.id','=','transformative_actions.user_id')
+                            ->where('transformative_actions.is_custom', 1)
+                            ->where('transformative_actions.program_id', $program_id)
+                            ->where('transformative_actions.by_professor', 1)
+                            ->select('users.*')
+                            ->groupby('transformative_actions.user_id')
+                            ->orderBy('users.first_name', 'ASC')
+                            ->get();
+          // get the courses from asociated with a TA
+          $course_filter_approvePanel = DB::table('ta_course')
+                            ->join('transformative_actions','transformative_actions.id','=','ta_course.ta_id')
+                            ->join('courses','courses.id','=','ta_course.course_id')
+                            ->where('transformative_actions.is_custom', 1)
+                            ->where('transformative_actions.program_id', $program_id)
+                            ->where('transformative_actions.by_professor', 1)
+                            ->select('courses.*')
+                            ->groupBy('courses.name','courses.code')
+                            ->orderBy('courses.name', 'ASC')
+                            ->orderBy('courses.code', 'ASC')
+                            ->get();
+          // get the outcome asociated with a TA
+          $outcome_filter_approvePanel = DB::table('transformative_actions')
+                            ->join('transformative_objective_program','transformative_objective_program.ta_id','=','transformative_actions.id')
+                            ->join('criterion_objective_outcome','criterion_objective_outcome.objective_id','=','transformative_objective_program.objective_id')
+                            ->join('outcomes','outcomes.id','=','criterion_objective_outcome.outcome_id')
+                            ->where('transformative_actions.is_custom', 1)
+                            ->where('transformative_actions.program_id', $program_id)
+                            ->where('transformative_actions.by_professor', 1)
+                            ->select('outcomes.*')
+                            ->groupBy('outcomes.id')
+                            ->orderBy('outcomes.name', 'ASC')
+                            ->get();
+          //3 edit panel: load the filter options.
+          // the "->where()" should be the same from $ta_edit_panel,
+          //  but with aditional joins and different select
+          //
+          $professor_filter_editPanel = DB::table('transformative_actions')
+                            ->join('users','users.id','=','transformative_actions.user_id')
+                            ->where('transformative_actions.is_custom', 1)
+                            ->where('transformative_actions.program_id', $program_id)
+                            ->where('transformative_actions.by_professor', 0)
+                            ->select('users.*')
+                            ->groupby('transformative_actions.user_id')
+                            ->orderBy('users.first_name', 'ASC')
+                            ->get();
+          $course_filter_editPanel =  DB::table('ta_course')
+                            ->join('transformative_actions','transformative_actions.id','=','ta_course.ta_id')
+                            ->join('courses','courses.id','=','ta_course.course_id')
+                            ->where('transformative_actions.is_custom', 1)
+                            ->where('transformative_actions.program_id', $program_id)
+                            ->where('transformative_actions.by_professor', 0)
+                            ->select('courses.*')
+                            ->groupBy('courses.name','courses.code')
+                            ->orderBy('courses.name', 'ASC')
+                            ->orderBy('courses.code', 'ASC')
+                            ->get();
+          $outcome_filter_editPanel = DB::table('transformative_actions')
+                            ->join('transformative_objective_program','transformative_objective_program.ta_id','=','transformative_actions.id')
+                            ->join('criterion_objective_outcome','criterion_objective_outcome.objective_id','=','transformative_objective_program.objective_id')
+                            ->join('outcomes','outcomes.id','=','criterion_objective_outcome.outcome_id')
+                            ->where('transformative_actions.is_custom', 1)
+                            ->where('transformative_actions.program_id', $program_id)
+                            ->where('transformative_actions.by_professor', 0)
+                            ->select('outcomes.*')
+                            ->groupBy('outcomes.id')
+                            ->orderBy('outcomes.name', 'ASC')
+                            ->get();
+          // 4 create panel: search all courses
+          $courses_create = DB::table('courses')
+                            ->where('courses.program_id',$program_id)
+                            ->select('courses.*')
+                            ->groupBy('courses.name','courses.code')
+                            ->orderBy('courses.name', 'ASC')
+                            ->orderBy('courses.code', 'ASC')
+                            ->get();
+        }
+        // if user is profesor
+        elseif ($role == 4){
+          // 1 the user can only edit TA that need approval and has been submited by the same user
+          $ta_edit_panel = DB::table('transformative_actions')
+                          ->where('transformative_actions.is_custom', 1)
+                          ->where('transformative_actions.program_id',$program_id)
+                          ->where('transformative_actions.user_id', Auth::user()->id)
+                          ->where('transformative_actions.by_professor',1)
+                          ->select('transformative_actions.*')
+                          ->orderBy('at_text', 'ASC')
+                          ->get();
+          // 2 approve panel: dont load TA since professors cant approve them
+          $ta_approval_panel = array();
+          // 3 edit panel: load professor filter for his courses
+          $professor_filter_editPanel = array();
+          $course_filter_editPanel =  DB::table('ta_course')
+                            ->join('transformative_actions','transformative_actions.id','=','ta_course.ta_id')
+                            ->join('courses','courses.id','=','ta_course.course_id')
+                            ->where('transformative_actions.is_custom', 1)
+                            ->where('transformative_actions.user_id', Auth::user()->id)
+                            ->where('transformative_actions.program_id', $program_id)
+                            ->where('transformative_actions.by_professor', 1)
+                            ->select('courses.*')
+                            ->groupBy('courses.name','courses.code')
+                            ->orderBy('courses.name', 'ASC')
+                            ->orderBy('courses.code', 'ASC')
+                            ->get();
+          $outcome_filter_editPanel = DB::table('transformative_actions')
+                            ->join('transformative_objective_program','transformative_objective_program.ta_id','=','transformative_actions.id')
+                            ->join('criterion_objective_outcome','criterion_objective_outcome.objective_id','=','transformative_objective_program.objective_id')
+                            ->join('outcomes','outcomes.id','=','criterion_objective_outcome.outcome_id')
+                            ->where('transformative_actions.is_custom', 1)
+                            ->where('transformative_actions.user_id', Auth::user()->id)
+                            ->where('transformative_actions.program_id',$program_id)
+                            ->where('transformative_actions.by_professor', 1)
+                            ->select('outcomes.*')
+                            ->groupBy('outcomes.id')
+                            ->orderBy('outcomes.name', 'ASC')
+                            ->get();
+          // these arent used by professors
+          $professor_filter_approvePanel = array();
+          $course_filter_approvePanel = array();
+          $outcome_filter_approvePanel = array();
+
+          // 4 create panel: search courses given by the professor
+          $courses_create = DB::table('courses')
+                            ->where('courses.program_id',$program_id)
+                            ->where('courses.user_id', Auth::user()->id)
+                            ->select('courses.*')
+                            ->groupBy('courses.name','courses.code')
+                            ->orderBy('courses.name', 'ASC')
+                            ->orderBy('courses.code', 'ASC')
+                            ->get();
+        }
+
+        return View::make('local.managers.admins.transformativeAction', compact('title','role', 'outcomes', 'schools', 'criteria', 'programs', 'outcomes', 'objectives',
+        'ta_edit_panel','ta_approval_panel','courses_create',
+        'professor_filter_approvePanel', 'course_filter_approvePanel', 'outcome_filter_approvePanel',
+        'professor_filter_editPanel', 'outcome_filter_editPanel', 'course_filter_editPanel'
+      ));
+    }
+
+
+    private function cleanInput()
+    {
+        $clean_input = array();
+
+
+        $trimmed = trim(preg_replace('/\t+/', '', Input::get('text')));
+
+        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['text'] = $trimmed;
+
+        //////
+        $trimmed = trim(preg_replace('/\t+/', '', Input::get('description')));
+
+        Log::info('trimmed 3 -->' . $trimmed . '<--');
+
+        // if ($trimmed == '') {
+        //     $trimmed = NULL;
+        // } else {
+        //     $trimmed = json_encode(preg_split('/\r\n/', $trimmed));
+        // }
+
+        Log::info('trimmed 4 -->' . $trimmed . '<--');
+
+
+        $clean_input['description'] = $trimmed;
+
+
+
+        $clean_input['objectiveid'] = Input::get('objectiveid');
+        $clean_input['courseid'] = Input::get('courseid');
+        $clean_input['approval'] = Input::get('approval');
+        $clean_input['ta_id'] = Input::get('ta_id');
+
+        return $clean_input;
+    }
+
+    private function makeValidator($clean_input)
+    {
+
+      /** Validation rules */
+      return Validator::make(
+            array(
+                'text' => $clean_input['text'],
+                'description' => $clean_input['description'],
+                'objectiveid' => $clean_input['objectiveid'],
+                'courseid' => $clean_input['courseid'],
+                'approval' => $clean_input['approval'],
+                'ta_id' => $clean_input['ta_id'],
+            ),
+            array(
+                'text' => 'required|string',
+                'description' => 'required|string',
+                'objectiveid' => 'required|array',
+                'courseid' => 'required|array',
+                'approval' => 'integer',
+                'ta_id' => 'integer',
+            )
+        );
+    }
+
+
+    /**
+     * Create a new transformative action.
+     *
+     * @return Redirect Redirect back to form page
+     */
+    public function createTA()
+    {
+        $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 Transformative Action:</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);
+            $role = Auth::user()['role'];
+            return Redirect::to('transformativeAction')->withInput();
+        } else {
+
+          $user_id = auth::user()->id;
+          $program_id = DB::table('program_user')
+              ->where('user_id',$user_id)
+              ->select('program_id')
+              ->get();
+          $program_id = $program_id[0]->program_id;
+          $role = Auth::user()['role'];
+          $by_professor = 1;
+          if($role == 3){
+            $by_professor = 0;
+          }
+
+          // $by_professor = $clean_input['approval'];
+
+          $current_timestamp = date('Y/m/d H:i:s', time());
+          // insert the TA
+          $ta_id = DB::table('transformative_actions')->insertGetId(
+              array('at_text' => $clean_input['text'],
+                    'description' => $clean_input['description'],
+                    'is_custom' => 1,
+                    'user_id' => $user_id,
+                    'program_id' => $program_id,
+                    'created_at' => $current_timestamp,
+                    'by_professor' => $by_professor,
+                  )
+          );
+
+          //
+          // // insert the multiple TA_objective_program
+          foreach ($clean_input['objectiveid'] as $objective_id) {
+            DB::table('transformative_objective_program')->insert(
+                array(
+                  'ta_id' => $ta_id,
+                  'objective_id' => $objective_id,
+                  'program_id' => $program_id,
+                  'created_at' => $current_timestamp,
+                  )
+            );
+          }
+
+          //
+          // // insert the multiple TA_course
+          foreach ($clean_input['courseid'] as $course_id) {
+            DB::table('TA_course')->insert(
+                array(
+                  'ta_id' => $ta_id,
+                  'course_id' => $course_id,
+                  )
+            );
+          }
+
+          Session::flash('status', 'success');
+          Session::flash('message', 'Transformative Action created: "' . $clean_input['text'] . '".');
+          $role = Auth::user()['role'];
+          return Redirect::to('transformativeAction')->withInput();
+        }
+    }
+
+
+    public function approveTA()
+    {
+      $role = Auth::user()['role'];
+      if($role != 3){
+        $message = 'Only Program Coordinators can approve a TA';
+        Session::flash('status', 'danger');
+        Session::flash('message', $message);
+        return Redirect::to('transformativeAction')->withInput();
+      }
+
+      $ta_id = Input::get('ta_id');
+      $text = Input::get('at_text');
+
+      if($ta_id == 0){
+        $message = 'Please select a Transformative Action</p>';
+
+        Session::flash('status', 'danger');
+        Session::flash('message', $message);
+
+        $role = Auth::user()['role'];
+        return Redirect::to('transformativeAction')->withInput();
+      }
+
+      $current_timestamp = date('Y/m/d H:i:s', time());
+
+      // edit the TA
+      DB::table('transformative_actions')
+                  ->where('id', $ta_id)
+                  ->update([
+                        'by_professor' => 0,
+                        'updated_at' => $current_timestamp,
+                    ]);
+
+      Session::flash('status', 'success');
+      Session::flash('message', 'Approved the Transformative Action: "' . $text . '".');
+      $role = Auth::user()['role'];
+      return Redirect::to('transformativeAction')->withInput();
+    }
+
+
+
+
+
+
+    public function updateTA()
+    {
+      $clean_input = $this->cleanInput();
+
+      /** Validation rules */
+      $validator = $this->makeValidator($clean_input);
+
+      /** If validation fails */
+      if ($validator->fails()) {
+          /** Prepare error message */
+          $message = 'Error(s) updating the Transformative Action: <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);
+          $role = Auth::user()['role'];
+          return Redirect::to('transformativeAction')->withInput();
+      } else {
+
+          $user_id = auth::user()->id;
+          $program_id = DB::table('program_user')
+              ->where('user_id',$user_id)
+              ->select('program_id')
+              ->get();
+          $program_id = $program_id[0]->program_id;
+          $role = Auth::user()['role'];
+          $by_professor = $clean_input['approval'];
+          if($role == 4){
+            $by_professor = 1;
+          }
+
+          // $by_professor = $clean_input['approval'];
+
+          $current_timestamp = date('Y/m/d H:i:s', time());
+          // edit the TA
+          DB::table('transformative_actions')
+                      ->where('id', $clean_input['ta_id'])
+                      ->update([
+                            'by_professor' => $by_professor,
+                            'at_text' => $clean_input['text'],
+                            'description' => $clean_input['description'],
+                            'updated_at' => $current_timestamp,
+                        ]);
+
+
+          $ta_id = $clean_input['ta_id'];
+          $new_objective_id = $clean_input['objectiveid'];
+          $old_objective_id = DB::table('transformative_objective_program')
+                      ->where('ta_id',$ta_id)
+                      ->select('objective_id')
+                      ->lists('objective_id');
+
+          //delete existing objective_id if it isnt in new_ids array
+          foreach ($old_objective_id as $old_id) {
+            if(in_array($old_id,$new_objective_id)){
+              //do nothing if a new id is already in atble
+            }
+            else {
+              //if old id not in new id, delete
+              DB::table('transformative_objective_program')
+                ->where('ta_id',$ta_id)
+                ->where('objective_id', $old_id)
+                ->delete();
+            }
+          }
+
+          //
+          foreach ($new_objective_id as $new_id) {
+            $result = DB::table('transformative_objective_program')
+                        ->where('objective_id',$new_id)
+                        ->select('objective_id')
+                        ->lists('objective_id');
+
+            if(count($result) == 0){
+              //if the new_id does not exists, do nothing
+              DB::table('transformative_objective_program')->insert(
+                array(
+                  'ta_id' => $ta_id,
+                  'objective_id' => $new_id,
+                  'program_id' => $program_id,
+                  'created_at' => $current_timestamp,
+                )
+              );
+            }
+            else {
+              //if the new_id already exists, do nothing
+            }
+          }
+
+
+          $new_course_id = $clean_input['courseid'];
+          $old_course_id = DB::table('ta_course')
+                      ->where('ta_id',$ta_id)
+                      ->select('course_id')
+                      ->lists('course_id');
+
+          //delete existing course_id if it isnt in new_ids array
+          foreach ($old_course_id as $old_id) {
+            if(in_array($old_id,$new_course_id)){
+              //do nothing if a new id is already in atble
+            }
+            else {
+              //if old id not in new id, delete
+              DB::table('ta_course')
+                ->where('ta_id',$ta_id)
+                ->where('course_id', $old_id)
+                ->delete();
+            }
+          }
+          //add course_id if it isnt already inserted
+          foreach ($new_course_id as $new_id) {
+            $result = DB::table('ta_course')
+                        ->where('ta_id',$ta_id)
+                        ->where('course_id',$new_id)
+                        ->select('course_id')
+                        ->lists('course_id');
+
+            if(count($result) == 0){
+              //if the new_id does not exists, do nothing
+              DB::table('ta_course')->insert(
+                array(
+                  'ta_id' => $ta_id,
+                  'course_id' => $new_id,
+                )
+              );
+            }
+            else {
+              //if the new_id already exists, do nothing
+            }
+          }
+
+          Session::flash('status', 'success');
+          Session::flash('message', 'Updated Transformative Action: "' . $clean_input['text'] . '".');
+          $role = Auth::user()['role'];
+          return Redirect::to('transformativeAction')->withInput();
+      }
+    }
+
+
+    public function deleteTA()
+    {
+      $ta_id = array(Input::get('ta_id'));
+
+      // si envia id 0, el backend se queja en la linea: $ta = $ta[0];
+      // nunca deberia ocurrir, pero es un safity measure.
+      if($ta_id == 0){
+        $message = 'Please select a Transformative Action</p>';
+
+        Session::flash('status', 'danger');
+        Session::flash('message', $message);
+
+        $role = Auth::user()['role'];
+        return Redirect::to('transformativeAction')->withInput();
+      }
+
+      $ta = DB::table('transformative_actions')
+          ->where('transformative_actions.is_custom', 1)
+          ->where('id',$ta_id)
+          ->get();
+      $ta = $ta[0];
+
+      $used = DB::table('annual_plan_transformative')
+              ->where('id',$ta_id)
+              ->get();
+
+      $recommended = $ta->by_professor;
+      // the TA can only be deleted if error if the TA is not currently as "Recommended"
+      // and isnt used in an anual plan
+      if ($recommended == 1 && count($used) == 0) {
+        // delete the TA if it qualifies
+        DB::delete("delete from transformative_actions where id = ?", $ta_id);
+
+        $name = $ta->at_text;
+
+        $message = 'The Transformative Action has been deleted:</p><ul>';
+        $message .= '<li> '.$name.' </li>';
+        $message .= '</ul>';
+
+        Session::flash('status', 'success');
+        Session::flash('message', $message);
+        $role = Auth::user()['role'];
+        return Redirect::to('transformativeAction')->withInput();
+      }
+
+
+      $message = 'Transformative Actions can only be deleted if:</p><ul>';
+      $message .= '<li> It has a status of "Recommended"</li>';
+      $message .= '<li> It is not currently used in a plan</li>';
+      $message .= '</ul>';
+
+      Session::flash('status', 'danger');
+      Session::flash('message', $message);
+
+      $role = Auth::user()['role'];
+      return Redirect::to('transformativeAction')->withInput();
+    }
+
+
+
+
+
+    public function selectTA()
+    {
+      $ta_id = Input::get("ta_id");
+      $user_id = Auth::user()->id;
+      $program_id = DB::table('program_user')
+          ->where('user_id',$user_id)
+          ->select('program_id')
+          ->get();
+      $program_id = $program_id[0]->program_id;
+
+      $objectives = DB::table('transformative_actions')
+                        ->join('transformative_objective_program','transformative_objective_program.ta_id','=','transformative_actions.id')
+                        ->join('objectives','objectives.id','=','transformative_objective_program.objective_id')
+                        ->where('transformative_actions.id',$ta_id)
+                        ->select('objectives.text as text', 'objectives.id as id')
+                        ->orderBy('objectives.text', 'ASC')
+                        ->get();
+
+      $an_objective = $objectives[0]->id;
+      $outcome_id = DB::table('criterion_objective_outcome')
+                    ->where('criterion_objective_outcome.objective_id',$an_objective)
+                    ->select('criterion_objective_outcome.outcome_id')
+                    ->get();
+      $outcome_id = $outcome_id[0]->outcome_id;
+
+
+      $objectives_from_outcome = DB::table('objectives')
+                    ->join('objective_program','objective_program.objective_id','=','objectives.id')
+                    ->join('criterion_objective_outcome','criterion_objective_outcome.objective_id','=','objectives.id')
+                    ->where('criterion_objective_outcome.outcome_id',$outcome_id)
+                    ->where('objective_program.program_id',$program_id)
+                    ->orderBy('objectives.text', 'ASC')
+                    ->select('objectives.text as text', 'objectives.id as id')
+                    ->get();
+      $selected_courses = DB::table('ta_course')
+                    ->join('courses','courses.id','=','ta_course.course_id')
+                    ->where('ta_id',$ta_id)
+                    ->orderBy('courses.name', 'ASC')
+                    ->orderBy('courses.code', 'ASC')
+                    ->select('courses.*')
+                    ->get();
+      $name = DB::table('transformative_actions')
+                  ->where('id',$ta_id)
+                  ->select('at_text as name')
+                  ->lists('name');
+      $description = DB::table('transformative_actions')
+                  ->where('id',$ta_id)
+                  ->select('description')
+                  ->lists('description');
+      $status = DB::table('transformative_actions')
+                  ->where('id',$ta_id)
+                  ->select('by_professor as status')
+                  ->lists('status');
+      $status = $status[0];
+      $plans_count = DB::table('annual_plan_transformative')
+                  ->where('id',$ta_id)
+                  ->get();
+      $plans_count = count($plans_count);
+      $can_be_deleted = false;
+      if($plans_count == 0 && $status == 1){
+        $can_be_deleted = true;
+      }
+      return array(
+        'objectives' => $objectives,
+        'objectives_from_outcome' => $objectives_from_outcome,
+        'selected_courses' => $selected_courses,
+        'name' => $name,
+        'description' => $description,
+        'status' => $status,
+        'can_be_deleted' => $can_be_deleted,
+        'plans_count' => $plans_count,
+      );
+    }
+
+    public function objectivesFromOutcome()
+    {
+      $user_id = Auth::user()->id;
+      $program_id = DB::table('program_user')
+          ->where('user_id',$user_id)
+          ->select('program_id')
+          ->get();
+      $program_id = $program_id[0]->program_id;
+      $ta_id = Input::get("ta_id");
+      $outcome_id = Input::get("outcome_id");
+
+      $objectives = DB::table('objectives')
+                    ->join('objective_program','objective_program.objective_id','=','objectives.id')
+                    ->join('criterion_objective_outcome','criterion_objective_outcome.objective_id','=','objectives.id')
+                    ->where('criterion_objective_outcome.outcome_id',$outcome_id)
+                    ->where('objective_program.program_id',$program_id)
+                    ->orderBy('objectives.text', 'ASC')
+                    ->select('objectives.text as text', 'objectives.id as id')
+                    ->get();
+
+      return array(
+        'objectives' => $objectives,
+      );
+    }
+
+    // return TA filtered by the user on the approve or edit panel
+    public function filterTA()
+    {
+      $user_id = Auth::user()->id;
+      $role = Auth::user()['role'];
+      $professor_id = Input::get('professor_id');
+      $course_id = Input::get('course_id');
+      $outcome_id = Input::get('outcome_id');
+      $panel_id = Input::get('panel_id');
+      $program_id = DB::table('program_user')
+          ->where('user_id',$user_id)
+          ->select('program_id')
+          ->get();
+      $program_id = $program_id[0]->program_id;
+
+      // if the user is a coordinator filtering the approvePanel
+      if ($role == '3' && $panel_id == 'approvePanel'){
+
+        // if professor isnt a desired filter, search all professors
+        if ($professor_id == 0){
+          $all_ta_users = DB::table('transformative_actions')
+                        ->where('transformative_actions.is_custom', 1)
+                        ->where('transformative_actions.program_id', $program_id)
+                        ->where('transformative_actions.by_professor',1)
+                        ->select('transformative_actions.user_id')
+                        ->get();
+          $professor_id = array();
+          foreach ($all_ta_users as $key => $user) {
+            array_push($professor_id, $user->user_id);
+          }
+        }else{
+          $professor_id = array($professor_id);
+        }
+        // if course isnt a desired filter, search all courses
+        if ($course_id == 0){
+          $courses =  DB::table('ta_course')
+                    ->join('transformative_actions','transformative_actions.id','=','ta_course.ta_id')
+                    ->join('courses','courses.id','=','ta_course.course_id')
+                    ->where('transformative_actions.is_custom', 1)
+                    ->where('transformative_actions.program_id', $program_id)
+                    ->where('transformative_actions.by_professor', 1)
+                    ->select('courses.id')
+                    ->get();
+
+          $course_id = array();
+          foreach ($courses as $key => $course) {
+            array_push($course_id, $course->id);
+          }
+        }else{
+          $course_id = array($course_id);
+        }
+        // if outcome isnt a desired filter, search all outcomes
+        if ($outcome_id == 0){
+          $outcomes = DB::table('transformative_actions')
+                      ->join('transformative_objective_program','transformative_objective_program.ta_id','=','transformative_actions.id')
+                      ->join('criterion_objective_outcome','criterion_objective_outcome.objective_id','=','transformative_objective_program.objective_id')
+                      ->join('outcomes','outcomes.id','=','criterion_objective_outcome.outcome_id')
+                      ->where('transformative_actions.is_custom', 1)
+                      ->where('transformative_actions.program_id', $program_id)
+                      ->where('transformative_actions.by_professor', 1)
+                      ->select('outcomes.id')
+                      ->groupBy('outcomes.id')
+                      ->get();
+          $outcome_id = array();
+          foreach ($outcomes as $key => $outcome) {
+            array_push($outcome_id, $outcome->id);
+          }
+        }else{
+          $outcome_id = array($outcome_id);
+        }
+
+        // search TA with filters
+        $filtered_at = DB::table('transformative_actions')
+                      ->join('ta_course','ta_course.ta_id','=','transformative_actions.id')
+                      ->join('transformative_objective_program','transformative_objective_program.ta_id','=','transformative_actions.id')
+                      ->join('criterion_objective_outcome','criterion_objective_outcome.objective_id','=','transformative_objective_program.objective_id')
+                      ->where('transformative_actions.is_custom', 1)
+                      ->where('transformative_actions.program_id',$program_id)
+                      ->where('transformative_actions.by_professor',1)
+                      ->whereIn('transformative_actions.user_id',$professor_id)
+                      ->whereIn('criterion_objective_outcome.outcome_id',$outcome_id)
+                      ->whereIn('ta_course.course_id',$course_id)
+                      ->select('transformative_actions.*')
+                      ->groupBy('transformative_actions.id')
+                      ->orderBy('transformative_actions.at_text', 'ASC')
+                      ->get();
+        return $filtered_at;
+      }
+      // if the user is a coordinator filtering the editPanel
+      elseif($role == '3' && $panel_id == 'editPanel'){
+
+        // if professor isnt a desired filter, search all professors
+        if ($professor_id == 0){
+          $all_ta_users = DB::table('transformative_actions')
+                        ->where('transformative_actions.is_custom', 1)
+                        ->where('transformative_actions.program_id', $program_id)
+                        ->where('transformative_actions.by_professor',0)
+                        ->select('transformative_actions.user_id')
+                        ->get();
+          $professor_id = array();
+          foreach ($all_ta_users as $key => $user) {
+            array_push($professor_id, $user->user_id);
+          }
+        }else{
+          $professor_id = array($professor_id);
+        }
+        // if course isnt a desired filter, search all courses
+        if ($course_id == 0){
+          $courses =  DB::table('ta_course')
+                    ->join('transformative_actions','transformative_actions.id','=','ta_course.ta_id')
+                    ->join('courses','courses.id','=','ta_course.course_id')
+                    ->where('transformative_actions.is_custom', 1)
+                    ->where('transformative_actions.program_id', $program_id)
+                    ->where('transformative_actions.by_professor', 0)
+                    ->select('courses.id')
+                    ->get();
+
+          $course_id = array();
+          foreach ($courses as $key => $course) {
+            array_push($course_id, $course->id);
+          }
+        }else{
+          $course_id = array($course_id);
+        }
+        // if outcome isnt a desired filter, search all outcomes
+        if ($outcome_id == 0){
+          $outcomes = DB::table('transformative_actions')
+                      ->join('transformative_objective_program','transformative_objective_program.ta_id','=','transformative_actions.id')
+                      ->join('criterion_objective_outcome','criterion_objective_outcome.objective_id','=','transformative_objective_program.objective_id')
+                      ->join('outcomes','outcomes.id','=','criterion_objective_outcome.outcome_id')
+                      ->where('transformative_actions.is_custom', 1)
+                      ->where('transformative_actions.program_id', $program_id)
+                      ->where('transformative_actions.by_professor', 0)
+                      ->select('outcomes.id')
+                      ->groupBy('outcomes.id')
+                      ->get();
+          $outcome_id = array();
+          foreach ($outcomes as $key => $outcome) {
+            array_push($outcome_id, $outcome->id);
+          }
+        }else{
+          $outcome_id = array($outcome_id);
+        }
+
+        // search TA with filters
+        $filtered_at = DB::table('transformative_actions')
+                      ->join('ta_course','ta_course.ta_id','=','transformative_actions.id')
+                      ->join('transformative_objective_program','transformative_objective_program.ta_id','=','transformative_actions.id')
+                      ->join('criterion_objective_outcome','criterion_objective_outcome.objective_id','=','transformative_objective_program.objective_id')
+                      ->where('transformative_actions.is_custom', 1)
+                      ->where('transformative_actions.program_id',$program_id)
+                      ->where('transformative_actions.by_professor',0)
+                      ->whereIn('transformative_actions.user_id',$professor_id)
+                      ->whereIn('criterion_objective_outcome.outcome_id',$outcome_id)
+                      ->whereIn('ta_course.course_id',$course_id)
+                      ->select('transformative_actions.*')
+                      ->groupBy('transformative_actions.id')
+                      ->orderBy('transformative_actions.at_text', 'ASC')
+                      ->get();
+        return $filtered_at;
+      }
+      // if the user is a professor filtering the editPanel
+      elseif($role == '4' && $panel_id == 'editPanel'){
+
+        // if course isnt a desired filter, search all courses
+        if ($course_id == 0){
+          $courses = DB::table('ta_course')
+                    ->join('transformative_actions','transformative_actions.id','=','ta_course.ta_id')
+                    ->join('courses','courses.id','=','ta_course.course_id')
+                    ->where('transformative_actions.user_id', Auth::user()->id)
+                    ->where('transformative_actions.is_custom', 1)
+                    ->where('transformative_actions.program_id', $program_id)
+                    ->where('transformative_actions.by_professor', 1)
+                    ->select('courses.id')
+                    ->get();
+
+          $course_id = array();
+          foreach ($courses as $key => $course) {
+            array_push($course_id, $course->id);
+          }
+        }else{
+          $course_id = array($course_id);
+        }
+        // if outcome isnt a desired filter, search all outcomes
+        if ($outcome_id == 0){
+          $outcomes = DB::table('transformative_actions')
+                      ->join('transformative_objective_program','transformative_objective_program.ta_id','=','transformative_actions.id')
+                      ->join('criterion_objective_outcome','criterion_objective_outcome.objective_id','=','transformative_objective_program.objective_id')
+                      ->join('outcomes','outcomes.id','=','criterion_objective_outcome.outcome_id')
+                      ->where('transformative_actions.user_id', Auth::user()->id)
+                      ->where('transformative_actions.is_custom', 1)
+                      ->where('transformative_actions.program_id', $program_id)
+                      ->where('transformative_actions.by_professor', 1)
+                      ->select('outcomes.id')
+                      ->groupBy('outcomes.id')
+                      ->get();
+          $outcome_id = array();
+          foreach ($outcomes as $key => $outcome) {
+            array_push($outcome_id, $outcome->id);
+          }
+        }else{
+          $outcome_id = array($outcome_id);
+        }
+
+        // search TA with filters
+        $filtered_at = DB::table('transformative_actions')
+                      ->join('ta_course','ta_course.ta_id','=','transformative_actions.id')
+                      ->join('transformative_objective_program','transformative_objective_program.ta_id','=','transformative_actions.id')
+                      ->join('criterion_objective_outcome','criterion_objective_outcome.objective_id','=','transformative_objective_program.objective_id')
+                      ->where('transformative_actions.user_id', Auth::user()->id)
+                      ->where('transformative_actions.is_custom', 1)
+                      ->where('transformative_actions.program_id',$program_id)
+                      ->where('transformative_actions.by_professor',1)
+                      ->whereIn('criterion_objective_outcome.outcome_id',$outcome_id)
+                      ->whereIn('ta_course.course_id',$course_id)
+                      ->select('transformative_actions.*')
+                      ->groupBy('transformative_actions.id')
+                      ->orderBy('transformative_actions.at_text', 'ASC')
+                      ->get();
+        return $filtered_at;
+      }
+      return 'ilegal';
+    }
+
+}

app/controllers/UsersController.php

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

app/database/migrations/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,11 +13,11 @@ class RemoveOutcomeIdFromObjectivesTable extends Migration {
 	 */
 	public function up()
 	{
-		Schema::table('objectives', function(Blueprint $table)
-		{
-            $table->dropForeign('objectives_outcome_id_foreign');
-			$table->dropColumn('outcome_id');
-		});
+		//Schema::table('objectives', function(Blueprint $table)
+		//{
+		//    $table->dropForeign('objectives_outcome_id_foreign');
+		//	$table->dropColumn('outcome_id');
+		//});
 	}
 
 
@@ -27,12 +28,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 +41,4 @@ class RemoveOutcomeIdFromObjectivesTable extends Migration {
 				->onUpdate('cascade');
 		});
 	}
-
 }

app/database/migrations/2020_04_04_005817_add_outcome_id_to_objectives_table.php

@@ -3,7 +3,8 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class AddOutcomeIdToObjectivesTable extends Migration {
+class AddOutcomeIdToObjectivesTable extends Migration
+{
 
 	/**
 	 * Run the migrations.
@@ -12,12 +13,12 @@ class AddOutcomeIdToObjectivesTable extends Migration {
 	 */
 	public function up()
 	{
-		Schema::table('objectives', function(Blueprint $table)
-		{
-			$table->integer('outcome_id')->unsigned();
+		//Schema::table('objectives', function(Blueprint $table)
+		//{
+		//	$table->integer('outcome_id')->unsigned();
 
-			$table->foreign('outcome_id')->references('id')->on('outcomes')->onDelete('cascade')->onUpdate('cascade');
-		});
+		//	$table->foreign('outcome_id')->references('id')->on('outcomes')->onDelete('cascade')->onUpdate('cascade');
+		//});
 	}
 
 
@@ -28,12 +29,10 @@ class AddOutcomeIdToObjectivesTable extends Migration {
 	 */
 	public function down()
 	{
-		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');
 		});
 	}
-
 }

app/database/migrations/2020_04_22_122910_add_criteria_id_to_assessments_table.php

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

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_12_04_111708_dropDescriptionInCriteria.php

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

app/database/migrations/2020_12_10_175517_createProgramCriterion2.php

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

app/database/migrations/2020_12_10_223135_addMinMaxInScales.php

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

app/database/migrations/2021_01_28_160558_ObjectiveProgramMigrate.php

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

app/database/migrations/2021_01_28_174905_fixObjectivesTable.php

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

app/database/migrations/2021_01_31_165057_fix_objectives_table_2.php

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

app/database/migrations/2021_01_31_171210_fix_criterion_scale.php

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

app/database/migrations/2021_02_16_142747_create_cycles_table.php

@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateCyclesTable extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	 public function up()
+ 	{
+ 		Schema::create('cycles', function(Blueprint $table)
+ 		{
+			// 		id unico
+ 			$table->increments('id');
+			// 		cuando a~nos tiene el ciclo('3')
+			$table->integer('years_in_cycle');
+			// 		cuando comienza el ciclo ('2019')
+			$table->integer('start');
+			// 		cuando termina  el ciclo ('2022')
+			$table->integer('end');
+ 			$table->timestamps();
+ 		});
+ 	}
+
+ 	/**
+ 	 * Reverse the migrations.
+ 	 *
+ 	 * @return void
+ 	 */
+ 	public function down()
+ 	{
+ 		Schema::drop('cycles');
+ 	}
+
+}

app/database/migrations/2021_02_16_142832_create_cycles_semesters_table.php

@@ -0,0 +1,50 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateCyclesSemestersTable extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('cycles_semesters', function(Blueprint $table)
+		{
+			// id unico
+			$table->increments('id');
+			// id del ciclo que pertenece
+			$table->integer('cycle_id')->unsigned();
+			// semestre n
+			$table->integer('semester_id')->unsigned();
+			$table
+				->foreign('cycle_id')
+				->references('id')
+				->on('cycles')
+				->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('cycles_semesters');
+	}
+
+}

app/database/migrations/2021_02_17_205601_create_cycles_table.php

@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateCyclesTable extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	 public function up()
+ 	{
+ 		Schema::create('cycles', function(Blueprint $table)
+ 		{
+			// 		id unico
+ 			$table->increments('id')->unsigned();
+			// 		cuando a~nos tiene el ciclo('3')
+			$table->integer('years_in_cycle');
+			// 		cuando comienza el ciclo ('2019')
+			$table->integer('start');
+			// 		cuando termina  el ciclo ('2022')
+			$table->integer('end');
+ 			$table->timestamps();
+ 		});
+ 	}
+
+ 	/**
+ 	 * Reverse the migrations.
+ 	 *
+ 	 * @return void
+ 	 */
+ 	public function down()
+ 	{
+ 		Schema::drop('cycles');
+ 	}
+
+}

app/database/migrations/2021_02_17_205659_create_cycles_semesters_table.php

@@ -0,0 +1,50 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateCyclesSemestersTable extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('cycles_semesters', function(Blueprint $table)
+		{
+			// id unico
+			$table->increments('id')->unsigned();
+			// id del ciclo que pertenece
+			$table->integer('cycle_id')->unsigned();
+			// semestre n
+			$table->integer('semester_id')->unsigned();
+			$table
+				->foreign('cycle_id')
+				->references('id')
+				->on('cycles')
+				->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('cycles_semesters');
+	}
+
+}

app/database/migrations/2021_02_17_205734_create_three_year_plans_table.php

@@ -0,0 +1,50 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateThreeYearPlansTable extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+			Schema::create('three_year_plans', function(Blueprint $table)
+			{
+					$table->increments('id')->unsigned();
+					$table->integer('cycle_id')->unsigned();
+					$table
+							->foreign('cycle_id')
+							->references('id')
+							->on('cycles')
+							->onDelete('cascade')
+							->onUpdate('cascade');
+					$table->integer('program_id')->unsigned();
+					$table
+							->foreign('program_id')
+							->references('id')
+							->on('programs')
+							->onDelete('cascade')
+							->onUpdate('cascade');
+					$table->boolean('is_submitted')->default(0);
+					$table->dateTime('submitted_on')->nullable();
+					$table->timestamps();
+			});
+	}
+
+
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+			Schema::drop('three_year_plans');
+	}
+
+}

app/database/migrations/2021_02_17_205809_create_typ_parts_table.php

@@ -0,0 +1,48 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateTypPartsTable extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('typ_parts', function(Blueprint $table)
+		{
+			$table->increments('id')->unsigned();
+			$table->integer('three_year_plan_id')->unsigned();
+			$table
+				->foreign('three_year_plan_id')
+				->references('id')
+				->on('three_year_plans')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->integer('semester_id')->unsigned();
+			$table
+					->foreign('semester_id')
+					->references('id')
+					->on('semesters')
+					->onDelete('cascade')
+					->onUpdate('cascade');
+			$table->timestamps();
+		});
+
+		// DB::statement("ALTER TABLE `typ_parts` comment 'Annual plans that are part of a three-year plan'");
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('typ_parts');
+	}
+
+}

app/database/migrations/2021_02_17_205850_create_typ_part_outcomes_table.php

@@ -0,0 +1,63 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateTypPartOutcomesTable extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('typ_part_outcomes', function (Blueprint $table) {
+
+			$table->increments('id')->unsigned();
+			$table->integer('typ_part_id')->unsigned();
+			$table
+				->foreign('typ_part_id')
+				->references('id')
+				->on('typ_parts')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->integer('outcome_id')->unsigned();
+			$table
+				->foreign('outcome_id')
+				->references('id')
+				->on('outcomes')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->integer('objective_id')->unsigned()->nullable();
+			$table
+				->foreign('objective_id')
+				->references('id')
+				->on('objectives')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->integer('course_id')->unsigned()->nullable();
+			$table
+				->foreign('course_id')
+				->references('id')
+				->on('courses')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->tinyInteger('display_order');
+			$table->timestamps();
+		});
+
+		// DB::statement("ALTER TABLE typ_part_outcomes comment 'Outcomes for the annual plans of the three year plans'");
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('typ_part_outcomes');
+	}
+}

app/database/migrations/2021_02_25_180526_three_year_plan.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class ThreeYearPlan extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('three_year_plan', function (Blueprint $table) {
+			$table->increments('id');
+			$table->timestamps();
+			$table->integer('year_start')->unsigned();
+			$table->integer('year_end')->unsigned();
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('three_year_plan');
+	}
+}

app/database/migrations/2021_02_25_181424_typ_semesters.php

@@ -0,0 +1,50 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class TypSemesters extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('typ_semesters', function(Blueprint $table)
+		{
+			// id unico
+			$table->increments('id')->unsigned();
+			// id del ciclo que pertenece
+			$table->integer('typ_id')->unsigned();
+			// semestre n
+			$table->integer('semester_id')->unsigned();
+			$table
+				->foreign('typ_id')
+				->references('id')
+				->on('three_year_plan')
+				->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('typ_semesters');
+	}
+
+}

app/database/migrations/2021_02_25_181544_typ_program.php

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

app/database/migrations/2021_02_25_181623_typ_semester_outcome.php

@@ -0,0 +1,50 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class TypSemesterOutcome extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('typ_semester_outcome', function (Blueprint $table) {
+			$table->increments('id');
+			$table->timestamps();
+			$table->integer('typ_program_id')->unsigned();
+			$table->integer('semester_id')->unsigned();
+			$table->integer('outcome_id')->unsigned();
+
+			$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->foreign('typ_program_id')
+				->references('id')
+				->on('typ_program')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('typ_semester_outcome');
+	}
+}

app/database/migrations/2021_02_25_181644_typ_semester_objectives.php

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

app/database/migrations/2021_02_25_181655_typ_semester_courses.php

@@ -0,0 +1,49 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class TypSemesterCourses extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('typ_semester_courses', function (Blueprint $table) {
+			$table->increments('id');
+			$table->timestamps();
+			$table->integer('typ_semester_objective_id')->unsigned();
+			$table->integer('course_id')->unsigned();
+
+
+			$table->foreign('typ_semester_objective_id')
+				->references('id')
+				->on('typ_semester_objectives')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->foreign('course_id')
+				->references('id')
+				->on('courses')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('typ_semester_courses', function (Blueprint $table) {
+			$table->dropForeign("typ_semester_courses_course_id_foreign");
+			$table->dropForeign("typ_semester_courses_typ_semester_outcome_id_foreign");
+		});
+		Schema::drop('typ_semester_courses');
+	}
+}

app/database/migrations/2021_03_29_151147_create_Transformative_Actions.php

@@ -0,0 +1,51 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Schema;
+
+class CreateTransformativeActions extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('transformative_actions', function (Blueprint $table) {
+
+			$table->increments('id');
+			$table->timestamps();
+			$table->boolean('is_custom');
+			$table->integer('user_id')->unsigned()->nullable();
+			$table->integer('program_id')->unsigned()->nullable();
+			$table->text('at_text');
+			$table->text('description');
+			$table->boolean('by_professor');
+
+			$table->foreign('user_id')
+				->references('id')
+				->on('users')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+
+			$table->foreign('program_id')
+				->references('id')
+				->on('programs')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('transformative_actions');
+	}
+}

app/database/migrations/2021_03_29_151507_create_transformative_objective_program.php

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

app/database/migrations/2021_03_29_151542_create_annual_report_transformative.php

@@ -0,0 +1,51 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Schema;
+
+class CreateAnnualReportTransformative extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('annual_report_transformative', function (Blueprint $table) {
+			$table->increments('id');
+			$table->boolean('accomplished');
+			$table->integer('cycle_of_life');
+			$table->integer("semester_used")->unsigned();
+			$table->integer('semester_continue')->unsigned()->nullable();
+			$table->integer('trans_op_id')->unsigned();
+			$table->foreign('trans_op_id')
+				->references('id')
+				->on('transformative_objective_program')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->foreign('semester_used')
+				->references('id')
+				->on('semesters')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->foreign('semester_continue')
+				->references('id')
+				->on('semesters')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('annual_report_transformative');
+	}
+}

app/database/migrations/2021_03_29_154844_create_annual_plan_transformative.php

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

app/database/migrations/2021_04_25_194120_create_ta_course_table.php

@@ -0,0 +1,44 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateTaCourseTable extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('ta_course', function (Blueprint $table) {
+			$table->increments('id');
+
+			$table->integer('ta_id')->unsigned();
+			$table->foreign('ta_id')
+				->references('id')
+				->on('transformative_actions')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+
+			$table->integer('course_id')->unsigned();
+			$table->foreign('course_id')
+				->references('id')
+				->on('courses')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('ta_course');
+	}
+}

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/seeds/FillNewAssessmentActivityCriterion.php

@@ -0,0 +1,125 @@
+<?php
+
+class FillNewAssessmentActivityCriterion extends Seeder {
+
+    public function run()
+    {
+    
+//   DB::enableQueryLog();
+    	$activities=DB::table('activities')
+    					->join('new_rubric_activity', 'activities.id', '=', 'new_rubric_activity.activity_id')
+    					->join('rubrics', 'rubrics.id', '=', 'new_rubric_activity.rubric_id')
+    					->join('new_criterion_rubric', 'rubrics.id', '=', 'new_criterion_rubric.rubric_id')
+						->select('activities.*','rubrics.expected_percentage','rubrics.expected_points','new_criterion_rubric.criterion_id')
+						->orderBy('activities.id')
+						->orderBy('new_criterion_rubric.criterion_id')
+    					->get();
+//   DB::enableQueryLog();
+// 		dd(DB::getQueryLog());
+// 		exit();
+		$activity_antes=-1;
+		foreach ($activities as $activity)
+		{
+			$activity_id=$activity->id;
+			$expected_percentage_students_achieving=$activity->expected_percentage;
+			$transformative_actions=$activity->transforming_actions;
+			$assessment_comments=$activity->assessment_comments;
+			$expected_student_score=$activity->expected_points;
+			$criterion_id=$activity->criterion_id;
+// 			$datos=json_decode($activity->criteria_achieved, true);
+// 			$i=0;
+// 			foreach($datos as $criterion_id=>$score)
+// 			{
+			$existe_ya=DB::table('activity_criterion')->where('activity_id', $activity_id)->where('criterion_id', $criterion_id)->first();
+			if(empty($existe_ya))
+			{			
+				if($activity_antes==$activity_id)
+				{
+					DB::table('activity_criterion')->insert(
+					array("activity_id"=>$activity_id,
+						  "criterion_id"=>$criterion_id,
+						  "expected_percentage_students_achieving"=>$expected_percentage_students_achieving,
+						  "expected_student_score"=>$expected_student_score
+						  )
+						);
+				}
+				else
+				{
+					$activity_antes=$activity_id;
+					DB::table('activity_criterion')->insert(
+					array("activity_id"=>$activity_id,
+						  "criterion_id"=>$criterion_id,
+						  "expected_percentage_students_achieving"=>$expected_percentage_students_achieving,
+						  "expected_student_score"=>$expected_student_score,
+						  "transformative_actions"=>$transformative_actions,
+						  "assessment_comments"=>$assessment_comments
+						  )
+						);				
+				}
+				print $activity_id.':'.$criterion_id;print"\n";
+			}
+// 				$i++;
+// 			}
+		}
+    	
+//     exit();
+    	$assessments=DB::table('assessments')->get();
+    $i=0;
+		foreach ($assessments as $assessment)
+		{
+// 			var_dump($assessment);exit();
+			$student_id=$assessment->student_id;
+			$activity_id=$assessment->activity_id;
+			$datos=json_decode($assessment->scores, true);
+// 			$criterion=(array)DB::table('activity_criterion')->where('activity_id', $activity_id)->first();
+// 			var_dump($rubric);exit();
+// 			$criterion_id=$criterion["criterion_id"];
+// 			print_r($datos);
+// 			print"\n";
+// 			print $rubric->id;print"\t";
+			foreach($datos as $criterion_id=>$score)
+			{
+// 				print $dato["id"];print"\n";
+// 				var_dump($new_criterion);
+				$activity_criterion=DB::table('activity_criterion')->where('criterion_id', $criterion_id)->where('activity_id', $activity_id)->first();
+				if(empty($activity_criterion))
+				{
+// 					var_dump($criterion_id);
+					var_dump($assessment);
+// 					$activities=DB::table('activities')->where('id', $activity_id)->first();
+// 					$criterion_rubric=DB::table('new_criterion_rubric')->where('criterion_id', $criterion_id)->first();
+// 					var_dump($activities);
+// 					var_dump($criterion_rubric);
+// 					exit();
+					$activity_criterion_id=DB::table('activity_criterion')->insertGetId(
+						array("activity_id"=>$activity_id,
+							  "criterion_id"=>$criterion_id,
+							  "transformative_actions"=>$transformative_actions,
+							  "assessment_comments"=>$assessment_comments
+							  )
+						);				
+					
+				}
+				else $activity_criterion_id=$activity_criterion->id;
+				$existe_ya=DB::table('new_assessments')->where('student_id', $student_id)->where('activity_criterion_id', $activity_criterion_id)->first();
+				if(empty($existe_ya))
+				{
+					DB::table('new_assessments')->insert(array("student_id"=>$student_id,"activity_criterion_id"=>$activity_criterion_id,'score'=>$score));
+					print".";
+				}
+			}
+// 			print $activity_id.':'.$criterion_id;print"\n";
+
+			$i++;
+		}
+
+
+// 		$course = Rubric::where('code', $code)->where('number', $number)->where('section', $section)->where('semester_id', $semester_id)->first();
+
+
+
+
+	}
+
+
+}

app/database/seeds/FillNewCriterionRubric.php

@@ -0,0 +1,94 @@
+<?php
+
+class FillNewCriterionRubric extends Seeder {
+
+    public function run()
+    {
+    	$rubrics=DB::table('rubrics')->get();
+    $i=0;
+		foreach ($rubrics as $rubric)
+		{
+			$datos=json_decode($rubric->contents, true);
+// 			print_r($datos);
+// 			print"\n";
+// 			print $rubric->id;print"\t";
+// 			if($rubric->id==29){var_dump($datos);}
+			foreach($datos as $dato)
+			{
+				if($rubric->id==29){print $dato["id"];print"Entrando\n";}
+				$new_criterion=(array)DB::table('criteria')->where('id', $dato["id"])->first();
+// 				var_dump($new_criterion);
+				$program_id=(array)DB::table('courses')
+				->join('activities', 'courses.id', '=', 'activities.course_id')
+				->join('new_rubric_activity', 'new_rubric_activity.activity_id', '=', 'activities.id')
+				->select('courses.program_id')
+				->where('new_rubric_activity.rubric_id',$rubric->id)
+				->first();
+				if(empty($program_id))$program_id['program_id']=1;
+	// 			else var_dump($program_id);
+
+// 				var_dump($program_id);
+// 				var_dump($new_criterion);
+				if(!empty($new_criterion))
+				{
+					$existe=(array)DB::table('objectives')->where('id', $new_criterion["id"])->first();
+					$objective_id=$new_criterion["id"];
+					if(empty($existe))
+					{
+						$existe4=(array)DB::table('objectives')->where('program_id', $program_id['program_id'])->where('text', $new_criterion["name"])->first();
+	// 					print_r($existe4);print"\n";
+						if(!empty($existe4))
+						{
+	// 						DB::table('objectives')->insert(array("id"=> $new_criterion["id"],"program_id"=>$program_id['program_id'],"text"=>$new_criterion["name"],'outcome_id'=>$new_criterion['outcome_id']));
+							$objective_id=$existe4["id"];
+						}
+						else 
+						{
+							print "A crear entrada en objectives:  $objective_id";
+// 							var_dump(array("id"=> $objective_id,"program_id"=>$program_id['program_id'],"text"=>$new_criterion["name"],'outcome_id'=>$new_criterion['outcome_id']));
+							DB::table('objectives')->insert(array("id"=> $objective_id,"program_id"=>$program_id['program_id'],"text"=>$new_criterion["name"],'outcome_id'=>$new_criterion['outcome_id']));
+						}
+					}
+					else
+					{
+						$existe4=(array)DB::table('objectives')->where('program_id', $program_id['program_id'])->where('text', $new_criterion["name"])->first();
+	// 					print_r($existe4);print"\n";
+						if(empty($existe4))
+						{
+							$objective_id=DB::table('objectives')->insertGetId(array("program_id"=>$program_id['program_id'],"text"=>$new_criterion["name"],'outcome_id'=>$new_criterion['outcome_id']));
+						}
+
+					}
+					$new_criterion["objective_id"]=$objective_id;
+					unset($new_criterion['outcome_id']);
+// 					var_dump($new_criterion);
+					$existe2=(array)DB::table('new_criteria')->where('id', $new_criterion["id"])->first();
+					if(empty($existe2))
+					{
+						DB::table('new_criteria')->insert($new_criterion);
+					}
+					$existe3=(array)DB::table('new_criterion_rubric')->where('criterion_id', $new_criterion["id"])->where('rubric_id', $rubric->id)->first();
+					if(empty($existe3))
+					{
+						DB::table('new_criterion_rubric')->insert(
+						array('criterion_id' => $dato["id"], 'rubric_id' => $rubric->id)
+						);
+					}
+				}
+	// 			if($i)exit();
+		
+			}
+// 			if($rubric->id==29){exit();}
+		$i++;
+		}
+
+
+// 		$course = Rubric::where('code', $code)->where('number', $number)->where('section', $section)->where('semester_id', $semester_id)->first();
+
+
+
+
+	}
+
+
+}

app/database/seeds/FillScalesCriteria.php

@@ -0,0 +1,59 @@
+<?php
+
+class FillScalesCriteria extends Seeder {
+
+    public function run()
+    {
+
+    	$criteria=DB::table('criteria')->get();
+		foreach($criteria as $criterion)
+		{
+			$existe=DB::table('scales')->where('title',"description12")->where('description',$criterion->description12)->where('position',1)->first();
+			if(empty($existe))
+			{
+				$scale_id=DB::table('scales')->insertGetId(array('title'=>"description12",'description'=>$criterion->description12,'position'=>1));		
+			}
+			else
+			{
+				$scale_id=$existe->id;
+			}
+			DB::table('criterion_scale')->insert(array("scale_id"=>$scale_id,"criterion_id"=>$criterion->id));
+			$existe=DB::table('scales')->where('title',"description34")->where('description',$criterion->description34)->where('position',2)->first();
+			if(empty($existe))
+			{
+				$scale_id=DB::table('scales')->insertGetId(array('title'=>"description34",'description'=>$criterion->description34,'position'=>2));
+			}
+			else
+			{
+				$scale_id=$existe->id;
+			}
+			DB::table('criterion_scale')->insert(array("scale_id"=>$scale_id,"criterion_id"=>$criterion->id));
+			$existe=DB::table('scales')->where('title',"description56")->where('description',$criterion->description56)->where('position',3)->first();
+			if(empty($existe))
+			{
+				$scale_id=DB::table('scales')->insertGetId(array('title'=>"description56",'description'=>$criterion->description56,'position'=>3));
+			}
+			else
+			{
+				$scale_id=$existe->id;
+			}
+			DB::table('criterion_scale')->insert(array("scale_id"=>$scale_id,"criterion_id"=>$criterion->id));
+			$existe=DB::table('scales')->where('title',"description78")->where('description',$criterion->description78)->where('position',4)->first();
+			if(empty($existe))
+			{
+				$scale_id=DB::table('scales')->insertGetId(array('title'=>"description78",'description'=>$criterion->description78,'position'=>4));
+			}
+			else
+			{
+				$scale_id=$existe->id;
+			}
+			$existe_ya=DB::table('criterion_scale')->where('scale_id', $scale_id)->where('criterion_id', $criterion->id)->first();
+			if(empty($existe_ya))DB::table('criterion_scale')->insert(array("scale_id"=>$scale_id,"criterion_id"=>$criterion->id));
+
+		
+		}
+
+	}
+
+
+}

app/database/unusedMigrations/2018_08_28_140328_remove_outcome_id_from_objectives_table.php

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

app/database/unusedMigrations/2020_04_04_005817_add_outcome_id_to_objectives_table.php

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

app/database/unusedMigrations/2020_10_04_141759_create_activity_criterion_table.php

@@ -0,0 +1,46 @@
+<?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('criterion_id')
+				->references('id')
+				->on('criteria')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table
+				->foreign('activity_id')
+				->references('id')
+				->on('activities')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->timestamps();
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('activity_criterion');
+	}
+
+}

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');
@@ -221,15 +198,13 @@ Route::filter('prof', function()
 |
 | The CSRF filter is responsible for protecting your application against
 | cross-site request forgery attacks. If this special token in a user
-| session does not match the one given in this request, we'll bail.
+| session does not match the one given in this request, we'll bail
 |
-*/
+ */
 
-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/Activity.php

@@ -10,7 +10,8 @@ class Activity extends Eloquent
 
   public function rubric()
   {
-    return $this->belongsTo('Rubric');
+//     return $this->belongsTo('Rubric');
+    return $this->belongsToMany('Rubric','new_rubric_activity');
   }
 
   public function course()

app/models/Course.php

@@ -42,6 +42,58 @@ class Course extends Eloquent
 
   }
 
+  public function outcomes_attempted()
+  {
+	return DB::table('courses')
+	    	->join('activities', 'activities.course_id', '=', 'courses.id')
+	    	->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
+	    	->join('new_criteria', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
+	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
+	    	->where('courses.id','=',$this->id)
+	    	->select('criterion_objective_outcome.outcome_id')
+	    	->distinct()
+	    	->orderBy('criterion_objective_outcome.outcome_id')
+	    	->get();
+
+//   	SELECT distinct cr.outcome_id FROM  courses c, activities a, activity_criterion ac, criteria cr WHERE c.id=a.course_id and a.id=ac.activity_id and ac.criterion_id=cr.id and c.id=1
+// 	return $this->id;
+  }
+
+  public function outcomes_achieved()
+  {
+		 $criteria=DB::table('new_criteria')
+	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
+	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+	    	->join('courses', 'activities.course_id', '=', 'courses.id')
+	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
+	    	->where('courses.id','=',$this->id)
+	    	->select('new_criteria.id','expected_percentage_students_achieving','activity_criterion.activity_id')
+	    	->distinct()
+	    	->get()
+			;
+
+		$conteo=0;
+		foreach($criteria as $criterion)
+		{	
+			$students_attempted=Criterion::students_attempted($criterion->id, $criterion->activity_id);
+			$students_achieved=Criterion::students_achieved($criterion->id, $criterion->activity_id);
+		
+			if($students_attempted)
+			{
+				$percentage_students_who_achieved=100.0*$students_achieved/$students_attempted;
+			}
+			else
+			{
+				$percentage_students_who_achieved=0;
+			}
+			if($percentage_students_who_achieved>=$criterion->expected_percentage_students_achieving)
+			{
+				$conteo++;
+			}
+		}		
+		return $conteo;
+  }
+
   public function semester()
   {
     return $this->belongsTo('Semester');

app/models/Criterion.php

@@ -37,9 +37,65 @@ class Criterion extends Eloquent
 		return $this->belongsTo('Program');
 	}
 
+// 	public function activities()
+// 	{
+// 		return $this->hasManyThrough('Activity','activity_criterion');
+// 	}
+// 
 	public function subcriteria()
 	{
 		return json_decode($this->subcriteria);
 	}
+	
+	public static function students_attempted($criterion_id,$activity_id)	
+	{
+		$students_attempted=0;
+// 		var_dump($criterion_id);
+// 		var_dump($semester);
+// 		exit();
+		$activities_criterions=DB::table('activity_criterion')
+			->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+			->join('courses', 'activities.course_id', '=', 'courses.id')
+			->where('activities.id','=',$activity_id)
+			->where('activity_criterion.criterion_id','=',$criterion_id)
+			->select('activity_criterion.id')
+			->distinct()
+			->get();
+			
+		foreach($activities_criterions as $activity_criterion)
+		{
+		
+			 $students_attempted+=DB::table('new_assessments')
+				->join('activity_criterion', 'new_assessments.activity_criterion_id', '=', 'activity_criterion.id')
+				->where('activity_criterion.id',$activity_criterion->id)
+				->count();
+		}
+		return $students_attempted;
+	}
+
+	public static function students_achieved($criterion_id,$activity_id)	
+	{
+		$students_achieved=0;
+		$activities_criterions=DB::table('activity_criterion')
+			->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+			->join('courses', 'activities.course_id', '=', 'courses.id')
+			->where('activities.id','=',$activity_id)
+			->where('activity_criterion.criterion_id','=',$criterion_id)
+			->select('activity_criterion.id','expected_student_score')
+			->distinct()
+			->get();
+			
+		foreach($activities_criterions as $activity_criterion)
+		{
+		
+// 			$expected_student_score=DB::table('new_criteria')->where('id',$criterion_id)->select('expected_student_score')->get();
+			 $students_achieved+=DB::table('new_assessments')
+				->join('activity_criterion', 'new_assessments.activity_criterion_id', '=', 'activity_criterion.id')
+				->where('activity_criterion.id',$activity_criterion->id)
+				->where('new_assessments.score','>=',$activity_criterion->expected_student_score)
+				->count();
+		}
+		return $students_achieved;
+	}
 
 }

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,6 +24,321 @@ class Outcome extends Eloquent
 	    return $this->hasMany('Objective');
 //		return $this->belongsToMany('Objective', 'objective_outcome');
 	}
+// 	public function attempted($semester, $is_grad)
+// 	{
+// 		return DB::table('new_criteria')
+// 	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
+// 	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+// 	    	->join('courses', 'activities.course_id', '=', 'courses.id')
+// 	    	->join('programs', 'programs.id', '=', 'courses.program_id')
+// 	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
+// 	    	->where('criterion_objective_outcome.outcome_id','=',$this->id)
+// 	    	->where('programs.is_graduate','=',$is_grad)
+// 	    	->where('courses.semester_id','=',$semester)
+// 	    	->count(DB::raw('DISTINCT new_criteria.id,activity_criterion.activity_id'))
+// 			;
+//
+// 	}
+// 	public function attempted($semester, $is_grad)
+// 	{
+// 		 $criteria=DB::table('new_criteria')
+// 	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
+// 	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+// 	    	->join('courses', 'activities.course_id', '=', 'courses.id')
+// 	    	->join('programs', 'programs.id', '=', 'courses.program_id')
+// 	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
+// 	    	->where('criterion_objective_outcome.outcome_id','=',$this->id)
+// 	    	->where('programs.is_graduate','=',$is_grad)
+// 	    	->where('courses.semester_id','=',$semester)
+// 	    	->select('new_criteria.id','expected_percentage_students_achieving','activity_criterion.activity_id')
+// 	    	->distinct()
+// 	    	->get()
+// 			;
+// 		$conteo=0;
+// 		foreach($criteria as $criterion)
+// 		{
+// 			$students_attempted=Criterion::students_attempted($criterion->id, $criterion->activity_id);
+// 			if($students_attempted)
+// 			{
+// 				$conteo++;
+// 			}
+// 		}
+// 		return $conteo;
+// 	}
+	public function active_by_semesters($selected_semesters, $level)
+	{
+		$min_start="9000-01-01 00:00:00";
+		$max_end="1000-01-01 00:00:00";
+		foreach($selected_semesters as $semester)
+		{
+			if($min_start>$semester->start)
+			{
+				$min_start=$semester->start;
+			}
+			if($max_end<$semester->end)
+			{
+				$max_end=$semester->end;
+			}
+		}
+		$outcomes = Outcome::where(function($query) use ($min_start)
+								   {
+										$query->where('deactivation_date', '>=', $min_start)
+											  ->orWhere('deactivation_date', null);
+								   })
+							->where('activation_date', '<=', $max_end)
+							->where(function($query2) use ($level)
+									{
+										$query2->where("level", $level+1)
+											   ->orWhere("level",3);
+									})
+							->orderBy('name', 'ASC')
+							->get();
+
+// 		return array('outcomes'=>$outcomes,'outcomes_attempted'=>$outcomes_attempted, 'outcomes_achieved'=>$outcomes_achieved, 'attemptedProgramsPerOutcome'=>$attemptedProgramsPerOutcome, 'achievedProgramsPerOutcome'=>$achievedProgramsPerOutcome,'participating_programs'=>$participating_programs);
+		return $outcomes;
+	}
+
+	public function programs_attempted($semesters)
+	{
+		$semesters_array=[];
+		foreach($semesters as $semester)
+		{
+			$semesters_array[]=$semester->id;
+		}
+		 $programs=DB::table('programs')
+	    	->join('courses', 'programs.id', '=', 'courses.program_id')
+	    	->join('activities', 'activities.course_id', '=', 'courses.id')
+	    	->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
+	    	->join('new_criteria', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
+	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
+	    	->where('criterion_objective_outcome.outcome_id','=',$this->id)
+	    	->whereIn('courses.semester_id',$semesters_array)
+	    	->distinct()
+	    	->select('programs.id')
+	    	->get()
+			;
+
+		return $programs;
+
+	}
+
+	public function attempted($semesters, $is_grad)
+	{
+		$semesters_array=[];
+		foreach($semesters as $semester)
+		{
+			$semesters_array[]=$semester->id;
+		}
+		 $criteria=DB::table('new_criteria')
+	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
+	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+	    	->join('courses', 'activities.course_id', '=', 'courses.id')
+	    	->join('programs', 'programs.id', '=', 'courses.program_id')
+	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
+	    	->where('criterion_objective_outcome.outcome_id','=',$this->id)
+	    	->where('programs.is_graduate','=',$is_grad)
+	    	->whereIn('courses.semester_id',$semesters_array)
+	    	->select('new_criteria.id','expected_percentage_students_achieving','activity_criterion.activity_id')
+	    	->distinct()
+	    	->get()
+			;
+		$conteo=0;
+		foreach($criteria as $criterion)
+		{
+			$students_attempted=Criterion::students_attempted($criterion->id, $criterion->activity_id);
+			if($students_attempted)
+			{
+				$conteo++;
+			}
+		}
+// 		var_dump($conteo);
+// 		exit();
+		return $conteo;
+	}
+
+	public function courses_attempted($courses)
+	{
+		$courses_array=[];
+		foreach($courses as $course)
+		{
+// 		var_dump($course);
+// 		exit();
+			$courses_array[]=$course->id;
+		}
+		 $criteria=DB::table('new_criteria')
+	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
+	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+	    	->join('courses', 'activities.course_id', '=', 'courses.id')
+	    	->join('programs', 'programs.id', '=', 'courses.program_id')
+	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
+	    	->where('criterion_objective_outcome.outcome_id','=',$this->id)
+	    	->whereIn('courses.id',$courses_array)
+	    	->select('new_criteria.id','expected_percentage_students_achieving','activity_criterion.activity_id')
+	    	->distinct()
+	    	->get()
+			;
+		$conteo=0;
+		foreach($criteria as $criterion)
+		{
+			$students_attempted=Criterion::students_attempted($criterion->id, $criterion->activity_id);
+			if($students_attempted)
+			{
+				$conteo++;
+			}
+		}
+// 		var_dump($conteo);
+// 		exit();
+		return $conteo;
+	}
+
+	public function courses_achieved($courses)
+	{
+		$courses_array=[];
+		foreach($courses as $course)
+		{
+			$courses_array[]=$course->id;
+		}
+
+		 $criteria=DB::table('new_criteria')
+	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
+	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+	    	->join('courses', 'activities.course_id', '=', 'courses.id')
+	    	->join('programs', 'programs.id', '=', 'courses.program_id')
+	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
+	    	->where('criterion_objective_outcome.outcome_id','=',$this->id)
+	    	->whereIn('courses.id',$courses_array)
+	    	->select('new_criteria.id','expected_percentage_students_achieving','activity_criterion.activity_id')
+	    	->distinct()
+	    	->get()
+			;
+
+
+		$conteo=0;
+		foreach($criteria as $criterion)
+		{
+			$students_attempted=Criterion::students_attempted($criterion->id, $criterion->activity_id);
+			$students_achieved=Criterion::students_achieved($criterion->id, $criterion->activity_id);
+
+			if($students_attempted)
+			{
+				$percentage_students_who_achieved=100.0*$students_achieved/$students_attempted;
+			}
+			else
+			{
+				$percentage_students_who_achieved=0;
+			}
+			if($percentage_students_who_achieved>=$criterion->expected_percentage_students_achieving)
+			{
+				$conteo++;
+			}
+		}
+		return $conteo;
+	}
+
+	public function achieved($semesters, $is_grad)
+	{
+		$semesters_array=[];
+		foreach($semesters as $semester)
+		{
+			$semesters_array[]=$semester->id;
+		}
+
+//   DB::enableQueryLog();
+		 $criteria=DB::table('new_criteria')
+	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
+	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+	    	->join('courses', 'activities.course_id', '=', 'courses.id')
+	    	->join('programs', 'programs.id', '=', 'courses.program_id')
+	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
+	    	->where('criterion_objective_outcome.outcome_id','=',$this->id)
+	    	->where('programs.is_graduate','=',$is_grad)
+	    	->whereIn('courses.semester_id',$semesters_array)
+	    	->select('new_criteria.id','expected_percentage_students_achieving','activity_criterion.activity_id')
+	    	->distinct()
+	    	->get()
+			;
+// 		dd(DB::getQueryLog());
+
+		$conteo=0;
+		foreach($criteria as $criterion)
+		{
+			$students_attempted=Criterion::students_attempted($criterion->id, $criterion->activity_id);
+			$students_achieved=Criterion::students_achieved($criterion->id, $criterion->activity_id);
+
+			if($students_attempted)
+			{
+				$percentage_students_who_achieved=100.0*$students_achieved/$students_attempted;
+			}
+			else
+			{
+				$percentage_students_who_achieved=0;
+			}
+			if($percentage_students_who_achieved>=$criterion->expected_percentage_students_achieving)
+			{
+				$conteo++;
+			}
+		}
+		return $conteo;
+	}
+
+
+// 	public function achieved($semester, $is_grad)
+// 	{
+//
+// //   DB::enableQueryLog();
+// 		 $criteria=DB::table('new_criteria')
+// 	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
+// 	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+// 	    	->join('courses', 'activities.course_id', '=', 'courses.id')
+// 	    	->join('programs', 'programs.id', '=', 'courses.program_id')
+// 	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
+// 	    	->where('criterion_objective_outcome.outcome_id','=',$this->id)
+// 	    	->where('programs.is_graduate','=',$is_grad)
+// 	    	->where('courses.semester_id','=',$semester)
+// 	    	->select('new_criteria.id','expected_percentage_students_achieving','activity_criterion.activity_id')
+// 	    	->distinct()
+// 	    	->get()
+// 			;
+// // 		dd(DB::getQueryLog());
+//
+// 		$conteo=0;
+// 		foreach($criteria as $criterion)
+// 		{
+// 			$outcome_performance=DB::table('outcome_performance')
+// 				->where('outcome_performance.outcome_id','=',$this->id)
+// 				->where('outcome_performance.criterion_id','=',$criterion->id)
+// 				->where('outcome_performance.semester_id','=',$semester)
+// 				->where('outcome_performance.level','=',$is_grad)
+// 				->select('students_attempted','students_achieved')
+// 				->first();
+// 			if(!empty($outcome_performance) and $outcome_performance->students_attempted)
+// 			{
+// 				$percentage_students_who_achieved=100.0*$outcome_performance->students_achieved/$outcome_performance->students_attempted;
+// 			}
+// 			else
+// 			{
+// 				$students_attempted=Criterion::students_attempted($criterion->id, $criterion->activity_id);
+// 				$students_achieved=Criterion::students_achieved($criterion->id, $criterion->activity_id);
+//
+// 				if($students_attempted)
+// 				{
+// 					$percentage_students_who_achieved=100.0*$students_achieved/$students_attempted;
+// 					DB::table('outcome_performance')->insert(array('criterion_id'=>$criterion->id,'outcome_id'=>$this->id,'semester_id'=>$semester,
+// 					'students_attempted' => $students_attempted,'students_achieved' => $students_achieved,'level'=>$is_grad));
+// 				}
+// 				else
+// 				{
+// 					$percentage_students_who_achieved=0;
+// 				}
+// 			}
+// 			if($percentage_students_who_achieved>=$criterion->expected_percentage_students_achieving)
+// 			{
+// 				$conteo++;
+// 			}
+// 		}
+// 		return $conteo;
+// 	}
+//
 
 	public static function active()
     {

app/models/Program.php

@@ -102,6 +102,216 @@ class Program extends Eloquent
 		return $this->hasMany('Criterion');
 	}
 
+// 	public function attempted_outcome($outcome_id, $semester)
+// 	{
+// 		$conteo= DB::table('activity_criterion')
+// 	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+// 	    	->join('courses', 'activities.course_id', '=', 'courses.id')
+// 	    	->join('programs', 'programs.id', '=', 'courses.program_id')
+// 	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'activity_criterion.criterion_id')
+// 	    	->where('criterion_objective_outcome.outcome_id','=',$outcome_id)
+// 	    	->where('programs.id','=',$this->id)
+// 	    	->where('courses.semester_id','=',$semester)
+// 	    	->count(DB::raw('DISTINCT criterion_objective_outcome.outcome_id'))
+// 			;	    	
+// 		return $conteo;		
+// 	}
+
+	public function attempted_criteria_by_outcome($outcome_id, $semesters)
+	{
+		$semesters_array=[];
+		foreach($semesters as $semester)
+		{
+			$semesters_array[]=$semester->id;
+		}
+		
+		$conteo= DB::table('activity_criterion')
+	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+	    	->join('courses', 'activities.course_id', '=', 'courses.id')
+	    	->join('programs', 'programs.id', '=', 'courses.program_id')
+	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'activity_criterion.criterion_id')
+	    	->where('criterion_objective_outcome.outcome_id','=',$outcome_id)
+	    	->where('programs.id','=',$this->id)
+	    	->whereIn('courses.semester_id',$semesters_array)
+	    	->count(DB::raw('DISTINCT criterion_objective_outcome.criterion_id'))
+			;	    	
+		return $conteo;		
+	}
+
+	public function attempted_outcome($outcome_id, $semesters)
+	{
+		$semesters_array=[];
+		foreach($semesters as $semester)
+		{
+			$semesters_array[]=$semester->id;
+		}
+		
+		$conteo= DB::table('activity_criterion')
+	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+	    	->join('courses', 'activities.course_id', '=', 'courses.id')
+	    	->join('programs', 'programs.id', '=', 'courses.program_id')
+	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'activity_criterion.criterion_id')
+	    	->where('criterion_objective_outcome.outcome_id','=',$outcome_id)
+	    	->where('programs.id','=',$this->id)
+	    	->whereIn('courses.semester_id',$semesters_array)
+	    	->count(DB::raw('DISTINCT criterion_objective_outcome.outcome_id'))
+			;	    	
+		return $conteo;		
+	}
+	
+	public function achieved_criteria_by_outcome($outcome_id, $semesters)
+	{
+		$semesters_array=[];
+		foreach($semesters as $semester)
+		{
+			$semesters_array[]=$semester->id;
+		}
+		
+//   DB::enableQueryLog();
+// 		dd(DB::getQueryLog());
+		 $criteria=DB::table('new_criteria')
+	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
+	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+	    	->join('courses', 'activities.course_id', '=', 'courses.id')
+	    	->join('programs', 'programs.id', '=', 'courses.program_id')
+	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
+	    	->where('criterion_objective_outcome.outcome_id','=',$outcome_id)
+	    	->where('programs.id','=',$this->id)
+	    	->whereIn('courses.semester_id',$semesters_array)
+	    	->select('new_criteria.id','expected_percentage_students_achieving','activity_criterion.activity_id')
+	    	->distinct()
+	    	->get()
+			;
+// 		dd(DB::getQueryLog());
+		 
+		$conteo=0;
+		$attempted_criteria_per_program_array=[];
+// 		$students_attempted=0;
+// 		$students_achieved=0;
+		foreach($criteria as $criterion)
+		{	
+			if(!isset($students_attempted[$criterion->id]))$students_attempted[$criterion->id]=0;
+			if(!isset($students_achieved[$criterion->id]))$students_achieved[$criterion->id]=0;
+			$attempted_criteria_per_program_array[$criterion->id]=1;
+			$students_attempted[$criterion->id]+=Criterion::students_attempted($criterion->id, $criterion->activity_id);
+			$students_achieved[$criterion->id]+=Criterion::students_achieved($criterion->id, $criterion->activity_id);
+		}
+// 		var_dump($outcome_id);
+// 		var_dump($this->id);
+// 		if(isset($students_attempted))var_dump($students_attempted);
+// 		else{print "aqui hay algo";}
+// 		print "<br>";
+// 		if(isset($students_achieved))var_dump($students_achieved);
+// 		print "<br>";
+// 		print "<br>";
+// 			exit();
+		if(isset($students_attempted))
+		{
+			foreach($students_attempted as $criteria_id => $students_attempted_n)
+			{
+				if($students_attempted_n)
+				{
+					$percentage_students_who_achieved=100.0*$students_achieved[$criteria_id]/$students_attempted[$criteria_id];
+				}
+				else
+				{
+					$percentage_students_who_achieved=0;
+				}
+				if($percentage_students_who_achieved>=$criterion->expected_percentage_students_achieving)
+				{
+					$conteo++;
+				}
+			}		
+		}
+		$attempted_criteria_per_program=count($attempted_criteria_per_program_array);
+		$achievedProgramOutcome=0;
+		$outcome=Outcome::where('id',$outcome_id)->select('expected_outcome')->first();
+// 		var_dump($outcome->expected_outcome);
+// 		exit();
+		if($attempted_criteria_per_program!=0 && 100.0*$conteo/$attempted_criteria_per_program >= $outcome->expected_outcome)
+		{
+			$achievedProgramOutcome=1;
+			// $output[]= 'END OF PROGRAM: '.$program->name.'-'.json_encode($achievedProgramsPerOutcome);
+		}
+		return $conteo;
+	}
+
+	public function achieved_outcome($outcome_id, $semesters)
+	{
+		$semesters_array=[];
+		foreach($semesters as $semester)
+		{
+			$semesters_array[]=$semester->id;
+		}
+		
+//   DB::enableQueryLog();
+// 		dd(DB::getQueryLog());
+		 $criteria=DB::table('new_criteria')
+	    	->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'new_criteria.id')
+	    	->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+	    	->join('courses', 'activities.course_id', '=', 'courses.id')
+	    	->join('programs', 'programs.id', '=', 'courses.program_id')
+	    	->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'new_criteria.id')
+	    	->where('criterion_objective_outcome.outcome_id','=',$outcome_id)
+	    	->where('programs.id','=',$this->id)
+	    	->whereIn('courses.semester_id',$semesters_array)
+	    	->select('new_criteria.id','expected_percentage_students_achieving','activity_criterion.activity_id')
+	    	->distinct()
+	    	->get()
+			;
+// 		dd(DB::getQueryLog());
+		 
+		$conteo=0;
+		$attempted_criteria_per_program_array=[];
+// 		$students_attempted=0;
+// 		$students_achieved=0;
+		foreach($criteria as $criterion)
+		{	
+			if(!isset($students_attempted[$criterion->id]))$students_attempted[$criterion->id]=0;
+			if(!isset($students_achieved[$criterion->id]))$students_achieved[$criterion->id]=0;
+			$attempted_criteria_per_program_array[$criterion->id]=1;
+			$students_attempted[$criterion->id]+=Criterion::students_attempted($criterion->id, $criterion->activity_id);
+			$students_achieved[$criterion->id]+=Criterion::students_achieved($criterion->id, $criterion->activity_id);
+		}
+// 		var_dump($outcome_id);
+// 		var_dump($this->id);
+// 		if(isset($students_attempted))var_dump($students_attempted);
+// 		else{print "aqui hay algo";}
+// 		print "<br>";
+// 		if(isset($students_achieved))var_dump($students_achieved);
+// 		print "<br>";
+// 		print "<br>";
+// 			exit();
+		if(isset($students_attempted))
+		{
+			foreach($students_attempted as $criteria_id => $students_attempted_n)
+			{
+				if($students_attempted_n)
+				{
+					$percentage_students_who_achieved=100.0*$students_achieved[$criteria_id]/$students_attempted[$criteria_id];
+				}
+				else
+				{
+					$percentage_students_who_achieved=0;
+				}
+				if($percentage_students_who_achieved>=$criterion->expected_percentage_students_achieving)
+				{
+					$conteo++;
+				}
+			}		
+		}
+		$attempted_criteria_per_program=count($attempted_criteria_per_program_array);
+		$achievedProgramOutcome=0;
+		$outcome=Outcome::where('id',$outcome_id)->select('expected_outcome')->first();
+// 		var_dump($outcome->expected_outcome);
+// 		exit();
+		if($attempted_criteria_per_program!=0 && 100.0*$conteo/$attempted_criteria_per_program >= $outcome->expected_outcome)
+		{
+			$achievedProgramOutcome=1;
+			// $output[]= 'END OF PROGRAM: '.$program->name.'-'.json_encode($achievedProgramsPerOutcome);
+		}
+		return $achievedProgramOutcome;
+	}
 
 	public static function generalComponentPrograms(){
 		return self::whereIn('id', array(123,124,125,126,127,128,129))->get();

app/models/Scale.php

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

app/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,11 @@ 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',
+    'global.view-three-year-plan'
+), function ($view) {
+    $view->with('role', Auth::user()->role);
+});
 
 
 /*
@@ -66,33 +66,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 +98,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 +106,112 @@ 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 Criterions associated to programs
+    Route::post('fetchAllCriterion', array(
+        'as' => 'fetchAllCriterion',
+        'uses' => 'CriteriaController@fetchAllCriterion'
+    ));
+    Route::post('delete', array(
+        'as' => 'delete',
+        'uses' => 'CriteriaController@delete'
+    ));
+    Route::post('delete', array(
+        'as' => 'delete',
+        'uses' => 'TransformativeActionsController@deleteTA'
+    ));
     // 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,57 +219,71 @@ 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 users all objectives and criteria
     Route::get('learning-objectives-criteria', 'CriteriaController@objectivesIndex');
-    Route::post('fetchObjectiveForCriteria', array('before' => 'csrf', 'uses'=>'ObjectivesController@fetchObjectiveForCriteria'));
+    Route::post('fetchObjectiveForCriteria', array('before' => 'csrf', 'uses' => 'ObjectivesController@fetchObjectiveForCriteria'));
 
     // 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'));
+
+    // Transformative Actions for p-coordinators and professors
+    Route::get('transformativeAction', array('uses' => 'TransformativeActionsController@editTA'));
+    Route::post('transformativeAction/createTA', array('before' => 'csrf', 'uses' => 'TransformativeActionsController@createTA'));
+    Route::post('transformativeAction/selectTA', array('before' => 'csrf', 'uses' => 'TransformativeActionsController@selectTA'));
+    Route::post('transformativeAction/updateTA', array('before' => 'csrf', 'uses'=>'TransformativeActionsController@updateTA'));
+    Route::post('transformativeAction/filterTA', array('before' => 'csrf', 'uses'=>'TransformativeActionsController@filterTA'));
+    Route::post('transformativeAction/objectivesFromOutcome', array('before' => 'csrf', 'uses'=>'TransformativeActionsController@objectivesFromOutcome'));
 
     /**
      * 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');
+        Route::post('fetchObjectives', 'Objective2Controller@fetchAllObjectives');
         // TODO: Change later
         Route::get('new-learning-outcomes', 'OutcomesController@newIndex');
-        Route::post('learning-outcomes/update', array('before' => 'csrf', 'uses' => 'OutcomesController@update'));
+
         Route::post('learning-outcomes/update', array('before' => 'csrf', 'uses' => 'OutcomesController@updateMore'));
-        Route::post('crtiteria/update', array('before' => 'csrf', 'uses'=>'CriteriaController@update'));
-        Route::delete('crtiteria/delete', array('before' => 'csrf', 'uses'=>'CriteriaController@destroy'));
+        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::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('criteria', array('uses' => 'CriteriaController@edit'));
+        Route::get('objectives', array('uses' => 'Objective2Controller@edit'));
         Route::get('administrator/semesters', 'SemestersController@edit');
         Route::post('administrator/semesters/update', 'SemestersController@update');
+        Route::post('deleteObjective', 'Objective2Controller@delete');
 
         Route::get('assessment-report/{outcome_id}', 'OutcomesController@assessmentReport');
         // TODO: Change later
@@ -277,51 +294,70 @@ 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');
         Route::post('programs/report', 'ProgramsController@showReport');
+        // Route::post('storeTypInfo', 'OutcomesController@storeCycleInfo'); //TODO: where is this route supposed to be placed?
         Route::get('programs', 'ProgramsController@index');
         Route::get('template-list', 'TemplatesController@schoolCoordinatorIndex');
-
+        Route::post('deleteObjective', 'Objective2Controller@delete');
         // Print school report
         Route::get('print_school/{id}', 'SchoolsController@print_school');
 
         // Assessment reports
         Route::get('school-assessment-report/{outcome_id}', 'OutcomesController@schoolAssessmentReport');
+
+        // Gabriel added this, so the school coordinator can add criterias and objectives
+        Route::get('school-objective', 'Objective2Controller@editSchool');
+        Route::get('school-criteria', 'CriteriaController@editSchool');
+
+        // Show users plan de tres a~nos
+        Route::get('three-years-plan', 'ThreeYearPlanController@threeYearsReport');
+        Route::post('fetchThreeYears', array('before' => 'csrf', 'uses'=>'ThreeYearPlanController@fetchThreeYears'));
+        Route::post('typ/lookUp', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@lookup_typ_semester_outcome'));
+        Route::post('section2_arrive', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@section2_arrive'));
+        Route::post('section2_on_change', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@section2_on_change'));
+        Route::post('section3_arrive', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@section3_arrive'));
+        Route::post('section3_on_change', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@section3_on_change'));
+        Route::post('typ/getObjectives', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@getObjectivesForTYP'));
+        Route::post('typ/updateOutcomeSemsters', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@typ_update_outcomes_semesters'));
+        Route::post('typ/update', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@update_typ_outcomes_semesters'));
+
     });
 
+
     /**
      * Program Coordinator Routes
      */
-    Route::group( array('before' => 'pcoord'), function()
-    {
+    Route::group(array('before' => 'pcoord'), function () {
         Route::get('program-coordinator', 'ProgramCoordinatorsController@overview');
-
+        Route::post('deleteObjective', 'Objective2Controller@delete');
         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::get('criteria', 'CriteriaController@edit');
+        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('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');
 
+        //Criteria and objectives
+        Route::get('program-criteria', 'CriteriaController@editProgram');
+        Route::get('program-objective', 'Objective2Controller@editProgram');
+
         // Print program report
         Route::get('print_program/{id}', 'ProgramsController@print_program');
 
@@ -334,19 +370,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
@@ -354,8 +396,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
@@ -363,50 +405,63 @@ Route::group(array('before' => 'auth|has_access'), function()
         Route::get('new-report/{id}', 'OutcomesController@newReport');
         Route::get('new-report-all', 'OutcomesController@newReportAll');
         Route::get('courses/{id}', 'CoursesController@newShow');
+
+        // Transformative Actions
+        Route::post('transformativeAction/approveTA', array('before' => 'csrf', 'uses'=>'TransformativeActionsController@approveTA'));
+
+        // Show users plan de tres a~nos
+        Route::get('three-years-plan', 'ThreeYearPlanController@threeYearsReport');
+        Route::post('fetchThreeYears', array('before' => 'csrf', 'uses'=>'ThreeYearPlanController@fetchThreeYears'));
+        Route::post('typ/lookUp', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@lookup_typ_semester_outcome'));
+        Route::post('section2_arrive', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@section2_arrive'));
+        Route::post('section2_on_change', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@section2_on_change'));
+        Route::post('section3_arrive', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@section3_arrive'));
+        Route::post('section3_on_change', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@section3_on_change'));
+        Route::post('typ/getObjectives', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@getObjectivesForTYP'));
+        Route::post('typ/updateOutcomeSemsters', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@typ_update_outcomes_semesters'));
+        Route::post('typ/update', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@update_typ_outcomes_semesters'));
+
     });
 
 
     /**
      * 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}/other_method', 'RubricsController@newOtherMethod');
         Route::get('activities/{activity_id}/rubric', 'RubricsController@show');
         Route::get('activities/{activity_id}/rubric/{rubric_id}/download', 'RubricsController@download');
         Route::get('activities/{activity_id}/rubric/{rubric_id}/print', 'RubricsController@printview');
         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('learning-objectives-criteria', 'CriteriaController@objectivesIndex');
         Route::get('export_grades/{id}', 'CoursesController@exportGrades');
-
+        Route::get('learning-objectives-criteria', 'CriteriaController@objectivesIndex');
         // Assessment reports
         Route::get('professor-assessment-report/{outcome_id}', 'OutcomesController@professorAssessmentReport');
         Route::get('professor-assessment-reports', 'OutcomesController@professorAssessmentReports');
 
         Route::get('general-studies-overview', 'ProfessorsController@generalStudiesOverview');
-
-
     });
-
 });

app/views/global/view-three-year-plan.blade.php

@@ -0,0 +1,803 @@
+@extends('layouts.master')
+
+@section('navigation')
+    @if(Auth::user()->role==2)
+      @include('local.managers.sCoords._navigation')
+    @elseif(Auth::user()->role==3)
+      @include('local.managers.pCoords._navigation')
+    @endif
+@stop
+
+@section('main')
+  {{-- TODO: look where to place this script.
+          if placed inside .ready() or before it,
+            an error that the function is not defined occurs. --}}
+  {{-- TODO: no reconoce acentos --}}
+  <script type="text/javascript">
+    function filterCycles() {
+      // Declare variables
+      var input, filter, div, li, i, cycleText;
+      input = document.getElementById('userInput');
+      filter = input.value.toUpperCase();
+      div = document.getElementById("list");
+      li = div.getElementsByTagName('li');
+
+      // Loop through all list items, and hide those who don't match the search query
+      for (i = 0; i < li.length; i++) {
+        cycleText = li[i].textContent;
+        if (cycleText.toUpperCase().indexOf(filter) > -1) {
+          li[i].style.display = "";
+        } else {
+          li[i].style.display = "none";
+        }
+      }
+    }
+
+    // onChange, update selected outcomes-semesters
+    function update_outcome_semesters() {
+      var outcomeSemesterArray= new Array();
+      // For each learning outcome, get selected boxes and put it into an array
+      $('#outcome-semesters-body tr').each(function( index )
+      {
+          var outcomeObject = new Object();
+          outcomeObject.id= $(this).data('id');
+          var semesters = new Array();
+          var temp = new Array();
+          temp.push($(this).children(".sem1-box").find("input").attr('name'));
+          temp.push($(this).children(".sem1-box").find("input").prop("checked"));
+          semesters.push(temp);
+
+          temp = new Array();
+          temp.push($(this).children(".sem2-box").find("input").attr('name'));
+          temp.push($(this).children(".sem2-box").find("input").prop("checked"));
+          semesters.push(temp);
+
+          temp = new Array();
+          temp.push($(this).children(".sem3-box").find("input").attr('name'));
+          temp.push($(this).children(".sem3-box").find("input").prop("checked"));
+          semesters.push(temp);
+
+          temp = new Array();
+          temp.push($(this).children(".sem4-box").find("input").attr('name'));
+          temp.push($(this).children(".sem4-box").find("input").prop("checked"));
+          semesters.push(temp);
+
+          temp = new Array();
+          temp.push($(this).children(".sem5-box").find("input").attr('name'));
+          temp.push($(this).children(".sem5-box").find("input").prop("checked"));
+          semesters.push(temp);
+
+          temp = new Array();
+          temp.push($(this).children(".sem6-box").find("input").attr('name'));
+          temp.push($(this).children(".sem6-box").find("input").prop("checked"));
+          semesters.push(temp);
+
+          outcomeObject.semesters= semesters;
+
+          var clone = jQuery.extend({}, outcomeObject);
+          outcomeSemesterArray.push(clone);
+      });
+
+      var id = $('#table-cycles').data('typ-id');
+
+      $.post(
+          "{{ URL::action('ThreeYearPlanController@update_typ_outcomes_semesters') }}",
+          {
+            outcomeSemesterArray : JSON.stringify(outcomeSemesterArray),
+            typ_id: (id)
+          },
+          function(data)
+          {
+              //;
+          }
+      );
+    }
+
+  </script>
+
+  <div class="row">
+    <div class="col-md-3">
+      <input class="form-control" type="text" id="userInput" onkeyup="filterCycles()" placeholder="Search for Cycles..">
+      <div class="list-group" id='list'>
+        @foreach ($typs as $typ)
+          <li data-cycle-id="{{$typ->id}}" class="list-group-item">{{$typ->year_start}}-{{$typ->year_end}}</li>
+        @endforeach
+      </div>
+    </div>
+
+    <div class="col-md-9">
+      <div id="cycle-display" class="panel panel-default">
+        <div class="panel-heading">
+          <h4 class=" panel-title" style="cursor:auto!important;">
+          </h4>
+        </div>
+        <div class="panel-body" id="section1">
+          <p class="section1-description">Select two or more Semesters that will be evaluated by an Outcome.</p>
+            <div class="table-responsive">
+              {{-- <table class="table table-striped table-condensed datatable"> --}}
+              <table data-typ-id="0" class="table table-striped table-condensed" id="table-cycles">
+                <style media="screen">
+                  input[type=checkbox] {transform: scale(2);}
+                </style>
+                <thead>
+                  <tr style="background-color:#FDD8B5;">
+                    {{-- <th rowspan="0" style="background-color:#F5DEDD;" class="text-center">Dominios de aprendizaje</th> --}}
+                    <th rowspan="0" style="background-color:#F5DEDD;" class="text-center">Learning Outcomes</th>
+                    <th colspan="2" class="text-center" id="cycle1"></th>
+                    <th colspan="2" class="text-center" id="cycle2"></th>
+                    <th colspan="2" class="text-center" id="cycle3"></th>
+                  </tr>
+                  <tr class="">
+                    <th class="text-center">1er sem</th>
+                    <th class="text-center">2do sem</th>
+                    <th class="text-center">1er sem</th>
+                    <th class="text-center">2do sem</th>
+                    <th class="text-center">1er sem</th>
+                    <th class="text-center">2do sem</th>
+                  </tr>
+                </thead>
+                <tfoot>
+                </tfoot>
+                <input type="text" id="cycle_id" name="cycle_id" value="getsReplacedWithJS" hidden>
+                      {{-- <label for="profesores">Profesores (pares)</label> --}}
+                <tbody id="outcome-semesters-body" onchange="update_outcome_semesters()">
+                  @foreach ($outcomes as $outcome)
+                    <tr data-id="{{$outcome->id}}">
+                      <th>{{$outcome->name}}</th>
+                      <th class="text-center sem1-box"><input type="checkbox" id="{{$outcome->id}}-sem1" name="{{$outcome->id}}-sem1" value="checked" /></th>
+                      <th class="text-center sem2-box"><input type="checkbox" id="{{$outcome->id}}-sem2" name="{{$outcome->id}}-sem2" value="checked" /></th>
+                      <th class="text-center sem3-box"><input type="checkbox" id="{{$outcome->id}}-sem3" name="{{$outcome->id}}-sem3" value="checked" /></th>
+                      <th class="text-center sem4-box"><input type="checkbox" id="{{$outcome->id}}-sem4" name="{{$outcome->id}}-sem4" value="checked" /></th>
+                      <th class="text-center sem5-box"><input type="checkbox" id="{{$outcome->id}}-sem5" name="{{$outcome->id}}-sem5" value="checked" /></th>
+                      <th class="text-center sem6-box"><input type="checkbox" id="{{$outcome->id}}-sem6" name="{{$outcome->id}}-sem6" value="checked" /></th>
+                    </tr>
+                  @endforeach
+                </tbody>
+              </table>
+              <hr>
+              <div class="">
+                <button class="btn-lg btn-primary pull-right go-to-2" style="margin:5px;">Select Objectives</button>
+              </div>
+            </div>
+        </div>
+        <div class="panel-body" id="section2">
+          <p class="section2-description">Select one or more Objectives that will be evaluated in a given Semester.</p>
+            <div>
+              <div class="objectives-section-0">
+              </div>
+              <div class="objectives-section">
+              </div>
+            <hr>
+            <div class="">
+              <button class="btn-lg btn-primary pull-right go-to-3" style="margin:5px;">Go to Objectives Selection</button>
+              <button class="btn-lg btn-primary pull-right back-to-1" style="margin:5px;">Back to Semester Selection</button>
+            </div>
+            </div>
+        </div>
+        <div class="panel-body" id="section3">
+          <p class="section3-description">Select one or more Courses that will be evaluated by an Objective in a given Semester.</p>
+            <div>
+              <div class="courses-main-clone-0" hidden>
+                <div class="title-course-selection-0">
+                  <button class="btn btn-md btn-secondary pull-right hide-course-selection"><span class="glyphicon glyphicon-minus"></span> Hide Outcome Options</button>
+                  <button class="btn btn-md btn-secondary pull-right show-course-selection"><span class="glyphicon glyphicon-plus"></span> Show Outcome Options</button>
+                  <p class="h3" style="width:100%;max-width:80%;"><b>Outcome: example</b></p>
+                </div>
+                <div class="semester-course-selection-0" style="margin-left:30px;">
+                  <label class="semester-label-course-selection-0" for="">First Semester of 2000-2000</label>
+                  <div class="select-course-selection-0" style="margin-left:30px;">
+                    <div class="objective-selector-0">
+                      <label for="">OBJECTIVE TEMP</label>
+                      <select class="select-0" name="" style="width:100%;max-width:55%;">
+                        <option class="default-option" value="nothing_selected">Select a course</option>
+                      </select>
+                      <button class="btn btn-md btn-danger delete-selection-0" style="margin:5px;"><span class="glyphicon glyphicon-minus"></span> remove</button>
+                    </div>
+                    <div class="clone-objective-course-select-0">
+                      <button class="btn btn-md btn-secondary add-objective-course" style="margin:5px;"><span class="glyphicon glyphicon-plus"></span> Choose more Courses</button>
+                    </div>
+                  </div>
+                </div>
+                <div class="footer-course-selection-0" style="margin-left:30px;" hidden>
+                  <p><b>Course selection for this Outcome is currently hidden</b></p>
+                </div>
+              </div>
+              <div class="courses-section-0">
+              </div>
+              <div class="courses-section">
+              </div>
+            <hr>
+            <div class="">
+              <button class="btn-lg btn-primary pull-right go-to-temp" style="margin:5px;">Go to TYP evaluation page</button>
+              <button class="btn-lg btn-primary pull-right back-to-2" style="margin:5px;">Back to Objective Selection</button>
+            </div>
+            </div>
+        </div>
+      </div>
+    </div>
+    <div class="col-md-9">
+      <div class="no-cycle alert alert-info">
+        <p>Select a Three year cycle to start</p>
+      </div>
+    </div>
+
+  </div>
+@stop
+
+@section('included-js')
+    @include('global._datatables_js')
+@stop
+
+@section('javascript')
+
+$(document).ready(function()
+{
+  // --------------------------------------------------------------------------
+  // Page load
+  // --------------------------------------------------------------------------
+
+  // Hide accordion panel contents by default
+  var outcomes = {{json_encode($outcomes)}};
+
+  $('.panel-group .panel-body').hide();
+
+  $('#cycle-display').parent().hide();
+
+  $("#clonedOutcome0").hide();;
+
+  $('.show-course-selection').hide();
+
+  // --------------------------------------------------------------------------
+  // Functions
+  // --------------------------------------------------------------------------
+
+
+
+(function () {
+    var previous;
+    $("select").on('focus', function () {
+        // Store the current value on focus and on change
+        previous = this.value;
+    }).change(function() {
+
+      //comienzo
+      var options_values = $(this).parent().find('select').val().split('-');
+
+      //ifs
+      if (options_values.length == 3){
+
+        var typ_id = $('#table-cycles').data('typ-id');
+        var previous_objective_id = previous.split('-')[2];
+
+        var options_values =this.value.split('-');
+        var outcome_id = options_values[0];
+        var semester_id = options_values[1];
+        var new_objective_id = options_values[2];
+
+        if (new_objective_id == 'n'){
+          new_objective_id = 'nothing_selected';
+        }
+        if (previous_objective_id == 'n'){
+          previous_objective_id = 'nothing_selected';
+        }
+
+        $.post(
+        "{{ URL::action('ThreeYearPlanController@section2_on_change') }}",
+        {
+          typ_id: (typ_id),
+          previous_objective_id: (previous_objective_id),
+          outcome_id: (outcome_id),
+          semester_id: (semester_id),
+          new_objective_id: (new_objective_id)
+        },
+        function(data)
+        {
+          //
+        }
+        );
+        previous = this.value;
+
+      }
+      else if (options_values.length == 4){
+
+        var typ_id = $('#table-cycles').data('typ-id');
+        var previous_course_id = previous.split('-')[3];
+
+        var options_values =this.value.split('-');
+        var outcome_id = options_values[0];
+        var semester_id = options_values[1];
+        var objective_id = options_values[2];
+        var new_course_id = options_values[3];
+
+        if (new_course_id == 'n'){
+          new_course_id = 'nothing_selected';
+        }
+        if (previous_course_id == 'n'){
+          previous_course_id = 'nothing_selected';
+        }
+
+        $.post(
+        "{{ URL::action('ThreeYearPlanController@section3_on_change') }}",
+        {
+          typ_id: (typ_id),
+          previous_course_id: (previous_course_id),
+          outcome_id: (outcome_id),
+          semester_id: (semester_id),
+          objective_id: (objective_id),
+          new_course_id: (new_course_id)
+        },
+        function(data)
+        {
+          //
+        }
+        );
+        previous = this.value;
+
+      }
+    });
+})();
+
+
+  // --------------------------------------------------------------------------
+  // Events
+  // --------------------------------------------------------------------------
+
+
+
+    // When list item is clicked, load corresponding info
+    //section 1
+    $('.list-group-item').on('click', function()
+    {
+      var id = $(this).data('cycle-id');
+      $('#table-cycles').data('typ-id',id);
+      $('#section1').show();
+      $('#section2').hide();
+      $('#section3').hide();
+
+      var outcome_id_semester_code_program_id_box_id_typ_id = new Object();
+      var outcome_id_semester_code_program_id_box_id_typ_id = Array();
+
+      $.post(
+      "{{ URL::action('ThreeYearPlanController@fetchThreeYears') }}",
+      { id: id },
+      function(json)
+      {
+
+
+          // Retrieve datatable instance
+          var table = $('#table-cycles');
+
+          var typ = json.typ;
+          var year_start = json.typ.year_start;
+          var year_end = json.typ.year_end;
+          var semesters = json.typ.semesters;
+          var program_id = {{$program_id}};
+          //  var outcomes = already defined
+
+          $('#cycle-display').parent().show();
+          $('.no-cycle').parent().hide();
+
+          //Display title and definition
+          $('#cycle-display .panel-title').html('Planning for the years of ' + year_start + '-' + year_end);
+          $('#cycle-display .cycle-definition').html("Select the semesters which you would like to review an outcome in the three year plan of " + year_start + '-' + year_end+".");
+
+          //Empty table
+          //table.clear();
+
+          // Add new semesters
+          //if(typ.length>0)
+          //{
+          $('table').show();
+          $('#cycle1').html((year_start)+"-"+(year_start+1));
+          $('#cycle2').html((year_start+1)+"-"+(year_end-1));
+          $('#cycle3').html((year_end-1)+"-"+(year_end));
+
+          $('#cycle_id').val(typ.id);
+
+          //resets the checkboxes' name, clears marked, and disables them by default.
+          $.each(outcomes, function(index, outcome)
+          {
+            $.each([1,2,3,4,5,6], function(index, semester)
+            {
+              var id = outcome.id+"-sem"+semester;
+              var new_name = id;
+              document.getElementById(id).setAttribute("name", new_name);
+              $("#"+id).attr("disabled", true);
+              $("#"+id).prop("checked", false);
+            });
+          });
+
+
+          var i = 1;
+          $.each(outcomes, function(index, outcome)
+          {
+            $.each(semesters, function(index, semester)
+            {
+              var id = outcome.id+"-sem"+i;
+              var new_name = outcome.id+"-sem"+semester.code;
+
+              var checkbox = document.getElementById(id);
+              checkbox.setAttribute("name", new_name);
+
+              //enable the check box
+              $("#"+id).removeAttr("disabled");
+
+              //store checkboxes info in an array to later lookup which are marked
+              var temp = Array(outcome.id,semester.code,program_id, id, typ.id);
+              outcome_id_semester_code_program_id_box_id_typ_id.push(temp);
+              i++;
+            });
+            i = 1;
+          });
+
+          //search which boxes are marked in the data-base
+          $.post(
+            "{{ URL::action('ThreeYearPlanController@lookup_typ_semester_outcome'  ) }}",
+            {
+              info : (outcome_id_semester_code_program_id_box_id_typ_id)
+            },
+            function(data)
+            {
+              $.each(data.box_value, function(index, box_id_value)
+              {
+                var box_id = box_id_value[0];
+                var value = box_id_value[1];
+                if (1 == value) {
+                  $("#"+box_id).prop("checked", true);
+                }
+              });
+            }
+          );
+      },
+      'json'
+      );
+
+
+    });
+
+
+  });
+
+
+    // go back to section 1
+    $('.back-to-1').on('click', function(e)
+    {
+      window.scrollTo(0, 0);
+      $(".panel-body").hide();
+      $("#section1").show();
+    });
+
+
+    // go back to section 2
+    $('.back-to-2').on('click', function(e)
+    {
+      window.scrollTo(0, 0);
+      $(".panel-body").hide();
+      $("#section2").show();
+    });
+
+
+  // go to section 2
+  $('.go-to-2').on('click', function(e)
+  {
+    var not_enough = false;
+    var i = 0;
+    $('#table-cycles tbody tr').each(function() {
+      $(this).find('th').each(function() {
+        if ($(this).find('input').is(':checked')){
+          i = i + 1;
+        }
+      });
+
+      if (i < 2){
+        not_enough = true;
+      }
+      i = 0;
+    });
+
+    if (not_enough == true){
+      alert("Each Outcome must be evaluated in at least 2 semesters.");
+      return true;
+    }
+
+    $(".panel-body").hide();;
+    $("#section2").show();;
+
+    var typ_id = $('#table-cycles').data('typ-id');
+    $.post(
+        "{{ URL::action('ThreeYearPlanController@section2_arrive') }}",
+        {
+          typ_id: (typ_id)
+        },
+        function(data)
+        {
+          $('.objectives-section').empty();
+
+          $.each(data, function(index, outcome)
+          {
+            var outcome_name = outcome.name;
+            var outcome_id = outcome.id;
+            $('.objectives-section').append('<hr>');
+
+            var area = $('.courses-section-0').clone(true);
+            area.attr('class','');
+
+            var title = 'Outcome: ' + outcome_name;
+            var title_area = $('.title-course-selection-0').clone(true);
+            title_area.attr('class','title-course-selection h3');
+            title_area.find('p').html(title);
+
+            area.append(title_area);
+
+            $.each(outcome.selected_semesters, function(index, semester)
+            {
+                var semester_name = semester.name;
+                var semester_id = semester.semester_id;
+
+                var select_area = $('.semester-course-selection-0').clone(true);
+                select_area.attr('class','semester-course-selection');
+                select_area.attr('style',' ');
+                select_area.find('.semester-label-course-selection-0').html(semester_name+"'s Objectives");
+                var no_option = outcome_id+'-'+semester_id+'-n';
+                select_area.find('option').val(no_option).html('Select an Objective');
+                select_area.find('.add-objective-course').html('<span class="glyphicon glyphicon-plus"></span> Choose more Objectives');
+
+                if (semester.available_objectives.length != 0){
+                  select_area.find('.objective-selector-0 label').hide();
+                  $.each(semester.available_objectives, function(index, objective)
+                  {
+                    var objective_id = objective.id;
+                    var option_value = outcome_id+'-'+semester_id+'-'+objective_id;
+
+                    var option_name = objective.text;
+                    var new_option = select_area.find('.default-option').clone(true);
+                    new_option.html(option_name);
+                    new_option.val(option_value);
+                    new_option.attr('class','select_objective');
+
+                    select_area.find('select').append(new_option);
+                  });
+                }
+                if (semester.available_objectives.length == 0){
+                  select_area.find('select').prop('disabled', 'disabled');
+                  select_area.find('.objective-selector-0 label').html('There are no Objectives available for this Outcome and Semester combination');
+                  select_area.find('.objective-selector-0 select').hide();
+                  select_area.find('button').prop('disabled', 'disabled');
+                }
+                $.each(semester.selected_objectives, function(index, objective)
+                {
+                  select_area.find('.objective-selector-0').hide();
+                  //si hay objetivos previamente seleccionados, escribirlos
+                  var objective_id = objective.id;
+                  var option_value = outcome_id+'-'+semester_id+'-'+objective_id;
+                  var new_select = select_area.find('.objective-selector-0').clone(true);
+                  new_select.attr('class','objective-selector');
+                  new_select.find('select').val(option_value);
+                  select_area.find('.clone-objective-course-select-0').before(new_select);
+                  select_area.find('.objective-selector').show();
+                });
+                area.append(select_area);
+            });
+            var footer = $('.footer-course-selection-0').clone(true);
+            footer.attr('class','footer-course-selection');
+            footer.find('p').html('<b>Objective selection for this Outcome is currently hidden.</b>');
+            area.append(footer);
+
+            area.append('<br>');
+            area.show(true);
+            $('.objectives-section').append(area);
+          });
+        }
+    );
+  });
+
+
+
+    // hide the options of an outcome in section 2 and 3
+    $('.hide-course-selection').on('click', function(e)
+    {
+      $(this).parent().find('.show-course-selection').show();;
+      $(this).hide();;
+      $(this).parent().parent().find('.semester-course-selection').hide(333);
+      $(this).parent().parent().find('.footer-course-selection').show(333);
+    });
+
+    // show the options of an outcome in section 2 and 3
+    $('.show-course-selection').on('click', function(e)
+    {
+      $(this).parent().find('.hide-course-selection').show();
+      $(this).hide();
+      $(this).parent().parent().find('.semester-course-selection').show(333);
+      $(this).parent().parent().find('.footer-course-selection').hide(333);
+    });
+
+
+    // in section 2 and 3, add selects for choosing more objectives and courses, respectively
+    $('.add-objective-course').on('click', function(e)
+    {
+      var new_select = $(this).parent().parent().find('.objective-selector-0').clone(true);
+      new_select.attr('class','objective-selector');
+      new_select.show();
+      $(this).parent().before(new_select);
+    });
+
+
+  // go to section 3
+  $('.go-to-3').on('click', function(e)
+  {
+    window.scrollTo(0, 0);
+    $(".panel-body").hide();;
+    $("#section3").show();;
+
+    var typ_id = $('#table-cycles').data('typ-id');
+    $.post(
+        "{{ URL::action('ThreeYearPlanController@section3_arrive') }}",
+        {
+          typ_id: (typ_id)
+        },
+        function(data)
+        {
+          $('.courses-section').empty();
+
+          $.each(data, function(index, outcome)
+          {
+            var outcome_name = outcome.name;
+            var outcome_id = outcome.id;
+            $('.courses-section').append('<hr>');
+
+            var area = $('.courses-section-0').clone(true);
+            area.attr('class','');
+
+            var title = 'Outcome: ' + outcome_name;
+            var title_area = $('.title-course-selection-0').clone(true);
+            title_area.attr('class','title-course-selection h3');
+            title_area.find('p').html(title);
+
+            area.append(title_area);
+
+            $.each(outcome.selected_semesters, function(index, semester)
+            {
+                var semester_name = semester.name;
+                var semester_id = semester.semester_id;
+
+                var select_area = $('.semester-course-selection-0').clone(true);
+                select_area.attr('class','semester-course-selection');
+                select_area.attr('style',' ');
+                select_area.find('.semester-label-course-selection-0').html(semester_name);
+
+
+                $.each(semester.selected_objectives, function(index, objective)
+                {
+                    var objective_id = objective.objective_id;
+                    var objective_text = objective.text;
+                    var new_select = select_area.find('.select-course-selection-0').clone(true);
+                    new_select.attr('class','select-course-selection');
+                    new_select.find('label').html('');
+                    new_select.find('.objective-selector-0').before('<p>Objective: <b>'+objective_text+'</b></p>');
+                    {{-- new_select.find('.objective-selector-0 select').attr('style','width:100%;max-width:25%;'); --}}
+                    $.each(objective.available_courses, function(index, course)
+                    {
+                      var course_id = course.course_id;
+
+                      var option_value = outcome_id+'-'+semester_id+'-'+objective_id+'-'+course_id;
+
+                      var option_name = '['+course.code+'] '+course.name;
+
+                      var new_option = new_select.find('.default-option').clone(true);
+                      new_option.html(option_name);
+                      new_option.val(option_value);
+                      new_option.attr('class','select_course');
+                      new_select.find('select').append(new_option);
+
+                    });
+                    if (objective.available_courses.length == 0){
+                      new_select.find('.select-course-selection-0').hide();
+                      new_select.find('select').prop('disabled', 'disabled');
+                      new_select.find('select label').html(' Objective "'+objective_text+'" has no courses available for selection');
+                      new_select.find('button').prop('disabled', 'disabled');
+                    }
+                    $.each(objective.selected_courses, function(index, course)
+                    {
+                      new_select.find('.objective-selector-0').hide();
+                      //si hay objetivos previamente seleccionados, escribirlos
+                      var course_id = course.course_id;
+                      var option_value = outcome_id+'-'+semester_id+'-'+objective_id+'-'+course_id;
+
+                      var new_selected_course = new_select.find('.objective-selector-0').clone(true);
+                      new_selected_course.attr('class','objective-selector');
+                      new_selected_course.find('select').val(option_value);
+                      {{-- new_selected_course.find('label').html(''); --}}
+                      new_selected_course.show();
+                      new_select.find('.clone-objective-course-select-0').before(new_selected_course);
+                    });
+                    select_area.find('.select-course-selection-0').after(new_select);
+                });
+                if (semester.selected_objectives.length != 0){
+                  select_area.find('.select-course-selection-0').hide();
+                }
+                else{
+                  select_area.find('select').prop('disabled', 'disabled');
+                  select_area.find('.objective-selector-0').html('There are no objectives selected for this semester');
+                  select_area.find('button').prop('disabled', 'disabled');
+                }
+                area.append(select_area);
+            });
+            var footer = $('.footer-course-selection-0').clone(true);
+            footer.attr('class','footer-course-selection');
+            area.append(footer);
+
+            area.append('<br>');
+            area.show(true);
+            $('.courses-section').append(area);
+          });
+        }
+    );
+  });
+
+
+  // remove an
+  $('.delete-selection-0').on('click', function(e)
+  {
+    var options_values = $(this).parent().find('select').val().split('-');
+
+    if (options_values.length == 3){
+      var typ_id = $('#table-cycles').data('typ-id');
+      var outcome_id = options_values[0];
+      var semester_id = options_values[1];
+      var new_objective_id = "nothing_selected";
+
+      var previous_objective_id = options_values[2];
+      if (previous_objective_id == 'n'){
+        previous_objective_id = "nothing_selected";
+        // with the next return, the post shouldnt excecute.
+        //  im leaving the assignment in the line before this one just in case.
+        $(this).parent().hide();;
+        return true;
+      }
+
+      $.post(
+        "{{ URL::action('ThreeYearPlanController@section2_on_change') }}",
+        {
+          typ_id: (typ_id),
+          previous_objective_id: (previous_objective_id),
+          outcome_id: (outcome_id),
+          semester_id: (semester_id),
+          new_objective_id: (new_objective_id)
+        },
+        function(data)
+        {
+          //
+        }
+      );
+    }
+    else if (options_values.length == 4){
+
+      var typ_id = $('#table-cycles').data('typ-id');
+      var outcome_id = options_values[0];
+      var semester_id = options_values[1];
+      var objective_id = options_values[2];
+      var previous_course_id = options_values[3];
+      var new_course_id = 'nothing_selected';
+
+      $.post(
+        "{{ URL::action('ThreeYearPlanController@section3_on_change') }}",
+        {
+          typ_id: (typ_id),
+          previous_course_id: (previous_course_id),
+          outcome_id: (outcome_id),
+          semester_id: (semester_id),
+          objective_id: (objective_id),
+          new_course_id: (new_course_id)
+        },
+        function(data)
+        {
+          //
+        }
+      );
+    }
+
+    $(this).parent().hide();;
+  });
+
+
+@stop

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

@@ -3,11 +3,14 @@
 
     <ul class="nav navbar-nav navbar-right">
       <li>{{ HTML::linkAction('AdministratorsController@overview', 'Overview') }}</li>
+      <li>{{ HTML::linkAction('ThreeYearPlanController@threeYearsReport', 'Three Years Plan') }}</li>
+      <li>{{ HTML::linkAction('TransformativeActionsController@editTA', 'Transformative Actions') }}</li>
 
       <li class="dropdown">
         <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>
           <li>{{ HTML::linkAction('CriteriaController@edit', 'Criteria') }}</li>
           <li>{{ HTML::linkAction('OutcomesController@index', 'Learning Outcomes') }}</li>
           <li>{{ HTML::linkAction('TemplatesController@newTemplate', 'Rubric Builder') }}</li>
@@ -16,8 +19,6 @@
           <li>{{ HTML::linkAction('UsersController@index', 'Users') }}</li>
         </ul>
       </li>
-      {{-- la linea siguiente comentada es lo que habia originalmente. tanto la linea como este comentario se pueden borrar --}}
-      {{-- <li>{{ HTML::linkAction('CriteriaController@index', 'Learning Outcomes and Criteria') }}</li> --}}
       <li class="dropdown">
         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Learning and Criterias<span class="caret"></span></a>
         <ul class="dropdown-menu" role="menu">
@@ -29,7 +30,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>
@@ -39,9 +40,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
@@ -49,37 +50,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>

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

@@ -80,8 +80,23 @@
                                                 @foreach($section->activities as $activity_index => $activity)
 
                                                     <!-- If activity has a rubric and the rubric has the outcome being evaluated -->
-                                                    @if(array_key_exists($outcome->id, (array)$activity->o_att_array) && $activity->o_att_array[$outcome->id] >=1)
+                                                    @if(array_key_exists($outcome->id, (array)$activity->o_att_array) && $activity->o_att_array[$outcome->id] >=1 && isset($section)&& isset($activity->rubric))
                                                         <h5>Measure {{ $activity_index + 1 }}</h5>
+                                                        <?php
+                                                        /*
+                                                        var_dump($section->code);
+                                                        var_dump($section->number);
+                                                        var_dump($section->name);
+                                                        var_dump($outcome->name);
+                                                        var_dump(date('M Y', strtotime($activity->date)));
+                                                        var_dump($activity->name);
+                                                        var_dump(count($section->students));
+                                                        print"<br>";
+                                                        print "A rubric was used in the $section->code-$section->number ($section->name) course (". date('M Y', strtotime($activity->date)).") to assess students’ <u>". strtolower($outcome->name) ."</u> in the activity: '<strong>$activity->name </strong>'. N= ". count($section->students);
+                                                        exit();
+                                                        */
+                                                        ?>
+
 
                                                         <p>A rubric was used in the {{ $section->code }}-{{ $section->number }} ({{ $section->name }}) course ({{ date('M Y', strtotime($activity->date))}}) to assess students’ <u>{{ strtolower($outcome->name) }}</u> in the activity: "<strong>{{ $activity->name }}</strong>". N= {{ count($section->students) }}. </p>
                                                         

app/views/local/managers/admins/learning-outcome_new.blade.php

@@ -0,0 +1,101 @@
+@extends('layouts.master')
+
+@section('navigation')
+    @if(Auth::user()->role==1)
+        @include('local.managers.admins._navigation')
+    @elseif(Auth::user()->role==2)
+        @include('local.managers.sCoords._navigation')
+    @elseif(Auth::user()->role==3)
+        @include('local.managers.pCoords._navigation')
+    @endif
+@stop
+
+@section('main')
+
+<div class="row">
+    <div class="col-md-12">
+
+        <!-- Nav tabs -->
+        <ul class="nav nav-tabs" role="tablist">
+            <li role="presentation" class="active"><a href="#undergraduate" aria-controls="undergraduate" role="tab" data-toggle="tab"><h4>Undergraduate Program Participation</h4></a></li>
+            <li role="presentation"><a href="#graduate" aria-controls="graduate" role="tab" data-toggle="tab"><h4>Graduate Program Participation</h4></a></li>
+        </ul>
+
+        <!-- Tab panes -->
+        <div class="tab-content">
+            <div role="tabpanel" class="tab-pane active" id="undergraduate">
+                <br>
+                <table class="table table-striped datatable">
+                    <thead>
+                        <th>Name</th>
+                        <th>School</th>
+                        <th>Criteria attempted for the outcome</th>
+                        <th>Criteria achieved for the outcome </th>
+                        <th>Success rate</th>
+                    </thead>
+                    <tbody>
+                        @foreach($undergradResults["names"] as $id=>$undergradProgramName)
+                            <tr>
+                                <td>{{{ $undergradProgramName }}}</td>
+                                <td>{{{ $undergradResults["schools"][$id] }}}</td>
+                                <td>{{{ $undergradResults["attempted"][$id] }}}</td>
+                                <td>{{{ $undergradResults["achieved"][$id] }}}</td>
+                                <td>{{{ $undergradResults["successRate"][$id] }}}</td>
+                            </tr>
+                        @endforeach
+                    </tbody>
+                    <caption>N/M: Not Measured</caption>
+                </table>
+            </div>
+            <div role="tabpanel" class="tab-pane" id="graduate">
+                <br>
+                <table class="table table-striped datatable">
+                    <thead>
+                        <th>Name</th>
+                        <th>School</th>
+                        <th>Sections that attempted outcome</th>
+                        <th>Sections that achieved outcome </th>
+                        <th>Success rate</th>
+                    </thead>
+                    <tbody>
+                        @foreach($gradResults["names"] as $id=>$gradProgramName)
+                            <tr>
+                                <td>{{{ $gradProgramName }}}</td>
+                                <td>{{{ $gradResults["schools"][$id] }}}</td>
+                                <td>{{{ $gradResults["attempted"][$id] }}}</td>
+                                <td>{{{ $gradResults["achieved"][$id] }}}</td>
+                                <td>{{{ $gradResults["successRate"][$id] }}}</td>
+                            </tr>
+                        @endforeach
+                    </tbody>
+                    <caption>N/M: Not Measured</caption>
+                </table>
+            </div>
+
+        </div>
+    </div>
+</div>
+
+@stop
+
+@section('included-js')
+    @include('global._datatables_js')
+@stop
+
+@section('javascript')
+
+    // ------------------------------------------------------------------------
+    // Page Load
+    // ------------------------------------------------------------------------
+
+    // ------------------------------------------------------------------------
+    // Events
+    // ------------------------------------------------------------------------
+
+
+
+    // ------------------------------------------------------------------------
+    // Functions
+    // ------------------------------------------------------------------------
+
+@stop

app/views/local/managers/admins/learning-outcomes_new.blade.php

@@ -0,0 +1,90 @@
+@extends('layouts.master')
+
+@section('navigation')
+    @if(Auth::user()->role==1)
+        @include('local.managers.admins._navigation')
+    @elseif(Auth::user()->role==2)
+        @include('local.managers.sCoords._navigation')
+    @elseif(Auth::user()->role==3)
+        @include('local.managers.pCoords._navigation')
+    @endif
+@stop
+
+@section('main')
+
+    <div class="row">
+        <div class="col-md-12">
+            <p>Click on the values you want to change. Invalid values will be rejected automatically. To save your changes, click the 'Save' button at the bottom of the page.</p>
+            <table class="table table-striped table-condensed editable-table">
+                <thead><tr class="center-text">
+                    <th class="col-md-4">Learning Outcome</th>
+                    <th class="col-md-7">Definition</th>
+                    <th class="col-md-1">Expected Value</th>
+
+                </thead>
+                <tbody>
+                @foreach ($outcomes as $outcome)
+                    <tr data-id="{{ $outcome->id }}">
+                        <td contenteditable="true" class="name col-md-4" >{{ $outcome->name }}</td>
+                        <td contenteditable="true" data-type="textarea" class="definition col-md-6" >{{ $outcome->definition }}</td>
+                        <td contenteditable="true" class="expected-outcome col-md-1" >{{ $outcome->expected_outcome }}</td>
+                    </tr>
+                @endforeach
+                </tbody>
+            </table>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-12"><button class="btn btn-lg btn-primary center-block">Save</button></div>
+    </div>
+@stop
+
+@section('javascript')
+
+        $('button').on('click', function(e)
+        {
+            e.preventDefault();
+
+            var outcomeArray= new Array();
+
+            // For each learning outcome, get its value and put it into an array
+            $('tbody tr').each(function( index )
+            {
+                var outcomeObject = new Object();
+
+                outcomeObject.id= $(this).data('id');
+                outcomeObject.name= $(this).children('.name').text();
+                outcomeObject.definition= $(this).children('.definition').text();
+                outcomeObject.expected_outcome= $(this).children('.expected-outcome').text();
+
+                if($(this).find('.glyphicon-eye-close').length>0)
+                {
+                    outcomeObject.delete=1;
+                }
+
+                else
+                    outcomeObject.delete=0;
+
+                var clone = jQuery.extend({}, outcomeObject);
+                outcomeArray.push(clone);
+            });
+
+            $.post(
+                "{{ URL::action('OutcomesController@update') }}",
+                { outcomeArray: JSON.stringify(outcomeArray)},
+                function(data)
+                {
+                    location.reload();
+                }
+            );
+        });
+
+        $('span').on('click', function()
+        {
+            if($(this).hasClass('glyphicon-eye-open'))
+                $(this).removeClass('glyphicon-eye-open').addClass('glyphicon-eye-close');
+            else
+                $(this).removeClass('glyphicon-eye-close').addClass('glyphicon-eye-open');
+
+        });
+@stop

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

@@ -0,0 +1,529 @@
+@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 -->
+
+
+                <!-- Associated Program -->
+                <div class="form-group">
+                    {{ Form::label('program_id', 'Associated Program') }}<br>
+                    <br>
+
+                    @foreach ($programs as $program)
+
+                    <input type="checkbox" id="{{ $program->name }}" name="program_id[]" value="{{$program->id}}">
+                    <label for="{{ $program->name }}"> {{ $program->name }} [{{ $program->school->name }}]</label><br>
+                    @endforeach
+                </div>
+
+
+                <div class="form-group">
+                    {{ 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('program_id2', 'Associated Program')}}
+                    <select id='select-program' class="form-control selectpicker" onchange='fetchAllObjectives("select-program", "assoc_outcomes_fetch")'>
+                        @foreach ($programs as $program)
+                        <option value='{{$program->id}}' data-subtext="{{$program->code}}">{{$program->name}}</option>
+                        @endforeach
+                    </select>
+                </div>
+                <div class="form-group">
+                    <label>Associated Outcome</label>
+                    {{ Form::select('assoc_outcome_fetch', $outcomes, null, ['class'=>'form-control selectpicker', 'id'=>'assoc_outcomes_fetch', 'onchange'=>'fetchAllObjectives("select-program", "assoc_outcomes_fetch")']) }}
+
+                </div>
+                <div class="form-group">
+                    {{ Form::label('objective_id', 'Objectives') }}
+                    <select id="select-objective" name="id" class="form-control selectpicker">
+                        @foreach ($objectives as $objective)
+                        <option value="{{ $objective->id }}" data-subtext="
+                                        @if($objective->program)
+                                            &nbsp;&nbsp;&nbsp;[{{ $objective->program->name }}]
+                                        @endif
+                                        ">
+                            {{ $objective->text }}
+
+
+
+                        </option>
+                        @endforeach
+                    </select>
+                </div>
+
+                <!-- Associated Outcome -->
+
+                <div class="form-group">
+                    <div id='assocOutcomeGroup'>
+                        <label>Associated Outcome</label>
+
+                        {{ Form::select('assoc_outcome[]', $outcomes, null, ['class'=>'form-control selectpicker', 'id'=>'assoc_outcome0']) }}
+
+                    </div>
+                </div>
+                <button id='button-add-assoc-outcome' class='btn btn-md btn-secondary' onclick='addAssoc()'>
+                    <span class='glyphicon glyphicon-plus'>
+
+                    </span>
+                    Add another Outcome
+                </button>
+
+
+                <!-- Associated Program -->
+                <!-- Associated Program -->
+                <div class="form-group">
+
+                    {{ Form::label('program_id2', 'Associated Program') }}<br><br>
+                    @foreach ($programs as $program)
+
+                    <input type="checkbox" id="assoc_program_id_{{ $program->id }}" name="program_id[]" value="{{$program->id}}">
+                    <label for="assoc_program_id_{{ $program->id }}"> {{ $program->name }} <sub>[{{ $program->school->name }}]</sub></label><br>
+                    @endforeach
+                </div>
+
+
+                <!-- 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>
+                <div id="text">
+
+                </div>
+
+                {{ Form::submit('Update', array('class' => 'btn btn-primary btn-block')) }}
+                {{ Form::close() }}
+                <form action="/deleteObjective" method="POST" id='deleteObj'>
+
+                </form>
+            </div>
+
+
+
+
+        </div>
+    </div>
+</div>
+<script>
+    var outcomeHTML = document.getElementById('outcomeGroup').innerHTML;
+    var selectOptions = document.getElementById('outcome[0]').innerHTML;
+    fetchAllObjectives("select-program", "assoc_outcomes_fetch")
+
+    function fetchAllObjectives(program, outcome) {
+        var program_id_fetch = $('#' + program).find(':selected').val();
+        var outcome_fetch = $('#' + outcome).find(':selected').val();
+        $.post(
+            "{{URL::action('Objective2Controller@fetchAllObjectives')}}", {
+                program_fetch: program_id_fetch,
+                outcome_fetch: outcome_fetch
+            },
+            function(json) {
+                json_length = (json.objective.length);
+                fullHTML = '';
+                for (var i = 0; i < json_length; i++) {
+                    fullHTML += '<option value="' + json.objective[i].id + '">' + json.objective[i].text + '</option>';
+                }
+                $('#select-objective').html(fullHTML);
+                $('#select-objective').selectpicker('refresh');
+                fetchObjectiveForEditing();
+
+            },
+            'json'
+        );
+    }
+
+    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.objective[0].text;
+
+
+                // Display info
+                $('#objective-text').val(text);
+
+
+                // Select associated outcome
+                for (var i = counterAssoc; i != 1; i--) {
+                    deleteLastAssoc(i);
+
+                }
+                $('#assoc_outcome0').val(json.outcome[0].outcome_id);
+                $('#assoc_outcome0').selectpicker('refresh');
+                counterAssoc = 1;
+                for (var i = 1; i < json.outcome.length; i++) {
+                    counterAssoc = i + 1;
+                    var $select = $('<select />', {
+                        'class': "selectpicker form-control",
+                        'name': "assoc_outcome[]",
+                        'data-live-search': 'true',
+                        'id': 'assoc_outcome' + i.toString()
+
+                    });
+                    var $div = $('<div />', {
+                        'id': 'assocOutcomeForm' + i.toString(),
+                        'class': 'form-group col-md-11'
+                    });
+                    var $divForButton = $('<div />', {
+                        'class': 'col-md-1',
+                        'id': 'closeAssoc' + i.toString()
+
+                    });
+                    var $button = $('<button />', {
+                        'type': 'button',
+                        'class': 'btn btn-primary',
+                        'onclick': 'deleteLastAssoc()'
+                    });
+                    $button.append('X');
+                    $divForButton.append($button);
+
+                    $div.appendTo('#assocOutcomeGroup')
+                    $select.append(selectOptions);
+
+                    $select.appendTo('#assocOutcomeForm' + i.toString()).selectpicker('refresh');
+                    $divForButton.appendTo('#assocOutcomeGroup');
+
+                    $('#assoc_outcome' + i.toString()).val(json.outcome[i].outcome_id);
+                    $('#assoc_outcome' + i.toString()).selectpicker('refresh');
+
+
+                }
+
+
+                // Select associated program
+                var program_length = json.program.length;
+                $('input[type=checkbox]').prop('checked', false);
+
+                for (var i = 0; i < program_length; i++) {
+                    prog = json.program[i].program_id.toString();
+                    $('#assoc_program_id_' + prog).prop("checked", true);
+                }
+
+
+                // Select status
+                if (json.objective[0].deleted_at)
+                    $('#status').val(0);
+                else
+                    $('#status').val(1);
+                if (json.assessment.length) {
+                    $('#deleteObj').html("<p>This objective is currently participating in an assessment, therefore it cannot be deleted</p>");
+                } else if (json.assoc_criteria.length) {
+                    modal = '<button type="button" class="btn btn-primary btn-block" data-toggle="modal" data-target="#delete">' +
+                        'Delete' +
+                        '</button>' +
+                        '<input type="hidden" value =' + json.objective[0].id + ' name="deleteObj">' +
+
+                        '<div class="modal fade" id="delete" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">' +
+                        '<div class="modal-dialog" role="document">' +
+                        '<div class="modal-content">' +
+                        ' <div class="modal-header">' +
+                        '<h5 class="modal-title" id="exampleModalLabel">Are you sure?</h5>' +
+                        '<button type="button" class="close" data-dismiss="modal" aria-label="Close">' +
+                        '<span aria-hidden="true">&times;</span>' +
+                        '</button>' +
+                        ' </div>' +
+                        '<div class="modal-body">' +
+                        "<p>This objective is associated to: <p>" +
+                        '<ul>';
+                    for (var i = 0; i < json.assoc_criteria.length; i++) {
+                        modal += "<li>" + json.assoc_criteria[i].name + '</li>';
+                    }
+                    modal += ' </ul>' +
+                        '<p>Do you still want to delete it?</p>' +
+                        '</div>' +
+                        '<div class="modal-footer">' +
+                        '<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>' +
+                        '<button type="submit" class="btn btn-primary">Delete</button>' +
+                        '</div>' +
+                        '</div>' +
+                        '</div>' +
+                        '</div>';
+                    $('#deleteObj').html(modal);
+
+
+                } else {
+                    modal = '<button type="button" class="btn btn-primary btn-block" data-toggle="modal" data-target="#delete">' +
+                        'Delete' +
+                        '</button>' +
+                        '<input type="hidden" value =' + json.objective[0].id + ' name="deleteObj">' +
+
+                        '<div class="modal fade" id="delete" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">' +
+                        '<div class="modal-dialog" role="document">' +
+                        '<div class="modal-content">' +
+                        ' <div class="modal-header">' +
+                        '<h5 class="modal-title" id="exampleModalLabel">Are you sure?</h5>' +
+                        '<button type="button" class="close" data-dismiss="modal" aria-label="Close">' +
+                        '<span aria-hidden="true">&times;</span>' +
+                        '</button>' +
+                        ' </div>' +
+                        '<div class="modal-body">' +
+                        "<p> Once deleted, there is no chance of getting it back.</p>";
+
+                    modal +=
+                        '<p>Do you still want to delete it?</p>' +
+                        '</div>' +
+                        '<div class="modal-footer">' +
+                        '<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>' +
+                        '<button type="submit" class="btn btn-primary">Delete</button>' +
+                        '</div>' +
+                        '</div>' +
+                        '</div>' +
+                        '</div>';
+                    $('#deleteObj').html(modal);
+                }
+            },
+            'json'
+        );
+    }
+
+    function deleteLastAssoc() {
+
+        div = document.getElementById('assocOutcomeForm' + (counterAssoc).toString());
+        div.remove();
+        button = document.getElementById('closeAssoc' + (counterAssoc).toString());
+        button.remove();
+        counterAssoc -= 1;
+
+    }
+
+    function addAssoc() {
+
+
+        var $select = $('<select />', {
+            'class': "selectpicker form-control",
+            'name': "assoc_outcome[]",
+            'data-live-search': 'true',
+            'id': 'assoc_outcome' + counterAssoc.toString()
+
+        });
+        var $div = $('<div />', {
+            'id': 'assocOutcomeForm' + counterAssoc.toString(),
+            'class': 'form-group col-md-11'
+        });
+        var $divForButton = $('<div />', {
+            'class': 'col-md-1',
+            'id': 'closeAssoc' + counterAssoc.toString()
+
+        });
+        var $button = $('<button />', {
+            'type': 'button',
+            'class': 'btn btn-primary',
+            'onclick': 'deleteLastAssoc()'
+        });
+        $button.append('X');
+        $divForButton.append($button);
+
+        $div.appendTo('#assocOutcomeGroup')
+        $select.append(selectOptions);
+
+        $select.appendTo('#assocOutcomeForm' + counterAssoc.toString()).selectpicker('refresh');
+        $divForButton.appendTo('#assocOutcomeGroup');
+
+
+
+        counterAssoc += 1;
+
+
+    }
+</script>
+@stop
+
+@section('javascript')
+
+// --------------------------------------------------------------------------
+// Page load
+// --------------------------------------------------------------------------
+
+// Hide accordion panel contents by default
+$('.panel-group .panel-body').hide();
+
+$('#outcome-display').parent().hide();
+
+fetchObjectiveForEditing();
+// setCriterionStatus();
+
+
+
+
+// --------------------------------------------------------------------------
+// Functions
+// --------------------------------------------------------------------------
+
+// Fetch criterion info for editing
+
+$('#button-add-outcome').on('click', function(e) {
+// Prevent the default action of the clicked item. In this case that is submit
+e.preventDefault();
+
+
+return false;
+});
+$('#button-add-assoc-outcome').on('click', function(e) {
+// Prevent the default action of the clicked item. In this case that is submit
+e.preventDefault();
+
+
+return false;
+});
+
+// --------------------------------------------------------------------------
+// Events
+// --------------------------------------------------------------------------
+
+// When panel heading is clicked, toggle it
+$('.panel-group .panel-heading').on('click', function()
+{
+$(this).next().stop().slideToggle();
+})
+
+
+// When list item is clicked, load corresponding info
+$('#select-objective').on('change', function()
+{
+fetchObjectiveForEditing();
+$('.selectpicker').selectpicker('refresh');
+});
+
+// When list item is clicked, load corresponding info
+$('.selectpicker').on('change', function()
+{
+//alert($(this).find(':selected').val());
+$('.selectpicker').selectpicker('refresh');
+});
+
+@stop

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

@@ -0,0 +1,891 @@
+@extends('layouts.master')
+
+@section('navigation')
+    @if($role==2)
+        @include('local.managers.sCoords._navigation')
+    @elseif($role==3)
+        @include('local.managers.pCoords._navigation')
+    @else
+        @include('local.professors._navigation')
+    @endif
+@stop
+@section('main')
+
+<div class="row">
+    <div class="col-md-6">
+        <!-- Form to add a new criterion -->
+        <div class="panel panel-default panel-button">
+            <div class="panel-heading">
+                Create a TA
+            </div>
+            <div class="panel-body" id="createPanel">
+              {{ Form::open(array('action' => 'TransformativeActionsController@createTA')) }}
+
+              <div class="form-group">
+                {{ Form::label('text', 'Name') }}
+                {{ Form::text('text', '', array('class' => 'form-control')) }}
+              </div>
+
+              <div class="form-group">
+                {{ Form::label('description', 'Description') }}
+                {{ Form::textarea('description', '', array('class' => 'form-control')) }}
+              </div>
+
+              <div class="form-group"> </div>
+              <div class="form-group" id='dummyApproval'>
+                <label>Availability</label>
+                <select name="approval" class="form-control">
+                  <option value="1">Recommended</option>
+                  <option value="0">To be implemented</option>
+                </select>
+              </div>
+
+              <label>Courses being Transformed by the Action</label>
+              <div class="" id="">
+                <div class="form-group col-md-11">
+                  <select name="courseid[]" class="form-control createCourses selectpicker">
+                    @foreach ($courses_create as $course)
+                      <option value="{{$course->id}}">{{$course->name}} [{{$course->code}}]</option>
+                    @endforeach
+                  </select>
+                </div>
+                <button type="button" class='btn btn-md btn-primary col-md-1 remove-course'>
+                  X
+                </button>
+              </div>
+              <button type="button" class='btn btn-md btn-secondary add-course'>
+                <span class='glyphicon glyphicon-plus'>
+                </span>
+                Add another Course
+              </button>
+              <div class="form-group"> </div>
+
+              <div class="form-group" id='createOutcome'>
+                <label>Outcome perteneciente</label>
+                <select name="outcome" class="form-control selectpicker">
+                  @foreach ($outcomes as $outcome)
+                    <option value="{{$outcome->id}}">{{$outcome->name}}</option>
+                  @endforeach
+                </select>
+              </div>
+
+              <label>Associated Objectives</label>
+              <div class="" id="">
+                <div class="form-group col-md-11">
+                  <select name="objectiveid[]" class="form-control createObjectives">
+                    <option value="">First, select an Outcome</option>
+                  </select>
+                </div>
+                <button type="button" class='btn btn-md btn-primary col-md-1 remove-objective'>
+                  X
+                </button>
+              </div>
+              <button type="button" class='btn btn-md btn-secondary add-objective'>
+                <span class='glyphicon glyphicon-plus'>
+                </span>
+                Add another Objective
+              </button>
+              <div class="form-group"> </div>
+
+              {{ Form::submit('Create', array('class' => 'btn btn-primary btn-block')) }}
+              {{ Form::close() }}
+            </div>
+        </div>
+        <div class="panel panel-default panel-button">
+            <div class="panel-heading">
+                Approve a Recommended TA
+            </div>
+            <div class="panel-body" id="approvePanel">
+
+              <div class="">
+                <button class="btn btn-md btn-secondary filterButton">
+                  <span class="glyphicon glyphicon-plus">
+                  </span>
+                  Filters
+                </button>
+              </div>
+              <div class="filterSection">
+                <br>
+                <div class="">
+                  <div class="">
+                    <label>Professor that created the TA</label>
+                    <select class="form-control filterProfessor selectpicker">
+                      <option value="0">Show All</option>
+                      @foreach ($professor_filter_approvePanel as $ta)
+                        <option value="{{$ta->id}}">Prof. {{$ta->first_name}} {{$ta->surnames}}</option>
+                      @endforeach
+                    </select>
+                  </div>
+                  <br>
+                  <div class="">
+                    <label>Course evaluated by an Objective of the TA</label>
+                    <select class="form-control filterCourse selectpicker">
+                      <option value="0">Show All</option>
+                      @foreach ($course_filter_approvePanel as $course)
+                        <option value="{{$course->id}}">{{$course->name}}[{{$course->code}}]</option>
+                      @endforeach
+                    </select>
+                  </div>
+                  <br>
+                  <div class="">
+                    <label>Outcome of the TA</label>
+                    <select class="form-control filterOutcome selectpicker">
+                      <option value="0">Show All</option>
+                      @foreach ($outcome_filter_approvePanel as $outcome)
+                        <option value="{{$outcome->id}}">{{$outcome->name}}</option>
+                      @endforeach
+                    </select>
+                  </div>
+                </div>
+              </div>
+              <hr>
+              {{ Form::open(array('action' => 'TransformativeActionsController@approveTA')) }}
+
+              <div>
+                <div class="form-group col-md-11">
+                  <label>Select Transformative Action</label>
+                  <select name="ta" class="form-control SelectTA selectpicker" id='approvalSelectTA'>
+                    @if (count($ta_approval_panel) == 0)
+                      <option value="0">No TAs available</option>
+                    @else
+                    @endif
+                    @foreach ($ta_approval_panel as $ta)
+                      <option value="{{$ta->id}}">{{$ta->at_text}}</option>
+                   @endforeach
+                  </select>
+                </div>
+              </div>
+
+              <div class="form-group">
+                {{ Form::label('approvalDescription', 'Description') }}
+                {{ Form::textarea('approvalDescription', '', array('class' => 'form-control')) }}
+              </div>
+
+              <label>Associated Courses</label>
+              <div class="approveCourses">
+                <div class="form-group col-md-11 approveCourse">
+                  <select name="courseid[]" class="form-control selectpicker">
+                      <option value="">option</option>
+                  </select>
+                </div>
+                <button type="button" class='btn btn-md btn-primary col-md-1 remove-course'>
+                  X
+                </button>
+              </div>
+              <button type="button" class='btn btn-md btn-secondary add-course'>
+                <span class='glyphicon glyphicon-plus'>
+                </span>
+                Add another Course
+              </button>
+
+              <label>Associated Objectives</label>
+              <div class="approveObjectives">
+                <div class="form-group col-md-11">
+                  <select name="objectiveid[]" class="form-control">
+                    @foreach ($objectives as $id => $text)
+                      <option value="{{$id}}">{{$text}}</option>
+                    @endforeach
+                  </select>
+                </div>
+                <button type="button" class='btn btn-md btn-primary col-md-1 remove-objective'>
+                  X
+                </button>
+              </div>
+              <button type="button" class='btn btn-md btn-secondary add-objective'>
+                <span class='glyphicon glyphicon-plus'>
+                </span>
+                Add another Objective
+              </button>
+
+              <input type='hidden' name='at_text' class="approvalText">
+
+              <input type='hidden' name='ta_id' class='updateTA'>
+
+              {{ Form::submit('Approve', 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 a TA
+            </div>
+            <div class="panel-body" id="editPanel">
+
+              <div class="">
+                <button class="btn btn-md btn-secondary filterButton">
+                  <span class="glyphicon glyphicon-plus">
+                  </span>
+                  Filters
+                </button>
+              </div>
+              <div class="filterSection">
+                <br>
+                <div class="">
+                  <div class="">
+                    <label>Professor that created the TA</label>
+                    <select class="form-control filterProfessor selectpicker">
+                      <option value="0">Show All</option>
+                      @foreach ($professor_filter_editPanel as $user)
+                        <option value="{{$user->id}}">Prof. {{$user->first_name}} {{$user->surnames}}</option>
+                      @endforeach
+                    </select>
+                  </div>
+                  <br>
+                  <div class="">
+                    <label>Course evaluated by an Objective of the TA</label>
+                    <select class="form-control filterCourse selectpicker">
+                      <option value="0">Show All</option>
+                      @foreach ($course_filter_editPanel as $course)
+                        <option value="{{$course->id}}">{{$course->name}}[{{$course->code}}]</option>
+                      @endforeach
+                    </select>
+                  </div>
+                  <br>
+                  <div class="">
+                    <label>Outcome of the TA</label>
+                    <select class="form-control filterOutcome selectpicker">
+                      <option value="0">Show All</option>
+                      @foreach ($outcome_filter_editPanel as $outcome)
+                        <option value="{{$outcome->id}}">{{$outcome->name}}</option>
+                      @endforeach
+                    </select>
+                  </div>
+                </div>
+              </div>
+              <hr>
+
+              {{ Form::open(array('action' => 'TransformativeActionsController@updateTA')) }}
+
+              <div>
+                <div class="form-group col-md-12">
+                  <label>Select Transformative Action</label>
+                  <select name="ta" class="form-control SelectTA selectpicker" id='editSelectTA'>
+                     @if (count($ta_edit_panel) == 0)
+                       <option value="0">No TAs available</option>
+                     @else
+                     @endif
+                     @foreach ($ta_edit_panel as $ta)
+                      <option value="{{$ta->id}}">{{$ta->at_text}}</option>
+                    @endforeach
+                  </select>
+                </div>
+              </div>
+
+              <div class="form-group" id="editName">
+                {{ Form::label('text', 'Name') }}
+                {{ Form::text('text', '', array('class' => 'form-control')) }}
+              </div>
+              <input type='hidden' name='ta_id' class='updateTA' value="0">
+
+              <div class="form-group">
+                {{ Form::label('description', 'Description') }}
+                {{ Form::textarea('description', '', array('class' => 'form-control')) }}
+              </div>
+
+              <div class="form-group"> </div>
+              <div class="form-group" id='editApproval'>
+                <label>Availability</label>
+                <select name="approval" class="form-control selectpicker">
+                    <option value="1">Recommended</option>
+                    <option value="0">To be implemented</option>
+                </select>
+              </div>
+
+              <label>Associated Courses</label>
+              <div class="editCourses">
+                <div class="form-group col-md-11 editCourse">
+                  <select name="courseid[]" class="form-control selectpicker">
+                    @foreach ($courses_create as $course)
+                      <option value="{{$course->id}}">{{$course->name}}[{{$course->code}}]</option>
+                    @endforeach
+                  </select>
+                </div>
+                <button type="button" class='btn btn-md btn-primary col-md-1 remove-course'>
+                  X
+                </button>
+              </div>
+              <button type="button" class='btn btn-md btn-secondary add-course'>
+                <span class='glyphicon glyphicon-plus'>
+                </span>
+                Add another Course
+              </button>
+              <div class="form-group"> </div>
+
+              <label>Associated Objectives</label>
+              <div class="editObjectives">
+                <div class="form-group col-md-11">
+                  {{-- <select class="form-control selectpicker"> --}}
+                  <select name="objectiveid[]" class="form-control">
+                    @foreach ($objectives as $id => $text)
+                      <option value="{{$id}}">{{$text}}</option>
+                    @endforeach
+                  </select>
+                </div>
+                <button type="button" class='btn btn-md btn-primary col-md-1 remove-objective'>
+                  X
+                </button>
+              </div>
+              <button type="button" class='btn btn-md btn-secondary add-objective'>
+                <span class='glyphicon glyphicon-plus'>
+                </span>
+                Add another Objective
+              </button>
+              <div class="form-group"> </div>
+
+              {{ Form::submit('Update', array('class' => 'btn btn-primary btn-block')) }}
+              {{ Form::close() }}
+
+              {{ Form::open(array('action' => 'TransformativeActionsController@deleteTA')) }}
+              <input type='hidden' name='ta_id' id='deleteTA'>
+              {{Form::submit("Delete", array('class'=> 'btn btn-primary btn-block', 'id'=>"DeleteButton"))}}
+            </div>
+        </div>
+    </div>
+</div>
+
+@stop
+
+@section('javascript')
+
+// --------------------------------------------------------------------------
+// Page load
+// --------------------------------------------------------------------------
+
+// Hide accordion panel contents by default
+$('.panel-group .panel-body').hide();
+
+$('#outcome-display').parent().hide();
+
+$('.remove-objective').hide();
+$('.remove-course').hide();
+
+////createPanel
+// remove TA approval section if the user isnt a program coordinator
+var dummyApproval = $('#dummyApproval');
+dummyApproval.find('select').prop('disabled', 'disabled');
+dummyApproval.find('option').remove();
+
+
+var role = {{Auth::user()['role']}};
+if (role == 3){
+  dummyApproval.find('select').append('<option value="0">To be implemented</option>');
+  $('#approvePanel .add-course').hide();
+} else if (role == 4){
+  dummyApproval.find('select').append('<option value="1">Recommended</option>');
+  $('#approvePanel').parent().hide();
+
+  //hide the select for changin Availability
+  $('#editApproval').find('select').prop('disabled', 'disabled');
+  //add an input since disabled the form wont recognize it
+  $('#editApproval').append('<input type="text" name="approval" value="1" hidden />')
+
+  // in edit panel, hide the professor filter
+  $('.filterProfessor').parent().hide();
+  $('.filterProfessor').parent().next().hide(); // hide <br>
+}
+
+$('.createObjectives').prop('disabled', 'disabled');
+$('#createPanel .add-objective').prop('disabled', 'disabled');
+
+
+////editPanel
+// disable the buttons of the edit section if there are no TA for selection
+if(($('#editSelectTA').val() === "")){
+  $('#editPanel').find('select').prop('disabled', 'disabled');
+  $('#editPanel').find('button').prop('disabled', 'disabled');
+  $('#editPanel').find('input').prop('disabled', 'disabled');
+}else{
+  var ta_id = $('#editSelectTA').val();
+  if(ta_id != 0){
+    load_ta_info_for_edit(ta_id);
+  }
+
+
+}
+
+////approvePanel
+$('#approvePanel .add-objective').hide();
+// disable the buttons of the approval section if there are no TA for selection
+if(($('#approvalSelectTA').val() === "")){
+  $('#approvePanel').find('select').prop('disabled', 'disabled');
+  $('#approvePanel').find('button').prop('disabled', 'disabled');
+  $('#approvePanel').find('input').prop('disabled', 'disabled');
+  $('#approvalDescription').prop('disabled', 'disabled');
+}else{
+  var ta_id = $('#approvalSelectTA').val();
+  if(ta_id != 0){
+    load_ta_info_for_approval(ta_id);
+  }
+
+}
+
+//
+$('.filterSection').hide();
+
+// --------------------------------------------------------------------------
+// Functions
+// --------------------------------------------------------------------------
+
+function load_objectives_from_outcome(outcome_id) {
+  $.post(
+    "{{ URL::action('TransformativeActionsController@objectivesFromOutcome') }}",
+    {
+      outcome_id: (outcome_id),
+    },
+    function(data)
+    {
+      var panel = $('#createPanel');
+
+      //
+      var objectives = data.objectives;
+      //delete al current select
+      panel.find('.remove-objective').parent().remove();
+
+      //create select
+      var new_div = $('<div/>',{
+        'class': 'createObjectives'
+      });
+      var new_inner_div = $('<div/>',{
+        'class': 'form-group col-md-11'
+      });
+      var new_select = $('<select/>',{
+        'class': 'form-control createObjectives selectpicker',
+        'data-live-search': 'true',
+        'name': 'objectiveid[]'
+      });
+      var new_button = $('<button/>',{
+        'class': 'btn btn-md btn-primary col-md-1 remove-objective',
+        'type': 'button',
+        'html': 'X'
+      });
+      new_button.hide();
+
+      $.each(objectives, function(index, objective)
+      {
+        new_select.append('<option value="'+ objective.id +'">'+ objective.text +'</option>');
+      });
+
+      panel.find('.add-objective').before(new_div);
+      new_div.append(new_button);
+      new_div.append(new_inner_div);
+      new_inner_div.append(new_select);
+      new_select.selectpicker('refresh');
+
+      //activate the button for adding more objectives
+      $('#createPanel .add-objective').prop('disabled', false);
+    }
+  );
+}
+
+function load_ta_info_for_edit(ta_id) {
+  $.post(
+    "{{ URL::action('TransformativeActionsController@selectTA') }}",
+    {
+      ta_id: (ta_id),
+    },
+    function(data)
+    {
+      //
+      var selected_courses = data.selected_courses;
+      var objectives = data.objectives;
+      var objectives_from_outcome = data.objectives_from_outcome;
+      var status = data.status;
+      var name = data.name[0];
+      var description = data.description[0];
+      var can_be_deleted = data.can_be_deleted;
+
+      //add objectives button
+      var add_button = $('#editPanel .add-objective');
+
+      //set if the TA is approved or not
+      $('#editApproval select').val(status);
+
+      //delete objectives select
+      $('.editObjectives').remove();
+
+      //create one objective select and populate it
+      var panel = $('#editPanel');
+
+      //
+      var objectives = data.objectives;
+      //delete al current select
+      panel.find('.remove-objective').parent().remove();
+
+      //create select
+      var new_div = $('<div/>',{
+        'class': 'editObjectives'
+      });
+      var new_inner_div = $('<div/>',{
+        'class': 'form-group col-md-11'
+      });
+      var new_select = $('<select/>',{
+        'class': 'form-control editObjectives selectpicker',
+        'data-live-search': 'true',
+        'name': 'objectiveid[]'
+      });
+      var new_button = $('<button/>',{
+        'class': 'btn btn-md btn-primary col-md-1 remove-objective',
+        'type': 'button',
+        'html': 'X'
+      });
+      new_button.hide();
+
+      $.each(objectives_from_outcome, function(index, objective)
+      {
+        new_select.append('<option value="'+ objective.id +'">'+ objective.text +'</option>');
+      });
+
+      panel.find('.add-objective').before(new_div);
+      new_div.append(new_button);
+      new_div.append(new_inner_div);
+      new_inner_div.append(new_select);
+      new_select.selectpicker('refresh');
+
+
+      //change de value of the select
+
+      //add the other selects
+
+      var prev_select = new_div;
+      $.each(objectives, function(index, objective)
+      {
+        prev_select.find('select').val(objective.id);
+        add_objective_select(add_button);
+        {{-- add_button; --}}
+        prev_select = add_button.prev();
+
+      });
+      add_button.prev().remove();
+
+      //set the text box
+      $('#editName').find('input').val(name);
+      $('#editPanel #description').val(description);
+
+      //
+      $('#deleteTA').val(ta_id);
+      $('#editPanel .updateTA').val(ta_id);
+
+      if(can_be_deleted == false){
+        $('#DeleteButton').prop('disabled', 'disabled');
+      }else{
+        $('#DeleteButton').prop('disabled', false);
+      }
+
+
+      //locate de "add course" button on edit panel
+      var add_course_button = $('#editPanel .add-course')
+
+      //save current course selectpickers, add a new one, and delete old ones
+      var current_course_selects = $('#editPanel .editCourse');
+      add_course_button.click();
+      current_course_selects.remove();
+
+      //populate edit panel with courses previusly selected
+      var prev_select = add_course_button.prev();
+      prev_select.find('.remove-course').hide();
+      $.each(selected_courses, function(index, course)
+      {
+        prev_select.find('select').val(course.id);
+        add_course_button.click();
+        prev_select = add_course_button.prev();
+      });
+      prev_select.remove();
+
+    }
+  );
+}
+
+function load_ta_info_for_approval(ta_id) {
+  $.post(
+    "{{ URL::action('TransformativeActionsController@selectTA') }}",
+    {
+      ta_id: (ta_id),
+    },
+    function(data)
+    {
+      //
+      var selected_courses = data.selected_courses;
+      var objectives = data.objectives;
+      var status = data.status[0];
+      var name = data.name[0];
+      var description = data.description[0];
+
+      //clear the objectives of ony prevoius TA selected for approve
+      var add_button = $('#approvePanel .add-objective');
+      var select = add_button.prev().clone(true);
+
+      var first_select = select.clone(true);
+      first_select.find('button').hide();
+
+      $('.approveObjectives').remove();
+      add_button.before(first_select);
+
+      var prev_select = first_select;
+      $.each(objectives, function(index, objective)
+      {
+
+        // save the new select in a var
+        var new_select = select.clone(true);
+
+        // set only one option on the select
+        prev_select.find('option').remove();
+        prev_select.find('select').append('<option value="'+ objective.id +'">'+objective.text +'</option>');
+        prev_select = new_select;
+        // add the copy of the select
+        add_button.before(new_select);
+      });
+      // remove the last objective select, since it isnt one of the saved objectives
+      add_button.prev().remove();
+
+      //
+      $('#approvalDescription').val(description);
+      $('.approvalText').val(name);
+      $('#approvePanel .updateTA').val(ta_id);
+
+
+      //locate de "add course" button on approve panel
+      var add_course_button = $('#approvePanel .add-course')
+
+      //save current course selectpickers, add a new one, and delete old ones
+      var current_course_selects = $('#approvePanel .approveCourse');
+      add_course_button.click();
+      current_course_selects.remove();
+
+      //populate approve panel with courses previusly selected
+      var prev_select = add_course_button.prev();
+      prev_select.find('.remove-course').hide();
+      $.each(selected_courses, function(index, course)
+      {
+        var new_option = $('<option/>',{
+          'value': course.id,
+          'type': 'button',
+          'html': course.name+' ['+course.code+']'
+        });
+        prev_select.find('select option').remove();
+        prev_select.find('select').append(new_option);
+        prev_select.find('.remove-course').hide();
+        add_course_button.click();
+        prev_select = add_course_button.prev();
+      });
+      prev_select.remove();
+
+    }
+  );
+}
+
+function add_objective_select(element) {
+  var prev_select = $(element).prev();
+
+  var parent_panel = $(element).parent().parent().attr('id');
+  var select_class = '';
+  if(parent_panel == 'editPanel'){
+    select_class = 'editObjectives';
+  }else{
+    select_class = 'createObjectives';
+  }
+
+  //create select
+  var new_div = $('<div/>',{
+    'class': select_class
+  });
+  var new_inner_div = $('<div/>',{
+    'class': 'form-group col-md-11'
+  });
+  var new_select = $('<select/>',{
+    'class': 'form-control createObjectives selectpicker',
+    'data-live-search': 'true',
+    'name': 'objectiveid[]'
+  });
+  var new_button = $('<button/>',{
+    'class': 'btn btn-md btn-primary col-md-1 remove-objective',
+    'type': 'button',
+    'html': 'X'
+  });
+
+
+  $.each(prev_select.find('option'), function(index, option)
+  {
+    var new_option = $('<option/>',{
+      'value': $(option).val(),
+      'html': $(option).html()
+    });
+    new_select.append(new_option);
+  });
+
+
+  $(element).before(new_div);
+  new_div.append(new_inner_div);
+  new_div.append(new_button);
+  new_inner_div.append(new_select);
+  $(element).parent().find('.selectpicker').selectpicker('refresh');
+  new_select.selectpicker('refresh');
+
+}
+
+function add_course_select(element) {
+  var prev_select = $(element).prev();
+
+  var parent_panel = $(element).parent().parent().attr('id');
+  var select_class = '';
+  if(parent_panel == 'editPanel'){
+    select_class = 'editCourse';
+  }else{
+    select_class = 'createCourse';
+  }
+
+  //create select
+  var new_div = $('<div/>',{
+    'class': select_class+' approveCourse'
+  });
+  var new_inner_div = $('<div/>',{
+    'class': 'form-group col-md-11'
+  });
+  var new_select = $('<select/>',{
+    'class': 'form-control createCourses selectpicker',
+    'data-live-search': 'true',
+    'name': 'courseid[]'
+  });
+  var new_button = $('<button/>',{
+    'class': 'btn btn-md btn-primary col-md-1 remove-course',
+    'type': 'button',
+    'html': 'X'
+  });
+
+
+  $.each(prev_select.find('option'), function(index, option)
+  {
+    var new_option = $('<option/>',{
+      'value': $(option).val(),
+      'html': $(option).html()
+    });
+    new_select.append(new_option);
+  });
+
+
+  $(element).before(new_div);
+  new_div.append(new_inner_div);
+  new_div.append(new_button);
+  new_inner_div.append(new_select);
+  $(element).parent().find('.selectpicker').selectpicker('refresh');
+  new_select.selectpicker('refresh');
+
+}
+
+// --------------------------------------------------------------------------
+// Events
+// --------------------------------------------------------------------------
+
+// When a TA is selected for edit, load the TA info
+$('#createOutcome').on('change', function()
+{
+  var outcome_id = $(this).find('select').val();
+
+  load_objectives_from_outcome(outcome_id);
+});
+
+// When a TA is selected for edit, load the TA info
+$('#editSelectTA').parent().on('change', function()
+{
+  var ta_id = $(this).find('select').val();
+  if(ta_id != 0){
+    load_ta_info_for_edit(ta_id);
+  }
+});
+
+// When a TA is selected for approval, load the TA info
+$('#approvalSelectTA').parent().on('change', function()
+{
+  var ta_id = $(this).find('select').val();
+  if(ta_id != 0){
+    load_ta_info_for_approval(ta_id);
+    }
+});
+
+
+// Add an objective Select picker
+$('.add-objective').on('click', function()
+{
+  add_objective_select(this);
+});
+// Add an course Select picker
+$('.add-course').on('click', function()
+{
+  add_course_select(this);
+});
+
+// Remove an objective Select picker
+$('.panel').on('click', '.remove-objective', function()
+{
+  $(this).parent().remove();
+});
+// Remove an course Select picker
+$('.panel').on('click', '.remove-course', function()
+{
+  $(this).parent().remove();
+});
+
+// Remove an objective Select picker
+$('.filterButton').on('click', function()
+{
+  var span = $(this).find('span');
+  if(span.attr('class') == 'glyphicon glyphicon-plus'){
+    span.attr('class','glyphicon glyphicon-minus');
+  } else{
+    span.attr('class','glyphicon glyphicon-plus');
+  }
+  $(this).parent().next().toggle(533);
+});
+
+//
+$('.filterSection').on('change', function()
+{
+
+  var professor_id = $(this).find('.filterProfessor select').val();
+  var course_id = $(this).find('.filterCourse select').val();
+  var outcome_id = $(this).find('.filterOutcome select').val();
+  var panel_id = $(this).parent().attr('id');
+
+  var select = $('#'+panel_id+' .SelectTA select');
+
+
+  $.post(
+    "{{ URL::action('TransformativeActionsController@filterTA') }}",
+    {
+      professor_id: (professor_id),
+      course_id: (course_id),
+      outcome_id: (outcome_id),
+      panel_id: (panel_id),
+    },
+    function(data)
+    {
+      //
+      select.find('option').remove();
+      $.each(data, function(index, ta)
+      {
+        var ta_id = ta.id;
+        var ta_text = ta.at_text;
+        var new_option = '<option value="'+ ta_id +'">'+ ta_text +'</option>';
+        select.append(new_option);
+      });
+
+      select.selectpicker('refresh');
+
+      if(data.length != 0){
+        var ta_id = data[0].id;
+
+        if(panel_id=='editPanel'){
+          load_ta_info_for_edit(ta_id);
+        }
+        if(panel_id=='approvePanel'){
+          load_ta_info_for_approval(ta_id);
+        }
+      }
+    }
+  );
+
+});
+
+@stop

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

@@ -6,8 +6,11 @@
     <ul class="nav navbar-nav navbar-right">
       <li>{{ HTML::linkAction('ProgramCoordinatorsController@overview', 'Overview') }}</li>
       <li>{{ HTML::linkAction('TemplatesController@newTemplate', 'Rubrics') }}</li>
-      {{-- la linea siguiente comentada es lo que habia originalmente. tanto la linea como este comentario se pueden borrar --}}
-      {{-- <li>{{ HTML::linkAction('CriteriaController@index', 'Learning Outcomes and Criteria') }}</li> --}}
+      <li>{{ HTML::linkAction('ThreeYearPlanController@threeYearsReport', 'Three Years Plan') }}</li>
+      <li>{{ HTML::linkAction('TransformativeActionsController@editTA', 'Transformative Actions') }}</li>
+
+      <li>{{ HTML::linkAction('Objective2Controller@editProgram', 'Objectives')}}</li>
+      <li>{{ HTML::linkAction('CriteriaController@editProgram', 'Criteria') }}</li>
       <li class="dropdown">
         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Learning and Criterias<span class="caret"></span></a>
         <ul class="dropdown-menu" role="menu">
@@ -20,9 +23,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
@@ -30,28 +33,28 @@
       <li class="dropdown">
         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Reports<span class="caret"></span></a>
         <ul class="dropdown-menu" role="menu">
-            <li>{{ HTML::linkAction('OutcomesController@managerAssessmentReports', 'Program Reports') }}</li>
-            @if(count(Auth::user()->courses))
-              <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReports', 'My Courses\' Reports') }}</li>
-            @endif
+          <li>{{ HTML::linkAction('OutcomesController@managerAssessmentReports', 'Program Reports') }}</li>
+          @if(count(Auth::user()->courses))
+          <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReports', 'My Courses\' Reports') }}</li>
+          @endif
         </ul>
       </li>
 
       <li class="dropdown">
         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Help<span class="caret"></span></a>
         <ul class="dropdown-menu" role="menu">
-            <li>{{ HTML::linkAction('FeedbackController@create', 'Feedback') }}</li>
-            <!-- <li><a href="{{ asset('files/OLAS-intro.pdf') }}">Introduction to OLAS</a></li> -->
-            <li><a href="{{ asset('files/intro-avaluo.pdf') }}">Introduction to Assessment</a></li>
-            <!-- <li><a href="{{ asset('files/OLAS-coords.pdf') }}">OLAS for Coordinators</a></li> -->
-            <li><a href="http://oeae.uprrp.edu/wp-content/uploads/2019/01/Brochure-de-OLAS-rev.-agosto-2018.pdf">Brochure</a></li>
+          <li>{{ HTML::linkAction('FeedbackController@create', 'Feedback') }}</li>
+          <!-- <li><a href="{{ asset('files/OLAS-intro.pdf') }}">Introduction to OLAS</a></li> -->
+          <li><a href="{{ asset('files/intro-avaluo.pdf') }}">Introduction to Assessment</a></li>
+          <!-- <li><a href="{{ asset('files/OLAS-coords.pdf') }}">OLAS for Coordinators</a></li> -->
+          <li><a href="http://oeae.uprrp.edu/wp-content/uploads/2019/01/Brochure-de-OLAS-rev.-agosto-2018.pdf">Brochure</a></li>
         </ul>
       </li>
       <li class="dropdown">
         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Account<span class="caret"></span></a>
         <ul class="dropdown-menu" role="menu">
-            <li>{{ HTML::linkAction('UsersController@edit', 'Profile') }}</li>
-            <li>{{ HTML::linkAction('AuthController@logout', 'Log out ('.Auth::user()->email.')') }}</li>
+          <li>{{ HTML::linkAction('UsersController@edit', 'Profile') }}</li>
+          <li>{{ HTML::linkAction('AuthController@logout', 'Log out ('.Auth::user()->email.')') }}</li>
         </ul>
       </li>
     </ul>