Los ultimos cambios del momento

app/controllers/ActivitiesController.php

@@ -522,7 +522,7 @@ class ActivitiesController extends \BaseController
                 DB::table('assessments')->where('activity_id', $activity->id)->delete();
 
                 // Recalculate course outcomes
-                $activities = DB::table('activities')
+                /*$activities = DB::table('activities')
                     ->where('course_id', $course->id)
                     ->where('draft', 0)
                     ->get();
@@ -588,6 +588,7 @@ class ActivitiesController extends \BaseController
                             'updated_at' => date('Y-m-d H:i:s')
                         ));
                 }
+            });*/
             });
 
             if (is_null($exception)) {
@@ -721,12 +722,12 @@ class ActivitiesController extends \BaseController
                 $activity->name = Input::get('name');
                 $activity->description = Input::get('description');
                 $activity->date = Input::get('date');
-            } elseif (Input::has('update_transforming_actions')) {
+            } /*elseif (Input::has('update_transforming_actions')) {
                 if (trim(Input::get('transforming_actions')) != "")
                     $activity->transforming_actions = Input::get('transforming_actions');
                 else
                     $activity->transforming_actions = NULL;
-            } elseif (Input::has('update_assessment_comments')) {
+            }*/ elseif (Input::has('update_assessment_comments')) {
                 if (trim(Input::get('assessment_comments')) != "")
                     $activity->assessment_comments = Input::get('assessment_comments');
                 else

app/controllers/AnnualPlansController.php

@@ -220,13 +220,28 @@ class AnnualPlansController extends \BaseController
 
       Log::info($typ_info['typ_objective_id'][$objective->id]->id);
       Log::info($annual_plan->id);
-      $typ_info['annual_plans_transformative'][$objective->id] = DB::select("select trans_id from annual_plan_transformative where annual_plan_id={$annual_plan->id} and typ_semester_objective_id ={$typ_info['typ_objective_id'][$objective->id]->id}");
+      //  $typ_info['annual_plans_transformative'][$objective->id] = DB::select(
+      //    "select trans_id from annual_plan_transformative
+      //     where annual_plan_id={$annual_plan->id} 
+      //     and typ_semester_objective_id ={$typ_info['typ_objective_id'][$objective->id]->id}"
+      //  );
       foreach ($typ_info['courses'][$objective->id] as $course) {
-        $typ_info['selected_criteria'][$objective->id][$course->id] = DB::select("select criteria_id, typ_semester_course_id typ_course_id from annual_plan_objective where annual_plan_id ={$annual_plan->id} and typ_semester_course_id ={$course->typ_course_id} ");
+        $typ_info['selected_criteria'][$objective->id][$course->typ_course_id] = DB::select("select criteria_id, typ_semester_course_id typ_course_id from annual_plan_objective where annual_plan_id ={$annual_plan->id} and typ_semester_course_id ={$course->typ_course_id} ");
+        $typ_info['annual_plans_transformative'][$objective->id][$course->typ_course_id] = DB::table('annual_plan_transformative')
+          ->select('trans_id')
+          ->where('annual_plan_id', $annual_plan->id)
+          ->where('typ_semester_course_id', $course->typ_course_id)
+          ->get();
+        $typ_info['custom_transformative'][$objective->id][$course->id] = DB::table('transformative_actions')
+          ->join('ta_course', 'ta_course.ta_id', '=', 'transformative_actions.id')
+          ->join('transformative_objective', 'transformative_objective.ta_id', '=', 'transformative_actions.id')
+          ->where('is_custom', 1)
+          ->where('by_professor', 0)
+          ->where('ta_course.course_number', $course->number)
+          ->where('ta_course.course_code', $course->code)
+          ->where('transformative_objective.objective_id', $objective->id)
+          ->get();
       }
-
-
-      $typ_info['custom_transformative'][$objective->id] = DB::select("select * from transformative_actions where is_custom =1 and by_professor=0 and id in (select ta_id from transformative_objective_course where objective_id = {$objective->id})");
     }
     $typ_info['annual_plan'] = $annual_plan;
     Log::info($typ_info);
@@ -239,7 +254,7 @@ class AnnualPlansController extends \BaseController
     $typ_id = Input::get('typ_id') + 0;
     $trans_id = Input::get('TA_id') + 0;
 
