push

app/controllers/AnnualPlansController.php

@@ -42,7 +42,9 @@ class AnnualPlansController extends \BaseController
 
   public function viewAllPlans($program_id)
   {
-    $title = "Annual Plans";
+    $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");
 
 
@@ -132,7 +134,8 @@ class AnnualPlansController extends \BaseController
 
   public function showPlan($program_id, $typ_id = null)
   {
-    $title = "Annual Plans";
+    $program = Program::find($program_id);
+    $title = "Annual Plans for " . $program->name;
     //$typ_parts = DB::select("select * from typ_parts");
 
     //     $current_typ = DB::select("select * from three_year_plan where year_start <=" . date('Y') . " and year_end >=" . date('Y'))[0];
@@ -145,7 +148,7 @@ class AnnualPlansController extends \BaseController
     }
 
 
-    $program = Program::where('id', '=', $program_id)->first();
+    //$program = Program::where('id', '=', $program_id)->first();
 
     //Dame los annual plans que esten dentro del three year plan
 
@@ -644,4 +647,41 @@ class AnnualPlansController extends \BaseController
 
     return $outcome;
   }
-}
+
+  public function fetchObjectiveInfo()
+  {
+    $typ_objective_id = Input::get('typ_objective_id');
+    $courses = DB::table('typ_semester_courses')
+      ->join('courses', 'courses.id', '=', 'typ_semester_courses.course_id')
+
+      ->select('courses.code', 'courses.number', 'courses.name', 'typ_semester_courses.id as typ_semester_course_id')
+      ->where('typ_semester_objective_id', $typ_objective_id)
+      ->distinct()
+      ->get();
+    foreach ($courses as $course) {
+      /*$course->criteria_scale = DB::table('annual_plan_objective')
+        ->join('criteria', 'criteria.id', '=', 'annual_plan_objective.criteria_id')
+        ->join('criterion_scale', 'criterion_scale.criterion_id', '=', 'criteria.id')
+        ->join('scales', 'scales.id', '=', 'criterion_scale.scale_id')
+        ->select('criterion_scale.*', 'scales.*')
+        ->where('typ_semester_course_id', $course->typ_semester_course_id)
+        ->orderBy('position', 'ASC')
+        ->get();*/
+      $course->criteria = DB::table('annual_plan_objective')
+        ->join('criteria', 'criteria.id', '=', 'annual_plan_objective.criteria_id')
+        ->where('typ_semester_course_id', $course->typ_semester_course_id)
+        ->select('criteria.*')
+        ->get();
+      foreach ($course->criteria as $criterion) {
+        $criterion->scales = DB::table('criteria')
+          ->join('criterion_scale', 'criterion_scale.criterion_id', '=', 'criteria.id')
+          ->join('scales', 'scales.id', '=', 'criterion_scale.scale_id')
+          ->select('criterion_scale.*', 'scales.*')
+          ->where('criteria.id', $criterion->id)
+          ->orderBy('position', 'ASC')
+          ->get();
+      }
+    }
+    return $courses;
+  }
+}

app/controllers/OutcomesController.php

