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

Trabajos en OutcomesController en paralelo

app/controllers/AnnualPlansController.php

@@ -206,7 +206,7 @@ class AnnualPlansController extends \BaseController
     $an_plan = DB::table("annual_plans")
       ->join('annual_cycle', 'annual_cycle.id', '=', 'annual_plans.annual_cycle_id')
       ->where('annual_plans.id', '=', Input::get('id'))
-      ->select('annual_plans.id as id', 'program_id', 'academic_year', 'semester_start', 'semester_end')
+      ->select('annual_plans.id as id', 'program_id', 'academic_year', 'semester_start', 'semester_end', 'is_submitted')
       ->first();
 
     $years = explode('-', $an_plan->academic_year);
@@ -232,18 +232,26 @@ class AnnualPlansController extends \BaseController
 
     $json_to_send["outcomes"]["first"] = DB::table('outcomes')
       ->join('typ_semester_outcome', 'typ_semester_outcome.outcome_id', '=', 'outcomes.id')
+      ->join('typ_semester_objectives', 'typ_semester_outcome.id', '=', 'typ_semester_objectives.typ_semester_outcome_id')
+      ->join('typ_semester_courses', 'typ_semester_objectives.id', '=', 'typ_semester_courses.typ_semester_objective_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')
+      ->groupBy('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::table('outcomes')
       ->join('typ_semester_outcome', 'typ_semester_outcome.outcome_id', '=', 'outcomes.id')
+      ->join('typ_semester_objectives', 'typ_semester_outcome.id', '=', 'typ_semester_objectives.typ_semester_outcome_id')
+      ->join('typ_semester_courses', 'typ_semester_objectives.id', '=', 'typ_semester_courses.typ_semester_objective_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')
+      ->groupBy('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})");
@@ -346,17 +354,34 @@ class AnnualPlansController extends \BaseController
     $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')
+      ->select('type_of_TA', 'is_custom')
       ->where('type_of_TA', '<>', '')
-      ->distinct()
+      ->where(function ($query) use (&$program_id) {
+        $query->whereNull('program_id')
+          ->orWhere('program_id', $program_id);
+      })
+      ->where('by_professor', 0)
+      ->groupBy('type_of_TA')
       ->get();
+    $optGroupGeneral = "<optgroup label='General Transformative Actions'>";
+    $optGroupCustom = "<optgroup label ='Program Custom Actions'>";
     foreach ($types as $type) {
-      $typ_info['categories'] .= "<option value = '" . $type->type_of_TA . "'>" . $type->type_of_TA . "</option>";
+
+      if ($type->is_custom) {
+        $optGroupCustom .= "<option value = '" . $type->type_of_TA . "' data-is-custom = '1'>" . $type->type_of_TA . "</option>";
+      } else {
+        $optGroupGeneral .= "<option value = '" . $type->type_of_TA . "' data-is-custom = '0'>" . $type->type_of_TA . "</option>";
+      }
     }
+    $typ_info['categories'] .= $optGroupGeneral . '</optgroup>';
+    $typ_info['categories'] .= $optGroupCustom . '</optgroup>';
+
+
     $typ_info['categories'] .= '<option value ="new"> New Type of Transformative Action</option>';
     return json_encode($typ_info);
   }
@@ -662,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()
   {
@@ -670,6 +695,7 @@ class AnnualPlansController extends \BaseController
     $semester_id = Input::get('semester_id');
     $annual_plan_id = Input::get('annual_plan_id');
     $outcome_id = Input::get('outcome_id');
+    $typ_semester_outcome_id = Input::get('typ_semester_outcome_id');
 
     $outcome = Outcome::where('id', $outcome_id)->first();
     $outcome->objectives = $outcome->fetchObjectivesReport($semester_id, $program_id);
@@ -677,6 +703,19 @@ class AnnualPlansController extends \BaseController
       ->where('program_id', $program_id)
       ->where('semester_id', $semester_id)
       ->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.*', 'transformative_action_status.*', 'transformative_actions.id as trans_id')
+      ->get();
+    $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);
@@ -721,4 +760,98 @@ class AnnualPlansController extends \BaseController
     }
     return $courses;
   }
+
+  public function submitAnnualPlan()
+  {
+    $annual_plan_id = Input::get('annual_plan_id');
+    DB::table('annual_plans')->where('id', $annual_plan_id)->update(array(
+      'is_submitted' => 1,
+      'submitted_on' => date('Y-m-d H:i:s')
+    ));
+    return;
+  }
+
+  public function fetchTheAnnualPlan()
+  {
+    $outcome_id = Input::get('id');
+    $semester_id = Input::get('semester');
+    $typ_semester_outcome_id = Input::get('typ_semester_outcome_id');
+    $program_id = Input::get('program_id');
+
+    $outcome = Outcome::find($outcome_id);
+
+    //El nombre es annual_plan_objective, fue cambiado como mil veces por Arlene y su combo
+    // Así que está mal escrito. Sorry future programmer
+
+    $array_to_send = [];
+    $array_to_send['typ_objectives'] = DB::table('typ_semester_objectives')
+      ->join('objectives', 'objectives.id', '=', 'typ_semester_objectives.objective_id')
+      ->where('typ_semester_outcome_id', $typ_semester_outcome_id)
+      ->select('objectives.*', 'typ_semester_outcome_id', 'typ_semester_objectives.id as typ_semester_objective_id')
+      ->get();
+    $array_to_send['typ_courses'] = DB::table('typ_semester_objectives')
+      ->join('typ_semester_courses', 'typ_semester_courses.typ_semester_objective_id', '=', 'typ_semester_objectives.id')
+      ->join('courses', 'courses.id', '=', 'typ_semester_courses.course_id')
+      ->where('typ_semester_outcome_id', $typ_semester_outcome_id)
+      ->select('courses.*', 'typ_semester_objective_id', 'typ_semester_courses.id as typ_semester_course_id')
+      ->get();
+    $array_to_send['courses_criteria'] = DB::table('typ_semester_objectives')
+      ->join('typ_semester_courses', 'typ_semester_courses.typ_semester_objective_id', '=', 'typ_semester_objectives.id')
+      ->join('annual_plan_objective', 'annual_plan_objective.typ_semester_course_id', '=', 'typ_semester_courses.id')
+      ->join('criteria', 'criteria.id', '=', 'annual_plan_objective.criteria_id')
+      ->select('typ_semester_course_id', 'annual_plan_objective.*', 'criteria.*')
+      ->where('typ_semester_outcome_id', $typ_semester_outcome_id)
+      ->groupBy('typ_semester_course_id')
+      ->get();
+    $array_to_send['courses_transformative_actions'] = DB::table('typ_semester_objectives')
+      ->join('typ_semester_courses', 'typ_semester_courses.typ_semester_objective_id', '=', 'typ_semester_objectives.id')
+      ->join('annual_plan_transformative', 'annual_plan_transformative.typ_semester_course_id', '=', 'typ_semester_courses.id')
+      ->join('transformative_actions', 'transformative_actions.id', '=', 'annual_plan_transformative.trans_id')
+      ->select('typ_semester_course_id', 'annual_plan_transformative.*', 'transformative_actions.*')
+      ->where('typ_semester_outcome_id', $typ_semester_outcome_id)
+      ->groupBy('typ_semester_course_id')
+      ->get();
+    $array_to_send['transformative_outcome'] = DB::table('transformative_actions')
+      ->join('transformative_typ_outcome', 'transformative_actions.id', '=', 'transformative_typ_outcome.trans_id')
+      ->where('typ_semester_outcome_id', $typ_semester_outcome_id)
+      ->get();
+
+    $array_to_send['expected_target'] = DB::table('target_outcomes_program')
+      ->where('program_id', $program_id)
+      ->where('semester_id', $semester_id)
+      ->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/controllers/OutcomesController.php

@@ -1071,8 +1071,8 @@ private function cmp($a, $b) {
         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

@@ -46,7 +46,7 @@ class TransformativeActionsController extends \BaseController
     $types = DB::table('transformative_actions')
       ->select('type_of_TA')
       ->where('type_of_TA', '<>', '')
-      ->distinct()
+      ->groupBy('type_of_TA')
       ->get();
     // if user is program coordinator
 
@@ -1404,4 +1404,112 @@ class TransformativeActionsController extends \BaseController
     }
     return $grouped_courses;
   }
