un push ultimo

app/controllers/AnnualPlansController.php

@@ -45,7 +45,7 @@ class AnnualPlansController extends \BaseController
     $program = Program::find($program_id);
     $title = "Annual Plans for " . $program->name;
 
-    $annual_plans = DB::select("select semester_start, semester_end, program_id, annual_plans.id, academic_year from annual_plans, annual_cycle   where annual_plans.annual_cycle_id = annual_cycle.id and program_id ={$program_id} order by id desc");
+    $annual_plans = DB::select("select semester_start, semester_end, program_id, annual_plans.id, academic_year from annual_plans, annual_cycle   where annual_plans.annual_cycle_id = annual_cycle.id and program_id ={$program_id} order by semester_start desc");
 
 
     return View::make('local.managers.shared.view-annual-plans', compact('title', 'program_id', 'annual_plans'));
@@ -156,7 +156,7 @@ class AnnualPlansController extends \BaseController
     $annual_plans = DB::table('annual_cycle')
       ->join('annual_plans', 'annual_cycle_id', '=', 'annual_cycle.id')
       ->where('program_id', $program_id)
-      ->orderBy('semester_start')
+      ->orderBy('semester_start', 'desc')
       ->get();
     /*$annual_plans = DB::select("
     
@@ -196,6 +196,7 @@ class AnnualPlansController extends \BaseController
     }*/
     //$alltyp = DB::select('select * from three_year_plan order by id desc');
     //$current_typ = $current_typ->id;
+
     return View::make('local.managers.shared.annual-plans', compact('title', 'annual_plans', 'current_typ', 'program', 'outcomes', 'allSemesterOrder', 'alltyp'));
   }
 
@@ -214,7 +215,10 @@ class AnnualPlansController extends \BaseController
 
 
       ->where('program_id', $an_plan->program_id)
-      ->where('semester_id', $an_plan->semester_start)
+      ->where(function ($query) use (&$an_plan) {
+        $query->where('semester_id', $an_plan->semester_start)
+          ->orWhere('semester_id', $an_plan->semester_end);
+      })
       ->select('typ_program.*')
       ->first();
     Log::info(array($an_plan));
@@ -225,9 +229,27 @@ class AnnualPlansController extends \BaseController
 
     $json_to_send = [];
     $json_to_send["annual_plans"] = $an_plan;
-    $json_to_send["outcomes"]["first"] = DB::select("select * from outcomes where id in (select outcome_id from typ_semester_outcome where semester_id = {$an_plan->semester_start} and typ_program_id = {$current_typ_program->id})");
+
+    $json_to_send["outcomes"]["first"] = DB::table('outcomes')
+      ->join('typ_semester_outcome', 'typ_semester_outcome.outcome_id', '=', 'outcomes.id')
+      ->where('semester_id', $an_plan->semester_start)
+      ->where('typ_program_id', $current_typ_program->id)
+      ->select('outcomes.*', 'typ_semester_outcome.id as typ_semester_outcome_id')
+      ->get();
+
+    //DB::select("select * from outcomes where id in (select outcome_id from typ_semester_outcome where semester_id = {$an_plan->semester_start} and typ_program_id = {$current_typ_program->id})");
     $json_to_send["allSemesterOrder"]["first"] = DB::select("select * from semesters where id = {$an_plan->semester_start}")[0];
-    $json_to_send["outcomes"]["second"] = DB::select("select * from outcomes where id in (select outcome_id from typ_semester_outcome where semester_id ={$an_plan->semester_end} and typ_program_id  = {$current_typ_program->id})");
+    $json_to_send["outcomes"]["second"] = DB::table('outcomes')
+      ->join('typ_semester_outcome', 'typ_semester_outcome.outcome_id', '=', 'outcomes.id')
+      ->where('semester_id', $an_plan->semester_end)
+      ->where('typ_program_id', $current_typ_program->id)
+      ->select('outcomes.*', 'typ_semester_outcome.id as typ_semester_outcome_id')
+      ->get();
+
+    //DB::select("select * from outcomes where id in (select outcome_id from typ_semester_outcome where semester_id ={$an_plan->semester_end} and typ_program_id  = {$current_typ_program->id})");
+
+
+
     $json_to_send["allSemesterOrder"]["second"] = DB::select("select * from semesters where id = {$an_plan->semester_end}")[0];
     return json_encode($json_to_send);
   }
