Arreglar unos bugs en los results,

app/controllers/CriteriaController.php

@@ -261,6 +261,7 @@ class CriteriaController extends \BaseController
     public function delete()
     {
         DB::delete("delete from criteria where id = ?", array(Input::get('criterion_delete')));
+        return Redirect::to('criteria')->withInput();
         $role = Auth::user()['role'];
         switch ($role) {
             case 1:
@@ -446,6 +447,7 @@ class CriteriaController extends \BaseController
             /** Send error message and old data */
             Session::flash('status', 'danger');
             Session::flash('message', $message);
+            return Redirect::to('criteria')->withInput();
             $role = Auth::user()['role'];
             switch ($role) {
                 case 1:
@@ -464,7 +466,7 @@ class CriteriaController extends \BaseController
                 /** Send error message and old data*/
                 Session::flash('status', 'danger');
                 Session::flash('message', 'This criterion is a duplicate of an already saved criterion because its name and associated program are the same.');
-
+                return Redirect::to('criteria')->withInput();
                 $role = Auth::user()['role'];
                 switch ($role) {
                     case 1:
@@ -530,6 +532,7 @@ class CriteriaController extends \BaseController
                         } else {
                             Session::flash('status', 'danger');
                             Session::flash('message', '<p>Error creating the Scales</p>');
+                            return Redirect::to('criteria')->withInput();
                             $role = Auth::user()['role'];
                             switch ($role) {
                                 case 1:
@@ -583,6 +586,7 @@ class CriteriaController extends \BaseController
 
                 Session::flash('status', 'success');
                 Session::flash('message', 'Criterion created: "' . $criterion->name . '".');
+                return Redirect::to('criteria')->withInput();
                 $role = Auth::user()['role'];
                 switch ($role) {
                     case 1:
@@ -600,6 +604,7 @@ class CriteriaController extends \BaseController
             else {
                 Session::flash('status', 'danger');
                 Session::flash('message', '<p>Error creating Criterion. Please try again later.</p>');
+                return Redirect::to('criteria')->withInput();
                 $role = Auth::user()['role'];
                 switch ($role) {
                     case 1:
@@ -745,6 +750,8 @@ class CriteriaController extends \BaseController
             /** Send error message and old data */
             Session::flash('status', 'danger');
             Session::flash('message', $message);
+
+            return Redirect::to('criteria')->withInput();
             $role = Auth::user()['role'];
             switch ($role) {
                 case 1:
@@ -846,7 +853,8 @@ class CriteriaController extends \BaseController
                         } else {
                             Session::flash('status', 'danger');
                             Session::flash('message', '<p>Error creating the Scales</p>');
-                            $role = Auth::user()['role'];
+                            return Redirect::to('criteria')->withInput();
+                            /*$role = Auth::user()['role'];
                             switch ($role) {
                                 case 1:
                                     return Redirect::to('criteria')->withInput();
@@ -856,7 +864,7 @@ class CriteriaController extends \BaseController
 
                                 case 3:
                                     return Redirect::to('program-criteria')->withInput();
-                            }
+                            }*/
                         }
                     }
                 }/*
@@ -897,7 +905,8 @@ class CriteriaController extends \BaseController
 
                 Session::flash('status', 'success');
                 Session::flash('message', 'Updated criterion: "' . $criterion->name . '"');
-                $role = Auth::user()['role'];
+                return Redirect::to('criteria')->withInput();
+                /*$role = Auth::user()['role'];
                 switch ($role) {
                     case 1:
                         return Redirect::to('criteria')->withInput();
@@ -907,15 +916,16 @@ class CriteriaController extends \BaseController
 
                     case 3:
                         return Redirect::to('program-criteria')->withInput();
-                }
+                }*/
             }
 
             /** If saving fails, send error message and old data */
             else {
                 Session::flash('status', 'danger');
                 Session::flash('message', 'Error updating the Criterion. Please try again later.');
+                return Redirect::to('criteria')->withInput();
                 $role = Auth::user()['role'];
-                switch ($role) {
+                /*switch ($role) {
                     case 1:
                         return Redirect::to('criteria')->withInput();
 
@@ -924,7 +934,7 @@ class CriteriaController extends \BaseController
 
                     case 3:
                         return Redirect::to('program-criteria')->withInput();
-                }
+                }*/
             }
         }
     }
@@ -1024,7 +1034,8 @@ class CriteriaController extends \BaseController
                 Session::flash('status', 'danger');
                 Session::flash('message', 'Error deactivating criterion."' . $criterion->name . '"');
             }
-            $role = Auth::user()['role'];
+            return Redirect::to('criteria')->withInput();
+            /*$role = Auth::user()['role'];
             switch ($role) {
                 case 1:
                     return Redirect::to('objective')->withInput();
@@ -1034,7 +1045,7 @@ class CriteriaController extends \BaseController
 
                 case 3:
                     return Redirect::to('program-objective')->withInput();
-            }
+            }*/
         } else {
             try {
                 $criterion->restore();
@@ -1044,7 +1055,8 @@ class CriteriaController extends \BaseController
                 Session::flash('status', 'danger');
                 Session::flash('message', 'Error reactivating criterion: "' . $criterion->name . '".');
             }
-            $role = Auth::user()['role'];
+            return Redirect::to('criteria')->withInput();
+            /*$role = Auth::user()['role'];
             switch ($role) {
                 case 1:
                     return Redirect::to('objective')->withInput();
@@ -1054,7 +1066,7 @@ class CriteriaController extends \BaseController
 
                 case 3:
                     return Redirect::to('program-objective')->withInput();
-            }
+            }*/
         }
     }
 

app/controllers/Objective2Controller.php

@@ -141,7 +141,8 @@ class Objective2Controller extends \BaseController
 	public function delete()
 	{
 		DB::delete("delete from objectives where id = ?", array(Input::get('deleteObj')));
-		$role = Auth::user()['role'];
+		return Redirect::to('objectives')->withInput();
+		/*$role = Auth::user()['role'];
 		switch ($role) {
 			case 1:
 				return Redirect::to('objectives')->withInput();
@@ -151,7 +152,7 @@ class Objective2Controller extends \BaseController
 
 			case 3:
 				return Redirect::to('program-objective')->withInput();
-		}
+		}*/
 	}
 	/**
 	 * Create a new Objective.
@@ -180,7 +181,8 @@ class Objective2Controller extends \BaseController
 			/** Send error message and old data */
 			Session::flash('status', 'danger');
 			Session::flash('message', $message);
-			$role = Auth::user()['role'];
+			return Redirect::to('objective')->withInput();
+			/*$role = Auth::user()['role'];
 			switch ($role) {
 				case 1:
 					return Redirect::to('objective')->withInput();
@@ -190,14 +192,15 @@ class Objective2Controller extends \BaseController
 
 				case 3:
 					return Redirect::to('program-objective')->withInput();
-			}
+			}*/
 		} else {
 			// Check Objective uniqueness
 			if (!$this->isObjectiveUnique($clean_input)) {
 				/** Send error message and old data */
 				Session::flash('status', 'danger');
 				Session::flash('message', "This objective is a duplicate of an already saved Objective because it's and associated program are the same.");
-				$role = Auth::user()['role'];
+				return Redirect::to('objective')->withInput();
+				/*$role = Auth::user()['role'];
 				switch ($role) {
 					case 1:
 						return Redirect::to('objective')->withInput();
@@ -207,7 +210,7 @@ class Objective2Controller extends \BaseController
 
 					case 3:
 						return Redirect::to('program-objective')->withInput();
-				}
+				}*/
 			}
 
 			/** Instantiate new Objective */
@@ -248,7 +251,8 @@ class Objective2Controller extends \BaseController
 
 				Session::flash('status', 'success');
 				Session::flash('message', 'Objective created: "' . $objective->text . '".');
-				$role = Auth::user()['role'];
+				return Redirect::to('objective')->withInput(Input::only('outcome_id'));
+				/*$role = Auth::user()['role'];
 				switch ($role) {
 					case 1:
 						return Redirect::to('objective')->withInput(Input::only('outcome_id'));
@@ -258,14 +262,15 @@ class Objective2Controller extends \BaseController
 
 					case 3:
 						return Redirect::to('program-objective')->withInput(Input::only('outcome_id'));
-				}
+				}*/
 			}
 
 			/** If saving fails, send error message and old data */
 			else {
 				Session::flash('status', 'danger');
 				Session::flash('message', '<p>Error creating objective. Please try again later.</p>');
-				$role = Auth::user()['role'];
+				return Redirect::to('objective')->withInput();
+				/*$role = Auth::user()['role'];
 				switch ($role) {
 					case 1:
 						return Redirect::to('objective')->withInput();
@@ -275,7 +280,7 @@ class Objective2Controller extends \BaseController
 
 					case 3:
 						return Redirect::to('program-objective')->withInput();
-				}
+				}*/
 			}
 		}
 	}
