Comments

app/controllers/AnnualPlansController.php

@@ -687,7 +687,7 @@ class AnnualPlansController extends \BaseController
     return View::make('local.managers.shared.annual_select', compact('title', 'programs'));
   }
 
-
+  //Fetch report in annual_plan_report
 
   public function fetchReportWithOutcome()
   {
@@ -712,6 +712,10 @@ class AnnualPlansController extends \BaseController
     $outcome->semester_info = DB::table('semesters')
       ->where('id', $semester_id)
       ->first();
+    $outcome->comments = DB::table('typ_outcome_report_comments')
+      ->where('typ_semester_outcome_id', $typ_semester_outcome_id)
+      ->get();
+
 
     foreach ($outcome->objectives as $index => $objective) {
       $objective->courses = Objective::getPlanReport($objective);
@@ -818,4 +822,36 @@ class AnnualPlansController extends \BaseController
       ->first();
     return $array_to_send;
   }
+
+  public function addCommentsToOutcome()
+  {
+    $edit_id = Input::get('edit_id');
+    $typ_semester_outcome_id = Input::get('typ_outcome_semester_id');
+    $comments = Input::get('comments');
+
+    Log::info(Input::all());
+
+    if ($edit_id) {
+      DB::table('typ_outcome_report_comments')
+        ->where('id', $edit_id)->update(array(
+          'user_id' => Auth::user()->id,
+          'typ_semester_outcome_id' => $typ_semester_outcome_id,
+          'comments' => $comments
+        ));
+    } else {
+      $edit_id = DB::table('typ_outcome_report_comments')->insertGetId(array(
+        'user_id' => Auth::user()->id,
+        'typ_semester_outcome_id' => $typ_semester_outcome_id,
+        'comments' => $comments
+      ));
+    }
+    return $edit_id;
+  }
+  public function deleteCommentsFromOutcome()
+  {
+    $comment_id = Input::get('id');
+
+    DB::table('typ_outcome_report_comments')->where('id', $comment_id)->delete();
+    return;
+  }
 }

app/database/migrations/2022_02_13_122758_create_annual_report_comments.php → app/database/migrations/2022_02_13_122758_create_typ_outcome_report_comments.php