@@ -244,7 +266,7 @@ class AnnualPlansController extends \BaseController
     $typ_info = array();
     $semester = DB::select("select * from semesters where id=?", array(Input::get('semester')))[0];
 
-
+    $typ_semester_outcome_id = Input::get('typ_semester_outcome_id');
     //$typ_info['courses'] = DB::select("select * from courses where id in (select course_id from typ_semester_courses where typ_semester_outcome_id in (select id from typ_semester_outcome where semester_id ={$semester->id} and typ_program_id in (select id from typ_program where program_id ={$program_id} )and outcome_id = ?))", array(Input::get('id')));
     //foreach ($typ_info['courses'] as $course) {
     //  $typ_info['courses_objective'][$course->id] = DB::select("select * from objectives where id in (select objective_id from typ_semester_objectives where typ_semester_course_id in (select id from typ_semester_courses where typ_semester_outcome_id in (select id from typ_semester_outcome where semester_id = {$semester->id} and typ_program_id in (select id from typ_program where program_id ={$program_id}))and course_id ={$course->id}))");
@@ -321,6 +343,21 @@ class AnnualPlansController extends \BaseController
     $typ_info['annual_plan'] = $annual_plan;
     Log::info($typ_info);
 
+    $typ_info['transformative_actions_for_outcome'] = DB::table('transformative_actions')
+      ->join('transformative_typ_outcome', 'transformative_typ_outcome.trans_id', '=', 'transformative_actions.id')
+      ->where('transformative_typ_outcome.typ_semester_outcome_id', $typ_semester_outcome_id)
+      ->get();
+    $typ_info['categories'] = "<option value='0'>Nothing Selected</option>";
+
+    $types = DB::table('transformative_actions')
+      ->select('type_of_TA')
+      ->where('type_of_TA', '<>', '')
+      ->distinct()
+      ->get();
+    foreach ($types as $type) {
+      $typ_info['categories'] .= "<option value = '" . $type->type_of_TA . "'>" . $type->type_of_TA . "</option>";
+    }
+    $typ_info['categories'] .= '<option value ="new"> New Type of Transformative Action</option>';
     return json_encode($typ_info);
   }
   public function deleteTA()
@@ -639,7 +676,7 @@ class AnnualPlansController extends \BaseController
     $outcome->outcome_program_goal = DB::table('target_outcomes_program')
       ->where('program_id', $program_id)
       ->where('semester_id', $semester_id)
-      ->first()->expected_target;
+      ->first();
 
     foreach ($outcome->objectives as $index => $objective) {
       $objective->courses = Objective::getPlanReport($objective);

app/controllers/OutcomesController.php

@@ -1056,7 +1056,7 @@ class OutcomesController extends \BaseController
         $title = "Program Annual Report";
 
 
-        $annual_plans = $annual_plans = DB::select("
+        $annual_plans = DB::select("
     
         select 
           academic_year, 
@@ -1068,18 +1068,8 @@ class OutcomesController extends \BaseController
         from annual_plans 
         join annual_cycle on annual_cycle_id = annual_cycle.id 
         where program_id = {$program_id} 
-        and(
-          semester_start in(
-            select semester_id 
-            from typ_semester_outcome 
-            join typ_program on typ_semester_outcome.typ_program_id = typ_program.id 
-            where program_id = {$program_id} )
-          or semester_end in(
-            select semester_id 
-            from typ_semester_outcome 
-            join typ_program on typ_semester_outcome.typ_program_id = typ_program.id 
-            where program_id = {$program_id} )
-          )
+        and
+        annual_plans.is_submitted =1
           order by semester_start desc");
         $program = DB::table('programs')
             ->where('id', $program_id)

app/models/Course.php

@@ -181,9 +181,11 @@ class Course extends Eloquent
   public static function getStudentReportForOutcome($course_code = null)
   {
     if ($course_code) {
+      Log::info('entré');
       $criteria_id = DB::table('annual_plan_objective')
         ->where('typ_semester_course_id', $course_code->typ_semester_course_id)
         ->lists('criteria_id');
+      Log::info($criteria_id);
       $program = Program::where('id', $course_code->program_id)->first();
       // // Log::info($program->code);
       if ($program->code == "") {
@@ -232,10 +234,12 @@ class Course extends Eloquent
 
 
       //Log::info($criteria_id);
+      Log::info('los courseCode');
+      Log::info(array($course_code));
+      Log::info('los programas');
+      Log::info($program_ids);
 
-      //Log::info($program_ids);
-
-      //Log::info($table_per_student->toSql());
+      Log::info($table_per_student->toSql());
       $students = $table_per_student->get();
 
 
@@ -423,4 +427,4 @@ class Course extends Eloquent
       $query->where('outcomes_attempted', 'not like', '\'%"' . $outcome_id . '":0%\'');
     }))->where('code', $this->code)->where('number', $this->number)->get();
   }
-}
+}