@@ -424,7 +429,8 @@ class Objective2Controller extends \BaseController
 			//Session::flash('status', 'danger');
 			//Session::flash('message', $message);
 			$MessageArray = array('status' => 'danger', 'message' => $message);
-			$role = Auth::user()['role'];
+			return $MessageArray;
+			/*$role = Auth::user()['role'];
 			switch ($role) {
 				case 1:
 					return $MessageArray;
@@ -437,7 +443,7 @@ class Objective2Controller extends \BaseController
 				case 3:
 					return $MessageArray;
 					return Redirect::to('program-objective')->withInput();
-			}
+			}*/
 		} else {
 
 
@@ -455,6 +461,8 @@ class Objective2Controller extends \BaseController
 			/** If Objective is updated, send success message */
 			if ($Objective->save()) {
 
+				//TODO
+
 				$objectiveId = $Objective->id;
 				DB::delete("delete from `objective_outcome` where objective_id ={$objectiveId}");
 				DB::delete("delete from objective_program where objective_id = {$objectiveId}");
@@ -469,7 +477,8 @@ class Objective2Controller extends \BaseController
 				//Session::flash('status', 'success');
 				//Session::flash('message', 'Updated Objective: "' . $Objective->text . '"');
 				$MessageArray = array('status' => 'success', 'message' => 'Updated Objective: "' . $Objective->text . '"');
-				$role = Auth::user()['role'];
+				return $MessageArray;
+				/*$role = Auth::user()['role'];
 
 				switch ($role) {
 					case 1:
@@ -483,7 +492,7 @@ class Objective2Controller extends \BaseController
 					case 3:
 						return $MessageArray;
 						return Redirect::to('program-objective')->withInput();
-				}
+				}*/
 			}
 
 			/** If saving fails, send error message and old data */
@@ -491,6 +500,7 @@ class Objective2Controller extends \BaseController
 				//Session::flash('status', 'danger');
 				////Session::flash('message', 'Error updating the Objective. Please try again later.');
 				$MessageArray = array('status' => 'danger', 'message' => 'Error updating the Objective. Please try again later.');
+				return $MessageArray;
 				$role = Auth::user()['role'];
 				switch ($role) {
 					case 1:

app/routes.php

@@ -245,6 +245,10 @@ Route::group(array('before' => 'auth|has_access'), function () {
         'uses' => 'TransformativeActionsController@fetchCourses'
     ));
 
+    //Objectives and Criteria Shared Routes
+    Route::get('criteria', array('uses' => 'CriteriaController@edit'));
+    Route::get('objectives', array('uses' => 'Objective2Controller@edit'));
+
     // Fetch a criterion for a rubric
     Route::post('fetchCriterion', array(
         'as' => 'fetchCriterion',
@@ -369,8 +373,8 @@ Route::group(array('before' => 'auth|has_access'), function () {
         Route::post('administrator/updateAccess', array('before' => 'csrf', 'uses' => 'UsersController@updateAccess'));
         Route::post('administrator/users/store', array('before' => 'csrf', 'uses' => 'UsersController@store'));
 
-        Route::get('criteria', array('uses' => 'CriteriaController@edit'));
-        Route::get('objectives', array('uses' => 'Objective2Controller@edit'));
+        //Route::get('criteria', array('uses' => 'CriteriaController@edit'));
+        //Route::get('objectives', array('uses' => 'Objective2Controller@edit'));
         Route::get('administrator/semesters', 'SemestersController@edit');
         Route::post('administrator/semesters/update', 'SemestersController@update');
         Route::post('deleteObjective', 'Objective2Controller@delete');
@@ -415,8 +419,8 @@ Route::group(array('before' => 'auth|has_access'), function () {
 
         // Gabriel added this, so the school coordinator can add criterias and objectives
         Route::post('createCriterion', array('before' => 'csrf', 'uses' => 'CriteriaController@create'));
-        Route::get('school-objective', 'Objective2Controller@edit');
-        Route::get('school-criteria', 'CriteriaController@edit');
+        //Route::get('school-objective', 'Objective2Controller@edit');
+        //Route::get('school-criteria', 'CriteriaController@edit');
         Route::post('crtiteria/update', array('before' => 'csrf', 'uses' => 'CriteriaController@update'));
 
         //Show users annual plan
@@ -473,9 +477,9 @@ Route::group(array('before' => 'auth|has_access'), function () {
 
 
         //Criteria and objectives
-        Route::get('program-criteria', 'CriteriaController@edit');
+        //Route::get('program-criteria', 'CriteriaController@edit');
         Route::post('crtiteria/update', array('before' => 'csrf', 'uses' => 'CriteriaController@update'));
-        Route::get('program-objective', 'Objective2Controller@edit');
+        //Route::get('program-objective', 'Objective2Controller@edit');
 
         // Print program report
         Route::get('print_program/{id}', 'ProgramsController@print_program');
@@ -495,7 +499,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
         Route::post('fetchObjectivesForCriteria', array('before' => 'csrf', 'uses' => 'ObjectivesController@fetchObjectivesForCriteria'));
 
         //Objectives por Gabriel
-        Route::get('objective', 'Objective2Controller@edit');
+        //Route::get('objective', 'Objective2Controller@edit');
         Route::post('createObjective', array('before' => 'csrf', 'uses' => 'Objective2Controller@create'));
         Route::post('updateObjective', array('before' => 'csrf', 'uses' => 'Objective2Controller@update'));
         Route::post('fetchObjectiveWithTrashed', array('before' => 'csrf', 'uses' => 'Objective2Controller@fetchObjectiveWithTrashed'));
@@ -607,4 +611,4 @@ Route::group(array('before' => 'auth|has_access'), function () {
 
         Route::get('general-studies-overview', 'ProfessorsController@generalStudiesOverview');
     });
-});
+});

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

@@ -20,7 +20,7 @@
                     <li>{{ $semester_info }}</li>
                 @endforeach
             </ul>
-            <?php set_time_limit(0);?>
+            <?php set_time_limit(0); ?>
             @foreach ($schools as $school)
                 <h3>{{ $school->name }}</h3>
                 <hr>
@@ -47,7 +47,14 @@
                                 <h3 class="panel-title">{{ $program->name }}</h3>
                             </div>
                             <div class="panel-body">
-
+                                <ul class="nav navbars" role="tablist">
+                                    @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>
 
 
 
@@ -56,14 +63,14 @@
                                     <?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')
                                     
@@ -99,494 +106,497 @@
                                     ?>
 
 
+                                    <div role="tabpanel" class='tab-pane'
+                                        id="{{ $course->code }}-{{ $course->number }}">
+                                        @foreach ($sections_evaluating as $index3 => $section)
+                                            @if (!$section->publishedActivities->isEmpty())
+                                                <h3 style="text-align: center"> Course: {{ $course->code }}
+                                                    {{ $course->number }}-{{ $section->section }} </h3>
+                                            @endif
 
-                                    @foreach ($sections_evaluating as $index3 => $section)
-                                        @if (!$section->publishedActivities->isEmpty())
-                                            <h3 style="text-align: center"> Course: {{ $course->code }}
-                                                {{ $course->number }}-{{ $section->section }} </h3>
-                                        @endif
-                              
-                                        @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
+                                            @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>
-                                            @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)
+                                                <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>
-                                                            <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
+                                                            <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
-                                                                $percentage = round(($out_ach / $out_att) * 100, 2);
+                                                                
+                                                                $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 ($percentage >= $activity->rubric[0]->expected_percentage)
-                                                                    <td class="col-md-1 success">{{ $percentage }}%</td>
-
+                                                                @if ($out_att == 0)
+                                                                    <td class="col-md-1 danger">{{ $percentage }}</td>
                                                                 @else
-                                                                    <td class="col-md-1 danger">{{ $percentage }}%</td>
+                                                                    <?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
-                                                            @endif
-                                                            <td>
+                                                                <td>
 
-                                                                @foreach (Criterion::outcomes($ac_criterion->criterion_id) as $index6 => $outcome)
-                                                                    <?php echo $outcome->name . "\n\n\n <br>"; ?>
-                                                                @endforeach
+                                                                    @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>
+                                                                </td>
+                                                            </tr>
+                                                        @endforeach
+                                                    </tbody>
 
-                                                    <i>{{ $formative_actions[0]->description }}
+                                                </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
+
+                                                <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>
+                                                <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>
-                                                <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>
-                                            <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)
+                                                <table class='table table-striped table-condensed datatable'>
+                                                    <thead>
                                                         <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>
+                                                            <th>
+                                                                Learning Outcome
+                                                            </th>
+                                                            <th>
+                                                                Number of Students Assessed
+                                                            </th>
+                                                            <th>
+                                                                Number of students that achieved the target
+                                                            </th>
+                                                            <th>
+                                                                %
+                                                            </th>
 
-                                                            @else
-                                                                <td class="col-md-1 danger">
-                                                                    {{ $outcome->percentage }}%
+                                                        </tr>
+                                                    </thead>
+                                                    <tbody>
+                                                        @foreach ($activity->getOutcomeReport() as $outcome)
+                                                            <tr>
+                                                                <td>
+                                                                    {{ $outcome->name }}
                                                                 </td>
-                                                            @endif
-
+                                                                <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
-                                        <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
+                                                            </tr>
                                                         @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
+                                                    </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>
-                                            @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)
+                                                <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>
-                                                            <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
+                                                            <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
-                                                                $percentage = round(($out_ach / $out_att) * 100, 2);
+                                                                
+                                                                $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 ($percentage >= $activity->rubric[0]->expected_percentage)
-                                                                    <td class="col-md-1 success">{{ $percentage }}%</td>
-
+                                                                @if ($out_att == 0)
+                                                                    <td class="col-md-1 danger">{{ $percentage }}</td>
                                                                 @else
-                                                                    <td class="col-md-1 danger">{{ $percentage }}%</td>
+                                                                    <?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
-                                                            @endif
-                                                            <td>
+                                                                <td>
 
-                                                                @foreach (Criterion::outcomes($ac_criterion->criterion_id) as $index6 => $outcome)
-                                                                    <?php echo $outcome->name . "\n\n\n <br>"; ?>
-                                                                @endforeach
+                                                                    @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>
+                                                                </td>
+                                                            </tr>
+                                                        @endforeach
+                                                    </tbody>
 
-                                                    <i>{{ $formative_actions[0]->description }}
+                                                </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
+
+                                                <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>
+                                                <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>
-                                                <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>
-                                            <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)
+                                                <table class='table table-striped table-condensed datatable'>
+                                                    <thead>
                                                         <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>
+                                                            <th>
+                                                                Learning Outcome
+                                                            </th>
+                                                            <th>
+                                                                Number of Students Assessed
+                                                            </th>
+                                                            <th>
+                                                                Number of students that achieved the target
+                                                            </th>
+                                                            <th>
+                                                                %
+                                                            </th>
 
-                                                            @else
-                                                                <td class="col-md-1 danger">
-                                                                    {{ $outcome->percentage }}%
+                                                        </tr>
+                                                    </thead>
+                                                    <tbody>
+                                                        @foreach ($activity->getOutcomeReport() as $outcome)
+                                                            <tr>
+                                                                <td>
+                                                                    {{ $outcome->name }}
+                                                                </td>
+                                                                <td>
+                                                                    {{ $outcome->attempted }}
+                                                                </td>
+                                                                <td>
+                                                                    {{ $outcome->achieved }}
                                                                 </td>
-                                                            @endif
+                                                                @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>
+                                                            </tr>
+                                                        @endforeach
+                                                    </tbody>
+                                                </table>
 
-                                            <br>
-                                            <hr>
+                                                <br>
+                                                <hr>
+                                            @endforeach
                                         @endforeach
-                                    @endforeach
+                                    </div>
                                 @endforeach
                             </div>
                         </div>
                     @endforeach
-
-
-
                 @else
                     <h4>This program has not assessed any activity</h4>
                 @endif

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

@@ -23,12 +23,11 @@
 
             @if ($program)
 
-            <?php set_time_limit(0);?>
+                <?php set_time_limit(0); ?>
 
                 <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>
@@ -40,18 +39,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')
                         
@@ -91,9 +89,8 @@
                             @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)
 
+                                @foreach ($section->publishedActivities as $index4 => $activity)
                                     <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
                                     <p style="display: inline;">{{ $activity->name }}
                                         <strong>({{ $activity->date }})</strong>
@@ -115,7 +112,6 @@
                                                     @else
                                                         and {{ $rubric_title->text }}
                                                     @endif
-
                                                 @endforeach
                                                 )
                                             @else
