Fixes on Three Year Plans and Transformative Actions

-Added comments on various controllers on what each function does.
-Removed some unused commented code.

app/controllers/ThreeYearPlanController.php

@@ -5,6 +5,7 @@ use Illuminate\Database\Eloquent\Collection;
 class ThreeYearPlanController extends \BaseController
 {
 
+  // load the Three year Plan page
   public function threeYearsReport()
   {
       $user_id = auth::user()->id;
@@ -19,22 +20,15 @@ class ThreeYearPlanController extends \BaseController
           ->where('deactivation_date','=','0000-00-00')
           ->orWhereNull('deactivation_date')
           ->get();
-      // $outcomes = DB::table('outcomes')
-      //     ->orderBy('name', 'asc')
-      //     ->get();
       $typs = DB::table('three_year_plan')
           ->orderBy('year_start', 'asc')
           ->get();
       $criteria = Criterion::withTrashed()->orderBy('name', 'ASC')->get();
-      // $criteria = DB::table('criteria')
-      //     ->orderBy('name', 'asc')
-      //     ->get();
       $program_id = DB::table('program_user')
       ->where('user_id',$user_id)
-      // ->where('user_id',8) //voy a usar 8 porque user 60 no tiene
       ->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;
 
       // se annadio la nueva variable
       return View::make('global.view-three-year-plan', compact('title', 'outcomes', 'typs', 'criteria', 'semesters', 'program_id'));
@@ -42,6 +36,7 @@ class ThreeYearPlanController extends \BaseController
   }
 
 
+  //when the user select a three year period from the left column, load the corresponding info
   public function fetchThreeYears()
   {
       $id = Input::get('id');
@@ -49,7 +44,6 @@ class ThreeYearPlanController extends \BaseController
       $semesters = DB::table('typ_semesters')
           ->join('semesters','semesters.id','=','typ_semesters.semester_id')
           ->where('typ_semesters.typ_id',$id)
-          // ->select('semesters.*')
           ->orderBy('typ_semesters.semester_id', 'asc')
           ->get();
       $typs = DB::table('three_year_plan')
@@ -66,18 +60,18 @@ class ThreeYearPlanController extends \BaseController
       );
   }
 
+  // add or remove a semester associated with an outcome when a user selects a checkbox
   public function update_typ_outcomes_semesters()
   {
     $outcomeSemesterArray = json_decode(Input::get('outcomeSemesterArray'), true);
     $typ_id = Input::get('typ_id');
 
-    $user_id = auth::user()->id; //ya, tester es 60
+    $user_id = auth::user()->id;
     $program_id = DB::table('program_user')
     ->where('user_id',$user_id)
-    // ->where('user_id',8) //voy a usar 8 porque user 60 no tiene
     ->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;
 
 
     $result = DB::table('typ_program')
@@ -158,6 +152,7 @@ class ThreeYearPlanController extends \BaseController
     return;
   }
 
+  // load semesters asociated with the outcomes if previously selected
   public function lookup_typ_semester_outcome()
   {
     $box_value = array();
@@ -200,27 +195,22 @@ class ThreeYearPlanController extends \BaseController
     );
   }
 
+  // save or delete Objectives associated with the outcomes and semsters
   public function section2_on_change()
   {
     $typ_id = Input::get('typ_id');
-    // typ_id: (typ_id),
     $outcome_id = Input::get('outcome_id');
-    // outcome_id: (outcome_id),
     $semester_id = Input::get('semester_id');
-    // semester_id: (semester_id),
     $previous_objective_id = Input::get('previous_objective_id');
-    // previous_objective_id: (previous_objective_id),
     $new_objective_id = Input::get('new_objective_id');
-    // new_objective_id: (new_objective_id)
 
     // get program_id
-    $user_id = auth::user()->id; //ya, tester es 60
+    $user_id = auth::user()->id;
     $program_id = DB::table('program_user')
         ->where('user_id',$user_id)
-        // ->where('user_id',8) //voy a usar 8 porque user 60 no tiene
         ->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;
 
     // get typ_program_id
     $result = DB::table('typ_program')
@@ -268,16 +258,16 @@ class ThreeYearPlanController extends \BaseController
     return 'update was succes';
   }
 
+  // load the corresponding info after associating semesters with outcomes
   public function section2_arrive()
   {
     // get program_id
-    $user_id = auth::user()->id; //ya, tester es 60
+    $user_id = auth::user()->id;
     $program_id = DB::table('program_user')
         ->where('user_id',$user_id)
-        // ->where('user_id',8) //voy a usar 8 porque user 60 no tiene
         ->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;
 
     // get typ_program_id
     $typ_id = Input::get('typ_id');
@@ -363,16 +353,16 @@ class ThreeYearPlanController extends \BaseController
     return $info;
   }
 
+  // load the corresponding info after associating objectives to semesters outcomes
   public function section3_arrive()
   {
     // get program_id
-    $user_id = auth::user()->id; //ya, tester es 60
+    $user_id = auth::user()->id;
     $program_id = DB::table('program_user')
         ->where('user_id',$user_id)
-        // ->where('user_id',8) //voy a usar 8 porque user 60 no tiene
         ->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;
 
     // get typ_program_id
     $typ_id = Input::get('typ_id');
@@ -473,30 +463,23 @@ class ThreeYearPlanController extends \BaseController
     return $info;
   }
 