app/models/Objective.php

@@ -71,4 +71,4 @@ class Objective extends Eloquent
     {
         return $this->hasMany('Objective_Outcome', 'objective_id');
     }
-}
+}

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

@@ -69,7 +69,7 @@
 
             </li>
             <li><a href="{{ URL::action('OutcomesController@annualReport', Auth::user()->programs[0]->id) }}">Annual
-                    Results</a></li>
+                    Report</a></li>
 
             <li>{{ HTML::linkAction('TransformativeActionsController@viewFormativeActions', 'Formative Actions') }}
 

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

@@ -52,7 +52,7 @@
                         </li>
 
                     @endif
-                    <li>{{ HTML::linkAction('AnnualPlansController@selectProgramPlan', 'Annual Results') }}</li>
+                    <li>{{ HTML::linkAction('AnnualPlansController@selectProgramPlan', 'Annual Reports') }}</li>
                     <li>{{ HTML::linkAction('TransformativeActionsController@viewFormativeActions', 'Formative Actions') }}
 
                 </ul>

app/views/local/managers/shared/annual-plans.blade.php

@@ -65,7 +65,7 @@
                                 <tr>
                                     <th>Objectives for courses</th>
                                     <th>Criteria per Course</th>
-                                    <th>Transformative Actions</th>
+                                    <th>Transformative Actions to be Implemented</th>
                                 </tr>
                             </thead>
                             <tbody>
@@ -74,6 +74,18 @@
                         </table>
 
                     </div>
+                    <hr>
+                    <div id='transformative_actions_to_outcome'>
+                        
+                    </div>
+                    <hr>
+                    <button class='btn btn-md btn-secondary button-add-objective'
+                                onclick='addTransToPlan()'>
+                                <span class='glyphicon glyphicon-plus'>
+
+                                </span>
+                                Add another Transformative Action
+                            </button>
 
                 </div>
             </div>
@@ -208,6 +220,7 @@
             var name = $(li).data('outcome-name');
             var semester = $(li).data('semester-id');
             var annual_plan = $(li).data('annual-plan');
+            var typ_semester_outcome_id = $(li).data('typ-semester-outcome-id');
             $('#expected-outcome').data('semester-id', semester);
 
 
@@ -216,7 +229,8 @@
             $.post(
                 "../annual-plan-fetchTYP/{{ $program->id }}", {
                     id: id,
-                    semester: semester
+                    semester: semester, 
+                    typ_semester_outcome_id: typ_semester_outcome_id,
                 },
 
                 function(json) {
@@ -505,12 +519,67 @@
                         }
                         table.draw();
 
+                        
+                        //transformative actions in outcome
+                        
+                      
+                        
+
 
                     } else {
                         $('table').hide();
                     }
+                    //transformative actions in outcome
+                    if(!json.transformative_actions_for_outcome.length){
+                        div_for_name = $('<div>',{
+                            'class':'form-group',
+
+                        });
+                        input_name = $('<input>', {
+                            'class':'form-control',
+                            
+                            'name':'at_text[]'
+                        });
+                        div_for_name.html("<label> Name</label>");
+                        div_for_name.append(input_name);
+                        $('#transformative_actions_to_outcome').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[]',
+                            'class':'form-control selectpicker',
+                            'onchange':'checkIfNew(this)'
+                        }).html(json.categories);
+GlobalTransCategories = json.categories;
+                        div_for_category.append(select_for_category);
+                        $('#transformative_actions_to_outcome').append(div_for_category);
+                        select_for_category.selectpicker('refresh');
+                        
 
 
+                        div_description = $('<div>',{
+                            'class':'form-group',
+
+                        }).html('<label> Description</label>');
+
+                        textarea = $('<textarea>', {
+                            'class':'form-control',
+                            'name':'description[]',
+                            'rows':'10'
+                        });
+
+                        div_description.append(textarea);
+
+                        $('#transformative_actions_to_outcome').append(div_description);
+
+
+                        
+                          
+                    }
+
 
 
 
