ando cansado y pico

desde las doce pm algarete

app/controllers/AnnualPlansController.php

@@ -705,9 +705,13 @@ class AnnualPlansController extends \BaseController
       ->first();
     $outcome->transforming_actions = DB::table('transformative_typ_outcome')
       ->join('transformative_actions', 'transformative_actions.id', '=', 'transformative_typ_outcome.trans_id')
+      ->leftJoin('transformative_action_status', 'transformative_actions.id', '=', 'transformative_action_status.trans_id')
       ->where('typ_semester_outcome_id', $typ_semester_outcome_id)
-      ->select('transformative_actions.*')
+      ->select('transformative_actions.*', 'transformative_action_status.*', 'transformative_actions.id as trans_id')
       ->get();
+    $outcome->semester_info = DB::table('semesters')
+      ->where('id', $semester_id)
+      ->first();
 
     foreach ($outcome->objectives as $index => $objective) {
       $objective->courses = Objective::getPlanReport($objective);

app/controllers/OutcomesController.php

@@ -1068,8 +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
-        annual_plans.is_submitted =1
+        
+        
           order by semester_start desc");
         $program = DB::table('programs')
             ->where('id', $program_id)

app/controllers/TransformativeActionsController.php

@@ -1460,4 +1460,56 @@ class TransformativeActionsController extends \BaseController
       ->delete();
     return;
   }
+
+  public function fetchStatus()
+  {
+    $trans_id = Input::get('trans_id');
+    $semester_id = Input::get('semester_id');
+    $transformative_action = DB::table('transformative_actions')
+      ->where('id', $trans_id)
+      ->first();
+    $transformative_action->status = DB::table('transformative_action_status')
+      ->where('trans_id', $transformative_action->id)
+      ->where('semester_id', $semester_id)
+      ->first();
+
+
+    //TransformativeAction::find($trans_id)->status($semester_id);
+
+    return array($transformative_action);
+  }
+  public function saveTransStatus()
+  {
+    $semester_id = Input::get('semester_id');
+    $trans_id = Input::get('trans_id');
+    $results = Input::get('results');
+    $comments = Input::get('comments');
+    $accomplished = Input::get('accomplished');
+    $was_it_useful = Input::get('was_it_useful');
+
+    $existing_status = DB::table('transformative_action_status')
+      ->where('semester_id', $semester_id)
+      ->where('trans_id', $trans_id)
+      ->first();
+    if ($existing_status) {
+      DB::table('transformative_action_status')->update(array(
+        'results' => $results,
+        'comments' => $comments,
+        'accomplished' => $accomplished,
+        'it_was_useful' => $was_it_useful,
+        'supervised_coordinator_id' => Auth::user()->id
+      ));
+    } else {
+      DB::table('transformative_action_status')->insert(array(
+        'trans_id' => $trans_id,
+        'results' => $results,
+        'comments' => $comments,
+        'accomplished' => $accomplished,
+        'it_was_useful' => $was_it_useful,
+        'semester_id' => $semester_id,
+        'supervised_coordinator_id' => Auth::user()->id
+      ));
+    }
+    return "done";
+  }
 }

app/database/migrations/2022_02_13_122842_add_results_to_transformative_status.php

@@ -3,7 +3,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class AddResultsToTransformativeStatus extends Migration {
+class AddResultsToTransformativeStatus extends Migration
+{
 
 	/**
 	 * Run the migrations.
@@ -12,7 +13,9 @@ class AddResultsToTransformativeStatus extends Migration {
 	 */
 	public function up()
 	{
-		//
+		Schema::table('transformative_action_status', function (Blueprint $table) {
+			$table->text('results')->nullable();
+		});
 	}
 
 	/**
@@ -22,7 +25,8 @@ class AddResultsToTransformativeStatus extends Migration {
 	 */
 	public function down()
 	{
-		//
+		Schema::table('transformative_action_status', function (Blueprint $table) {
+			$table->dropColumn('results');
+		});
 	}
-
-}
+}

app/database/migrations/2022_02_15_121554_create_transformative_future_course.php

