Arregle el bug

app/controllers/AnnualPlansController.php

@@ -337,6 +337,7 @@ class AnnualPlansController extends \BaseController
           ->where('annual_plan_id', $annual_plan->id)
           ->where('typ_semester_course_id', $course->typ_course_id)
           ->get();
+        //Log::info($course->typ_course_id);
         $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')
@@ -715,6 +716,9 @@ class AnnualPlansController extends \BaseController
     $outcome->comments = DB::table('typ_outcome_report_comments')
       ->where('typ_semester_outcome_id', $typ_semester_outcome_id)
       ->get();
+    $outcome->transformative_actions_categories_html = TransformativeAction::getCategoriesHtml($program_id);
+
+
 
 
     foreach ($outcome->objectives as $index => $objective) {
@@ -771,6 +775,60 @@ class AnnualPlansController extends \BaseController
     return;
   }
 
+  public function futureTransformative()
+  {
+    $at_text = Input::get('at_text');
+    $description = Input::get('description');
+    $future_typ_course_id = Input::get('future_typ_course_id');
+    $future_semesters = Input::get('future_semesters');
+    $type_of_ta = Input::get('type_of_TA');
+    $is_custom = Input::get('is_custom');
+    $program_id = Input::get('program_id');
+    //$annual_plan_id = Input::get('annual_plan_id');
+    $objective_id = Input::get('objective_id');
+    $course_code = Input::get('course_code');
+    $course_number = Input::get('course_number');
+
+    $newTransId = DB::table('transformative_actions')
+      ->insertGetId(array(
+        'is_custom' => $is_custom,
+        'at_text' => $at_text,
+        'description' => $description,
+        'type_of_TA' => $type_of_ta,
+        'user_id' => Auth::user()->id,
+        'program_id' => $program_id,
+        'by_professor' => 0,
+        'created_at' => date('Y-m-d H:i:s'),
+        'updated_at' => date('Y-m-d H:i:s')
+      ));
+    DB::table('ta_course')->insert(array(
+      'ta_id' => $newTransId,
+      'course_number' => $course_number,
+      'course_code' => $course_code
+    ));
+    DB::table('transformative_objective')->insert(array(
+      'ta_id' => $newTransId,
+      'objective_id' => $objective_id
+    ));
+    foreach ($future_typ_course_id as $index => $typ_future_course_id) {
+      $annual_plan = DB::table('annual_cycle')
+        ->join('annual_plans', 'annual_plans.annual_cycle_id', '=', 'annual_cycle.id')
+        ->where('program_id', $program_id)
+        ->where(function ($query) use (&$future_semesters, &$index) {
+          $query->where('semester_start', $future_semesters[$index])
+            ->orWhere('semester_end', $future_semesters[$index]);
+        })->first();
+      DB::table('annual_plan_transformative')
+        ->insert(array(
+          'annual_plan_id' => $annual_plan->id,
+          'trans_id' => $newTransId,
+          'typ_semester_course_id' => $typ_future_course_id,
+          'proposing_coordinator_id' => Auth::user()->id,
+          'proposed_date' => date('Y-m-d H:i:s')
+        ));
+    }
+  }
+
   public function fetchTheAnnualPlan()
   {
     $outcome_id = Input::get('id');

app/models/Course.php

@@ -43,13 +43,58 @@ class Course extends Eloquent
       ->select('activities.id')
       ->distinct()
       ->lists('activities.id');
-    Log::info($activitiesAssessed);
+    //Log::info($activitiesAssessed);
 
     return $this->hasMany('Activity')->whereIn('activities.id', $activitiesAssessed)->orderBy('date', 'asc');
 
     //    return $this->hasMany('Activity')->where('activities.draft', 0)->orderBy('date', 'asc');
   }
+  public static function get_associated_objective_outcome($typ_semester_course_id)
+  {
+    return DB::table('typ_semester_outcome')->join('typ_semester_objectives', 'typ_semester_outcome.id', '=', 'typ_semester_objectives.typ_semester_outcome_id')
+      ->join('typ_semester_courses', 'typ_semester_courses.typ_semester_objective_id', '=', 'typ_semester_objectives.id')
+      ->where('typ_semester_courses.id', $typ_semester_course_id);
+  }
 