-}
+  public function createTAForOutcome()
+  {
+    $is_custom = Input::get('is_custom');
+    $category = Input::get('category');
+    $is_new = Input::get('is_new');
+    $name = Input::get('name');
+    $description = Input::get('description');
+    $edit_ta_id = Input::get('edit');
+    if ($is_new || $is_custom)
+      $program_id = Input::get('program_id');
+    else $program_id = NULL;
+    $typ_semester_outcome_id = Input::get('typ_semester_outcome_id');
+
+    if (!$edit_ta_id) {
+      $ta_id = DB::table('transformative_actions')->insertGetId(array(
+        'program_id' => $program_id,
+        'type_of_TA' => $category,
+        'at_text' => $name,
+        'description' => $description,
+        'user_id' => Auth::user()->id,
+        'created_at' => date('Y-m-d H:i:s'),
+        'updated_at' => date('Y-m-d H:i:s'),
+        'by_professor' => 0,
+        'is_custom' => $is_custom
+      ));
+      DB::table('transformative_typ_outcome')->insert(array(
+        'trans_id' => $ta_id,
+        'typ_semester_outcome_id' => $typ_semester_outcome_id,
+        'proposing_coordinator_id' => Auth::user()->id,
+
+      ));
+    } else {
+      DB::table('transformative_actions')
+        ->where('id', $edit_ta_id)
+        ->update(array(
+          'program_id' => $program_id,
+          'type_of_TA' => $category,
+          'at_text' => $name,
+          'description' => $description,
+          'user_id' => Auth::user()->id,
+          'created_at' => date('Y-m-d H:i:s'),
+          'updated_at' => date('Y-m-d H:i:s'),
+          'by_professor' => 0,
+          'is_custom' => $is_custom
+        ));
+      $ta_id = $edit_ta_id;
+    }
+    return $ta_id;
+  }
+  public function deleteTaFromOutcome()
+  {
+    DB::table('transformative_actions')
+      ->where('id', Input::get('trans_id'))
+      ->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_04_040351_add_submit_in_typ_program.php

@@ -13,7 +13,7 @@ class AddSubmitInTypProgram extends Migration
 	 */
 	public function up()
 	{
-		Schema::table('courses', function (Blueprint $table) {
+		Schema::table('typ_program', function (Blueprint $table) {
 			$table->boolean('is_submitted');
 		});
 	}
@@ -25,7 +25,7 @@ class AddSubmitInTypProgram extends Migration
 	 */
 	public function down()
 	{
-		Schema::table('courses', function (Blueprint $table) {
+		Schema::table('typ_program', function (Blueprint $table) {
 			$table->dropColumn('is_submitted');
 		});
 	}

app/database/migrations/2022_02_10_194719_add_time_limit_annual_cycle.php

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

app/database/migrations/2022_02_10_195154_add_time_limit_three_year_plan.php

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

app/database/migrations/2022_02_13_122758_create_typ_outcome_report_comments.php

@@ -0,0 +1,43 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateTypOutcomeReportComments extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('typ_outcome_report_comments', function (Blueprint $table) {
+			$table->increments('id');
+			$table->integer('user_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('typ_semester_outcome_id')
+				->references('id')
+				->on('typ_semester_outcome')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('typ_outcome_report_comments');
+	}
+}

app/database/migrations/2022_02_13_122842_add_results_to_transformative_status.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddResultsToTransformativeStatus extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('transformative_action_status', function (Blueprint $table) {
+			$table->text('results')->nullable();
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	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

@@ -64,6 +64,20 @@ class Course extends Eloquent
     //$this->hasMany('Activity')->whereNotNull('activities.outcomes_attempted')->where('activities.draft', 0)->orderBy('date', 'asc');
     return  $this->hasMany('Activity')->whereIn('activities.id', $activitiesAssessed)->orderBy('date', 'asc');
   }
+  public function diagnosticActivities()
+  {
+    $activitiesAssessed = DB::table('activities')
+      ->join('activity_criterion as ac', 'ac.activity_id', '=', 'activities.id')
+      ->join('assessments', 'assessments.activity_criterion_id', '=', 'ac.id')
+      ->where('activities.course_id', $this->id)
+      ->where('activities.draft', 0)
+      ->where('activities.diagnostic', 1)
+      ->select('activities.id')
+      ->distinct()
+      ->lists('activities.id');
+    //$this->hasMany('Activity')
+    return  $this->hasMany('Activity')->whereIn('activities.id', $activitiesAssessed)->orderBy('date', 'asc');
+  }
 
   public function outcomes_attempted()
   {
@@ -181,7 +195,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/Objective.php

@@ -46,6 +46,7 @@ class Objective extends Eloquent
                 ->where('typ_semester_course_id', $course_code->typ_semester_course_id)
                 ->select('transformative_actions.*')
                 ->get();
+
             $course_code->students = Course::getStudentReportForOutcome($course_code);
             Log::info(array($course_code));
             $course_code->criteria = Course::getCriteriaPlanReport($course_code);

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

@@ -166,6 +166,20 @@ Route::group(array('before' => 'auth|has_access'), function () {
     /**
      * Shared Routes
      */
+
+    // 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'));
+    Route::post(
+        'postTransformativeToOutcome',
+        array(
+            'as' => 'postTransformativeToOutcome',
+            'uses' => 'TransformativeActionsController@createTAForOutcome'
+        )
+    );
     Route::post('fetchObjectiveInfo', array(
         'as' => 'fetchObjectiveInfo',
         'uses' => 'AnnualPlansController@fetchObjectiveInfo'
@@ -188,6 +202,13 @@ Route::group(array('before' => 'auth|has_access'), function () {
         'as' => 'fetchAnnualReport',
         'uses' => 'AnnualPlansController@fetchAnnualReport'
     ));
+
+    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}',
         'uses' => 'TransformativeActionsController@postActivityCriterion'

app/views/global/view-three-year-plan.blade.php

@@ -103,10 +103,10 @@
           <li data-cycle-id="{{$typ->id}}" class="list-group-item">{{$typ->year_start}}-{{$typ->year_end}}</li>
         @endforeach
       </div>
-      <br>
+      <br> <!--<button type="button" class="btn btn-secondary" id = "three_year_button" data-toggle="modal" data-target="#three_year">Create Three Year Cycle</button>
+      -->
     </div>
-        <button type="button" class="btn btn-secondary" id = "three_year_button" data-toggle="modal" data-target="#three_year">Create Three Year Cycle</button>
-
+       
 <!-- Modal -->
 <div id="three_year" class="modal fade" role="dialog">
   <div class="modal-dialog">
@@ -138,7 +138,7 @@
 
   </div>
 </div>
-      </div>
+      
    
 
     <div class="col-md-9">

app/views/local/managers/admins/new_assessment_report.blade.php

@@ -29,8 +29,6 @@
 
                     </ol>
                     @foreach ($school->programs as $program)
-
-
                         {{-- <ul id='levelTabs' class="nav nav-tabs" role="tablist">
                         <!-- For each grouped course -->
                         @foreach ($program->courses as $index2 => $course)
@@ -54,18 +52,17 @@
 
                                 <!-- If grouped course has activities that evaluate the outcome -->
                                 @foreach ($program->courses as $index2 => $course)
-
                                     <?php
                                     
                                     /*$sections_evaluating = Course::has('activities')
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ->whereNotNull('outcomes_attempted')
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ->with(array('activities'=>function($query) use(&$outcome){
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    $query->whereNotNull('outcomes_attempted');
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ->where('code', $course->code)->where('number',$course->number)
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ->whereIn('semester_id', Session::get('semesters_ids'))
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ->get();*/
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            ->whereNotNull('outcomes_attempted')
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            ->with(array('activities'=>function($query) use(&$outcome){
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                $query->whereNotNull('outcomes_attempted');
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            ->where('code', $course->code)->where('number',$course->number)
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            ->whereIn('semester_id', Session::get('semesters_ids'))
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            ->get();*/
                                     
                                     $sections_evaluating = Course::has('activities')
                                     
@@ -107,8 +104,8 @@
                                             <h3 style="text-align: center"> Course: {{ $course->code }}
                                                 {{ $course->number }}-{{ $section->section }} </h3>
                                         @endif
+                                        <h4>Non-Diagnostic Activities</h4>
                                         @foreach ($section->publishedActivities as $index4 => $activity)
-
                                             <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
                                             <p style="display: inline;">{{ $activity->name }}
                                                 <strong>({{ $activity->date }})</strong>
@@ -130,7 +127,6 @@
                                                             @else
                                                                 and {{ $rubric_title->text }}
                                                             @endif
-
                                                         @endforeach
                                                         )
                                                     @else
@@ -145,7 +141,6 @@
                                                 <p style="display: inline;">1-{{ $activity->rubric[0]->max_score }} point
                                                     scale
                                                 </p>
-
                                             @endif
                                             <br>
                                             <br>
@@ -217,17 +212,12 @@
 
                                                                 @else
                                                                     <td class="col-md-1 danger">{{ $percentage }}%</td>
-
                                                                 @endif
                                                             @endif
                                                             <td>
 
                                                                 @foreach (Criterion::outcomes($ac_criterion->criterion_id) as $index6 => $outcome)
-
                                                                     <?php echo $outcome->name . "\n\n\n <br>"; ?>
-
-
-
                                                                 @endforeach
 
 
@@ -254,18 +244,12 @@
                                                 <ul style="margin:30px;">
                                                     @foreach ($formative_actions as $criteria)
                                                         <li> <i>{{ $criteria->name }} <i></li>
-
                                                     @endforeach
                                                 </ul>
-
-
-
                                             @endif
                                             <br>
                                             <h5 style="display: inline; margin:30px;">Assessment Comments: </h5>
                                             @if ($activity->assessment_comments != null)
-
-
                                                 <p style="display: inline;">{{ $activity->assessment_comments }}</p>
                                             @endif
                                             <br>
@@ -295,10 +279,9 @@
                                                         ->first(); //->expected_target;
                                                     if (!$expected) {
                                                         $expected = 'It has not been defined in the annual plan';
+                                                    } else {
+                                                        $expected = $expected->expected_target;
                                                     }
-                                                    else{
-                                            $expected = $expected->expected_target;
-                                        }
                                                     ?>
                                                     {{ $expected }}
                                                 </i>
@@ -343,7 +326,6 @@
                                                                 <td class="col-md-1 danger">
                                                                     {{ $outcome->percentage }}%
                                                                 </td>
-
                                                             @endif
 
 
@@ -351,23 +333,250 @@
 
 
                                                         </tr>
+                                                    @endforeach
+                                                </tbody>
+                                            </table>
+
+                                            <br>
+                                            <hr>
+                                        @endforeach
+                                        <h4>Diagnostic Activities</h4>
+                                        @foreach ($section->diagnosticActivities as $index4 => $activity)
+                                            <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
+                                            <p style="display: inline;">{{ $activity->name }}
+                                                <strong>({{ $activity->date }})</strong>
+                                            </p>
+                                            <br>
+                                            <br>
+                                            <h5 style="display: inline;">Performance Indicators: </h5>
+                                            <?php
+                                            Log::info($activity->rubric[0]);
+                                            ?>
+                                            <p style="display: inline;"><i>{{ $activity->rubric[0]->num_scales }} (
+                                                    <?php
+                                                    $titles = $activity->rubric[0]->getTitles();
+                                                    ?>
+                                                    @if (sizeof($titles) != 1)
+                                                        @foreach ($titles as $index5 => $rubric_title)
+                                                            @if ($index5 != $activity->rubric[0]->num_scales - 1)
+                                                                {{ $rubric_title->text }},
+                                                            @else
+                                                                and {{ $rubric_title->text }}
+                                                            @endif
+                                                        @endforeach
+                                                        )
+                                                    @else
+                                                        {{ $titles[0]->text }} )
+                                                    @endif
+                                                </i></p>
+                                            <br>
+                                            <h5 style="display: inline;">Scale: </h5>
+                                            @if ($activity->rubric[0]->max_score == 1)
+                                                <p style="display: inline;">1 point scale</p>
+                                            @else
+                                                <p style="display: inline;">1-{{ $activity->rubric[0]->max_score }} point
+                                                    scale
+                                                </p>
+                                            @endif
+                                            <br>
+                                            <br>
+                                            <h4>Performance of Students by Learning Outcome Criteria</h4>
+                                            <h5 style="display: inline; margin:30px;">Target by criterion: </h5>
+                                            <p style="display: inline;"> <i>{{ $activity->rubric[0]->expected_points }}
+                                                    or
+                                                    more</i>
+                                            </p>
+                                            <br>
+                                            <h5 style="display: inline; margin:30px;">Expected percent of students achieving
+                                                the
+                                                target by criterion: </h5>
+                                            <p style="display: inline;">
+                                                <i>{{ $activity->rubric[0]->expected_percentage }}
+                                                    %</i>
+                                            </p>
+
+                                            <br>
+
+                                            <table class='table table-striped table-condensed datatable'>
+                                                <thead>
+                                                    <tr>
+                                                        <th>
+                                                            Criterion
+                                                        </th>
+                                                        <th>
+                                                            Number of Students Assessed
+                                                        </th>
+                                                        <th>
+                                                            Number of students that achieved the target
+                                                        </th>
+                                                        <th>
+                                                            %
+                                                        </th>
+                                                        <th>
+                                                            Learning Outcomes
+                                                        </th>
+                                                    </tr>
+                                                </thead>
+                                                <tbody>
+                                                    @foreach ($activity->allActivityCriterionInfo() as $index5 => $ac_criterion)
+                                                        <tr>
+                                                            <td> {{ $ac_criterion->name }}</td>
+                                                            <td>{{ Criterion::students_attempted($ac_criterion->criterion_id, $activity->id) }}
+                                                            </td>
+                                                            <td>
+                                                                {{ Criterion::students_achieved($ac_criterion->criterion_id, $activity->id) }}
+
+                                                            </td>
+                                                            <?php
+                                                            
+                                                            $out_att = Criterion::students_attempted($ac_criterion->criterion_id, $activity->id);
+                                                            $out_ach = Criterion::students_achieved($ac_criterion->criterion_id, $activity->id);
+                                                            
+                                                            $percentage = 'N/A';
+                                                            $activity->getOutcomeReport();
+                                                            
+                                                            ?>
+                                                            @if ($out_att == 0)
+                                                                <td class="col-md-1 danger">{{ $percentage }}</td>
+
+                                                            @else
+                                                                <?php
+                                                                $percentage = round(($out_ach / $out_att) * 100, 2);
+                                                                ?>
+                                                                @if ($percentage >= $activity->rubric[0]->expected_percentage)
+                                                                    <td class="col-md-1 success">{{ $percentage }}%</td>
+
+                                                                @else
+                                                                    <td class="col-md-1 danger">{{ $percentage }}%</td>
+                                                                @endif
+                                                            @endif
+                                                            <td>
+
+                                                                @foreach (Criterion::outcomes($ac_criterion->criterion_id) as $index6 => $outcome)
+                                                                    <?php echo $outcome->name . "\n\n\n <br>"; ?>
+                                                                @endforeach
+
 
+                                                            </td>
+                                                        </tr>
                                                     @endforeach
                                                 </tbody>
+
                                             </table>
+                                            <br>
+                                            <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
+                                            <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
+                                            @if ($formative_actions)
+                                                <p style="display: inline;">
+                                                    <u>{{ $formative_actions[0]->at_text }}:
+                                                    </u>
 
+                                                    <i>{{ $formative_actions[0]->description }}
+                                                    </i>
+                                                </p>
+                                                <br>
+                                                <h5 style="display: inline; margin:30px;">Formative Action's Associated
+                                                    Criteria: </h5>
+                                                <ul style="margin:30px;">
+                                                    @foreach ($formative_actions as $criteria)
+                                                        <li> <i>{{ $criteria->name }} <i></li>
+                                                    @endforeach
+                                                </ul>
+                                            @endif
+                                            <br>
+                                            <h5 style="display: inline; margin:30px;">Assessment Comments: </h5>
+                                            @if ($activity->assessment_comments != null)
+                                                <p style="display: inline;">{{ $activity->assessment_comments }}</p>
+                                            @endif
                                             <br>
                                             <hr>
+                                            <br>
 
+                                            <h4>Performance of Students by Learning Outcome</h4>
+                                            <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
+                                            <p style="display: inline;">{{ $activity->name }}
+                                                <strong>({{ $activity->date }})</strong>
+                                            </p>
+                                            <br>
 
+                                            <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
+                                            <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
+                                            </p>
+                                            <br>
+                                            <h5 style="display: inline; margin:30px;">Expected percent of students
+                                                achieving
+                                                the
+                                                target by learning outcome: </h5>
+                                            <p style="display: inline;"> <i>
+                                                    <?php
+                                                    $expected = DB::table('target_outcomes_program')
+                                                        ->where('program_id', $course->program_id)
+                                                        ->where('semester_id', $course->semester_id)
+                                                        ->first(); //->expected_target;
+                                                    if (!$expected) {
+                                                        $expected = 'It has not been defined in the annual plan';
+                                                    } else {
+                                                        $expected = $expected->expected_target;
+                                                    }
+                                                    ?>
+                                                    {{ $expected }}
+                                                </i>
+                                            </p>
+                                            <br>
+                                            <table class='table table-striped table-condensed datatable'>
+                                                <thead>
+                                                    <tr>
+                                                        <th>
+                                                            Learning Outcome
+                                                        </th>
+                                                        <th>
+                                                            Number of Students Assessed
+                                                        </th>
+                                                        <th>
+                                                            Number of students that achieved the target
+                                                        </th>
+                                                        <th>
+                                                            %
+                                                        </th>
 
+                                                    </tr>
+                                                </thead>
+                                                <tbody>
+                                                    @foreach ($activity->getOutcomeReport() as $outcome)
+                                                        <tr>
+                                                            <td>
+                                                                {{ $outcome->name }}
+                                                            </td>
+                                                            <td>
+                                                                {{ $outcome->attempted }}
+                                                            </td>
+                                                            <td>
+                                                                {{ $outcome->achieved }}
+                                                            </td>
+                                                            @if ($outcome->percentage >= $expected)
+                                                                <td class="col-md-1 success">
+                                                                    {{ $outcome->percentage }}%
+                                                                </td>
+
+                                                            @else
+                                                                <td class="col-md-1 danger">
+                                                                    {{ $outcome->percentage }}%
+                                                                </td>
+                                                            @endif
 
 
 
-                                        @endforeach
-                                    @endforeach
 
 
+                                                        </tr>
+                                                    @endforeach
+                                                </tbody>
+                                            </table>
+
+                                            <br>
+                                            <hr>
+                                        @endforeach
+                                    @endforeach
                                 @endforeach
                             </div>
                         </div>
@@ -378,7 +587,6 @@
                 @else
                     <h4>This program has not assessed any activity</h4>
                 @endif
-
             @endforeach
 
         </div>

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/pCoords/new_assessment_report.blade.php

@@ -91,6 +91,7 @@
                             @foreach ($sections_evaluating as $index3 => $section)
                                 <h3 style="text-align: center"> Course: {{ $course->code }}
                                     {{ $course->number }}-{{ $section->section }} </h3>
+                                    <h4>Non Diagnostic Activities</h4>
                                 @foreach ($section->publishedActivities as $index4 => $activity)
 
                                     <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
@@ -336,6 +337,252 @@
 
 
                                 @endforeach
+                                <h4>Diagnostic Activities</h4>
+                                @foreach ($section->diagnosticActivities as $index4 => $activity)
+
+                                <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
+                                <p style="display: inline;">{{ $activity->name }}
+                                    <strong>({{ $activity->date }})</strong>
+                                </p>
+                                <br>
+                                <br>
+                                <h5 style="display: inline;">Performance Indicators: </h5>
+                                <?php
+                                Log::info($activity->rubric[0]);
+                                ?>
+                                <p style="display: inline;"><i>{{ $activity->rubric[0]->num_scales }} (
+                                        <?php
+                                        $titles = $activity->rubric[0]->getTitles();
+                                        ?>
+                                        @if (sizeof($titles) != 1)
+                                            @foreach ($titles as $index5 => $rubric_title)
+                                                @if ($index5 != $activity->rubric[0]->num_scales - 1)
+                                                    {{ $rubric_title->text }},
+                                                @else
+                                                    and {{ $rubric_title->text }}
+                                                @endif
+
+                                            @endforeach
+                                            )
+                                        @else
+                                            {{ $titles[0]->text }} )
+                                        @endif
+                                    </i></p>
+                                <br>
+                                <h5 style="display: inline;">Scale: </h5>
+                                @if ($activity->rubric[0]->max_score == 1)
+                                    <p style="display: inline;">1 point scale</p>
+                                @else
+                                    <p style="display: inline;">1-{{ $activity->rubric[0]->max_score }} point scale
+                                    </p>
+
+                                @endif
+                                <br>
+                                <br>
+                                <h4>Performance of Students by Learning Outcome Criteria</h4>
+                                <h5 style="display: inline; margin:30px;">Target by criterion: </h5>
+                                <p style="display: inline;"> <i>{{ $activity->rubric[0]->expected_points }} or
+                                        more</i>
+                                </p>
+                                <br>
+                                <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
+                                    target by criterion: </h5>
+                                <p style="display: inline;"> <i>{{ $activity->rubric[0]->expected_percentage }} %</i>
+                                </p>
+
+                                <br>
+
+                                <table class='table table-striped table-condensed datatable'>
+                                    <thead>
+                                        <tr>
+                                            <th>
+                                                Criterion
+                                            </th>
+                                            <th>
+                                                Number of Students Assessed
+                                            </th>
+                                            <th>
+                                                Number of students that achieved the target
+                                            </th>
+                                            <th>
+                                                %
+                                            </th>
+                                            <th>
+                                                Learning Outcomes
+                                            </th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        @foreach ($activity->allActivityCriterionInfo() as $index5 => $ac_criterion)
+                                            <tr>
+                                                <td> {{ $ac_criterion->name }}</td>
+                                                <td>{{ Criterion::students_attempted($ac_criterion->criterion_id, $activity->id) }}
+                                                </td>
+                                                <td>
+                                                    {{ Criterion::students_achieved($ac_criterion->criterion_id, $activity->id) }}
+
+                                                </td>
+                                                <?php
+                                                
+                                                $out_att = Criterion::students_attempted($ac_criterion->criterion_id, $activity->id);
+                                                $out_ach = Criterion::students_achieved($ac_criterion->criterion_id, $activity->id);
+                                                
+                                                $percentage = 'N/A';
+                                                $activity->getOutcomeReport();
+                                                
+                                                ?>
+                                                @if ($out_att == 0)
+                                                    <td class="col-md-1 danger">{{ $percentage }}</td>
+
+                                                @else
+                                                    <?php
+                                                    $percentage = round(($out_ach / $out_att) * 100, 2);
+                                                    ?>
+                                                    @if ($percentage >= $activity->rubric[0]->expected_percentage)
+                                                        <td class="col-md-1 success">{{ $percentage }}%</td>
+
+                                                    @else
+                                                        <td class="col-md-1 danger">{{ $percentage }}%</td>
+
+                                                    @endif
+                                                @endif
+                                                <td>
+
+                                                    @foreach (Criterion::outcomes($ac_criterion->criterion_id) as $index6 => $outcome)
+
+                                                        <?php echo $outcome->name . "\n\n\n <br>"; ?>
+
+
+
+                                                    @endforeach
+
+
+                                                </td>
+                                            </tr>
+                                        @endforeach
+                                    </tbody>
+
+                                </table>
+                                <br>
+                                <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
+                                <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
+                                @if ($formative_actions)
+                                    <p style="display: inline;">
+                                        <u>{{ $formative_actions[0]->at_text }}:
+                                        </u>
+
+                                        <i>{{ $formative_actions[0]->description }}
+                                        </i>
+                                    </p>
+                                    <br>
+                                    <h5 style="display: inline; margin:30px;">Formative Action's Associated
+                                        Criteria: </h5>
+                                    <ul style="margin:30px;">
+                                        @foreach ($formative_actions as $criteria)
+                                            <li> <i>{{ $criteria->name }} <i></li>
+
+                                        @endforeach
+                                    </ul>
+
+
+                                @endif
+                                <br>
+                                <h5 style="display: inline; margin:30px;">Assessment Comments: </h5>
+                                @if ($activity->assessment_comments != null)
+
+
+                                    <p style="display: inline;">{{ $activity->assessment_comments }}</p>
+                                @endif
+                                <br>
+                                <hr>
+                                <br>
+
+                                <h4>Performance of Students by Learning Outcome</h4>
+                                <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
+                                <p style="display: inline;">{{ $activity->name }}
+                                    <strong>({{ $activity->date }})</strong>
+                                </p>
+                                <br>
+                                <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
+                                <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
+                                </p>
+                                <br>
+                                <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
+                                    target by learning outcome: </h5>
+                                <p style="display: inline;"> <i>
+                                        <?php
+                                        $expected = DB::table('target_outcomes_program')
+                                            ->where('program_id', $course->program_id)
+                                            ->where('semester_id', $course->semester_id)
+                                            ->first();
+                                        if (!$expected) {
+                                            $expected = 'It has not been defined in the annual plan';
+                                        }
+                                        else{
+                                        $expected = $expected->expected_target;
+                                    }
+                                        ?>
+                                        {{ $expected }}
+                                    </i>
+                                </p>
+                                <br>
+                                <table class='table table-striped table-condensed datatable'>
+                                    <thead>
+                                        <tr>
+                                            <th>
+                                                Learning Outcome
+                                            </th>
+                                            <th>
+                                                Number of Students Assessed
+                                            </th>
+                                            <th>
+                                                Number of students that achieved the target
+                                            </th>
+                                            <th>
+                                                %
+                                            </th>
+
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        @foreach ($activity->getOutcomeReport() as $outcome)
+                                            <tr>
+                                                <td>
+                                                    {{ $outcome->name }}
+                                                </td>
+                                                <td>
+                                                    {{ $outcome->attempted }}
+                                                </td>
+                                                <td>
+                                                    {{ $outcome->achieved }}
+                                                </td>
+                                                @if ($outcome->percentage >= $expected)
+                                                    <td class="col-md-1 success">{{ $outcome->percentage }}%</td>
+
+                                                @else
+                                                    <td class="col-md-1 danger">{{ $outcome->percentage }}%</td>
+
+                                                @endif
+
+
+
+
+
+                                            </tr>
+
+                                        @endforeach
+                                    </tbody>
+                                </table>
+
+                                <br>
+                                <hr>
+
+
+
+
+
+
+                            @endforeach
                             @endforeach
                         </div>
 

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

@@ -105,6 +105,7 @@
                                         <h3 style="text-align: center"> Course: {{ $course->code }}
                                             {{ $course->number }}-{{ $section->section }} </h3>
                                     @endif
+                                    <h4> Non-Diagnostic Activities</h4>
                                     @foreach ($section->publishedActivities as $index4 => $activity)
 
                                         <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
@@ -354,6 +355,256 @@
 
 
                                     @endforeach
+                                    <h4>Diagnostic Activities</h4>
+                                    @foreach ($section->diagnosticActivities as $index4 => $activity)
+
+                                    <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
+                                    <p style="display: inline;">{{ $activity->name }}
+                                        <strong>({{ $activity->date }})</strong>
+                                    </p>
+                                    <br>
+                                    <br>
+                                    <h5 style="display: inline;">Performance Indicators: </h5>
+                                    <?php
+                                    Log::info($activity->rubric[0]);
+                                    ?>
+                                    <p style="display: inline;"><i>{{ $activity->rubric[0]->num_scales }} (
+                                            <?php
+                                            $titles = $activity->rubric[0]->getTitles();
+                                            ?>
+                                            @if (sizeof($titles) != 1)
+                                                @foreach ($titles as $index5 => $rubric_title)
+                                                    @if ($index5 != $activity->rubric[0]->num_scales - 1)
+                                                        {{ $rubric_title->text }},
+                                                    @else
+                                                        and {{ $rubric_title->text }}
+                                                    @endif
+
+                                                @endforeach
+                                                )
+                                            @else
+                                                {{ $titles[0]->text }} )
+                                            @endif
+                                        </i></p>
+                                    <br>
+                                    <h5 style="display: inline;">Scale: </h5>
+                                    @if ($activity->rubric[0]->max_score == 1)
+                                        <p style="display: inline;">1 point scale</p>
+                                    @else
+                                        <p style="display: inline;">1-{{ $activity->rubric[0]->max_score }} point
+                                            scale
+                                        </p>
+
+                                    @endif
+                                    <br>
+                                    <br>
+                                    <h4>Performance of Students by Learning Outcome Criteria</h4>
+                                    <h5 style="display: inline; margin:30px;">Target by criterion: </h5>
+                                    <p style="display: inline;"> <i>{{ $activity->rubric[0]->expected_points }} or
+                                            more</i>
+                                    </p>
+                                    <br>
+                                    <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
+                                        target by criterion: </h5>
+                                    <p style="display: inline;"> <i>{{ $activity->rubric[0]->expected_percentage }}
+                                            %</i>
+                                    </p>
+
+
+                                    <br>
+                                    <table class='table table-striped table-condensed datatable'>
+                                        <thead>
+                                            <tr>
+                                                <th>
+                                                    Criterion
+                                                </th>
+                                                <th>
+                                                    Number of Students Assessed
+                                                </th>
+                                                <th>
+                                                    Number of students that achieved the target
+                                                </th>
+                                                <th>
+                                                    %
+                                                </th>
+                                                <th>
+                                                    Learning Outcomes
+                                                </th>
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                            @foreach ($activity->allActivityCriterionInfo() as $index5 => $ac_criterion)
+                                                <tr>
+                                                    <td> {{ $ac_criterion->name }}</td>
+                                                    <td>{{ Criterion::students_attempted($ac_criterion->criterion_id, $activity->id) }}
+                                                    </td>
+                                                    <td>
+                                                        {{ Criterion::students_achieved($ac_criterion->criterion_id, $activity->id) }}
+
+                                                    </td>
+                                                    <?php
+                                                    
+                                                    $out_att = Criterion::students_attempted($ac_criterion->criterion_id, $activity->id);
+                                                    $out_ach = Criterion::students_achieved($ac_criterion->criterion_id, $activity->id);
+                                                    
+                                                    $percentage = 'N/A';
+                                                    $activity->getOutcomeReport();
+                                                    
+                                                    ?>
+                                                    @if ($out_att == 0)
+                                                        <td class="col-md-1 danger">{{ $percentage }}</td>
+
+                                                    @else
+                                                        <?php
+                                                        $percentage = round(($out_ach / $out_att) * 100, 2);
+                                                        ?>
+                                                        @if ($percentage >= $activity->rubric[0]->expected_percentage)
+                                                            <td class="col-md-1 success">{{ $percentage }}%</td>
+
+                                                        @else
+                                                            <td class="col-md-1 danger">{{ $percentage }}%</td>
+
+                                                        @endif
+                                                    @endif
+                                                    <td>
+
+                                                        @foreach (Criterion::outcomes($ac_criterion->criterion_id) as $index6 => $outcome)
+
+                                                            <?php echo $outcome->name . "\n\n\n <br>"; ?>
+
+
+
+                                                        @endforeach
+
+
+                                                    </td>
+                                                </tr>
+                                            @endforeach
+                                        </tbody>
+
+                                    </table>
+
+                                    <br>
+                                    <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
+                                    <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
+                                    @if ($formative_actions)
+                                        <p style="display: inline;"> <u>{{ $formative_actions[0]->at_text }}:
+                                            </u>
+
+                                            <i>{{ $formative_actions[0]->description }}
+                                            </i>
+                                        </p>
+                                        <br>
+                                        <h5 style="display: inline; margin:30px;">Formative Action's Associated
+                                            Criteria: </h5>
+                                        <ul style="margin:30px;">
+                                            @foreach ($formative_actions as $criteria)
+                                                <li> <i>{{ $criteria->name }} <i></li>
+
+                                            @endforeach
+                                        </ul>
+
+
+
+                                    @endif
+                                    <br>
+                                    <h5 style="display: inline; margin:30px;">Assessment Comments: </h5>
+                                    @if ($activity->assessment_comments != null)
+
+
+                                        <p style="display: inline;">{{ $activity->assessment_comments }}</p>
+                                    @endif
+                                    <hr>
+                                    <br>
+
+
+
+                                    <h4>Performance of Students by Learning Outcome</h4>
+                                    <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
+                                    <p style="display: inline;">{{ $activity->name }}
+                                        <strong>({{ $activity->date }})</strong>
+                                    </p>
+                                    <br>
+                                    <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
+                                    <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
+                                    </p>
+                                    <br>
+                                    <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
+                                        target by learning outcome: </h5>
+                                    <p style="display: inline;"> <i>
+                                            <?php
+                                            $expected = DB::table('target_outcomes_program')
+                                                ->where('program_id', $course->program_id)
+                                                ->where('semester_id', $course->semester_id)
+                                                ->first(); //->expected_target;
+                                            if (!$expected) {
+                                                $expected = 'It has not been defined in the annual plan';
+                                            }
+                                            else{
+                                        $expected = $expected->expected_target;
+                                    }
+                                            ?>
+                                            {{ $expected }}
+                                        </i>
+                                    </p>
+                                    <br>
+                                    <table class='table table-striped table-condensed datatable'>
+                                        <thead>
+                                            <tr>
+                                                <th>
+                                                    Learning Outcome
+                                                </th>
+                                                <th>
+                                                    Number of Students Assessed
+                                                </th>
+                                                <th>
+                                                    Number of students that achieved the target
+                                                </th>
+                                                <th>
+                                                    %
+                                                </th>
+
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                            @foreach ($activity->getOutcomeReport() as $outcome)
+                                                <tr>
+                                                    <td>
+                                                        {{ $outcome->name }}
+                                                    </td>
+                                                    <td>
+                                                        {{ $outcome->attempted }}
+                                                    </td>
+                                                    <td>
+                                                        {{ $outcome->achieved }}
+                                                    </td>
+                                                    @if ($outcome->percentage >= $expected)
+                                                        <td class="col-md-1 success">{{ $outcome->percentage }}%</td>
+
+                                                    @else
+                                                        <td class="col-md-1 danger">{{ $outcome->percentage }}%</td>
+
+                                                    @endif
+
+
+
+
+
+                                                </tr>
+
+                                            @endforeach
+                                        </tbody>
+                                    </table>
+
+                                    <br>
+                                    <hr>
+
+
+
+
+
+
+                                @endforeach
                                 @endforeach
 
 

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

@@ -25,7 +25,6 @@
                 <option value='0'> Nothing Selected</option>
                 @foreach ($annual_plans as $an_plan)
                     <option value={{ $an_plan->annual_id }}>Plan {{ $an_plan->academic_year }}</option>
-
                 @endforeach
             </select>
             <br>
@@ -53,20 +52,27 @@
                     </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>
-                      <tbody>
-                      </tbody>
+                    
 
-                    </table>
                     
-                </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>
+                          <tbody>
+                          </tbody>
+
+                        </table>
+                        
+                    </div>-->
 
                 </div>
             </div>
@@ -80,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);
@@ -90,23 +134,241 @@
             // --------------------------------------------------------------------------
             // 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();
 
             $('#outcome-display').parent().hide();
 
-            // --------------------------------------------------------------------------
-            // Functions
-            // --------------------------------------------------------------------------
+            
+    
 
-            // --------------------------------------------------------------------------
-            // Events
-            // --------------------------------------------------------------------------
+        });
 
-            // When list item is clicked, load corresponding info
+        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();
+                    
+                }
+            )
+        }
+
+
+
+        // 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 to Outcome</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');
@@ -131,11 +393,10 @@
                         $('#allLists').empty();
                         $('#levelTabs').empty();
                         $('.no-outcome').hide();
-                        if(outcome.outcome_program_goal){
+                        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';
+                        } 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>' +
@@ -164,13 +425,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 +452,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) {
@@ -203,22 +473,24 @@
 
                                             }
                                             wholeDict[student.student_id][
-                                                "criteria_attempted"] += student
+                                                    "criteria_attempted"
+                                                ] += student
                                                 .criteria_attempted;
                                             wholeDict[student.student_id][
-                                                "criteria_achieved"] += student
+                                                    "criteria_achieved"
+                                                ] += student
                                                 .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>' +
                                             'Number of Students Assessed </th>' +
                                             '<th>Number of students that achieved the target</th></thead>'
-                                            );
+                                        );
                                         tbody = $('<tbody/>')
                                         $.each(course_code.criteria, function(index, criterion) {
 
@@ -232,27 +504,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();
 
 
                                     }
+    
+                                    
 
 
                                 })