@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateTransformativeFutureCourse extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('transformative_future_course', function (Blueprint $table) {
+			$table->increments('id');
+			$table->integer('trans_id')->unsigned();
+			$table->char('course_code', 8);
+			$table->char('course_number', 4)->default('0000');
+			$table->integer('semester_id')->unsigned();
+			$table->foreign('trans_id')
+				->references('id')
+				->on('transformative_actions')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('transformative_future_course');
+	}
+}

app/database/migrations/2022_02_15_131614_add_user_id_to_template.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddUserIdToTemplate extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('templates', function (Blueprint $table) {
+
+			$table->integer('user_id')->unsigned()->nullable();
+			$table->foreign('user_id')
+				->references('id')
+				->on('users')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('templates', function (Blueprint $table) {
+			$table->dropColumn('user_id');
+		});
+	}
+}

app/database/migrations/2022_02_15_184454_add_semester_id_transformative_action_status.php

@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddSemesterIdTransformativeActionStatus extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('transformative_action_status', function (Blueprint $table) {
+			$table->integer('semester_id')->unsigned();
+			$table->foreign('semester_id')
+				->references('id')
+				->on('semesters')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('transformative_action_status', function (Blueprint $table) {
+			$table->dropColumn('semester_id');
+		});
+	}
+}

app/models/Activity.php

@@ -393,7 +393,10 @@ class Activity extends Eloquent
     $outcomes_attempted = [];
 
     $all_criterion = DB::table('activity_criterion')
+      ->join('assessments', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
       ->where('activity_criterion.activity_id', '=', $this->id)
+      ->groupBy('criterion_id')
+
       ->lists('criterion_id');
 
     foreach ($all_criterion as $index => $criterion_id) {
@@ -414,4 +417,4 @@ class Activity extends Eloquent
     //return json_decode($this->outcomes_attempted, true);
     return $outcomes_attempted;
   }
-}
+}

app/models/Course.php