+  public static function getFutureTypSemesterCourses($typ_semester_course_id, $program_id)
+  {
+    $typ_info = DB::table('typ_semester_outcome')
+      ->join('typ_semester_objectives', 'typ_semester_outcome.id', '=', 'typ_semester_objectives.typ_semester_outcome_id')
+      ->join('typ_semester_courses', 'typ_semester_courses.typ_semester_objective_id', '=', 'typ_semester_objectives.id')
+      ->join('typ_semester_outcome as typ_o_2', 'typ_o_2.outcome_id', '=', 'typ_semester_outcome.outcome_id')
+      ->join('semesters as sem1', 'sem1.id', '=', 'typ_semester_outcome.semester_id')
+      ->join('typ_semester_objectives as typ_ob_2', function ($query) {
+        $query->on('typ_ob_2.typ_semester_outcome_id', '=', 'typ_o_2.id')
+          ->on('typ_semester_objectives.objective_id', '=', 'typ_ob_2.objective_id');
+      })
+      ->join('typ_semester_courses as typ_course_2', function ($join) {
+        $join->on('typ_course_2.typ_semester_objective_id', '=', 'typ_ob_2.id')
+          ->on('typ_semester_courses.course_id', '=', 'typ_course_2.course_id');
+      })
+      ->join('typ_program', 'typ_o_2.typ_program_id', '=', 'typ_program.id')
+      ->join('semesters', 'semesters.id', '=', 'typ_o_2.semester_id')
+
+      ->where('typ_semester_courses.id', $typ_semester_course_id)
+      ->where('typ_program.program_id', $program_id)
+      ->whereRaw('sem1.code < semesters.code')
+      ->groupBy('typ_o_2.semester_id')
+      ->select(
+        'typ_o_2.semester_id',
+        'typ_o_2.outcome_id',
+        'typ_o_2.id',
+        'typ_semester_courses.course_id',
+        'typ_semester_objectives.objective_id',
+        'typ_ob_2.id as typ_future_objective_id',
+        'typ_course_2.id as typ_future_course_id',
+        'semesters.name as semester_name',
+        'semesters.code as semester_code'
+      );
+    //Log::info('El sql');
+    //Log::info($typ_info->toSql());
+    //Log::info($typ_semester_course_id);
+    //Log::info($program_id);
+    return $typ_info->get();
+  }
   public function publishedActivities()
   {
     $activitiesAssessed = DB::table('activities')
@@ -249,7 +294,7 @@ class Course extends Eloquent
 
       //Log::info($criteria_id);
       Log::info('los courseCode');
-      Log::info(array($course_code));
+      // Log::info(array($course_code));
       Log::info('los programas');
       Log::info($program_ids);
 

app/models/Objective.php

@@ -34,7 +34,7 @@ class Objective extends Eloquent
             ->join('courses', 'courses.id', '=', 'typ_semester_courses.course_id')
             ->where('typ_semester_objective_id', $objective->typ_semester_objective_id)
             ->where('courses.program_id', $objective->program_id)
-            ->select('courses.code', 'courses.number', 'typ_semester_courses.id as typ_semester_course_id', DB::raw("'{$objective->semester_id}' as semester_id"), "courses.program_id")
+            ->select('courses.code', 'courses.number', 'courses.id as course_id', 'typ_semester_courses.id as typ_semester_course_id', DB::raw("'{$objective->semester_id}' as semester_id"), "courses.program_id")
             ->get();
         Log::info($course_codes);
 
@@ -46,9 +46,11 @@ class Objective extends Eloquent
                 ->where('typ_semester_course_id', $course_code->typ_semester_course_id)
                 ->select('transformative_actions.*')
                 ->get();
+            $course_code->future_typ_course_id = Course::getFutureTypSemesterCourses($course_code->typ_semester_course_id, $course_code->program_id);
+
 
             $course_code->students = Course::getStudentReportForOutcome($course_code);
-            Log::info(array($course_code));
+            //Log::info(array($course_code));
             $course_code->criteria = Course::getCriteriaPlanReport($course_code);
         }
         return $course_codes;