-    DB::delete("delete from `annual_plan_transformative` where annual_plan_id ={$annual_id} and typ_semester_objective_id ={$typ_id} and trans_id={$trans_id}");
+    DB::delete("delete from `annual_plan_transformative` where annual_plan_id ={$annual_id} and typ_semester_course_id ={$typ_id} and trans_id={$trans_id}");
     return;
   }
 
@@ -247,24 +262,24 @@ class AnnualPlansController extends \BaseController
   {
     $annual_id = Input::get('annual_id') + 0;
     $TA_id = Input::get('TA_id') + 0;
-    $typ_id = Input::get('typ_id') + 0;
+    $typ_id = Input::get('typ_course_id') + 0;
     $old_ta = Input::get('old_ta') + 0;
     $id = Auth::user()['id'];
     $date = date('Y-m-d');
     $date = strtotime($date);
 
 
-    $query = DB::select("select * from annual_plan_transformative where annual_plan_id ={$annual_id} and trans_id ={$old_ta} and typ_semester_objective_id ={$typ_id}");
+    $query = DB::select("select * from annual_plan_transformative where annual_plan_id ={$annual_id} and trans_id ={$old_ta} and typ_semester_course_id ={$typ_id}");
 
     if (!count($query)) {
-      DB::insert("insert into `annual_plan_transformative` (`annual_plan_id`,`trans_id`, `typ_semester_objective_id`, `proposing_coordinator_id`, `proposed_date`) values({$annual_id},{$TA_id},{$typ_id}, {$id}, now() ) ");
+      DB::insert("insert into `annual_plan_transformative` (`annual_plan_id`,`trans_id`, `typ_semester_course_id`, `proposing_coordinator_id`, `proposed_date`) values({$annual_id},{$TA_id},{$typ_id}, {$id}, now() ) ");
       return "Insert Successful";
     } else {
       if ($TA_id == 0) {
-        DB::delete("delete from annual_plan_transformative where trans_id={$TA_id} and annual_plan_id ={$annual_id} and typ_semester_objective_id ={$typ_id}");
+        DB::delete("delete from annual_plan_transformative where trans_id={$TA_id} and annual_plan_id ={$annual_id} and typ_semester_course_id ={$typ_id}");
         return "deleted";
       } else {
-        DB::update("update annual_plan_transformative set trans_id = {$TA_id}, proposing_coordinator_id = {$id}, proposed_date = now() where trans_id={$old_ta} and annual_plan_id ={$annual_id} and typ_semester_objective_id ={$typ_id}");
+        DB::update("update annual_plan_transformative set trans_id = {$TA_id}, proposing_coordinator_id = {$id}, proposed_date = now() where trans_id={$old_ta} and annual_plan_id ={$annual_id} and typ_semester_course_id ={$typ_id}");
         return "updated";
       }
     }

app/controllers/TransformativeActionsController.php

@@ -27,7 +27,11 @@ class TransformativeActionsController extends \BaseController
       ->orWhereNull('deactivation_date')
       ->get();
     $objectives = array();
-
+    $types = DB::table('transformative_actions')
+      ->select('type_of_TA')
+      ->where('type_of_TA', '<>', '')
+      ->distinct()
+      ->get();
     // if user is program coordinator
     if ($role == 3) {
       //1 edit panel: load the TA that
@@ -64,20 +68,23 @@ class TransformativeActionsController extends \BaseController
       // get the courses from asociated with a TA
       $course_filter_approvePanel = DB::table('ta_course')
         ->join('transformative_actions', 'transformative_actions.id', '=', 'ta_course.ta_id')
-        ->join('courses', 'courses.id', '=', 'ta_course.course_id')
+        ->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.name', 'courses.code')
+        ->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_course', 'transformative_objective_course.ta_id', '=', 'transformative_actions.id')
-        ->join('criterion_objective_outcome', 'criterion_objective_outcome.objective_id', '=', 'transformative_objective_course.objective_id')
-        ->join('outcomes', 'outcomes.id', '=', 'criterion_objective_outcome.outcome_id')
+        ->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)
@@ -100,18 +107,21 @@ class TransformativeActionsController extends \BaseController
         ->get();
       $course_filter_editPanel =  DB::table('ta_course')
         ->join('transformative_actions', 'transformative_actions.id', '=', 'ta_course.ta_id')
-        ->join('courses', 'courses.id', '=', 'ta_course.course_id')
+        ->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.name', 'courses.code')
+        ->groupBy('courses.number', 'courses.code')
         ->orderBy('courses.name', 'ASC')
         ->orderBy('courses.code', 'ASC')
         ->get();
       $outcome_filter_editPanel = DB::table('transformative_actions')
-        ->join('transformative_objective_course', 'transformative_objective_course.ta_id', '=', 'transformative_actions.id')
-        ->join('criterion_objective_outcome', 'criterion_objective_outcome.objective_id', '=', 'transformative_objective_course.objective_id')
+        ->join('transformative_objective', 'transformative_objective.ta_id', '=', 'transformative_actions.id')
+        ->join('criterion_objective_outcome', 'criterion_objective_outcome.objective_id', '=', 'transformative_objective.objective_id')
         ->join('outcomes', 'outcomes.id', '=', 'criterion_objective_outcome.outcome_id')
         ->where('transformative_actions.is_custom', 1)
         ->where('transformative_actions.program_id', $program_id)
@@ -124,11 +134,11 @@ class TransformativeActionsController extends \BaseController
       $courses_create = DB::table('courses')
         ->where('courses.program_id', $program_id)
         ->select('courses.*')
-        ->groupBy('courses.name', 'courses.code')
+        ->groupBy('courses.number', 'courses.code')
         ->orderBy('courses.name', 'ASC')
         ->orderBy('courses.code', 'ASC')
         ->get();
-    }
+    }/*
     // if user is profesor
     elseif ($role == 4) {
       // 1 the user can only edit TA that need approval and has been submited by the same user
@@ -157,8 +167,8 @@ class TransformativeActionsController extends \BaseController
         ->orderBy('courses.code', 'ASC')
         ->get();
       $outcome_filter_editPanel = DB::table('transformative_actions')
-        ->join('transformative_objective_course', 'transformative_objective_course.ta_id', '=', 'transformative_actions.id')
-        ->join('criterion_objective_outcome', 'criterion_objective_outcome.objective_id', '=', 'transformative_objective_course.objective_id')
+        ->join('transformative_objective', 'transformative_objective.ta_id', '=', 'transformative_actions.id')
+        ->join('criterion_objective_outcome', 'criterion_objective_outcome.objective_id', '=', 'transformative_objective.objective_id')
         ->join('outcomes', 'outcomes.id', '=', 'criterion_objective_outcome.outcome_id')
         ->where('transformative_actions.is_custom', 1)
         ->where('transformative_actions.user_id', Auth::user()->id)
@@ -183,10 +193,11 @@ class TransformativeActionsController extends \BaseController
         ->orderBy('courses.code', 'ASC')
         ->get();
     }
-
+*/
     return View::make('local.managers.admins.transformativeAction', compact(
       'title',
       'role',
+      'types',
       'outcomes',
       'schools',
       'criteria',
@@ -246,7 +257,9 @@ class TransformativeActionsController extends \BaseController
     $clean_input['objectiveid'] = Input::get('objectiveid');
     $clean_input['courseid'] = Input::get('courseid');
     $clean_input['approval'] = Input::get('approval');
+    $clean_input['type'] = Input::get('type_of_ta');
     $clean_input['ta_id'] = Input::get('ta_id');
+    $clean_input['new_type'] = Input::get('new_type');
 
     return $clean_input;
   }
@@ -263,14 +276,16 @@ class TransformativeActionsController extends \BaseController
         'courseid' => $clean_input['courseid'],
         'approval' => $clean_input['approval'],
         'ta_id' => $clean_input['ta_id'],
+        'type_of_ta' => $clean_input['type'],
       ),
       array(
         'text' => 'required|string',
         'description' => 'required|string',
         'objectiveid' => 'required|array',
-        'courseid' => 'required|array',
+        'courseid' => 'required|string',
         'approval' => 'integer',
         'ta_id' => 'integer',
+        'type_of_ta' => 'required|string'
       )
     );
   }