@@ -129,7 +125,6 @@
                                     @else
                                         <p style="display: inline;">1-{{ $activity->rubric[0]->max_score }} point scale
                                         </p>
-
                                     @endif
                                     <br>
                                     <br>
@@ -187,27 +182,20 @@
                                                     ?>
                                                     @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
 
 
@@ -233,18 +221,13 @@
                                             Criteria: </h5>
                                         <ul style="margin:30px;">
                                             @foreach ($formative_actions as $criteria)
-                                                <li> <i>{{ $criteria->name }} <i></li>
-
+                                                <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>
@@ -272,10 +255,9 @@
                                                 ->first();
                                             if (!$expected) {
                                                 $expected = 'It has not been defined in the annual plan';
+                                            } else {
+                                                $expected = $expected->expected_target;
                                             }
-                                            else{
-                                            $expected = $expected->expected_target;
-                                        }
                                             ?>
                                             {{ $expected }}
                                         </i>
@@ -313,10 +295,8 @@
                                                     </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
 
 
@@ -324,274 +304,238 @@
 
 
                                                 </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
+                                    <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>
 
-                                @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)
+                                    <br>
+
+                                    <table class='table table-striped table-condensed datatable'>
+                                        <thead>
                                             <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
+                                                <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
-                                                    $percentage = round(($out_ach / $out_att) * 100, 2);
+                                                    
+                                                    $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 ($percentage >= $activity->rubric[0]->expected_percentage)
-                                                        <td class="col-md-1 success">{{ $percentage }}%</td>
-
+                                                    @if ($out_att == 0)
+                                                        <td class="col-md-1 danger">{{ $percentage }}</td>
                                                     @else
