Merge branch 'gabriel_branch' into oniel-progreso

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/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_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/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/local/managers/admins/_navigation.blade.php

@@ -8,6 +8,7 @@
         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Management<span class="caret"></span></a>
         <ul class="dropdown-menu" role="menu">
           <li>{{ HTML::linkAction('CoursesController@reassign', 'Courses') }}</li>
+          <li>{{ HTML::linkAction('Objective2Controller@edit', 'Objectives')}}</li>
           <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 +17,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 +28,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 +38,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 +48,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/pCoords/_navigation.blade.php

@@ -6,8 +6,9 @@
     <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('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 +21,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 +31,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>

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

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

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

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

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

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

app/views/local/managers/shared/program.blade.php

@@ -1,13 +1,13 @@
 @extends('layouts.master')
 
 @section('navigation')
-    @if($role==1)
-        @include('local.managers.admins._navigation')
-    @elseif($role==2)
-        @include('local.managers.sCoords._navigation')
-    @elseif($role==3)
-        @include('local.managers.pCoords._navigation')
-    @endif
+@if($role==1)
+@include('local.managers.admins._navigation')
+@elseif($role==2)
+@include('local.managers.sCoords._navigation')
+@elseif($role==3)
+@include('local.managers.pCoords._navigation')
+@endif
 @stop
 
 @section('main')
@@ -36,42 +36,44 @@
                 <div class="col-md-12">
                     <h3>Courses in this program</h3>
                     @if($program_courses->count()>0)
-                        <table class="table table-striped table-condensed datatable">
-                            <thead>
-                                <tr>
-                                    <th>Identifier</th>
-                                    <th>Name</th>
-                                    <th>Program</th>
-                                    <th>Assessed</th>
-                                </tr>
-                            </thead>
-                            <tfoot>
-                                <tr class="column-search">
-                                    <th><input class="column-search-bar form-control" type="text" placeholder="Search"/></th>
-                                    <th><input class="column-search-bar form-control" type="text" placeholder="Search"/></th>
-                                    <th><input class="column-search-bar form-control" type="text" placeholder="Search"/></th>
-                                    <th><select class="column-search-select form-control"><option value=""></option></select></th>
-                                </tr>
-                            </tfoot>
-                            <tbody>
-                                @foreach($grouped_courses as $grouped_course)
-                                    <tr>
-                                        <td class="col-md-1">{{ HTML::linkAction('CoursesController@showGrouped', $grouped_course->code.$grouped_course->number.' ('.$grouped_course->semester->code.')', array($grouped_course->code, $grouped_course->number, $grouped_course->semester->code)) }}</td>
-                                        <td class="col-md-4">{{{ $grouped_course->name}}}</td>
-                                        <td class="col-md-3">{{{ $grouped_course->program->name }}}</td>
-                                        <td class="col-md-1">
-                                            @if($grouped_course->outcomes_attempted!=NULL)
-                                                Yes
-                                            @else
-                                                No
-                                            @endif
-                                        </td>
-                                    </tr>
-                                @endforeach
-                            </tbody>
-                        </table>
+                    <table class="table table-striped table-condensed datatable">
+                        <thead>
+                            <tr>
+                                <th>Identifier</th>
+                                <th>Name</th>
+                                <th>Program</th>
+                                <th>Assessed</th>
+                            </tr>
+                        </thead>
+                        <tfoot>
+                            <tr class="column-search">
+                                <th><input class="column-search-bar form-control" type="text" placeholder="Search" /></th>
+                                <th><input class="column-search-bar form-control" type="text" placeholder="Search" /></th>
+                                <th><input class="column-search-bar form-control" type="text" placeholder="Search" /></th>
+                                <th><select class="column-search-select form-control">
+                                        <option value=""></option>
+                                    </select></th>
+                            </tr>
+                        </tfoot>
+                        <tbody>
+                            @foreach($grouped_courses as $grouped_course)
+                            <tr>
+                                <td class="col-md-1">{{ HTML::linkAction('CoursesController@showGrouped', $grouped_course->code.$grouped_course->number.' ('.$grouped_course->semester->code.')', array($grouped_course->code, $grouped_course->number, $grouped_course->semester->code)) }}</td>
+                                <td class="col-md-4">{{{ $grouped_course->name}}}</td>
+                                <td class="col-md-3">{{{ $grouped_course->program->name }}}</td>
+                                <td class="col-md-1">
+                                    @if($grouped_course->outcomes_attempted!=NULL)
+                                    Yes
+                                    @else
+                                    No
+                                    @endif
+                                </td>
+                            </tr>
+                            @endforeach
+                        </tbody>
+                    </table>
                     @else
-                        <p class="lead"> No courses assigned.</p>
+                    <p class="lead"> No courses assigned.</p>
                     @endif
                 </div>
             </div>
@@ -82,43 +84,45 @@
                 <div class="col-md-12">
                     <h3>Sections in this program</h3>
                     @if($program_courses->count()>0)
-                        <p class="lead"> {{{ $assessed_courses_count }}} out of {{{ $program_courses->count() }}} section(s) doing Assessment ({{{ round($assessed_courses_count/$program_courses->count()*100, 2) }}}%)</p>
-                        <table class="table table-striped table-condensed datatable">
-                            <thead>
-                                <tr>
-                                    <th>Identifier</th>
-                                    <th>Name</th>
-                                    <th>Professor</th>
-                                    <th>Assessed</th>
-                                </tr>
-                            </thead>
-                            <tfoot>
-                                <tr class="column-search">
-                                    <th><input class="column-search-bar form-control" type="text" placeholder="Buscar"/></th>
-                                    <th><input class="column-search-bar form-control" type="text" placeholder="Buscar"/></th>
-                                    <th><input class="column-search-bar form-control" type="text" placeholder="Buscar"/></th>
-                                    <th><select class="column-search-select form-control"><option value=""></option></select></th>
-                                </tr>
-                            </tfoot>
-                            <tbody>
-                                @foreach($program_courses as $course)
-                                <tr>
-                                    <td>{{ HTML::linkAction('CoursesController@showLimited', $course->code.$course->number.'-'.$course->section.' ('.$course->semester->code.')', array('id'=>$course->id)) }}</td>
-                                    <td>{{{ $course->name}}}</td>
-                                    <td>{{{ $course->user->surnames }}}, {{{ $course->user->first_name }}}</td>
-                                    <td>
-                                        @if($course->outcomes_attempted!=NULL)
-                                            Yes
-                                        @else
-                                            No
-                                        @endif
-                                    </td>
-                                </tr>
-                                @endforeach
-                            </tbody>
-                        </table>
+                    <p class="lead"> {{{ $assessed_courses_count }}} out of {{{ $program_courses->count() }}} section(s) doing Assessment ({{{ round($assessed_courses_count/$program_courses->count()*100, 2) }}}%)</p>
+                    <table class="table table-striped table-condensed datatable">
+                        <thead>
+                            <tr>
+                                <th>Identifier</th>
+                                <th>Name</th>
+                                <th>Professor</th>
+                                <th>Assessed</th>
+                            </tr>
+                        </thead>
+                        <tfoot>
+                            <tr class="column-search">
+                                <th><input class="column-search-bar form-control" type="text" placeholder="Buscar" /></th>
+                                <th><input class="column-search-bar form-control" type="text" placeholder="Buscar" /></th>
+                                <th><input class="column-search-bar form-control" type="text" placeholder="Buscar" /></th>
+                                <th><select class="column-search-select form-control">
+                                        <option value=""></option>
+                                    </select></th>
+                            </tr>
+                        </tfoot>
+                        <tbody>
+                            @foreach($program_courses as $course)
+                            <tr>
+                                <td>{{ HTML::linkAction('CoursesController@showLimited', $course->code.$course->number.'-'.$course->section.' ('.$course->semester->code.')', array('id'=>$course->id)) }}</td>
+                                <td>{{{ $course->name}}}</td>
+                                <td>{{{ $course->user->surnames }}}, {{{ $course->user->first_name }}}</td>
+                                <td>
+                                    @if($course->outcomes_attempted!=NULL)
+                                    Yes
+                                    @else
+                                    No
+                                    @endif
+                                </td>
+                            </tr>
+                            @endforeach
+                        </tbody>
+                    </table>
                     @else
-                        <p class="lead"> No sections assigned.</p>
+                    <p class="lead"> No sections assigned.</p>
                     @endif
                 </div>
             </div>
@@ -140,55 +144,59 @@
                         </thead>
                         <tfoot>
                             <tr class="column-search">
-                                <th><input class="column-search-bar form-control" type="text" placeholder="Search"/></th>
-                                <th><select class="column-search-select form-control"><option value=""></option></select></th>
-                                <th><select class="column-search-select form-control"><option value=""></option></select></th>
-                                <th><input class="column-search-bar form-control" type="text" placeholder="Search"/></th>
-                                <th><input class="column-search-bar form-control" type="text" placeholder="Search"/></th>
+                                <th><input class="column-search-bar form-control" type="text" placeholder="Search" /></th>
+                                <th><select class="column-search-select form-control">
+                                        <option value=""></option>
+                                    </select></th>
+                                <th><select class="column-search-select form-control">
+                                        <option value=""></option>
+                                    </select></th>
+                                <th><input class="column-search-bar form-control" type="text" placeholder="Search" /></th>
+                                <th><input class="column-search-bar form-control" type="text" placeholder="Search" /></th>
                             </tr>
                         </tfoot>
                         <tbody>
                             @foreach($users as $user)
-                                <tr>
-                                    <td>{{ $user->surnames }}, {{ $user->first_name }}</td>
+                            <tr>
+                                <td>{{ $user->surnames }}, {{ $user->first_name }}</td>
 
-                                    @if($user->role == 1)
-                                        <td>Administrator</td>
-                                        <td>All</td>
-                                    @elseif($user->role == 2)
-                                        <td>School Coordinator</td>
-                                        <td>All in {{ $program->school->name }}</td>
-                                    @elseif($user->role == 3)
-                                        <td>Program Coordinator</td>
-                                        <td>
-                                            @foreach ($user->programs as $program)
-                                                {{ $program->name }}&nbsp;
-                                            @endforeach
-                                        </td>
-                                    @else
-                                        <td>Professor</td>
-                                        <td>
-                                            @foreach ($user->programs as $program)
-                                                {{ $program->name }}&nbsp;
-                                            @endforeach
-                                        </td>
-                                    @endif
+                                @if($user->role == 1)
+                                <td>Administrator</td>
+                                <td>All</td>
+                                @elseif($user->role == 2)
+                                <td>School Coordinator</td>
+                                <td>All in {{ $program->school->name }}</td>
+                                @elseif($user->role == 3)
+                                <td>Program Coordinator</td>
+                                <td>
+                                    @foreach ($user->programs as $program)
+                                    {{ $program->name }}&nbsp;
+                                    @endforeach
+                                </td>
+                                @else
+                                <td>Professor</td>
+                                <td>
+                                    @foreach ($user->programs as $program)
+                                    {{ $program->name }}&nbsp;
+                                    @endforeach
+                                </td>
+                                @endif
 
-                                    <td>
-                                        <a href="mailto:{{ $user->email }}">{{ $user->email }}</a>
-                                    </td>
-                                    <td>
-                                        @if($user->office_phone)
-                                            {{{ $user->office_phone }}}
+                                <td>
+                                    <a href="mailto:{{ $user->email }}">{{ $user->email }}</a>
+                                </td>
+                                <td>
+                                    @if($user->office_phone)
+                                    {{{ $user->office_phone }}}
 
-                                            @if($user->office_extension)
-                                                <span>ext.</span> {{{ $user->office_extension }}}
-                                            @endif
-                                        @else
-                                            Not set
-                                        @endif
-                                    </td>
-                                </tr>
+                                    @if($user->office_extension)
+                                    <span>ext.</span> {{{ $user->office_extension }}}
+                                    @endif
+                                    @else
+                                    Not set
+                                    @endif
+                                </td>
+                            </tr>
                             @endforeach
                         </tbody>
                     </table>
@@ -215,118 +223,118 @@
 @section('javascript')
 
 $('#programTabs a').click(function (e) {
-    e.preventDefault()
-    $(this).tab('show');
+e.preventDefault()
+$(this).tab('show');
 });
 
 
 $('#graph').highcharts({
-    chart: {
-        type: 'bar'
-    },
-    title: {
-        text: 'Performance by Learning Outcome Criteria in {{ $program->name }} Program'
-    },
-    legend: {
-                reversed: true,
-            },
-    xAxis: {
-        categories: [
-            @foreach($outcomes as $outcome)
-                "{{{ $outcome->name }}}",
-            @endforeach
-        ],
-        labels: {
-            style: {
-                fontSize:'11px'
-            },
-            step:1,
-            useHTML:true,
-            formatter: function() {
-                return '<div style="width:200px; word-break:break; text-overflow:ellipsis; overflow:hidden;">'+this.value+'</div>';
-            },
-        }
-    },
-    yAxis: {
-        min: 0,
-        max: 100,
-        title: {
-            text: 'Percentage'
-        }
-    },
-    tooltip: {
-        headerFormat: '<span style="font-size:10px">{point.key}</span><table>',
-        pointFormat: '<tr><td style="color:{series.color};padding:0">{series.name}: </td>' +
-            '<td style="padding:0"><b>{point.y:.2f}</b></td></tr>',
-        footerFormat: '</table>',
-        shared: true,
-        useHTML: true
-    },
-    plotOptions: {
-        bar: {
-            //grouping: false,
-            shadow: false,
-            borderWidth: 0,
-        },
-        series: {
-        pointPadding: 0,
-        groupPadding: 0.075
-        },
-    },
-    series: [{
-        name: 'Expected Value',
-        color: '#555555',
-        dataLabels: {
-            enabled: true,
-            fontSize: 8,
-            color: '#fff',
-            align: 'right',
-            format: '{y:.1f}%',
-            style: {
-                //fontWeight: 'bold'
-            },
-            y:-1
-        },
-        data: [
-            @foreach($outcomes as $index => $outcome)
-                @if(
-                    is_array($outcomes_attempted)
-                    && array_key_exists($outcome->id, $outcomes_attempted)
-                    && $outcomes_attempted[$outcome->id]!=0)
-                    {{{ $outcome->expected_outcome }}},
-                @else
-                    0,
-                @endif
-            @endforeach
-        ]
+chart: {
+type: 'bar'
+},
+title: {
+text: 'Performance by Learning Outcome Criteria in {{ $program->name }} Program'
+},
+legend: {
+reversed: true,
+},
+xAxis: {
+categories: [
+@foreach($outcomes as $outcome)
+"{{{ $outcome->name }}}",
+@endforeach
+],
+labels: {
+style: {
+fontSize:'11px'
+},
+step:1,
+useHTML:true,
+formatter: function() {
+return '<div style="width:200px; word-break:break; text-overflow:ellipsis; overflow:hidden;">'+this.value+'</div>';
+},
+}
+},
+yAxis: {
+min: 0,
+max: 100,
+title: {
+text: 'Percentage'
+}
+},
+tooltip: {
+headerFormat: '<span style="font-size:10px">{point.key}</span><table>',
+    pointFormat: '<tr><td style="color:{series.color};padding : 0">{series.name}: </td>' +
+        '<td style="padding:0"><b>{point.y:.2f}</b></td></tr>',
+    footerFormat: '</table>',
+shared: true,
+useHTML: true
+},
+plotOptions: {
+bar: {
+//grouping: false,
+shadow: false,
+borderWidth: 0,
+},
+series: {
+pointPadding: 0,
+groupPadding: 0.075
+},
+},
+series: [{
+name: 'Expected Value',
+color: '#555555',
+dataLabels: {
+enabled: true,
+fontSize: 8,
+color: '#fff',
+align: 'right',
+format: '{y:.1f}%',
+style: {
+//fontWeight: 'bold'
+},
+y:-1
+},
+data: [
+@foreach($outcomes as $index => $outcome)
+@if(
+is_array($outcomes_attempted)
+&& array_key_exists($outcome->id, $outcomes_attempted)
+&& $outcomes_attempted[$outcome->id]!=0)
+{{{ $outcome->expected_outcome }}},
+@else
+0,
+@endif
+@endforeach
+]
 
-    },{
-        name: 'Obtained Value',
-        color: '#e70033',
-        dataLabels: {
-            enabled: true,
-            fontSize: 8,
-            color: '#fff',
-            align: 'right',
-            format: '{y:.1f}%',
-            style: {
-                //fontWeight: 'bold'
-            },
-            y:-1
-        },
-        data:[
-            @foreach($outcomes as $index => $outcome)
-                @if(
-                    is_array($outcomes_attempted)
-                    && array_key_exists($outcome->id, $outcomes_attempted)
-                    && $outcomes_attempted[$outcome->id]!=0)
-                    {{{ ($outcomes_achieved[$outcome->id]/$outcomes_attempted[$outcome->id])*100 }}},
-                @else
-                    0,
-                @endif
-            @endforeach
-        ]
-    }]
+},{
+name: 'Obtained Value',
+color: '#e70033',
+dataLabels: {
+enabled: true,
+fontSize: 8,
+color: '#fff',
+align: 'right',
+format: '{y:.1f}%',
+style: {
+//fontWeight: 'bold'
+},
+y:-1
+},
+data:[
+@foreach($outcomes as $index => $outcome)
+@if(
+is_array($outcomes_attempted)
+&& array_key_exists($outcome->id, $outcomes_attempted)
+&& $outcomes_attempted[$outcome->id]!=0)
+{{{ ($outcomes_achieved[$outcome->id]/$outcomes_attempted[$outcome->id])*100 }}},
+@else
+0,
+@endif
+@endforeach
+]
+}]
 });
 
 // Include dummy graph for outcomes

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

@@ -16,14 +16,14 @@
         </ul>
       </li>
       @if(count(Auth::user()->courses))
-        <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">
+      <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)
-            <li> {{ HTML::linkAction('CoursesController@show', $course->code.$course->number.'-'.$course->section.' ('.$course->semester->code.')', array('id'=>$course->id)) }}</li>
+          <li> {{ HTML::linkAction('CoursesController@show', $course->code.$course->number.'-'.$course->section.' ('.$course->semester->code.')', array('id'=>$course->id)) }}</li>
           @endforeach