@@ -302,7 +317,7 @@ class TransformativeActionsController extends \BaseController
       return Redirect::to('transformativeAction')->withInput();
     } else {
 
-      $user_id = auth::user()->id;
+      $user_id = Auth::user()->id;
       $program_id = DB::table('program_user')
         ->where('user_id', $user_id)
         ->select('program_id')
@@ -313,10 +328,17 @@ class TransformativeActionsController extends \BaseController
       if ($role == 3) {
         $by_professor = 0;
       }
-
+      Log::info($clean_input['courseid']);
       // $by_professor = $clean_input['approval'];
 
+      $parentesis = array('(', ')');
+      $course_code_number = str_replace($parentesis, '', $clean_input['courseid']);
+
+      $course_code_number = explode(',', $course_code_number);
+
       $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'];
       // insert the TA
       $ta_id = DB::table('transformative_actions')->insertGetId(
         array(
@@ -327,32 +349,34 @@ class TransformativeActionsController extends \BaseController
           'program_id' => $program_id,
           'created_at' => $current_timestamp,
           'by_professor' => $by_professor,
+          'type_of_TA' => $type
         )
       );
 
       //
       // // insert the multiple TA_objective_program
       foreach ($clean_input['objectiveid'] as $objective_id) {
-        DB::table('transformative_objective_course')->insert(
+        DB::table('transformative_objective')->insert(
           array(
             'ta_id' => $ta_id,
             'objective_id' => $objective_id,
-            'program_id' => $program_id,
-            'created_at' => $current_timestamp,
+
+
           )
         );
       }
 
       //
       // // insert the multiple TA_course
-      foreach ($clean_input['courseid'] as $course_id) {
-        DB::table('TA_course')->insert(
-          array(
-            'ta_id' => $ta_id,
-            'course_id' => $course_id,
-          )
-        );
-      }
+      DB::table('TA_course')->insert(
+        array(
+          'ta_id' => $ta_id,
+          'course_number' => $course_code_number[1],
+          'course_code' => $course_code_number[0],
+
+        )
+      );
+
 
       Session::flash('status', 'success');
       Session::flash('message', 'Transformative Action created: "' . $clean_input['text'] . '".');
@@ -387,12 +411,19 @@ class TransformativeActionsController extends \BaseController
 
     $current_timestamp = date('Y/m/d H:i:s', time());
 
+    if (Input::get('new_type')) {
+      $type = Input::get('new_type');
+    } else {
+      $type = Input::get('type_of_ta');
+    }
+
     // edit the TA
     DB::table('transformative_actions')
       ->where('id', $ta_id)
       ->update([
         'by_professor' => 0,
         'updated_at' => $current_timestamp,
+        'type_of_TA' => $type
       ]);
 
     Session::flash('status', 'success');
@@ -442,6 +473,9 @@ class TransformativeActionsController extends \BaseController
 
       // $by_professor = $clean_input['approval'];
 
+      if ($clean_input['new_type']) $type = $clean_input['new_type'];
+      else $type = $clean_input['type'];
+
       $current_timestamp = date('Y/m/d H:i:s', time());
       // edit the TA
       DB::table('transformative_actions')
@@ -451,12 +485,14 @@ class TransformativeActionsController extends \BaseController
           'at_text' => $clean_input['text'],
           'description' => $clean_input['description'],
           'updated_at' => $current_timestamp,
+          'type_of_TA' => $type
+
         ]);
 
 
       $ta_id = $clean_input['ta_id'];
       $new_objective_id = $clean_input['objectiveid'];