-                                                        <td class="col-md-1 danger">{{ $percentage }}%</td>
-
+                                                        <?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
-                                                @endif
-                                                <td>
+                                                    <td>
 
-                                                    @foreach (Criterion::outcomes($ac_criterion->criterion_id) as $index6 => $outcome)
+                                                        @foreach (Criterion::outcomes($ac_criterion->criterion_id) as $index6 => $outcome)
+                                                            <?php echo $outcome->name . "\n\n\n <br>"; ?>
+                                                        @endforeach
 
-                                                        <?php echo $outcome->name . "\n\n\n <br>"; ?>
 
+                                                    </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>
 
-                                                    @endforeach
+                                            <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
 
+                                    <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>
 
-                                                </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 }}
+                                    <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>
+                                    <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>
-                                    <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>
-                                <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)
+                                    <table class='table table-striped table-condensed datatable'>
+                                        <thead>
                                             <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
-
-
-
-
+                                                <th>
+                                                    Learning Outcome
+                                                </th>
+                                                <th>
+                                                    Number of Students Assessed
+                                                </th>
+                                                <th>
+                                                    Number of students that achieved the target
+                                                </th>
+                                                <th>
+                                                    %
+                                                </th>
 
                                             </tr>
-
-                                        @endforeach
-                                    </tbody>
-                                </table>
-
-                                <br>
-                                <hr>
+                                        </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>
 
