Antes de añadir a rúbricas

Arreglé algunos bugs de planes anuales, de objetivos, de three year plans. Hasta ahora, rubricas funciona. Al igual que hacer assessments.

ahora estoy arreglando my courses reports.

app/controllers/AnnualPlansController.php

@@ -43,7 +43,7 @@ class AnnualPlansController extends \BaseController
   public function viewAllPlans($program_id)
   {
     $title = "Annual Plans";
-    $annual_plans = DB::select("select * from annual_plans  where program_id ={$program_id} order by id desc");
+    $annual_plans = DB::select("select semester_start, semester_end, program_id, annual_plans.id, academic_year from annual_plans, annual_cycle   where annual_plans.annual_cycle_id = annual_cycle.id and program_id ={$program_id} order by id desc");
 
 
     return View::make('local.managers.sCoords.view-annual-plans', compact('title', 'program_id', 'annual_plans'));
@@ -67,6 +67,7 @@ class AnnualPlansController extends \BaseController
     $semester = Input::get('semester');
     $typ_objective = Input::get('typ_objective');
     $transformative = Input::get('transformative');
+    $comments = Input::get("comments");
     $annual_id = Input::get("annual_id") + 0;
     $id = Auth::user()['id'];
 
@@ -77,7 +78,7 @@ class AnnualPlansController extends \BaseController
       $obj = $typ_objective[$i] + 0;
       $trans = $transformative[$i] + 0;
       $sem = $semester[$i] + 0;
-
+      $comment = $comments[$i];
       //if it was continued
       if ($real == 1) $real = 2;
       else $real = 1;
@@ -88,14 +89,14 @@ class AnnualPlansController extends \BaseController
 
       $queryUpdate = DB::select("select * from annual_report_transformative where annual_trans_id = {$annual_trans_id}");
       if (!count($queryUpdate)) {
-        DB::insert("insert into annual_report_transformative (accomplished, cycle_of_life, semester_used, semester_continue, annual_trans_id, supervised_coordinator_id) values ({$logr},{$real},{$sem},{$cont},{$annual_trans_id}, {$id})");
+        DB::insert("insert into annual_report_transformative (accomplished, cycle_of_life, semester_used, semester_continue, annual_trans_id, supervised_coordinator_id, comments) values ({$logr},{$real},{$sem},{$cont},{$annual_trans_id}, {$id}, '{$comment}')");
       } else {
-        DB::update("update annual_report_transformative set accomplished = {$logr}, cycle_of_life ={$real}, semester_used ={$sem}, semester_continue={$cont}, supervised_coordinator_id={$id} where annual_trans_id ={$annual_trans_id}");
+        DB::update("update annual_report_transformative set accomplished = {$logr}, cycle_of_life ={$real}, semester_used ={$sem}, semester_continue={$cont}, supervised_coordinator_id={$id}, comments = '{$comment}' where annual_trans_id ={$annual_trans_id}");
       }
     }
     return;
   }
