Los cambios mas recientes unidos con oniel

app/controllers/CriteriaController.php

@@ -87,17 +87,17 @@ class CriteriaController extends \BaseController
 
     public function delete()
     {
-        DB::delete("delete from new_criteria where id = ?", array(Input::get('id')));
+        DB::delete("delete from new_criteria where id = ?", array(Input::get('criterion_delete')));
         $role = Auth::user()['role'];
         switch ($role) {
             case 1:
-                return Redirect::to('objective')->withInput();
+                return Redirect::to('criteria')->withInput();
 
             case 2:
-                return Redirect::to('school-objective')->withInput();
+                return Redirect::to('school-criteria')->withInput();
 
             case 3:
-                return Redirect::to('program-objective')->withInput();
+                return Redirect::to('program-criteria')->withInput();
         }
     }
     public function isCriterionUnique($input, $existing_criterion = NULL)
@@ -225,13 +225,13 @@ class CriteriaController extends \BaseController
             $role = Auth::user()['role'];
             switch ($role) {
                 case 1:
-                    return Redirect::to('objective')->withInput();
+                    return Redirect::to('criteria')->withInput();
 
                 case 2:
-                    return Redirect::to('school-objective')->withInput();
+                    return Redirect::to('school-criteria')->withInput();
 
                 case 3:
-                    return Redirect::to('program-objective')->withInput();
+                    return Redirect::to('program-criteria')->withInput();
             }
         } else {
             // Check criterion uniqueness
@@ -288,13 +288,13 @@ class CriteriaController extends \BaseController
                         $role = Auth::user()['role'];
                         switch ($role) {
                             case 1:
-                                return Redirect::to('objective')->withInput();
+                                return Redirect::to('criteria')->withInput();
 
                             case 2:
-                                return Redirect::to('school-objective')->withInput();
+                                return Redirect::to('school-criteria')->withInput();
 
                             case 3:
-                                return Redirect::to('program-objective')->withInput();
+                                return Redirect::to('program-criteria')->withInput();
                         }
                     }
                 }
@@ -308,13 +308,13 @@ class CriteriaController extends \BaseController
                 $role = Auth::user()['role'];
                 switch ($role) {
                     case 1:
-                        return Redirect::to('objective')->withInput();
+                        return Redirect::to('criteria')->withInput();
 
                     case 2:
-                        return Redirect::to('school-objective')->withInput();
+                        return Redirect::to('school-criteria')->withInput();
 
                     case 3:
-                        return Redirect::to('program-objective')->withInput();
+                        return Redirect::to('program-criteria')->withInput();
                 }
             }
 
@@ -325,13 +325,13 @@ class CriteriaController extends \BaseController
                 $role = Auth::user()['role'];
                 switch ($role) {
                     case 1:
-                        return Redirect::to('objective')->withInput();
+                        return Redirect::to('criteria')->withInput();
 
                     case 2:
-                        return Redirect::to('school-objective')->withInput();
+                        return Redirect::to('school-criteria')->withInput();
 
                     case 3:
-                        return Redirect::to('program-objective')->withInput();
+                        return Redirect::to('program-criteria')->withInput();
                 }
             }
         }
@@ -550,15 +550,55 @@ class CriteriaController extends \BaseController
             }
         }
     }
+    // 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();
+        }
+
+        $title = "Learning Objectives and Criteria";
 
+        return View::make('global.view-objectives-criteria', compact('title', 'objectives'));
+    }
     public function index()
     {
+        // el ID de los semestres que el usuario tiene seleccionado.
+        $semesters_ids = Session::get('semesters_ids');
+        // buscar informacion de los semestres seleccionados
+        $semesters = Semester::whereIn('id', $semesters_ids)->get();
+
         $title = "Learning Outcomes and Criteria";
         $outcomes = Outcome::orderBy('name', 'ASC')->get();
         $schools = School::orderBy('name', 'ASC')->get();
         $criteria = Criterion::withTrashed()->orderBy('name', 'ASC')->get();
 
-        return View::make('global.view-learning-outcomes-criteria', compact('title', 'outcomes', 'schools', 'criteria'));
+        // se annadio la nueva variable
+        return View::make('global.view-learning-outcomes-criteria', compact('title', 'outcomes', 'schools', 'criteria', 'semesters'));
     }
 
     public function destroy()

app/controllers/Objective2Controller.php

@@ -70,7 +70,7 @@ class Objective2Controller extends \BaseController
 				'text' => 'required|string',
 
 				'outcome_id' => 'required|array',
-				'program_id' => 'required|numeric|integer'
+				'program_id' => 'required|array'
 
 			)
 
@@ -92,7 +92,7 @@ class Objective2Controller extends \BaseController
 			$clean_input['outcome_id'][$i] = trim(preg_replace('/\t+/', '', $clean_input['outcome_id'][$i]));
 		}
 
-		$clean_input['program_id'] = trim(preg_replace('/\t+/', '', Input::get('program_id')));
+		$clean_input['program_id'] = Input::get('program_id');
 
 
 		return $clean_input;
@@ -109,7 +109,7 @@ class Objective2Controller extends \BaseController
 
 
 
-		$clean_input['program_id'] = trim(preg_replace('/\t+/', '', Input::get('program_id')));
+		$clean_input['program_id'] = Input::get('program_id');
 
 
 		return $clean_input;