@@ -3,7 +3,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class CreateAnnualReportComments extends Migration
+class CreateTypOutcomeReportComments extends Migration
 {
 
 	/**
@@ -13,19 +13,19 @@ class CreateAnnualReportComments extends Migration
 	 */
 	public function up()
 	{
-		Schema::create('annual_report_comments', function (Blueprint $table) {
+		Schema::create('typ_outcome_report_comments', function (Blueprint $table) {
 			$table->increments('id');
 			$table->integer('user_id')->unsigned();
-			$table->integer('annual_plan_id')->unsigned();
+			$table->integer('typ_semester_outcome_id')->unsigned();
 			$table->text('comments');
 			$table->foreign('user_id')
 				->references('id')
 				->on('users')
 				->onDelete('cascade')
 				->onUpdate('cascade');
-			$table->foreign('annual_plan_id')
+			$table->foreign('typ_semester_outcome_id')
 				->references('id')
-				->on('annual_plans')
+				->on('typ_semester_outcome')
 				->onDelete('cascade')
 				->onUpdate('cascade');
 		});
@@ -38,6 +38,6 @@ class CreateAnnualReportComments extends Migration
 	 */
 	public function down()
 	{
-		Schema::drop('annual_report_comments');
+		Schema::drop('typ_outcome_report_comments');
 	}
 }

app/routes.php

@@ -168,7 +168,8 @@ Route::group(array('before' => 'auth|has_access'), function () {
      */
 
     // Annual Plan routes
-
+    Route::post('deleteCommentsFromOutcome', array('uses' => 'AnnualPlansController@deleteCommentsFromOutcome'));
+    Route::post('addCommentsToOutcome', array('uses' => 'AnnualPlansController@addCommentsToOutcome'));
     Route::post('fetchAnnualPlan', array('uses' => 'AnnualPlansController@fetchTheAnnualPlan'));
 
     Route::post('deleteTaFromOutcome', array('uses' => 'TransformativeActionsController@deleteTaFromOutcome'));

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

@@ -155,17 +155,157 @@
 
             $('#outcome-display').parent().hide();
 
-            // --------------------------------------------------------------------------
-            // Functions
-            // --------------------------------------------------------------------------
+            
+    
 
-            // --------------------------------------------------------------------------
-            // Events
-            // --------------------------------------------------------------------------
+        });
+
+        function draw_comment_section(typ_semester_outcome_id, outcome_comments){
+            $('#levelTabs').append('<li role = "presentation" id = "comments_for_outcome">'+
+                            '<a data-toggle="tab" id="a_for_ta_outcome" href="#comments_outcome" role="tab" >Comments for Outcome</a>'+
+                            '</li>');
+            $('#allLists').append('<div role="tabpanel" class="tab-pane" data-typ-semester-outcome-id = "'+typ_semester_outcome_id+'" id="comments_outcome"></div>');
+            button_for_adding_comments = $('<button>', {
+                'class':'btn btn-secondary',
+                'id':'add_comments_button',
+                'style':'float: right',
+                'onclick': 'add_comments_to_plan()'
+            }).html("<span class='glyphicon glyphicon-plus'></span> Add Comments");
+            $('#comments_outcome').append('<h3>Comments</h3>')
+        if(outcome_comments.length){
+            table_for_comments = $('<table>',{
+               'class':'table table-striped table-condensed datatable',
+               'id':'table_for_comments'
+            }).html('<thead><th>Comments</th><th>Edit or Delete</th></thead><tbody></tbody>');
+            table_for_comments.appendTo('#comments_outcome');
+            table_for_comments = table_for_comments.DataTable();
+            $.each(outcome_comments, function(index, comment){
+                
+                comment_td = '<div id="comments_id_'+comment.id+'">'+comment.comments+'</div>';
+                
+                inputEdit = $('<input>', {
+                                    'type': 'button',
+                                    'class': 'btn btn-secondary',
+                                    'onclick': 'add_comments_to_plan('+comment.id+')',
+                                    'id': 'edit_button_comment_' + comment.id,
+                                    'value': 'Edit'
+                                }).html('Edit');
+                inputDelete = $('<input>', {
+                                    'type': 'button',
+                                    'class': 'btn btn-primary',
+                                    'style': 'display: inline',
+                                    'onclick': 'deleteCommentsFromOutcome('+comment.id+')',
+                                    'value': 'Delete'
+            })
+            div = $('<div>');
+                                div.append(inputEdit);
+                                div.append(inputDelete);
+                                table_for_comments.row.add([
+                                    comment_td,
+                                    div.html()
+
+                                ]).draw();
+         });
+         
+        }
+
+            $('#comments_outcome').append('<hr>');
+            $('#comments_outcome').append(button_for_adding_comments);
+
+
+
+           
+       
+
+        
+        }
+
+        function add_comments_to_plan(edit_id = null){
+            $('#add_comments_button').hide();
+            div_for_inputs = $('<div>', {
+                'id':'add_comment_div'
+            });
+            textarea = $('<textarea>',{
+                'class':'form-control',
+                'data-comment-id':edit_id,
+                'id':'comment_textbox'
+            });
+            if(edit_id){
+            textarea.val($("#comments_id_"+edit_id).html());
+            }
+            save_button = $('<button>', {
+                'class':'btn btn-primary',
+                'onclick':'saveComment()',
+                'style':'float: right'
+            }).html('Save');
+            $('#comments_outcome').append(div_for_inputs);
+            div_for_inputs.append('<h5>Add new comment</h5>');
+            div_for_inputs.append(textarea);
+            div_for_inputs.append(save_button);
+
+        }
+
+        function saveComment(){
+            typ_outcome_semester_id = $("#comments_outcome").data('typ-semester-outcome-id');
+            comment_area = $('#comment_textbox');
+
+            $.post(
+                "{{URL::action('AnnualPlansController@addCommentsToOutcome')}}",
+                {
+                    typ_outcome_semester_id:typ_outcome_semester_id,
+                    comments:comment_area.val(),
+                    edit_id:comment_area.data('comment-id')
+                },
+                function(edit_id){
+                    $('#add_comment_div').remove();
+                    $('#add_comments_button').show();
+                    if($('#comments_id_'+edit_id).length){
+                        $('#comments_id_'+edit_id).html(comment_area.val());
+                    }
+                    else{
+                        table_for_comments = $('#table_for_comments').DataTable();
+                        comment_td = '<div id="comments_id_'+edit_id+'">'+comment_area.val()+'</div>';
+                
+                inputEdit = $('<input>', {
+                                    'type': 'button',
+                                    'class': 'btn btn-secondary',
+                                    'onclick': 'add_comments_to_plan('+edit_id+')',
+                                    'id': 'edit_button_comment_' + edit_id,
+                                    'value': 'Edit'
+                                }).html('Edit');
+                inputDelete = $('<input>', {
+                                    'type': 'button',
+                                    'class': 'btn btn-primary',
+                                    'style': 'display: inline',
+                                    'onclick': 'deleteCommentsFromOutcome('+edit_id+')',
+                                    'value': 'Delete'
+            })
+            div = $('<div>');
+                                div.append(inputEdit);
+                                div.append(inputDelete);
+                                table_for_comments.row.add([
+                                    comment_td,
+                                    div.html()
+
+                                ]).draw();
+                    }
+                }
+            )
+            
+        }
+
+        function deleteCommentsFromOutcome(id){
+            $.post(
+                "{{URL::action('AnnualPlansController@deleteCommentsFromOutcome')}}",
+                {id:id},
+                function(){
+                    $('#comments_id_'+id).parent().parent().remove();
+                    
+                }
+            )
+        }
 
-            // When list item is clicked, load corresponding info
 
-        });
 
         // Create everything 
 
@@ -175,7 +315,7 @@
             }
             else{
                 $('#levelTabs').prepend('<li role = "presentation" id = "transformative_for_outcome">'+
-                            '<a data-toggle="tab" id="a_for_ta_outcome" href="#transformative_actions" role="tab" >Transformative Actions</a>'+
+                            '<a data-toggle="tab" id="a_for_ta_outcome" href="#transformative_actions" role="tab" >Transformative Actions to Outcome</a>'+
                             '</li>');
                 $('#allLists').prepend('<div role="tabpanel" class="tab-pane" id="transformative_actions"></div>');
                         
@@ -425,6 +565,8 @@
                         })
 
                         draw_transformative_actions(outcome.transforming_actions, outcome.semester_info.id)
+                        draw_comment_section(typ_semester_outcome_id, outcome.comments);
+                        
                         //$('#a_for_'+first_objective_id).click();
                         theArray = [];