-                            @endforeach
+                                    <br>
+                                    <hr>
+                                @endforeach
                             @endforeach
                         </div>
-
                     @endforeach
-
-
-
                 @else
                     <h4>This program has not assessed any activity</h4>
             @endif

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

@@ -142,7 +142,6 @@
                                 @else
                                     and {{ $rubric_title->text }}
                                 @endif
-
                             @endforeach
                             )
                         @else
@@ -155,7 +154,6 @@
                     <p style="display: inline;">1 point scale</p>
                 @else
                     <p style="display: inline;">1-{{ $activity_1->rubric[0]->max_score }} point scale</p>
-
                 @endif
                 <br>
                 <br>
@@ -210,27 +208,20 @@
                                 ?>
                                 @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_1->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
 
 
@@ -255,17 +246,14 @@
                         Criteria: </h5>
                     <ul style=" margin:30px;">
                         @foreach ($formative_actions as $criteria)
-                            <li> <i>{{ $criteria->name }} <i></li>
-
+                            <li> <i>{{ $criteria->name }} </i></li>
                         @endforeach
                     </ul>
                 @endif
-                <br>
+
 
                 <h5 style="display: inline; margin:30px;">Assessment Comments: </h5>
                 @if ($activity_1->assessment_comments != null)
-
-
                     <p style="display: inline;">{{ $activity_1->assessment_comments }}</p>
                 @endif
                 <hr>