@@ -121,7 +121,37 @@ class Objective2Controller extends \BaseController
 
 	public function fetchObjectiveWithTrashed()
 	{
-		return json_encode(DB::select('select o.id, o.program_id, o.text, outc.outcome_id outcome_id from objectives o, objective_outcome outc where o.id = ? and o.id = outc.objective_id', array(Input::get('id'))));
+		$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.
@@ -187,16 +217,15 @@ class Objective2Controller extends \BaseController
 
 
 
-			// Set program
-			if (Input::get('program_id') != 0)
-				$objective->program_id = $clean_input['program_id'];
-			else
-				$objective->program_id = NULL;
+
 
 
 			/** If Objective is saved, send success message */
 			if ($objective->save()) {
 				$objectiveId = $objective->id;
+				foreach ($clean_input['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})");
 
@@ -369,11 +398,6 @@ class Objective2Controller extends \BaseController
 
 
 
-			// Set program
-			if (Input::get('program_id') != 0)
-				$Objective->program_id = Input::get('program_id');
-			else
-				$Objective->program_id = NULL;
 
 			// Set status
 
@@ -383,7 +407,11 @@ class Objective2Controller extends \BaseController
 
 				$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})");
 				}

app/controllers/ObjectivesController.php

@@ -234,4 +234,19 @@ class ObjectivesController extends \BaseController {
 
     return json_encode($res);
   }
+
+  public function fetchObjectiveForCriteria()
+  {
+      $id = Input::get('id');
+
+      $objective = Objective::find($id);
+
+      $objective->program;
+      $objective->criteria;
+
+      return array
+      (
+          'objective' => $objective
+      );
+  }
 }

app/controllers/OutcomesController.php

@@ -14,8 +14,11 @@ class OutcomesController extends \BaseController {
         $title = "Learning Outcomes";
         $outcomes = Outcome::withTrashed()->orderBy('name', 'ASC')->get();
         $schools = School::orderBy('name', 'ASC')->get();
+        // $semesters_ids = Session::get('semesters_ids');
+        // $semesters = Semester::whereIn('id',$semesters_ids)->get();
 
         return View::make('local.managers.admins.learning-outcomes', compact('title', 'outcomes', 'schools'));
+        //return View::make('local.managers.admins.learning-outcomes', compact('title', 'outcomes', 'schools','semesters'));
     }
 
     // TODO: Change to home page
@@ -295,6 +298,85 @@ class OutcomesController extends \BaseController {
         return;
     }
 