-          </ul>
-        </li>
+        </ul>
+      </li>
       @endif
       <li> {{ HTML::linkAction('ProfessorsController@program', 'Program') }}</li>
       <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReports', 'Reports') }}</li>
@@ -45,4 +45,4 @@
       </li>
     </ul>
   </div>
-</div>
+</div>

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

@@ -166,6 +166,7 @@
             <!-- If no rubric is assigned and the semester is active -->
             @if($activity->rubric == NULL && in_array($course->semester->id, $active_semesters))
                 {{ HTML::linkAction('RubricsController@newRubric', 'Assign Rubric', array($activity->id), array('class'=>'btn btn-primary btn-sm btn-block')) }}
+                {{ HTML::linkAction('RubricsController@newOtherMethod', 'Assign Other Assessment Method', array($activity->id), array('class'=>'btn btn-primary btn-sm btn-block')) }}
             @else
 
                 {{ HTML::linkAction('RubricsController@show', 'View Rubric', array($activity->id), array('class'=>'btn btn-primary btn-sm btn-block')) }}

bootstrap/start.php

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

composer.json

@@ -1,20 +1,23 @@
 {
 	"name": "laravel/laravel",
 	"description": "The Laravel Framework.",
-	"keywords": ["framework", "laravel"],
+	"keywords": [
+		"framework",
+		"laravel"
+	],
 	"license": "MIT",
 	"type": "project",
 	"require": {
 		"laravel/framework": "4.2.*",
 		"pda/pheanstalk": "~2.0",
 		"barryvdh/laravel-dompdf": "0.4.*",
-		 "zizaco/entrust": "1.2.*@dev"
+		"zizaco/entrust": "1.2.*@dev"
 	},
 	"require-dev": {
 		"way/generators": "~2.0",
 		"fzaninotto/faker": "1.5.*@dev",
 		"barryvdh/laravel-ide-helper": "1.11"
-		},
+	},
 	"autoload": {
 		"classmap": [
 			"app/commands",
@@ -42,4 +45,4 @@
 		"preferred-install": "dist"
 	},
 	"minimum-stability": "stable"
-}
+}