@@ -288,10 +276,9 @@
                             ->first();
                         if (!$expected) {
                             $expected = 'It has not been defined in the annual plan';
+                        } else {
+                            $expected = $expected->expected_target;
                         }
-                        else{
-                                            $expected = $expected->expected_target;
-                                        }
                         
                         ?>
                         {{ $expected }}
@@ -331,10 +318,8 @@
                                 </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
 
 
@@ -342,7 +327,6 @@
 
 
                             </tr>
-
                         @endforeach
                     </tbody>
                 </table>
@@ -385,7 +369,6 @@
                                 @else
                                     and {{ $rubric_title->text }}
                                 @endif
-
                             @endforeach
                             )
                         @else
@@ -398,7 +381,6 @@
                     <p style="display: inline;">1 point scale</p>
                 @else
                     <p style="display: inline;">1-{{ $activity_2->rubric[0]->max_score }} point scale</p>
-
                 @endif
                 <br>
                 <br>
@@ -454,27 +436,20 @@
                                 ?>
                                 @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_2->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
 
 
@@ -499,16 +474,13 @@
                         Criteria: </h5>
                     <ul style=" margin:30px;">
                         @foreach ($formative_actions as $criteria)
-                            <li> <i>{{ $criteria->name }} <i></li>
-
+                            <li> <i>{{ $criteria->name }} </i></li>
                         @endforeach
                     </ul>
                 @endif