app/models/TransformativeAction.php

@@ -11,4 +11,36 @@ class TransformativeAction extends Eloquent
             ->where('semester_id', $semester_id)
             ->first();
     }
+
+    public static function getCategoriesHtml($program_id)
+    {
+        $categories = "<option value='0'>Nothing Selected</option>";
+
+        $types = DB::table('transformative_actions')
+            ->select('type_of_TA', 'is_custom')
+            ->where('type_of_TA', '<>', '')
+            ->where(function ($query) use (&$program_id) {
+                $query->whereNull('program_id')
+                    ->orWhere('program_id', $program_id);
+            })
+            ->where('by_professor', 0)
+            ->groupBy('type_of_TA')
+            ->get();
+        $optGroupGeneral = "<optgroup label='General Transformative Actions'>";
+        $optGroupCustom = "<optgroup label ='Program Custom Actions'>";
+        foreach ($types as $type) {
+
+            if ($type->is_custom) {
+                $optGroupCustom .= "<option value = '" . $type->type_of_TA . "' data-is-custom = '1'>" . $type->type_of_TA . "</option>";
+            } else {
+                $optGroupGeneral .= "<option value = '" . $type->type_of_TA . "' data-is-custom = '0'>" . $type->type_of_TA . "</option>";
+            }
+        }
+        $categories .= $optGroupGeneral . '</optgroup>';
+        $categories .= $optGroupCustom . '</optgroup>';
+
+
+        $categories .= '<option value ="new"> New Type of Transformative Action</option>';
+        return $categories;
+    }
 }

app/routes.php