-  public function index()
+  /*public function index()
   {
     $title = 'Annual Plans';
     $user = Auth::user();
@@ -120,7 +121,7 @@ class AnnualPlansController extends \BaseController
     }
 
     return View::make('local.managers.shared.index_annual_plans', compact('title', 'quinquenniums', 'programs', 'current_quinquennium'));
-  }
+  }*/
   public function adminIndex($school_id)
   {
     $title = "Annual Plans";
@@ -133,26 +134,24 @@ class AnnualPlansController extends \BaseController
   {
     $title = "Annual Plans";
     //$typ_parts = DB::select("select * from typ_parts");
-    if (!$typ_id) {
-      $current_typ = DB::select("select * from three_year_plan where year_start <=" . date('Y') . " and year_end >=" . date('Y'))[0];
-    } else {
-      $current_typ = DB::select("select * from three_year_plan where id ={$typ_id}")[0];
-    }
+
+    $current_typ = DB::select("select * from three_year_plan where year_start <=" . date('Y') . " and year_end >=" . date('Y'))[0];
+
 
 
 
     $program = Program::where('id', '=', $program_id)->first();
-    $annual_plans = DB::select("select * from annual_plans where program_id = {$program_id} order by id desc limit 5");
+    $annual_plans = DB::select("select academic_year, semester_start, semester_end, program_id, annual_plans.id as id from annual_plans, annual_cycle where program_id = {$program_id} and annual_cycle.id = annual_plans.annual_cycle_id order by annual_plans.id desc ");
     Log::info($annual_plans);
     $outcomes = array();
     $allSemesterOrder = array();
-    foreach ($annual_plans as $an_plan) {
+    /*foreach ($annual_plans as $an_plan) {
       Log::info($an_plan->id);
       $outcomes[$an_plan->id]["first"] = DB::select("select * from outcomes where id in (select outcome_id from typ_semester_outcome where semester_id = {$an_plan->semester_start} and typ_program_id in (select id from typ_program where program_id ={$an_plan->program_id} and three_year_plan_id ={$current_typ->id} ))");
       $allSemesterOrder[$an_plan->id]["first"] = DB::select("select * from semesters where id = {$an_plan->semester_start}")[0];
       $outcomes[$an_plan->id]["second"] = DB::select("select * from outcomes where id in (select outcome_id from typ_semester_outcome where semester_id ={$an_plan->semester_end} and typ_program_id in (select id from typ_program where program_id ={$an_plan->program_id} and three_year_plan_id = {$current_typ->id} ))");
       $allSemesterOrder[$an_plan->id]["second"] = DB::select("select * from semesters where id = {$an_plan->semester_end}")[0];
-    }
+    }*/
     $alltyp = DB::select('select * from three_year_plan order by id desc');
     $current_typ = $current_typ->id;
     return View::make('local.managers.sCoords.annual-plans', compact('title', 'annual_plans', 'current_typ', 'program', 'outcomes', 'allSemesterOrder', 'alltyp'));
@@ -161,7 +160,11 @@ class AnnualPlansController extends \BaseController
   public function fetchInfo()
   {
     Log::info(Input::get('id'));
-    $an_plan = DB::table("annual_plans")->where('id', '=', Input::get('id'))->first();
+    $an_plan = DB::table("annual_plans")
+      ->join('annual_cycle', 'annual_cycle.id', '=', 'annual_plans.annual_cycle_id')
+      ->where('annual_plans.id', '=', Input::get('id'))
+      ->select('annual_plans.id as id', 'program_id', 'academic_year', 'semester_start', 'semester_end')
+      ->first();
 
     $years = explode('-', $an_plan->academic_year);
     $current_typ_program = DB::select("select * from typ_program where program_id = {$an_plan->program_id} and three_year_plan_id in (select id from three_year_plan where year_start <= {$years[0]} and year_end>= {$years[1]})")[0];
@@ -202,7 +205,7 @@ class AnnualPlansController extends \BaseController
     //  $typ_info['courses_objective'][$objective->id] = DB::select("select * from courses where id in (SELECT course_id from typ_semester_courses where typ_semester_outcome_id in (select id from typ_semester_outcome where semester_id={$semester->id} and outcome_id =? and typ_program_id in (select id from typ_program where program_id = {$program_id})) and id in (select typ_semester_course_id from typ_semester_objectives where objective_id  = {$objective->id}))", array(Input::get('id')));
     //  $typ_info['criteria'][$objective->id] = DB::select("select * from criteria where id in (select criterion_id from criterion_objective_outcome where outcome_id = ? and objective_id = {$objective->id})", array(Input::get('id')));
     //}
-    $annual_plan = DB::select("select id from annual_plans where (semester_start = {$semester->id} or semester_end ={$semester->id}) and program_id ={$program_id}")[0];
+    $annual_plan = DB::select("select annual_plans.id from annual_plans, annual_cycle where annual_plans.annual_cycle_id = annual_cycle.id and (semester_start = {$semester->id} or semester_end ={$semester->id}) and program_id ={$program_id}")[0];
     $typ_info['objectives'] = DB::select("select * from objectives where id in (select objective_id from typ_semester_objectives where typ_semester_outcome_id in(select id from typ_semester_outcome where outcome_id = ? and semester_id = {$semester->id} and typ_program_id in (select id from typ_program where program_id ={$program_id})))", array(Input::get('id')));
     $typ_info['transformative_actions'] = DB::select("select * from transformative_actions where by_professor =0 and is_custom=0");
     foreach ($typ_info['objectives'] as $objective) {
@@ -311,7 +314,7 @@ class AnnualPlansController extends \BaseController
     $an_id = Input::get('id');
     $program_id = Input::get('program_id');
 
-    $an_semesters = DB::select("select semester_start, semester_end, program_id from annual_plans where id ={$an_id} and program_id ={$program_id}")[0];
+    $an_semesters = DB::select("select semester_start, semester_end, program_id from annual_plans, annual_cycle where annual_plans.annual_cycle_id = annual_cycle.id and annual_plans.id ={$an_id} and program_id ={$program_id}")[0];
 
     $annual_plan['first']['outcomes'] = DB::select("select * from outcomes where id in (select outcome_id from typ_semester_outcome where semester_id = {$an_semesters->semester_start} and typ_program_id in(select id from typ_program where program_id ={$an_semesters->program_id}))");
 

app/controllers/AuthController.php

@@ -1,6 +1,7 @@
 <?php
 
-class AuthController extends \BaseController {
+class AuthController extends \BaseController
+{
 
 	/**
 	 * Display a listing of the resource.
@@ -10,7 +11,7 @@ class AuthController extends \BaseController {
 	 */
 	public function showLogin()
 	{
-		$title ="Online Learning Assessment System";
+		$title = "Online Learning Assessment System";
 		return View::make('global.login', compact('title'));
 	}
 
@@ -20,17 +21,16 @@ class AuthController extends \BaseController {
 		$validator = Validator::make(
 			Input::all(),
 			array(
-				'email'=>'required|email',
-    			'password'=>'required|min:4|max:16'
+				'email' => 'required|email',
+				'password' => 'required|min:4|max:16'
 			)
 		);
 
-		if(!$validator->fails())
-		{
-//			TODO: Remove this for production environment
-//             if (App::environment('local', 'staging')) {
-// 			    return $this->processLogin();
-//             }
+		if (!$validator->fails()) {
+			//			TODO: Remove this for production environment
+			if (App::environment('local', 'staging')) {
+				return $this->processLogin();
+			}
 			try {
 				// User input
 				$username = str_replace('@upr.edu', '', Input::get('email'));
@@ -51,14 +51,14 @@ class AuthController extends \BaseController {
 				$result = radius_send_request($radius);
 
 				switch ($result) {
-					// Credentials are correct
+						// Credentials are correct
 					case RADIUS_ACCESS_ACCEPT:
 
 						return $this->processLogin();
 						break;
 					case RADIUS_ACCESS_REJECT:
 						// If email is a workshop email,
-						if(Input::get('email') == 'taller1@upr.edu' && Input::get('password') == 'o34eAvaluo'){
+						if (Input::get('email') == 'taller1@upr.edu' && Input::get('password') == 'o34eAvaluo') {
 							return $this->processLogin();
 						}
 
@@ -67,32 +67,27 @@ class AuthController extends \BaseController {
 						Session::flash('message', 'Incorrect email/password combination.');
 						return Redirect::action('AuthController@showLogin');
 						break;
-					// Throw exception in case of any other error
+						// Throw exception in case of any other error
 					default:
 						throw new Exception("-", 1);
 						break;
 				}
-
-			}
-			catch(Exception $e){
+			} catch (Exception $e) {
 				// Tell user access is denied and return to login page.
 				Session::flash('status', 'danger');
 				Session::flash('message', 'An error occurred while connecting to the authentication service. Please try again later. If the problem persists, contact the help desk at x. 80400 or the administrators at oeae.uprrp.edu.');
 				return Redirect::action('AuthController@showLogin');
 			}
 			return Redirect::route('login');
-		}
-		else
-		{
-            /** Prepare error message */
-            $message = '<ul>';
+		} else {
+			/** Prepare error message */
+			$message = '<ul>';
 
-            foreach ($validator->messages()->all('<li>:message</li>') as $validationError)
-            {
-                $message.=$validationError;
-            }
+			foreach ($validator->messages()->all('<li>:message</li>') as $validationError) {
+				$message .= $validationError;
+			}
 
-            $message.='</ul>';
+			$message .= '</ul>';
 
 			Session::flash('status', 'danger');
 			Session::flash('message', $message);
@@ -100,19 +95,18 @@ class AuthController extends \BaseController {
 		}
 	}
 
-	private function processLogin(){
+	private function processLogin()
+	{
 		// Get user record in OLAS database, if it exists
 		$user = User::where('email', Input::get('email'))->first();
 
 		// If user exists in the database AND is authorized
-		if($user and $user->has_access)
-		{
+		if ($user and $user->has_access) {
 			// Log in user and direct to main page
 			Auth::login($user);
 
 			// Get last visible AND running term;
-			$semester = Semester::
-				where('is_visible', 1)
+			$semester = Semester::where('is_visible', 1)
 				->where('start', '<=', date('Y-m-d H:i:s'))
 				->orderBy('start', 'DESC')
 				->first();
@@ -125,7 +119,7 @@ class AuthController extends \BaseController {
 			$semesters_info = array();
 
 			$semesters_ids[] = $semester->id;
-			$semesters_info[] = $semester->name.' ('.$semester->code.')';
+			$semesters_info[] = $semester->name . ' (' . $semester->code . ')';
 
 			// Put semesters information arrays into Session
 			Session::forget('semesters_ids');
@@ -136,12 +130,13 @@ class AuthController extends \BaseController {
 
 			// Record last login
 			User::where('id', Auth::user()->id)
-				->update(array(
-					'last_login' => DB::raw('NOW()')
-				)
-			);
+				->update(
+					array(
+						'last_login' => DB::raw('NOW()')
+					)
+				);
 
-			if(!Auth::user()->office_phone){
+			if (!Auth::user()->office_phone) {
 				return Redirect::action('UsersController@edit');
 			}
 
@@ -163,9 +158,7 @@ class AuthController extends \BaseController {
 					return Redirect::intended('professor');
 					break;
 			}
-		}
-		else
-		{
+		} else {
 			// Tell user access is denied and return to login page.
 			Session::flash('status', 'danger');
 			Session::flash('message', 'You are not an authorized user. You may request access by contacting oeae.uprrp.edu.');
@@ -178,7 +171,5 @@ class AuthController extends \BaseController {
 		Auth::logout();
 		Session::flush();
 		return Redirect::action('AuthController@showLogin');
-
 	}
-
 }

app/controllers/CriteriaController.php

@@ -54,10 +54,25 @@ class CriteriaController extends \BaseController
     {
         $json_to_send = array();
         $json_to_send['criterion'] = DB::table('criteria')->where('id', '=', Input::get('id'))->first();
+        $outcomeIDS = DB::table('criterion_objective_outcome')->where('criterion_id', '=', $json_to_send['criterion']->id)->lists('outcome_id');
+        Log::info($outcomeIDS);
+        $json_to_send['outcomes'] = DB::table('outcomes')->whereIn('id', $outcomeIDS)->get();
+        $outcomeStr = '';
+        if (count($json_to_send['outcomes']) == 1) {
+            $outcomeStr .= $json_to_send['outcomes'][0]->name;
+        } else {
+            foreach ($json_to_send['outcomes'] as $index => $outcome) {
+
+                $outcomeStr .= $outcome->name . ', ';
+            }
+            $outcomeStr = rtrim($outcomeStr, ',');
+        }
+        $json_to_send['outcomes'] = $outcomeStr;
         $num_scales = Input::get('numberOfScale');
         $criterionID = Input::get('id');
+
         $json_to_send['scales'] = DB::select("select * from scales, template_criterion_scale where template_criterion_scale.template_criterion_id in (select id from template_criterion where template_criterion.template_id in (SELECT id FROM templates where num_scales = {$num_scales}) and template_criterion.criterion_id = {$criterionID}) and scales.id = template_criterion_scale.scale_id GROUP BY position order by position");
-        Log::info("select * from scales, template_criterion_scale where template_criterion_scale.template_criterion_id in (select id from template_criterion where template_criterion.template_id in (SELECT id FROM templates where num_scales = {$num_scales}) and template_criterion.criterion_id = {$criterionID}) and scales.id = template_criterion_scale.scale_id GROUP BY position order by position");
+        $json_to_send['crit_info'] = DB::select("select copyright, notes from template_criterion where id in (select template_criterion_id from scales, template_criterion_scale where template_criterion_scale.template_criterion_id in (select id from template_criterion where template_criterion.template_id in (SELECT id FROM templates where num_scales = {$num_scales}) and template_criterion.criterion_id = {$criterionID}) and scales.id = template_criterion_scale.scale_id  GROUP BY position  order by position) limit 1");
 
 
 

app/controllers/Objective2Controller.php

@@ -320,7 +320,7 @@ class Objective2Controller extends \BaseController
 		$userProgram = DB::select("select program_user.program_id from program_user where user_id = {$userProgram}");
 
 		$title = "Objective";
-		$outcomes = Outcome::orderBy('name', 'ASC')->lists('name', 'id');
+		$outcomes = Outcome::where('deactivation_date', '=', null)->orderBy('name', 'ASC')->lists('name', 'id');
 
 		$objectives = Objective::withTrashed()->orderBy('text', 'ASC')->get();
 
@@ -337,7 +337,7 @@ class Objective2Controller extends \BaseController
 		$userSchool = Auth::user()['school_id'];
 		Log::info($userSchool);
 		$title = "Objective";
-		$outcomes = Outcome::orderBy('name', 'ASC')->lists('name', 'id');
+		$outcomes = Outcome::where('deactivation_date', '=', null)->orderBy('name', 'ASC')->lists('name', 'id');
 
 		$objectives = Objective::withTrashed()->orderBy('text', 'ASC')->get();
 		$programs = Program::where("school_id", "=", $userSchool)->orderBy('name', 'ASC')->get();

app/controllers/RubricsController.php

@@ -34,8 +34,8 @@ class RubricsController extends \BaseController
         $criteria = Criterion::orderBy('name', 'ASC')->get();
         $rubric = $activity->rubric;
         Log::info($rubric);
-        Log::info($activity->rubric_id);
-        Log::info($activity->rubric[0]->id);
+
+
 
         return View::make('local.professors.rubrics', compact('title', 'templates', 'outcomes', 'criteria', 'rubrics', 'activity', 'rubric'));
     }
@@ -94,7 +94,7 @@ class RubricsController extends \BaseController
         $rubric->user_id = Auth::id();
         $rubric->num_scales = count($scales[0]);
         $rubric->max_score = Input::get('max_score');
-        $defaultWeight = round(100 / $rubric->num_scales, 2);
+        $defaultWeight = round(100 / count($criteria), 2);
 
         if ($rubric->save()) {
 
@@ -182,7 +182,7 @@ class RubricsController extends \BaseController
 
         $rubric->num_scales = count($scales[0]);
         $rubric->max_score = Input::get('max_score');
-        $defaultWeight = round(100 / $rubric->num_scales, 2);
+        $defaultWeight = round(100 / count($criteria), 2);
 
 
         DB::beginTransaction();

app/controllers/TemplatesController.php

@@ -139,8 +139,12 @@ class TemplatesController extends \BaseController
 		$criteria = Input::get('criteria');
 
 		$max_score = Input::get('max_score');
+		$copyright = Input::get('copyright');
+		$notes = Input::get('notes');
 		Log::info($scales);
 		Log::info($criteria);
+		Log::info($copyright);
+		Log::info($notes);
 
 
 		$template->num_scales = count($scales[0]);
@@ -149,7 +153,12 @@ class TemplatesController extends \BaseController
 		if ($template->save()) {
 			$templateId = $template->id;
 			foreach ($criteria as $index => $criterion_id) {
-				DB::insert("insert into template_criterion (`template_id`,`criterion_id`) values ({$templateId},{$criterion_id})");
+				$note = $notes[$index];
+				$copy = $copyright[$index];
+				if ($copy == "Empty") $copy = NULL;
+				if ($note == "Empty") $note = NULL;
+
+				DB::insert("insert into template_criterion (`template_id`,`criterion_id`, `copyright`, `notes`) values ({$templateId},{$criterion_id}, '{$copy}', '{$note}')");
 				$template_criterion_id = DB::table('template_criterion')->where('template_id', '=', $templateId)
 					->where('criterion_id', '=', $criterion_id)->first();
 
@@ -200,7 +209,17 @@ class TemplatesController extends \BaseController
 				->where('template_criterion_scale.template_criterion_id', '=', $temp_crit->id)
 				->orderBy('position', 'ASC')
 				->get();
+			$outcomeID = DB::table('criterion_objective_outcome')->where('criterion_id', '=', $temp_crit->criterion_id)
+				->lists('outcome_id');
+			$outcomes = DB::table('outcomes')->whereIn('id', $outcomeID)->get();
+			$outcomeStr = '';
+			foreach ($outcomes as $key => $outcome) {
+				$outcomeStr .= $outcome->name . ', ';
+			}
+			$outcomeStr = rtrim($outcomeStr, ',');
+			$temp_crit->outcomes = $outcomeStr;
 		}
+
 		Log::info($template_info);
 
 		return json_encode($template_info);
@@ -254,8 +273,11 @@ class TemplatesController extends \BaseController
 		$criteria = Input::get('criteria');
 
 		$max_score = Input::get('max_score');
+		$copyright = Input::get('copyright');
+		$notes = Input::get('notes');
 		Log::info($scales);
 		Log::info(Input::all());
+
 		$template->num_scales = count($scales[0]);
 		$template->max_score = $max_score;
 		//$division = $max_score / count($scales[0]);
@@ -264,8 +286,11 @@ class TemplatesController extends \BaseController
 			$templateId = $template->id;
 			DB::delete("delete from template_criterion where template_id ={$template->id}");
 			foreach ($criteria as $index => $criterion_id) {
-
-				DB::insert("insert into template_criterion (`template_id`,`criterion_id`) values ({$templateId},{$criterion_id})");
+				$copy = $copyright[$index];
+				$note = $notes[$index];
+				if ($copy == 'Empty') $copy = NULL;
+				if ($note == 'Empty') $note = NULL;
+				DB::insert("insert into template_criterion (`template_id`,`criterion_id`, `copyright`, `notes`) values ({$templateId},{$criterion_id}, '{$copy}', '{$note}')");
 				$template_criterion_id = DB::table('template_criterion')->where('template_id', '=', $templateId)
 					->where('criterion_id', '=', $criterion_id)->first();
 				DB::delete("delete from template_criterion_scale where template_criterion_id ={$template_criterion_id->id}");

app/controllers/ThreeYearPlanController.php

@@ -5,11 +5,51 @@ use Illuminate\Database\Eloquent\Collection;
 class ThreeYearPlanController extends \BaseController
 {
 
+  public function create()
+  {
+    try {
+      $yearStart = Input::get('years') + 0;
+      $yearEnd = $yearStart + 3;
+      DB::insert("insert into three_year_plan (`year_start`, `year_end`) values ({$yearStart}, {$yearEnd})");
+      DB::commit();
+      $typ = DB::table('three_year_plan')->where('year_start', '=', $yearStart)
+        ->where('year_end', '=', $yearEnd)
+        ->first();
+      for ($i = $yearStart; $i < $yearEnd; $i++) {
+        $string = 'First Semester ' . $i . '-' . ($i + 1);
+        $string2 = 'Second Semester ' . $i . '-' . ($i + 1);
+
+        $Firstsemester = DB::table('semesters')->where('name', '=', $string)->first();
+        $secondSemester = DB::table('semesters')->where('name', '=', $string2)->first();
+        Log::info($Firstsemester->id);
+        Log::info($secondSemester->id);
+        Log::info($typ->id);
+        DB::insert("insert into typ_semesters (typ_id, semester_id) values ({$typ->id}, {$Firstsemester->id}), ({$typ->id}, {$secondSemester->id})");
+      }
+
+      Session::flash('status', 'success');
+      Session::flash('message', '<p> Cycle created.</p>');
+      return Redirect::to('three-years-plan');
+    } catch (Exception $e) {
+      Session::flash('status', 'danger');
+      Session::flash('message', "<p>Could not create cycle</p>");
+      Log::info($e);
+      return Redirect::to('three-years-plan');;
+    }
+  }
   // load the Three year Plan page
   public function threeYearsReport()
   {
     $user_id = Auth::user()->id;
 
+    $last_year = DB::table('three_year_plan')->select('year_start')
+      ->orderBy('year_start', 'desc')->first();
+    if (!$last_year) {
+      $last_year = date('Y');
+    } else {
+      $last_year = $last_year->year_start;
+    }
+
     // el ID de los semestres que el usuario tiene seleccionado.
     $semesters_ids = Session::get('semesters_ids');
     // buscar informacion de los semestres seleccionados
@@ -27,7 +67,7 @@ class ThreeYearPlanController extends \BaseController
     $program_id = $program_id[0]->program_id;
     $outcomes = DB::table('outcomes')->where('deactivation_date', '=', null)->orderBy('name', 'ASC')->get();
     // se annadio la nueva variable
-    return View::make('global.view-three-year-plan', compact('title', 'outcomes', 'typs', 'criteria', 'semesters', 'program_id'));
+    return View::make('global.view-three-year-plan', compact('title', 'last_year', 'outcomes', 'typs', 'criteria', 'semesters', 'program_id'));
   }
 
 
@@ -540,9 +580,17 @@ class ThreeYearPlanController extends \BaseController
       if (count($firstSemester) && count($secondSemester)) {
         Log::info($firstSemester);
         Log::info($secondSemester);
-        $query = DB::select("select * from annual_plans where semester_start ={$firstSemester[0]->id} and semester_end ={$secondSemester[0]->id} and program_id = {$program_id}");
+        $query = DB::select("select * from annual_cycle where semester_start ={$firstSemester[0]->id} and semester_end ={$secondSemester[0]->id} ");
         if (!count($query)) {
-          DB::insert("insert into annual_plans (academic_year, semester_start, semester_end, program_id) values ('{$yearStart}-{$yearStartPlusOne}', {$firstSemester[0]->id}, {$secondSemester[0]->id}, {$program_id})");
+          DB::insert("insert into annual_cycle (academic_year, semester_start, semester_end) values ('{$yearStart}-{$yearStartPlusOne}', {$firstSemester[0]->id}, {$secondSemester[0]->id})");
+        }
+        $an_cycle = DB::table('annual_cycle')->where('semester_start', '=', $firstSemester[0]->id)
+          ->where('semester_end', '=', $secondSemester[0]->id)
+          ->first();
+        $query = DB::table('annual_plans')->where("annual_cycle_id", '=', $an_cycle->id)
+          ->where('program_id', '=', $program_id)->first();
+        if (!$query) {
+          DB::insert("insert into annual_plans (`annual_cycle_id`, `program_id`) values ({$an_cycle->id}, {$program_id})");
         }
       }
       $count++;

app/routes.php

@@ -166,7 +166,10 @@ Route::group(array('before' => 'auth|has_access'), function () {
     /**
      * Shared Routes
      */
-
+    Route::post('createThreeYearCycle', array(
+        'as' => 'createThreeYearCycle',
+        'uses' => 'ThreeYearPlanController@create'
+    ));
     // Fetch all criteria associated to an outcome
     Route::post('fetchInfo', array(
         'as' => 'fetchInfo',

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

@@ -99,6 +99,40 @@
           <li data-cycle-id="{{$typ->id}}" class="list-group-item">{{$typ->year_start}}-{{$typ->year_end}}</li>
         @endforeach
       </div>
+      <br>
+      <div>
+        <button type="button" class="btn btn-secondary" id = "three_year_button" data-toggle="modal" data-target="#three_year">Create Three Year Cycle</button>
+
+<!-- Modal -->
+<div id="three_year" class="modal fade" role="dialog">
+  <div class="modal-dialog">
+
+    <!-- Modal content-->
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal">&times;</button>
+        <h4 class="modal-title">Create New Cycle</h4>
+      </div>
+      <div class="modal-body">
+        {{ Form::open(array('action' => 'ThreeYearPlanController@create' )) }}
+        <p>Select a new cycle. You cannot choose a cycle that has been created before</p>
+        <select name = 'years' class="form-control selectpicker">
+          @for ($i = (int)$last_year; $i<2100; $i++)
+          
+          <option value='{{$i}}' >{{$i}} - {{$i+3}} </option>
+          @endfor
+      </select>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+        {{ Form::submit('Create Cycle', array('class' => 'btn btn-primary')) }}
+        {{ Form::close() }}
+      </div>
+    </div>
+
+  </div>
+</div>
+      </div>
     </div>
 
     <div class="col-md-9">

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

@@ -114,7 +114,7 @@
                     <div id='assocOutcomeGroup'>
                         <label>Associated Outcome</label>
 
-                        {{ Form::select('assoc_outcome[]', $outcomes, null, ['class'=>'form-control selectpicker', 'id'=>'assoc_outcome0']) }}
+                        {{ Form::select("assoc_outcome[]", $outcomes, null, ['class'=>'form-control selectpicker', 'id'=>'assoc_outcome0']) }}
 
                     </div>
                 </div>

app/views/local/managers/sCoords/view-annual-plans.blade.php

@@ -88,6 +88,7 @@
       semester = [];
       typ_objective = [];
       transformative =[];
+      comments = [];
       for(i = 0; i<counter;i++){
         realized.push($('input[name="seHizo'+i+'"]:checked').val());
         logrado.push( $('input[name="logro'+i+'"]:checked').val());
@@ -95,6 +96,7 @@
         typ_objective.push($('input[name="objective_'+i+'"]').val());
         semester.push($('input[name="what_semester_'+i+'"]').val());
         transformative.push($('input[name="transformative_'+i+'"]').val());
+        comments.push($('textarea[name="comment2'+i+'"]').val())
       }
         
 
@@ -106,7 +108,8 @@
         semester:semester,
         typ_objective: typ_objective,
         transformative:transformative, 
-        annual_id: an_id}
+        annual_id: an_id,
+        comments: comments}
         )
     }
 

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

@@ -280,7 +280,7 @@
 
         <div id="copyright-info">
             <hr>
-            <p class="small"><strong>Copyright Information</strong></p>
+            <p class="small"><strong>Outcomes Evaluated</strong></p>
             <ul id="copyright-list" class="list-unstyled small">
             </ul>
             <hr>
@@ -404,7 +404,15 @@ function addCriterion()
         function(data)
         {
             // Append the fetched data
-            var str ='<tr data-criterion-id="'+data.criterion.id+'" data-criterion-copyright="'+data.criterion.copyright+'" data-criterion-notes="'+data.criterion.notes+'"><th><span class="glyphicon glyphicon-move"></span></th><td>';
+            copyright = null;
+            notes = null;
+            if(data.crit_info.length){
+                copyright = data.crit_info[0].copyright;
+                notes = data.crit_info[0].notes;
+            }
+            
+            
+            var str ='<tr data-criterion-id="'+data.criterion.id+'" data-criterion-copyright="'+copyright+'" data-criterion-notes="'+notes+'" data-outcomes = "'+data.outcomes+'"><th><span class="glyphicon glyphicon-move"></span></th><td>';
 
             var subcriteria = '';
             if(data.criterion.subcriteria){
@@ -418,9 +426,9 @@ function addCriterion()
 
             }
 
-            if(data.criterion.notes)
+            if(notes)
             {
-                str+='<span><em data-toggle="tooltip" data-placement="top" title="'+data.criterion.notes+'">'+data.criterion.name+'</em></span><sup></sup>'+subcriteria+'</td>';
+                str+='<span><em data-toggle="tooltip" data-placement="top" title="'+notes+'">'+name+'</em></span><sup></sup>'+subcriteria+'</td>';
             }
             else
             {
@@ -438,13 +446,17 @@ function addCriterion()
                 str+='<td class="editable" data-type="textarea"></td>';
             }
         }
+        if(copyright== null) copyright= '';
+        if(notes == null)notes ='';
+        str += '<td class = "editable nullable" data-type = "textarea">'+copyright+'</td>';
+        str+= '<td class = "editable nullable" data-type = "textarea">'+notes+'</td>';
 
             str +='<th><span class="glyphicon glyphicon-remove icon-btn" aria-hidden="true"></span></th></tr>';
 
             $('table tbody').append(str);
 
             // Build copyright list
-            buildCopyrightList();
+            buildOutcomeList();
 
             // Enable X-Edtable on this new row
             $('.editable').editable({
@@ -494,7 +506,7 @@ function fetchCriterion(criterion)
 }
 
 // Build list from copyright info in rubric
-function buildCopyrightList()
+function buildOutcomeList()
 {
     // Empty the copyright list
     $('#copyright-list').empty();
@@ -503,7 +515,59 @@ function buildCopyrightList()
     {
         var criterion = $(this);
         // If there's copyright info
-        if(criterion.data('criterion-copyright')!=null)
+        if(criterion.data('outcomes')!=null){
+            var outcomes = criterion.data('outcomes');
+            if($('#copyright-list li').length>0)
+            {
+                var found = false;
+                $('#copyright-list li').each(function()
+                {
+                    // If found, give the string its number
+                    if(outcomes==$(this).find('span').text())
+                    {
+
+                        copyrightNumber = Number.parseInt($(this).find('sup').text());
+
+                        console.log('a: '+copyrightNumber);
+
+                        criterion.children('td:nth-child(2)').find('sup').text(copyrightNumber);
+                        found =true;
+
+                        //to break
+                        return false;
+                    }
+                });
+
+                // Otherwise, give it the next number and append a new item to the
+                // list
+                if(!found)
+                {
+                    var copyrightNumber = $('#copyright-list li').length+1;
+
+                    console.log('b: '+copyrightNumber);
+                    console.log(criterion.children('td:nth-child(2)').find('sup').length);
+
+                    criterion.children('td:nth-child(2)').find('sup').text(copyrightNumber);
+                    $('#copyright-list').append('<li><sup>'+copyrightNumber+' </sup><span>'+outcomes+'<span></li>');
+                }
+            }
+            else
+            {
+                criterion.children('td:nth-child(2)').find('sup').text('1');
+                $('#copyright-list').append('<li><sup>1 </sup><span>'+outcomes+'<span></li>');
+            }
+        }
+    });
+
+    if($('#copyright-info li').length>0)
+    {
+    $('#copyright-info').show();
+    }
+    else
+    {
+       $('#copyright-info').hide();
+}}
+    /*        if(criterion.data('criterion-copyright')!=null)
         {
             var copyright = criterion.data('criterion-copyright');
 
@@ -550,18 +614,18 @@ function buildCopyrightList()
                 $('#copyright-list').append('<li><sup>1 </sup><span>'+copyright+'<span></li>');
             }
         }
-    });
-
-    if($('#copyright-info li').length>0)
-    {
-        $('#copyright-info').show();
-    }
-    else
-    {
-        $('#copyright-info').hide();
-    }
-}
+        });
 
+        if($('#copyright-info li').length>0)
+        {
+            $('#copyright-info').show();
+        }
+        else
+        {
+            $('#copyright-info').hide();
+        }
+        }
+    */
 function refreshSelects()
 {
     $('#select-template').selectpicker('refresh');
@@ -664,7 +728,7 @@ function loadTemplate()
             // Set the contents of the rubric
             var temp_criterion = data.criterion;
             for(temp_c in temp_criterion){
-                var str = '<tr data-criterion-id="'+temp_criterion[temp_c].criterion_id+'" data-criterion-copyright="'+temp_criterion[temp_c].copyright+'" data-criterion-notes="'+temp_criterion[temp_c].notes+'"><th><span class="glyphicon glyphicon-move"></span></th><td>';
+                var str = '<tr data-criterion-id="'+temp_criterion[temp_c].criterion_id+'" data-criterion-copyright="'+temp_criterion[temp_c].copyright+'" data-criterion-notes="'+temp_criterion[temp_c].notes+'" data-outcomes = "'+temp_criterion[temp_c].outcomes+'"><th><span class="glyphicon glyphicon-move"></span></th><td>';
                 current_criterion = temp_criterion[temp_c]
                 var subcriteria ='';
                 if(current_criterion.subcriteria){
@@ -692,12 +756,21 @@ function loadTemplate()
                     str+='<td class="editable" data-id-value ="'+scale.scale_id+'" data-type="textarea">'+scale.description+'</td>';
 
                 }
-
+                copyright = temp_criterion[temp_c].copyright;
+                notes = temp_criterion[temp_c].notes;
+                if(copyright == null){
+                    copyright = '';
+                }
+                if(notes==null) notes ='';
+                str += '<td class = "editable" data-type = "textarea">'+copyright+'</td>';
+                str+= '<td class = "editable" data-type = "textarea">'+notes+'</td>';
                 str+='<th><span class="glyphicon glyphicon-remove" aria-hidden="true"></span></th></tr>';
 
     $('table tbody').append(str);
 
-    buildCopyrightList();
+    
+
+    
 
                 // Enable X-Edtable on this new row
                 $('.editable').editable({
@@ -752,7 +825,7 @@ function loadTemplate()
                 $('table tbody').append(str);
 
                 // Build copyright list
-                buildCopyrightList();
+                buildOutcomeList();
 
                 // Enable X-Edtable on this new row
                 $('.editable').editable({
@@ -777,7 +850,38 @@ function loadTemplate()
             });
 
             // Build Copyright List
-            buildCopyrightList();
+            buildOutcomeList();
+
+            var selected = $('#select-template').find(':selected');
+        var programs = {{ json_encode(Auth::user()->programs->lists('id')) }};
+        
+        var template_program = selected.data('template-program-id');
+      
+        
+
+        if(
+            {{ Auth::user()->role }}==1
+            || ({{ Auth::user()->role }}==2 && selected.data('admin')!=1)
+            || ({{ Auth::user()->role }}==3
+                && programs.includes(selected.data('template-program-id'))
+
+                && selected.data('admin')!=1
+            )
+        )
+        {
+            $('#button-confirm-delete-rubric').prop('disabled', false);
+            $('#button-confirm-update-rubric').prop('disabled', false);
+        }
+        else
+        {
+            // Disable update and edit
+            $('#button-confirm-delete-rubric').prop('disabled', true);
+            $('#button-confirm-update-rubric').prop('disabled', true);
+        }
+
+        // Enable print button
+        $('#button-print-rubric').prop('disabled', false);
+
         }, 
         'json',
     );
@@ -865,13 +969,19 @@ $('#select-template').on('change', function()
 
         //If user is admin, or the templates id matches user's, or the template
         // id's school matches user, allow editing
-        var selected = $('#select-template').find(':selected');
+        /*var selected = $('#select-template').find(':selected');
         var programs = {{ json_encode(Auth::user()->programs->lists('id')) }};
+        
+        var template_program = selected.data('template-program-id');
+        var dataset = selected.dataSet.templateProgramId;
+        
+
         if(
             {{ Auth::user()->role }}==1
             || ({{ Auth::user()->role }}==2 && selected.data('admin')!=1)
             || ({{ Auth::user()->role }}==3
-                && $.inArray(selected.data('template-program-id'), programs)
+                && programs.includes(selected.data('template-program-id'))
+
                 && selected.data('admin')!=1
             )
         )
@@ -888,7 +998,7 @@ $('#select-template').on('change', function()
 
         // Enable print button
         $('#button-print-rubric').prop('disabled', false);
-
+*/
     }
 
 });
@@ -923,7 +1033,7 @@ function changeTable(){
                 counter++;
             }
             }
-            newScaleHeaders += '<th></th>';
+            newScaleHeaders += '<th>Copyright</th><th>Notes</th><th></th>';
             
             $("#criterion-header").html(newScaleHeaders);
             $('#allCriteria').html(' ');
@@ -995,7 +1105,7 @@ $('.save').on('click', function(e)
 
     $('#allCriteria').children('td').each(function()
     {
-        if ($(this).text() == "" || $(this).text() == "Empty")
+        if (($(this).text() == "" || $(this).text() == "Empty") && !($(this).hasClass('nullable')) )
         {
             emptyFields=true;
         }
@@ -1034,6 +1144,8 @@ $('.save').on('click', function(e)
     scalesMaxArray =[];
     scalesMinArray =[];
     scales_id =[];
+    copyright = [];
+    notes = [];
 
     
     var amount_of_scales =parseInt($('#number_of_scales').find(':selected').val())+2;
@@ -1047,6 +1159,10 @@ $('.save').on('click', function(e)
                each_criterion_scale.push($(this.children[i]).text());
 
             }
+            copyright.push($(this.children[i]).text());
+            i+=1;
+            notes.push($(this.children[i]).text());
+
             scales.push(each_criterion_scale);
 
             
@@ -1078,7 +1194,9 @@ $('.save').on('click', function(e)
                 is_visible: $('input[name=is_visible]:checked').val(),
                 criteria : criteria,
                 scales: scales,
-                max_score : max
+                max_score : max,
+                copyright : copyright,
+                notes :notes
 
             },
             function(data)
@@ -1107,7 +1225,9 @@ $('.save').on('click', function(e)
                 is_visible: $('input[name=is_visible]:checked').val(),
                 criteria : criteria,
                 scales: scales,
-                max_score : max
+                max_score : max,
+                copyright :copyright,
+                notes:notes
             },
             function(data)
             {
@@ -1147,7 +1267,7 @@ $('table').on('click', 'span.glyphicon-remove', function(e)
         $('#rubric-container').hide();
     }
 
-    buildCopyrightList();
+    buildOutcomeList();
 });
 
 // When print button is clicked, redirect to print page

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

@@ -538,6 +538,14 @@ function toggleSaveButton()
 // Events
 // --------------------------------------------------------------------------
 
+
+$('input[name="weight[]"]').on('change', function(e){
+    $('.student-row').each(function(index)
+    {
+        percentagePerStudent($(this));
+    
+    });
+});
 // When any score changes, calculate percentages
 $('select').on('change', function(e)
 {

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

@@ -93,12 +93,15 @@
     </table>
 
     <div id="copyright-info">
+      
+
       <hr>
-      <p class="small"><strong>Copyright Information</strong></p>
+      <p class="small"><strong>Outcome Information</strong></p>
       <ul id="copyright-list" class="list-unstyled small">
       </ul>
       <hr>
     </div>
+    
 
     @if($activity->outcomes_attempted!=NULL)
     <div class="alert alert-info" role="alert">This activity has already been assessed. Changing the rubric will delete all saved scores.</div>
@@ -141,7 +144,7 @@ function changeTable(){
                 counter++;
             }
             }
-            newScaleHeaders += '';
+            newScaleHeaders += '<th>Copyright</th><th>Notes</th>';
             
             $("#criterion-header").html(newScaleHeaders);
             
@@ -211,65 +214,67 @@ function fetchCriteria(outcome)
 }
 
 // Build list from copyright info in rubric
-function buildCopyrightList()
+function buildOutcomeList()
 {
-  // Empty the copyright list
-  $('#copyright-list').empty();
+    // Empty the copyright list
+    $('#copyright-list').empty();
 
-  $('tbody tr').each(function( index )
-  {
-    var criterion = $(this);
-    // If there's copyright info
-    if(criterion.data('criterion-copyright')!=null)
+    $('tbody tr').each(function( index )
     {
-      var copyright = criterion.data('criterion-copyright');
+        var criterion = $(this);
+        // If there's copyright info
+        if(criterion.data('outcomes')!=null){
+            var outcomes = criterion.data('outcomes');
+            if($('#copyright-list li').length>0)
+            {
+                var found = false;
+                $('#copyright-list li').each(function()
+                {
+                    // If found, give the string its number
+                    if(outcomes==$(this).find('span').text())
+                    {
 
-      // If there is anything in the copyright list
-      if($('#copyright-list li').length>0)
-      {
-        // Check copyright list for the same copyright text
-        var found = false;
-        $('#copyright-list li').each(function()
-        {
-          // If found, give the string its number
-          if(copyright==$(this).find('span').text())
-          {
-            copyrightNumber = Number.parseInt($(this).find('sup').text());
-            criterion.children('td:nth-child(1)').find('sup').text(copyrightNumber);
-            found =true;
-
-            //to break
-            return false;
-          }
-        });
-
-        // Otherwise, give it the next number and append a new item to the
-        // list
-        if(!found)
-        {
-          var copyrightNumber = $('#copyright-list li').length+1;
-          criterion.children('td:nth-child(1)').find('sup').text(copyrightNumber);
-          $('#copyright-list').append('<li><sup>'+copyrightNumber+' </sup><span>'+copyright+'<span></li>');
+                        copyrightNumber = Number.parseInt($(this).find('sup').text());
+
+                        console.log('a: '+copyrightNumber);
+
+                        criterion.children('td:nth-child(1)').find('sup').text(copyrightNumber);
+                        found =true;
+
+                        //to break
+                        return false;
+                    }
+                });
+
+                // Otherwise, give it the next number and append a new item to the
+                // list
+                if(!found)
+                {
+                    var copyrightNumber = $('#copyright-list li').length+1;
+
+                    console.log('b: '+copyrightNumber);
+                    console.log(criterion.children('td:nth-child(1)').find('sup').length);
+
+                    criterion.children('td:nth-child(1)').find('sup').text(copyrightNumber);
+                    $('#copyright-list').append('<li><sup>'+copyrightNumber+' </sup><span>'+outcomes+'<span></li>');
+                }
+            }
+            else
+            {
+                criterion.children('td:nth-child(1)').find('sup').text('1');
+                $('#copyright-list').append('<li><sup>1 </sup><span>'+outcomes+'<span></li>');
+            }
         }
-      }
-      // Otherwise, give it number 1 and append it
-      else
-      {
-        criterion.children('td:nth-child(1)').find('sup').text('1');
-        $('#copyright-list').append('<li><sup>1 </sup><span>'+copyright+'<span></li>');
-      }
-    }
-  });
+    });
 
-  if($('#copyright-info li').length>0)
-  {
+    if($('#copyright-info li').length>0)
+    {
     $('#copyright-info').show();
-  }
-  else
-  {
-    $('#copyright-info').hide();
-  }
-}
+    }
+    else
+    {
+       $('#copyright-info').hide();
+}}
 
 // Load a template
 
@@ -298,7 +303,7 @@ function loadTemplate()
             // Set the contents of the rubric
             var temp_criterion = data.criterion;
             for(temp_c in temp_criterion){
-                var str = '<tr data-criterion-id="'+temp_criterion[temp_c].criterion_id+'" data-criterion-copyright="'+temp_criterion[temp_c].copyright+'" data-criterion-notes="'+temp_criterion[temp_c].notes+'">';
+                var str = '<tr data-criterion-id="'+temp_criterion[temp_c].criterion_id+'" data-criterion-copyright="'+temp_criterion[temp_c].copyright+'" data-criterion-notes="'+temp_criterion[temp_c].notes+'" data-outcomes = "'+temp_criterion[temp_c].outcomes+'">';
                 current_criterion = temp_criterion[temp_c]
                 var subcriteria ='';
                 if(current_criterion.subcriteria){
@@ -326,12 +331,19 @@ function loadTemplate()
                     str+='<td data-scale-id ="'+scale.id+'">'+scale.description+'</td>';
 
                 }
-
+                copyright = temp_criterion[temp_c].copyright;
+                notes = temp_criterion[temp_c].notes;
+                if(copyright == null){
+                    copyright = '';
+                }
+                if(notes==null) notes ='';
+                str+= '<td >'+copyright+'</td>';
+                str+= '<td>'+notes+'</td>';
                 str+='</tr>';
 
     $('table tbody').append(str);
 
-    buildCopyrightList();
+    buildOutcomeList();
 
                 
 
@@ -382,7 +394,7 @@ function loadTemplate()
                 $('table tbody').append(str);
 
                 // Build copyright list
-                buildCopyrightList();
+                buildOutcomeList();
 
                 // Enable X-Edtable on this new row
                 $('.editable').editable({
@@ -400,7 +412,7 @@ function loadTemplate()
           
 
             // Build Copyright List
-            buildCopyrightList();
+            buildOutcomeList();
         }, 
         'json',
     );
@@ -461,7 +473,7 @@ function loadTemplate()
       });
 
       // Build Copyright List
-      buildCopyrightList();
+      buildOutcomeList();
     }
   );
 }
@@ -500,9 +512,12 @@ $('#button-save-rubric').on('click', function(e)
     criteria.push($(this).data('criterion-id'));
     each_criterion_scale =[];
     $(this).children('td').each(function(index){
-      if(index!=0)
+      if(index!=0 )
       each_criterion_scale.push($(this).text());
+      
     })
+each_criterion_scale.pop();
+each_criterion_scale.pop();
     scales.push(each_criterion_scale);
     /*
       criterionObject.id = $(this).data('criterion-id');