-      $old_objective_id = DB::table('transformative_objective_course')
+      $old_objective_id = DB::table('transformative_objective')
         ->where('ta_id', $ta_id)
         ->select('objective_id')
         ->lists('objective_id');
@@ -467,7 +503,7 @@ class TransformativeActionsController extends \BaseController
           //do nothing if a new id is already in atble
         } else {
           //if old id not in new id, delete
-          DB::table('transformative_objective_course')
+          DB::table('transformative_objective')
             ->where('ta_id', $ta_id)
             ->where('objective_id', $old_id)
             ->delete();
@@ -476,18 +512,17 @@ class TransformativeActionsController extends \BaseController
 
       //
       foreach ($new_objective_id as $new_id) {
-        $result = DB::table('transformative_objective_course')
+        $result = DB::table('transformative_objective')
           ->where('objective_id', $new_id)
           ->select('objective_id')
           ->lists('objective_id');
 
         if (count($result) == 0) {
           //if the new_id does not exists, do nothing
-          DB::table('transformative_objective_course')->insert(
+          DB::table('transformative_objective')->insert(
             array(
               'ta_id' => $ta_id,
               'objective_id' => $new_id,
-              'program_id' => $program_id,
               'created_at' => $current_timestamp,
             )
           );
@@ -496,8 +531,17 @@ 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}"
+      );
+
+      /*$new_course_id = $clean_input['courseid'];
 
-      $new_course_id = $clean_input['courseid'];
       $old_course_id = DB::table('ta_course')
         ->where('ta_id', $ta_id)
         ->select('course_id')
@@ -534,7 +578,7 @@ class TransformativeActionsController extends \BaseController
         } else {
           //if the new_id already exists, do nothing
         }
-      }
+      } */
 
       Session::flash('status', 'success');
       Session::flash('message', 'Updated Transformative Action: "' . $clean_input['text'] . '".');
@@ -617,12 +661,13 @@ class TransformativeActionsController extends \BaseController
     $program_id = $program_id[0]->program_id;
 
     $objectives = DB::table('transformative_actions')
-      ->join('transformative_objective_course', 'transformative_objective_course.ta_id', '=', 'transformative_actions.id')
-      ->join('objectives', 'objectives.id', '=', 'transformative_objective_course.objective_id')
+      ->join('transformative_objective', 'transformative_objective.ta_id', '=', 'transformative_actions.id')
+      ->join('objectives', 'objectives.id', '=', 'transformative_objective.objective_id')
       ->where('transformative_actions.id', $ta_id)
       ->select('objectives.text as text', 'objectives.id as id')
       ->orderBy('objectives.text', 'ASC')
       ->get();
+    Log::info($ta_id);
 
     $an_objective = $objectives[0]->id;
     $outcome_id = DB::table('criterion_objective_outcome')
@@ -641,7 +686,10 @@ class TransformativeActionsController extends \BaseController
       ->select('objectives.text as text', 'objectives.id as id')
       ->get();
     $selected_courses = DB::table('ta_course')
-      ->join('courses', 'courses.id', '=', 'ta_course.course_id')
+      ->join('courses', function ($join) {
+        $join->on('courses.number', '=', 'ta_course.course_number');
+        $join->on('courses.code', '=', 'ta_course.course_code');
+      })
       ->where('ta_id', $ta_id)
       ->orderBy('courses.name', 'ASC')
       ->orderBy('courses.code', 'ASC')
@@ -694,8 +742,8 @@ class TransformativeActionsController extends \BaseController
 
     $objectives = DB::table('objectives')
       ->join('objective_program', 'objective_program.objective_id', '=', 'objectives.id')
-      ->join('criterion_objective_outcome', 'criterion_objective_outcome.objective_id', '=', 'objectives.id')
-      ->where('criterion_objective_outcome.outcome_id', $outcome_id)
+      ->join('objective_outcome', 'objective_outcome.objective_id', '=', 'objectives.id')
+      ->where('objective_outcome.outcome_id', $outcome_id)
       ->where('objective_program.program_id', $program_id)
       ->orderBy('objectives.text', 'ASC')
       ->select('objectives.text as text', 'objectives.id as id')
@@ -743,25 +791,38 @@ class TransformativeActionsController extends \BaseController
       if ($course_id == 0) {
         $courses =  DB::table('ta_course')
           ->join('transformative_actions', 'transformative_actions.id', '=', 'ta_course.ta_id')
-          ->join('courses', 'courses.id', '=', 'ta_course.course_id')
+          ->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.id')
+          ->select('ta_course.course_number', 'ta_course.course_code')
+          ->distinct()
           ->get();
 
         $course_id = array();
         foreach ($courses as $key => $course) {
-          array_push($course_id, $course->id);
+          array_push($course_id["number"], $course->course_number);
+          array_push($course_id["code"], $course->code);
         }
       } else {
-        $course_id = array($course_id);
+
+        $parentesis = array('(', ')');
+        $course_code_number = str_replace($parentesis, '', $course_id);
+
+        $course_code_number = explode(',', $course_code_number);
+
+        $course_id = array();
+        $course_id['number'] = $course_code_number[1];
+        $course_id['code'] = $course_code_number[0];
       }
       // if outcome isnt a desired filter, search all outcomes
       if ($outcome_id == 0) {
         $outcomes = DB::table('transformative_actions')
-          ->join('transformative_objective_course', 'transformative_objective_course.ta_id', '=', 'transformative_actions.id')
-          ->join('criterion_objective_outcome', 'criterion_objective_outcome.objective_id', '=', 'transformative_objective_course.objective_id')
+          ->join('transformative_objective', 'transformative_objective.ta_id', '=', 'transformative_actions.id')
+          ->join('criterion_objective_outcome', 'criterion_objective_outcome.objective_id', '=', 'transformative_objective.objective_id')
           ->join('outcomes', 'outcomes.id', '=', 'criterion_objective_outcome.outcome_id')
           ->where('transformative_actions.is_custom', 1)
           ->where('transformative_actions.program_id', $program_id)
@@ -778,16 +839,18 @@ class TransformativeActionsController extends \BaseController
       }
 
       // search TA with filters
+
       $filtered_at = DB::table('transformative_actions')
         ->join('ta_course', 'ta_course.ta_id', '=', 'transformative_actions.id')
-        ->join('transformative_objective_course', 'transformative_objective_course.ta_id', '=', 'transformative_actions.id')
-        ->join('criterion_objective_outcome', 'criterion_objective_outcome.objective_id', '=', 'transformative_objective_course.objective_id')
+        ->join('transformative_objective', 'transformative_objective.ta_id', '=', 'transformative_actions.id')
+        ->join('objective_outcome', 'objective_outcome.objective_id', '=', 'transformative_objective.objective_id')
         ->where('transformative_actions.is_custom', 1)
         ->where('transformative_actions.program_id', $program_id)
         ->where('transformative_actions.by_professor', 1)
         ->whereIn('transformative_actions.user_id', $professor_id)
-        ->whereIn('criterion_objective_outcome.outcome_id', $outcome_id)
-        ->whereIn('ta_course.course_id', $course_id)
+        ->whereIn('objective_outcome.outcome_id', $outcome_id)
+        ->whereIn('ta_course.course_code', $course_id['code'])
+        ->whereIn('ta_course.course_number', $course_id['number'])
         ->select('transformative_actions.*')
         ->groupBy('transformative_actions.id')
         ->orderBy('transformative_actions.at_text', 'ASC')
@@ -816,26 +879,39 @@ class TransformativeActionsController extends \BaseController
       if ($course_id == 0) {
         $courses =  DB::table('ta_course')
           ->join('transformative_actions', 'transformative_actions.id', '=', 'ta_course.ta_id')
-          ->join('courses', 'courses.id', '=', 'ta_course.course_id')
+          ->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.id')
+          ->select('ta_course.course_number', 'ta_course.course_code')
+          ->distinct()
           ->get();
 
         $course_id = array();
         foreach ($courses as $key => $course) {
-          array_push($course_id, $course->id);
+          array_push($course_id["number"], $course->course_number);
+          array_push($course_id["code"], $course->code);
         }
       } else {
-        $course_id = array($course_id);
+
+        $parentesis = array('(', ')');
+        $course_code_number = str_replace($parentesis, '', $course_id);
+
+        $course_code_number = explode(',', $course_code_number);
+
+        $course_id = array();
+        $course_id['number'] = $course_code_number[1];
+        $course_id['code'] = $course_code_number[0];
       }
       // if outcome isnt a desired filter, search all outcomes
       if ($outcome_id == 0) {
         $outcomes = DB::table('transformative_actions')
-          ->join('transformative_objective_course', 'transformative_objective_course.ta_id', '=', 'transformative_actions.id')
-          ->join('criterion_objective_outcome', 'criterion_objective_outcome.objective_id', '=', 'transformative_objective_course.objective_id')
-          ->join('outcomes', 'outcomes.id', '=', 'criterion_objective_outcome.outcome_id')
+          ->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)
@@ -853,14 +929,15 @@ class TransformativeActionsController extends \BaseController
       // search TA with filters
       $filtered_at = DB::table('transformative_actions')
         ->join('ta_course', 'ta_course.ta_id', '=', 'transformative_actions.id')
-        ->join('transformative_objective_course', 'transformative_objective_course.ta_id', '=', 'transformative_actions.id')
-        ->join('criterion_objective_outcome', 'criterion_objective_outcome.objective_id', '=', 'transformative_objective_course.objective_id')
+        ->join('transformative_objective', 'transformative_objective.ta_id', '=', 'transformative_actions.id')
+        ->join('objective_outcome', 'objective_outcome.objective_id', '=', 'transformative_objective.objective_id')
         ->where('transformative_actions.is_custom', 1)
         ->where('transformative_actions.program_id', $program_id)
         ->where('transformative_actions.by_professor', 0)
         ->whereIn('transformative_actions.user_id', $professor_id)
-        ->whereIn('criterion_objective_outcome.outcome_id', $outcome_id)
-        ->whereIn('ta_course.course_id', $course_id)
+        ->whereIn('objective_outcome.outcome_id', $outcome_id)
+        ->whereIn('ta_course.course_code', $course_id['code'])
+        ->whereIn('ta_course.course_number', $course_id['number'])
         ->select('transformative_actions.*')
         ->groupBy('transformative_actions.id')
         ->orderBy('transformative_actions.at_text', 'ASC')
@@ -879,22 +956,32 @@ class TransformativeActionsController extends \BaseController
           ->where('transformative_actions.is_custom', 1)
           ->where('transformative_actions.program_id', $program_id)
           ->where('transformative_actions.by_professor', 1)
-          ->select('courses.id')
+          ->select('ta_course.course_number', 'ta_course.course_code')
+          ->distinct()
           ->get();
 
         $course_id = array();
         foreach ($courses as $key => $course) {
-          array_push($course_id, $course->id);
+          array_push($course_id["number"], $course->course_number);
+          array_push($course_id["code"], $course->code);
         }
       } else {
-        $course_id = array($course_id);
+
+        $parentesis = array('(', ')');
+        $course_code_number = str_replace($parentesis, '', $course_id);
+
+        $course_code_number = explode(',', $course_code_number);
+
+        $course_id = array();
+        $course_id['number'] = $course_code_number[1];
+        $course_id['code'] = $course_code_number[0];
       }
       // if outcome isnt a desired filter, search all outcomes
       if ($outcome_id == 0) {
         $outcomes = DB::table('transformative_actions')
-          ->join('transformative_objective_course', 'transformative_objective_course.ta_id', '=', 'transformative_actions.id')
-          ->join('criterion_objective_outcome', 'criterion_objective_outcome.objective_id', '=', 'transformative_objective_course.objective_id')
-          ->join('outcomes', 'outcomes.id', '=', 'criterion_objective_outcome.outcome_id')
+          ->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.user_id', Auth::user()->id)
           ->where('transformative_actions.is_custom', 1)
           ->where('transformative_actions.program_id', $program_id)
@@ -913,14 +1000,15 @@ class TransformativeActionsController extends \BaseController
       // search TA with filters
       $filtered_at = DB::table('transformative_actions')
         ->join('ta_course', 'ta_course.ta_id', '=', 'transformative_actions.id')
-        ->join('transformative_objective_course', 'transformative_objective_course.ta_id', '=', 'transformative_actions.id')
-        ->join('criterion_objective_outcome', 'criterion_objective_outcome.objective_id', '=', 'transformative_objective_course.objective_id')
+        ->join('transformative_objective', 'transformative_objective.ta_id', '=', 'transformative_actions.id')
+        ->join('criterion_objective_outcome', 'criterion_objective_outcome.objective_id', '=', 'transformative_objective.objective_id')
         ->where('transformative_actions.user_id', Auth::user()->id)
         ->where('transformative_actions.is_custom', 1)
         ->where('transformative_actions.program_id', $program_id)
         ->where('transformative_actions.by_professor', 1)
         ->whereIn('criterion_objective_outcome.outcome_id', $outcome_id)
-        ->whereIn('ta_course.course_id', $course_id)
+        ->whereIn('ta_course.course_code', $course_id['code'])
+        ->whereIn('ta_course.course_number', $course_id['number'])
         ->select('transformative_actions.*')
         ->groupBy('transformative_actions.id')
         ->orderBy('transformative_actions.at_text', 'ASC')
@@ -933,6 +1021,12 @@ class TransformativeActionsController extends \BaseController
   function postActivityCriterion($activity_id)
   {
     DB::beginTransaction();
+
+    $existing_transformative_action = DB::table('transformative_actions')
+      ->join('transformative_activity_criterion', 'transformative_activity_criterion.trans_action_id', '=', 'transformative_actions.id')
+      ->join('activity_criterion', 'activity_criterion.id', '=', 'transformative_activity_criterion.activity_criterion_id')
+      ->where('activity_id', $activity_id)
+      ->delete();
     $activity_criterion = Input::get('trans_act');
 
     $trans = new TransformativeAction;
@@ -949,8 +1043,19 @@ class TransformativeActionsController extends \BaseController
     $trans->at_text = Input::get('name_trans');
     $trans->description = Input::get('transforming_actions');
 
+    $activity = DB::table('activities')
+      ->where('id', $activity_id)
+      ->first();
+    $course_credentials = DB::table('courses')
+      ->where('id', $activity->course_id)
+      ->first();
+
+
     if ($trans->save()) {
 
+
+
+
       foreach ($activity_criterion as $single_ac) {
         $result = DB::insert("insert into `transformative_activity_criterion` (`trans_action_id`, `activity_criterion_id`) values ($trans->id, $single_ac)");
         if (!$result) {
@@ -961,6 +1066,35 @@ class TransformativeActionsController extends \BaseController
           return Redirect::to("professor/activities/{$activity_id}");
         }
       }
+      $criteria = DB::table('activity_criterion')
+        ->whereIn('id', $activity_criterion)
+        ->lists('criterion_id');
+
+      $allObjectives = DB::table('criterion_objective_outcome')
+        ->whereIn('criterion_id', $criteria)
+        ->select('objective_id')
+        ->distinct()
+        ->lists('objective_id');
+
+
+      foreach ($allObjectives as $objective) {
+        $result2 = DB::insert("insert into `transformative_objective` (`ta_id`, `objective_id`) values ({$trans->id},{$objective})");
+        if (!$result2) {
+          DB::rollback();
+          Session::flash('status', 'danger');
+          Session::flash('message', 'Error saving Transforming Action. Try again later.');
+
+          return Redirect::to("professor/activities/{$activity_id}");
+        }
+      }
+      $result3 = DB::insert("insert into `ta_course` (`ta_id`, `course_number`, `course_code`) values ({$trans->id}, '{$course_credentials->number}', '{$course_credentials->code}')");
+
+      if (!($result3)) {
+        DB::rollback();
+        Session::flash('status', 'danger');
+        Session::flash('message', 'Error saving Transforming Action. Try again later.');
+        return Redirect::to("professor/activities/{$activity_id}");
+      }
       DB::commit();
       Session::flash('status', 'success');
       Session::flash('message', 'Transformative Actions Saved.');

app/database/migrations/2021_06_06_001211_create_transformative_objective_course_table.php → app/database/migrations/2021_06_06_001211_create_transformative_objective_table.php

@@ -3,14 +3,14 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class CreateTransformativeObjectiveCourseTable extends Migration
+class CreateTransformativeObjectiveTable extends Migration
 {
 
 	public function up()
 	{
-		Schema::create('transformative_objective_course', function (Blueprint $table) {
+		Schema::create('transformative_objective', function (Blueprint $table) {
 			$table->increments('id');
-			$table->timestamps();
+
 
 			$table->integer('ta_id')->unsigned();
 			$table->foreign('ta_id')
@@ -26,8 +26,6 @@ class CreateTransformativeObjectiveCourseTable extends Migration
 				->onDelete('cascade')
 				->onUpdate('cascade');
 
-			$table->string('course_code');
-			$table->string('course_number');
 
 			/*$table->integer('program_id')->unsigned();
 			$table->foreign('program_id')
@@ -45,6 +43,6 @@ class CreateTransformativeObjectiveCourseTable extends Migration
 	 */
 	public function down()
 	{
-		Schema::drop('transformative_objective_course');
+		Schema::drop('transformative_objective');
 	}
 }

app/database/migrations/2021_06_14_000848_create_ta_course_table.php

@@ -18,12 +18,8 @@ class CreateTaCourseTable extends Migration
 				->onDelete('cascade')
 				->onUpdate('cascade');
 
-			$table->integer('course_id')->unsigned();
-			$table->foreign('course_id')
-				->references('id')
-				->on('courses')
-				->onDelete('cascade')
-				->onUpdate('cascade');
+			$table->string('course_number');
+			$table->string('course_code');
 		});
 	}