Fix three year amen

app/controllers/ThreeYearPlanController.php

@@ -11,6 +11,7 @@ class ThreeYearPlanController extends \BaseController
       DB::beginTransaction();
       $yearStart = Input::get('years') + 0;
       $yearEnd = $yearStart + 3;
+      $program_id = Input::get('program_id');
       DB::insert("insert into three_year_plan (`year_start`, `year_end`) values ({$yearStart}, {$yearEnd})");
 
       $typ = DB::table('three_year_plan')->where('year_start', '=', $yearStart)
@@ -30,13 +31,13 @@ class ThreeYearPlanController extends \BaseController
       DB::commit();
       Session::flash('status', 'success');
       Session::flash('message', '<p> Cycle created.</p>');
-      return Redirect::to('three-years-plan');
+      return Redirect::to("three-years-plan/{$program_id}");
     } catch (Exception $e) {
       Session::flash('status', 'danger');
       Session::flash('message', "<p>Could not create cycle</p>");
       Log::info($e);
       DB::rollback();
-      return Redirect::to('three-years-plan');;
+      return Redirect::to("three-years-plan/{$program_id}");
     }
   }
   // load the Three year Plan page
@@ -105,11 +106,7 @@ class ThreeYearPlanController extends \BaseController
     $typ_id = Input::get('typ_id');
 
     $user_id = auth::user()->id;
-    $program_id = DB::table('program_user')
-      ->where('user_id', $user_id)
-      ->select('program_id')
-      ->get();
-    $program_id = $program_id[0]->program_id;
+    $program_id = Input::get('program_id');
 
 
     $result = DB::table('typ_program')
@@ -242,14 +239,11 @@ class ThreeYearPlanController extends \BaseController
     $semester_id = Input::get('semester_id');
     $previous_objective_id = Input::get('previous_objective_id');
     $new_objective_id = Input::get('new_objective_id');
+    $program_id = Input::get('program_id');
 
     // get program_id
     $user_id = auth::user()->id;
-    $program_id = DB::table('program_user')
-      ->where('user_id', $user_id)
-      ->select('program_id')
-      ->get();
-    $program_id = $program_id[0]->program_id;
+
 
     // get typ_program_id
     $result = DB::table('typ_program')
@@ -303,11 +297,7 @@ class ThreeYearPlanController extends \BaseController
   {
     // get program_id
     $user_id = auth::user()->id;
-    $program_id = DB::table('program_user')
-      ->where('user_id', $user_id)
-      ->select('program_id')
-      ->get();
-    $program_id = $program_id[0]->program_id;
+    $program_id = Input::get('program_id');
 
     // get typ_program_id
     $typ_id = Input::get('typ_id');
@@ -398,11 +388,7 @@ class ThreeYearPlanController extends \BaseController
   {
     // get program_id
     $user_id = auth::user()->id;
-    $program_id = DB::table('program_user')
-      ->where('user_id', $user_id)
-      ->select('program_id')
-      ->get();
-    $program_id = $program_id[0]->program_id;
+    $program_id = Input::get('program_id');
 
     // get typ_program_id
     $typ_id = Input::get('typ_id');
@@ -506,12 +492,7 @@ class ThreeYearPlanController extends \BaseController
     $new_course_id = Input::get('new_course_id');
 
     // get program_id
-    $user_id = auth::user()->id;
-    $program_id = DB::table('program_user')
-      ->where('user_id', $user_id)
-      ->select('program_id')
-      ->get();
-    $program_id = $program_id[0]->program_id;
+    $program_id = Input::get('program_id');
 
     // get typ_program_id
     $result = DB::table('typ_program')
@@ -568,7 +549,8 @@ class ThreeYearPlanController extends \BaseController
   }
   public function createAnnualPlan($program_id)
   {
-    $current_typ = DB::select("select * from three_year_plan where year_start <=" . date('Y') . " and year_end >=" . date('Y'))[0];
+    $input_id =  Input::get('typ_id');
+    $current_typ = DB::select("select * from three_year_plan where id  = {$input_id}")[0];
     $count = 0;
     $yearStartPlusOne = $current_typ->year_start + 1;
     $yearStart = $current_typ->year_start;

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

@@ -80,7 +80,8 @@
           "{{ URL::action('ThreeYearPlanController@update_typ_outcomes_semesters') }}",
           {
             outcomeSemesterArray : JSON.stringify(outcomeSemesterArray),
-            typ_id: (id)
+            typ_id: (id),
+            program_id: {{$program_id}}
           },
           function(data)
           {
@@ -117,6 +118,7 @@
       <div class="modal-body">
         {{ Form::open(array('action' => 'ThreeYearPlanController@create' )) }}
         <p>Select a new cycle. You cannot choose a cycle that has been created before</p>
+        <input type ='hidden' name = 'program_id' value = '{{$program_id}}'>
         <select name = 'years' class="form-control selectpicker">
           
           
@@ -322,7 +324,9 @@ $(document).ready(function()
           previous_objective_id: (previous_objective_id),
           outcome_id: (outcome_id),
           semester_id: (semester_id),
-          new_objective_id: (new_objective_id)
+          new_objective_id: (new_objective_id),
+          program_id: {{$program_id}}
+
         },
         function(data)
         {
@@ -358,7 +362,8 @@ $(document).ready(function()
           outcome_id: (outcome_id),
           semester_id: (semester_id),
           objective_id: (objective_id),
-          new_course_id: (new_course_id)
+          new_course_id: (new_course_id),
+          program_id: {{$program_id}}
         },
         function(data)
         {
@@ -378,7 +383,10 @@ $(document).ready(function()
 
 $('.go-to-temp').on('click', function(){
   $.post(
-    "{{ URL::action('ThreeYearPlanController@createAnnualPlan', array($program_id))}}");
+    "{{ URL::action('ThreeYearPlanController@createAnnualPlan', array($program_id))}}",
+    {
+      typ_id: $('#table-cycles').data('typ-id')
+    });
     window.location.href = "{{URL::action('AnnualPlansController@showPlan',array($program_id))}}";
 
   });
@@ -551,7 +559,8 @@ $('.go-to-temp').on('click', function(){
     $.post(
         "{{ URL::action('ThreeYearPlanController@section2_arrive') }}",
         {
-          typ_id: (typ_id)
+          typ_id: (typ_id),
+          program_id: {{$program_id}}
         },
         function(data)
         {
@@ -677,7 +686,8 @@ $('.go-to-temp').on('click', function(){
     $.post(
         "{{ URL::action('ThreeYearPlanController@section3_arrive') }}",
         {
-          typ_id: (typ_id)
+          typ_id: (typ_id),
+          program_id : {{$program_id}}
         },
         function(data)
         {