Utlimo push con el boton de save diagnostic y tablas terminadas

app/controllers/ActivitiesController.php

@@ -51,6 +51,7 @@ class ActivitiesController extends \BaseController
 
             // Gabriel añadió aquí
             $activity->draft = 1;
+            $activity->diagnostic = 0;
             //
             $activity->date = date('Y-m-d');
 
@@ -283,11 +284,12 @@ class ActivitiesController extends \BaseController
                         }
                     }
                     $activity_draft = Input::get('draft');
+                    $activity_diagnostic = Input::get('diagnostic');
                     Log::info(json_encode($weights));
                     foreach ($weights as $act_crit => $weigh) {
                         DB::update("update activity_criterion set weight = {$weigh} where id = {$act_crit}");
                     }
-                    DB::update("update activities set draft = {$activity_draft} where id = {$activity_id}");
+                    DB::update("update activities set draft = {$activity_draft}, diagnostic = {$activity_diagnostic} where id = {$activity_id}");
                     // Outcome count
                     Session::flash('status', 'success');
                     Session::flash('message', 'Assessment Saved. To add transforming actions click "Transforming Actions".');

app/controllers/AnnualPlansController.php

@@ -146,8 +146,36 @@ class AnnualPlansController extends \BaseController
 
 
     $program = Program::where('id', '=', $program_id)->first();
-    $annual_plans = DB::select("select academic_year, semester_start, semester_end, program_id, annual_plans.id as id from annual_plans, annual_cycle where program_id = {$program_id} and annual_cycle.id = annual_plans.annual_cycle_id order by annual_plans.id desc ");
-    Log::info($annual_plans);
+
+    //Dame los annual plans que esten dentro del three year plan
+
+
+    $annual_plans = DB::select("
+    
+    select 
+      academic_year, 
+      semester_start, 
+      semester_end, 
+      program_id, 
+      annual_plans.id as id 
+    from annual_plans 
+    join annual_cycle on annual_cycle_id = annual_cycle.id 
+    where program_id = 110 
+    and(
+      semester_start in(
+        select semester_id 
+        from typ_semester_outcome 
+        join typ_program on typ_semester_outcome.typ_program_id = typ_program.id 
+        where program_id = {$program_id} )
+      or semester_end in(
+        select semester_id 
+        from typ_semester_outcome 
+        join typ_program on typ_semester_outcome.typ_program_id = typ_program.id 
+        where program_id = {$program_id} )
+      )
+      order by semester_start desc");
+    // $annual_plans = DB::select("select academic_year, semester_start, semester_end, program_id, annual_plans.id as id from annual_plans, annual_cycle where program_id = {$program_id} and annual_cycle.id = annual_plans.annual_cycle_id order by annual_plans.id desc ");
+    // Log::info($annual_plans);
     $outcomes = array();
     $allSemesterOrder = array();
     /*foreach ($annual_plans as $an_plan) {
@@ -157,8 +185,8 @@ class AnnualPlansController extends \BaseController
       $outcomes[$an_plan->id]["second"] = 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 in (select id from typ_program where program_id ={$an_plan->program_id} and three_year_plan_id = {$current_typ->id} ))");
       $allSemesterOrder[$an_plan->id]["second"] = DB::select("select * from semesters where id = {$an_plan->semester_end}")[0];
     }*/
-    $alltyp = DB::select('select * from three_year_plan order by id desc');
-    $current_typ = $current_typ->id;
+    //$alltyp = DB::select('select * from three_year_plan order by id desc');
+    //$current_typ = $current_typ->id;
     return View::make('local.managers.shared.annual-plans', compact('title', 'annual_plans', 'current_typ', 'program', 'outcomes', 'allSemesterOrder', 'alltyp'));
   }
 
@@ -172,7 +200,18 @@ class AnnualPlansController extends \BaseController
       ->first();
 
     $years = explode('-', $an_plan->academic_year);
-    $current_typ_program = DB::select("select * from typ_program where program_id = {$an_plan->program_id} and three_year_plan_id in (select id from three_year_plan where year_start <= {$years[0]} and year_end>= {$years[1]})")[0];
+    $current_typ_program = DB::table('typ_program')
+      ->join('typ_semester_outcome', 'typ_semester_outcome.typ_program_id', '=', 'typ_program.id')
+
+
+      ->where('program_id', $an_plan->program_id)
+      ->where('semester_id', $an_plan->semester_start)
+      ->select('typ_program.*')
+      ->first();
+    Log::info(array($an_plan));
+    Log::info(array($current_typ_program));
+
+    //DB::select("select * from typ_program where program_id = {$an_plan->program_id} and three_year_plan_id in (select id from three_year_plan where year_start <= {$years[0]} and year_end>= {$years[1]})")[0];
 
 
     $json_to_send = [];
@@ -525,4 +564,37 @@ class AnnualPlansController extends \BaseController
 
     return $all_courses_info;
   }
+  public function selectProgramPlan()
+  {
+
+    $title = "Program Annual Reports";
+    $programs = Auth::user()->school->programs;
+
+
+
+    return View::make('local.managers.shared.annual_select', compact('title', 'programs'));
+  }
+
+
+
+  public function fetchReportWithOutcome()
+  {
+    $program_id = Input::get('program_id');
+    $semester_id = Input::get('semester_id');
+    $annual_plan_id = Input::get('annual_plan_id');
+    $outcome_id = Input::get('outcome_id');
+
+    $outcome = Outcome::where('id', $outcome_id)->first();
+    $outcome->objectives = $outcome->fetchObjectivesReport($semester_id, $program_id);
+    $outcome->outcome_program_goal = DB::table('target_outcomes_program')
+      ->where('program_id', $program_id)
+      ->where('semester_id', $semester_id)
+      ->first()->expected_target;
+
+    foreach ($outcome->objectives as $index => $objective) {
+      $objective->courses = Objective::getPlanReport($objective);
+    }
+
+    return $outcome;
+  }
 }

app/controllers/OutcomesController.php

@@ -896,6 +896,7 @@ class OutcomesController extends \BaseController
                             ->join('activity_criterion as ac', 'ac.activity_id', '=', 'activities.id')
                             ->join('assessments', 'assessments.activity_criterion_id', '=', 'ac.id')
                             ->where('activities.draft', 0)
+                            ->where('activities.diagnostic', 0)
                             ->select('courses.*')->distinct()
                             ->whereIn('semester_id', Session::get('semesters_ids'))
                             ->groupBy(array('code', 'number'));
@@ -911,11 +912,11 @@ class OutcomesController extends \BaseController
      */
     public function schoolAssessmentReport($outcome_id)
     {
-        //$outcome = Outcome::find($outcome_id);
+        $outcome = Outcome::find($outcome_id);
 
         //if (!$outcome)
         //    App::abort('404');
-        $title = "Assessment Report: " . $outcome->name;
+        $title = "School Assessment Reports";
 
 
         $school = School::where('id', Auth::user()->school_id)
@@ -930,6 +931,7 @@ class OutcomesController extends \BaseController
                             ->join('activity_criterion as ac', 'ac.activity_id', '=', 'activities.id')
                             ->join('assessments', 'assessments.activity_criterion_id', '=', 'ac.id')
                             ->where('activities.draft', 0)
+                            ->where('activities.diagnostic', 0)
                             ->select('courses.*')->distinct()
                             //->whereNotNull('outcomes_attempted')
 
@@ -939,7 +941,7 @@ class OutcomesController extends \BaseController
             }))
             ->first();
 