@@ -208,6 +208,8 @@ Route::group(array('before' => 'auth|has_access'), function () {
     Route::post('fetchTransformativeStatus', array('uses' => 'TransformativeActionsController@fetchStatus'));
 
     Route::post('saveTransStatus', array('uses' => 'TransformativeActionsController@saveTransStatus'));
+
+    Route::post('futureTransformativeCourse', 'AnnualPlansController@futureTransformative');
     //other stuff
     Route::post('postActivityCriterionTrans/{activity_id}', array(
         'as' => 'postActivityCriterionTrans/{activity_id}',
@@ -342,6 +344,13 @@ Route::group(array('before' => 'auth|has_access'), function () {
             'before' => 'csrf',
             'uses' => 'CriteriaController@fetch'
         ));
+
+        //Plans routes
+        Route::post('showThreeYearPlans', 'ThreeYearPlanController@adminIndex');
+        Route::post('showAnnualPlans', 'AnnualPlansController@adminIndex');
+
+
+        //endhere
         Route::post('createOutcome', array('before' => 'csrf', 'uses' => 'OutcomesController@create'));
         Route::post('createCriterion', array('before' => 'csrf', 'uses' => 'CriteriaController@create'));
 

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

@@ -53,6 +53,7 @@
 
             @endif
 
+
             <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"
                     aria-expanded="false">Results<span class="caret"></span></a>
@@ -67,6 +68,14 @@
                     @endif
                 </ul>
             </li>
+            <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Program Plans
+                    <span class="caret"></span></a>
+                <ul class="dropdown-menu" role="menu">
+                    <li>{{ HTML::linkAction('AnnualPlansController@adminIndex', 'Annual Plans') }}</li>
+                    <li>{{ HTML::linkAction('ThreeYearPlanController@adminIndex', 'Three Year Plans') }}</li>
+                </ul>
+            </li>
 
             <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Help<span

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

@@ -92,7 +92,7 @@
                 <div class="modal-header">
                     <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
                             aria-hidden="true">&times;</span></button>
-                    <h3 class="modal-title"></h3>
+                    <h3 id ='transformative_modal_title' class="modal-title"></h3>
                 </div>
                 <div class="modal-body">
                    <h5 id="was_it_implemented"> </h5>
@@ -124,6 +124,28 @@
             </div><!-- /.modal-content -->
         </div><!-- /.modal-dialog -->
     </div><!-- /.modal -->
+
+    <div class="modal fade" id="modal-future-trans-course">
+        <div class="modal-dialog modal-lg">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
+                            aria-hidden="true">&times;</span></button>
+                    <h3 class="modal-title"></h3>
+                </div>
+                <div class="modal-body">
+                
+            
+   
+              
+            </div>
+            <div class='modal-footer'>
+                <button type="button" class="btn btn-secondary" data-dismiss="modal" >Cancel</button>
+                <button type="button" class="btn btn-primary" id ="save_transformative_info" onclick ='saveTransReport()'>Save</button>
+            </div>
+            </div><!-- /.modal-content -->
+        </div><!-- /.modal-dialog -->
+    </div><!-- /.modal -->
     <script>
         function nextChar(c) {
             return String.fromCharCode(c.charCodeAt(0) + 1);
@@ -370,6 +392,288 @@
             }
         }
 
+        function draw_transformative_future_course(course_code){
+
+            /* This is the modal
+            <div class="modal fade" id="modal-future-trans-course">
+        <div class="modal-dialog modal-lg">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
+                            aria-hidden="true">&times;</span></button>
+                    <h3 class="modal-title"></h3>
+                </div>
+                <div class="modal-body">
+                
+            
+   
+              
+            </div>
+            <div class='modal-footer'>
+                <button type="button" class="btn btn-secondary" data-dismiss="modal" >Cancel</button>
+                <button type="button" class="btn btn-primary" id ="save_transformative_info" onclick ='saveTransReport()'>Save</button>
+            </div>
+            </div><!-- /.modal-content -->
+        </div><!-- /.modal-dialog -->
+    </div><!-- /.modal --> */
+
+            return_complete_div = $('<div>');
+
+            typ_semester_course_id = course_code.typ_semester_course_id;
+            modalComplete = $('<div>',{
+                'class':'modal fade',
+                'id':'modal_for_future_trans_on_'+typ_semester_course_id
+            });
+            modalDialog = $('<div>',{
+                'class':'modal-dialog modal-lg'
+            });
+            modalComplete.append(modalDialog);
+            
+            modalContent = $('<div>',{
+                'class':'modal-content'
+            });
+
+            modalDialog.append(modalContent);
+
+            modalHeader = $('<div>', {
+                'class':'modal-header'
+            }).html('<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>'+
+            '<h3 class="modal-title">Future Transformative Actions for '+course_code.code+' '+course_code.number+'</h3>');
+
+
+            
+            modalContent.append(modalHeader);
+
+
+            modalBody = $('<div>', {
+                'class':'modal-body'
+            });
+            modalContent.append(modalBody);
+
+            div_for_name = $('<div>', {
+                'class': 'form-group',
+
+            });
+
+
+
+            input_name = $('<input>', {
+                'class': 'form-control',
+
+                'name': 'at_text',
+                'id': 'at_text_for_'+typ_semester_course_id
+            });
+
+            div_for_name.html("<label> Name</label>");
+            div_for_name.append(input_name);
+            modalBody.append(div_for_name);
+
+            div_for_category = $('<div>', {
+                'class': 'form-group'
+            }).html('<label>Type of Transformative Action</label>');
+
+            select_for_category = $('<select>', {
+                'name': 'type_of_ta',
+                'id': 'type_of_ta_of_'+typ_semester_course_id,
+                'class': 'form-control selectpicker',
+                'onchange': 'checkIfNew(this)'
+            }).html(GlobalTransCategories);
+
+            div_for_category.append(select_for_category);
+            modalBody.append(select_for_category);
+            
+
+            div_description = $('<div>', {
+                'class': 'form-group',
+
+            }).html('<label> Description</label>');
+
+            textarea = $('<textarea>', {
+                'class': 'form-control',
+                'id': 'description_for_'+typ_semester_course_id,
+                'name': 'description',
+                'rows': '10'
+            });
+
+            div_description.append(textarea);
+            modalBody.append(div_description);
+            modalBody.append('<hr><label>Select when will this transformative action will be implemeneted</label>');
+
+           
+            
+            selectpicker_for_semesters = $('<select>',{
+                'name':'selected_semesters_for_'+typ_semester_course_id+'_[]',
+                'id':'selected_semester_first_for_'+typ_semester_course_id,
+                'class':'form-control selectpicker'
+            });
+            options_for_semesters='<option value = "0">Nothing Selected</option>';
+            $.each(course_code.future_typ_course_id, function(index, typ_future){
+                options_for_semesters +='<option value="'+typ_future.typ_future_course_id+'" data-semester-id ="'+typ_future.semester_id+'" data-objective-id = "'+typ_future.objective_id+'" >'+typ_future.semester_name+' ['+typ_future.semester_code+'] '+'</option>';
+            });
+            selectpicker_for_semesters.html(options_for_semesters);
+
+            modalBody.append(selectpicker_for_semesters);
+            modalBody.append('<br><br>');
+
+            button_for_more = $('<button>', {
+                'class':'btn btn-secondary', 
+                'onclick':'addMoreSemesters('+typ_semester_course_id+', this)',
+                'style':'float:right'
+            }).html('<span class="glyphicon glyphicon-plus">'+
+            '</span>Add another semester');
+
+            modalBody.append(button_for_more);
+            modalBody.append('<br><br>');
+
+            
+
+
+
+            
+            modalFooter = $('<div>',{
+                'class':'modal-footer'
+            });
+            modalContent.append(modalFooter);
+        
+            close_button = $('<button>',{
+                'type':'button',
+                'class':'btn btn-secondary',
+                'data-dismiss':'modal'
+            }).html('Cancel');
+            save_button = $('<button>',{
+                'class':'btn btn-primary',
+                'onclick':'saveFutureTrans('+typ_semester_course_id+', "'+course_code.code+'", "'+course_code.number+'")'
+            }).html('Save');
+
+            modalFooter.append(close_button);
+            modalFooter.append(save_button);
+
+
+            return_complete_div.append(modalComplete);
+
+            return_complete_div.append('<h3>Future Transformative Actions for '+course_code.code+' '+course_code.number);
+            
+
+            return_complete_div.append('<hr><button type="button" class="btn btn-primary btn-block" data-toggle="modal" data-target="#modal_for_future_trans_on_'+typ_semester_course_id+'">' +
+                            'Add Transformative Actions' +
+                            '</button><hr>')
+
+            return return_complete_div;
+
+
+
+
+
+        }
+
+        function saveFutureTrans(typ_semester_course_id, course_code, course_number){
+            annual_plan_id = $('#annual_plan').val()
+            at_text = $('#at_text_for_'+typ_semester_course_id).val();
+            type_of_TA = $('#type_of_ta_of_'+typ_semester_course_id).val();
+            is_custom = $('#type_of_ta_of_'+typ_semester_course_id).find('option:selected').data('is-custom');
+            if(type_of_TA == "new"){
+                type_of_TA = $('#new_type_type_of_ta_of_'+typ_semester_course_id).val();
+                is_custom = 1;
+            }
+            description = $('#description_for_'+typ_semester_course_id).val();
+            future_typ_course_id =[];
+            future_semesters = [];
+            objective_id =0
+
+            $.each($('select[name="selected_semesters_for_'+typ_semester_course_id+'_[]"]'), function(index, select){
+                objective_id = $(select).find('option:selected').data('objective-id');
+                future_semesters.push($(select).find('option:selected').data('semester-id'));
+                future_typ_course_id.push($(select).val());
+            });
+            $.post(
+                "{{URL::action('AnnualPlansController@futureTransformative')}}",
+                {
+                    at_text:at_text,
+                    type_of_TA:type_of_TA,
+                    description:description,
+                    future_semesters:future_semesters,
+                    future_typ_course_id:future_typ_course_id,
+                    is_custom:is_custom,
+                    program_id:{{$program->id}},
+                    annual_plan_id:annual_plan_id,
+                    course_code:course_code,
+                    course_number:course_number,
+                    objective_id:objective_id
+                },
+                function(data){
+                    alert('estamos');
+                }
+            )
+
+        }
+
+        function addMoreSemesters(typ_semester_course_id, button_add_new_semester){
+            first_select_options = $('#selected_semester_first_for_'+typ_semester_course_id).html();
+            /*<div class="input-group">
+  <select class="form-control">
+    <option>Select option..</option>
+    <option>Option 1</option>
+    <option>Option 2</option>
+  </select>            
+  <span class="input-group-btn">
+    <button class="btn btn-default" type="button" tabindex="-1"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span></button>
+  </span>
+</div> */
+            input_group = $('<div>', {
+                'class':'input-group'
+            });
+            newselect = $('<select>',{
+                'name':'selected_semesters_for_'+typ_semester_course_id+'_[]',
+                //'id':'selected_semester_first_for_'+typ_semester_course_id,
+                'class':'form-control selectpicker'
+            }).html(first_select_options);
+
+            span_group = $("<span>",{
+                'class':'input-group-btn',
+
+            });
+            button_for_close = $('<button>',{
+                'class':'btn btn-primary',
+                'type':'button',
+                'onclick': '$(this).parent().parent().remove()'
+
+            }).html('<span class="glyphicon glyphicon-remove" aria-hidden="true"></span></button>');
+            span_group.append(button_for_close);
+            input_group.append(newselect);
+            input_group.append(span_group);
+            input_group.insertBefore($(button_add_new_semester));
+            //input_group.prepend('<hr>');
+            $('.selectpicker').selectpicker('refresh');
+
+        }
+
+        function checkIfNew(select) {
+            id =$(select).attr('id');
+if ($(select).val() == "new") {
+    var new_div = $('<div/>', {
+        'class': 'form-group new_type'
+    }).html("<label>New Type </label>");
+
+    var input = $("<input/>", {
+        'type': 'text',
+        'id': 'new_type_'+id,
+        'name': "new_type",
+        'class': 'form-control'
+    });
+    new_div.append(input);
+
+    $(select).parent().after(new_div)
+
+} else {
+    $(select).parent().next('.new_type').remove();
+}
+
+
+}
+
+
+        GlobalTransCategories= '';
+
         function fetchEverything(li) {
             var outcome_id = $(li).data('outcome-id');
             var name = $(li).data('outcome-name');
@@ -398,6 +702,7 @@
                         } else {
                             outcome.outcome_program_goal = 'It has not been defined';
                         }
+                        GlobalTransCategories = outcome.transformative_actions_categories_html;
                         var outcomeHTML = "<h4>Performance of Students by Learning Outcome</h4>" +
                             '<h5 style = "display: inline; margin:30px;">Target learning by learning outcome: </h5>' +
                             '<p  style = "display: inline;"> <i>>= ' + outcome.expected_outcome +
@@ -538,8 +843,14 @@
                                             table_for_transformative_actions.append(tbody_for_transformative_actions);
                                             div.append('<hr><h4>Transformative actions for '+course_code.code+' '+course_code.number+'</h4>')
                                             div.append(table_for_transformative_actions);
+                                            div.append('<hr>');
+
+                                         
                                             //table_for_transformative_actions.DataTable();
                                         }
+                                        the_drawn_transformative_future_html = draw_transformative_future_course(course_code, outcome.transformative_actions_categories_html);
+                                            div.append(the_drawn_transformative_future_html);
+                                            $('.selectpicker').selectpicker('refresh');
 
                                         
                                         table.DataTable();
@@ -670,7 +981,7 @@
                 success: function(transformative_action_with_status) {
                     transformative_action = transformative_action_with_status[0];
 
-                    $('.modal-title').html('<strong>'+transformative_action.at_text+'</strong>: '+transformative_action.description);
+                    $('#transformative_modal_title').html('<strong>'+transformative_action.at_text+'</strong>: '+transformative_action.description);
                     
                    
                     $('input[name="implemented"]').prop('checked',false);