-                <br>
+
                 <h5 style="display: inline; margin:30px;">Assessment Comments: </h5>
                 @if ($activity_2->assessment_comments != null)
-
-
                     <p style="display: inline;">{{ $activity_2->assessment_comments }}</p>
                 @endif
                 <hr>
@@ -529,10 +501,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>
@@ -570,10 +541,8 @@
                                 </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
 
 
@@ -581,7 +550,6 @@
 
 
                             </tr>
-
                         @endforeach
                     </tbody>
                 </table>
@@ -622,7 +590,6 @@
     type: 'bar',
     height:
     @if ($activity_1->is_assessed())
-
         {{ count($activity_1->criteria_achieved()) * 22 + 225 }}
     @else
         {{ 22 + 225 }}
@@ -715,7 +682,6 @@
     data: [
     @if ($activity_1->is_assessed())
         @foreach ($activity_1->cap_array as $id => $crit)
-
             //This conditional is to ignore criteria that weren't assessed. These would have a value of null.
             @if ($crit->score_percentage)
                 {{ $crit->score_percentage }},
@@ -734,7 +700,6 @@
     type: 'bar',
     height:
     @if ($activity_2->is_assessed())
-
         {{ count($activity_2->criteria_achieved()) * 22 + 225 }}
     @else
         {{ 22 + 225 }}
@@ -827,7 +792,6 @@
     data: [
     @if ($activity_2->is_assessed())
         @foreach ($activity_2->cap_array as $id => $crit)
-
             //This conditional is to ignore criteria that weren't assessed. These would have a value of null.
             @if ($crit->score_percentage)
                 {{ $crit->score_percentage }},

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

@@ -9,7 +9,6 @@
         @include('local.managers.pCoords._new_navigation')
     @else
         @include('local.professors._navigation')
-
     @endif
 @stop
 
@@ -28,11 +27,8 @@
             <!-- For each grouped course -->
             <ul id="levelTabs" class="nav nav-tabs" role="tablist">
 
-                <?php set_time_limit(0);?>
+                <?php set_time_limit(0); ?>
                 @foreach ($courses as $index2 => $course)
-
-
-
                     <li role="presentation">
                         <a data-toggle="tab" href="#{{ $course->code }}-{{ $course->number }}"
                             role="tab">{{ $course->code }}-{{ $course->number }}</a>
@@ -45,18 +41,17 @@
 
 
                 @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();*/
+                                                                                                                                                                                                                                                                                                                                                                                                                       ->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')
                     
@@ -97,9 +92,8 @@
                         @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)
 
+                            @foreach ($section->publishedActivities as $index4 => $activity)
                                 <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
                                 <p style="display: inline;">{{ $activity->name }}
                                     <strong>({{ $activity->date }})</strong>
@@ -121,7 +115,6 @@
                                                 @else
                                                     and {{ $rubric_title->text }}
                                                 @endif
-
                                             @endforeach
                                             )
                                         @else