@@ -1053,7 +1053,7 @@ class OutcomesController extends \BaseController
 
     public function annualReport($program_id)
     {
-        $title = "Program Courses Report";
+        $title = "Program Annual Report";
 
 
         $annual_plans = $annual_plans = DB::select("
@@ -1067,7 +1067,7 @@ class OutcomesController extends \BaseController
           annual_cycle.*
         from annual_plans 
         join annual_cycle on annual_cycle_id = annual_cycle.id 
-        where program_id = 110 
+        where program_id = {$program_id} 
         and(
           semester_start in(
             select semester_id 
@@ -1088,4 +1088,4 @@ class OutcomesController extends \BaseController
 
         return View::make('local.managers.shared.annual_report', compact('title', 'program_id', 'annual_plans', 'program'));
     }
-}
+}

app/database/migrations/2022_02_03_135359_create_transformative_typ_outcome.php

@@ -0,0 +1,56 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateTransformativeTypOutcome extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('transformative_typ_outcome', function (Blueprint $table) {
+			$table->increments('id');
+			$table->integer('trans_id')->unsigned();
+			$table->integer('typ_semester_outcome_id')->unsigned();
+			$table->foreign('trans_id')
+				->references('id')
+				->on('transformative_actions')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->foreign('typ_semester_outcome_id')
+				->references('id')
+				->on('typ_semester_outcome')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->integer('proposing_coordinator_id')->unsigned();
+			$table->foreign('proposing_coordinator_id')
+				->references('id')
+				->on('users')
+				->onDelete('restrict')
+				->onUpdate('restrict');
+
+
+
+			$table->timestamp('created_at')->default(DB::raw('CURRENT_TIMESTAMP'));
+			$table->timestamp('updated_at')->default(DB::raw('CURRENT_TIMESTAMP'));
+			$table->timestamp('deleted_at')->default(DB::raw('CURRENT_TIMESTAMP'));
+			//$table->softDeletes()->default(DB::raw('CURRENT_TIMESTAMP'));
+
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('transformative_typ_outcome');
+	}
+}

app/database/migrations/2022_02_03_193908_create_transformative_action_status.php

@@ -0,0 +1,42 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateTransformativeActionStatus extends Migration
+{
+
+	public function up()
+	{
+		Schema::create('transformative_action_status', function (Blueprint $table) {
+			$table->increments('id');
+			$table->boolean('accomplished');
+			$table->boolean('it_was_useful')->default(0);
+
+			$table->integer('trans_id')->unsigned();
+			$table->foreign('trans_id')
+				->references('id')
+				->on('transformative_actions')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+
+			$table->integer('supervised_coordinator_id')->unsigned();
+			$table->foreign('supervised_coordinator_id')
+				->references('id')
+				->on('users')
+				->onDelete('restrict')
+				->onUpdate('restrict');
+			$table->text('comments')->nullable();
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('transformative_action_status');
+	}
+}

app/database/migrations/2022_02_04_040351_add_submit_in_typ_program.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddSubmitInTypProgram extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('courses', function (Blueprint $table) {
+			$table->boolean('is_submitted');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('courses', function (Blueprint $table) {
+			$table->dropColumn('is_submitted');
+		});
+	}
+}

app/routes.php

@@ -166,7 +166,10 @@ Route::group(array('before' => 'auth|has_access'), function () {
     /**
      * Shared Routes
      */
-
+    Route::post('fetchObjectiveInfo', array(
+        'as' => 'fetchObjectiveInfo',
+        'uses' => 'AnnualPlansController@fetchObjectiveInfo'
+    ));
     Route::get('selectAnnualProgram', array(
         'as' => 'selectAnnualProgram',
         'uses' => 'AnnualPlansController@selectProgramPlan'

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

@@ -87,6 +87,19 @@
         </div>
 
     </div>
+    <div class="modal fade" id="modal-view-objective">
+        <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><!-- /.modal-content -->
+        </div><!-- /.modal-dialog -->
+    </div><!-- /.modal -->
     <script>
         function nextChar(c) {
             return String.fromCharCode(c.charCodeAt(0) + 1);
@@ -124,6 +137,72 @@
         //   console.log(console.log(annual_id));
         // }
 
+        function fetchObjectiveInfo(objective_div){
+            typ_objective_id = $(objective_div).data('typ-objective-id');
+            objective =  $(objective_div).html();
+            
+            $.ajax({
+        type: 'POST',
+        url: "{{ URL::action('AnnualPlansController@fetchObjectiveInfo') }}",
+        data: {
+            typ_objective_id: typ_objective_id
+        },
+        success: function(courses)
+        {
+            
+            $('.modal-title').html(objective);
+            descriptions = '';
+            $('.modal-body').empty();
+            $.each(courses, function(index, course){
+
+                $('.modal-body').append('<h4>'+course.code+' '+course.number+': '+course.name+'</h4>')
+                $('.modal-body').append('<br><p>The following course is tied to these criteria: </p>')
+                $.each(course.criteria, function(index,criterion){
+                    criterion_html = '<h5 style ="text-indent: 15px;">'+(index+1)+'. '+criterion.name+'</h5>';
+                    table = $('<table>', {
+                        'style':'margin-left:15px',
+                        //'id':'criteria-'+criterion.id,
+                        'class':"table table-striped table-condensed table-bordered"
+                    });
+                    thead = $('<thead/>');
+                    tr = $('<tr/>');
+                    for(i=0; i<criterion.num_scales;i++){
+                        minimumScore = 1+(i*(criterion.max_score/criterion.num_scales));
+                maximumScore = (1+i)*(criterion.max_score/criterion.num_scales);
+                th = '<th>Scale '+(i+1)+'. ('+minimumScore+' - '+maximumScore+')</th>';
+                tr.append(th);
+                    }
+                    thead.append(tr);
+                    table.append(thead);
+                    tbody = $('<tbody>')
+                    tr_for_body = $('<tr>', {
+                        'id':'criterion_'+criterion.id
+                    })
+                    td_for_criteria = '';
+                    $.each(criterion.scales, function(index, scale){
+                    
+                    td_for_criteria += '<td>'+scale.description+'</td>';
+                });
+                tr_for_body.html(td_for_criteria);
+                    tbody.append(tr_for_body);
+                    table.append(tbody);
+                    $('.modal-body').append(criterion_html);
+                    $('.modal-body').append(table);
+                })
+                
+                $('.modal-body').append('<hr>')
+            });
+            
+           
+
+            $('#modal-view-objective').modal();
+
+        },
+        async:true
+    });
+    
+}
+
         function fetchEverything(li) {
             var id = $(li).data('outcome-id');
             var name = $(li).data('outcome-name');
@@ -186,8 +265,8 @@
                         table.clear();
                         var annual_plan = json.annual_plan.id;
                         for (objective in objectives) {
-
-                            var objectivesHTML = '';
+                            var typ_objective_id = json.typ_objective_id[objectives[objective].id].id;
+                            var objectivesHTML = '<div class="criterion-field" data-typ-objective-id = "'+typ_objective_id+'" onclick = "fetchObjectiveInfo(this)">';
                             var courseshtml = '';
                             var courseTAhtml = '';
 
@@ -195,13 +274,13 @@
 
                             var criteriaHTML = '';
                             objectivesHTML += '<strong>' + nextLetter + '.    ' + objectives[objective].text +
-                                '</strong>';
+                                '</strong></div>';
                             // courseshtml += "<strong>Objective "+nextLetter+"</strong>";
                             // courseshtml += '<ul>';
                             criteriaHTML += "<strong>Objective " + nextLetter + "</strong>";
                             //criteriaHTML+= '<ol>';
 
-                            var typ_objective_id = json.typ_objective_id[objectives[objective].id].id;
+                            //var typ_objective_id = json.typ_objective_id[objectives[objective].id].id;
                             nextLetter = nextChar(nextLetter);
                             for (course in courses[objectives[objective].id]) {