@@ -524,6 +593,82 @@
 
         }
 
+        GlobalTransCategories = '';
+
+function addTransToPlan(){
+                        div_for_name = $('<div>',{
+                            'class':'form-group',
+
+                        });
+                        input_name = $('<input>', {
+                            'class':'form-control',
+                            
+                            'name':'at_text[]'
+                        });
+                        div_for_name.html("<label> Name</label>");
+                        div_for_name.append(input_name);
+                        $('#transformative_actions_to_outcome').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[]',
+                            'class':'form-control selectpicker',
+                            'onchange':'checkIfNew(this)'
+                        }).html(GlobalTransCategories);
+
+                        div_for_category.append(select_for_category);
+                        $('#transformative_actions_to_outcome').append(div_for_category);
+                        select_for_category.selectpicker('refresh');
+                        
+
+
+                        div_description = $('<div>',{
+                            'class':'form-group',
+
+                        }).html('<label> Description</label>');
+
+                        textarea = $('<textarea>', {
+                            'class':'form-control',
+                            'name':'description[]',
+                            'rows':'10'
+                        });
+
+                        div_description.append(textarea);
+
+                        $('#transformative_actions_to_outcome').append(div_description);
+
+
+                        
+                          
+                    }
+
+     function checkIfNew(select){
+  
+  if($(select).val()=="new"){
+    var new_div = $('<div/>',{
+      'class':'form-group new_type'
+    }).html("<label>New Type </label>");
+
+    var input = $("<input/>", {
+      'type': 'text',
+      'name':"new_type",
+      'class':'form-control'
+    });
+    new_div.append(input);
+
+    $(select).parent().parent().after(new_div)
+    
+  }
+  else{
+    $(select).parent().parent().next('.new_type').remove();
+  }
+  
+  
+}
+
         function posttoTransAnnual(annual_id, selectTransId, typ_course_id) {
             ta = $("#" + selectTransId).val();
             old_ta = $("#" + selectTransId).data('old-TA');
@@ -697,6 +842,7 @@
                         'class': 'list-group',
                         'id': 'list'
                     });
+                    if(json.outcomes.first){
                     header5 = $('<h5/>', {
                         'style': "padding-left: 10px"
                     }).html("First Semester");
@@ -705,13 +851,15 @@
                     for (outcome in json.outcomes.first) {
                         list +=
                             "<li style='padding-left: 25px' onclick = 'fetchEverything(this)' data-annual-plan = '" +
-                            json.annual_plans.id + "' data-semester-id = '" + json.allSemesterOrder.first.id +
+                            json.annual_plans.id + "' data-typ-semester-outcome-id ='"+json.outcomes.first[outcome].typ_semester_outcome_id+"' data-semester-id = '" + json.allSemesterOrder.first.id +
                             "' data-outcome-id='" + json.outcomes.first[outcome].id + "' data-outcome-name ='" + json
                             .outcomes.first[outcome].name + "' class='list-group-item' >" + json.outcomes.first[outcome]
                             .name + " </li>";
 
                     }
                     div.append(list);
+                    }
+                    if(json.outcomes.second){
                     header4 = $('<h5/>', {
                         'style': "padding-left: 10px"
                     }).html("Second Semester");
@@ -720,13 +868,14 @@
                     for (outcome in json.outcomes.second) {
                         list +=
                             "<li style='padding-left: 25px' onclick = 'fetchEverything(this)' data-annual-plan = '" +
-                            json.annual_plans.id + "' data-semester-id = '" + json.allSemesterOrder.second.id +
+                            json.annual_plans.id + "' data-typ-semester-outcome-id ='"+json.outcomes.second[outcome].typ_semester_outcome_id+"'data-semester-id = '" + json.allSemesterOrder.second.id +
                             "' data-outcome-id='" + json.outcomes.second[outcome].id + "' data-outcome-name ='" + json
                             .outcomes.second[outcome].name + "' class='list-group-item' >" + json.outcomes.second[
                                 outcome].name + " </li>";
 
                     }
                     div.append(list);
+                    }
                     html = div[0].innerHTML;
 
                     $("#allOutcomes").html(div[0].innerHTML);

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

