Merge branch 'Merge_gabriel_mayo' of https://git.ccom.uprrp.edu/CDCC/OLAS into Merge_gabriel_mayo

app/controllers/AnnualPlansController.php

@@ -250,6 +250,7 @@ class AnnualPlansController extends \BaseController
     //  $typ_info['criteria'][$objective->id] = DB::select("select * from criteria where id in (select criterion_id from criterion_objective_outcome where outcome_id = ? and objective_id = {$objective->id})", array(Input::get('id')));
     //}
     $annual_plan = DB::select("select annual_plans.id from annual_plans, annual_cycle where annual_plans.annual_cycle_id = annual_cycle.id and (semester_start = {$semester->id} or semester_end ={$semester->id}) and program_id ={$program_id}")[0];
+    $typ_info['expected_target'] = DB::select("select * from target_outcomes_program where program_id = {$program_id} and semester_id = {$semester->id}");
     $typ_info['objectives'] = DB::select("select * from objectives where id in (select objective_id from typ_semester_objectives where typ_semester_outcome_id in(select id from typ_semester_outcome where outcome_id = ? and semester_id = {$semester->id} and typ_program_id in (select id from typ_program where program_id ={$program_id})))", array(Input::get('id')));
     $typ_info['transformative_actions'] = DB::select("select * from transformative_actions where by_professor =0 and is_custom=0");
     foreach ($typ_info['objectives'] as $objective) {
@@ -328,6 +329,27 @@ class AnnualPlansController extends \BaseController
       }
     }
   }
+
+  public function CreateOrEdit($program_id){
+
+    $semester_id = Input::get('semester_id');
+    $expected_target = Input::get('expected_target');
+    
+    $exist = DB::select("select * from target_outcomes_program where program_id = {$program_id} and semester_id = {$semester_id}");
+    
+    
+    if($exist){
+      //update
+      DB::update("update target_outcomes_program set expected_target = {$expected_target}, updated_at = now() where program_id = {$program_id} and semester_id = {$semester_id}");
+    }
+
+
+    else{
+      //create a new one
+      DB::insert("insert into target_outcomes_program (program_id, semester_id, expected_target, created_at, updated_at) values({$program_id}, {$semester_id}, '{$expected_target}', '{now()}', '{now()}')");
+    }
+    return;
+  }
   public function transformativeReport()
   {
     $json_to_send = array();

app/routes.php

@@ -488,6 +488,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
 
         Route::get('annual-plan-program/{program_id}/{typ_id?}', 'AnnualPlansController@showPlan');
         Route::post('annual-plan-fetchTYP/{program_id}', 'AnnualPlansController@fetchTYP');
+        Route::post('annual-plan-CreateOrEdit/{program_id}', 'AnnualPlansController@CreateOrEdit');
         Route::post('annual-plan-postOnChange', 'AnnualPlansController@postAnnualPlan');
         Route::post('annual-plan-deleteCriteria', 'AnnualPlansController@deleteCriteria');
 

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

@@ -41,9 +41,17 @@
     
 
     <div class="col-md-9">
+      <div id="expected-outcome" class="panel panel-default" data-semester-id ="">
+        <div class="panel-heading">
+          <h3 class="panel-title">
+            Expected Target Outcomes
+          </h3>
+          <input style="width: 150px;" min="0" class="form-control" type="number" >
+        </div>
+      </div>
       <div id="outcome-display" class="panel panel-default">
         <div class="panel-heading">
-          <h4 class=" panel-title" style="cursor:auto!important;">
+          <h4 class=" panel-title" >
             Primer Semestre 2019-2020
           </h4>
         </div>
@@ -84,6 +92,8 @@ $(document).ready(function()
   // --------------------------------------------------------------------------
 
   // Hide accordion panel contents by default
+  // $('.panel-group .panel-body').hide();
+
   $('.panel-group .panel-body').hide();
 
   $('#outcome-display').parent().hide();
@@ -97,23 +107,50 @@ $(document).ready(function()
   // --------------------------------------------------------------------------
 
    // When list item is clicked, load corresponding info
+   $('#expected-outcome .form-control').on('change', function(){
+          
+           program_id = {{$program->id}};
+
+           semester_id = $('#expected-outcome').data('semester-id');
+            $.post(
+            "../annual-plan-CreateOrEdit/{{$program->id}}",
+            { 
+              program_id: program_id,
+              semester_id: semester_id,
+              expected_target: $('#expected-outcome .form-control').val(),
+            },
+
+            ) 
+      
+           });
 
 });
-   function fetchEverything(li)
+  //   function CreateOrEdit(id){
+  //   //send data to the database
+  //   console.log(id);
+  //   annual_id = $("#"+id);
+  //   console.log(console.log(annual_id));
+  // }
+
+     function fetchEverything(li)
   {
     var id = $(li).data('outcome-id');
     var name = $(li).data('outcome-name');
     var semester = $(li).data('semester-id');
     var annual_plan = $(li).data('annual-plan');
+    $('#expected-outcome').data('semester-id', semester);
+
+    
+    
     $('#theChange').data('annual-plan', annual_plan);
     $.post(
     "../annual-plan-fetchTYP/{{$program->id}}",
     { id: id,
     semester: semester
   },
+
     function(json)
     {
-        // Retrieve datatable instance
         
         
 
@@ -139,6 +176,28 @@ $(document).ready(function()
 
         //Display title and definition
         $('#outcome-display .panel-title').html(name);
+
+
+        var expected_target = json.expected_target;
+
+
+        //check the data type of the expected target   
+        //if the expected_target var is an empty array, set default value
+        if(expected_target.length == 0)
+        {
+          $('#expected-outcome .form-control').val(0);
+          
+          
+        }
+        else
+        {
+          $('#expected-outcome .form-control').val(expected_target[0].expected_target);
+      
+        
+          
+        }
+        
+        
      
 
         //Empty table