@@ -268,6 +563,11 @@
 
 
                         })
+
+                        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 = [];
 
                         $('#tableOutcome').html(tableStudent);
@@ -326,6 +626,10 @@
 
 
 
+
+
+
+
                         /* table.row.add([
                               objectivesHTML,
                               courseshtml,
@@ -353,6 +657,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');
@@ -526,39 +911,47 @@
                         'class': 'list-group',
                         'id': 'list'
                     });
-                    if(json.outcomes.first){
-                    header5 = $('<h5/>', {
-                        'style': "padding-left: 10px"
-                    }).html("First Semester");
-                    div.append(header5);
-                    list = '';
-                    for (outcome in json.outcomes.first) {
-                        list +=
-                            "<li style='padding-left: 25px' onclick = 'fetchEverything(this)' data-annual-plan = '" +
-                            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>";
+                    if (json.outcomes.first) {
+                        header5 = $('<h5/>', {
+                            'style': "padding-left: 10px"
+                        }).html("First Semester");
+                        div.append(header5);
+                        list = '';
+                        for (outcome in json.outcomes.first) {
+                            list +=
+                                "<li style='padding-left: 25px' onclick = 'fetchEverything(this)' data-annual-plan = '" +
+                                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);
                     }
-                    div.append(list);
-                    }
-                    if(json.outcomes.second){
-                    header4 = $('<h5/>', {
-                        'style': "padding-left: 10px"
-                    }).html("Second Semester");
-                    div.append(header4);
-                    list = '';
-                    for (outcome in json.outcomes.second) {
-                        list +=
-                            "<li style='padding-left: 25px' onclick = 'fetchEverything(this)' data-annual-plan = '" +
-                            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>";
+                    if (json.outcomes.second) {
+                        header4 = $('<h5/>', {
+                            'style': "padding-left: 10px"
+                        }).html("Second Semester");
+                        div.append(header4);
+                        list = '';
+                        for (outcome in json.outcomes.second) {
+                            list +=
+                                "<li style='padding-left: 25px' onclick = 'fetchEverything(this)' data-annual-plan = '" +
+                                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);
                     }
-                    div.append(list);}
                     html = div[0].innerHTML;
 
                     $("#allOutcomes").html(div[0].innerHTML);

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>

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

@@ -97,9 +97,7 @@
                         @foreach ($sections_evaluating as $index3 => $section)
                             <h3 style="text-align: center"> Course: {{ $course->code }}
                                 {{ $course->number }}-{{ $section->section }}</h3>
-                            <?php
-                            Log::info($section->publishedActivities);
-                            ?>
+                                <h4> Non-diagnostic Activities</h4>
                             @foreach ($section->publishedActivities as $index4 => $activity)
 
                                 <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
@@ -355,6 +353,263 @@
 
 
                             @endforeach
+                            <h4>Diagnostic Activities</h4>
+                            @foreach ($section->diagnosticActivities as $index4 => $activity)
+
+                                <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
+                                <p style="display: inline;">{{ $activity->name }}
+                                    <strong>({{ $activity->date }})</strong>
+                                </p>
+                                <br>
+                                <br>
+                                <h5 style="display: inline;">Performance Indicators: </h5>
+                                <?php
+                                Log::info($activity->rubric[0]);
+                                ?>
+                                <p style="display: inline;"><i>{{ $activity->rubric[0]->num_scales }} (
+                                        <?php
+                                        $titles = $activity->rubric[0]->getTitles();
+                                        ?>
+                                        @if (sizeof($titles) != 1)
+                                            @foreach ($titles as $index5 => $rubric_title)
+                                                @if ($index5 != $activity->rubric[0]->num_scales - 1)
+                                                    {{ $rubric_title->text }},
+                                                @else
+                                                    and {{ $rubric_title->text }}
+                                                @endif
+
+                                            @endforeach
+                                            )
+                                        @else
+                                            {{ $titles[0]->text }} )
+                                        @endif
+                                    </i></p>
+                                <br>
+                                <h5 style="display: inline;">Scale: </h5>
+                                @if ($activity->rubric[0]->max_score == 1)
+
+                                    <p style="display: inline;">1 point scale</p>
+                                @else
+                                    <p style="display: inline;">1-{{ $activity->rubric[0]->max_score }} point scale</p>
+
+                                @endif
+                                <br>
+                                <br>
+                                <h4>Performance of Students by Learning Outcome Criteria</h4>
+                                <h5 style="display: inline; margin:30px;">Target by criterion: </h5>
+                                <p style="display: inline;"> <i>{{ $activity->rubric[0]->expected_points }} or more</i>
+                                </p>
+                                <br>
+                                <h5 style="display: inline; margin:30px;">Expected percent of students achieving the target
+                                    by criterion: </h5>
+                                <p style="display: inline;"> <i>{{ $activity->rubric[0]->expected_percentage }} %</i>
+                                </p>
+
+                                <br>
+
+
+                                <table class='table table-striped table-condensed datatable'>
+                                    <thead>
+                                        <tr>
+                                            <th>
+                                                Criterion
+                                            </th>
+                                            <th>
+                                                Number of Students Assessed
+                                            </th>
+                                            <th>
+                                                Number of students that achieved the target
+                                            </th>
+                                            <th>
+                                                %
+                                            </th>
+                                            <th>
+                                                Learning Outcomes
+                                            </th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        @foreach ($activity->allActivityCriterionInfo() as $index5 => $ac_criterion)
+                                            <tr>
+                                                <td> {{ $ac_criterion->name }}</td>
+                                                <td>{{ Criterion::students_attempted($ac_criterion->criterion_id, $activity->id) }}
+                                                </td>
+                                                <td>
+                                                    {{ Criterion::students_achieved($ac_criterion->criterion_id, $activity->id) }}
+
+                                                </td>
+                                                <?php
+                                                
+                                                $out_att = Criterion::students_attempted($ac_criterion->criterion_id, $activity->id);
+                                                $out_ach = Criterion::students_achieved($ac_criterion->criterion_id, $activity->id);
+                                                
+                                                $percentage = 'N/A';
+                                                $activity->getOutcomeReport();
+                                                
+                                                ?>
+
+                                                @if ($out_att == 0)
+                                                    <td class="col-md-1 danger">{{ $percentage }}</td>
+
+                                                @else
+                                                    <?php
+                                                    $percentage = round(($out_ach / $out_att) * 100, 2);
+                                                    ?>
+                                                    @if ($percentage >= $activity->rubric[0]->expected_percentage)
+                                                        <td class="col-md-1 success">{{ $percentage }}%</td>
+
+                                                    @else
+                                                        <td class="col-md-1 danger">{{ $percentage }}%</td>
+
+                                                    @endif
+
+
+
+                                                @endif
+
+
+
+                                                <td>
+
+
+                                                    @foreach (Criterion::outcomes($ac_criterion->criterion_id) as $index6 => $outcome)
+
+                                                        <?php echo $outcome->name . "\n\n\n <br>"; ?>
+
+
+
+                                                    @endforeach
+
+
+                                                </td>
+                                            </tr>
+                                        @endforeach
+                                    </tbody>
+
+                                </table>
+                                <br>
+                                <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
+                                <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
+                                @if ($formative_actions)
+                                    <p style="display: inline;"> <u>{{ $formative_actions[0]->at_text }}:
+                                        </u>
+
+                                        <i>{{ $formative_actions[0]->description }}
+                                        </i>
+                                    </p>
+                                    <br>
+                                    <h5 style="display: inline; margin:30px;">Formative Action's Associated
+                                        Criteria: </h5>
+                                    <ul style="margin:30px;">
+                                        @foreach ($formative_actions as $criteria)
+                                            <li> <i>{{ $criteria->name }} <i></li>
+
+                                        @endforeach
+                                    </ul>
+                                @endif
+                                <br>
+
+                                <h5 style="display: inline; margin:30px;">Assessment Comments: </h5>
+                                @if ($activity->assessment_comments != null)
+
+
+                                    <p style="display: inline;">{{ $activity->assessment_comments }}</p>
+                                @endif
+                                <br>
+                                <hr>
+                                <br>
+
+                                <h4>Performance of Students by Learning Outcome</h4>
+                                <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5><br>
+                                <p style="display: inline;">{{ $activity->name }}
+                                    <strong>({{ $activity->date }})</strong>
+                                </p>
+                                <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
+                                <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
+                                </p>
+                                <br>
+                                <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
+                                    target
+                                    by learning outcome: </h5>
+                                <p style="display: inline;"> <i>
+                                        <?php
+                                        $expected = DB::table('target_outcomes_program')
+                                            ->where('program_id', $course->program_id)
+                                            ->where('semester_id', $course->semester_id)
+                                            ->first(); //->expected_target;
+                                        if (!$expected) {
+                                            
+                                             $expected = 'It has not been defined in the annual plan';
+                                        }
+                                        else{
+                                            $expected = $expected->expected_target;
+                                        }
+                                        
+                                        ?>
+                                        {{ $expected }}
+                                    </i>
+                                </p>
+                                <br>
+                                <table class='table table-striped table-condensed datatable'>
+                                    <thead>
+                                        <tr>
+                                            <th>
+                                                Learning Outcome
+                                            </th>
+                                            <th>
+                                                Number of Students Assessed
+                                            </th>
+                                            <th>
+                                                Number of students that achieved the target
+                                            </th>
+                                            <th>
+                                                %
+                                            </th>
+
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        @foreach ($activity->getOutcomeReport() as $outcome)
+                                            <tr>
+                                                <td>
+                                                    {{ $outcome->name }}
+                                                </td>
+                                                <td>
+                                                    {{ $outcome->attempted }}
+                                                </td>
+                                                <td>
+                                                    {{ $outcome->achieved }}
+                                                </td>
+                                                @if ($outcome->percentage >= $expected)
+                                                    <td class="col-md-1 success">{{ $outcome->percentage }}%</td>
+
+                                                @else
+                                                    <td class="col-md-1 danger">{{ $outcome->percentage }}%</td>
+
+                                                @endif
+
+
+
+
+
+                                            </tr>
+
+                                        @endforeach
+                                    </tbody>
+                                </table>
+
+                                <br>
+                                <hr>
+
+
+
+
+
+
+
+
+                            @endforeach
+                            
                         @endforeach
                     </div>