-
+  // save or delete courses associated with objectives
   public function section3_on_change()
   {
     $typ_id = Input::get('typ_id');
-    // typ_id: (typ_id),
     $outcome_id = Input::get('outcome_id');
-    // outcome_id: (outcome_id),
     $semester_id = Input::get('semester_id');
-    // semester_id: (semester_id),
     $objective_id = Input::get('objective_id');
-    // objective_id: (objective_id),
     $previous_course_id = Input::get('previous_course_id');
-    // previous_course_id: (previous_course_id),
     $new_course_id = Input::get('new_course_id');
-    // new_course_id: (new_course_id)
 
     // get program_id
-    $user_id = auth::user()->id; //ya, tester es 60
+    $user_id = auth::user()->id;
     $program_id = DB::table('program_user')
         ->where('user_id',$user_id)
-        // ->where('user_id',8) //voy a usar 8 porque user 60 no tiene
         ->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;
 
     // get typ_program_id
     $result = DB::table('typ_program')

app/controllers/TransformativeActionsController.php

@@ -5,6 +5,7 @@ use Illuminate\Support\Facades\Input;
 class TransformativeActionsController extends \BaseController
 {
 
+    // load the Tranformative actions page
     public function editTA()
     {
         $title = "Transformative Action";
@@ -190,7 +191,6 @@ class TransformativeActionsController extends \BaseController
       ));
     }
 
-
     private function cleanInput()
     {
         $clean_input = array();
@@ -262,11 +262,7 @@ class TransformativeActionsController extends \BaseController
     }
 
 
-    /**
-     * Create a new transformative action.
-     *
-     * @return Redirect Redirect back to form page
-     */
+    // Create a Transformative Action
     public function createTA()
     {
         $clean_input = $this->cleanInput();
@@ -350,7 +346,7 @@ class TransformativeActionsController extends \BaseController
         }
     }
 
-
+    // apporve a Transformative Action
     public function approveTA()
     {
       $role = Auth::user()['role'];
@@ -391,10 +387,7 @@ class TransformativeActionsController extends \BaseController
     }
 
 
-
-
-
-
+    // update a Tranformative Action
     public function updateTA()
     {
       $clean_input = $this->cleanInput();
@@ -539,7 +532,7 @@ class TransformativeActionsController extends \BaseController
       }
     }
 
-
+    // delete a Transformative Action
     public function deleteTA()
     {
       $ta_id = array(Input::get('ta_id'));
@@ -600,8 +593,8 @@ class TransformativeActionsController extends \BaseController
 
 
 
-
-
+    // load the information of a Tranformative Action when its
+    //  selected on the approve or edit panel
     public function selectTA()
     {
       $ta_id = Input::get("ta_id");
@@ -676,6 +669,7 @@ class TransformativeActionsController extends \BaseController
       );
     }
 
+    // load the available objectieves from an outcome when creating a Tranformative Action
     public function objectivesFromOutcome()
     {
       $user_id = Auth::user()->id;
@@ -701,7 +695,7 @@ class TransformativeActionsController extends \BaseController
       );
     }
 
-    // return TA filtered by the user on the approve or edit panel
+    // return Transformative Actions that meet the filter criterias
     public function filterTA()
     {
       $user_id = Auth::user()->id;

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

@@ -9,10 +9,6 @@
 @stop
 
 @section('main')
-  {{-- TODO: look where to place this script.
-          if placed inside .ready() or before it,
-            an error that the function is not defined occurs. --}}
-  {{-- TODO: no reconoce acentos --}}
   <script type="text/javascript">
     function filterCycles() {
       // Declare variables
@@ -121,7 +117,6 @@
                 </style>
                 <thead>
                   <tr style="background-color:#FDD8B5;">
-                    {{-- <th rowspan="0" style="background-color:#F5DEDD;" class="text-center">Dominios de aprendizaje</th> --}}
                     <th rowspan="0" style="background-color:#F5DEDD;" class="text-center">Learning Outcomes</th>
                     <th colspan="2" class="text-center" id="cycle1"></th>
                     <th colspan="2" class="text-center" id="cycle2"></th>
@@ -139,7 +134,6 @@
                 <tfoot>
                 </tfoot>
                 <input type="text" id="cycle_id" name="cycle_id" value="getsReplacedWithJS" hidden>
-                      {{-- <label for="profesores">Profesores (pares)</label> --}}
                 <tbody id="outcome-semesters-body" onchange="update_outcome_semesters()">
                   @foreach ($outcomes as $outcome)
                     <tr data-id="{{$outcome->id}}">
@@ -208,7 +202,7 @@
               </div>
             <hr>
             <div class="">
-              <button class="btn-lg btn-primary pull-right go-to-temp" style="margin:5px;">Go to TYP evaluation page</button>
+              {{-- <button class="btn-lg btn-primary pull-right go-to-temp" style="margin:5px;">Go to TYP evaluation page</button> --}}
               <button class="btn-lg btn-primary pull-right back-to-2" style="margin:5px;">Back to Objective Selection</button>
             </div>
             </div>