-        return View::make('local.managers.sCoords.assessment_report', compact('title', 'school'));
+        return View::make('local.managers.sCoords.assessment_report', compact('title', 'school', 'outcome'));
     }
 
     /**
@@ -964,6 +966,7 @@ class OutcomesController extends \BaseController
                     ->join('activity_criterion as ac', 'ac.activity_id', '=', 'activities.id')
                     ->join('assessments', 'assessments.activity_criterion_id', '=', 'ac.id')
                     ->where('activities.draft', 0)
+                    ->where('activities.diagnostic', 0)
                     ->select('courses.*')->distinct()
 
                     ->whereIn('semester_id', Session::get('semesters_ids'))
@@ -1002,13 +1005,15 @@ class OutcomesController extends \BaseController
         //if (!$outcome)
         //    App::abort('404');
         $title = "My Courses' Assessment Report";
-        $activity_criterion = DB::table('assessments')->lists('activity_criterion_id');
+        //$activity_criterion = DB::table('assessments')->lists('activity_criterion_id');
         $courses = DB::table("courses")
             ->join('activities', 'activities.course_id', '=', 'courses.id')
             ->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
-            ->whereIn('activity_criterion.id', $activity_criterion)
+            ->join('assessments', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
+            //->whereIn('activity_criterion.id', $activity_criterion)
             ->where('courses.user_id', '=', Auth::user()->id)
             ->where('activities.draft', '=', 0)
+            ->where('activities.diagnostic', 0)
             ->whereIn('courses.semester_id', Session::get('semesters_ids'))
             ->groupBy(array('code', 'number'))
             ->get();
@@ -1039,14 +1044,36 @@ class OutcomesController extends \BaseController
         $title = "Program Courses Report";
 
 
-        $annual_plans = DB::table('annual_plans')
-            ->join('annual_cycle', 'annual_plans.annual_cycle_id', '=', 'annual_cycle.id')
-            ->where('program_id', $program_id)
-            ->orderBy('semester_start', 'DESC')
-            ->select('*', 'annual_plans.id as annual_id')
-            ->get();
+        $annual_plans = $annual_plans = DB::select("
+    
+        select 
+          academic_year, 
+          semester_start, 
+          semester_end, 
+          program_id, 
+          annual_plans.id as annual_id,
+          annual_cycle.*
+        from annual_plans 
+        join annual_cycle on annual_cycle_id = annual_cycle.id 
+        where program_id = 110 
+        and(
+          semester_start in(
+            select semester_id 
+            from typ_semester_outcome 
+            join typ_program on typ_semester_outcome.typ_program_id = typ_program.id 
+            where program_id = {$program_id} )
+          or semester_end in(
+            select semester_id 
+            from typ_semester_outcome 
+            join typ_program on typ_semester_outcome.typ_program_id = typ_program.id 
+            where program_id = {$program_id} )
+          )
+          order by semester_start desc");
+        $program = DB::table('programs')
+            ->where('id', $program_id)
+            ->first();
 
 
-        return View::make('local.managers.pCoords.annual_report', compact('title', 'program_id', 'annual_plans'));
+        return View::make('local.managers.shared.annual_report', compact('title', 'program_id', 'annual_plans', 'program'));
     }
 }

app/controllers/ProgramsController.php

@@ -78,6 +78,7 @@ class ProgramsController extends \BaseController
       ->leftJoin('activities', function ($query) {
         $query->on('activities.course_id', '=', 'courses.id');
         $query->on('activities.draft', '=', DB::raw('0'));
+        $query->on('activities.diagnostic', '=', DB::raw('0'));
       })
       ->with('semester')
       ->with('program')

app/controllers/SchoolCoordinatorsController.php

@@ -227,6 +227,7 @@ class SchoolCoordinatorsController extends \BaseController
                     ->join('activity_criterion as ac', 'ac.activity_id', '=', 'activities.id')
                     ->join('assessments', 'assessments.activity_criterion_id', '=', 'ac.id')
                     ->where('activities.draft', 0)
+                    ->where('activities.diagnostic', 0)
                     ->select('courses.*')->distinct();
             }))->where('is_graduate', 0)->where('school_id', $school->id)->orderBy('name', 'asc')->get();
 
@@ -304,6 +305,7 @@ class SchoolCoordinatorsController extends \BaseController
                     ->join('activity_criterion as ac', 'ac.activity_id', '=', 'activities.id')
                     ->join('assessments', 'assessments.activity_criterion_id', '=', 'ac.id')
                     ->where('activities.draft', 0)
+                    ->where('activities.diagnostic', 0)
                     ->select('courses.*')->distinct();
             }))->where('is_graduate', 1)->where('school_id', $school->id)->orderBy('name', 'asc')->get();
 

app/controllers/TransformativeActionsController.php

@@ -1343,6 +1343,7 @@ class TransformativeActionsController extends \BaseController
           ->join('transformative_actions', 'transformative_activity_criterion.trans_action_id', '=', 'transformative_actions.id')
           ->where('activities.course_id', $section->id)
           ->where('activities.draft', 0)
+          ->where('activities.diagnostic', 0)
           ->where('criterion_objective_outcome.outcome_id', $outcome_id)
           ->select('activities.id as activity_id', 'activities.name')
           ->addSelect('transformative_actions.*', 'transformative_activity_criterion.trans_action_id as trans_action_id')

app/database/migrations/2021_12_20_181154_add_diagnostic_to_activity.php

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

app/models/Course.php

@@ -57,6 +57,7 @@ class Course extends Eloquent
       ->join('assessments', 'assessments.activity_criterion_id', '=', 'ac.id')
       ->where('activities.course_id', $this->id)
       ->where('activities.draft', 0)
+      ->where('activities.diagnostic', 0)
       ->select('activities.id')
       ->distinct()
       ->lists('activities.id');
@@ -90,6 +91,7 @@ class Course extends Eloquent
       ->select('criterion_id', 'activity_criterion.id as activity_criterion_id')
       ->where('courses.id', $this->id)
       ->where('draft', 0)
+      ->where('activities.diagnostic', 0)
       ->get();
 
     // Old data was formed like { "outcome1": cuantity_of_criteria_associated, "outcome2":cuantity_of_criteria}
@@ -112,7 +114,132 @@ class Course extends Eloquent
 
     return $outcomes_attempted;
   }
-
+  public static function getCriteriaPlanReport($course_code = null)
+  {
+    if ($course_code) {
+      $criteria_id = DB::table('annual_plan_objective')
+        ->where('typ_semester_course_id', $course_code->typ_semester_course_id)
+        ->lists('criteria_id');
+      Log::info($course_code->typ_semester_course_id);
+      Log::info("dame ese id");
+      $program = Program::where('id', $course_code->program_id)->first();
+      // Log::info($program->code);
+      if ($program->code == "") {
+        $program_ids = DB::table('programs')
+          ->where('school_id', $program->school->id)
+          ->lists('programs.id');
+        //Log::info("estamos");
+      } else $program_ids = array($program->id);
+
+      /*tabla es asi por curso codigo
+      *
+      *criterioDelPlan    EstudiantesDelProgramaQuePasaron   EstudiantesqueIntentaron
+      *    
+      *    criterio1                 3                             5
+      *    criterio2                 2                             2
+      *
+      *
+      */
+      $table_per_criterion = DB::table('program_student_semester')
+        ->join('course_student', 'program_student_semester.student_id', '=', 'course_student.student_id')
+        ->join('courses', 'courses.id', '=', 'course_student.course_id')
+        ->join('activities', 'activities.course_id', '=', 'courses.id')
+        ->join('activity_criterion', 'activities.id', '=', 'activity_criterion.activity_id')
+        ->join('criteria', 'criteria.id', '=', 'activity_criterion.criterion_id')
+        ->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
+        ->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
+
+        ->join('assessments', function ($join) {
+          $join->on("assessments.student_id", '=', 'program_student_semester.student_id')
+            ->on('assessments.activity_criterion_id', '=', 'activity_criterion.id');
+        })
+        ->where('courses.semester_id', $course_code->semester_id)
+        ->whereIn('courses.program_id', $program_ids)
+        ->where('courses.code', $course_code->code)
+        ->where('courses.number', $course_code->number)
+        ->whereIn('program_student_semester.program_id', $program_ids)
+        ->whereIn('activity_criterion.criterion_id', $criteria_id)
+        ->whereIn('criteria.id', $criteria_id)
+        ->where('program_student_semester.semester_id', $course_code->semester_id)
+        ->select('criteria.*')
+        ->addSelect(DB::raw('count(case when assessments.score>= rubrics.expected_points then 1 else null end) as criteria_achieved'))
+        ->addSelect(DB::raw('count(assessments.activity_criterion_id) as criteria_attempted'))
+        ->groupBy('criteria.id');
+
+      /* Log::info($table_per_criterion->toSql());
+      Log::info(array($course_code));
+      Log::info($program_ids);
+      Log::info($criteria_id);*/
+      Log::info('mera 1');
+      Log::info(array($course_code));
+      Log::info($table_per_criterion->get());
+      return $table_per_criterion->get();
+    }
+  }
+  public static function getStudentReportForOutcome($course_code = null)
+  {
+    if ($course_code) {
+      $criteria_id = DB::table('annual_plan_objective')
+        ->where('typ_semester_course_id', $course_code->typ_semester_course_id)
+        ->lists('criteria_id');
+      $program = Program::where('id', $course_code->program_id)->first();
+      // // Log::info($program->code);
+      if ($program->code == "") {
+        $program_ids = DB::table('programs')
+          ->where('school_id', $program->school->id)
+          ->lists('programs.id');
+        //    Log::info("estamos");
+      } else $program_ids = array($program->id);
+
+      // Log::info(array($course_code));
+
+      //Table
+      /* Student  criterion_attempted criterion passed
+      *     1             2                   1
+      *     2             7                   4
+      *
+      *
+      */
+      $table_per_student = DB::table('program_student_semester')
+        ->join('course_student', 'program_student_semester.student_id', '=', 'course_student.student_id')
+        ->join('courses', 'courses.id', '=', 'course_student.course_id')
+        ->join('activities', 'activities.course_id', '=', 'courses.id')
+        ->join('activity_criterion', 'activities.id', '=', 'activity_criterion.activity_id')
+        ->join('criteria', 'criteria.id', '=', 'activity_criterion.criterion_id')
+        ->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
+        ->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
+
+        ->join('assessments', function ($join) {
+          $join->on("assessments.student_id", '=', 'program_student_semester.student_id')
+            ->on('assessments.activity_criterion_id', '=', 'activity_criterion.id');
+        })
+        ->where('courses.semester_id', $course_code->semester_id)
+        ->whereIn('courses.program_id', $program_ids)
+        ->where('courses.code', $course_code->code)
+        ->where('courses.number', $course_code->number)
+        ->whereIn('program_student_semester.program_id', $program_ids)
+        ->whereIn('activity_criterion.criterion_id', $criteria_id)
+        ->where('program_student_semester.semester_id', $course_code->semester_id)
+        ->select('course_student.student_id')
+        ->addSelect(DB::raw('count(assessments.activity_criterion_id) as criteria_attempted'))
+        ->addSelect(DB::raw('count(case when assessments.score>=rubrics.expected_points then 1 else NULL end) as criteria_achieved'))
+        ->groupBy('course_student.student_id');
+
+
+
+
+
+      //Log::info($criteria_id);
+
+      //Log::info($program_ids);
+
+      //Log::info($table_per_student->toSql());
+      $students = $table_per_student->get();
+
+
+      return $students;
+    }
+  }
   public function getReportObject()
   {
     $reportObject = new stdClass();
@@ -132,7 +259,7 @@ class Course extends Eloquent
       ->where('courses.id', $this->id)
       ->groupBy('criteria.id')
       ->get();
-    Log::info($this->id);
+    //Log::info($this->id);
     $reportObject->outcomesReport = DB::table('courses')
       ->join('activities', 'activities.course_id', '=', 'courses.id')
       ->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
@@ -166,6 +293,7 @@ class Course extends Eloquent
       ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
       ->where('courses.id', '=', $this->id)
       ->where('activities.draft', 0)
+      ->where('activities.diagnostic', 0)
       ->select(
         'criteria.id',
         'rubrics.expected_percentage as expected_percentage_students_achieving'/*'expected_percentage_students_achieving',*/,
@@ -226,6 +354,7 @@ class Course extends Eloquent
         $this->program_id
       )
       ->where('activities.draft', 0)
+      ->where('activities.diagnostic', 0)
       ->groupBy('courses.id')
       ->count();
 

app/models/Objective.php

@@ -23,7 +23,31 @@ class Objective extends Eloquent
      *
      * @return Illuminate\Database\Eloquent\Model
      */
+    //Must have typ_semester_objective_id, program_id,semester_id to work
 
+    //funciona con Outcome::getObjectivesReport
+    //Es como la imagen suelta por el app llamada, tabla_estudiantes.jpg
+    //
+    public static function getPlanReport($objective)
+    {
+        $course_codes = DB::table('typ_semester_courses')
+            ->join('courses', 'courses.id', '=', 'typ_semester_courses.course_id')
+            ->where('typ_semester_objective_id', $objective->typ_semester_objective_id)
+            ->where('courses.program_id', $objective->program_id)
+            ->select('courses.code', 'courses.number', 'typ_semester_courses.id as typ_semester_course_id', DB::raw("'{$objective->semester_id}' as semester_id"), "courses.program_id")
+            ->get();
+        Log::info($course_codes);
+
+        //$course_codes['studentPerOutcome'] = array();
+
+        foreach ($course_codes as $course_code) {
+
+            $course_code->students = Course::getStudentReportForOutcome($course_code);
+            Log::info(array($course_code));
+            $course_code->criteria = Course::getCriteriaPlanReport($course_code);
+        }
+        return $course_codes;
+    }
     public function outcomes()
     {
         return $this->belongsToMany('Outcome', 'objective_outcome', 'objective_id', 'outcome_id');

app/models/Outcome.php

@@ -14,6 +14,34 @@ class Outcome extends Eloquent
 		return $this->hasManyThrough('Criterion', 'Objective')->orderBy('name');
 	}
 
+
+	public function fetchObjectivesReport($semester_id, $program_id)
+	{
+		/*$objectives = DB::table('typ_semester_outcome')
+			->join('typ_semester_objectives', 'typ_semester_objectives.typ_semester_outcome_id', '=', 'typ_semester_outcome.id')
+			->join('objectives', 'objectives.id', '=', 'typ_semester_objectives.objective_id')
+			->join("typ_program", 'typ_program.id', '=', 'typ_semester_outcome.typ_program_id')
+			->where('typ_semester_outcome.semester_id', $semester_id)
+			->where('typ_program.program_id', $program_id)
+			->where('typ_semester_outcome.outcome_id', $this->id)
+			->select('objectives.*')
+			->get();*/
+
+		$objectives = DB::table('objectives')
+			->join('typ_semester_objectives', 'typ_semester_objectives.objective_id', '=', 'objectives.id')
+			->join('typ_semester_outcome', 'typ_semester_outcome.id', '=', 'typ_semester_objectives.typ_semester_outcome_id')
+			->join('typ_program', 'typ_program.id', '=', 'typ_semester_outcome.typ_program_id')
+			->where('semester_id', $semester_id)
+			->where('program_id', $program_id)
+			->where('outcome_id', $this->id)
+			->select('objectives.*', 'typ_semester_objectives.id as typ_semester_objective_id', 'program_id', 'semester_id')
+			->distinct();
+		Log::info($objectives->toSql());
+		Log::info('semester_program_outcome' . $semester_id . ',' . $program_id . ',' . $this->id);
+
+
+		return $objectives->get();
+	}
 	/**
 	 * Return the objectives that the outcome belongs to
 	 *

app/models/Program.php

@@ -42,7 +42,8 @@ class Program extends Eloquent
 
 		return $this->hasManyThrough('Activity', 'Course')
 			//->whereNotNull('activities.outcomes_attempted')
-			->where('activities.draft', 0)->whereIn('semester_id', Session::get('semesters_ids'));
+			->where('activities.draft', 0)
+			->where('activities.diagnostic', 0)->whereIn('semester_id', Session::get('semesters_ids'));
 	}
 
 	public function assessesOutcome($outcome_id)
@@ -70,7 +71,7 @@ class Program extends Eloquent
 
 	public function objectives()
 	{
-		
+
 		return $this->hasMany('Objective');
 	}
 

app/routes.php

@@ -167,6 +167,16 @@ Route::group(array('before' => 'auth|has_access'), function () {
      * Shared Routes
      */
 
+    Route::get('selectAnnualProgram', array(
+        'as' => 'selectAnnualProgram',
+        'uses' => 'AnnualPlansController@selectProgramPlan'
+    ));
+
+    Route::post("fetchReportWithOutcome", array(
+        'as' => 'fetchReportWithOutcome',
+        'uses' => 'AnnualPlansController@fetchReportWithOutcome'
+    ));
+
     Route::get('annual_plan_report/{program_id}', array(
         'as' => 'annual_plan_report/{program_id}',
         'uses' => 'OutcomesController@annualReport'
@@ -283,7 +293,8 @@ Route::group(array('before' => 'auth|has_access'), function () {
     Route::get('professor', 'ProfessorsController@overview');
 
     // Assessment reports for users' courses
-    Route::get('my-assessment-reports', 'OutcomesController@professorAssessmentReports');
+
+    Route::get('my-assessment-reports', 'OutcomesController@professorAssessmentReport');
     Route::post('objectives/fetch', array('before' => 'csrf', 'uses' => 'ObjectivesController@fetch'));
 
     // Transformative Actions for p-coordinators and professors

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

@@ -114,7 +114,7 @@ Log::info($activity->rubric[0]);
 
 ?>
                                                     <!-- If activity has a rubric and the rubric has the outcome being evaluated -->
-                                                    @if($activity->draft == 0 && array_key_exists($outcome->id, $activity->o_att_array) && $activity->o_att_array[$outcome->id] >=1 && isset($section)&& isset($activity->rubric[0]))
+                                                    @if($activity->draft == 0 &&$activity->diagnostic==0 && array_key_exists($outcome->id, $activity->o_att_array) && $activity->o_att_array[$outcome->id] >=1 && isset($section)&& isset($activity->rubric[0]))
                                                         <h5>Measure {{ $activity_index + 1 }}</h5>
                                                         <?php
                                                         /*

app/views/local/managers/admins/new-course-show.blade.php

@@ -53,7 +53,7 @@
                                 @endif
                             </td>
                             <td>
-                                @if($activity->outcomes_attempted!=NULL && !$activity->draft)
+                                @if($activity->outcomes_attempted!=NULL && !$activity->draft && !$activity->diagnostic)
                                     <span class="glyphicon glyphicon-ok"></span>
                                 @endif
                             </td>

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

@@ -50,7 +50,7 @@
             </li>
           
           @if(count(Auth::user()->courses))
-          <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReports', 'My Courses\' Reports') }}</li>
+          <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReport', 'My Courses\' Reports') }}</li>
           @endif
 
    

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

@@ -1,134 +0,0 @@
-@extends('layouts.master')
-
-@section('navigation')
-    @if(Auth::user()->role==1)
-        @include('local.managers.admins._navigation')
-    @elseif(Auth::user()->role==2)
-        @include('local.managers.sCoords._navigation')
-    @elseif(Auth::user()->role==3)
-        @include('local.managers.pCoords._navigation')
-    @endif
-@stop
-
-@section('main')
-    <div class="row">
-        <div class="col-md-3">
-            <div class="category" >
-              <label for="annual_plans">Annual Plan</label>
-              <div class="select">
-                <select  class="selectpicker" name="annual_plan" id="annual_plans" onchange ="fetchAnnualReport(this)">
-                  
-                  @foreach ($annual_plans as $an_pl)
-                    <option value='{{json_encode($an_pl)}}'>Annual Plan {{$an_pl->academic_year}}</option>
-                  @endforeach
-                </select>
-              </div>
-            </div>
-        </div>
-
-        <div class='col-md-9' id='report'>
-            <ul id = 'levelTabs' class = "nav nav-tabs" role = "tablist">
- 
-
-            </ul>
-<div id ='allLists' class="tab-content">
-</div>
-        </div>
-        
-
-    </div>
-
-<script>
-    function fetchAnnualReport(select){
-        object_json = $(select).val();
-        object_json = JSON.parse(object_json);
-        semester_start = object_json.semester_start;
-        semester_end = object_json.semester_end;
-        program_id = object_json.program_id;
-        annual_plan_id = object_json.annual_id;
-
-        $.post(
-        "{{ URL::action('AnnualPlansController@fetchAnnualReport') }}",
-        { 
-            semester_start: semester_start,
-            semester_end: semester_end,
-            program_id: program_id,
-            annual_plan_id: annual_plan_id,
-            academic_year:object_json.academic_year
-
-        
-        },
-        function(data)
-        {
-            $('#levelTabs').html(' ');
-        $.each(data, function(course_code, course_data){
-            
-            li = $("<li/>", {
-                'role':'presentation'
-            });
-            li.append($('<a/>',{
-                'onclick': "$(this).tab('show')",
-                'data-toggle':'tab',
-                'href':'#'+course_code,
-                'role':'tab'
-            }).html(course_code.replace('_',' ')));
-
-            div = $("<div/>",{
-                'role':'tabpanel',
-                'class':'tab-pane',
-                'id':course_code,
-            });
-
-            title = $("<h3/>",{
-                'style':'text-align: center'
-            }).html('Course: '+course_code.replace('_',' '));
-
-            criteriaAssessed = $("<h4/>",{
-                'style':'display: inline'
-            }).html('Criteria Assessed in course')
-
-            tableCriteria = $("<table/>", {
-                'class':'table table-striped table-condensed datatable'
-            });
-            thead = $("<thead/>").html("<tr>"+
-            "<th>Criterion</th>"+
-            "<th>Number of Students Assessed</th>"+
-            "<th>Number of Students that Achieved The Target</th>"+
-            "<th>%</th>"+
-            "<th>Outcomes</th>");
-            tbody = $("<tbody>");
-
-
-            $('#levelTabs').append(li);
-            $("#allLists").append(div);
-            
-
-            $.each(course_data, function(index, reports){
-
-                $.each(reports.criteriaReport, function(index2, criterion){
-                    criterion
-                })
-            })
-            
-
-        })
-
-                  
-        }
-        );
-
-    }
-
-    fetchAnnualReport(document.getElementById('annual_plans'));
-</script>
-@section('included-js')
-@include('global._datatables_js')
-@stop
-    
-@stop
-
-@section('javascript')
-
-
-
-@stop

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

@@ -93,7 +93,7 @@
                                                 @foreach($section->activities as $index4 => $activity)
 
                                                     <!-- If activity has a rubric and the rubric has the outcome being evaluated -->
-                                                    @if($activity->draft ==0 && array_key_exists($outcome->id, (array)$activity->o_att_array) && $activity->o_att_array[$outcome->id] >=1)
+                                                    @if($activity->draft ==0 && $activity->diagnostic == 0 && array_key_exists($outcome->id, (array)$activity->o_att_array) && $activity->o_att_array[$outcome->id] >=1)
                                                         <h5>Measure {{ $index4 + 1 }}</h5>
                                                         <p>A rubric was used in the {{ $section->code }}-{{ $section->number }} ({{ $section->name }}) course ({{ date('M Y', strtotime($course->updated_at))}}) to assess students’ <u>{{ strtolower($outcome->name) }}</u> in the activity: "<strong>{{ $activity->name }}</strong>". N= {{ count($section->students) }}. </p>
                                                         <p>The expected performance level was that <strong>{{ $activity->rubric[0]->expected_percentage }}%</strong> of students participating in the activity would score <strong>{{ $activity->rubric[0]->expected_points }} points</strong> or more in the 1-8 point scale used.</p>

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

@@ -27,7 +27,18 @@
                         <ul id = 'levelTabs' class = "nav nav-tabs" role = "tablist">
                                 <!-- For each grouped course -->
                                 @foreach($program->courses as $index2=>$course)
+
+                                <li role= "presentation">
+                                    <a data-toggle = "tab" href ="#{{ $course->code}}-{{ $course->number }}"
+                                        role ="tab">{{ $course->code}}-{{ $course->number }}</a>
+                                    </li>
+                        @endforeach
+                            </ul>
+                            <div id="allLists" class="tab-content">
+
+
                                     <!-- If grouped course has activities that evaluate the outcome -->
+                                    @foreach($program->courses as $index2=>$course)
 
                                     <?php
 
@@ -51,7 +62,11 @@
                                 ->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
                                 ->join('assessments', 'assessments.activity_criterion_id', '=','activity_criterion.id')
                                 //->join('criterion_objective_outcome', 'activity_criterion.criterion_id', '=', 'criterion_objective_outcome.criterion_id')
-                                ->where('course_id', $course->id)
+                                ->join('courses','courses.id','=','activities.course_id')
+                   ->where('courses.code',$course->code)
+                   ->where('courses.number',$course->number)
+                   ->where('activities.draft',0)
+                   ->where('activities.diagnostic',0)
                                 //->where('criterion_objective_outcome.outcome_id', $outcome->id)
                                 ->select('activity_id')
                                 ->lists('activity_id');
@@ -69,12 +84,8 @@
                             
                             
                                     ?>
-                    @if($sections_evaluating)
-                                    <li role= "presentation">
-                                        <a onclick = "$(this).tab('show');" data-toggle = "tab" href ="#{{ $course->code}}-{{ $course->number }}"
-                                            role ="tab">{{ $course->code}}-{{ $course->number }}</a>
-                                        </li>
-                                        @section('lists')
+                    
+                                  
                                         <div role = "tabpanel" class = 'tab-pane' id = "{{$course->code}}-{{$course->number}}">
                                             @foreach($sections_evaluating as $index3 => $section)
                                             <h3 style="text-align: center"> Course: {{$course->code}} {{$course->number}}-{{$section->section}} </h3> 
@@ -84,7 +95,7 @@
                                             <p style="display: inline;">{{$activity->name}} <strong>({{$activity->date}})</strong></p>
                                             <br>
                                             <br>
-                                            <h5 style="display: inline;">Performance Indicators: </h4>
+                                            <h5 style="display: inline;">Performance Indicators: </h5>
                                                 <?php
                                                 Log::info($activity->rubric[0]);
                                                 ?>
@@ -107,7 +118,7 @@
                                     @endif
                                     </i></p>
                                     <br>
-                                    <h5 style="display: inline;">Scale: </h4>
+                                    <h5 style="display: inline;">Scale: </h5>
                                     @if($activity->rubric[0]->max_score == 1)
                                     <p style="display: inline;">1 point scale</p>
                                     @else
@@ -276,19 +287,12 @@ $expected = DB::table('target_outcomes_program')
 
 @endforeach
 @endforeach
-@stop
+                                        </div>
 
-@else
-    <h4>There is no assessment for this course.</h4>
+            @endforeach
 
-@endif
 
-            @endforeach
-            <ul>
 
-        <div id="allLists" class="tab-content">
-        @yield('lists')
-        </div>
 @else
 <h4>This program has not assessed any activity</h4>
 @endif

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

@@ -42,9 +42,10 @@
         <ul class="dropdown-menu" role="menu">
           <li>{{ HTML::linkAction('OutcomesController@managerAssessmentReports', 'School Reports') }}</li>
           @if(count(Auth::user()->courses))
-          <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReports', 'My Courses\' Reports') }}</li>
+          <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReport', 'My Courses\' Reports') }}</li>
           
           @endif
+          <li>{{HTML::linkAction('AnnualPlansController@selectProgramPlan','Annual Reports')}}</li>
           <li>{{ HTML::linkAction('TransformativeActionsController@viewFormativeActions', 'Tranformative and Formative Actions')}}
     
         </ul>

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

@@ -27,7 +27,7 @@
                 <ol id="table-of-contents" class="upper-roman">
 
                 </ol>
-
+                
                 <h3 id="{{ $outcome->id }}" class="outcome">{{ $outcome->name }}</h3>
                 <table class="table table-condensed table-bordered">
                     <thead>

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

@@ -0,0 +1,314 @@
+@extends('layouts.master')
+
+@section('navigation')
+    @if(Auth::user()->role==1)
+        @include('local.managers.admins._navigation')
+    @elseif(Auth::user()->role==2)
+        @include('local.managers.sCoords._navigation')
+    @elseif(Auth::user()->role==3)
+        @include('local.managers.pCoords._navigation')
+    @endif
+@stop
+
+@section('main')
+    <div class="row">
+        <div class="col-md-12">
+            <p>This report contains performance information for all your Program's assessed courses during the following semester(s):</p>
+            <ul>
+                @foreach (Session::get('semesters_info') as $semester_info)
+                    <li>{{ $semester_info }}</li>
+                @endforeach
+            </ul>
+
+            @if(!$school->programs->isEmpty())
+
+                
+
+                        <ul id = 'levelTabs' class = "nav nav-tabs" role = "tablist">
+                                <!-- For each grouped course -->
+                                @foreach($program->courses as $index2=>$course)
+
+                                <li role= "presentation">
+                                    <a data-toggle = "tab" href ="#{{ $course->code}}-{{ $course->number }}"
+                                        role ="tab">{{ $course->code}}-{{ $course->number }}</a>
+                                    </li>
+                        @endforeach
+                            </ul>
+                            <div id="allLists" class="tab-content">
+
+
+                                    <!-- 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();*/
+
+
+                                        $sections_evaluating = Course::has('activities')
+                            
+                            //->whereNotNull('outcomes_attempted')
+                            //->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
+                            ->with(array('activities'=>function($query) use(&$course){
+                                $activities = DB::table('activities')
+                                ->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
+                                ->join('assessments', 'assessments.activity_criterion_id', '=','activity_criterion.id')
+                                //->join('criterion_objective_outcome', 'activity_criterion.criterion_id', '=', 'criterion_objective_outcome.criterion_id')
+                                ->join('courses','courses.id','=','activities.course_id')
+                   ->where('courses.code',$course->code)
+                   ->where('courses.number',$course->number)
+                   ->where('activities.draft',0)
+                   ->where('activities.diagnostic',0)
+                                //->where('criterion_objective_outcome.outcome_id', $outcome->id)
+                                ->select('activity_id')
+                                ->lists('activity_id');
+
+                                //$query->whereNotNull('outcomes_attempted');
+                                //$query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');
+                            $query->whereIn('id', $activities);
+                        } ))
+                                
+
+                            ->where('code', $course->code)->where('number',$course->number)
+                            ->whereIn('semester_id', Session::get('semesters_ids'))
+                            ->orderBy('semester_id')
+                            ->get();
+                            
+                            
+                                    ?>
+                    
+                                  
+                                        <div role = "tabpanel" class = 'tab-pane' id = "{{$course->code}}-{{$course->number}}">
+                                            @foreach($sections_evaluating as $index3 => $section)
+                                            <h3 style="text-align: center"> Course: {{$course->code}} {{$course->number}}-{{$section->section}} </h3> 
+                                            @foreach($section->publishedActivities 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>Perfomance 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>
+                                                    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)
+                                            
+        {{$index6 + 1}}.   <?php echo $outcome->name."\n\n\n <br>" ?>
+        
+       
+
+       @endforeach
+       
+       
+   </td>
+</tr>
+@endforeach
+</tbody>
+
+</table>
+<hr>
+<br>
+
+<h4>Perfomance by Learning Outcome Student</h4>
+<h5 style = "display: inline; margin:30px;">Target by 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 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;
+
+
+?>
+{{$expected}}
+</i>
+</p>
+<br>
+<table class='table table-striped table-condensed datatable'>
+<thead>
+   <tr>
+       <th>
+           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>
+
+            @endforeach
+
+
+
+@else
+<h4>This program has not assessed any activity</h4>
+@endif
+
+        </div>
+    </div>
+
+
+@section('included-js')
+@include('global._datatables_js')
+@stop
+    
+@stop
+
+@section('javascript')
+
+
+
+@stop

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

@@ -0,0 +1,541 @@
+@extends('layouts.master-2')
+
+@section('navigation')
+    @if(Auth::user()->role==1)
+      @include('local.managers.admins._navigation')
+    @elseif(Auth::user()->role==2)
+      @include('local.managers.sCoords._navigation')
+    @elseif(Auth::user()->role==3)
+      @include('local.managers.pCoords._navigation')
+    @elseif(Auth::user()->role==4)
+      @include('local.professors._navigation')
+    @endif
+@stop
+@section('main')
+
+  {{-- TODO: look where to place this script.
+          if placed inside .ready() or before it,
+            an error that the function is not defined occurs. --}}
+  {{-- TODO: no reconoce acentos --}}
+
+
+  <div class="row">
+    <div class="col-md-3">
+      <select class = "form-control selectpicker" id = "annual_plan" onchange="fetchInfo('annual_plan')">
+        <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>
+     
+
+    
+      <div id='allOutcomes'> 
+      
+      </div>
+    </div>
+    
+
+    <div class="col-md-9">
+      <div id="outcome-display" class="panel panel-default">
+        <div class="panel-heading">
+          <h4 class=" panel-title" style="cursor:auto!important;">
+            Primer Semestre 2019-2020
+          </h4>
+        </div>
+        <div class="panel-body">
+          <div id = 'outcomeInfo'>
+            
+          </div>
+          <div id="tableOutcome">
+          </div>
+
+          <ul id = "levelTabs" class="nav nav-tabs" role="tablist">
+
+          </ul>
+          <div id="allLists" class="tab-content">
+
+          </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>
+    </div>
+
+
+    <div class="col-md-9">
+      <div class="no-outcome alert alert-info">
+        <p>Select a Learning Outcome to view its information</p>
+      </div>
+    </div>
+
+  </div>
+  <script>
+   function nextChar(c) {
+    return String.fromCharCode(c.charCodeAt(0) + 1);
+}
+changed = false;
+
+$(document).ready(function()
+{
+  // --------------------------------------------------------------------------
+  // Page load
+  // --------------------------------------------------------------------------
+
+  // 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 fetchEverything(li)
+  {
+    var outcome_id = $(li).data('outcome-id');
+    var name = $(li).data('outcome-name');
+    var semester_id = $(li).data('semester-id');
+    var annual_plan_id = $(li).data('annual-plan');
+    $('#theChange').data('annual-plan', annual_plan);
+    $.post(
+    "{{URL::action('AnnualPlansController@fetchReportWithOutcome')}}",
+    { semester_id: semester_id,
+    outcome_id: outcome_id,
+    program_id: {{$program->id}},
+    annual_plan_id:annual_plan_id
+  },
+    function(outcome)
+    {
+        if(outcome.objectives){
+            $('table').show();
+          $('#outcome-display').parent().show();
+          $('#outcome-display .panel-title').html(name);
+          $('#allLists').empty();
+          $('#levelTabs').empty();
+          $('.no-outcome').hide();
+          var outcomeHTML = "<h4>Perfomance by Learning Outcome Student</h4>"+
+          '<h5 style = "display: inline; margin:30px;">Target by outcome: </h5>'+
+          '<p  style = "display: inline;"> <i>>= '+outcome.expected_outcome+' of the attempts</i>'+'</p>'
+          +'<br><h5 style = "display: inline; margin:30px;">Expected percent of students achieving the target by outcome: </h5>'
+          +'<p  style = "display: inline;"> <i>'+outcome.outcome_program_goal+'</i></p>';
+          $('#outcomeInfo').html('<p class="outcome-definition">'+outcome.definition+'</p>' +outcomeHTML);
+          //theStudentOutcomeTable = $("<table/>");
+          //theStudentOutcomeTable.hide();
+          ///$('#outcomeInfo').append(theStudentOutcomeTable);
+
+                  
+
+                  wholeDict ={};
+
+
+                  tableStudent = $('<table/>',{
+                    'class':'table table-striped table-condensed datatable'
+                  });
+                  tableStudent.html('<thead><tr>'+
+                  '<th>Student</th>'+
+                  '<th>Criteria Attempted</th>'+
+                  '<th>Criteria Achieved</th>'+
+                  '<th>Percentage</th>'+
+                  '<th>Outcome Achieved</th>'+
+                  '</tr></thead><tbody></tbody>');
+          $.each(outcome.objectives, function(index, objective){
+
+                li = $('<li/>',{
+                    'role':'presentation'
+                });
+                a = $('<a/>',{
+                    'data-toggle':'tab',
+                    'href':'#'+objective.id,
+                    'role':'tab'
+                }).html('Objective '+(index+1));
+                li.append(a);
+                $('#levelTabs').append(li);
+                objective_title = "<h3>"+objective.text+'</h3>';
+                div = $('<div/>',{
+                    'role':'tabpanel',
+                    'class':'tab-pane',
+                    'id':objective.id
+                }).html(objective_title);
+
+      
+
+               
+                div.appendTo($('#allLists'))
+                
+                
+                if(objective.courses){
+                  $.each(objective.courses, function(index, course_code){
+                    if(course_code.criteria.length){
+                      
+                      $.each(course_code.students, function(index, student){
+                        if(wholeDict[student.student_id] === undefined){
+                          wholeDict[student.student_id] = { 'student':student.student_id, 
+                          'criteria_attempted':0,
+                          'criteria_achieved':0}
+
+                        }
+                        wholeDict[student.student_id]["criteria_attempted"] += student.criteria_attempted;
+                        wholeDict[student.student_id]["criteria_achieved"] += student.criteria_achieved;
+
+                      });
+                      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){
+
+                        tr = $('<tr/>').append(
+                          "<td>"+criterion.name+"</td>"+
+                          "<td>"+criterion.criteria_attempted+"</td>"+
+                          "<td>"+criterion.criteria_achieved+"</td>"
+                        );
+                        tbody.append(tr);
+                      });
+                      table.append(tbody);
+                      div.append('<h3>'+course_code.code + ' '+ course_code.number+'</h3>')
+                      div.append(table);
+                      table.DataTable();
+
+                      
+                    }
+                    
+                    
+                  })
+                  
+
+               
+
+                }
+                else{
+                  div.append('<div class="no-outcome alert alert-info"'+
+        '<p>No Course in plan has assessed yet</p>'+
+      '</div>')
+                }
+                
+                
+          })
+          theArray =[];
+         
+          $('#tableOutcome').html(tableStudent);
+//tableStudent.appendTo($('#outcomeInfo'));
+          
+          tableStudent = tableStudent.DataTable({
+            dom: 'Bfrtip',
+        buttons: [
+             'csv', 'excel', 'pdf', 'print'
+        ]
+          });
+          students_attempted =0;
+          students_achieved = 0;
+ $.each(wholeDict, function(key, dict){
+  
+
+if(dict.criteria_attempted){
+  students_attempted +=1;
+  percentage = ((dict.criteria_achieved/dict.criteria_attempted)*100).toFixed(2);
+  if(parseFloat(percentage)>= parseFloat(outcome.expected_outcome)){
+  achieved =  "Yes"
+  students_achieved +=1;
+  }
+  else achieved = "No"
+}
+else{
+  percentage = "N/A"
+  achieved = "N/A"
+}
+            tableStudent.row.add([
+                dict.student,
+                dict.criteria_attempted,
+                dict.criteria_achieved,
+                percentage,
+                achieved
+            
+              ]);
+          })
+
+            tableStudent.draw();
+            
+          if(students_attempted){
+            studentPercentage = ((students_achieved/students_attempted) *100).toFixed(2);
+            if(studentPercentage >= outcome.outcome_program_goal){
+            FinalReport= "<br><p><strong>The students achieved the Learning Outcome with " +studentPercentage+"% of students achieving.</strong></p>";
+            }
+            else{
+              FinalReport = "<br><p><strong>The students did not achieve the Learning Outcome with " +studentPercentage+"% of students achieving.</strong></p>";
+            
+            }
+          }
+          
+          $("#outcomeInfo").append(FinalReport)
+
+
+            
+  
+
+          /* table.row.add([
+                objectivesHTML,
+                courseshtml,
+                
+                courseTAhtml
+                
+              ]);
+              table.draw();
+             */
+        }
+ else
+        {
+          $('table').hide();
+        }
+
+       
+
+    
+
+    
+        
+        
+ 
+    }
+    
+    );
+
+  }
+function posttoTransAnnual(annual_id, selectTransId, typ_course_id){
+  ta = $("#"+selectTransId).val();
+  old_ta = $("#"+selectTransId).data('old-TA');
+  if(ta == "0")return;
+  $.post("../annual-plan-postTA",
+  {annual_id : annual_id,
+  TA_id:ta,
+  typ_course_id : typ_course_id,
+  old_ta:old_ta
+  },
+  function(message){
+    
+      $("#"+selectTransId).data('old-TA', ta);
+    
+  }
+  )
+}
+function addTAselect(options, master_div, annual_plan_id, objective_id, typ_course_id, selected_ta){
+  var $div = $('<div/>', {
+      
+      'class': 'form-group '
+  });
+  counter = parseInt($('#'+master_div).data('amount-ta'));
+  
+  var selectTA = $('<select/>',{
+            'class': "selectpicker form-control",
+            'data-live-search':'true',
+            'data-old-TA' :'0',
+            'data-width': '180px',
+            
+            'id': 'transformativeForObjective'+master_div+'_'+counter,
+            'onchange':'posttoTransAnnual('+annual_plan_id+', "transformativeForObjective'+master_div+'_'+counter+'", '+typ_course_id+')'
+
+          });
+          selectTA.append(options);
+          
+          selectTA.appendTo($div);
+          selectTA.val(selected_ta);
+          selectTA.data('old-TA', selected_ta);
+          selectTA.selectpicker('refresh');
+          $span = $('<span/>', {
+    'id':'close',
+    'onclick':'  postDeleteTA('+annual_plan_id+', "transformativeForObjective'+master_div+'_'+counter+'", '+typ_course_id+'); this.parentNode.parentNode.removeChild(this.parentNode);return false;'
+  }).html('x');
+  $span.appendTo($div);
+  $div.append("<br><br>");
+  $('#'+master_div).append("<br>");
+  
+  $div.appendTo($('#'+master_div));
+  $('#'+master_div).data('amount-ta', counter+1);
+
+
+}
+function postDeleteTA(annual_id, selectTransId, typ_course_id){
+  ta = $("#"+selectTransId).val();
+
+  
+  if(ta == "0")return;
+  $.post("../annual-plan-deleteTA",
+  {annual_id : annual_id,
+  TA_id:ta,
+  typ_id : typ_course_id,
+
+  }
+  );
+  parent = $("#"+selectTransId).parent().parent().parent();
+  counter = parseInt(parent.data('amount-ta'));
+  parent.data('amount-ta', counter-1);
+}
+function postToAnnualPlans(typ_course_id, criteria_select){
+  var criteria = $('#'+criteria_select).val();
+  var oldCriteria = $('#'+criteria_select).data('old-criteria');
+  var criteriaNode = document.getElementById(criteria_select).parentNode.parentNode.parentNode;
+  
+  var annual = criteriaNode.dataset.annualPlan;
+  $.post("../annual-plan-postOnChange",
+  {criteria : criteria, 
+  typ_course_id : typ_course_id,
+  annual_plan : annual,
+  old_criteria :oldCriteria
+  },
+  function(message){
+    if(message =="Duplicate entry, please choose another criteria."){
+      alert(message)
+    }
+    else{
+        $('#'+criteria_select).data('old-criteria', criteria);  
+    changed = true;
+    }
+
+  })
+}
+
+
+function addCriteriaTest(div, new_id_for_select, typ_course_id, i=null, options) {
+  
+  if(!i) amount_select = $('#'+div).data("amount-select");
+  else amount_select = i;
+  $select = $('<select/>',{
+            'class': "selectpicker form-control",
+            'data-live-search':'true',
+            'data-old-criteria' :'0',
+            'data-width': '180px',
+            
+            'id': 'criteriaFor'+new_id_for_select+'_'+amount_select,
+            'onchange':'postToAnnualPlans('+typ_course_id+', "criteriaFor'+new_id_for_select+'_'+amount_select+'")'
+
+          })
+
+  var $div = $('<div/>', {
+      'id': 'courseSelect_' + new_id_for_select +'_'+amount_select,
+      'class': 'form-group '
+  });
+
+  $select.append(options);
+  $select.appendTo($div);
+  $span = $('<span/>', {
+    'id':'close',
+    'onclick':'  postDelete('+typ_course_id+', "criteriaFor'+new_id_for_select+'_'+amount_select+'"); this.parentNode.parentNode.removeChild(this.parentNode);return false;'
+  }).html('x');
+  $div.append($span);
+ $div.append("<br><br>")
+ $('#'+div).append("<br>");
+  $div.appendTo($("#"+div));
+  
+
+  
+          $select.selectpicker('refresh');
+  
+  
+
+ 
+  $("#"+div).data("amount-select", amount_select+1);
+
+}
+$('#allOutcomes').hide();
+function postDelete(typ_course_id, criteria_select){
+  var criteria = $('#'+criteria_select).val();
+  var oldCriteria = $('#'+criteria_select).data('old-criteria');
+  var criteriaNode = document.getElementById(criteria_select).parentNode.parentNode.parentNode;
+  
+  var annual = criteriaNode.dataset.annualPlan;
+  $.post("../annual-plan-deleteCriteria",
+  {criteria : criteria, 
+  typ_course_id : typ_course_id,
+  annual_plan : annual,
+  old_criteria :oldCriteria
+  });
+
+}
+
+function fetchInfo(id){
+  annual_id = $("#"+id).val();
+  program_id = {{$program->id}};
+  $.post("{{URL::action('AnnualPlansController@fetchInfo')}}",
+    {
+        id:annual_id,
+        program_id:program_id
+        
+
+    },
+    function(json){
+      
+      div = $('<div/>', {
+        'class':'list-group',
+        'id':'list'
+      });
+      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-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);
+      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-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);
+     html = div[0].innerHTML;
+     
+      $("#allOutcomes").html(div[0].innerHTML);
+      $("#allOutcomes").show();
+
+},
+"json",
+  );
+  
+  }
+
+
+function deleteObjective(objectiveSelectDiv, closeObj){
+
+  $('#'+objectiveSelectDiv).remove();
+  $('#'+closeObj).remove();
+  $('#'+div).data("amount-select", $('#'+div).data("amount-select")-1);
+
+}
+</script>
+
+
+  
+
+@stop
+
+@section('included-js')
+    @include('global._datatables_js')
+@stop
+
+

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

@@ -0,0 +1,31 @@
+@extends('layouts.master')
+
+@section('navigation')
+    @if(Auth::user()->role==1)
+        @include('local.managers.admins._navigation')
+    @elseif(Auth::user()->role==2)
+        @include('local.managers.sCoords._navigation')
+    @elseif(Auth::user()->role==3)
+        @include('local.managers.pCoords._navigation')
+    @endif
+@stop
+
+@section('main')
+    <div class="row">
+        <div class="col-md-12">
+            <p>Click the links below to see the reports on Annual Plans </p>
+           
+            <p>Due to the large amount of information in these reports, please allow them to load a few seconds.</p>
+
+            <ol id="table-of-contents" class="upper-roman">
+            @foreach($programs as $program)
+                <li>
+                    <a href="{{ URL::action('OutcomesController@annualReport', array($program->id))}}">
+                        {{ $program->name }}
+                    </a>
+                </li>
+            @endforeach
+            </ol>
+        </div>
+    </div>
+@stop

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

@@ -211,19 +211,24 @@
 
         <div class="text-center">
             <button id="button-submit-assessment" class="btn btn-primary btn-lg publish">Publish Assessment</button>
+            <button id="button-diagnostic-assessment" class="btn btn-primary btn-lg diagnostic">Save as Diagnostic Test</button>
             <button id="button-draft-assessment" class="btn btn-primary btn-lg draft">Save as Draft</button>
+   
         </div>
     </div>
 </div>
 <script>
 
-$('#button-submit-assessment, #button-draft-assessment').on('click', function(e)
+$('#button-submit-assessment, #button-draft-assessment, #button-diagnostic-assessment').on('click', function(e)
 {
 
     var draft = 0;
+    var diagnostic=0
 
     if($(this).hasClass('draft'))
         draft = 1;
+    if($(this).hasClass('diagnostic'))
+        diagnostic = 1;
 
     var expected_points = parseInt($('#expected_points').text());
     var expected_percentage = parseInt($('#expected_percentage').text());
@@ -350,7 +355,8 @@ $('#button-submit-assessment, #button-draft-assessment').on('click', function(e)
             draft: draft,
             weights: JSON.stringify(weights),
         
-            student_info: JSON.stringify(student_info)
+            student_info: JSON.stringify(student_info),
+            diagnostic:diagnostic
         },
         function(data)
         {

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

@@ -83,7 +83,7 @@ Log::info($activity->cap_array);
 Log::info('aqui papi');?>
 
                                         <!-- If activity is not draft, has a rubric and the rubric has the outcome being evaluated -->
-                                        @if($activity->draft ==0 && array_key_exists($outcome->id, (array)$activity->o_att_array))
+                                        @if($activity->draft ==0 && $activity->diagnostic ==0&& array_key_exists($outcome->id, (array)$activity->o_att_array))
                                             <h5>Measure {{ $index4 + 1 }}</h5>
                                             <p>A rubric was used in the {{ $section->code }}-{{ $section->number }} ({{ $section->name }}) course ({{ date('M Y', strtotime($course->updated_at))}}) to assess students’ <u>{{ strtolower($outcome->name) }}</u> in the activity: "<strong>{{ $activity->name }}</strong>". At the time of assessment there were {{ $activity->amount_of_assessed_students() }} students in the section.</p>
                                             <p>The expected performance level was that <strong>{{ $activity->rubric[0]->expected_percentage }}%</strong> of students participating in the activity would score <strong>{{ $activity->rubric[0]->expected_points }} points</strong>  or more in the 1-{{$activity->rubric[0]->max_score}} point scale used.</p>

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

@@ -91,7 +91,7 @@
                             @endif
                         </td>
                         <td>
-                            @if($activity->o_att_array && !$activity->draft)
+                            @if($activity->o_att_array && !$activity->draft && !$activity->diagnostic)
                                 <span class="glyphicon glyphicon-ok"></span>
                             @endif
                         </td>

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

@@ -22,58 +22,76 @@
                     <li>{{ $semester_info }}</li>
                 @endforeach
             </ul>
+         
 
                                 <!-- For each grouped course -->
                                 <ul id = "levelTabs" class="nav nav-tabs" role="tablist">
                                         
                                    
                                 @foreach($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();*/
-
-
-                                $sections_evaluating = Course::has('activities')
-                    
-                    //->whereNotNull('outcomes_attempted')
-                    //->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
-                    ->with(array('activities'=>function($query) use(&$course){
-                        $activities = DB::table('activities')
-                        ->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
-                        ->join('assessments', 'assessments.activity_criterion_id', '=','activity_criterion.id')
-                        //->join('criterion_objective_outcome', 'activity_criterion.criterion_id', '=', 'criterion_objective_outcome.criterion_id')
-                        ->where('course_id', $course->id)
-                        //->where('criterion_objective_outcome.outcome_id', $outcome->id)
-                        ->select('activity_id')
-                        ->lists('activity_id');
-
-                        //$query->whereNotNull('outcomes_attempted');
-                        //$query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');
-                    $query->whereIn('id', $activities);
-                } ))
-                        
-
-                    ->where('code', $course->code)->where('number',$course->number)
-                    ->whereIn('semester_id', Session::get('semesters_ids'))
-                    ->get();
-                    
-                    
-                            ?>
-                            @if($sections_evaluating)
+                              
+                            
+                          
                                    <li role= "presentation">
-                                        <a onclick = "$(this).tab('show');" data-toggle = "tab" href ="#{{ $course->code}}-{{ $course->number }}"
+                                        <a data-toggle = "tab" href ="#{{ $course->code}}-{{ $course->number }}"
                                             role ="tab">{{ $course->code}}-{{ $course->number }}</a>
                                         </li>
+                            @endforeach
+                                </ul>
+                                <div id="allLists" class="tab-content">
+                                   
+                                
+
 
-                            @section('lists')
+                           @foreach($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();*/
+
+
+                           $sections_evaluating = Course::has('activities')
+               
+               //->whereNotNull('outcomes_attempted')
+               //->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
+               ->with(array('activities'=>function($query) use(&$course){
+                   $activities = DB::table('activities')
+                   ->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
+                   ->join('assessments', 'assessments.activity_criterion_id', '=','activity_criterion.id')
+                   //->join('criterion_objective_outcome', 'activity_criterion.criterion_id', '=', 'criterion_objective_outcome.criterion_id')
+                   ->join('courses','courses.id','=','activities.course_id')
+                   ->where('courses.code',$course->code)
+                   ->where('courses.number',$course->number)
+                   ->where('activities.draft',0)
+                   ->where('activities.diagnostic',0)
+                   //->where('criterion_objective_outcome.outcome_id', $outcome->id)
+                   ->select('activity_id')
+                   ->lists('activity_id');
+
+                   //$query->whereNotNull('outcomes_attempted');
+                   //$query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');
+               $query->whereIn('activities.id', $activities);
+           } ))
+                   
+
+               ->where('code', $course->code)->where('number',$course->number)
+               ->where('user_id',Auth::user()->id)
+               ->whereIn('semester_id', Session::get('semesters_ids'))
+               ->orderBy('semester_id')
+               ->get();
+               
+              
+                       ?>
+
+                            
                             <div role = "tabpanel" class = 'tab-pane' id = "{{$course->code}}-{{$course->number}}">
                                 @foreach($sections_evaluating as $index3 => $section)
                                 <h3 style="text-align: center"> Course: {{$course->code}} {{$course->number}}-{{$section->section}}</h3> 
@@ -82,11 +100,11 @@
                                 ?>
                                 @foreach($section->publishedActivities as $index4 => $activity)
 
-                                <h5 style="display: inline;">Activity {{$index4+1}}: </h4>
+                                <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: </h4>
+                                <h5 style="display: inline;">Performance Indicators: </h5>
                                     <?php
                                     Log::info($activity->rubric[0]);
                                     ?>
@@ -109,7 +127,7 @@
                                 @endif
                                 </i></p>
                                 <br>
-                                <h5 style="display: inline;">Scale: </h4>
+                                <h5 style="display: inline;">Scale: </h5>
                                 @if($activity->rubric[0]->max_score == 1)
 
                                <p style="display: inline;">1 point scale</p>
@@ -288,19 +306,14 @@
 
                                 
                                 @endforeach
+                            
                                 @endforeach
-                            @stop
+                            </div>
 
-                            @else
-                                <h4>There is no assessment for this course.</h4>
-
-                            @endif
+                            
 
                                         @endforeach
-                                        <ul>
-                                    <div id="allLists" class="tab-content">
-                                    @yield('lists')
-                                    </div>
+