Arreglo a annual plan asociando typ_program al join, ediciones sencillas

app/controllers/AnnualPlansController.php

   public function checkIfPlanReady()
   {
     $annual_plan = AnnualPlan::findOrFail(Input::get("annual_id"));
+      Log::info('annual_plan'.$annual_plan->courses);
 
     /*
       error = [

app/models/AnnualPlan.php

 					->orOn('typ_semester_outcome.semester_id', '=', 'annual_cycle.semester_end');
 			})
 			->join('annual_plans', 'annual_plans.annual_cycle_id', '=', 'annual_cycle.id')
+			->join('typ_program', 'typ_program.program_id','=','annual_plans.program_id')
+			->where('typ_program.id','=','typ_semester_outcome.typ_program_id')
 			->where('annual_plans.program_id', $this->program_id)
 			->where('annual_plans.id', $this->id)
 			->select('courses.*', 'typ_semester_courses.id as typ_semester_course_id', 'annual_plans.program_id', 'typ_semester_outcome.semester_id as semester_id')
 					->orOn('typ_semester_outcome.semester_id', '=', 'annual_cycle.semester_end');
 			})
 			->join('annual_plans', 'annual_plans.annual_cycle_id', '=', 'annual_cycle.id')
+			->join('typ_program', 'typ_program.program_id','=','annual_plans.program_id')
+			->where('typ_program.id','=','typ_semester_outcome.typ_program_id')
 			->where('annual_plans.program_id', $this->program_id)
 			->where('annual_plans.id', $this->id)
 			->select('courses.*', 'typ_semester_courses.id as typ_semester_course_id', 'annual_plans.program_id', 'typ_semester_outcome.semester_id as semester_id')

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

 
             <li class='dropdown'>
                 <a href='#' class='dropdown-toggle' data-toggle='dropdown' role='button' aria-expanded="false"> Three
-                    year Plans<span class="caret"></span></a>
+                    Year Plans<span class="caret"></span></a>
                 <ul class='dropdown-menu' role='menu'>
-                    <h6 class="dropdown-header">Create/Edit Three Year Plan For: </h6>
+                    <h6 class="dropdown-header">Create/Edit Three Year Plan for: </h6>
                     @foreach (Auth::user()->programs as $program)
                         <li><a
                                 href="{{ URL::action('ThreeYearPlanController@threeYearsReport', [$program->id]) }}">{{ $program->name }}</a>
                 <a href='#' class='dropdown-toggle' data-toggle='dropdown' role='button' aria-expanded="false"> Annual
                     Plans<span class="caret"></span></a>
                 <ul class='dropdown-menu' role='menu'>
-                    <h6 class="dropdown-header">Create/Edit Annual Plan For: </h6>
+                    <h6 class="dropdown-header">Create/Edit Annual Plan for: </h6>
                     @foreach (Auth::user()->programs as $program)
                         <li><a
                                 href="{{ URL::action('AnnualPlansController@showPlan', [$program->id]) }}">{{ $program->name }}</a>
                     Results<span class="caret"></span></a>
                 <ul class="dropdown-menu" role="menu">
 
-                    <h6 class='dropdown-header'>Program Results For:</h6>
+                    <h6 class='dropdown-header'>Program Results for:</h6>
                     @foreach (Auth::user()->programs as $program)
                         <li><a href="{{ URL::action('OutcomesController@programAssessmentReport', $program->id) }}">{{ $program->name }}
                             </a></li>
                     Report<span class="caret"></span></a>
                 <ul class="dropdown-menu" role="menu">
 
-                    <h6 class='dropdown-header'>Create/Edit Annual Report For:</h6>
+                    <h6 class='dropdown-header'>Create/Edit Annual Report for:</h6>
                     @foreach (Auth::user()->programs as $program)
                         <li><a
                                 href="{{ URL::action('OutcomesController@annualReport', $program->id) }}">{{ $program->name }}</a>

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

             </li>
             <li class='dropdown'>
                 <a href='#' class='dropdown-toggle' data-toggle='dropdown' role='button' aria-expanded="false"> Three
-                    year Plans<span class="caret"></span></a>
+                    Year Plans<span class="caret"></span></a>
                 <ul class='dropdown-menu' role='menu'>
                     @foreach (Auth::user()->school->programs as $program)
                         <li><a

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

 
             <li class='dropdown'>
                 <a href='#' class='dropdown-toggle' data-toggle='dropdown' role='button' aria-expanded="false"> Three
-                    year Plans<span class="caret"></span></a>
+                    Year Plans<span class="caret"></span></a>
                 <ul class='dropdown-menu' role='menu'>
-                    <h6 class="dropdown-header">Create/Edit Three Year Plan For: </h6>
+                    <h6 class="dropdown-header">Create/Edit Three Year Plan for: </h6>
                     @foreach (Auth::user()->school->programs as $program)
                         <li><a
                                 href="{{ URL::action('ThreeYearPlanController@threeYearsReport', [$program->id]) }}">{{ $program->name }}</a>
                 <a href='#' class='dropdown-toggle' data-toggle='dropdown' role='button' aria-expanded="false"> Annual
                     Plans<span class="caret"></span></a>
                 <ul class='dropdown-menu' role='menu'>
-                    <h6 class="dropdown-header">Create/Edit Annual Plan For: </h6>
+                    <h6 class="dropdown-header">Create/Edit Annual Plan for: </h6>
                     @foreach (Auth::user()->school->programs as $program)
                         <li><a
                                 href="{{ URL::action('AnnualPlansController@showPlan', [$program->id]) }}">{{ $program->name }}</a>
                     Report<span class="caret"></span></a>
                 <ul class="dropdown-menu" role="menu">
 
-                    <h6 class='dropdown-header'>Create/Edit Annual Report For:</h6>
+                    <h6 class='dropdown-header'>Create/Edit Annual Report for:</h6>
                     @foreach (Auth::user()->school->programs as $program)
                         <li><a
                                 href="{{ URL::action('OutcomesController@annualReport', $program->id) }}">{{ $program->name }}</a>

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

             <div class="modal-content">
                 <div class="modal-header">
                     <button type="button" class="close" data-dismiss="modal">&times;</button>
-                    <h5 class="modal-title">Would you like to pair these new Outcomes to all the Criteria associated to
+                    <h5 class="modal-title">Would you like to pair these new Learning Outcomes to all the Criteria associated to
                         this Objective?</h5>
 
                 </div>
                         }).html('<span aria-hidden="true">×</span>');
                         alert.append(button);
                         alert.append(
-                            '<strong>If you wish to edit the disabled Outcomes you need to detach the Objective from every Criteria paired to it and this Objectvie cannot be in any annual plan with that Outcome</strong>'
+                            '<strong>If you wish to edit the disabled Learning Outcomes you need to detach the Objective from every Criteria paired to it and this Objectvie cannot be in any annual plan with that Learning Outcome</strong>'
                         )
 
                         alert.appendTo($('#message_to_disconnect'))