@@ -113,13 +113,15 @@
             var name = $(li).data('outcome-name');
             var semester_id = $(li).data('semester-id');
             var annual_plan_id = $(li).data('annual-plan');
+            var typ_semester_outcome_id = $(li).data('typ-semester-outcome-id');
             $('#theChange').data('annual-plan', annual_plan);
             $.post(
                 "{{ URL::action('AnnualPlansController@fetchReportWithOutcome') }}", {
                     semester_id: semester_id,
                     outcome_id: outcome_id,
                     program_id: {{ $program->id }},
-                    annual_plan_id: annual_plan_id
+                    annual_plan_id: annual_plan_id,
+                    typ_semester_outcome_id: typ_semester_outcome_id
                 },
                 function(outcome) {
                     if (outcome.objectives) {
@@ -129,6 +131,12 @@
                         $('#allLists').empty();
                         $('#levelTabs').empty();
                         $('.no-outcome').hide();
+                        if(outcome.outcome_program_goal){
+                            outcome.outcome_program_goal = outcome.outcome_program_goal.expected_target;
+                        }
+                        else{
+                            outcome.outcome_program_goal ='It has not been defined';
+                        }
                         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 +
@@ -302,7 +310,7 @@
 
                         if (students_attempted) {
                             studentPercentage = ((students_achieved / students_attempted) * 100).toFixed(2);
-                            if (studentPercentage >= outcome.outcome_program_goal) {
+                            if (parseFloat(studentPercentage) >= parseFloat(outcome.outcome_program_goal)) {
                                 FinalReport = "<br><p><strong>The students achieved the Learning Outcome with " +
                                     studentPercentage + "% of students achieving.</strong></p>";
                             } else {
@@ -518,6 +526,7 @@
                         'class': 'list-group',
                         'id': 'list'
                     });
+                    if(json.outcomes.first){
                     header5 = $('<h5/>', {
                         'style': "padding-left: 10px"
                     }).html("First Semester");
@@ -526,13 +535,15 @@
                     for (outcome in json.outcomes.first) {
                         list +=
                             "<li style='padding-left: 25px' onclick = 'fetchEverything(this)' data-annual-plan = '" +
-                            json.annual_plans.id + "' data-semester-id = '" + json.allSemesterOrder.first.id +
+                            json.annual_plans.id + "' data-typ-semester-outcome-id ='"+json.outcomes.first[outcome].typ_semester_outcome_id+"' data-semester-id = '" + json.allSemesterOrder.first.id +
                             "' data-outcome-id='" + json.outcomes.first[outcome].id + "' data-outcome-name ='" + json
                             .outcomes.first[outcome].name + "' class='list-group-item' >" + json.outcomes.first[outcome]
                             .name + " </li>";
 
                     }
                     div.append(list);
+                    }
+                    if(json.outcomes.second){
                     header4 = $('<h5/>', {
                         'style': "padding-left: 10px"
                     }).html("Second Semester");
@@ -541,13 +552,13 @@
                     for (outcome in json.outcomes.second) {
                         list +=
                             "<li style='padding-left: 25px' onclick = 'fetchEverything(this)' data-annual-plan = '" +
-                            json.annual_plans.id + "' data-semester-id = '" + json.allSemesterOrder.second.id +
+                            json.annual_plans.id + "' data-typ-semester-outcome-id ='"+json.outcomes.first[outcome].typ_semester_outcome_id+"'data-semester-id = '" + json.allSemesterOrder.second.id +
                             "' data-outcome-id='" + json.outcomes.second[outcome].id + "' data-outcome-name ='" + json
                             .outcomes.second[outcome].name + "' class='list-group-item' >" + json.outcomes.second[
                                 outcome].name + " </li>";
 
                     }
-                    div.append(list);
+                    div.append(list);}
                     html = div[0].innerHTML;
 
                     $("#allOutcomes").html(div[0].innerHTML);