@@ -131,11 +124,9 @@
                                 <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>
@@ -194,21 +185,15 @@
 
                                                 @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
 
 
@@ -217,11 +202,7 @@
 
 
                                                     @foreach (Criterion::outcomes($ac_criterion->criterion_id) as $index6 => $outcome)
-
                                                         <?php echo $outcome->name . "\n\n\n <br>"; ?>
-
-
-
                                                     @endforeach
 
 
@@ -241,22 +222,19 @@
                                         <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>
-
+                                            <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>
@@ -284,10 +262,8 @@
                                             ->where('semester_id', $course->semester_id)
                                             ->first(); //->expected_target;
                                         if (!$expected) {
-                                            
-                                             $expected = 'It has not been defined in the annual plan';
-                                        }
-                                        else{
+                                            $expected = 'It has not been defined in the annual plan';
+                                        } else {
                                             $expected = $expected->expected_target;
                                         }
                                         
@@ -328,10 +304,8 @@
                                                 </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
 
 
@@ -339,25 +313,15 @@
 
 
                                             </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>
@@ -379,7 +343,6 @@
                                                 @else
                                                     and {{ $rubric_title->text }}
                                                 @endif
-
                                             @endforeach
                                             )
                                         @else
@@ -389,11 +352,9 @@
                                 <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>
@@ -452,21 +413,15 @@
 
                                                 @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
 
 
@@ -475,11 +430,7 @@
 
 
                                                     @foreach (Criterion::outcomes($ac_criterion->criterion_id) as $index6 => $outcome)
-
                                                         <?php echo $outcome->name . "\n\n\n <br>"; ?>
-
-
-
                                                     @endforeach
 
 
@@ -504,17 +455,14 @@
                                         Criteria: </h5>
                                     <ul style="margin:30px;">
                                         @foreach ($formative_actions as $criteria)
-                                            <li> <i>{{ $criteria->name }} <i></li>
-
+                                            <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>
@@ -541,10 +489,8 @@
                                             ->where('semester_id', $course->semester_id)
                                             ->first(); //->expected_target;
                                         if (!$expected) {
-                                            
-                                             $expected = 'It has not been defined in the annual plan';
-                                        }
-                                        else{
+                                            $expected = 'It has not been defined in the annual plan';
+                                        } else {
                                             $expected = $expected->expected_target;
                                         }
                                         
@@ -585,10 +531,8 @@
                                                 </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
 
 
@@ -596,28 +540,15 @@
 
 
                                             </tr>
-
                                         @endforeach
                                     </tbody>
                                 </table>
 
                                 <br>
                                 <hr>
-
-
-
-
-
-
-
-
                             @endforeach
-                            
                         @endforeach
                     </div>
-
-
-
                 @endforeach