Push a mitad

app/controllers/AnnualPlansController.php

@@ -210,7 +210,7 @@ class AnnualPlansController extends \BaseController
     $typ_info['transformative_actions'] = DB::select("select * from transformative_actions where by_professor =0 and is_custom=0");
     foreach ($typ_info['objectives'] as $objective) {
 
-      $typ_info['courses'][$objective->id] = DB::select("select c.id, c.number, c.code, typ.id typ_course_id from courses c, typ_semester_courses typ, (select course_id, id  from typ_semester_courses where typ_semester_objective_id in (select id from typ_semester_objectives where objective_id ={$objective->id} and 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})))) rel where typ.course_id =c.id and rel.course_id = c.id and typ.id = rel.id ", array(Input::get('id')));
+      $typ_info['courses'][$objective->id] = DB::select("select c.id, c.number, c.name, c.code, typ.id typ_course_id from courses c, typ_semester_courses typ, (select course_id, id  from typ_semester_courses where typ_semester_objective_id in (select id from typ_semester_objectives where objective_id ={$objective->id} and 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})))) rel where typ.course_id =c.id and rel.course_id = c.id and typ.id = rel.id ", array(Input::get('id')));
 
       $typ_info['criteria'][$objective->id] = DB::select("select * from criteria where deleted_at IS NULL and id in (select criterion_id from criterion_objective_outcome where outcome_id = ? and objective_id = {$objective->id})", array(Input::get('id')));
       Log::info($typ_info['criteria'][$objective->id]);
@@ -344,7 +344,7 @@ class AnnualPlansController extends \BaseController
       Log::info($annual_plan['first']['objectives'][$outcomes->id]);
       foreach ($annual_plan['first']['objectives'][$outcomes->id] as $objective) {
         $annual_plan['first']['typ_objective_id'][$objective->id] = DB::select("select id from typ_semester_objectives where objective_id = {$objective->id} and  typ_semester_outcome_id in (select id from typ_semester_outcome where outcome_id ={$outcomes->id} and semester_id ={$an_semesters->semester_start} and typ_program_id in(select id from typ_program where program_id ={$an_semesters->program_id})) ")[0];
-        $annual_plan['first']['courses'][$objective->id] = DB::select("select typ.id typ_course_id, typ.course_id, c.code, c.number from (select course_id, id from typ_semester_courses where typ_semester_objective_id = {$annual_plan['first']['typ_objective_id'][$objective->id]->id}) typ, courses c where c.id = typ.course_id");
+        $annual_plan['first']['courses'][$objective->id] = DB::select("select typ.id typ_course_id, typ.course_id, c.code, c.number, c.name from (select course_id, id from typ_semester_courses where typ_semester_objective_id = {$annual_plan['first']['typ_objective_id'][$objective->id]->id}) typ, courses c where c.id = typ.course_id");
         foreach ($annual_plan['first']['courses'][$objective->id] as $course) {
           $annual_plan['first']['criteria'][$objective->id][$course->typ_course_id] = DB::select("select * from criteria where  id in(select criteria_id from annual_plan_objective where annual_plan_id = {$an_id} and typ_semester_course_id = {$course->typ_course_id} )");
           $annual_plan['first']['trans_actions'][$objective->id][$course->typ_course_id] = DB::select("select * from transformative_actions where id in (select trans_id from annual_plan_transformative where typ_semester_course_id = {$course->typ_course_id})");
@@ -369,7 +369,7 @@ class AnnualPlansController extends \BaseController
       foreach ($annual_plan['second']['objectives'][$outcomes->id] as $objective) {
         $annual_plan['second']['typ_objective_id'][$objective->id] = DB::select("select id from typ_semester_objectives where objective_id = {$objective->id} and  typ_semester_outcome_id in (select id from typ_semester_outcome where outcome_id ={$outcomes->id} and semester_id ={$an_semesters->semester_end} and typ_program_id in(select id from typ_program where program_id ={$an_semesters->program_id})) ")[0];
 
-        $annual_plan['second']['courses'][$objective->id] = DB::select("select typ.id typ_course_id, typ.course_id, c.code, c.number from (select course_id, id from typ_semester_courses where typ_semester_objective_id = {$annual_plan['second']['typ_objective_id'][$objective->id]->id}) typ, courses c where c.id = typ.course_id");
+        $annual_plan['second']['courses'][$objective->id] = DB::select("select typ.id typ_course_id, typ.course_id, c.code, c.number, c.name from (select course_id, id from typ_semester_courses where typ_semester_objective_id = {$annual_plan['second']['typ_objective_id'][$objective->id]->id}) typ, courses c where c.id = typ.course_id");
         foreach ($annual_plan['second']['courses'][$objective->id] as $course) {
           $annual_plan['second']['criteria'][$objective->id][$course->course_id] = DB::select("select * from criteria where id in(select criteria_id from annual_plan_objective where annual_plan_id = {$an_id} and typ_semester_course_id ={$course->typ_course_id})");
           $annual_plan['second']['trans_actions'][$objective->id][$course->typ_course_id] = DB::select("select * from transformative_actions where id in (select trans_id from annual_plan_transformative where typ_semester_course_id = {$course->typ_course_id})");

app/controllers/Objective2Controller.php

@@ -327,7 +327,7 @@ class Objective2Controller extends \BaseController
 		$userSchool = Auth::user()['school_id'];
 		Log::info($userSchool);
 		$title = "Objective";
-		$outcomes = Outcome::whereNull("deactivation_date")->orderBy('name', 'ASC')->lists('name', 'id');
+		$outcomes = Outcome::whereNull("deactivation_date")->orderBy('name', 'ASC')->get();
 
 		$objectives = Objective::withTrashed()->orderBy('text', 'ASC')->get();
 		$programs = Program::where("school_id", "=", $userSchool)->orderBy('name', 'ASC')->get();

app/controllers/TransformativeActionsController.php

@@ -18,11 +18,26 @@ class TransformativeActionsController extends \BaseController
     $programs = Program::orderBy('name', 'ASC')->get();
     $user_id = auth::user()->id;
 
-    $program_id = DB::table('program_user')
+    switch ($role) {
+      case 3:
+        $program_id = DB::table('program_user')
+          ->where('user_id', $user_id)
+          ->select('program_id')
+          ->lists('program_id');
+
+        break;
+
+      case 2:
+        $program_id = DB::table('programs')
+          ->where('school_id', Auth::user()->school_id)
+          ->lists('id');
+        break;
+    }
+    /*$program_id = DB::table('program_user')
       ->where('user_id', $user_id)
       ->select('program_id')
       ->get();
-    $program_id = $program_id[0]->program_id; //program id 15 debido al user 8
+    $program_id = $program_id[0]->program_id; */ //program id 15 debido al user 8
     $outcomes = Outcome::orderBy('name', 'ASC')
       ->where('deactivation_date', '=', '0000-00-00')
       ->orWhereNull('deactivation_date')
@@ -34,112 +49,112 @@ class TransformativeActionsController extends \BaseController
       ->distinct()
       ->get();
     // if user is program coordinator
-    if ($role == 3) {
-      //1 edit panel: load the TA that
-      //    are custom ('transformative_actions.by_professor' == 0)
-      //    were approved in past ('transformative_actions.is_custom' == 1)
-      $ta_edit_panel = DB::table('transformative_actions')
-        ->where('transformative_actions.is_custom', 1)
-        ->where('transformative_actions.program_id', $program_id)
-        ->where('transformative_actions.by_professor', 0)
-        ->orderBy('at_text', 'ASC')
-        ->get();
-      //2 approve panel: load TAs that
-      //    can be approved ('transformative_actions.by_professor' == 1)
-      $ta_approval_panel = DB::table('transformative_actions')
-        ->where('transformative_actions.is_custom', 1)
-        ->where('transformative_actions.program_id', $program_id)
-        ->where('transformative_actions.by_professor', 1)
-        ->orderBy('at_text', 'ASC')
-        ->get();
-      //2.1 approve panel: load the filter options.
-      // the "->where()" should be the same from $ta_approval_panel,
-      //  but with aditional joins and different select
-      //
-      // get the names of the professors
-      $professor_filter_approvePanel = DB::table('transformative_actions')
-        ->join('users', 'users.id', '=', 'transformative_actions.user_id')
-        ->where('transformative_actions.is_custom', 1)
-        ->where('transformative_actions.program_id', $program_id)
-        ->where('transformative_actions.by_professor', 1)
-        ->select('users.*')
-        ->groupby('transformative_actions.user_id')
-        ->orderBy('users.first_name', 'ASC')
-        ->get();
-      // get the courses from asociated with a TA
-      $course_filter_approvePanel = DB::table('ta_course')
-        ->join('transformative_actions', 'transformative_actions.id', '=', 'ta_course.ta_id')
-        ->join('courses', function ($join) {
-          $join->on('courses.number', '=', 'ta_course.course_number');
-          $join->on('courses.code', '=', 'ta_course.course_code');
-        })
-        ->where('transformative_actions.is_custom', 1)
-        ->where('transformative_actions.program_id', $program_id)
-        ->where('transformative_actions.by_professor', 1)
-        ->select('courses.*')
-        ->groupBy('courses.number', 'courses.code')
-        ->orderBy('courses.name', 'ASC')
-        ->orderBy('courses.code', 'ASC')
-        ->get();
-      // get the outcome asociated with a TA
-      $outcome_filter_approvePanel = DB::table('transformative_actions')
-        ->join('transformative_objective', 'transformative_objective.ta_id', '=', 'transformative_actions.id')
-        ->join('objective_outcome', 'objective_outcome.objective_id', '=', 'transformative_objective.objective_id')
-        ->join('outcomes', 'outcomes.id', '=', 'objective_outcome.outcome_id')
-        ->where('transformative_actions.is_custom', 1)
-        ->where('transformative_actions.program_id', $program_id)
-        ->where('transformative_actions.by_professor', 1)
-        ->select('outcomes.*')
-        ->groupBy('outcomes.id')
-        ->orderBy('outcomes.name', 'ASC')
-        ->get();
-      //3 edit panel: load the filter options.
-      // the "->where()" should be the same from $ta_edit_panel,
-      //  but with aditional joins and different select
-      //
-      $professor_filter_editPanel = DB::table('transformative_actions')
-        ->join('users', 'users.id', '=', 'transformative_actions.user_id')
-        ->where('transformative_actions.is_custom', 1)
-        ->where('transformative_actions.program_id', $program_id)
-        ->where('transformative_actions.by_professor', 0)
-        ->select('users.*')
-        ->groupby('transformative_actions.user_id')
-        ->orderBy('users.first_name', 'ASC')
-        ->get();
-      $course_filter_editPanel =  DB::table('ta_course')
-        ->join('transformative_actions', 'transformative_actions.id', '=', 'ta_course.ta_id')
-        ->join('courses', function ($join) {
-          $join->on('courses.number', '=', 'ta_course.course_number');
-          $join->on('courses.code', '=', 'ta_course.course_code');
-        })
-        ->where('transformative_actions.is_custom', 1)
-        ->where('transformative_actions.program_id', $program_id)
-        ->where('transformative_actions.by_professor', 0)
-        ->select('courses.*')
-        ->groupBy('courses.number', 'courses.code')
-        ->orderBy('courses.name', 'ASC')
-        ->orderBy('courses.code', 'ASC')
-        ->get();
-      $outcome_filter_editPanel = DB::table('transformative_actions')
-        ->join('transformative_objective', 'transformative_objective.ta_id', '=', 'transformative_actions.id')
-        ->join('objective_outcome', 'objective_outcome.objective_id', '=', 'transformative_objective.objective_id')
-        ->join('outcomes', 'outcomes.id', '=', 'objective_outcome.outcome_id')
-        ->where('transformative_actions.is_custom', 1)
-        ->where('transformative_actions.program_id', $program_id)
-        ->where('transformative_actions.by_professor', 0)
-        ->select('outcomes.*')
-        ->groupBy('outcomes.id')
-        ->orderBy('outcomes.name', 'ASC')
-        ->get();
-      // 4 create panel: search all courses
-      $courses_create = DB::table('courses')
-        ->where('courses.program_id', $program_id)
-        ->select('courses.*')
-        ->groupBy('courses.number', 'courses.code')
-        ->orderBy('courses.name', 'ASC')
-        ->orderBy('courses.code', 'ASC')
-        ->get();
-    }/*
+
+    //1 edit panel: load the TA that
+    //    are custom ('transformative_actions.by_professor' == 0)
+    //    were approved in past ('transformative_actions.is_custom' == 1)
+    $ta_edit_panel = DB::table('transformative_actions')
+      ->where('transformative_actions.is_custom', 1)
+      ->whereIn('transformative_actions.program_id', $program_id)
+      ->where('transformative_actions.by_professor', 0)
+      ->orderBy('at_text', 'ASC')
+      ->get();
+    //2 approve panel: load TAs that
+    //    can be approved ('transformative_actions.by_professor' == 1)
+    $ta_approval_panel = DB::table('transformative_actions')
+      ->where('transformative_actions.is_custom', 1)
+      ->whereIn('transformative_actions.program_id', $program_id)
+      ->where('transformative_actions.by_professor', 1)
+      ->orderBy('at_text', 'ASC')
+      ->get();
+    //2.1 approve panel: load the filter options.
+    // the "->where()" should be the same from $ta_approval_panel,
+    //  but with aditional joins and different select
+    //
+    // get the names of the professors
+    $professor_filter_approvePanel = DB::table('transformative_actions')
+      ->join('users', 'users.id', '=', 'transformative_actions.user_id')
+      ->where('transformative_actions.is_custom', 1)
+      ->whereIn('transformative_actions.program_id', $program_id)
+      ->where('transformative_actions.by_professor', 1)
+      ->select('users.*')
+      ->groupBy('transformative_actions.user_id')
+      ->orderBy('users.first_name', 'ASC')
+      ->get();
+    // get the courses from asociated with a TA
+    $course_filter_approvePanel = DB::table('ta_course')
+      ->join('transformative_actions', 'transformative_actions.id', '=', 'ta_course.ta_id')
+      ->join('courses', function ($join) {
+        $join->on('courses.number', '=', 'ta_course.course_number');
+        $join->on('courses.code', '=', 'ta_course.course_code');
+      })
+      ->where('transformative_actions.is_custom', 1)
+      ->whereIn('transformative_actions.program_id', $program_id)
+      ->where('transformative_actions.by_professor', 1)
+      ->select('courses.*')
+      ->groupBy('courses.number', 'courses.code', 'courses.name')
+      ->orderBy('courses.name', 'ASC')
+      ->orderBy('courses.code', 'ASC')
+      ->get();
+    // get the outcome asociated with a TA
+    $outcome_filter_approvePanel = DB::table('transformative_actions')
+      ->join('transformative_objective', 'transformative_objective.ta_id', '=', 'transformative_actions.id')
+      ->join('objective_outcome', 'objective_outcome.objective_id', '=', 'transformative_objective.objective_id')
+      ->join('outcomes', 'outcomes.id', '=', 'objective_outcome.outcome_id')
+      ->where('transformative_actions.is_custom', 1)
+      ->whereIn('transformative_actions.program_id', $program_id)
+      ->where('transformative_actions.by_professor', 1)
+      ->select('outcomes.*')
+      ->groupBy('outcomes.id')
+      ->orderBy('outcomes.name', 'ASC')
+      ->get();
+    //3 edit panel: load the filter options.
+    // the "->where()" should be the same from $ta_edit_panel,
+    //  but with aditional joins and different select
+    //
+    $professor_filter_editPanel = DB::table('transformative_actions')
+      ->join('users', 'users.id', '=', 'transformative_actions.user_id')
+      ->where('transformative_actions.is_custom', 1)
+      ->whereIn('transformative_actions.program_id', $program_id)
+      ->where('transformative_actions.by_professor', 0)
+      ->select('users.*')
+      ->groupBy('transformative_actions.user_id')
+      ->orderBy('users.first_name', 'ASC')
+      ->get();
+    $course_filter_editPanel =  DB::table('ta_course')
+      ->join('transformative_actions', 'transformative_actions.id', '=', 'ta_course.ta_id')
+      ->join('courses', function ($join) {
+        $join->on('courses.number', '=', 'ta_course.course_number');
+        $join->on('courses.code', '=', 'ta_course.course_code');
+      })
+      ->where('transformative_actions.is_custom', 1)
+      ->whereIn('transformative_actions.program_id', $program_id)
+      ->where('transformative_actions.by_professor', 0)
+      ->select('courses.*')
+      ->groupBy('courses.number', 'courses.code', 'courses.name')
+      ->orderBy('courses.name', 'ASC')
+      ->orderBy('courses.code', 'ASC')
+      ->get();
+    $outcome_filter_editPanel = DB::table('transformative_actions')
+      ->join('transformative_objective', 'transformative_objective.ta_id', '=', 'transformative_actions.id')
+      ->join('objective_outcome', 'objective_outcome.objective_id', '=', 'transformative_objective.objective_id')
+      ->join('outcomes', 'outcomes.id', '=', 'objective_outcome.outcome_id')
+      ->where('transformative_actions.is_custom', 1)
+      ->whereIn('transformative_actions.program_id', $program_id)
+      ->where('transformative_actions.by_professor', 0)
+      ->select('outcomes.*')
+      ->groupBy('outcomes.id')
+      ->orderBy('outcomes.name', 'ASC')
+      ->get();
+    // 4 create panel: search all courses
+    $courses_create = DB::table('courses')
+      ->whereIn('courses.program_id', $program_id)
+      ->select('courses.*')
+      ->groupBy('courses.number', 'courses.code',  'courses.name')
+      ->orderBy('courses.name', 'ASC')
+      ->orderBy('courses.code', 'ASC')
+      ->get();
+    /*
     // if user is profesor
     elseif ($role == 4) {
       // 1 the user can only edit TA that need approval and has been submited by the same user
@@ -319,14 +334,16 @@ class TransformativeActionsController extends \BaseController
     } else {
 
       $user_id = Auth::user()->id;
-      $program_id = DB::table('program_user')
+
+
+      /*$program_id = DB::table('program_user')
         ->where('user_id', $user_id)
         ->select('program_id')
         ->get();
-      $program_id = $program_id[0]->program_id;
+      $program_id = $program_id[0]->program_id;*/
       $role = Auth::user()['role'];
       $by_professor = 1;
-      if ($role == 3) {
+      if ($role != 4) {
         $by_professor = 0;
       }
       Log::info($clean_input['courseid']);
@@ -337,6 +354,13 @@ class TransformativeActionsController extends \BaseController
 
       $course_code_number = explode(',', $course_code_number);
 
+      $program_id = DB::table('courses')
+        ->where('code', $course_code_number[0])
+        ->where('number', $course_code_number[1])
+        ->select('program_id')
+        ->first()->program_id;
+
+
       $current_timestamp = date('Y/m/d H:i:s', time());
       if ($clean_input['new_type']) $type = $clean_input['new_type'];
       else $type = $clean_input['type'];
@@ -459,13 +483,23 @@ class TransformativeActionsController extends \BaseController
       $role = Auth::user()['role'];
       return Redirect::to('transformativeAction')->withInput();
     } else {
+      $parentesis = array('(', ')');
+      $course_code_number = str_replace($parentesis, '', $clean_input['courseid']);
+
+      $course_code_number = explode(',', $course_code_number);
+
+      $program_id = DB::table('courses')
+        ->where('code', $course_code_number[0])
+        ->where('number', $course_code_number[1])
+        ->select('program_id')
+        ->first()->program_id;
 
       $user_id = auth::user()->id;
-      $program_id = DB::table('program_user')
+      /* $program_id = DB::table('program_user')
         ->where('user_id', $user_id)
         ->select('program_id')
         ->get();
-      $program_id = $program_id[0]->program_id;
+      $program_id = $program_id[0]->program_id;*/
       $role = Auth::user()['role'];
       $by_professor = $clean_input['approval'];
       if ($role == 4) {
@@ -532,10 +566,9 @@ class TransformativeActionsController extends \BaseController
         }
       }
 
-      $parentesis = array('(', ')');
-      $course_code_number = str_replace($parentesis, '', $clean_input['courseid']);
 
-      $course_code_number = explode(',', $course_code_number);
+
+
 
       DB::update(
         "UPDATE `ta_course` set `course_number` = '{$course_code_number[1]}', `course_code` = '{$course_code_number[0]}' where ta_id = {$ta_id}"
@@ -739,11 +772,11 @@ class TransformativeActionsController extends \BaseController
       ->lists('status');
     $status = $status[0];
     $plans_count = DB::table('annual_plan_transformative')
-      ->where('id', $ta_id)
+      ->where('trans_id', $ta_id)
       ->get();
     $plans_count = count($plans_count);
     $can_be_deleted = false;
-    if ($plans_count == 0 && $status == 1) {
+    if ($plans_count == 0 /*&& $status == 1*/) {
       $can_be_deleted = true;
     }
     return array(
@@ -800,6 +833,7 @@ class TransformativeActionsController extends \BaseController
       ->whereIn('objective_program.program_id', $program_ids)
       ->orderBy('objectives.text', 'ASC')
       ->select('objectives.text as text', 'objectives.id as id')
+      ->distinct()
       ->get();
 
     return array(
@@ -816,14 +850,28 @@ class TransformativeActionsController extends \BaseController
     $course_id = Input::get('course_id');
     $outcome_id = Input::get('outcome_id');
     $panel_id = Input::get('panel_id');
-    $program_id = DB::table('program_user')
-      ->where('user_id', $user_id)
-      ->select('program_id')
-      ->get();
-    $program_id = $program_id[0]->program_id;
+
+    switch ($role) {
+      case 1:
+        $program_id = DB::table('programs')->lists('id');
+        break;
+
+      case 2:
+        $program_id = DB::table('programs')->where('school_id', Auth::user()->school_id)
+          ->lists('id');
+        break;
+      case 3:
+        $program_id = DB::table('program_user')
+          ->where('user_id', $user_id)
+          ->select('program_id')
+          ->get();
+        $program_id = $program_id[0]->program_id;
+        break;
+    }
+
 
     // if the user is a coordinator filtering the approvePanel
-    if ($role == '3' && $panel_id == 'approvePanel') {
+    /*if ($role == '3' && $panel_id == 'approvePanel') {
 
       // if professor isnt a desired filter, search all professors
       if ($professor_id == 0) {
@@ -909,9 +957,9 @@ class TransformativeActionsController extends \BaseController
         ->orderBy('transformative_actions.at_text', 'ASC')
         ->get();
       return $filtered_at;
-    }
+    }*/
     // if the user is a coordinator filtering the editPanel
-    elseif ($role == '3' && $panel_id == 'editPanel') {
+    if ($panel_id == 'editPanel') {
 
       // if professor isnt a desired filter, search all professors
       if ($professor_id == 0) {
@@ -998,7 +1046,7 @@ class TransformativeActionsController extends \BaseController
       return $filtered_at;
     }
     // if the user is a professor filtering the editPanel
-    elseif ($role == '4' && $panel_id == 'editPanel') {
+    /*elseif ($role == '4' && $panel_id == 'editPanel') {
 
       // if course isnt a desired filter, search all courses
       if ($course_id == 0) {
@@ -1067,7 +1115,7 @@ class TransformativeActionsController extends \BaseController
         ->orderBy('transformative_actions.at_text', 'ASC')
         ->get();
       return $filtered_at;
-    }
+    }*/
     return 'ilegal';
   }
 

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

@@ -45,7 +45,7 @@
                 <div class="form-group col-md-11">
                   <select name="courseid" class="form-control createCourses selectpicker">
                     @foreach ($courses_create as $course)
-                      <option value="({{$course->code}},{{$course->number}})">{{$course->code}} {{$course->number}}</option>
+                      <option value="({{$course->code}},{{$course->number}})">{{$course->code}} {{$course->name}}</option>
                     @endforeach
                   </select>
                 </div>
@@ -104,7 +104,8 @@
               {{ Form::close() }}
             </div>
         </div>
-        <div class="panel panel-default panel-button">
+
+        <!--<div class="panel panel-default panel-button">
             <div class="panel-heading">
                 Approve a Recommended TA
             </div>
@@ -124,9 +125,9 @@
                     <label>Professor that created the TA</label>
                     <select class="form-control filterProfessor selectpicker">
                       <option value="0">Show All</option>
-                      @foreach ($professor_filter_approvePanel as $ta)
+                     {{-- @foreach ($professor_filter_approvePanel as $ta)
                         <option value="{{$ta->id}}">Prof. {{$ta->first_name}} {{$ta->surnames}}</option>
-                      @endforeach
+                      @endforeach--}}
                     </select>
                   </div>
                   <br>
@@ -134,9 +135,9 @@
                     <label>Course evaluated by an Objective of the TA</label>
                     <select class="form-control filterCourse selectpicker">
                       <option value="0">Show All</option>
-                      @foreach ($course_filter_approvePanel as $course)
+                      {{--@foreach ($course_filter_approvePanel as $course)
                         <option value="({{$course->code}},{{$course->number}})">{{$course->code}} {{$course->number}}</option>
-                      @endforeach
+                      @endforeach--}}
                     </select>
                   </div>
                   <br>
@@ -144,34 +145,34 @@
                     <label>Outcome of the TA</label>
                     <select class="form-control filterOutcome selectpicker">
                       <option value="0">Show All</option>
-                      @foreach ($outcome_filter_approvePanel as $outcome)
+                      {{--@foreach ($outcome_filter_approvePanel as $outcome)
                         <option value="{{$outcome->id}}">{{$outcome->name}}</option>
-                      @endforeach
+                      @endforeach--}}
                     </select>
                   </div>
                 </div>
               </div>
               <hr>
-              {{ Form::open(array('action' => 'TransformativeActionsController@approveTA')) }}
+              {{-- Form::open(array('action' => 'TransformativeActionsController@approveTA')) --}}
 
               <div>
                 <div class="form-group col-md-11">
                   <label>Select Transformative Action</label>
                   <select name="ta" class="form-control SelectTA selectpicker" id='approvalSelectTA'>
-                    @if (count($ta_approval_panel) == 0)
+                   {{-- @if (count($ta_approval_panel) == 0)
                       <option value="0">No TAs available</option>
                     @else
                     @endif
                     @foreach ($ta_approval_panel as $ta)
                       <option value="{{$ta->id}}">{{$ta->at_text}}</option>
-                   @endforeach
+                   @endforeach--}}
                   </select>
                 </div>
               </div>
 
               <div class="form-group">
-                {{ Form::label('approvalDescription', 'Description') }}
-                {{ Form::textarea('approvalDescription', '', array('class' => 'form-control')) }}
+               {{-- {{ Form::label('approvalDescription', 'Description') }}
+                {{ Form::textarea('approvalDescription', '', array('class' => 'form-control')) }}--}}
               </div>
 
               <label>Associated Courses</label>
@@ -182,23 +183,23 @@
                       
                   </select>
                 </div>
-               <!-- <button type="button" class='btn btn-md btn-primary col-md-1 remove-course'>
+                <button type="button" class='btn btn-md btn-primary col-md-1 remove-course'>
                   X
-                </button>-->
+                </button>
               </div>
-              <!--<button type="button" class='btn btn-md btn-secondary add-course'>
+              <button type="button" class='btn btn-md btn-secondary add-course'>
                 <span class='glyphicon glyphicon-plus'>
                 </span>
                 Add another Course
-              </button>-->
+              </button>
 
               <label>Associated Objectives</label>
               <div class="approveObjectives">
                 <div class="form-group col-md-11">
                   <select name="objectiveid[]" class="form-control">
-                    @foreach ($objectives as $id => $text)
+                   {{-- @foreach ($objectives as $id => $text)
                       <option value="{{$id}}">{{$text}}</option>
-                    @endforeach
+                    @endforeach--}}
                   </select>
                 </div>
                 <button type="button" class='btn btn-md btn-primary col-md-1 remove-objective'>
@@ -215,9 +216,9 @@
                 <label>Type of Transformative Action</label>
                 <select name='type_of_ta' class="form-control selectpicker">
                   <option value ='0'>Select a Type</option>
-                  @foreach($types as $type)
+                 {{-- @foreach($types as $type)
                   <option value = '{{$type->type_of_TA}}'>{{$type->type_of_TA}}</option>
-                  @endforeach
+                  @endforeach--}}
                   <option value ="new"> New Type of Transformative Action</option>
 
                 </select>
@@ -227,10 +228,10 @@
 
               <input type='hidden' name='ta_id' class='updateTA'>
 
-              {{ Form::submit('Approve', array('class' => 'btn btn-primary btn-block')) }}
-              {{ Form::close() }}
+              {{-- Form::submit('Approve', array('class' => 'btn btn-primary btn-block')) }}
+              {{ Form::close() --}}
             </div>
-        </div>
+        </div> -->
     </div>
 
     <div class="col-md-6">
@@ -265,7 +266,7 @@
                     <select class="form-control filterCourse selectpicker">
                       <option value="0">Show All</option>
                       @foreach ($course_filter_editPanel as $course)
-                        <option value="({{$course->code}},{{$course->number}})">{{$course->code}} {{$course->number}}</option>
+                        <option value="({{$course->code}},{{$course->number}})">{{$course->code}} {{$course->name}}</option>
                       @endforeach
                     </select>
                   </div>
@@ -325,7 +326,7 @@
                 <div class="form-group col-md-11 editCourse">
                   <select name="courseid" id = "edit_course" class="form-control selectpicker">
                     @foreach ($courses_create as $course)
-                      <option value="({{$course->code}},{{$course->number}})">{{$course->code}} {{$course->number}}</option>
+                      <option value="({{$course->code}},{{$course->number}})">{{$course->code}} {{$course->name}}</option>
                     @endforeach
                   </select>
                 </div>
@@ -431,10 +432,10 @@ dummyApproval.find('option').remove();
 
 
 var role = {{Auth::user()['role']}};
-if (role == 3){
+if (role != 4){
   dummyApproval.find('select').append('<option value="0">To be implemented</option>');
   $('#approvePanel .add-course').hide();
-} else if (role == 4){
+} /* else if (role == 4){
   dummyApproval.find('select').append('<option value="1">Recommended</option>');
   $('#approvePanel').parent().hide();
 
@@ -446,7 +447,7 @@ if (role == 3){
   // in edit panel, hide the professor filter
   $('.filterProfessor').parent().hide();
   $('.filterProfessor').parent().next().hide(); // hide <br>
-}
+}*/
 
 $('.createObjectives').prop('disabled', 'disabled');
 $('#createPanel .add-objective').prop('disabled', 'disabled');
@@ -477,9 +478,9 @@ if(($('#approvalSelectTA').val() === "")){
   $('#approvalDescription').prop('disabled', 'disabled');
 }else{
   var ta_id = $('#approvalSelectTA').val();
-  if(ta_id != 0){
-    load_ta_info_for_approval(ta_id);
-  }
+  //if(ta_id != 0){
+  //  load_ta_info_for_approval(ta_id);
+  //}
 
 }
 
@@ -664,7 +665,7 @@ function load_ta_info_for_edit(ta_id) {
   );
 }
 
-function load_ta_info_for_approval(ta_id) {
+/*function load_ta_info_for_approval(ta_id) {
   $.post(
     "{{ URL::action('TransformativeActionsController@selectTA') }}",
     {
@@ -711,7 +712,7 @@ function load_ta_info_for_approval(ta_id) {
       $('.approvalText').val(name);
       $('#approvePanel .updateTA').val(ta_id);
 
-/*
+
       //locate de "add course" button on approve panel
       var add_course_button = $('#approvePanel .add-course')
 
@@ -737,7 +738,7 @@ function load_ta_info_for_approval(ta_id) {
         prev_select = add_course_button.prev();
       });
       prev_select.remove();
-      */
+      
       course = selected_course[0];
       var new_option = $('<option/>',{
         'value': '('+course.code+','+course.number+')',
@@ -753,7 +754,7 @@ function load_ta_info_for_approval(ta_id) {
 
     }
   );
-}
+}*/
 
 function add_objective_select(element) {
   var prev_select = $(element).prev();
@@ -879,9 +880,9 @@ $('#editSelectTA').parent().on('change', function()
 $('#approvalSelectTA').parent().on('change', function()
 {
   var ta_id = $(this).find('select').val();
-  if(ta_id != 0){
-    load_ta_info_for_approval(ta_id);
-    }
+  //if(ta_id != 0){
+  //  load_ta_info_for_approval(ta_id);
+  //  }
 });
 
 
@@ -959,9 +960,9 @@ $('.filterSection').on('change', function()
         if(panel_id=='editPanel'){
           load_ta_info_for_edit(ta_id);
         }
-        if(panel_id=='approvePanel'){
-          load_ta_info_for_approval(ta_id);
-        }
+       // if(panel_id=='approvePanel'){
+       //   load_ta_info_for_approval(ta_id);
+       // }
       }
     }
   );

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

@@ -5,17 +5,25 @@
     </div>-->
     <ul class="nav navbar-nav navbar-right">
       <li>{{ HTML::linkAction('SchoolCoordinatorsController@overview', 'Overview') }}</li>
-      <li>{{ HTML::linkAction('TemplatesController@newTemplate', 'Rubrics') }}</li>
-      <li class="dropdown">
+           <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 class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Management<span class="caret"></span></a>
+        <ul class="dropdown-menu" role="menu">
+<li>{{ HTML::linkAction('Objective2Controller@editSchool', 'Objectives')}}</li>
       <li>{{ HTML::linkAction('CriteriaController@editSchool', 'Criteria') }}</li>
-      @if(count(Auth::user()->courses))
+ <li>{{ HTML::linkAction('TemplatesController@newTemplate', 'Rubrics') }}</li>
+ <li>{{ HTML::linkAction('TransformativeActionsController@editTA', 'Transformative Actions') }}</li>
+
+
+      </ul>
+      </li>
+            @if(count(Auth::user()->courses))
       <li> {{ HTML::linkAction('ProfessorsController@overview', 'My Courses', NULL) }}</li>
       <li class="dropdown">
         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Sections<span class="caret"></span></a>

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

@@ -120,6 +120,8 @@ $(document).ready(function()
         var table = $('.datatable').DataTable();
         
         table.clear();
+
+        var optionsForTADict ={};
         
 
 
@@ -161,8 +163,8 @@ $(document).ready(function()
           nextLetter= nextChar(nextLetter);
           for(course in courses[objectives[objective].id]){
             
-            courseshtml += ' &#8226; '+courses[objectives[objective].id][course].code+' '+courses[objectives[objective].id][course].number+'<br>'
-            courseTAhtml += ' &#8226; '+courses[objectives[objective].id][course].code+' '+courses[objectives[objective].id][course].number+'<br>'
+            courseshtml += ' &#8226; '+courses[objectives[objective].id][course].code+' '+courses[objectives[objective].id][course].name+'<br>'
+            courseTAhtml += ' &#8226; '+courses[objectives[objective].id][course].code+' '+courses[objectives[objective].id][course].name+'<br>'
       
             $divForEach =$('<div/>',{
             'id':'objective-'+objectives[objective].id
@@ -214,15 +216,17 @@ $(document).ready(function()
             
           }
           }
+          typ_course_id = courses[objectives[objective].id][course].typ_course_id
           var $buttonTA = $('<button/>', {
            'type': 'button',
            'class': 'btn btn-secondary',
-            'onclick': 'addTAselect("'+optionsForTa+'", "forTA-objective-'+objectives[objective].id+'-course-'+courses[objectives[objective].id][course].typ_course_id+'", '+annual_plan+', '+objectives[objective].id+', '+typ_objective_id+', 0)'
+
+            'onclick': 'addTAselect("'+optionsForTa+'", "forTA-objective-'+objectives[objective].id+'-course-'+courses[objectives[objective].id][course].typ_course_id+'", '+annual_plan+', '+objectives[objective].id+', '+typ_course_id+', 0)'
   });
            
           $buttonTA.append("+ Add TA");
-
-
+          typ_course_id = courses[objectives[objective].id][course].typ_course_id
+          optionsForTADict[typ_course_id] = optionsForTa;
           
           
 
@@ -236,6 +240,8 @@ $(document).ready(function()
             
             courseshtml += $divForEach[0].innerHTML +"<br><br>";
             courseTAhtml += $divForTA[0].innerHTML +"<br><br>";
+
+          
           }
 
 
@@ -308,12 +314,13 @@ $(document).ready(function()
        if(json.annual_plans_transformative[objectives[objective].id][typ_course_id].length){
             for(i=0; i<json.annual_plans_transformative[objectives[objective].id][typ_course_id].length; i++){
               selected_ta = json.annual_plans_transformative[objectives[objective].id][typ_course_id][i].trans_id;
-              addTAselect(optionsForTa, "forTA-objective-"+objectives[objective].id+'-course-'+typ_course_id, annual_plan, objectives[objective].id, typ_course_id, selected_ta);
+              addTAselect(optionsForTADict[typ_course_id], "forTA-objective-"+objectives[objective].id+'-course-'+typ_course_id, annual_plan, objectives[objective].id, typ_course_id, selected_ta);
               
             }
           }
             else{
-              addTAselect(optionsForTa, "forTA-objective-"+objectives[objective].id+'-course-'+typ_course_id, annual_plan, objectives[objective].id, typ_course_id, 0);
+              $('#')
+              addTAselect(optionsForTADict[typ_course_id], "forTA-objective-"+objectives[objective].id+'-course-'+typ_course_id, annual_plan, objectives[objective].id, typ_course_id, 0);
             }
         if(json.selected_criteria[objectives[objective].id][typ_course_id].length){
          

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

@@ -17,10 +17,18 @@
                 <div id='outcomeGroup'>
                     <label> Associated Outcome</label>
                     <div class="form-group col-md-11" id='outcomeForm'>
+                        <select id="outcome[0]" name="outcome[0]" class="form-control selectpicker">
+                            @foreach ($outcomes as $outcome)
+                            <option value="{{ $outcome->id }}">
+                                {{ $outcome->name }}
+    
+    
+    
+                            </option>
+                            @endforeach
+                        </select>
 
-
-                        {{ Form::select('outcome[0]', $outcomes, null, ['class'=>'form-control selectpicker', 'id' =>'outcome[0]']) }}
-
+                      
                     </div>
 
                 </div>
@@ -115,8 +123,17 @@
                 <div class="form-group">
                     <div id='assocOutcomeGroup'>
                         <label>Associated Outcome</label>
-
-                        {{ Form::select('assoc_outcome[]', $outcomes, null, ['class'=>'form-control selectpicker', 'id'=>'assoc_outcome0']) }}
+                        <select id="assoc_outcome0" name="assoc_outcome[]" class="form-control selectpicker">
+                            @foreach ($outcomes as $outcome)
+                            <option value="{{ $outcome->id }}">
+                                {{ $outcome->name }}
+    
+    
+    
+                            </option>
+                            @endforeach
+                        </select>
+                   
 
                     </div>
                 </div>

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

@@ -207,7 +207,7 @@ $('#here2').append($buttonForInform);*/
                "style": "table-layout: fixed",
                "id": 'allReportToExport',
               "data-title": plan});
-        $thead = $('<thead/>').html("<tr><th>Objectives for courses</th><th>Criteria per Courses</th><th>Transformative Actions</th><th>Expected Outcome</th></tr>");
+        $thead = $('<thead/>').html("<tr><th>Objectives for courses</th><th>Criteria per Courses</th><th>Transformative Actions</th></tr>");
         $tbody = $('<tbody/>');
         $tableForAll.append($thead);
         $tableForAll.append($tbody);
@@ -275,7 +275,7 @@ $('#here2').append($buttonForInform);*/
                "id": json.first.outcomes[outcome].id +'first',
                "data-title": json.first.outcomes[outcome].name
              })
-             $thead = $('<thead/>').html("<tr><th>Objectives for courses</th><th>Criteria per Course</th><th>Transformative Actions</th><th>Expected Outcome</th></tr>")
+             $thead = $('<thead/>').html("<tr><th>Objectives for courses</th><th>Criteria per Course</th><th>Transformative Actions</th></tr>")
              $table.append($thead);
              $table.append($('<tbody/>')); 
              $divTable.append($table);
@@ -302,12 +302,12 @@ $('#here2').append($buttonForInform);*/
 
                 for(criterion in json.first.criteria[theObj.id][theCourse.typ_course_id]){
                   theCrit = json.first.criteria[theObj.id][theCourse.typ_course_id][criterion];
-                  courseHTML += '\t&nbsp;&nbsp; '+(parseInt(criterion)+1)+". "+theCrit.name+'\n<br>';
+                  courseHTML += '\t&nbsp;&nbsp; '+(parseInt(criterion)+1)+". "+theCrit.name+'\n\n<br>';
                   
                 }
                 for(trans in json.first.trans_actions[theObj.id][theCourse.typ_course_id]){
                   theTA = json.first.trans_actions[theObj.id][theCourse.typ_course_id][trans]
-                  courseTAhtml +='\t&nbsp;&nbsp; '+(parseInt(trans)+1)+". "+theTA.at_text+'\n<br>'; 
+                  courseTAhtml +='\t&nbsp;&nbsp; '+(parseInt(trans)+1)+". "+theTA.description+'\n\n<br>'; 
                 }
               }
               //courseHTML += '</ul>';
@@ -417,7 +417,7 @@ $('#here2').append($buttonForInform);*/
                "id": json.second.outcomes[outcome].id +'second',
                "data-title": json.second.outcomes[outcome].name
              })
-             $thead = $('<thead/>').html("<tr><th>Objectives for courses</th><th>Criteria per Course</th><th>Transformative Actions</th><th>Expected Outcome</tr>")
+             $thead = $('<thead/>').html("<tr><th>Objectives for courses</th><th>Criteria per Course</th><th>Transformative Actions</th></tr>")
              $table.append($thead);
              $table.append($('<tbody/>')); 
              $divTable.append($table);
@@ -443,14 +443,14 @@ $('#here2').append($buttonForInform);*/
                 courseTAhtml += '&#8226; '+theCourse.code + " "+ theCourse.number +'\n\n\n<br>';
                 for(criterion in json.second.criteria[theObj.id][theCourse.typ_course_id]){
                   theCrit = json.second.criteria[theObj.id][theCourse.typ_course_id][criterion];
-                  courseHTML += '&nbsp;&nbsp; '+(parseInt(criterion)+1)+". "+theCrit.name+'\n<br>';
+                  courseHTML += '&nbsp;&nbsp; '+(parseInt(criterion)+1)+". "+theCrit.name+'\n\n<br>';
 
 
                 }
 
                 for(trans in json.second.trans_actions[theObj.id][theCourse.typ_course_id]){
                   theTA = json.second.trans_actions[theObj.id][theCourse.typ_course_id][trans]
-                  courseTAhtml +='\t&nbsp;&nbsp; '+(parseInt(trans)+1)+". "+theTA.at_text+'\n<br>'; 
+                  courseTAhtml +='\t&nbsp;&nbsp; '+(parseInt(trans)+1)+". "+theTA.description+'\n\n<br>'; 
                 }
               }
               //courseHTML += '</ul>';
@@ -585,7 +585,7 @@ function createDataTable(table1){
                                     tableCopy = doc.content[1];
                                     doc.content[1] = { text: dt.exportOptions.text, style:'title', margin : [0,0,0,12]};
                                     doc.content[2] =tableCopy;
-                                    doc.content[2].table.widths =['20%', '20%', '20%', '20%', '20%']
+                                    doc.content[2].table.widths =['33%', '33%', '34%']
                                     doc.pageSize = 'LEGAL';
                                     doc.pageOrientation ='landscape';
                                     doc.defaultStyle.fontSize = 10;
@@ -755,7 +755,7 @@ function createTheExportAll(table1){
                                       
 
                                       doc.content.push({text:title,style:"title", margin:[0,0,0,12],  });
-                                      doc.content.push({table: {body:body1, headerRows:1, widths:['20%', '20%', '20%', '20%', '20%']},layout:"noBorders", pageBreak:'after'});
+                                      doc.content.push({table: {body:body1, headerRows:1, widths:['33%', '33%', '34%']},layout:"noBorders", pageBreak:'after'});
 
 
                                       
@@ -1166,7 +1166,7 @@ function createTheTrans(table1){
                                         suggested = json_to_use.suggested[trans][0];
                                       }
                                       else suggested =0;
-                                      title_trans = this_is_the_json[trans].at_text;
+                                      title_trans = this_is_the_json[trans].description;
                                       json_outcomes = json_to_use.outcomes[trans];
                                       if(suggested){
                                       doc.content.push({text:'\n\n'+title_trans+'['+suggested.surnames + ', '+suggested.first_name+']' ,style:"title", margin:[0,0,0,12],  });

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

@@ -8,7 +8,7 @@
       <li>{{ HTML::linkAction('ProfessorsController@overview', 'My Courses') }}</li>
       {{-- la linea siguiente comentada es lo que habia originalmente. tanto la linea como este comentario se pueden borrar --}}
       {{-- <li>{{ HTML::linkAction('CriteriaController@index', 'Learning Outcomes and Criteria') }}</li> --}}
-      <li>{{ HTML::linkAction('TransformativeActionsController@editTA', 'Transformative Actions') }}</li>
+      {{--<li>{{ HTML::linkAction('TransformativeActionsController@editTA', 'Transformative Actions') }}</li>--}}
       <li class="dropdown">
         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Learning and Criterias<span class="caret"></span></a>
         <ul class="dropdown-menu" role="menu">