+    /**
+    *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)
+        {
+
+
+            $validator = Validator::make(
+                array(
+                    'name' => $outcomeObject['name'],
+                    'definition' => $outcomeObject['definition'],
+                    'expected_outcome' => $outcomeObject['expected_outcome']
+                    // TODO- validar los otros 3 valores
+                ),
+                array(
+                    'name' => 'required',
+                    'definition' => 'required',
+                    'expected_outcome' => 'required|numeric'
+                    // TODO- los requisitos de los otros 3 valores
+                )
+            );
+
+            if(!$validator->fails())
+            {
+                try
+                {
+                    $outcome = Outcome::withTrashed()
+                        ->where('id','=', $outcomeObject['id'])
+                        ->firstOrFail();
+                    $outcome->name = $outcomeObject['name'];
+                    $outcome->definition = $outcomeObject['definition'];
+                    $outcome->expected_outcome = $outcomeObject['expected_outcome'];
+                    $outcome->activation_date = $outcomeObject['activation_date'];
+                    $outcome->deactivation_date = $outcomeObject['deactivation_date'];
+                    $outcome->level = $outcomeObject['level'];
+                    $outcome->save();
+
+                    // If delete is 1, and outcome isn't already trashed, delete
+                    if($outcomeObject['delete']==1 && !$outcome->trashed())
+                        $outcome->delete();
+                    // If delete is 0, and outcome is already trashed, restore
+                    elseif($outcomeObject['delete']==0 && $outcome->trashed())
+                        $outcome->restore();
+                }
+
+                catch(Exception $e)
+                {
+
+                    Session::flash('message', $e->getMessage());
+                }
+            }
+            else
+            {
+                /** Prepare error message */
+                $message = 'Error(s) updating the Learning Outcomes: <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;
+            }
+        }
+
+        return;
+    }
+
     public function fetchCriteria()
     {
 
@@ -391,7 +473,7 @@ class OutcomesController extends \BaseController {
             /** Send error message and old data */
             Session::flash('status', 'warning');
             Session::flash('message', $message);
-            return Redirect::to('learning-outcomes-criteria')->withInput();
+            return Redirect::to('learning-outcomes')->withInput();
         }
         else
         {
@@ -405,7 +487,7 @@ class OutcomesController extends \BaseController {
             {
                 Session::flash('status', 'success');
                 Session::flash('message', '<p>Learning Outcome added.</p>');
-                return Redirect::to('learning-outcomes-criteria');
+                return Redirect::to('learning-outcomes');
             }
 
             /** If saving fails, send error message and old data */
@@ -413,7 +495,7 @@ class OutcomesController extends \BaseController {
             {
                 Session::flash('status', 'warning');
                 Session::flash('message', '<p>Error adding Learning Outcome. Please try again later.</p>');
-                return Redirect::to('learning-outcomes-criteria')->withInput();
+                return Redirect::to('learning-outcomes')->withInput();
             }
         }
     }

app/controllers/ProgramsController.php

@@ -80,6 +80,97 @@ class ProgramsController extends \BaseController
 
 }
 
+public function showReport()
+{
+
+
+  // create an array with the ID of Semesters selected in the form
+  $selected_semesters_id = array();
+  $semesters = Semester::all();
+  foreach ($semesters as $semester) {
+    if ($semester->is_visible){
+      if (Input::get('semester'.$semester->id)!=null){
+        array_push($selected_semesters_id, $semester->id);
+      }
+    }
+  }
+  $selected_semesters = DB::table('semesters')
+                        ->wherein('semesters.id',$selected_semesters_id)
+                        ->get();
+
+  // create a srting with the selected metodos de divulgfacion
+  $selected_divulgaciones = '';
+  $divulgaciones = array('profesores','comiteDepartamental','comiteFacultadEscuela',
+                      'pleno','estudiantes','administrativos','senado','comunidadWeb',
+                      'otros');
+  foreach ($divulgaciones as $divulgacion) {
+    if (Input::get($divulgacion)!=null){
+      $selected_divulgaciones = $selected_divulgaciones.'\n'.Input::get($divulgacion);
+    }
+  }
+
+  //OUTCOMES Join criteria join program
+  $programs = DB::table('programs')
+                        ->select('id','name')
+                        ->orderBy('name', 'asc')
+                        ->get();
+
+
+
+   // $program
+   $tables_names = '{';
+   foreach ($programs as $program) {
+     $tables_names = $tables_names.'"table'.$program->id.'" : "'.$program->name.'",';// code...
+   }
+   $tables_names = $tables_names.'}';
+
+   $title = "Programs Reports";
+   // $title = "Program Report: ".$program->name;
+
+   $programs_info = array();
+   //OUTCOMES Join criteria join program
+   foreach ($programs as $program) {
+     $info_by_id = Program::find($program->id);
+
+     $domains = DB::table('outcomes')
+                           ->join('criteria','criteria.outcome_id','=','outcomes.id')
+                           ->join('programs','programs.id','=','criteria.program_id')
+                           ->join('courses','courses.program_id','=','programs.id')
+                           ->where('programs.id',$program->id)
+                           ->select('outcomes.name','outcomes.activation_date')
+                           ->distinct()
+                           ->orderBy('outcomes.name', 'asc')
+                           ->get();
+
+     $courses_used = DB::table('outcomes')
+                           ->join('criteria','criteria.outcome_id','=','outcomes.id')
+                           ->join('programs','programs.id','=','criteria.program_id')
+                           ->join('courses','courses.program_id','=','programs.id')
+                           ->where('programs.id',$program->id)
+                           ->select('courses.number', 'outcomes.name as domain_name', 'courses.code')
+                           ->distinct()
+                           ->orderBy('courses.name', 'asc')
+                           ->get();
+
+     $transformative_actions = DB::table('outcomes')
+                           ->join('criteria','criteria.outcome_id','=','outcomes.id')
+                           ->join('programs','programs.id','=','criteria.program_id')
+                           ->join('courses','courses.program_id','=','programs.id')
+                           ->join('activities','activities.course_id','=','courses.id')
+                           ->join('activity_criterion','activity_criterion.activity_id','=','activities.id')
+                           ->where('programs.id',$program->id)
+                           ->select('activity_criterion.transformative_actions', 'outcomes.name as domain_name')
+                           ->distinct()
+                           ->orderBy('activity_criterion.transformative_actions', 'asc')
+                           ->get();
+     $info = array($info_by_id, $domains, $courses_used, $transformative_actions);
+     array_push($programs_info, $info);
+   }
+
+
+   return View::make('local.managers.shared.program_report', compact('title','programs_info','selected_divulgaciones','selected_semesters','tables_names'));
+}
+
   /**
    * Info to print a program
    */
@@ -141,8 +232,9 @@ class ProgramsController extends \BaseController
     $title = "Programs by School";
     $programs = Program::orderBy('name')->get();
     $schools = School::all();
+    $semesters = Semester::all();
 
-    return View::make('local.managers.shared.programs', compact('programs', 'schools', 'title'));
+    return View::make('local.managers.shared.programs', compact('programs', 'schools', 'semesters', 'title'));
   }
 
   /**

app/database/migrations/2018_08_28_140328_remove_outcome_id_from_objectives_table.php

@@ -0,0 +1,44 @@
+<?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/migrations/2020_04_04_005817_add_outcome_id_to_objectives_table.php

@@ -0,0 +1,38 @@
+<?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/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/filters.php

@@ -198,9 +198,9 @@ 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 () {
 	$token = Request::ajax() ? Request::header('X-CSRF-Token') : Input::get('_token');

app/routes.php

@@ -226,7 +226,9 @@ Route::group(array('before' => 'auth|has_access'), function () {
 
     // Show users all learning outcomes and criteria
     Route::get('learning-outcomes-criteria', 'CriteriaController@index');
+    Route::get('learning-objectives-criteria', 'CriteriaController@objectivesIndex');
     Route::post('fetchOutcome', array('before' => 'csrf', 'uses' => 'OutcomesController@fetchOutcome'));
+    Route::post('fetchObjectiveForCriteria', array('before' => 'csrf', 'uses' => 'ObjectivesController@fetchObjectiveForCriteria'));
 
     // Show professor overview to users with courses
     Route::get('professor', 'ProfessorsController@overview');
@@ -249,8 +251,11 @@ Route::group(array('before' => 'auth|has_access'), function () {
         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@updateMore'));
         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'));
@@ -260,9 +265,11 @@ Route::group(array('before' => 'auth|has_access'), function () {
         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
@@ -285,9 +292,10 @@ Route::group(array('before' => 'auth|has_access'), 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::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');
 
@@ -305,7 +313,7 @@ Route::group(array('before' => 'auth|has_access'), 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'));
@@ -403,7 +411,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
         Route::post('deleteRubric', array('before' => 'csrf', 'uses' => 'RubricsController@destroy'));
         Route::get('learning-outcomes-criteria', 'CriteriaController@index');
         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');

app/views/global/view-learning-outcomes-criteria.blade.php

@@ -13,12 +13,42 @@
 @stop
 
 @section('main')
+  {{-- TODO: look where to place this script.
+          if placed inside .ready() or before it,
+            an error that the function is not defined occurs. --}}
+  {{-- TODO: no reconoce acentos --}}
+  <script type="text/javascript">
+  function filterOutcomes() {
+    // Declare variables
+    var input, filter, div, li, i, outcomeText;
+    input = document.getElementById('userInput');
+    filter = input.value.toUpperCase();
+    div = document.getElementById("list");
+    li = div.getElementsByTagName('li');
+
+    // Loop through all list items, and hide those who don't match the search query
+    for (i = 0; i < li.length; i++) {
+      outcomeText = li[i].textContent;
+      if (outcomeText.toUpperCase().indexOf(filter) > -1) {
+        li[i].style.display = "";
+      } else {
+        li[i].style.display = "none";
+      }
+    }
+  }
+  </script>
 
   <div class="row">
     <div class="col-md-3">
-      <div class="list-group">
+      <input class="form-control" type="text" id="userInput" onkeyup="filterOutcomes()" placeholder="Search for Learning Outcomes..">
+      <div class="list-group" id='list'>
         @foreach ($outcomes as $outcome)
-          <li data-outcome-id="{{ $outcome->id }}"class="list-group-item">{{ $outcome->name }}</li>
+          @foreach ($semesters as $semester)
+            @if(!$outcome->deleted_at && $outcome->activation_date >= $semester->start && $outcome->activation_date <= $semester->end)
+              {{-- <li data-outcome-id="{{ $outcome->id }}"class="list-group-item">{{ $outcome->name }}</li> --}}
+              <li data-outcome-id="{{ $outcome->id }}"class="list-group-item">{{ $outcome->name }} [{{$semester->code}}]</li>
+            @endif
+          @endforeach
         @endforeach
       </div>
     </div>

app/views/global/view-objectives-criteria.blade.php

@@ -0,0 +1,170 @@
+@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')
+    @elseif(Auth::user()->role==4)
+      @include('local.professors._navigation')
+    @endif
+@stop
+
+@section('main')
+  {{-- TODO: look where to place this script.
+          if placed inside .ready() or before it,
+            an error that the function is not defined occurs. --}}
+  {{-- TODO: no reconoce acentos --}}
+  <script type="text/javascript">
+  function filterObjectives() {
+    // Declare variables
+    var input, filter, div, li, i, objectiveText;
+    input = document.getElementById('userInput');
+    filter = input.value.toUpperCase();
+    div = document.getElementById("list");
+    li = div.getElementsByTagName('li');
+
+    // Loop through all list items, and hide those who don't match the search query
+    for (i = 0; i < li.length; i++) {
+      objectiveText = li[i].textContent;
+      if (objectiveText.toUpperCase().indexOf(filter) > -1) {
+        li[i].style.display = "";
+      } else {
+        li[i].style.display = "none";
+      }
+    }
+  }
+  </script>
+
+  <div class="row">
+    <div class="col-md-3">
+      <input class="form-control" type="text" id="userInput" onkeyup="filterObjectives()" placeholder="Search for Learning Outcomes..">
+      <div class="list-group" id='list'>
+        @foreach ($objectives as $objective)
+          <li data-objective-id="{{ $objective->id }}"class="list-group-item">{{ $objective->text }}</li>
+        @endforeach
+      </div>
+    </div>
+
+    <div class="col-md-9">
+      <div id="objective-display" class="panel panel-default">
+        <div class="panel-heading">
+          <h4 class=" panel-title" style="cursor:auto!important;">
+          </h4>
+        </div>
+        <div class="panel-body">
+          <p class="objective-definition "></p>
+            <div class="table-responsive">
+                <table class="table table-striped table-condensed datatable">
+                  <thead><tr><th>Criterion</th><th>Beginning (1-2)</th><th>In Progress (3-4)</th><th>Satisfactory (5-6)</th><th>Excellent (7-8)</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><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>
+                      </tr>
+                  </tfoot>
+                  <tbody>
+                  </tbody>
+                </table>
+            </div>
+
+        </div>
+      </div>
+    </div>
+
+    <div class="col-md-9">
+      <div class="no-objective alert alert-info">
+        <p>Select a Learning Objective to view its information</p>
+      </div>
+    </div>
+
+  </div>
+@stop
+
+@section('included-js')
+    @include('global._datatables_js')
+@stop
+
+@section('javascript')
+
+$(document).ready(function()
+{
+  // --------------------------------------------------------------------------
+  // Page load
+  // --------------------------------------------------------------------------
+
+  // Hide accordion panel contents by default
+  $('.panel-group .panel-body').hide();
+
+  $('#objective-display').parent().hide();
+
+  // --------------------------------------------------------------------------
+  // Functions
+  // --------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------
+  // Events
+  // --------------------------------------------------------------------------
+
+  // When list item is clicked, load corresponding info
+  $('.list-group-item').on('click', function()
+  {
+    var id = $(this).data('objective-id');
+
+    $.post(
+    "{{ URL::action('ObjectivesController@fetchObjectiveForCriteria') }}",
+    { id: id },
+    function(json)
+    {
+        // Retrieve datatable instance
+        var table = $('.datatable').DataTable();
+
+        var name = json.objective.text;
+        var definition = json.objective.program.name;
+        var criteria =json.objective.criteria;
+
+        $('#objective-display').parent().show();
+        $('.no-objective').parent().hide();
+
+        //Display title and definition
+        $('#objective-display .panel-title').html(name);
+        $('#objective-display .objective-definition').html(definition);
+
+        //Empty table
+        table.clear();
+
+        // Add new criteria
+        if(criteria.length>0)
+        {
+          $('table').show();
+          $.each(criteria, function(index, value)
+          {
+              table.row.add([
+                value.name,
+                value.description12,
+                value.description34,
+                value.description56,
+                value.description78
+              ]);
+          });
+        }
+        else
+        {
+          $('table').hide();
+        }
+
+        // Update display
+        table.draw();
+    },
+    'json'
+    );
+
+  })
+});
+
+@stop

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

@@ -17,7 +17,13 @@
           <li>{{ HTML::linkAction('UsersController@index', 'Users') }}</li>
         </ul>
       </li>
-      <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">
+          <li>{{ HTML::linkAction('CriteriaController@index', 'Outcomes and Criteria') }}</li>
+          <li>{{ HTML::linkAction('CriteriaController@objectivesIndex', 'Objectives and Criteria') }}</li>
+        </ul>
+      </li>
       <li class="dropdown">
         <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">

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

@@ -232,13 +232,14 @@
                     {{ Form::label('notes', 'Additional Notes') }}
                     {{ Form::textarea('notes', Input::old('notes'), array('class' => 'form-control', 'rows'=>2, 'id'=>'criterion_notes', 'placeholder'=>'(optional)')) }}
                 </div>
-                <div id='delete'>
 
-                </div>
+
                 {{ Form::submit('Update', array('class' => 'btn btn-primary btn-block')) }}
                 {{ Form::close() }}
 
-
+                {{ Form::open(array('action' => 'CriteriaController@delete')) }}
+                <input type='hidden' name='criterion_delete' id='deleteCriteria'>
+                {{Form::submit("Delete", array('class'=> 'btn btn-primary btn-block', 'id'=>"DeleteButton"))}}
             </div>
         </div>
     </div>
@@ -718,9 +719,10 @@
 
                 if (!(json.activity_criterion.length)) {
 
-                    var button = "<button type='button' class ='btn btn-primary btn-block' onclick ='deleteCriterion()'>Delete Criterion</button><br><br>"
-                    $('#delete').html(button)
+                    $('#DeleteButton').prop('enabled', true);
 
+                } else {
+                    $('#DeleteButton').prop('disabled', true);
                 }
 
                 if (!(json.criteria.length)) {

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

@@ -35,14 +35,16 @@
                 <!-- Associated Program -->
 
 
+                <!-- Associated Program -->
                 <div class="form-group">
-                    {{ Form::label('program_id', 'Associated Program') }}
-                    <select id="program_id" name="program_id" class="form-control selectpicker">
-                        <option value="0">All</option>
-                        @foreach ($programs as $program)
-                        <option value="{{ $program->id }}">{{ $program->name }} [{{ $program->school->name }}]</option>
-                        @endforeach
-                    </select>
+                    {{ Form::label('program_id', 'Associated Program') }}<br>
+                    <br>
+
+                    @foreach ($programs as $program)
+
+                    <input type="checkbox" id="{{ $program->name }}" name="program_id[]" value="{{$program->id}}">
+                    <label for="{{ $program->name }}"> {{ $program->name }} [{{ $program->school->name }}]</label><br>
+                    @endforeach
                 </div>
 
 
@@ -65,8 +67,21 @@
                 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">
@@ -104,16 +119,18 @@
 
 
                 <!-- Associated Program -->
+                <!-- Associated Program -->
                 <div class="form-group">
-                    {{ Form::label('program_id2', 'Associated Program') }}
-                    <select id="program_id2" name="program_id" class="form-control selectpicker">
-                        <option value="0">All</option>
-                        @foreach ($programs as $program)
-                        <option value="{{ $program->id }}">{{ $program->name }} [{{ $program->school->name }}]</option>
-                        @endforeach
-                    </select>
+
+                    {{ Form::label('program_id2', 'Associated Program') }}<br><br>
+                    @foreach ($programs as $program)
+
+                    <input type="checkbox" id="assoc_program_id_{{ $program->id }}" name="program_id[]" value="{{$program->id}}">
+                    <label for="assoc_program_id_{{ $program->id }}"> {{ $program->name }} <sub>[{{ $program->school->name }}]</sub></label><br>
+                    @endforeach
                 </div>
 
+
                 <!-- Status -->
                 <div class="form-group">
                     {{ Form::label('status', 'Status') }}
@@ -125,12 +142,20 @@
                     </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>
 
 
@@ -142,7 +167,30 @@
 <script>
     var outcomeHTML = document.getElementById('outcomeGroup').innerHTML;
     var selectOptions = document.getElementById('outcome[0]').innerHTML;
-    var ran = false;
+    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;
@@ -168,6 +216,8 @@
         document.getElementById("outcomeGroup").innerHTML += outcomeHTML;
     }
 
+
+
     function addOutcomeTest() {
         var $select = $('<select/>', {
             'class': "selectpicker form-control",
@@ -221,8 +271,7 @@
             },
             function(json) {
 
-                var text = json[0].text;
-
+                var text = json.objective[0].text;
 
 
                 // Display info
@@ -230,19 +279,15 @@
 
 
                 // Select associated outcome
-                var outcome_id = json[0].outcome_id;
-                $('#assoc_outcome0').val(outcome_id);
-                $('#assoc_outcome0').selectpicker('refresh');
-
-                var length = json.length;
-                if (ran == true) {
-                    for (var i = counterAssoc; i != 0; i--) {
-                        deleteLastAssoc(i);
+                for (var i = counterAssoc; i != 1; i--) {
+                    deleteLastAssoc(i);
 
-                    }
-                    counterAssoc = 1
                 }
-                for (var i = 1; i < length; 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[]",
@@ -273,30 +318,94 @@
                     $select.appendTo('#assocOutcomeForm' + i.toString()).selectpicker('refresh');
                     $divForButton.appendTo('#assocOutcomeGroup');
 
-                    $('#assoc_outcome' + i.toString()).val(json[i].outcome_id);
+                    $('#assoc_outcome' + i.toString()).val(json.outcome[i].outcome_id);
                     $('#assoc_outcome' + i.toString()).selectpicker('refresh');
 
-                    counterAssoc = i;
-                    ran = true;
 
                 }
 
+
                 // Select associated program
-                if (json[0].program_id) {
-                    $('#program_id2').val(json[0].program_id);
+                var program_length = json.program.length;
+                $('input[type=checkbox]').prop('checked', false);
 
-                } else {
-                    $('#program_id2').val(0);
+                for (var i = 0; i < program_length; i++) {
+                    prog = json.program[i].program_id.toString();
+                    $('#assoc_program_id_' + prog).prop("checked", true);
                 }
 
-                $('#program_id2').selectpicker('refresh');
-
 
                 // Select status
-                if (json[0].deleted_at)
+                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'
         );
@@ -346,7 +455,7 @@
         $divForButton.appendTo('#assocOutcomeGroup');
 
 
-        ran = true;
+
         counterAssoc += 1;
 
 

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

@@ -6,9 +6,16 @@
     <ul class="nav navbar-nav navbar-right">
       <li>{{ HTML::linkAction('ProgramCoordinatorsController@overview', 'Overview') }}</li>
       <li>{{ HTML::linkAction('TemplatesController@newTemplate', 'Rubrics') }}</li>
-      <li>{{ HTML::linkAction('CriteriaController@index', 'Learning Outcomes and Criteria') }}</li>
+
       <li>{{ HTML::linkAction('Objective2Controller@editProgram', 'Objectives')}}</li>
       <li>{{ HTML::linkAction('CriteriaController@editProgram', 'Criteria') }}</li>
+      <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">
+          <li>{{ HTML::linkAction('CriteriaController@index', 'Outcomes and Criteria') }}</li>
+          <li>{{ HTML::linkAction('CriteriaController@objectivesIndex', 'Objectives and Criteria') }}</li>
+        </ul>
+      </li>
       @if(count(Auth::user()->courses))
       <li> {{ HTML::linkAction('ProfessorsController@overview', 'My Courses', NULL) }}</li>
       <li class="dropdown">

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

@@ -36,15 +36,17 @@
 
 
                 <div class="form-group">
-                    {{ Form::label('program_id', 'Associated Program') }}
-                    <select id="program_id" name="program_id" class="form-control selectpicker">
+                    {{ Form::label('program_id', 'Associated Program') }}<br>
+                    <br>
 
-                        <option value="{{ $programs[0]->id }}">{{ $programs[0]->name }} [{{ $programs[0]->school->name }}]</option>
 
-                    </select>
-                </div>
+
+                    <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')) }}
@@ -104,13 +106,15 @@
 
                 <!-- Associated Program -->
                 <div class="form-group">
-                    {{ Form::label('program_id2', 'Associated Program') }}
-                    <select id="program_id2" name="program_id" class="form-control selectpicker">
+                    {{ Form::label('program_id', 'Associated Program') }}<br>
+                    <br>
 
 
-                        <option value="{{ $programs[0]->id }}">{{ $programs[0]->name }} [{{ $programs[0]->school->name }}]</option>
 
-                    </select>
+                    <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 -->
@@ -131,6 +135,9 @@
                 {{ Form::submit('Update', array('class' => 'btn btn-primary btn-block')) }}
                 {{ Form::close() }}
             </div>
+            <div id="text">
+                <p>lmao</p>
+            </div>
 
 
 
@@ -220,8 +227,7 @@
             },
             function(json) {
 
-                var text = json[0].text;
-
+                var text = json.objective[0].text;
 
 
                 // Display info
@@ -229,19 +235,15 @@
 
 
                 // Select associated outcome
-                var outcome_id = json[0].outcome_id;
-                $('#assoc_outcome0').val(outcome_id);
-                $('#assoc_outcome0').selectpicker('refresh');
-
-                var length = json.length;
-                if (ran == true) {
-                    for (var i = counterAssoc; i != 0; i--) {
-                        deleteLastAssoc(i);
+                for (var i = counterAssoc; i != 1; i--) {
+                    deleteLastAssoc(i);
 
-                    }
-                    counterAssoc = 1
                 }
-                for (var i = 1; i < length; 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[]",
@@ -272,34 +274,95 @@
                     $select.appendTo('#assocOutcomeForm' + i.toString()).selectpicker('refresh');
                     $divForButton.appendTo('#assocOutcomeGroup');
 
-                    $('#assoc_outcome' + i.toString()).val(json[i].outcome_id);
+                    $('#assoc_outcome' + i.toString()).val(json.outcome[i].outcome_id);
                     $('#assoc_outcome' + i.toString()).selectpicker('refresh');
 
-                    counterAssoc = i;
-                    ran = true;
 
                 }
 
-                // Select associated program
-                if (json[0].program_id) {
-                    $('#program_id2').val(json[0].program_id);
-
-                } else {
-                    $('#program_id2').val(0);
-                }
 
-                $('#program_id2').selectpicker('refresh');
 
 
                 // Select status
-                if (json[0].deleted_at)
+                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() {
 

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

@@ -6,7 +6,13 @@
     <ul class="nav navbar-nav navbar-right">
       <li>{{ HTML::linkAction('SchoolCoordinatorsController@overview', 'Overview') }}</li>
       <li>{{ HTML::linkAction('TemplatesController@newTemplate', 'Rubrics') }}</li>
-      <li>{{ HTML::linkAction('CriteriaController@index', 'Learning Outcomes and Criteria') }}</li>
+      <li 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">
+          <li>{{ HTML::linkAction('CriteriaController@index', 'Outcomes and Criteria') }}</li>
+          <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))

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

@@ -36,15 +36,16 @@
 
 
                 <div class="form-group">
-                    {{ Form::label('program_id', 'Associated Program') }}
-                    <select id="program_id" name="program_id" class="form-control selectpicker">
-                        <option value="0">All</option>
-                        @foreach ($programs as $program)
-                        <option value="{{ $program->id }}">{{ $program->name }} [{{ $program->school->name }}]</option>
-                        @endforeach
-                    </select>
-                </div>
+                    {{ 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') }}
@@ -105,15 +106,16 @@
 
                 <!-- Associated Program -->
                 <div class="form-group">
-                    {{ Form::label('program_id2', 'Associated Program') }}
-                    <select id="program_id2" name="program_id" class="form-control selectpicker">
-                        <option value="0">All</option>
-                        @foreach ($programs as $program)
-                        <option value="{{ $program->id }}">{{ $program->name }} [{{ $program->school->name }}]</option>
-                        @endforeach
-                    </select>
+
+                    {{ Form::label('program_id2', 'Associated Program') }}<br><br>
+                    @foreach ($programs as $program)
+
+                    <input type="checkbox" id="assoc_program_id_{{ $program->id }}" name="program_id[]" value="{{$program->id}}">
+                    <label for="assoc_program_id_{{ $program->id }}"> {{ $program->name }} <sub>[{{ $program->school->name }}]</sub></label><br>
+                    @endforeach
                 </div>
 
+
                 <!-- Status -->
                 <div class="form-group">
                     {{ Form::label('status', 'Status') }}
@@ -221,8 +223,7 @@
             },
             function(json) {
 
-                var text = json[0].text;
-
+                var text = json.objective[0].text;
 
 
                 // Display info
@@ -230,19 +231,15 @@
 
 
                 // Select associated outcome
-                var outcome_id = json[0].outcome_id;
-                $('#assoc_outcome0').val(outcome_id);
-                $('#assoc_outcome0').selectpicker('refresh');
+                for (var i = counterAssoc; i != 1; i--) {
+                    deleteLastAssoc(i);
 
-                var length = json.length;
-                if (ran == true) {
-                    for (var i = counterAssoc; i != 0; i--) {
-                        deleteLastAssoc(i);
-
-                    }
-                    counterAssoc = 1
                 }
-                for (var i = 1; i < length; i++) {
+                $('#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[]",
@@ -273,34 +270,102 @@
                     $select.appendTo('#assocOutcomeForm' + i.toString()).selectpicker('refresh');
                     $divForButton.appendTo('#assocOutcomeGroup');
 
-                    $('#assoc_outcome' + i.toString()).val(json[i].outcome_id);
+                    $('#assoc_outcome' + i.toString()).val(json.outcome[i].outcome_id);
                     $('#assoc_outcome' + i.toString()).selectpicker('refresh');
 
-                    counterAssoc = i;
-                    ran = true;
 
                 }
 
+
                 // Select associated program
-                if (json[0].program_id) {
-                    $('#program_id2').val(json[0].program_id);
+                var program_length = json.program.length;
+                $('input[type=checkbox]').prop('checked', false);
 
-                } else {
-                    $('#program_id2').val(0);
+                for (var i = 0; i < program_length; i++) {
+                    prog = json.program[i].program_id.toString();
+                    $('#assoc_program_id_' + prog).prop("checked", true);
                 }
 
-                $('#program_id2').selectpicker('refresh');
-
 
                 // Select status
-                if (json[0].deleted_at)
+                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() {
 

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,121 +223,124 @@
 @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
 @include('global.dummy-outcomes')
 
-@stop
+@stop

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

@@ -11,6 +11,76 @@
 @stop
 
 @section('main')
+  <button class="btn btn-lg btn-primary pull-right" id='show'>Custom Report</button>
+  <div class="" id='make_report'>
+    <hr>
+    <b><h3>Report Options</h3><br></b>
+    {{-- For for adding a new outcome --}}
+    {{ Form::open(array('action' => 'ProgramsController@showReport')) }}
+    <div class="row">
+      <div class="col-md-1">
+      </div>
+      <div class="col-md-5">
+      {{ Form::label('name', 'Select which semesters to report on') }}<br>
+          @foreach ($semesters as $semester)
+            @if ($semester->is_visible)
+              <div class="form-group">
+                <input type="checkbox" id="semester{{$semester->id}}" name="semester{{$semester->id}}" value="semester{{$semester->id}}">
+                <label for="semester{{$semester->id}}">{{$semester->name}}({{$semester->code}})</label>
+                {{-- {{ Form::checkbox('semester'.$semester->id, $semester->name, array('class' => 'form-control', 'id'=>$semester->id)) }}
+                {{ Form::label('semester'.$semester->id, $semester->name.'('.$semester->code.')') }}<br> --}}
+              </div>
+            @endif
+          @endforeach
+      </div>
+      <div class="col-md-6">
+        {{ Form::label('divulgacion', 'Select metodos de divulgacion') }}<br>
+        <div class="form-group">
+          <input type="checkbox" id="profesores" name="profesores" value="Profesores (pares)">
+          <label for="profesores">Profesores (pares)</label>
+        </div>
+        <div class="form-group">
+          <input type="checkbox" id="comiteDepartamental" name="comiteDepartamental" value="Comites de curriculo departamental">
+          <label for="comiteDepartamental">Comites de curriculo departamental</label>
+        </div>
+        <div class="form-group">
+          <input type="checkbox" id="comiteFacultadEscuela" name="comiteFacultadEscuela" value="Comites de curriculo  de Facultad o Escuela">
+          <label for="comiteFacultadEscuela">Comites de curriculo  de Facultad o Escuela</label>
+        </div>
+        <div class="form-group">
+          <input type="checkbox" id="pleno" name="pleno" value="Pleno de la Facultad">
+          <label for="pleno">Pleno de la Facultad</label>
+        </div>
+        <div class="form-group">
+          <input type="checkbox" id="estudiantes" name="estudiantes" value="Estudiantes">
+          <label for="estudiantes">Estudiantes</label>
+        </div>
+        <div class="form-group">
+          <input type="checkbox" id="administrativos" name="administrativos" value="Administrativos">
+          <label for="administrativos">Administrativos</label>
+        </div>
+        <div class="form-group">
+          <input type="checkbox" id="senado" name="senado" value="Senado">
+          <label for="senado">Senado</label>
+        </div>
+        <div class="form-group">
+          <input type="checkbox" id="comunidadWeb" name="comunidadWeb" value="Comunidad (pagina web)">
+          <label for="comunidadWeb">Comunidad (pagina web)</label>
+        </div>
+        <div class="form-group">
+          <input type="checkbox" id="otros" name="otros" value="Otros">
+          <label for="otros">Otro- <input type="text" id='otherBox'></label>
+        </div>
+      </div>
+    </div>
+    <div class="row">
+      <div class=""><button type="submit" id='submit' class="btn btn-lg btn-primary center-block">Create Report</button></div>
+    </div>
+    {{ Form::close() }}
+    <hr>
+    <button class="btn btn-lg btn-primary pull-right" id='hide'>Hide Form</button>
+  </div>
+
 <div class="row">
   <div class="col-md-12">
       <table class="table table-condensed table-stripedd datatable">
@@ -46,4 +116,28 @@
 <!-- Datatables -->
 @include('global._datatables_js')
 
-@stop
+@stop
+
+@section('javascript')
+
+      $('#make_report').hide();
+
+      //show form
+      $('#show').on('click', function(e)
+      {
+        $('#make_report').show();
+        $('#show').hide();
+      });
+
+      //hide form
+      $('#hide').on('click', function(e)
+      {
+        $('#make_report').hide();
+        $('#show').show();
+      });
+
+      //on submit, change value of the checkbox input of id 'other'
+      $('#submit').click(function(){
+        $('#otros').val('Otro- '+$('#otherBox').val());
+      });
+@stop

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

@@ -6,16 +6,24 @@
     </div>-->
     <ul class="nav navbar-nav navbar-right">
       <li>{{ HTML::linkAction('ProfessorsController@overview', 'My Courses') }}</li>
-      <li>{{ HTML::linkAction('CriteriaController@index', 'Learning Outcomes and Criteria') }}</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">
+          <li>{{ HTML::linkAction('CriteriaController@index', 'Outcomes and Criteria') }}</li>
+          <li>{{ HTML::linkAction('CriteriaController@objectivesIndex', 'Objectives and Criteria') }}</li>
+        </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>
@@ -37,4 +45,4 @@
       </li>
     </ul>
   </div>
-</div>
+</div>