@@ -181,7 +181,7 @@ class Course extends Eloquent
   public static function getStudentReportForOutcome($course_code = null)
   {
     if ($course_code) {
-      Log::info('entré');
+      //Log::info('entré');
       $criteria_id = DB::table('annual_plan_objective')
         ->where('typ_semester_course_id', $course_code->typ_semester_course_id)
         ->lists('criteria_id');

app/models/TransformativeAction.php

@@ -3,4 +3,12 @@
 class TransformativeAction extends Eloquent
 {
     protected $table = 'transformative_actions';
-}
+
+    public function scopeStatus($query, $semester_id)
+    {
+        return $query->join('transformative_action_status')
+            ->where('trans_id', $this->id)
+            ->where('semester_id', $semester_id)
+            ->first();
+    }
+}

app/models/TransformativeActionStatus.php

@@ -0,0 +1,11 @@
+<?php
+
+class TransformativeActionStatus extends Eloquent
+{
+    protected $table = 'transformative_action_status';
+
+    public function trans_id()
+    {
+        return $this->belongsTo('TransformativeAction');
+    }
+}

app/routes.php

@@ -204,7 +204,9 @@ Route::group(array('before' => 'auth|has_access'), function () {
 
     Route::post('submitAnnualPlan', array('uses' => 'AnnualPlansController@submitAnnualPlan'));
 
+    Route::post('fetchTransformativeStatus', array('uses' => 'TransformativeActionsController@fetchStatus'));
 
+    Route::post('saveTransStatus', array('uses' => 'TransformativeActionsController@saveTransStatus'));
     //other stuff
     Route::post('postActivityCriterionTrans/{activity_id}', array(
         'as' => 'postActivityCriterionTrans/{activity_id}',

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

@@ -212,7 +212,7 @@
 
                             {{ Form::label('program_id2', 'Associated Program') }}<br><br>
 
-                            <input type=" hidden" id="{{ $programs[0]->name }}" name="program_id[]"
+                            <input type="hidden" id="{{ $programs[0]->name }}" name="program_id[]"
                         value="{{ $programs[0]->id }}">
 
                         <input type="checkbox" id="assoc_program_id_{{ $programs[0]->id }}" name="program_id[]"

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

@@ -52,11 +52,18 @@
                     </div>
 
                     <ul id="levelTabs" class="nav nav-tabs" role="tablist">
-
+                        <li role = "presentation" id = 'transformative_for_outcome'>
+                            <a data-toggle="tab" id="a_for_ta_outcome" href="#transformative_actions" role="tab" aria-expanded="true">Transformative Actions</a>
+                        </li>
                     </ul>
                     <div id="allLists" class="tab-content">
+                        <div role="tabpanel" class="tab-pane active" id="transformative_actions">
 
+                        </div>
                     </div>
+                    
+
+                    
                     <!-- <div class="table-responsive">
                         <table class="table table-striped table-condensed datatable" style="table-layout: fixed ; width : 100%">
                           <thead><tr><th>Objectives for courses</th><th>Criteria per Course</th><th>Transformative Actions</th></tr></thead>
@@ -79,6 +86,44 @@
         </div>
 
     </div>
+    <div class="modal fade" id="modal-status-trans">
+        <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">
+                   <h5 id="was_it_implemented"> </h5>
+              <label class="radio-inline">
+                  <input type="radio"  name="implemented" value = "1">Yes</label>
+              <label class="radio-inline">
+                  <input type="radio" name="implemented" value = "0">No</label>
+                  <br>
+                <div id='useful_radio_div'>
+                    <h5>Was this transformative action helpful to achieve the learning expectation?</h5>
+                <label class="radio-inline">
+                    <input type="radio"  name="useful" value = "1">Yes</label>
+                <label class="radio-inline">
+                    <input type="radio" name="useful" value = "0">No</label>
+                </div>
+                <br>
+        <div id='comment_div'>
+            <label id="implement_textarea" for='comments'></label>
+            <textarea  class="form-control" id='comments'>
+            </textarea>
+        </div>
+            
+   
+              
+            </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><!-- /.modal-content -->
+        </div><!-- /.modal-dialog -->
+    </div><!-- /.modal -->
     <script>
         function nextChar(c) {
             return String.fromCharCode(c.charCodeAt(0) + 1);
@@ -89,7 +134,22 @@
             // --------------------------------------------------------------------------
             // Page load
             // --------------------------------------------------------------------------
-
+            $('#comment_div').hide();
+            $('input[name="implemented"]').change(function(){
+                //was implemented
+                if(!parseInt($(this).val())){
+                    $('#useful_radio_div').hide();
+                    $('#comment_div').show();
+                    $('#comments').val(' ');
+                    $('#implement_textarea').html("Explain briefly why this transformative action was not implemented");
+                    }
+                else{
+                    $('#useful_radio_div').show();
+                    $('#comment_div').show();
+                    $('#implement_textarea').html("Explain briefly details about the implementation of this transformative action");
+                   
+                }
+            })
             // Hide accordion panel contents by default
             $('.panel-group .panel-body').hide();
 
@@ -109,6 +169,67 @@
 
         // Create everything 
 
+        function  draw_transformative_actions(transforming_actions, semester_id){
+            if(!transforming_actions.length){
+                $("#transformative_for_outcome").hide();
+            }
+            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>'+
+                            '</li>');
+                $('#allLists').prepend('<div role="tabpanel" class="tab-pane" id="transformative_actions"></div>');
+                        
+                $('#transformative_actions').html('<h3>Tranformative actions for Learning Outcome')
+                $.each(transforming_actions, function(index, trans_action){
+                    div = $("<div>", {
+                        'id':'div_trans_id_'+trans_action.trans_id
+                    }).html('<p><strong>'+(index+1)+'. '+trans_action.at_text+': </strong>'+trans_action.description+'</p>'+
+                    '<p><strong>Category: </strong> '+trans_action.type_of_TA+'</p>');
+                    div.append('<label>Results: </label>')
+                    input_results = $("<textarea>", {
+                        'class':'form-control',
+                        'id':'results_for_'+trans_action.trans_id
+                    });
+                    div.append(input_results)
+
+                    div.append('<h5>Was this transformative action helpful to achieve the learning expectation?</h5>'+
+                    '<label class="radio-inline">'+
+                    '<input type="radio"  name="useful_for_'+trans_action.trans_id+'" value = "1">Yes</label>'+
+                    '<label class="radio-inline">'+
+                    '<input type="radio" name="useful_for_'+trans_action.trans_id+'" value = "0">No</label>');
+                    comments = $('<textarea>',{
+                        'id':'comments_for_'+trans_action.trans_id,
+                        'class':'form-control'
+                    });
+                    div.append('<br><label>Explain briefly details about the implementation</label>');
+                    div.append(comments);
+                    
+                    button = $('<button>',{
+                        "type":"button",
+                        "class":"btn btn-primary",
+                        "onclick":'saveTransReport('+trans_action.trans_id+', '+semester_id+')',
+                        'style':'float: right'
+          
+                    }).html('Save');
+                    div.append('<br>');
+                    div.append(button);
+                    div.append('<br>');
+                    div.append('<hr>');
+
+                    $('#transformative_actions').append(div);
+
+                    $('#results_for_'+trans_action.trans_id).val(trans_action.results);
+                    $('#comments_for_'+trans_action.trans_id).val(trans_action.comments);
+                    $('input[name="useful_for_'+trans_action.trans_id+'"][value="'+trans_action.it_was_useful + '"]').prop('checked', true);
+
+                
+
+
+
+                })
+            }
+        }
+
         function fetchEverything(li) {
             var outcome_id = $(li).data('outcome-id');
             var name = $(li).data('outcome-name');
@@ -164,13 +285,16 @@
                             '<th>Percentage</th>' +
                             '<th>Outcome Achieved</th>' +
                             '</tr></thead><tbody></tbody>');
+                        first_objective_id = outcome.objectives[0].id;
                         $.each(outcome.objectives, function(index, objective) {
 
                             li = $('<li/>', {
-                                'role': 'presentation'
+                                'role': 'presentation',
+                                'id':'li_for_'+objective.id
                             });
                             a = $('<a/>', {
                                 'data-toggle': 'tab',
+                                'id': 'a_for_'+objective.id,
                                 'href': '#' + objective.id,
                                 'role': 'tab'
                             }).html('Objective ' + (index + 1));
@@ -188,6 +312,12 @@
 
                             div.appendTo($('#allLists'))
 
+                            div.append(
+                                            '<p>The following results are from the courses in the selected semester with the focused criteria in the selected annual plan</p>'
+                                        );
+
+                            
+
 
                             if (objective.courses) {
                                 $.each(objective.courses, function(index, course_code) {
@@ -212,9 +342,9 @@
                                                 .criteria_achieved;
 
                                         });
-                                        div.append(
+                                        /*div.append(
                                             '<p>The following results are from the courses in the selected semester with the focused criteria in the selected annual plan</p>'
-                                        );
+                                        );*/
                                         table = $('<table/>', {
                                             'class': 'table table-striped table-condensed datatable'
                                         }).html('<thead><th>Criterion</th><th>' +
@@ -234,27 +364,50 @@
                                             tbody.append(tr);
                                         });
                                         table.append(tbody);
-                                        Course_and_transformative = '<h3>' + course_code.code + ' ' +
+                                        Course_section = '<h3>' + course_code.code + ' ' +
                                             course_code.number + '</h3><hr>';
+                                            
+                                        div.append(Course_section)
+                                        div.append('<h4> Criteria Assessed in '+course_code.code+' '+course_code.number+'</h4>')
+                                        div.append(table);
                                         if (course_code.transforming_actions.length) {
-                                            Course_and_transformative +=
-                                                '<h5> This course was tied to the following transformative actions</h5>';
-                                            Course_and_transformative += '<ol>';
+                                             table_for_transformative_actions = $('<table>',{
+                                                'class': 'table table-striped table-condensed datatable'
+                                             }).html('<thead><th>Transformative Actions Proposed in Annual Plan</th>' +
+                                            '<th>Follow up </th>' +
+                                            '</thead>'
+                                        );
+                                        tbody_for_transformative_actions = $('<tbody>');
+                                            
                                             $.each(course_code.transforming_actions, function(index,
                                                 transformative_action) {
-                                                Course_and_transformative += '<li><p><strong>' +
-                                                    transformative_action.at_text +
-                                                    '</strong>: ' + transformative_action
-                                                    .description + '</p></li>'
+
+                                                button_for_followup = $('<button>',{
+                                                    'class':'btn btn-secondary',
+                                                    'onclick':'give_follow_up_questions('+transformative_action.id+', "'+outcome.semester_info.code+'", '+outcome.semester_info.id+')'
+                                                }).html('Follow Up Questions');
+                                                table_row = "<tr>"+
+                                                '<td><p><strong>'+transformative_action.at_text +': </strong>'+
+                                                transformative_action.description+'</p></td>'+
+                                                '<td>'+button_for_followup.prop('outerHTML')+'</td></tr>';
+
+                                                tbody_for_transformative_actions.append(table_row)
+                                                
+                                                
                                             })
+                                            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);
+                                            //table_for_transformative_actions.DataTable();
                                         }
 
-                                        div.append(Course_and_transformative)
-                                        div.append(table);
+                                        
                                         table.DataTable();
 
 
                                     }
+    
+                                    
 
 
                                 })
@@ -270,6 +423,9 @@
 
 
                         })
+
+                        draw_transformative_actions(outcome.transforming_actions, outcome.semester_info.id)
+                        //$('#a_for_'+first_objective_id).click();
                         theArray = [];
 
                         $('#tableOutcome').html(tableStudent);
@@ -328,6 +484,10 @@
 
 
 
+
+
+
+
                         /* table.row.add([
                               objectivesHTML,
                               courseshtml,
@@ -355,6 +515,87 @@
 
         }
 
+        function give_follow_up_questions(trans_id, semester_code, semester_id){
+        
+
+            $.ajax({
+                type: 'POST',
+                url: "{{ URL::action('TransformativeActionsController@fetchStatus') }}",
+                data: {
+                    trans_id:trans_id,
+                    semester_id:semester_id
+                },
+                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);
+                    
+                   
+                    $('input[name="implemented"]').prop('checked',false);
+                    $('input[name="useful"]').prop('checked',false);
+                    $('#comments').val(' ');
+                    $('#useful_radio_div').hide();
+                    $('#comment_div').hide();
+                    
+                    if(transformative_action['status']){
+                        transformative_action['status'].accomplished;
+                        $('input[name="implemented"][value="'+ transformative_action['status'].accomplished + '"]').prop('checked', true);
+                        if(transformative_action['status'].accomplished){
+                        $('#useful_radio_div').show();
+                        $('input[name="useful"][value="'+ transformative_action['status'].it_was_useful + '"]').prop('checked', true);
+                        }
+                        $('#comment_div').show();
+                        $('#comments').val(transformative_action['status'].comments);
+                        
+                    }
+
+                    $('#was_it_implemented').html('Was this transformative action implemented during Semester '+semester_code);
+
+
+
+                    $('#modal-status-trans').modal();
+                    $('#save_transformative_info').attr('onclick', 'saveTransReport('+trans_id+','+semester_id+',"modal")');
+
+                },
+                async: true
+            });
+
+        }
+
+        function saveTransReport(trans_id, semester_id, type_of_input){
+            if(type_of_input=='modal'){
+                comments = $('#comments').val();
+                accomplished = parseInt($('input[name="implemented"]:checked').val());
+                if(accomplished)
+                was_it_useful = $('input[name="useful"]:checked').val();
+                else was_it_useful =0;
+                results = "";
+            }
+            else{
+                comments = $('#comments_for_'+trans_id).val();
+                accomplished = 1;
+                was_it_useful = $('input[name="useful_for_'+trans_id+'"]:checked').val();
+                results = $('#results_for_'+trans_id).val();
+            }
+
+            $.post(
+                "{{URL::action('TransformativeActionsController@saveTransStatus')}}",
+                {
+                    semester_id:semester_id,
+                    trans_id:trans_id,
+                    results:results,
+                    comments:comments,
+                    accomplished:accomplished,
+                    was_it_useful:was_it_useful,
+                },
+                function(message){
+                    alert(message);
+                }
+            )
+        }
+
+
+
         function posttoTransAnnual(annual_id, selectTransId, typ_course_id) {
             ta = $("#" + selectTransId).val();
             old_ta = $("#" + selectTransId).data('old-TA');

app/views/local/professors/course.blade.php

@@ -89,6 +89,7 @@
                         <td>{{ date('M d, Y', strtotime($activity->updated_at)) }}</td>
                         <td>
                             @if($activity->o_att_array)
+                            <?php Log::info($activity->id);?>
                                 <span class="glyphicon glyphicon-ok"></span>
                             @endif
                         </td>