drop_tables.sql

@@ -0,0 +1,53 @@
+Set foreign_key_checks =0;
+drop table if exists `VIEW_participating_programs`...
+
+drop table if exists `activities`;
+
+drop table if exists `annual_plan_outcomes`;
+
+drop table if exists `annual_plans`;
+
+drop table if exists `assessments`;
+
+drop table if exists `course_student`;
+
+drop table if exists `courses`;
+
+drop table if exists `criteria`;
+
+drop table if exists `criterion_objective`;
+
+drop table if exists `five_year_plans`;
+
+drop table if exists `fyp_part_outcomes`;
+
+drop table if exists `fyp_parts`;
+
+drop table if exists `migrations`;
+
+drop table if exists `objectives`;
+
+drop table if exists `outcomes`;
+
+drop table if exists `password_reminders`;
+
+drop table if exists `password_resets`;
+
+drop table if exists `program_user`;
+
+drop table if exists `programs`;
+
+drop table if exists `quinquenniums`;
+
+drop table if exists `rubrics`;
+
+drop table if exists `schools`;
+
+drop table if exists `semesters`;
+
+drop table if exists `students`;
+
+drop table if exists `templates`;
+
+
+set foreign_key_checks =1;

public/.htaccess

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

seed.sql

@@ -0,0 +1,103 @@
+SET FOREIGN_KEY_CHECKS=0;
+INSERT INTO activities (id, name, description, course_id, date, draft, created_at, updated_at, criteria_achieved, criteria_weights, outcomes_achieved, outcomes_attempted, transforming_actions, assessment_comments, criteria_achieved_percentage, criteria_participant_count, criteria_achiever_count) VALUES (1, 'act1', 'abc', null, '2020-01-01', 0, '2020-01-01 00:00:00', '2020-01-01 00:00:00', null, null, null, null, null, null, null, null, null);
+INSERT INTO activities (id, name, description, course_id, date, draft, created_at, updated_at, criteria_achieved, criteria_weights, outcomes_achieved, outcomes_attempted, transforming_actions, assessment_comments, criteria_achieved_percentage, criteria_participant_count, criteria_achiever_count) VALUES (3, 'act2', 'from course1', 1, '2020-01-01', 0, '2020-01-01 00:00:00', '2020-01-01 00:00:00', null, null, null, null, null, null, null, null, null);INSERT INTO courses (id, name, code, section, program_id, user_id, semester_id, created_at, updated_at, criteria_achieved, outcomes_achieved, outcomes_attempted, number) VALUES (1, 'course1', 'CURS0001', '001', 1, 1, 1, '2020-01-01 00:00:00', '2020-01-01 00:00:00', null, null, null, '0000');INSERT INTO criteria (id, name, subcriteria, description12, description34, description56, description78, outcome_id, created_at, updated_at, user_id, program_id, deleted_at, copyright, notes) VALUES (1, 'crit1', null, 'a', 'b', 'c', 'd', 1, '2020-01-01 00:00:00', '2020-01-01 00:00:00', 1, 1, null, null, null);INSERT INTO migrations (migration, batch) VALUES ('2014_10_05_052350_create_schools_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2014_10_05_055013_create_programs_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2014_10_06_050335_create_users_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2014_10_12_100000_create_password_resets_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2014_11_10_035949_create_rubrics_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2014_11_29_210957_create_templates_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2014_11_29_211309_create_courses_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2014_11_29_211310_create_activities_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2014_11_29_212240_create_outcomes_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2014_11_29_212341_create_criteria_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2014_11_29_214028_create_semesters_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2014_11_30_134022_create_students_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2014_12_07_214036_create_course_student_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2015_01_09_171350_create_assessments_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2015_01_12_204310_add_columns_to_activities_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2015_01_12_222859_add_columns_to_assessments_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2015_01_13_010052_add_index_to_assessments_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2015_01_13_142849_add_column_to_criteria_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2015_01_14_140724_add_columns_to_courses_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2015_01_21_124809_add_column_to_courses_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2015_01_22_195515_add_column_to_templates_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2015_01_23_175455_remove_total_from_assessments_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2015_01_23_175923_rename_average_in_assessments_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2015_01_28_121848_add_index_to_course_student_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2015_01_28_133036_add_criteria_achieved_count_to_activities_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2015_02_05_133245_add_transforming_actions_to_activities_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2015_02_05_143641_add_assessment_comments_to_activities_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2015_02_06_145359_create_password_reminders_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2015_02_19_143311_add_is_graduate_to_programs_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2015_02_25_170516_add_deleted_at_to_outcomes_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2015_02_25_170529_add_deleted_at_to_criteria_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2015_02_27_201953_add_criteria_achieved_percentage_to_activities_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2015_03_04_132321_add_copyright_and_notes_to_criteria_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2015_04_13_183730_add_program_id_to_templates_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2015_04_28_141931_add_is_visible_to_templates_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2015_05_04_162918_remove_expected_outcome_from_outcomes_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2015_05_05_083800_add_decimal_expected_outcome_to_outcomes_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2015_05_18_095002_add_first_login_to_users_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2015_05_18_131259_add_columns_to_semesters_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2015_05_18_134926_add_semester_id_to_courses', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2015_06_10_092319_add_name_to_semesters_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2015_06_12_085247_add_visibility_to_semesters_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2015_06_16_092223_add_has_access_to_users', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2015_06_18_103255_add_expected_percentage_and_points_to_templates_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2015_07_10_150430_add_email_to_students_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2015_07_13_111726_add_code_to_programs_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2015_07_13_132620_add_ssn_and_employee_number_to_users_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2015_08_19_130733_add_semester_id_to_course_student_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2015_12_10_145451_add_criteria_weights_to_activities_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2016_01_12_132034_add_program_id_to_criteria_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2016_01_27_093808_add_date_to_activities_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2016_01_27_134306_add_draft_to_activities_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2016_03_11_085258_add_school_and_concentration_codes_to_students_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2016_05_09_145427_create_program_user_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2016_05_10_091847_remove_program_id_from_users_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2016_05_23_153434_create_objectives_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2016_05_25_090412_add_active_to_objectives_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2016_05_26_092328_create_criterion_objective_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2016_07_15_084546_create_quinquenniums_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2016_07_15_084751_create_five_year_plans_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2016_07_15_084851_create_annual_plans_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2016_07_15_090133_create_fyp_parts_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2016_07_15_090203_create_fyp_part_outcomes_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2016_07_15_090217_create_annual_plan_outcomes_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2016_08_03_120016_remove_methods_from_fyp_part_outcomes_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2016_08_03_140525_add_unique_index_to_five_year_plans_table', 1);
+INSERT INTO migrations (migration, batch) VALUES ('2016_08_11_150848_remove_semester_id_from_annual_plans_table', 2);
+INSERT INTO migrations (migration, batch) VALUES ('2016_08_11_151247_add_year_start_and_year_end_to_annual_plans_table', 2);
+INSERT INTO migrations (migration, batch) VALUES ('2017_02_03_150052_add_comments_to_assessments_table', 2);
+INSERT INTO migrations (migration, batch) VALUES ('2018_02_12_144827_add_subcriteria_to_criteria_table', 2);
+INSERT INTO migrations (migration, batch) VALUES ('2018_07_26_132933_add_last_login_to_users_table', 2);
+INSERT INTO migrations (migration, batch) VALUES ('2018_07_26_134316_add_phone_numbers_and_extension_to_users_table', 2);
+INSERT INTO migrations (migration, batch) VALUES ('2018_08_09_110432_remove_password_from_users_table', 2);
+INSERT INTO migrations (migration, batch) VALUES ('2018_08_09_110813_remove_password_updated_and_remember_token_from_users_table', 2);
+INSERT INTO migrations (migration, batch) VALUES ('2018_08_10_083743_add_remember_token_to_users_table', 2);
+INSERT INTO migrations (migration, batch) VALUES ('2018_08_28_140328_remove_outcome_id_from_objectives_table', 2);
+INSERT INTO migrations (migration, batch) VALUES ('2018_08_28_141547_drop_criterion_objective_table', 2);
+INSERT INTO migrations (migration, batch) VALUES ('2018_08_28_142111_create_objective_outcome_table', 2);
+INSERT INTO migrations (migration, batch) VALUES ('2018_09_13_134104_entrust_setup_tables', 2);
+INSERT INTO migrations (migration, batch) VALUES ('2019_08_07_100303_add_participants_achievers_counts_to_activities_table', 2);
+INSERT INTO migrations (migration, batch) VALUES ('2020_03_06_122426_create_participating_programs_view', 2);
+INSERT INTO migrations (migration, batch) VALUES ('2020_04_04_002657_create_new_criteria_table', 2);
+INSERT INTO migrations (migration, batch) VALUES ('2020_04_04_005817_add_outcome_id_to_objectives_table', 2);
+INSERT INTO migrations (migration, batch) VALUES ('2020_04_22_090200_alter_activities_table', 2);
+INSERT INTO migrations (migration, batch) VALUES ('2020_04_22_095649_create_new_criterion_rubric_table', 2);
+INSERT INTO migrations (migration, batch) VALUES ('2020_04_22_101110_create_new_rubric_activity_table', 2);
+INSERT INTO migrations (migration, batch) VALUES ('2020_04_22_105537_create_new_activity_course_table', 2);
+INSERT INTO migrations (migration, batch) VALUES ('2020_04_22_122910_add_criteria_id_to_assessments_table', 2);INSERT INTO new_criteria (id, name, subcriteria, description12, description34, description56, description78, objective_id, program_id, user_id, copyright, notes, created_at, updated_at, deleted_at) VALUES (2, 'crit1', null, '12', '34', '56', '78', 1, 1, 1, null, null, '2020-01-01 00:00:00', '2020-01-01 00:00:00', null);INSERT INTO new_criterion_rubric (id, criterion_id, rubric_id, created_at, updated_at) VALUES (2, 2, 1, '2020-01-01 00:00:00', '2020-01-01 00:00:00');INSERT INTO new_rubric_activity (id, rubric_id, activity_id, created_at, updated_at) VALUES (1, 1, 1, '2020-01-01 00:00:00', '2020-01-01 00:00:00');
+INSERT INTO new_rubric_activity (id, rubric_id, activity_id, created_at, updated_at) VALUES (2, 1, 3, '2020-01-01 00:00:00', '2020-01-01 00:00:00');INSERT INTO objective_outcome (id, objective_id, outcome_id, created_at, updated_at) VALUES (1, 1, 1, '2020-01-01 00:00:00', '2020-01-01 00:00:00');INSERT INTO objectives (id, program_id, text, active, created_at, updated_at, outcome_id) VALUES (1, 1, 'obj1', 1, '2020-01-01 00:00:00', '2020-01-01 00:00:00', 1);INSERT INTO outcomes (id, name, definition, expected_outcome, created_at, updated_at, deleted_at, new_outcome_id, deactivation_date) VALUES (1, 'outcome1', 'outcome1', 66.66, '2020-01-01 00:00:00', '2020-01-01 00:00:00', null, 1, null);
+INSERT INTO outcomes (id, name, definition, expected_outcome, created_at, updated_at, deleted_at, new_outcome_id, deactivation_date) VALUES (2, 'outcome2', 'outcome2', 66.66, '2020-01-01 00:00:00', '2020-01-01 00:00:00', null, 2, null);
+INSERT INTO outcomes (id, name, definition, expected_outcome, created_at, updated_at, deleted_at, new_outcome_id, deactivation_date) VALUES (3, 'outcome3', 'outcome3', 66.66, '2020-01-01 00:00:00', '2020-01-01 00:00:00', null, 3, null);
+INSERT INTO outcomes (id, name, definition, expected_outcome, created_at, updated_at, deleted_at, new_outcome_id, deactivation_date) VALUES (4, 'outcome4', 'outcome4', 66.66, '2020-01-01 00:00:00', '2020-01-01 00:00:00', null, 4, null);
+INSERT INTO outcomes (id, name, definition, expected_outcome, created_at, updated_at, deleted_at, new_outcome_id, deactivation_date) VALUES (5, 'outcome5', 'outcome5', 66.66, '2020-01-01 00:00:00', '2020-01-01 00:00:00', null, 5, null);
+INSERT INTO outcomes (id, name, definition, expected_outcome, created_at, updated_at, deleted_at, new_outcome_id, deactivation_date) VALUES (6, 'outcome6', 'outcome6', 66.66, '2020-01-01 00:00:00', '2020-01-01 00:00:00', null, 6, null);
+INSERT INTO outcomes (id, name, definition, expected_outcome, created_at, updated_at, deleted_at, new_outcome_id, deactivation_date) VALUES (7, 'outcome7', 'outcome7', 66.66, '2020-01-01 00:00:00', '2020-01-01 00:00:00', null, 7, null);
+INSERT INTO outcomes (id, name, definition, expected_outcome, created_at, updated_at, deleted_at, new_outcome_id, deactivation_date) VALUES (8, 'outcome8', 'outcome8', 66.66, '2020-01-01 00:00:00', '2020-01-01 00:00:00', null, 8, null);
+INSERT INTO outcomes (id, name, definition, expected_outcome, created_at, updated_at, deleted_at, new_outcome_id, deactivation_date) VALUES (9, 'old_outcome1', 'deactivates on 2015-01-01', 66.66, '2020-01-01 00:00:00', '2020-01-01 00:00:00', null, 1, '2015-01-01');INSERT INTO programs (id, name, code, school_id, restrict_rubrics, created_at, updated_at, is_graduate) VALUES (1, 'TEST', 'TEST', 1, 0, '2020-01-01 00:00:00', '2020-01-01 00:00:00', 0);
+INSERT INTO programs (id, name, code, school_id, restrict_rubrics, created_at, updated_at, is_graduate) VALUES (2, 'UHS', 'UHS', 2, 0, '2020-01-01 00:00:00', '2020-01-01 00:00:00', 0);INSERT INTO program_user (id, program_id, user_id, created_at, updated_at) VALUES (1, 1, 1, '2020-01-01 00:00:00', '2020-01-01 00:00:00');INSERT INTO rubrics (id, name, contents, expected_percentage, expected_points, user_id, created_at, updated_at) VALUES (1, 'rubric1', 'abcd', 50, 50, 1, '2020-01-01 00:00:00', '2020-01-01 00:00:00');INSERT INTO schools (id, name, created_at, updated_at) VALUES (1, 'school1', '2020-01-01 00:00:00', '2020-01-01 00:00:00');
+INSERT INTO schools (id, name, created_at, updated_at) VALUES (2, 'UHS', '2020-01-01 00:00:00', '2020-01-01 00:00:00');INSERT INTO semesters (id, code, name, start, end, is_visible) VALUES (1, 'B92', 'SEM 2 2019-2020', '2019-01-01 00:00:00', '2020-06-01 00:00:00', 1);
+INSERT INTO semesters (id, code, name, start, end, is_visible) VALUES (2, 'B01', 'SEM 1 2010-2011', '2010-01-01 00:00:00', '2010-01-01 00:00:00', 1);INSERT INTO users (id, ssn, number, first_name, surnames, email, alternate_email, office_phone, office_extension, cell_phone, role, school_id, has_access, created_at, updated_at, last_login, remember_token) VALUES (1, '000000000', '0000000000', 'test', 'test', 'test@upr.edu', null, null, null, null, 1, 1, 1, '2020-01-01 00:00:00', '2020-05-15 11:03:31', '2020-05-15 15:03:31', null);
+SET FOREIGN_KEY_CHECKS=1;