PAL DE UPDATES

app/controllers/AnnualPlansController.php

@@ -126,7 +126,7 @@ class AnnualPlansController extends \BaseController
 
     return View::make('local.managers.shared.index_annual_plans', compact('title', 'quinquenniums', 'programs', 'current_quinquennium'));
   }*/
-  public function adminIndex($school_id)
+  public function adminIndex()
   {
     $title = "Annual Plans";
     $programs = Program::where("school_id", $school_id)->get();
@@ -1069,6 +1069,11 @@ class AnnualPlansController extends \BaseController
     return View::make('local.managers.shared.new_view_annual_plans', compact('paths_with_users', 'title', 'report', 'last', 'annual_report_or_plan', 'program_id'));
   }
 
+  public function adminReportIndex()
+  {
+  }
+
+
   public function downloadPDF($download, $path_id)
   {
     $pdf = new PDF(app('config'), app("Filesystem"), app('view'), '/storage/plan_pdf');
@@ -1100,7 +1105,7 @@ class AnnualPlansController extends \BaseController
   public function checkIfPlanReady()
   {
     $annual_plan = AnnualPlan::findOrFail(Input::get("annual_id"));
-      Log::info('annual_plan'.$annual_plan->courses);
+    Log::info('annual_plan' . $annual_plan->courses);
 
     /*
       error = [

app/controllers/Objective2Controller.php

@@ -5,20 +5,54 @@ use Illuminate\Support\Facades\Auth;
 class Objective2Controller extends \BaseController
 {
 
-	/**
-	 * Display a listing of the resource.
-	 *
-	 * @return Response
-	 */
 
 
+	// display index Objectives
+
+	public function viewObjectives()
+	{
+
+
+		$title = "Learning Objectives and Criteria";
+		$outcomes = Outcome::whereNull("deactivation_date")->orderBy('name', 'ASC')->get();
+
 
+		return View::make('global.view-objectives-criteria', compact('title', 'outcomes'));
+	}
 
 	/**
 	 * Show the form for creating a new resource.
 	 *
 	 * @return Response
 	 */
+
+	public function fetchObjectivesForOutcome()
+	{
+
+		$outcome = Outcome::find(Input::get('id'));
+
+
+		$role = Auth::user()->role;
+		switch ($role) {
+			case 1:
+				$programs = DB::table('programs')->lists('id');
+				break;
+
+			case 2:
+				$programs = DB::table('programs')
+					->where('school_id', Auth::user()->school_id)
+					->lists('id');
+				break;
+			case 3:
+				$programs = DB::table('program_user')
+					->where("user_id", Auth::user()->id)
+					->lists('program_id');
+		}
+		$objectives = $outcome->objectivesFromProgram($programs)->get();
+
+		return $objectives;
+	}
+
 	public function isObjectiveUnique($input, $existing_Objective = NULL)
 	{
 
@@ -469,7 +503,7 @@ class Objective2Controller extends \BaseController
 
 		/** Validation rules */
 		if ($clean_input['text'] == $Objective->text) {
-			$validator = $this->makeValidator($clean_input, true);
+			$validator = $this->makeValidator($clean_input, false);
 		} else
 			$validator = $this->makeValidator($clean_input, false);
 

app/controllers/OutcomesController.php

@@ -21,7 +21,9 @@ class OutcomesController extends \BaseController
         return View::make('local.managers.admins.learning-outcomes', compact('title', 'outcomes', 'schools'));
         //return View::make('local.managers.admins.learning-outcomes', compact('title', 'outcomes', 'schools','semesters'));
     }
-
+    public function adminProgramIndex()
+    {
+    }
     // TODO: Change to home page
     public function newIndex()
     {

app/models/Objective.php

@@ -7,16 +7,18 @@ class Objective extends Eloquent
     use SoftDeletingTrait;
     protected $fillable = array('text', 'outcome_id',  'active');
     protected $table = 'objectives';
-    protected $appends = array("grouped_annual_course");
+    protected $appends = array("grouped_annual_course", 'programs');
 
     /**
      * Return the program that the objective belongs to
      *
      * @return Illuminate\Database\Eloquent\Model
      */
-    public function program()
+    public function getProgramsAttribute()
     {
-        return $this->belongsTo('Program');
+        return Program::join('objective_program', 'programs.id', '=', 'objective_program.program_id')
+            ->where('objective_program.objective_id', $this->id)
+            ->get();
     }
 
     //paired_outcome
@@ -130,6 +132,7 @@ class Objective extends Eloquent
 
 
 
+
     /**
      * Return the program that the objective belongs to
      *

app/models/Outcome.php

@@ -271,6 +271,16 @@ class Outcome extends Eloquent
 		return $this->hasMany('Objective');
 		//		return $this->belongsToMany('Objective', 'objective_outcome');
 	}
+
+	public function scopeObjectivesFromProgram($query, $programs)
+	{
+		return Objective::join('objective_program', 'objective_program.objective_id', '=', 'objectives.id')
+			//->join('programs', 'programs.id', '=', 'objective_program.program_id')
+			->whereIn("program_id", $programs)
+			->where('objective_program.objective_id', '<>', '0')
+			->select('objectives.*')
+			->groupBy('objectives.id');
+	}
 	// 	public function attempted($semester, $is_grad)
 	// 	{
 	// 		return DB::table('new_criteria')

app/routes.php

@@ -30,7 +30,7 @@ Route::model('five_year_plan', 'FiveYearPlan');
 // Composers
 View::composer(array(
     'local.professors._navigation',
-    'local.managers.admins._navigation',
+    'local.managers.admins._new_navigation',
     'local.managers.sCoords._new_navigation',
     'local.managers.pCoords._new_navigation',
 ), function ($view) {
@@ -43,7 +43,7 @@ View::composer(array(
 
 View::composer(array(
     'local.professors.*',
-    'local.managers.admins._navigation',
+    'local.managers.admins._new_navigation',
     'local.managers.sCoords._new_navigation',
     'local.managers.pCoords._new_navigation',
     'local.managers.shared.limited-course',
@@ -215,6 +215,11 @@ Route::group(array('before' => 'auth|has_access'), function () {
         'uses' => 'AnnualPlansController@fetchAnnualReport'
     ));
 
+    //shared viewTransformativeActions
+
+    Route::get('viewTransformativeActions', 'TransformativeActionsController@viewTransformativeActions');
+    Route::get('viewProgramActivities', 'TransformativeActionsController@viewProgramActivities');
+
     //View Three year plan
 
     Route::get('three-year-plan/show/{program_id}', "ThreeYearPlanController@showPDFs");
@@ -272,6 +277,8 @@ Route::group(array('before' => 'auth|has_access'), function () {
         'uses' => 'TransformativeActionsController@fetchCourses'
     ));
 
+    Route::post('fetchObjectivesForOutcome', "Objective2Controller@fetchObjectivesForOutcome");
+
     //Objectives and Criteria Shared Routes
     Route::get('criteria', array('uses' => 'CriteriaController@edit'));
     Route::get('objectives', array('uses' => 'Objective2Controller@edit'));
@@ -341,7 +348,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
     Route::get('learning-outcomes-criteria', 'CriteriaController@index');
     Route::post('fetchOutcome', array('before' => 'csrf', 'uses' => 'OutcomesController@fetchOutcome'));
     // Show users all objectives and criteria
-    Route::get('learning-objectives-criteria', 'CriteriaController@objectivesIndex');
+    Route::get('learning-objectives-criteria', 'objective2Controller@viewObjectives');
     Route::post('fetchObjectiveForCriteria', array('before' => 'csrf', 'uses' => 'ObjectivesController@fetchObjectiveForCriteria'));
 
     // Show professor overview to users with courses
@@ -373,6 +380,14 @@ Route::group(array('before' => 'auth|has_access'), function () {
             'uses' => 'CriteriaController@fetch'
         ));
 
+
+        //New navigation routes
+
+        Route::get('campusAnnualReport', 'AnnualPlansController@adminReportIndex');
+        Route::get('campusResults', 'OutcomesController@adminProgramIndex');
+        Route::get('manageSemesterCycle', 'ThreeYearPlanController@manageSemesterCycle');
+
+
         //Plans routes
         Route::post('showThreeYearPlans', 'ThreeYearPlanController@adminIndex');
         Route::post('showAnnualPlans', 'AnnualPlansController@adminIndex');
@@ -626,9 +641,9 @@ Route::group(array('before' => 'auth|has_access'), function () {
         Route::post('updateRubric', array('before' => 'csrf', 'uses' => 'RubricsController@update'));
         Route::post('deleteRubric', array('before' => 'csrf', 'uses' => 'RubricsController@destroy'));
         Route::get('learning-outcomes-criteria', 'CriteriaController@index');
-        Route::get('learning-objectives-criteria', 'CriteriaController@objectivesIndex');
+        Route::get('learning-objectives-criteria', 'objective2Controller@viewObjectives');
         Route::get('export_grades/{id}', 'CoursesController@exportGrades');
-        Route::get('learning-objectives-criteria', 'CriteriaController@objectivesIndex');
+        Route::get('learning-objectives-criteria', 'objective2Controller@viewObjectives');
         Route::get('compare_activities/{activity_1}/{activity_2}', 'ActivitiesController@compareActivities');
         // Assessment reports
         //Route::get('professor-assessment-report/{outcome_id}', 'OutcomesController@professorAssessmentReport');

app/views/global/feedback.blade.php

@@ -1,10 +1,10 @@
 @extends('layouts.master')
 @section('navigation')
-    @if($user->role==1)
-        @include('local.managers.admins._navigation')
-    @elseif($user->role==2)
+    @if ($user->role == 1)
+        @include('local.managers.admins._new_navigation')
+    @elseif($user->role == 2)
         @include('local.managers.sCoords._new_navigation')
-    @elseif($user->role==3)
+    @elseif($user->role == 3)
         @include('local.managers.pCoords._new_navigation')
     @else
         @include('local.professors._navigation')
@@ -13,57 +13,58 @@
 
 @section('main')
 
-<div class="row">
-	<div class="col-md-12">
-		<p>Use this form to let us know of any comments you have about the application. Please note that all fields are required. When writing comments, be as descriptive as possible, especially when you want to report errors. Include the name of the page you are commenting about, if applicable. Once you are done, click 'Send'. A copy will be sent to your chosen email address.</p>
+    <div class="row">
+        <div class="col-md-12">
+            <p>Use this form to let us know of any comments you have about the application. Please note that all fields are
+                required. When writing comments, be as descriptive as possible, especially when you want to report errors.
+                Include the name of the page you are commenting about, if applicable. Once you are done, click 'Send'. A
+                copy will be sent to your chosen email address.</p>
 
-		{{ Form::open(array('action'=>'FeedbackController@send', 'class'=>'form-horizontal')) }}
-			<div class="form-group">
-				{{ Form::label('type', 'Type of Comment', array('class'=>'col-md-2')) }}
-				<div class="col-md-10">
-					{{ Form::select(
-						'type',
-						array(
-							'0' => 'Error Report',
-							'1' => 'Question',
-							'2'=>'Suggestion',
-							'3'=>'Other'),
-						null,
-						array('class'=>'form-control', 'name'=>'type'))
-					}}
-				</div>
-			</div>
+            {{ Form::open(['action' => 'FeedbackController@send', 'class' => 'form-horizontal']) }}
+            <div class="form-group">
+                {{ Form::label('type', 'Type of Comment', ['class' => 'col-md-2']) }}
+                <div class="col-md-10">
+                    {{ Form::select(
+                        'type',
+                        [
+                            '0' => 'Error Report',
+                            '1' => 'Question',
+                            '2' => 'Suggestion',
+                            '3' => 'Other',
+                        ],
+                        null,
+                        ['class' => 'form-control', 'name' => 'type'],
+                    ) }}
+                </div>
+            </div>
 
-			<div class="form-group">
-				{{ Form::label('email', 'Copy to', array('class'=>'col-md-2')) }}
-				<div class="col-md-10">
-					<select name="email" id="email" class="form-control" aria-labelledby="email">
-						<option value="{{ $user->email }}">{{ $user->email }}</option>
-						@if($user->alternate_email!=NULL)
-						<option value="{{ $user->alternate_email }}">{{ $user->alternate_email }}</option>
-						@endif
-					</select>
-				</div>
-			</div>
+            <div class="form-group">
+                {{ Form::label('email', 'Copy to', ['class' => 'col-md-2']) }}
+                <div class="col-md-10">
+                    <select name="email" id="email" class="form-control" aria-labelledby="email">
+                        <option value="{{ $user->email }}">{{ $user->email }}</option>
+                        @if ($user->alternate_email != null)
+                            <option value="{{ $user->alternate_email }}">{{ $user->alternate_email }}</option>
+                        @endif
+                    </select>
+                </div>
+            </div>
 
-			<div class="form-group">
-				<div class="col-md-12">
-					{{ Form::label( 'comment', 'Comment') }}
-					{{ Form::textarea('comment', '', array('class'=>'form-control', 'name'=>'comment')) }}
-				</div>
-			</div>
+            <div class="form-group">
+                <div class="col-md-12">
+                    {{ Form::label('comment', 'Comment') }}
+                    {{ Form::textarea('comment', '', ['class' => 'form-control', 'name' => 'comment']) }}
+                </div>
+            </div>
 
-			<div class="form-group">
-				<div class="col-md-12">
-					{{ Form::submit('Send', array('class'=>'btn btn-lg btn-primary pull-right'))}}
-				</div>
-			</div>
+            <div class="form-group">
+                <div class="col-md-12">
+                    {{ Form::submit('Send', ['class' => 'btn btn-lg btn-primary pull-right']) }}
+                </div>
+            </div>
 
-		{{ Form::close() }}
-	</div>
-</div>
+            {{ Form::close() }}
+        </div>
+    </div>
 
 @stop
-
-
-

app/views/global/hello.blade.php

@@ -1,97 +1,152 @@
 @extends('layouts.master')
 
 @section('navigation')
-    @include('local.managers.admins._navigation')
+    @include('local.managers.admins._new_navigation')
 @stop
 
 
 @section('main')
-<div class="container">
-  <div class="row">
-    <h2>Rubrics</h2>
-    <div class="well">
-      <form>
-        <div class="form-group">
-          <label for="exampleInputEmail1">Select a Template</label>
-          <select class="form-control"><option>One</option><option>Two</option><option>Three</option></select>
+    <div class="container">
+        <div class="row">
+            <h2>Rubrics</h2>
+            <div class="well">
+                <form>
+                    <div class="form-group">
+                        <label for="exampleInputEmail1">Select a Template</label>
+                        <select class="form-control">
+                            <option>One</option>
+                            <option>Two</option>
+                            <option>Three</option>
+                        </select>
+                    </div>
+                    <div class="form-group">
+                        <label for="exampleInputEmail1">Select a Learning Outcome</label>
+                        <select class="form-control">
+                            <option>One</option>
+                            <option>Two</option>
+                            <option>Three</option>
+                        </select>
+                    </div>
+                    <div class="form-group">
+                        <label for="exampleInputEmail1">Select a Criterion</label>
+                        <select class="form-control">
+                            <option>One</option>
+                            <option>Two</option>
+                            <option>Three</option>
+                        </select>
+                    </div>
+                </form>
+            </div>
         </div>
-        <div class="form-group">
-          <label for="exampleInputEmail1">Select a Learning Outcome</label>
-          <select class="form-control"><option>One</option><option>Two</option><option>Three</option></select>
+
+        <div class="row">
+            <table class="table table-striped">
+                <thead>
+                    <tr>
+                        <th colspan="5"><input type="text" class="form-control input-xxl" placeholder="Rubric Name"></th>
+                    </tr>
+                </thead>
+                <thead>
+                    <tr>
+                        <th></th>
+                        <th>Beginning (1-2)</th>
+                        <th>Satisfactory (3-4)</th>
+                        <th>Good (6-7)</th>
+                        <th>Excellent (7-8)</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td>Criterion 1</td>
+                        <td>..</td>
+                        <td>..</td>
+                        <td>..</td>
+                        <td>..</td>
+                    </tr>
+                    <tr>
+                        <td>Criterion 2</td>
+                        <td>..</td>
+                        <td>..</td>
+                        <td>..</td>
+                        <td>..</td>
+                    </tr>
+                    <tr>
+                        <td>Criterion 3</td>
+                        <td>..</td>
+                        <td>..</td>
+                        <td>..</td>
+                        <td>..</td>
+                    </tr>
+                    <tr>
+                        <td>Criterion 4</td>
+                        <td>..</td>
+                        <td>..</td>
+                        <td>..</td>
+                        <td>..</td>
+                    </tr>
+                    <tr>
+                        <td>Criterion 5</td>
+                        <td>..</td>
+                        <td>..</td>
+                        <td>..</td>
+                        <td>..</td>
+                    </tr>
+                </tbody>
+            </table>
         </div>
-        <div class="form-group">
-          <label for="exampleInputEmail1">Select a Criterion</label>
-          <select class="form-control"><option>One</option><option>Two</option><option>Three</option></select>
+        <div class="row">
+            <div class="col-md-12"><button class="btn btn-md btn-block btn-primary center-block">Save</button></div>
         </div>
-      </form>
     </div>
-  </div>
-
-  <div class="row">
-    <table class="table table-striped">
-      <thead><tr><th colspan="5"><input type="text" class="form-control input-xxl" placeholder="Rubric Name"></th></tr></thead>
-      <thead><tr><th></th><th>Beginning (1-2)</th><th>Satisfactory (3-4)</th><th>Good (6-7)</th><th>Excellent (7-8)</th></tr></thead>
-      <tbody><tr><td>Criterion 1</td><td>..</td><td>..</td><td>..</td><td>..</td></tr>
-            <tr><td>Criterion 2</td><td>..</td><td>..</td><td>..</td><td>..</td></tr>
-            <tr><td>Criterion 3</td><td>..</td><td>..</td><td>..</td><td>..</td></tr>
-            <tr><td>Criterion 4</td><td>..</td><td>..</td><td>..</td><td>..</td></tr>
-            <tr><td>Criterion 5</td><td>..</td><td>..</td><td>..</td><td>..</td></tr>
-      </tbody>
-    </table>
-  </div>
-  <div class="row">
-    <div class="col-md-12"><button class="btn btn-md btn-block btn-primary center-block">Save</button></div>
-  </div>
-</div>
 @stop
 
 @section('javascript')
-  $(function () {
+    $(function () {
     $('#container').highcharts({
-        title: {
-            text: 'Monthly Average Temperature',
-            x: -20 //center
-        },
-        subtitle: {
-            text: 'Source: WorldClimate.com',
-            x: -20
-        },
-        xAxis: {
-            categories: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
-                'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
-        },
-        yAxis: {
-            title: {
-                text: 'Temperature (°C)'
-            },
-            plotLines: [{
-                value: 0,
-                width: 1,
-                color: '#808080'
-            }]
-        },
-        tooltip: {
-            valueSuffix: '°C'
-        },
-        legend: {
-            layout: 'vertical',
-            align: 'right',
-            verticalAlign: 'middle',
-            borderWidth: 0
-        },
-        series: [{
-            name: 'Tokyo',
-            data: [7.0, 6.9, 9.5, 14.5, 18.2, 21.5, 25.2, 26.5, 23.3, 18.3, 13.9, 9.6]
-        }, {
-            name: 'New York',
-            data: [-0.2, 0.8, 5.7, 11.3, 17.0, 22.0, 24.8, 24.1, 20.1, 14.1, 8.6, 2.5]
-        }, {
-            name: 'Berlin',
-            data: [-0.9, 0.6, 3.5, 8.4, 13.5, 17.0, 18.6, 17.9, 14.3, 9.0, 3.9, 1.0]
-        }, {
-            name: 'London',
-            data: [3.9, 4.2, 5.7, 8.5, 11.9, 15.2, 17.0, 16.6, 14.2, 10.3, 6.6, 4.8]
-        }]
+    title: {
+    text: 'Monthly Average Temperature',
+    x: -20 //center
+    },
+    subtitle: {
+    text: 'Source: WorldClimate.com',
+    x: -20
+    },
+    xAxis: {
+    categories: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
+    'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
+    },
+    yAxis: {
+    title: {
+    text: 'Temperature (°C)'
+    },
+    plotLines: [{
+    value: 0,
+    width: 1,
+    color: '#808080'
+    }]
+    },
+    tooltip: {
+    valueSuffix: '°C'
+    },
+    legend: {
+    layout: 'vertical',
+    align: 'right',
+    verticalAlign: 'middle',
+    borderWidth: 0
+    },
+    series: [{
+    name: 'Tokyo',
+    data: [7.0, 6.9, 9.5, 14.5, 18.2, 21.5, 25.2, 26.5, 23.3, 18.3, 13.9, 9.6]
+    }, {
+    name: 'New York',
+    data: [-0.2, 0.8, 5.7, 11.3, 17.0, 22.0, 24.8, 24.1, 20.1, 14.1, 8.6, 2.5]
+    }, {
+    name: 'Berlin',
+    data: [-0.9, 0.6, 3.5, 8.4, 13.5, 17.0, 18.6, 17.9, 14.3, 9.0, 3.9, 1.0]
+    }, {
+    name: 'London',
+    data: [3.9, 4.2, 5.7, 8.5, 11.9, 15.2, 17.0, 16.6, 14.2, 10.3, 6.6, 4.8]
+    }]
+    });
     });
-});
 @stop

app/views/global/profile.blade.php

@@ -1,7 +1,7 @@
 @extends('layouts.master')
 @section('navigation')
     @if($user->role==1)
-        @include('local.managers.admins._navigation')
+        @include('local.managers.admins._new_navigation')
     @elseif($user->role==2)
         @include('local.managers.sCoords._new_navigation')
     @elseif($user->role==3)

app/views/global/view-learning-outcomes-criteria.blade.php

@@ -2,7 +2,7 @@
 
 @section('navigation')
     @if(Auth::user()->role==1)
-      @include('local.managers.admins._navigation')
+      @include('local.managers.admins._new_navigation')
     @elseif(Auth::user()->role==2)
       @include('local.managers.sCoords._new_navigation')
     @elseif(Auth::user()->role==3)

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

@@ -24,7 +24,8 @@
                     and Criterias<span class="caret"></span></a>
                 <ul class="dropdown-menu" role="menu">
                     <li>{{ HTML::linkAction('CriteriaController@index', 'Outcomes and Criteria') }}</li>
-                    <li>{{ HTML::linkAction('CriteriaController@objectivesIndex', 'Objectives and Criteria') }}</li>
+                    <li>{{ HTML::linkAction('objective2Controller@viewObjectives', 'Objectives and Criteria') }}
+                    </li>
                 </ul>
             </li>
             <li class="dropdown">
@@ -64,12 +65,12 @@
                     @if (count(Auth::user()->courses))
                         <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReport', 'My Courses\' Results') }}
                         </li>
-
                     @endif
                 </ul>
             </li>
             <li class="dropdown">
-                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Program Plans
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Program
+                    Plans
                     <span class="caret"></span></a>
                 <ul class="dropdown-menu" role="menu">
                     <li>{{ HTML::linkAction('AnnualPlansController@adminIndex', 'Annual Plans') }}</li>
@@ -98,7 +99,7 @@
                     <li>{{ HTML::linkAction('AuthController@logout', 'Log out (' . Auth::user()->email . ')') }}</li>
                 </ul>
             </li>
-            <!-- 
+            <!--
           <li>{{ HTML::linkAction('AuthController@logout', 'Log out (' . Auth::user()->email . ')') }}
       </li>
  -->

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

@@ -0,0 +1,134 @@
+<div class="navbar navbar-inverse navbar-static-top">
+    <div class="container-fluid">
+        <!--<div class="navbar-header">
+      {{ HTML::linkAction('ProgramCoordinatorsController@overview', 'Online Learning Assessment System · Program Coordinator', [], ['class' => 'navbar-brand']) }}
+    </div>-->
+        <ul class="nav navbar-nav navbar-right ml-auto">
+            <li>{{ HTML::linkAction('AdministratorsController@overview', 'Overview') }}</li>
+            <li>{{ HTML::linkAction('AdministratorsController@overview2', 'Overview2') }}</li>
+
+            <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"
+                    aria-expanded="false">Objectives<span class="caret"></span></a>
+                <ul class="dropdown-menu dropdown-menu-left" role="menu">
+                    <li>{{ HTML::linkAction('Objective2Controller@edit', 'Create/Edit Objectives') }}</li>
+                    <li>{{ HTML::linkAction('objective2Controller@viewObjectives', 'View Objectives and Criteria') }}
+                    </li>
+                </ul>
+            </li>
+            <li class='dropdown'>
+                <a href='#' class='dropdown-toggle' data-toggle='dropdown' role='button' aria-expanded="false">
+                    Criteria<span class="caret"></span></a>
+                <ul class='dropdown-menu dropdown-menu-left' role='menu'>
+
+                    <li>{{ HTML::linkAction('CriteriaController@edit', 'Create/Edit Criteria') }}</li>
+                    <li>{{ HTML::linkAction('CriteriaController@index', 'View Criteria') }}</li>
+
+                </ul>
+            </li>
+
+
+
+
+            <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"
+                    aria-expanded="false">Rubrics<span class="caret"></span></a>
+                <ul class="dropdown-menu dropdown-menu-left" role="menu">
+                    <li>{{ HTML::linkAction('TemplatesController@newTemplate_new', 'Create/Edit Rubrics') }}</li>
+                    <li>{{ HTML::linkAction('TemplatesController@index', 'View Rubric List') }}</li>
+                </ul>
+            </li>
+
+
+            <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Colleges
+                    and Schools<span class="caret"></span></a>
+                <ul class="dropdown-menu dropdown-menu-left" role="menu">
+                    @foreach ($schools as $school)
+                        <li>{{ HTML::linkAction('SchoolsController@show', $school->name, [$school->id]) }}</li>
+                    @endforeach
+                </ul>
+            </li>
+            <li>{{ HTML::linkAction('ProgramsController@index', 'Programs') }}</li>
+            <li class='dropdown'>
+                <a href='#' class='dropdown-toggle' data-toggle='dropdown' role='button' aria-expanded="false">
+                    Assessment Cycle<span class="caret"></span></a>
+                <ul class='dropdown-menu dropdown-menu-left' role='menu'>
+
+                    <li>{{ HTML::linkAction('ThreeYearPlanController@adminIndex', 'View Three Year Plan') }}</li>
+                    <li>{{ HTML::linkAction('AnnualPlansController@adminIndex', 'View Annual Plan') }}</li>
+                    <li>{{ HTML::linkAction('AnnualPlansController@adminReportIndex', 'View Annual Report') }}</li>
+                    <li>{{ HTML::linkAction('OutcomesController@adminProgramIndex', 'View Program Courses Results') }}
+                    </li>
+                    <li>{{ HTML::linkAction('TransformativeActionsController@viewTransformativeActions', 'View Transformative Actions') }}
+                    </li>
+
+                    <li>{{ HTML::linkAction('TransformativeActionsController@viewFormativeActions', 'View Formative Actions') }}
+
+                </ul>
+            </li>
+
+            <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"
+                    aria-expanded="false">Management<span class="caret"></span></a>
+                <ul class="dropdown-menu dropdown-menu-left" role="menu">
+                    <li>{{ HTML::linkAction('CoursesController@reassign', 'Courses') }}</li>
+
+                    <li>{{ HTML::linkAction('OutcomesController@index', 'Learning Outcomes') }}</li>
+
+                    <li>{{ HTML::linkAction('SemestersController@edit', 'Semesters') }}</li>
+                    <li>{{ HTML::linkAction('ThreeYearPlanController@manageSemesterCycle', 'Schedule Assessment Cycle') }}
+                    </li>
+
+                    <li>{{ HTML::linkAction('UsersController@index', 'Users') }}</li>
+                </ul>
+            </li>
+
+
+            @if (count(Auth::user()->courses))
+                <li> {{ HTML::linkAction('ProfessorsController@overview', 'My Courses', null) }}</li>
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"
+                        aria-expanded="false">Sections<span class="caret"></span></a>
+                    <ul class="dropdown-menu" role="menu">
+                        @foreach ($courses as $course)
+                            <li> {{ HTML::linkAction('CoursesController@show', $course->code . $course->number . '-' . $course->section . ' (' . $course->semester->code . ')', ['id' => $course->id]) }}
+                            </li>
+                        @endforeach
+                    </ul>
+                </li>
+
+            @endif
+
+
+
+
+
+
+
+
+            <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Help<span
+                        class="caret"></span></a>
+                <ul class="dropdown-menu dropdown-menu-left" role="menu">
+                    <li>{{ HTML::linkAction('FeedbackController@create', 'Feedback') }}</li>
+                    <!-- <li><a href="{{ asset('files/OLAS-intro.pdf') }}">Introduction to OLAS</a></li> -->
+                    <li><a href="{{ asset('files/intro-avaluo.pdf') }}">Introduction to Assessment</a></li>
+                    <!-- <li><a href="{{ asset('files/OLAS-coords.pdf') }}">OLAS for Coordinators</a></li> -->
+                    <li><a
+                            href="http://oeae.uprrp.edu/wp-content/uploads/2019/01/Brochure-de-OLAS-rev.-agosto-2018.pdf">Brochure</a>
+                    </li>
+                </ul>
+            </li>
+            <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"
+                    aria-expanded="false">Account<span class="caret"></span></a>
+                <ul class="dropdown-menu dropdown-menu-left" role="menu">
+                    <li>{{ HTML::linkAction('UsersController@edit', 'Profile') }}</li>
+                    <li>{{ HTML::linkAction('AuthController@logout', 'Log out (' . Auth::user()->email . ')') }}</li>
+                </ul>
+            </li>
+            <li>
+        </ul>
+    </div>
+</div>

app/views/local/managers/admins/appraisal-program.blade.php

@@ -1,11 +1,11 @@
 @extends('layouts.master')
 
 @section('navigation')
-    @if(Auth::user()->role==1)
-        @include('local.managers.admins._navigation')
-    @elseif(Auth::user()->role==2)
+    @if (Auth::user()->role == 1)
+        @include('local.managers.admins._new_navigation')
+    @elseif(Auth::user()->role == 2)
         @include('local.managers.sCoords._new_navigation')
-    @elseif(Auth::user()->role==3)
+    @elseif(Auth::user()->role == 3)
         @include('local.managers.pCoords._new_navigation')
     @endif
 @stop
@@ -14,16 +14,16 @@
     <div class="row">
         <div class="col-md-12">
             <p>Click the links below to see annual appraisal plans for a specific program with assessed courses:</p>
-            
-            
+
+
             <ol id="table-of-contents" class="upper-roman">
-            @foreach($programs as $program)
-                <li>
-                    <a href="{{ URL::action('AnnualPlansController@showPlan', array($program->id))}}">
-                        {{ $program->name }}
-                    </a>
-                </li>
-            @endforeach
+                @foreach ($programs as $program)
+                    <li>
+                        <a href="{{ URL::action('AnnualPlansController@showPlan', [$program->id]) }}">
+                            {{ $program->name }}
+                        </a>
+                    </li>
+                @endforeach
             </ol>
         </div>
     </div>

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

@@ -1,7 +1,7 @@
 @extends('layouts.master')
 
 @section('navigation')
-    @include('local.managers.admins._navigation')
+    @include('local.managers.admins._new_navigation')
 @stop
 
 @section('main')
@@ -22,7 +22,7 @@
             <!-- <h3>Table of Contents</h3> -->
             <!-- <ol id="table-of-contents" class="upper-roman">
 
-                    </ol> -->
+                        </ol> -->
 
 
             <h3 id="{{ $outcome->id }}" class="outcome">{{ $outcome->name }}</h3>
@@ -66,16 +66,16 @@
                                             <?php
                                             
                                             /* $sections_evaluating_outcome = 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%\'');} ))
-                                                                                        //                                                 $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%\'');} ))
+                                                                                                                                    //                                                 $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_outcome = Course::has('activities')
                                             
@@ -120,17 +120,17 @@
                                                             <h5>Measure {{ $activity_index + 1 }}</h5>
                                                             <?php
                                                             /*
-                                                                                                                                                                                var_dump($section->code);
-                                                                                                                                                                                var_dump($section->number);
-                                                                                                                                                                                var_dump($section->name);
-                                                                                                                                                                                var_dump($outcome->name);
-                                                                                                                                                                                var_dump(date('M Y', strtotime($activity->date)));
-                                                                                                                                                                                var_dump($activity->name);
-                                                                                                                                                                                var_dump(count($section->students));
-                                                                                                                                                                                print"<br>";
-                                                                                                                                                                                print "A rubric was used in the $section->code-$section->number ($section->name) course (". date('M Y', strtotime($activity->date)).") to assess students’ <u>". strtolower($outcome->name) ."</u> in the activity: '<strong>$activity->name </strong>'. N= ". count($section->students);
-                                                                                                                                                                                exit();
-                                                                                                                                                                                */
+                                                                                                                                                                                                                                            var_dump($section->code);
+                                                                                                                                                                                                                                            var_dump($section->number);
+                                                                                                                                                                                                                                            var_dump($section->name);
+                                                                                                                                                                                                                                            var_dump($outcome->name);
+                                                                                                                                                                                                                                            var_dump(date('M Y', strtotime($activity->date)));
+                                                                                                                                                                                                                                            var_dump($activity->name);
+                                                                                                                                                                                                                                            var_dump(count($section->students));
+                                                                                                                                                                                                                                            print"<br>";
+                                                                                                                                                                                                                                            print "A rubric was used in the $section->code-$section->number ($section->name) course (". date('M Y', strtotime($activity->date)).") to assess students’ <u>". strtolower($outcome->name) ."</u> in the activity: '<strong>$activity->name </strong>'. N= ". count($section->students);
+                                                                                                                                                                                                                                            exit();
+                                                                                                                                                                                                                                            */
                                                             ?>
 
 

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

@@ -1,11 +1,11 @@
 @extends('layouts.master')
 
 @section('navigation')
-    @if(Auth::user()->role==1)
-        @include('local.managers.admins._navigation')
-    @elseif(Auth::user()->role==2)
+    @if (Auth::user()->role == 1)
+        @include('local.managers.admins._new_navigation')
+    @elseif(Auth::user()->role == 2)
         @include('local.managers.sCoords._new_navigation')
-    @elseif(Auth::user()->role==3)
+    @elseif(Auth::user()->role == 3)
         @include('local.managers.pCoords._new_navigation')
     @endif
 @stop
@@ -22,13 +22,13 @@
             <p>Due to the large amount of information in these reports, please allow them to load a few seconds.</p>
 
             <ol id="table-of-contents" class="upper-roman">
-            @foreach($outcomes as $outcome)
-                <li>
-                    <a href="{{ URL::action('OutcomesController@assessmentReport', array($outcome->id))}}">
-                        {{ $outcome->name }}
-                    </a>
-                </li>
-            @endforeach
+                @foreach ($outcomes as $outcome)
+                    <li>
+                        <a href="{{ URL::action('OutcomesController@assessmentReport', [$outcome->id]) }}">
+                            {{ $outcome->name }}
+                        </a>
+                    </li>
+                @endforeach
             </ol>
         </div>
     </div>

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

@@ -2,7 +2,7 @@
 
 @section('navigation')
     @if (Auth::user()->role == 1)
-        @include('local.managers.admins._navigation')
+        @include('local.managers.admins._new_navigation')
     @elseif(Auth::user()->role == 2)
         @include('local.managers.sCoords._new_navigation')
     @elseif(Auth::user()->role == 3)
@@ -28,7 +28,7 @@
                             <div class="form-group col-md-12 selectOutcome">
                                 <label>Learning Outcome 1</label>
 
-                                {{ Form::select('outcome[]', $outcomes, reset($outcomes), ['class' => 'form-control selectpicker','id' => 'outcome0','onchange' => 'fetchObjectiveForSelect("outcome0", "objectiveGroupFor0")']) }}
+                                {{ Form::select('outcome[]', $outcomes, reset($outcomes), ['class' => 'form-control selectpicker', 'id' => 'outcome0', 'onchange' => 'fetchObjectiveForSelect("outcome0", "objectiveGroupFor0")']) }}
                             </div>
 
                             <div id='objectiveGroupFor0' class='createObjective' data-value='1'>
@@ -87,11 +87,11 @@
                     <div class="form-group">
                         {{ Form::label('subcriteria', 'Subcriteria') }}
                         <p class="help-block"><strong>Manually add</strong> bullets or numbering.</p>
-                        {{ Form::textarea('subcriteria', '', ['class' => 'form-control','rows' => 3,'aria-labelledby' => 'subcriteria']) }}
+                        {{ Form::textarea('subcriteria', '', ['class' => 'form-control', 'rows' => 3, 'aria-labelledby' => 'subcriteria']) }}
                     </div>
                     <div class="form-group form_validation maximum_form ">
                         {{ Form::label('maximum_score', 'Maximum Score') }}
-                        {{ Form::text('maximum_score', '8', ['class' => 'form-control','id' => 'maximum_score','oninput' => 'addOptions("Num_scale", "maximum_score", "Scales")']) }}
+                        {{ Form::text('maximum_score', '8', ['class' => 'form-control', 'id' => 'maximum_score', 'oninput' => 'addOptions("Num_scale", "maximum_score", "Scales")']) }}
                     </div>
                     <div class="form-group form_validation number_of_scales">
                         {{ Form::label('scales', 'Number of Scales') }}
@@ -105,15 +105,15 @@
                     </div>
                     <div class="form-group">
                         {{ Form::label('copyright', 'Copyright') }}
-                        {{ Form::textarea('copyright', '', ['class' => 'form-control','rows' => 2,'placeholder' => '(optional)','aria-labelledby' => 'copyright']) }}
+                        {{ Form::textarea('copyright', '', ['class' => 'form-control', 'rows' => 2, 'placeholder' => '(optional)', 'aria-labelledby' => 'copyright']) }}
                     </div>
 
                     <div class="form-group">
                         {{ Form::label('notes', 'Notes') }}
-                        {{ Form::textarea('notes', '', ['class' => 'form-control','rows' => 2,'placeholder' => '(optional)','aria-labelledby' => 'notes']) }}
+                        {{ Form::textarea('notes', '', ['class' => 'form-control', 'rows' => 2, 'placeholder' => '(optional)', 'aria-labelledby' => 'notes']) }}
                     </div>
 
-                    {{ Form::submit('Create', ['class' => 'btn btn-primary btn-block','id' => 'create_the_criterion_button','data-form-id' => 'create_criterion']) }}
+                    {{ Form::submit('Create', ['class' => 'btn btn-primary btn-block', 'id' => 'create_the_criterion_button', 'data-form-id' => 'create_criterion']) }}
                     {{ Form::close() }}
                 </div>
             </div>
@@ -125,7 +125,7 @@
                     Edit
                 </div>
                 <div class="panel-body">
-                    {{ Form::open(['action' => 'CriteriaController@update','id' => 'update_criterion','data-form-id' => 'update_criterion']) }}
+                    {{ Form::open(['action' => 'CriteriaController@update', 'id' => 'update_criterion', 'data-form-id' => 'update_criterion']) }}
                     <button class="btn btn-md btn-secondary filterButton">
                         <span class="glyphicon glyphicon-minus">
                         </span>
@@ -144,7 +144,7 @@
                         </div>
                         <div class="form-group">
                             <label>Associated Learning Outcome</label>
-                            {{ Form::select('assoc_outcome_fetch', $outcomes, null, ['class' => 'form-control selectpicker','id' => 'assoc_outcomes_fetch','onchange' => 'fetchAllCriterion("select-program", "assoc_outcomes_fetch")']) }}
+                            {{ Form::select('assoc_outcome_fetch', $outcomes, null, ['class' => 'form-control selectpicker', 'id' => 'assoc_outcomes_fetch', 'onchange' => 'fetchAllCriterion("select-program", "assoc_outcomes_fetch")']) }}
 
                         </div>
                     </div>
@@ -155,8 +155,8 @@
                             onchange='fetchCriterionForEditing()'>
                             @foreach ($criteria as $criterion)
                                 <option value="{{ $criterion->id }}" data-subtext="
-                                                                     @if ($criterion->program) &nbsp;&nbsp;&nbsp;[{{ $criterion->program->name }}] @endif
-                                ">
+                                                                         @if ($criterion->program) &nbsp;&nbsp;&nbsp;[{{ $criterion->program->name }}] @endif
+                                    ">
                                     {{ $criterion->name }}
 
 
@@ -170,7 +170,7 @@
                         <div id='assocOutcomeGroup0' class='createOutcome' data-value="1">
                             <div class="form-group col-md-12 selectOutcome">
                                 <label>Learning Outcome 1</label>
-                                {{ Form::select('outcome[]', $outcomes, null, ['class' => 'form-control selectpicker','id' => 'assoc_outcome_0','onchange' => 'fetchObjectiveForSelect("assoc_outcome_0", "assoc_objectiveGroupFor0")']) }}
+                                {{ Form::select('outcome[]', $outcomes, null, ['class' => 'form-control selectpicker', 'id' => 'assoc_outcome_0', 'onchange' => 'fetchObjectiveForSelect("assoc_outcome_0", "assoc_objectiveGroupFor0")']) }}
 
                             </div>
                             <div id='assoc_objectiveGroupFor0' class='createObjective' data-value="1">
@@ -242,7 +242,7 @@
                     </div>
                     <div class="form-group  form_validation maximum_form">
                         {{ Form::label('maximum_score', 'Maximum Score') }}
-                        {{ Form::text('maximum_score', '', ['class' => 'form-control','id' => 'assoc_maximum_score','oninput' => 'addOptions("Num_assoc_scale", "assoc_maximum_score", "Assoc_Scales")']) }}
+                        {{ Form::text('maximum_score', '', ['class' => 'form-control', 'id' => 'assoc_maximum_score', 'oninput' => 'addOptions("Num_assoc_scale", "assoc_maximum_score", "Assoc_Scales")']) }}
                     </div>
 
 
@@ -261,15 +261,15 @@
 
                     <div class="form-group">
                         {{ Form::label('copyright', 'Copyright Information') }}
-                        {{ Form::textarea('copyright', Input::old('copyright'), ['class' => 'form-control','rows' => 2,'id' => 'criterion_copyright','placeholder' => '(optional)']) }}
+                        {{ Form::textarea('copyright', Input::old('copyright'), ['class' => 'form-control', 'rows' => 2, 'id' => 'criterion_copyright', 'placeholder' => '(optional)']) }}
                     </div>
 
                     <div class="form-group">
                         {{ Form::label('notes', 'Additional Notes') }}
-                        {{ Form::textarea('notes', Input::old('notes'), ['class' => 'form-control','rows' => 2,'id' => 'criterion_notes','placeholder' => '(optional)']) }}
+                        {{ Form::textarea('notes', Input::old('notes'), ['class' => 'form-control', 'rows' => 2, 'id' => 'criterion_notes', 'placeholder' => '(optional)']) }}
                     </div>
 
-                    {{ Form::submit('Update', ['class' => 'btn btn-primary btn-block','id' => 'update_the_criterion_button','data-form-id' => 'update_criterion']) }}
+                    {{ Form::submit('Update', ['class' => 'btn btn-primary btn-block', 'id' => 'update_the_criterion_button', 'data-form-id' => 'update_criterion']) }}
                     {{ Form::close() }}
 
                     {{ Form::open(['action' => 'CriteriaController@delete']) }}

app/views/local/managers/admins/learning-outcome.blade.php

@@ -2,7 +2,7 @@
 
 @section('navigation')
     @if(Auth::user()->role==1)
-        @include('local.managers.admins._navigation')
+        @include('local.managers.admins._new_navigation')
     @elseif(Auth::user()->role==2)
         @include('local.managers.sCoords._new_navigation')
     @elseif(Auth::user()->role==3)

app/views/local/managers/admins/learning-outcome_new.blade.php

@@ -2,7 +2,7 @@
 
 @section('navigation')
     @if(Auth::user()->role==1)
-        @include('local.managers.admins._navigation')
+        @include('local.managers.admins._new_navigation')
     @elseif(Auth::user()->role==2)
         @include('local.managers.sCoords._new_navigation')
     @elseif(Auth::user()->role==3)

app/views/local/managers/admins/learning-outcomes-criteria.blade.php

@@ -1,269 +1,278 @@
 @extends('layouts.master')
 
 @section('navigation')
-    @if(Auth::user()->role==1)
-        @include('local.managers.admins._navigation')
-    @elseif(Auth::user()->role==2)
+    @if (Auth::user()->role == 1)
+        @include('local.managers.admins._new_navigation')
+    @elseif(Auth::user()->role == 2)
         @include('local.managers.sCoords._new_navigation')
-    @elseif(Auth::user()->role==3)
+    @elseif(Auth::user()->role == 3)
         @include('local.managers.pCoords._new_navigation')
     @endif
 @stop
 
 @section('main')
 
-  <div class="row">
-    <div class="col-md-3">
-      <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
-
-        <!-- Form to add a new Learning Outcome -->
-<!--         <div class="panel panel-default">
-          <div class="panel-heading">
-            New Learning Outcome
-          </div>
-          <div class="panel-body">
-            {{ Form::open(array('action' => 'OutcomesController@create')) }}
-
-            <div class="form-group">
-              {{ Form::label('name', 'Name') }}
-              {{ Form::text('name', '', array('class' => 'form-control')) }}
-            </div>
-
-            <div class="form-group">
-              {{ Form::label('definition', 'Definition') }}
-              {{ Form::textarea('definition', '', array('class' => 'form-control', 'rows'=>2)) }}
-            </div>
-
-            {{ Form::submit('Submit', array('class' => 'btn btn-primary btn-block')) }}
-
-            {{ Form::close() }}
-          </div>
-        </div> -->
-
-        <!-- Form to add a new criterion -->
-        <div class="panel panel-default panel-button">
-          <div class="panel-heading">
-            Create
-          </div>
-          <div class="panel-body">
-            {{ Form::open(array('action' => 'CriteriaController@create')) }}
-
-              <div class="form-group">
-                {{ Form::label('outcome_id', 'Associated Learning Outcome') }}
-                <select name="outcome_id" class="form-control">
-                @foreach ($outcomes as $outcome)
-                  <option value="{{ $outcome->id }}">{{ $outcome->name }}</option>
-                @endforeach
-                </select>
-              </div>
-
-              <div class="form-group">
-                {{ Form::label('name', 'Name') }}
-                {{ Form::text('name', '', array('class' => 'form-control')) }}
-              </div>
-
-              <div class="form-group">
-                {{ Form::label('description12', 'Beginning (1-2)') }}
-                {{ Form::textarea('description12', '', array('class' => 'form-control', 'rows'=>2)) }}
-              </div>
-
-              <div class="form-group">
-                {{ Form::label('description34', 'In Progress (3-4)') }}
-                {{ Form::textarea('description34', '', array('class' => 'form-control', 'rows'=>2)) }}
-              </div>
-
-              <div class="form-group">
-                {{ Form::label('description56', 'Satisfactory (5-6)') }}
-                {{ Form::textarea('description56', '', array('class' => 'form-control', 'rows'=>2)) }}
-              </div>
-
-              <div class="form-group">
-                {{ Form::label('description78', 'Excellent (7-8)') }}
-                {{ Form::textarea('description78', '', array('class' => 'form-control', 'rows'=>2)) }}
-              </div>
-
-              {{ Form::submit('Create', array('class' => 'btn btn-primary btn-block')) }}
-            {{ Form::close() }}
-          </div>
-        </div>
+    <div class="row">
+        <div class="col-md-3">
+            <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
 
-        <div class="panel panel-default panel-button">
-          <div class="panel-heading">
-            Edit
-          </div>
-          <div class="panel-body">
-            {{ Form::open(array('action' => 'CriteriaController@update')) }}
-
-              <div class="form-group">
-                {{ Form::label('criterion_id', 'Criterion') }}
-                <select id="select-criterion" name="id" class="form-control">
-                @foreach ($criteria as $criterion)
-                  <option value="{{ $criterion->id }}">{{ $criterion->name }}</option>
-                @endforeach
-                </select>
+                <!-- Form to add a new Learning Outcome -->
+                <!--         <div class="panel panel-default">
+              <div class="panel-heading">
+                New Learning Outcome
               </div>
+              <div class="panel-body">
+                {{ Form::open(['action' => 'OutcomesController@create']) }}
 
-              <div class="form-group">
-                {{ Form::label('assoc_outcome_id', 'Associated Learning Outcome') }}
-                <select id="assoc_outcome_id" name="outcome_id" class="form-control">
-                @foreach ($outcomes as $outcome)
-                  <option value="{{ $outcome->id }}">{{ $outcome->name }}</option>
-                @endforeach
-                </select>
-              </div>
+                <div class="form-group">
+                  {{ Form::label('name', 'Name') }}
+                  {{ Form::text('name', '', ['class' => 'form-control']) }}
+                </div>
 
-              <div class="form-group">
-                {{ Form::label('name', 'Name') }}
-                {{ Form::text('name', Input::old('name'), array('class' => 'form-control', 'id'=>'criterion_name')) }}
-              </div>
+                <div class="form-group">
+                  {{ Form::label('definition', 'Definition') }}
+                  {{ Form::textarea('definition', '', ['class' => 'form-control', 'rows' => 2]) }}
+                </div>
 
-              <div class="form-group">
-                {{ Form::label('description12', 'Beginning (1-2)') }}
-                {{ Form::textarea('description12', Input::old('description12'), array('class' => 'form-control', 'rows'=>2, 'id'=>'criterion_description12')) }}
-              </div>
+                {{ Form::submit('Submit', ['class' => 'btn btn-primary btn-block']) }}
 
-              <div class="form-group">
-                {{ Form::label('description34', 'In Progress (3-4)') }}
-                {{ Form::textarea('description34', Input::old('description34'), array('class' => 'form-control', 'rows'=>2, 'id'=>'criterion_description34')) }}
+                {{ Form::close() }}
               </div>
-
-              <div class="form-group">
-                {{ Form::label('description56', 'Satisfactory (5-6)') }}
-                {{ Form::textarea('description56', Input::old('description56'), array('class' => 'form-control', 'rows'=>2, 'id'=>'criterion_description56')) }}
+            </div> -->
+
+                <!-- Form to add a new criterion -->
+                <div class="panel panel-default panel-button">
+                    <div class="panel-heading">
+                        Create
+                    </div>
+                    <div class="panel-body">
+                        {{ Form::open(['action' => 'CriteriaController@create']) }}
+
+                        <div class="form-group">
+                            {{ Form::label('outcome_id', 'Associated Learning Outcome') }}
+                            <select name="outcome_id" class="form-control">
+                                @foreach ($outcomes as $outcome)
+                                    <option value="{{ $outcome->id }}">{{ $outcome->name }}</option>
+                                @endforeach
+                            </select>
+                        </div>
+
+                        <div class="form-group">
+                            {{ Form::label('name', 'Name') }}
+                            {{ Form::text('name', '', ['class' => 'form-control']) }}
+                        </div>
+
+                        <div class="form-group">
+                            {{ Form::label('description12', 'Beginning (1-2)') }}
+                            {{ Form::textarea('description12', '', ['class' => 'form-control', 'rows' => 2]) }}
+                        </div>
+
+                        <div class="form-group">
+                            {{ Form::label('description34', 'In Progress (3-4)') }}
+                            {{ Form::textarea('description34', '', ['class' => 'form-control', 'rows' => 2]) }}
+                        </div>
+
+                        <div class="form-group">
+                            {{ Form::label('description56', 'Satisfactory (5-6)') }}
+                            {{ Form::textarea('description56', '', ['class' => 'form-control', 'rows' => 2]) }}
+                        </div>
+
+                        <div class="form-group">
+                            {{ Form::label('description78', 'Excellent (7-8)') }}
+                            {{ Form::textarea('description78', '', ['class' => 'form-control', 'rows' => 2]) }}
+                        </div>
+
+                        {{ Form::submit('Create', ['class' => 'btn btn-primary btn-block']) }}
+                        {{ Form::close() }}
+                    </div>
+                </div>
+
+                <div class="panel panel-default panel-button">
+                    <div class="panel-heading">
+                        Edit
+                    </div>
+                    <div class="panel-body">
+                        {{ Form::open(['action' => 'CriteriaController@update']) }}
+
+                        <div class="form-group">
+                            {{ Form::label('criterion_id', 'Criterion') }}
+                            <select id="select-criterion" name="id" class="form-control">
+                                @foreach ($criteria as $criterion)
+                                    <option value="{{ $criterion->id }}">{{ $criterion->name }}</option>
+                                @endforeach
+                            </select>
+                        </div>
+
+                        <div class="form-group">
+                            {{ Form::label('assoc_outcome_id', 'Associated Learning Outcome') }}
+                            <select id="assoc_outcome_id" name="outcome_id" class="form-control">
+                                @foreach ($outcomes as $outcome)
+                                    <option value="{{ $outcome->id }}">{{ $outcome->name }}</option>
+                                @endforeach
+                            </select>
+                        </div>
+
+                        <div class="form-group">
+                            {{ Form::label('name', 'Name') }}
+                            {{ Form::text('name', Input::old('name'), ['class' => 'form-control', 'id' => 'criterion_name']) }}
+                        </div>
+
+                        <div class="form-group">
+                            {{ Form::label('description12', 'Beginning (1-2)') }}
+                            {{ Form::textarea('description12', Input::old('description12'), ['class' => 'form-control', 'rows' => 2, 'id' => 'criterion_description12']) }}
+                        </div>
+
+                        <div class="form-group">
+                            {{ Form::label('description34', 'In Progress (3-4)') }}
+                            {{ Form::textarea('description34', Input::old('description34'), ['class' => 'form-control', 'rows' => 2, 'id' => 'criterion_description34']) }}
+                        </div>
+
+                        <div class="form-group">
+                            {{ Form::label('description56', 'Satisfactory (5-6)') }}
+                            {{ Form::textarea('description56', Input::old('description56'), ['class' => 'form-control', 'rows' => 2, 'id' => 'criterion_description56']) }}
+                        </div>
+
+                        <div class="form-group">
+                            {{ Form::label('description78', 'Excellent (7-8)') }}
+                            {{ Form::textarea('description78', Input::old('description78'), ['class' => 'form-control', 'rows' => 2, 'id' => 'criterion_description78']) }}
+                        </div>
+
+                        {{ Form::submit('Update', ['class' => 'btn btn-primary btn-block']) }}
+                        {{ Form::close() }}
+                    </div>
+                </div>
+
+                <div class="panel panel-default panel-button">
+                    <div class="panel-heading">
+                        Change Status
+                    </div>
+                    <div class="panel-body">
+                        <p>Use this form to deactivate or reactivate criteria. Inactive criteria will
+                            stay in the system, but will not be available to use in new rubrics.</p>
+                        {{ Form::open(['action' => 'CriteriaController@destroy', 'method' => 'delete']) }}
+
+                        <div class="form-group">
+                            {{ Form::label('criterion_id', 'Criterion') }}
+                            <select id="select-criterion-with-status" name="id" class="form-control">
+                                @foreach ($criteria as $criterion)
+                                    <option data-status="{{ $criterion->trashed() }}" value="{{ $criterion->id }}">
+                                        {{ $criterion->name }}</option>
+                                @endforeach
+                            </select>
+                        </div>
+
+                        <div class="form-group">
+                            {{ Form::label('status', 'Status') }}
+                            <p name="status" id="status" class="form-control-static"></p>
+                        </div>
+
+                        {{ Form::submit('Change', ['class' => 'btn btn-primary btn-block']) }}
+                        {{ Form::close() }}
+                    </div>
+                </div>
+
+                <!-- Form to edit a Learning Outcome -->
+                <!--         <div class="panel panel-default">
+              <div class="panel-heading">
+                Edit a Learning Outcome
               </div>
-
-              <div class="form-group">
-                {{ Form::label('description78', 'Excellent (7-8)') }}
-                {{ Form::textarea('description78', Input::old('description78'), array('class' => 'form-control', 'rows'=>2, 'id'=>'criterion_description78')) }}
+              <div class="panel-body">
+                {{ Form::open(['action' => 'OutcomesController@update']) }}
+
+                <div class="form-group">
+                    {{ Form::label('outcome_id', 'Learning Outcome') }}
+                    <select id="select-outcome" name="id" class="form-control">
+                    @foreach ($outcomes as $outcome)
+    <option value="{{ $outcome->id }}">{{ $outcome->name }}</option>
+    @endforeach
+                    </select>
+                </div>
+
+                <div class="form-group">
+                  {{ Form::label('name', 'Name') }}
+                  {{ Form::text('name', Input::old('name'), ['class' => 'form-control', 'id' => 'outcome_name']) }}
+                </div>
+
+                <div class="form-group">
+                  {{ Form::label('definition', 'Definition') }}
+                  {{ Form::textarea('definition', Input::old('definition'), ['class' => 'form-control', 'rows' => 2, 'id' => 'outcome_definition']) }}
+                </div>
+
+                {{ Form::submit('Update', ['class' => 'btn btn-primary btn-block']) }}
+
+                {{ Form::close() }}
               </div>
+            </div> -->
 
-              {{ Form::submit('Update', array('class' => 'btn btn-primary btn-block')) }}
-            {{ Form::close() }}
-          </div>
-        </div>
-
-        <div class="panel panel-default panel-button">
-          <div class="panel-heading">
-            Change Status
-          </div>
-          <div class="panel-body">
-            <p>Use this form to deactivate or reactivate criteria. Inactive criteria will
-              stay in the system, but will not be available to use in new rubrics.</p>
-            {{ Form::open(array('action' => 'CriteriaController@destroy', 'method'=>'delete')) }}
-
-              <div class="form-group">
-                {{ Form::label('criterion_id', 'Criterion') }}
-                <select id="select-criterion-with-status" name="id" class="form-control">
-                @foreach ($criteria as $criterion)
-                  <option data-status="{{ $criterion->trashed() }}" value="{{ $criterion->id }}">{{ $criterion->name }}</option>
-                @endforeach
-                </select>
-              </div>
-
-              <div class="form-group">
-                {{ Form::label('status', 'Status') }}
-                <p name="status" id="status" class="form-control-static"></p>
-              </div>
-
-              {{ Form::submit('Change', array('class' => 'btn btn-primary btn-block')) }}
-            {{ Form::close() }}
-          </div>
-        </div>
+            </div>
 
-        <!-- Form to edit a Learning Outcome -->
-<!--         <div class="panel panel-default">
-          <div class="panel-heading">
-            Edit a Learning Outcome
-          </div>
-          <div class="panel-body">
-            {{ Form::open(array('action' => 'OutcomesController@update')) }}
-
-            <div class="form-group">
-                {{ Form::label('outcome_id', 'Learning Outcome') }}
-                <select id="select-outcome" name="id" class="form-control">
+            <ul class="list-group">
                 @foreach ($outcomes as $outcome)
-                  <option value="{{ $outcome->id }}">{{ $outcome->name }}</option>
+                    <li data-outcome-id="{{ $outcome->id }}" class="list-group-item">{{ $outcome->name }}</li>
                 @endforeach
-                </select>
-            </div>
+            </ul>
+        </div>
 
-            <div class="form-group">
-              {{ Form::label('name', 'Name') }}
-              {{ Form::text('name', Input::old('name'), array('class' => 'form-control', 'id'=>'outcome_name')) }}
+        <div class="col-md-9">
+            <div id="outcome-display" class="panel panel-default">
+                <div class="panel-heading">
+                    <div class="panel-title"></div>
+                    </h4>
+                </div>
+                <div class="panel-body">
+                    <p class="outcome-definition"></p>
+                    <table class="table table-striped table-condensed">
+                        <thead>
+                            <tr>
+                                <th>Criterion</th>
+                                <th>Beginning (1-2)</th>
+                                <th>In Progress (3-4)</th>
+                                <th>Satisfactory (5-6)</th>
+                                <th>Excellent (7-8)</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                        </tbody>
+                    </table>
+                </div>
             </div>
+        </div>
 
-            <div class="form-group">
-              {{ Form::label('definition', 'Definition') }}
-              {{ Form::textarea('definition', Input::old('definition'), array('class' => 'form-control', 'rows'=>2, 'id'=>'outcome_definition')) }}
+        <div class="col-md-9">
+            <div class="no-outcome alert alert-info">
+                <p>Select a Learning Outcome to view its criteria.</p>
             </div>
-
-            {{ Form::submit('Update', array('class' => 'btn btn-primary btn-block')) }}
-
-            {{ Form::close() }}
-          </div>
-        </div> -->
-
-      </div>
-
-      <ul class="list-group">
-        @foreach ($outcomes as $outcome)
-          <li data-outcome-id="{{ $outcome->id }}"class="list-group-item">{{ $outcome->name }}</li>
-        @endforeach
-      </ul>
-    </div>
-
-    <div class="col-md-9">
-      <div id="outcome-display" class="panel panel-default">
-        <div class="panel-heading">
-          <div class="panel-title"></div>
-          </h4>
         </div>
-        <div class="panel-body">
-          <p class="outcome-definition"></p>
-          <table class="table table-striped table-condensed">
-            <thead><tr><th>Criterion</th><th>Beginning (1-2)</th><th>In Progress (3-4)</th><th>Satisfactory (5-6)</th><th>Excellent (7-8)</th></tr></thead>
-            <tbody>
-            </tbody>
-          </table>
-        </div>
-      </div>
-    </div>
 
-    <div class="col-md-9">
-      <div class="no-outcome alert alert-info">
-        <p>Select a Learning Outcome to view its criteria.</p>
-      </div>
     </div>
-
-  </div>
 @stop
 
 @section('javascript')
 
 
-  // --------------------------------------------------------------------------
-  // Page load
-  // --------------------------------------------------------------------------
+    // --------------------------------------------------------------------------
+    // Page load
+    // --------------------------------------------------------------------------
 
-  // Hide accordion panel contents by default
-  $('.panel-group .panel-body').hide();
+    // Hide accordion panel contents by default
+    $('.panel-group .panel-body').hide();
 
-  $('#outcome-display').parent().hide();
+    $('#outcome-display').parent().hide();
 
-  fetchOutcomeForEditing();
-  fetchCriterionForEditing();
-  setCriterionStatus();
+    fetchOutcomeForEditing();
+    fetchCriterionForEditing();
+    setCriterionStatus();
 
 
 
 
-  // --------------------------------------------------------------------------
-  // Functions
-  // --------------------------------------------------------------------------
+    // --------------------------------------------------------------------------
+    // Functions
+    // --------------------------------------------------------------------------
 
-  // Fetch outcome info for editing
-  function fetchOutcomeForEditing()
-  {
+    // Fetch outcome info for editing
+    function fetchOutcomeForEditing()
+    {
     var id = $('#select-outcome').find(':selected').val();
 
     $.post(
@@ -271,20 +280,20 @@
     { id: id },
     function(json)
     {
-      var name = json.outcome.name;
-      var definition = json.outcome.definition;
+    var name = json.outcome.name;
+    var definition = json.outcome.definition;
 
-      //Display title and definition
-      $('#outcome_name').val(name);
-      $('#outcome_definition').text(definition);
+    //Display title and definition
+    $('#outcome_name').val(name);
+    $('#outcome_definition').text(definition);
     },
     'json'
     );
-  }
+    }
 
-  // Fetch criterion info for editing
-  function fetchCriterionForEditing()
-  {
+    // Fetch criterion info for editing
+    function fetchCriterionForEditing()
+    {
     var id = $('#select-criterion').find(':selected').val();
 
     $.post(
@@ -292,55 +301,55 @@
     { id: id },
     function(json)
     {
-      var name = json.name;
-      var description12 = json.description12;
-      var description34 = json.description34;
-      var description56 = json.description56;
-      var description78 = json.description78;
-
-      // Display title and definition
-      $('#criterion_name').val(name);
-      $('#criterion_description12').text(description12);
-      $('#criterion_description34').text(description34);
-      $('#criterion_description56').text(description56);
-      $('#criterion_description78').text(description78);
-
-      // Select associated outcome
-      $('#assoc_outcome_id').val(json.outcome_id);
+    var name = json.name;
+    var description12 = json.description12;
+    var description34 = json.description34;
+    var description56 = json.description56;
+    var description78 = json.description78;
+
+    // Display title and definition
+    $('#criterion_name').val(name);
+    $('#criterion_description12').text(description12);
+    $('#criterion_description34').text(description34);
+    $('#criterion_description56').text(description56);
+    $('#criterion_description78').text(description78);
+
+    // Select associated outcome
+    $('#assoc_outcome_id').val(json.outcome_id);
     },
     'json'
     );
-  }
+    }
 
-  // Set criterion status
-  function setCriterionStatus()
-  {
+    // Set criterion status
+    function setCriterionStatus()
+    {
     $('#select-criterion-with-status').find(':selected').data('status')
     switch($('#select-criterion-with-status').find(':selected').data('status'))
     {
-      case 1:
-        $('#status').text('Inactive');
-        break;
-      default:
-        $('#status').text('Active');
-        break;
+    case 1:
+    $('#status').text('Inactive');
+    break;
+    default:
+    $('#status').text('Active');
+    break;
 
     }
-  }
+    }
 
-  // --------------------------------------------------------------------------
-  // Events
-  // --------------------------------------------------------------------------
+    // --------------------------------------------------------------------------
+    // Events
+    // --------------------------------------------------------------------------
 
-  // When panel heading is clicked, toggle it
-  $('.panel-group .panel-heading').on('click', function()
-  {
+    // When panel heading is clicked, toggle it
+    $('.panel-group .panel-heading').on('click', function()
+    {
     $(this).next().stop().slideToggle();
-  })
+    })
 
-  // When list item is clicked, load corresponding info
-  $('.list-group-item').on('click', function()
-  {
+    // When list item is clicked, load corresponding info
+    $('.list-group-item').on('click', function()
+    {
     var id = $(this).data('outcome-id');
 
     $.post(
@@ -348,57 +357,63 @@
     { id: id },
     function(json)
     {
-      var name = json.outcome.name;
-      var definition = json.outcome.definition;
-      var criteria =json.outcome.criteria;
-      var deleted = json.outcome.deleted_at;
-
-
-      $('#outcome-display').parent().show();
-      $('.no-outcome').parent().hide();
-
-      //Display title and definition
-      $('#outcome-display .panel-title').html(name);
-      $('#outcome-display .outcome-definition').html(definition);
-
-
-      //Empty table body
-      $('tbody').empty();
-
-      if(criteria.length>0)
-      {
-        $('table').show();
-        $.each(criteria, function(index, value)
-        {
-          $('tbody').append('<tr><td >'+value.name+'</td><td >'+value.description12+'</td><td >'+value.description34+'</td><td >'+value.description56+'</td><td >'+value.description78+'</td></tr>');
-        });
-      }
-      else
-      {
-        $('table').hide();
-      }
+    var name = json.outcome.name;
+    var definition = json.outcome.definition;
+    var criteria =json.outcome.criteria;
+    var deleted = json.outcome.deleted_at;
+
+
+    $('#outcome-display').parent().show();
+    $('.no-outcome').parent().hide();
+
+    //Display title and definition
+    $('#outcome-display .panel-title').html(name);
+    $('#outcome-display .outcome-definition').html(definition);
+
+
+    //Empty table body
+    $('tbody').empty();
+
+    if(criteria.length>0)
+    {
+    $('table').show();
+    $.each(criteria, function(index, value)
+    {
+    $('tbody').append('<tr>
+        <td>'+value.name+'</td>
+        <td>'+value.description12+'</td>
+        <td>'+value.description34+'</td>
+        <td>'+value.description56+'</td>
+        <td>'+value.description78+'</td>
+    </tr>');
+    });
+    }
+    else
+    {
+    $('table').hide();
+    }
     },
     'json'
     );
 
-  });
+    });
 
-  // When list item is clicked, load corresponding info
-  $('#select-outcome').on('change', function()
-  {
+    // When list item is clicked, load corresponding info
+    $('#select-outcome').on('change', function()
+    {
     fetchOutcomeForEditing();
-  });
+    });
 
-  // When list item is clicked, load corresponding info
-  $('#select-criterion').on('change', function()
-  {
+    // When list item is clicked, load corresponding info
+    $('#select-criterion').on('change', function()
+    {
     fetchCriterionForEditing();
-  });
+    });
 
-  // When list item is clicked, load corresponding info
-  $('#select-criterion-with-status').on('change', function()
-  {
+    // When list item is clicked, load corresponding info
+    $('#select-criterion-with-status').on('change', function()
+    {
     setCriterionStatus();
-  });
+    });
 
 @stop

app/views/local/managers/admins/learning-outcomes-grad-undergrad.blade.php

@@ -1,11 +1,11 @@
 @extends('layouts.master')
 
 @section('navigation')
-    @if(Auth::user()->role==1)
-        @include('local.managers.admins._navigation')
-    @elseif(Auth::user()->role==2)
+    @if (Auth::user()->role == 1)
+        @include('local.managers.admins._new_navigation')
+    @elseif(Auth::user()->role == 2)
         @include('local.managers.sCoords._new_navigation')
-    @elseif(Auth::user()->role==3)
+    @elseif(Auth::user()->role == 3)
         @include('local.managers.pCoords._new_navigation')
     @endif
 @stop
@@ -14,49 +14,61 @@
 
     <div class="row">
         <div class="col-md-12">
-            <p>Click on the values you want to change. Invalid values will be rejected automatically. To save your changes, click the 'Save' button at the bottom of the page.</p>
+            <p>Click on the values you want to change. Invalid values will be rejected automatically. To save your changes,
+                click the 'Save' button at the bottom of the page.</p>
             <!-- Nav tabs -->
             <ul class="nav nav-tabs" role="tablist">
-                <li role="presentation" class="active"><a href="#undergraduate" aria-controls="undergraduate" role="tab" data-toggle="tab"><h4>Undergraduate Program Participation</h4></a></li>
-                <li role="presentation"><a href="#graduate" aria-controls="graduate" role="tab" data-toggle="tab"><h4>Graduate Program Participation</h4></a></li>
+                <li role="presentation" class="active"><a href="#undergraduate" aria-controls="undergraduate"
+                        role="tab" data-toggle="tab">
+                        <h4>Undergraduate Program Participation</h4>
+                    </a></li>
+                <li role="presentation"><a href="#graduate" aria-controls="graduate" role="tab" data-toggle="tab">
+                        <h4>Graduate Program Participation</h4>
+                    </a></li>
             </ul>
             <!-- Tab panes -->
             <div class="tab-content">
                 <div role="tabpanel" class="tab-pane active" id="undergraduate">
                     <table class="table table-striped table-condensed editable-table">
-                        <thead><tr class="center-text">
-                            <th class="col-md-4">Learning Outcome</th>
-                            <th class="col-md-7">Definition</th>
-                            <th class="col-md-1">Expected Value</th>
+                        <thead>
+                            <tr class="center-text">
+                                <th class="col-md-4">Learning Outcome</th>
+                                <th class="col-md-7">Definition</th>
+                                <th class="col-md-1">Expected Value</th>
 
                         </thead>
                         <tbody>
-                        @foreach ($outcomes as $outcome)
-                            <tr data-id="{{ $outcome->id }}">
-                                <td contenteditable="true" class="name col-md-4" >{{ $outcome->name }}</td>
-                                <td contenteditable="true" data-type="textarea" class="definition col-md-6" >{{ $outcome->definition }}</td>
-                                <td contenteditable="true" class="expected-outcome col-md-1" >{{ $outcome->expected_outcome }}</td>
-                            </tr>
-                        @endforeach
+                            @foreach ($outcomes as $outcome)
+                                <tr data-id="{{ $outcome->id }}">
+                                    <td contenteditable="true" class="name col-md-4">{{ $outcome->name }}</td>
+                                    <td contenteditable="true" data-type="textarea" class="definition col-md-6">
+                                        {{ $outcome->definition }}</td>
+                                    <td contenteditable="true" class="expected-outcome col-md-1">
+                                        {{ $outcome->expected_outcome }}</td>
+                                </tr>
+                            @endforeach
                         </tbody>
                     </table>
                 </div>
                 <div role="tabpanel" class="tab-pane" id="graduate">
                     <table class="table table-striped table-condensed editable-table">
-                        <thead><tr class="center-text">
-                            <th class="col-md-4">Learning Outcome</th>
-                            <th class="col-md-7">Definition</th>
-                            <th class="col-md-1">Expected Value</th>
+                        <thead>
+                            <tr class="center-text">
+                                <th class="col-md-4">Learning Outcome</th>
+                                <th class="col-md-7">Definition</th>
+                                <th class="col-md-1">Expected Value</th>
 
                         </thead>
                         <tbody>
-                        @foreach ($outcomes as $outcome)
-                            <tr data-id="{{ $outcome->id }}">
-                                <td contenteditable="true" class="name col-md-4" >{{ $outcome->name }}</td>
-                                <td contenteditable="true" data-type="textarea" class="definition col-md-6" >{{ $outcome->definition }}</td>
-                                <td contenteditable="true" class="expected-outcome col-md-1" >{{ $outcome->expected_outcome }}</td>
-                            </tr>
-                        @endforeach
+                            @foreach ($outcomes as $outcome)
+                                <tr data-id="{{ $outcome->id }}">
+                                    <td contenteditable="true" class="name col-md-4">{{ $outcome->name }}</td>
+                                    <td contenteditable="true" data-type="textarea" class="definition col-md-6">
+                                        {{ $outcome->definition }}</td>
+                                    <td contenteditable="true" class="expected-outcome col-md-1">
+                                        {{ $outcome->expected_outcome }}</td>
+                                </tr>
+                            @endforeach
                         </tbody>
                     </table>
                 </div>
@@ -70,50 +82,50 @@
 
 @section('javascript')
 
-        $('button').on('click', function(e)
-        {
-            e.preventDefault();
-
-            var outcomeArray= new Array();
-
-            // For each learning outcome, get its value and put it into an array
-            $('tbody tr').each(function( index )
-            {
-                var outcomeObject = new Object();
-
-                outcomeObject.id= $(this).data('id');
-                outcomeObject.name= $(this).children('.name').text();
-                outcomeObject.definition= $(this).children('.definition').text();
-                outcomeObject.expected_outcome= $(this).children('.expected-outcome').text();
-
-                if($(this).find('.glyphicon-eye-close').length>0)
-                {
-                    outcomeObject.delete=1;
-                }
-
-                else
-                    outcomeObject.delete=0;
-
-                var clone = jQuery.extend({}, outcomeObject);
-                outcomeArray.push(clone);
-            });
-
-            $.post(
-                "{{ URL::action('OutcomesController@update') }}",
-                { outcomeArray: JSON.stringify(outcomeArray)},
-                function(data)
-                {
-                    location.reload();
-                }
-            );
-        });
-
-        $('span').on('click', function()
-        {
-            if($(this).hasClass('glyphicon-eye-open'))
-                $(this).removeClass('glyphicon-eye-open').addClass('glyphicon-eye-close');
-            else
-                $(this).removeClass('glyphicon-eye-close').addClass('glyphicon-eye-open');
-
-        });
+    $('button').on('click', function(e)
+    {
+    e.preventDefault();
+
+    var outcomeArray= new Array();
+
+    // For each learning outcome, get its value and put it into an array
+    $('tbody tr').each(function( index )
+    {
+    var outcomeObject = new Object();
+
+    outcomeObject.id= $(this).data('id');
+    outcomeObject.name= $(this).children('.name').text();
+    outcomeObject.definition= $(this).children('.definition').text();
+    outcomeObject.expected_outcome= $(this).children('.expected-outcome').text();
+
+    if($(this).find('.glyphicon-eye-close').length>0)
+    {
+    outcomeObject.delete=1;
+    }
+
+    else
+    outcomeObject.delete=0;
+
+    var clone = jQuery.extend({}, outcomeObject);
+    outcomeArray.push(clone);
+    });
+
+    $.post(
+    "{{ URL::action('OutcomesController@update') }}",
+    { outcomeArray: JSON.stringify(outcomeArray)},
+    function(data)
+    {
+    location.reload();
+    }
+    );
+    });
+
+    $('span').on('click', function()
+    {
+    if($(this).hasClass('glyphicon-eye-open'))
+    $(this).removeClass('glyphicon-eye-open').addClass('glyphicon-eye-close');
+    else
+    $(this).removeClass('glyphicon-eye-close').addClass('glyphicon-eye-open');
+
+    });
 @stop

app/views/local/managers/admins/learning-outcomes.blade.php

@@ -1,11 +1,11 @@
 @extends('layouts.master')
 
 @section('navigation')
-    @if(Auth::user()->role==1)
-        @include('local.managers.admins._navigation')
-    @elseif(Auth::user()->role==2)
+    @if (Auth::user()->role == 1)
+        @include('local.managers.admins._new_navigation')
+    @elseif(Auth::user()->role == 2)
         @include('local.managers.sCoords._new_navigation')
-    @elseif(Auth::user()->role==3)
+    @elseif(Auth::user()->role == 3)
         @include('local.managers.pCoords._new_navigation')
     @endif
 @stop
@@ -14,157 +14,168 @@
 
     <div class="row">
         <div class="col-md-12">
-            <p>Click on the values you want to change. Invalid values will be rejected automatically. To save your changes, click the 'Save' button at the bottom of the page.</p>
+            <p>Click on the values you want to change. Invalid values will be rejected automatically. To save your changes,
+                click the 'Save' button at the bottom of the page.</p>
             <table class="table table-striped table-condensed editable-table" id='outcomes_table'>
-                <thead><tr class="center-text">
-                    <th class="col-md-4">Learning Outcome</th>
-                    <th class="col-md-7">Definition</th>
-                    <th class="col-md-1">Expected Value</th>
-                    <th class="col-md-2">Activation date</th>
-                    <th class="col-md-2">Deactivation date</th>
-                    <th class="col-md-1">Level</th>
+                <thead>
+                    <tr class="center-text">
+                        <th class="col-md-4">Learning Outcome</th>
+                        <th class="col-md-7">Definition</th>
+                        <th class="col-md-1">Expected Value</th>
+                        <th class="col-md-2">Activation date</th>
+                        <th class="col-md-2">Deactivation date</th>
+                        <th class="col-md-1">Level</th>
 
                 </thead>
                 <tbody>
-                  @foreach ($outcomes as $outcome)
-                    {{-- @foreach ($semesters as $semester) --}}
-                      {{-- display an outcome only if it is part of a currently selected semester --}}
-                      @if ((($outcome->deactivation_date == '0000-00-00') or ($outcome->deactivation_date == ''))
-                            // and ($outcome->activation_date >= $semester->start && $outcome->activation_date <= $semester->end)
-                            )
+                    @foreach ($outcomes as $outcome)
+                        {{-- @foreach ($semesters as $semester) --}}
+                        {{-- display an outcome only if it is part of a currently selected semester --}}
+                        @if ($outcome->deactivation_date == '0000-00-00' or $outcome->deactivation_date == '';
+                        // and ($outcome->activation_date >= $semester->start && $outcome->activation_date <= $semester->end))
                             <tr data-id="{{ $outcome->id }}">
-                                <td contenteditable="true" class="name col-md-4" >{{ $outcome->name }}</td>
-                                <td contenteditable="true" data-type="textarea" class="definition col-md-6" >{{ $outcome->definition }}</td>
-                                <td contenteditable="true" class="expected-outcome col-md-1" >{{ $outcome->expected_outcome }}</td>
-                                <td contenteditable="true" class="activation-date col-md-2" >{{ $outcome->activation_date }}</td>
-                                <td contenteditable="true" class="deactivation-date col-md-2" >{{ $outcome->deactivation_date }}</td>
-                                <td contenteditable="true" class="level col-md-1" >{{ $outcome->level }}</td>
+                                <td contenteditable="true" class="name col-md-4">{{ $outcome->name }}</td>
+                                <td contenteditable="true" data-type="textarea" class="definition col-md-6">
+                                    {{ $outcome->definition }}</td>
+                                <td contenteditable="true" class="expected-outcome col-md-1">
+                                    {{ $outcome->expected_outcome }}</td>
+                                <td contenteditable="true" class="activation-date col-md-2">
+                                    {{ $outcome->activation_date }}</td>
+                                <td contenteditable="true" class="deactivation-date col-md-2">
+                                    {{ $outcome->deactivation_date }}</td>
+                                <td contenteditable="true" class="level col-md-1">{{ $outcome->level }}</td>
                             </tr>
-                      @endif
-                    {{-- @endforeach --}}
-                  @endforeach
-                  @foreach ($outcomes as $outcome)
-                    {{-- @foreach ($semesters as $semester) --}}
-                      {{-- display an outcome only if it is part of a currently selected semester --}}
-                      @if ((($outcome->deactivation_date != '0000-00-00') and ($outcome->deactivation_date != ''))
-                            // and ($outcome->deactivation_date != '0000-00-00') and ($outcome->deactivation_date != '')
-                            )
+                        @endif
+                        {{-- @endforeach --}}
+                    @endforeach
+                    @foreach ($outcomes as $outcome)
+                        {{-- @foreach ($semesters as $semester) --}}
+                        {{-- display an outcome only if it is part of a currently selected semester --}}
+                        @if ($outcome->deactivation_date != '0000-00-00' and $outcome->deactivation_date != '';
+                        // and ($outcome->deactivation_date != '0000-00-00') and ($outcome->deactivation_date != ''))
                             <tr data-id="{{ $outcome->id }}">
-                                <td contenteditable="true" class="name col-md-4" >{{ $outcome->name }}</td>
-                                <td contenteditable="true" data-type="textarea" class="definition col-md-6" >{{ $outcome->definition }}</td>
-                                <td contenteditable="true" class="expected-outcome col-md-1" >{{ $outcome->expected_outcome }}</td>
-                                <td contenteditable="true" class="activation-date col-md-2" >{{ $outcome->activation_date }}</td>
-                                <td contenteditable="true" class="deactivation-date col-md-2" >{{ $outcome->deactivation_date }}</td>
-                                <td contenteditable="true" class="level col-md-1" >{{ $outcome->level }}</td>
+                                <td contenteditable="true" class="name col-md-4">{{ $outcome->name }}</td>
+                                <td contenteditable="true" data-type="textarea" class="definition col-md-6">
+                                    {{ $outcome->definition }}</td>
+                                <td contenteditable="true" class="expected-outcome col-md-1">
+                                    {{ $outcome->expected_outcome }}</td>
+                                <td contenteditable="true" class="activation-date col-md-2">
+                                    {{ $outcome->activation_date }}</td>
+                                <td contenteditable="true" class="deactivation-date col-md-2">
+                                    {{ $outcome->deactivation_date }}</td>
+                                <td contenteditable="true" class="level col-md-1">{{ $outcome->level }}</td>
                             </tr>
-                      @endif
-                    {{-- @endforeach --}}
-                  @endforeach
+                        @endif
+                        {{-- @endforeach --}}
+                    @endforeach
                 </tbody>
             </table>
         </div>
     </div>
     <div class="row">
-      <div class="col-md-6"><button class="btn btn-lg btn-secondary center-block" id='show'>New Outcome</button></div>
-      <div class="col-md-6"><button class="btn btn-lg btn-primary center-block" id='save'>Save</button></div>
+        <div class="col-md-6"><button class="btn btn-lg btn-secondary center-block" id='show'>New Outcome</button>
+        </div>
+        <div class="col-md-6"><button class="btn btn-lg btn-primary center-block" id='save'>Save</button></div>
     </div>
 
-  <div class="" id='new_outcome_form'>
-    <h2>Add a new Learning Outcomes</h2>
-    {{-- For for adding a new outcome --}}
-    {{ Form::open(array('action' => 'OutcomesController@create')) }}
-      <div class="form-group">
-          {{ Form::label('name', 'Name') }}
-          {{ Form::text('name', '', array('class' => 'form-control', 'id'=>'outcome_name')) }}
-      </div>
-      <div class="form-group">
-          {{ Form::label('definition', 'Definition') }}
-          {{ Form::textarea('definition', 'At least 10 characters long', array('class' => 'form-control', 'id'=>'outcome_definition')) }}
-      </div>
-      Due to technical limitationss, the following must be edited after adding the new Outcome:
-      {{-- the technical limitation is: the Outcome Model has to be edited --}}
-      <ul>
-       <li>Expected Outcome</li>
-       <li>Activation Date</li>
-       <li>Deactivation Date</li>
-       <li>Level</li>
-      </ul>
-
-      <div class="row">
-        <div class="col-md-6"><button type="reset" class="btn btn-lg btn-secondary center-block" id='hide'>Hide Form</button></div>
-        <div class="col-md-6"><button type="submit" class="btn btn-lg btn-primary center-block">Submit New Outcome</button></div>
-      </div>
-      {{ Form::close() }}
-
-    <hr>
-  </div>
+    <div class="" id='new_outcome_form'>
+        <h2>Add a new Learning Outcomes</h2>
+        {{-- For for adding a new outcome --}}
+        {{ Form::open(['action' => 'OutcomesController@create']) }}
+        <div class="form-group">
+            {{ Form::label('name', 'Name') }}
+            {{ Form::text('name', '', ['class' => 'form-control', 'id' => 'outcome_name']) }}
+        </div>
+        <div class="form-group">
+            {{ Form::label('definition', 'Definition') }}
+            {{ Form::textarea('definition', 'At least 10 characters long', ['class' => 'form-control', 'id' => 'outcome_definition']) }}
+        </div>
+        Due to technical limitationss, the following must be edited after adding the new Outcome:
+        {{-- the technical limitation is: the Outcome Model has to be edited --}}
+        <ul>
+            <li>Expected Outcome</li>
+            <li>Activation Date</li>
+            <li>Deactivation Date</li>
+            <li>Level</li>
+        </ul>
+
+        <div class="row">
+            <div class="col-md-6"><button type="reset" class="btn btn-lg btn-secondary center-block" id='hide'>Hide
+                    Form</button></div>
+            <div class="col-md-6"><button type="submit" class="btn btn-lg btn-primary center-block">Submit New
+                    Outcome</button></div>
+        </div>
+        {{ Form::close() }}
+
+        <hr>
+    </div>
 @stop
 
 @section('javascript')
 
-        $('#new_outcome_form').hide();
-
-        //show form
-        $('#show').on('click', function(e)
-        {
-          $('#new_outcome_form').show();
-          $('#show').hide();
-        });
-
-        //hide form
-        $('#hide').on('click', function(e)
-        {
-          $('#new_outcome_form').hide();
-          $('#show').show();
-        });
-
-        $('#save').on('click', function(e)
-        {
-            e.preventDefault();
-
-            var outcomeArray= new Array();
-
-            // For each learning outcome, get its value and put it into an array
-            $('tbody tr').each(function( index )
-            {
-                var outcomeObject = new Object();
-
-                outcomeObject.id= $(this).data('id');
-                outcomeObject.name= $(this).children('.name').text();
-                outcomeObject.definition= $(this).children('.definition').text();
-                outcomeObject.expected_outcome= $(this).children('.expected-outcome').text();
-                outcomeObject.activation_date= $(this).children('.activation-date').text();
-                outcomeObject.deactivation_date= $(this).children('.deactivation-date').text();
-                outcomeObject.level= $(this).children('.level').text();
-
-                if($(this).find('.glyphicon-eye-close').length>0)
-                {
-                    outcomeObject.delete=1;
-                }
-
-                else
-                    outcomeObject.delete=0;
-
-                var clone = jQuery.extend({}, outcomeObject);
-                outcomeArray.push(clone);
-            });
-
-            $.post(
-                "{{ URL::action('OutcomesController@updateMore') }}",
-                { outcomeArray: JSON.stringify(outcomeArray)},
-                function(data)
-                {
-                    location.reload();
-                }
-            );
-        });
-
-        $('span').on('click', function()
-        {
-            if($(this).hasClass('glyphicon-eye-open'))
-                $(this).removeClass('glyphicon-eye-open').addClass('glyphicon-eye-close');
-            else
-                $(this).removeClass('glyphicon-eye-close').addClass('glyphicon-eye-open');
-
-        });
+    $('#new_outcome_form').hide();
+
+    //show form
+    $('#show').on('click', function(e)
+    {
+    $('#new_outcome_form').show();
+    $('#show').hide();
+    });
+
+    //hide form
+    $('#hide').on('click', function(e)
+    {
+    $('#new_outcome_form').hide();
+    $('#show').show();
+    });
+
+    $('#save').on('click', function(e)
+    {
+    e.preventDefault();
+
+    var outcomeArray= new Array();
+
+    // For each learning outcome, get its value and put it into an array
+    $('tbody tr').each(function( index )
+    {
+    var outcomeObject = new Object();
+
+    outcomeObject.id= $(this).data('id');
+    outcomeObject.name= $(this).children('.name').text();
+    outcomeObject.definition= $(this).children('.definition').text();
+    outcomeObject.expected_outcome= $(this).children('.expected-outcome').text();
+    outcomeObject.activation_date= $(this).children('.activation-date').text();
+    outcomeObject.deactivation_date= $(this).children('.deactivation-date').text();
+    outcomeObject.level= $(this).children('.level').text();
+
+    if($(this).find('.glyphicon-eye-close').length>0)
+    {
+    outcomeObject.delete=1;
+    }
+
+    else
+    outcomeObject.delete=0;
+
+    var clone = jQuery.extend({}, outcomeObject);
+    outcomeArray.push(clone);
+    });
+
+    $.post(
+    "{{ URL::action('OutcomesController@updateMore') }}",
+    { outcomeArray: JSON.stringify(outcomeArray)},
+    function(data)
+    {
+    location.reload();
+    }
+    );
+    });
+
+    $('span').on('click', function()
+    {
+    if($(this).hasClass('glyphicon-eye-open'))
+    $(this).removeClass('glyphicon-eye-open').addClass('glyphicon-eye-close');
+    else
+    $(this).removeClass('glyphicon-eye-close').addClass('glyphicon-eye-open');
+
+    });
 @stop

app/views/local/managers/admins/learning-outcomes_new.blade.php

@@ -1,11 +1,11 @@
 @extends('layouts.master')
 
 @section('navigation')
-    @if(Auth::user()->role==1)
-        @include('local.managers.admins._navigation')
-    @elseif(Auth::user()->role==2)
+    @if (Auth::user()->role == 1)
+        @include('local.managers.admins._new_navigation')
+    @elseif(Auth::user()->role == 2)
         @include('local.managers.sCoords._new_navigation')
-    @elseif(Auth::user()->role==3)
+    @elseif(Auth::user()->role == 3)
         @include('local.managers.pCoords._new_navigation')
     @endif
 @stop
@@ -14,22 +14,26 @@
 
     <div class="row">
         <div class="col-md-12">
-            <p>Click on the values you want to change. Invalid values will be rejected automatically. To save your changes, click the 'Save' button at the bottom of the page.</p>
+            <p>Click on the values you want to change. Invalid values will be rejected automatically. To save your changes,
+                click the 'Save' button at the bottom of the page.</p>
             <table class="table table-striped table-condensed editable-table">
-                <thead><tr class="center-text">
-                    <th class="col-md-4">Learning Outcome</th>
-                    <th class="col-md-7">Definition</th>
-                    <th class="col-md-1">Expected Value</th>
+                <thead>
+                    <tr class="center-text">
+                        <th class="col-md-4">Learning Outcome</th>
+                        <th class="col-md-7">Definition</th>
+                        <th class="col-md-1">Expected Value</th>
 
                 </thead>
                 <tbody>
-                @foreach ($outcomes as $outcome)
-                    <tr data-id="{{ $outcome->id }}">
-                        <td contenteditable="true" class="name col-md-4" >{{ $outcome->name }}</td>
-                        <td contenteditable="true" data-type="textarea" class="definition col-md-6" >{{ $outcome->definition }}</td>
-                        <td contenteditable="true" class="expected-outcome col-md-1" >{{ $outcome->expected_outcome }}</td>
-                    </tr>
-                @endforeach
+                    @foreach ($outcomes as $outcome)
+                        <tr data-id="{{ $outcome->id }}">
+                            <td contenteditable="true" class="name col-md-4">{{ $outcome->name }}</td>
+                            <td contenteditable="true" data-type="textarea" class="definition col-md-6">
+                                {{ $outcome->definition }}</td>
+                            <td contenteditable="true" class="expected-outcome col-md-1">{{ $outcome->expected_outcome }}
+                            </td>
+                        </tr>
+                    @endforeach
                 </tbody>
             </table>
         </div>
@@ -41,50 +45,50 @@
 
 @section('javascript')
 
-        $('button').on('click', function(e)
-        {
-            e.preventDefault();
+    $('button').on('click', function(e)
+    {
+    e.preventDefault();
 
-            var outcomeArray= new Array();
+    var outcomeArray= new Array();
 
-            // For each learning outcome, get its value and put it into an array
-            $('tbody tr').each(function( index )
-            {
-                var outcomeObject = new Object();
+    // For each learning outcome, get its value and put it into an array
+    $('tbody tr').each(function( index )
+    {
+    var outcomeObject = new Object();
 
-                outcomeObject.id= $(this).data('id');
-                outcomeObject.name= $(this).children('.name').text();
-                outcomeObject.definition= $(this).children('.definition').text();
-                outcomeObject.expected_outcome= $(this).children('.expected-outcome').text();
+    outcomeObject.id= $(this).data('id');
+    outcomeObject.name= $(this).children('.name').text();
+    outcomeObject.definition= $(this).children('.definition').text();
+    outcomeObject.expected_outcome= $(this).children('.expected-outcome').text();
 
-                if($(this).find('.glyphicon-eye-close').length>0)
-                {
-                    outcomeObject.delete=1;
-                }
+    if($(this).find('.glyphicon-eye-close').length>0)
+    {
+    outcomeObject.delete=1;
+    }
 
-                else
-                    outcomeObject.delete=0;
+    else
+    outcomeObject.delete=0;
 
-                var clone = jQuery.extend({}, outcomeObject);
-                outcomeArray.push(clone);
-            });
+    var clone = jQuery.extend({}, outcomeObject);
+    outcomeArray.push(clone);
+    });
 
-            $.post(
-                "{{ URL::action('OutcomesController@update') }}",
-                { outcomeArray: JSON.stringify(outcomeArray)},
-                function(data)
-                {
-                    location.reload();
-                }
-            );
-        });
+    $.post(
+    "{{ URL::action('OutcomesController@update') }}",
+    { outcomeArray: JSON.stringify(outcomeArray)},
+    function(data)
+    {
+    location.reload();
+    }
+    );
+    });
 
-        $('span').on('click', function()
-        {
-            if($(this).hasClass('glyphicon-eye-open'))
-                $(this).removeClass('glyphicon-eye-open').addClass('glyphicon-eye-close');
-            else
-                $(this).removeClass('glyphicon-eye-close').addClass('glyphicon-eye-open');
+    $('span').on('click', function()
+    {
+    if($(this).hasClass('glyphicon-eye-open'))
+    $(this).removeClass('glyphicon-eye-open').addClass('glyphicon-eye-close');
+    else
+    $(this).removeClass('glyphicon-eye-close').addClass('glyphicon-eye-open');
 
-        });
+    });
 @stop

app/views/local/managers/admins/new-activity-create.blade.php

@@ -1,29 +1,31 @@
 @extends('layouts.master')
 
 @section('navigation')
-    @include('local.managers.admins._navigation')
+    @include('local.managers.admins._new_navigation')
 @stop
 @section('main')
 
     <!-- New Rubric Modal -->
-    <div class="modal fade" id="newRubricModal" tabindex="-1" role="dialog" aria-labelledby="newRubricModalLabel" aria-hidden="true">
+    <div class="modal fade" id="newRubricModal" tabindex="-1" role="dialog" aria-labelledby="newRubricModalLabel"
+        aria-hidden="true">
         <div class="modal-dialog modal-sm">
             <div class="modal-content">
                 <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+                    <button type="button" class="close" data-dismiss="modal"><span
+                            aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
                     <h4 class="modal-title" id="newRubricModalLabel">New Instrument</h4>
                 </div>
                 <div class="modal-body">
-                    {{ Form::open(array('action' => array('RubricsController@create'))) }}
+                    {{ Form::open(['action' => ['RubricsController@create']]) }}
                     <div class="form-group">
                         {{ Form::label('name', 'Name') }}
-                        {{ Form::text('name', Input::old('name'), array('class' => 'form-control')) }}
+                        {{ Form::text('name', Input::old('name'), ['class' => 'form-control']) }}
                     </div>
                     <div class="form-group">
                         {{ Form::label('criteria', 'Criteria') }}
                         <select id="criteria" name="criteria" class="form-control" multiple required>
                         </select>
-                        {{ Form::textarea('criteria', Input::old('description'), array('class' => 'form-control', 'rows'=> 5, 'placeholder'=>'Minimum 10 characters')) }}
+                        {{ Form::textarea('criteria', Input::old('description'), ['class' => 'form-control', 'rows' => 5, 'placeholder' => 'Minimum 10 characters']) }}
                     </div>
                     <div class="btn-group" role="group">
                         <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
@@ -42,27 +44,27 @@
                     Create new activity
                 </div>
                 <div class="panel-body">
-                    {{ Form::open(array('action' => 'ActivitiesController@update')) }}
+                    {{ Form::open(['action' => 'ActivitiesController@update']) }}
                     <div class="form-group">
                         {{ Form::label('activity_type', 'Activity Type') }}
                         <select id="activity_type" name="activity_type" class="form-control">
                             @foreach ($activity_types as $activity_type)
-{{--                                @if(Input::old('activity_type')!=$activity_type)--}}
-{{--                                    <option value="{{ $activity_type }}">{{ $activity_type }} ({{ $program->school->name }})</option>--}}
-{{--                                @else--}}
-{{--                                    <option selected value="{{ $program->id }}">{{ $program->name }} ({{ $program->school->name }})</option>--}}
-{{--                                @endif--}}
+                                {{-- @if (Input::old('activity_type') != $activity_type) --}}
+                                {{-- <option value="{{ $activity_type }}">{{ $activity_type }} ({{ $program->school->name }})</option> --}}
+                                {{-- @else --}}
+                                {{-- <option selected value="{{ $program->id }}">{{ $program->name }} ({{ $program->school->name }})</option> --}}
+                                {{-- @endif --}}
                             @endforeach
                         </select>
-{{--                        {{ Form::text('activity_type', Input::old('activity_Type'), array('class' => 'form-control', 'placeholder'=>'TEST', 'maxLength'=>5)) }}--}}
+                        {{-- {{ Form::text('activity_type', Input::old('activity_Type'), array('class' => 'form-control', 'placeholder'=>'TEST', 'maxLength'=>5)) }} --}}
                     </div>
-                    
+
 
                     <div class="form-group">
                         {{ Form::label('outcome', 'Learning Outcome') }}
                         <select id="outcome" name="outcome" class="form-control">
                             @foreach ($outcomes as $outcome)
-                                @if(Input::old('outcome')!=$outcome->id)
+                                @if (Input::old('outcome') != $outcome->id)
                                     <option value="{{ $outcome->id }}">{{ $outcome->name }}</option>
                                 @else
                                     <option selected value="{{ $outcome->id }}">{{ $outcome->name }}</option>
@@ -73,9 +75,9 @@
                     <div class="form-group">
                         {{ Form::label('objective', 'Learning Objective') }}
                         <select id="objective" name="objective[]" class="form-control" multiple required>
-                            @if(Input::old('outcome')!=null)
+                            @if (Input::old('outcome') != null)
                                 @foreach ($objectives_by_outcome[Input::old('outcome')] as $objective)
-                                    @if(Input::old('objective')!=$objective->id)
+                                    @if (Input::old('objective') != $objective->id)
                                         <option value="{{ $objective->id }}">{{ $objective->text }}</option>
                                     @else
                                         <option selected value="{{ $objective->id }}">{{ $objective->text }}</option>
@@ -92,7 +94,7 @@
                         {{ Form::label('instrument', 'Instrument') }}
                         <select id="instrument" name="instrument" class="form-control">
                             @foreach ($instruments as $instrument)
-                                @if(Input::old('instrument')!=$instrument->id)
+                                @if (Input::old('instrument') != $instrument->id)
                                     <option value="{{ $instrument->id }}">{{ $instrument->name }}</option>
                                 @else
                                     <option selected value="{{ $instrument->id }}">{{ $instrument->name }}</option>
@@ -101,24 +103,25 @@
                         </select>
                     </div>
                     <div class="form-group">
-                        <button type="button" data-toggle="modal" data-target="#newRubricModal" class="btn btn-sm btn-default">New Instrument</button>
+                        <button type="button" data-toggle="modal" data-target="#newRubricModal"
+                            class="btn btn-sm btn-default">New Instrument</button>
                     </div>
                     <div class="form-group">
                         {{ Form::label('transforming_action', 'Transformative Actions') }}
                         <select id="transforming_action" name="transforming_action[]" class="form-control" multiple>
                             @foreach ($transforming_actions as $transforming_action)
-{{--                                @if(Input::old('transforming_action')!=$transforming_action->id)--}}
-{{--                                    <option value="{{ $transforming_action->id }}">{{ $transforming_action->name }}</option>--}}
-{{--                                @else--}}
-{{--                                    <option selected value="{{ $transforming_action->id }}">{{ $transforming_action->name }}</option>--}}
-{{--                                @endif--}}
+                                {{-- @if (Input::old('transforming_action') != $transforming_action->id) --}}
+                                {{-- <option value="{{ $transforming_action->id }}">{{ $transforming_action->name }}</option> --}}
+                                {{-- @else --}}
+                                {{-- <option selected value="{{ $transforming_action->id }}">{{ $transforming_action->name }}</option> --}}
+                                {{-- @endif --}}
                             @endforeach
                         </select>
                     </div>
 
                     <br>
 
-                    {{ Form::submit('Submit', array('class' => 'btn btn-primary btn-block', 'name'=>'create_activity')) }}
+                    {{ Form::submit('Submit', ['class' => 'btn btn-primary btn-block', 'name' => 'create_activity']) }}
                     {{ Form::close() }}
                 </div>
             </div>
@@ -147,24 +150,24 @@
     // Events
     // --------------------------------------------------------------------------
     outcomesSelect.addEventListener('change', (event) => {
-        var objectivesSelectOptions = [];
-        objectives[event.target.value].forEach((objective) => {
-            objectivesSelectOptions.push(`<option value="${objective.id}">${objective.text}</option>`);
-        });
-        objectivesSelect.innerHTML = objectivesSelectOptions.join();
+    var objectivesSelectOptions = [];
+    objectives[event.target.value].forEach((objective) => {
+    objectivesSelectOptions.push(`<option value="${objective.id}">${objective.text}</option>`);
+    });
+    objectivesSelect.innerHTML = objectivesSelectOptions.join();
     });
 
     objectivesSelect.addEventListener('change', (event) => {
-        var criteriaSelectOptions = [];
-        var selectedObjectives = Array.from(objectivesSelect.selectedOptions).map(v => value);
-        selectedObjectives.forEach((objectiveId) => {
-            criteria[objectiveId].forEach((criteriaArray) => {
-                criteriaArray.forEach((criteria) => {
-                    criteriaSelectOptions.push(`<option value="${criteria.id}">${criteria.name}</option>`);
-                });
-            });
-        });
-        criteriaSelect.innerHTML = criteriaSelectOptions.join();
+    var criteriaSelectOptions = [];
+    var selectedObjectives = Array.from(objectivesSelect.selectedOptions).map(v => value);
+    selectedObjectives.forEach((objectiveId) => {
+    criteria[objectiveId].forEach((criteriaArray) => {
+    criteriaArray.forEach((criteria) => {
+    criteriaSelectOptions.push(`<option value="${criteria.id}">${criteria.name}</option>`);
+    });
+    });
+    });
+    criteriaSelect.innerHTML = criteriaSelectOptions.join();
     });
 
 

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

@@ -1,11 +1,11 @@
 @extends('layouts.master')
 
 @section('navigation')
-    @if(Auth::user()->role==1)
-        @include('local.managers.admins._navigation')
-    @elseif(Auth::user()->role==2)
+    @if (Auth::user()->role == 1)
+        @include('local.managers.admins._new_navigation')
+    @elseif(Auth::user()->role == 2)
         @include('local.managers.sCoords._new_navigation')
-    @elseif(Auth::user()->role==3)
+    @elseif(Auth::user()->role == 3)
         @include('local.managers.pCoords._new_navigation')
     @else
         @include('local.professors._navigation')
@@ -16,7 +16,7 @@
 
     <div class="row">
         <div class="col-md-12">
-            <p>{{$course->name}}</p>
+            <p>{{ $course->name }}</p>
         </div>
     </div>
 
@@ -25,54 +25,58 @@
         <div class="col-md-12">
             <h3>Activities</h3>
 
-            @if(!$activities->isEmpty())
+            @if (!$activities->isEmpty())
 
                 @if ($is_active_semester)
-                    <a href="{{ URL::action('ActivitiesController@newCreate', ['course_id' => $course->id]) }}" class="btn btn-sm btn-default pull-right">New Activity</a>
+                    <a href="{{ URL::action('ActivitiesController@newCreate', ['course_id' => $course->id]) }}"
+                        class="btn btn-sm btn-default pull-right">New Activity</a>
                 @endif
 
                 <table class="table table-striped table-condensed">
                     <thead>
-                    <tr>
-                        <th>Name</th>
-                        <th>Date</th>
-                        <th>Updated</th>
-                        <th>Assessed</th>
-                        <th>Published</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    @foreach ($activities as $activity)
-                        <tr>
-                            <td>{{ link_to_action('ActivitiesController@show', $activity->name, $parameters = array('id'=>$activity->id)) }}</td>
-                            <td>{{ date('M d, Y', strtotime($activity->date)) }}</td>
-                            <td>{{ date('M d, Y', strtotime($activity->updated_at)) }}</td>
-                            <td>
-                                @if($activity->outcomes_attempted!=NULL)
-                                    <span class="glyphicon glyphicon-ok"></span>
-                                @endif
-                            </td>
-                            <td>
-                                @if($activity->outcomes_attempted!=NULL && !$activity->draft && !$activity->diagnostic)
-                                    <span class="glyphicon glyphicon-ok"></span>
-                                @endif
-                            </td>
-                        </tr>
-                    @endforeach
-
-                    @if (!$is_active_semester)
                         <tr>
-                            <td colspan="3"><div class="alert alert-info">The semester for this course is inactive. You cannot create any more activities.</div></td>
+                            <th>Name</th>
+                            <th>Date</th>
+                            <th>Updated</th>
+                            <th>Assessed</th>
+                            <th>Published</th>
                         </tr>
-                    @endif
+                    </thead>
+                    <tbody>
+                        @foreach ($activities as $activity)
+                            <tr>
+                                <td>{{ link_to_action('ActivitiesController@show', $activity->name, $parameters = ['id' => $activity->id]) }}
+                                </td>
+                                <td>{{ date('M d, Y', strtotime($activity->date)) }}</td>
+                                <td>{{ date('M d, Y', strtotime($activity->updated_at)) }}</td>
+                                <td>
+                                    @if ($activity->outcomes_attempted != null)
+                                        <span class="glyphicon glyphicon-ok"></span>
+                                    @endif
+                                </td>
+                                <td>
+                                    @if ($activity->outcomes_attempted != null && !$activity->draft && !$activity->diagnostic)
+                                        <span class="glyphicon glyphicon-ok"></span>
+                                    @endif
+                                </td>
+                            </tr>
+                        @endforeach
+
+                        @if (!$is_active_semester)
+                            <tr>
+                                <td colspan="3">
+                                    <div class="alert alert-info">The semester for this course is inactive. You cannot create
+                                        any more activities.</div>
+                                </td>
+                            </tr>
+                        @endif
                     </tbody>
                 </table>
 
                 <p>Unplublished activity results are <strong>not considered</strong> in the graph above.</p>
-
             @else
                 <div class="alert alert-info">
-                    @if($is_active_semester)
+                    @if ($is_active_semester)
                         <p>
                             No activities.
                             <a data-toggle="modal" data-target="#newActivityModal">
@@ -99,4 +103,3 @@
 
 
 @stop
-

app/views/local/managers/admins/new-learning-outcome.blade.php

@@ -1,11 +1,11 @@
 @extends('layouts.master')
 
 @section('navigation')
-    @if(Auth::user()->role==1)
-        @include('local.managers.admins._navigation')
-    @elseif(Auth::user()->role==2)
+    @if (Auth::user()->role == 1)
+        @include('local.managers.admins._new_navigation')
+    @elseif(Auth::user()->role == 2)
         @include('local.managers.sCoords._new_navigation')
-    @elseif(Auth::user()->role==3)
+    @elseif(Auth::user()->role == 3)
         @include('local.managers.pCoords._new_navigation')
     @endif
 @stop
@@ -21,10 +21,11 @@
         </div>
     </div>
     <div class="row">
-        @foreach($courses as $course)
+        @foreach ($courses as $course)
             <div class="col-md-2">
-{{--                TODO: Add href --}}
-                <a href="{{ URL::action('CoursesController@newShow', ['id' => $course->id]) }}" style="text-decoration: none">
+                {{-- TODO: Add href --}}
+                <a href="{{ URL::action('CoursesController@newShow', ['id' => $course->id]) }}"
+                    style="text-decoration: none">
                     <div class="panel panel-default" style="height: 10rem">
                         <div class="panel-heading">
                             <h5 class="panel-title">{{ $course->code }}</h5>
@@ -43,9 +44,9 @@
         </div>
     </div>
     <div class="row">
-        @foreach($activities as $activity)
+        @foreach ($activities as $activity)
             <div class="col-md-2">
-                {{--                TODO: Add href --}}
+                {{-- TODO: Add href --}}
                 <a href="" style="text-decoration: none">
                     <div class="panel panel-default" style="height: 10rem">
                         <div class="panel-heading">

app/views/local/managers/admins/new-learning-outcomes.blade.php

@@ -1,11 +1,11 @@
 @extends('layouts.master')
 
 @section('navigation')
-    @if(Auth::user()->role==1)
-        @include('local.managers.admins._navigation')
-    @elseif(Auth::user()->role==2)
+    @if (Auth::user()->role == 1)
+        @include('local.managers.admins._new_navigation')
+    @elseif(Auth::user()->role == 2)
         @include('local.managers.sCoords._new_navigation')
-    @elseif(Auth::user()->role==3)
+    @elseif(Auth::user()->role == 3)
         @include('local.managers.pCoords._new_navigation')
     @endif
 @stop
@@ -14,15 +14,17 @@
 
     <div class="row">
         <div class="col-md-6">
-            <a href="{{ URL::action('OutcomesController@newShow', ['id' => 'all']) }}" class="btn btn-lg btn-default">Show courses and activities for all domains</a>
+            <a href="{{ URL::action('OutcomesController@newShow', ['id' => 'all']) }}" class="btn btn-lg btn-default">Show
+                courses and activities for all domains</a>
         </div>
     </div>
     <br>
     <div class="row">
         <div class="col-md-12">
-            @foreach($outcomes as $outcome)
+            @foreach ($outcomes as $outcome)
                 <div class="col-md-3">
-                    <a href="{{ URL::action('OutcomesController@newShow', ['id' => $outcome->id]) }}" style="text-decoration: none">
+                    <a href="{{ URL::action('OutcomesController@newShow', ['id' => $outcome->id]) }}"
+                        style="text-decoration: none">
                         <div class="panel panel-default" style="height: 20rem">
                             <div class="panel-heading">
                                 <h5 class="panel-title">{{ $outcome->name }}</h5>
@@ -40,7 +42,7 @@
 @stop
 
 @section('included-js')
-{{--    @include('global._datatables_js')--}}
+    {{-- @include('global._datatables_js') --}}
 @stop
 
 @section('javascript')

app/views/local/managers/admins/new-report-all.blade.php

@@ -1,11 +1,11 @@
 @extends('layouts.master')
 
 @section('navigation')
-    @if(Auth::user()->role==1)
-        @include('local.managers.admins._navigation')
-    @elseif(Auth::user()->role==2)
+    @if (Auth::user()->role == 1)
+        @include('local.managers.admins._new_navigation')
+    @elseif(Auth::user()->role == 2)
         @include('local.managers.sCoords._new_navigation')
-    @elseif(Auth::user()->role==3)
+    @elseif(Auth::user()->role == 3)
         @include('local.managers.pCoords._new_navigation')
     @endif
 @stop
@@ -14,26 +14,30 @@
     <div class="row">
         <div class="col-md-12">
             <table class="table table-striped table-condensed editable-table">
-                <thead><tr class="center-text">
-                    <th class="col-md-2">Outcomes</th>
-                    <th class="col-md-4">Learning Objectives</th>
-                    <th class="col-md-4">Transformative Actions</th>
-                    <th class="col-md-2">Expected Metric</th>
+                <thead>
+                    <tr class="center-text">
+                        <th class="col-md-2">Outcomes</th>
+                        <th class="col-md-4">Learning Objectives</th>
+                        <th class="col-md-4">Transformative Actions</th>
+                        <th class="col-md-2">Expected Metric</th>
                 </thead>
                 <tbody>
-                @foreach ($outcomes as $outcome)
-                    @foreach ($outcome->objectives as $i => $objective)
-                        <tr data-id="{{$outcome->id}}">
-                            @if ($i == 0)
-                                <td contenteditable="true" class="name col-md-2" rowspan="{{ $outcome->objectives->count() }}">{{ $outcome->name }}</td>
-                            @endif
-                            <td contenteditable="true" class="name col-md-4" >{{ $objective->text }}</td>
-{{--                             TODO: Use correct data--}}
-                            <td contenteditable="true" data-type="textarea" class="definition col-md-6" >{{ 'TODO' }}</td>
-                            <td contenteditable="true" class="expected-outcome col-md-1" >{{ $outcome->expected_outcome }}</td>
-                        </tr>
+                    @foreach ($outcomes as $outcome)
+                        @foreach ($outcome->objectives as $i => $objective)
+                            <tr data-id="{{ $outcome->id }}">
+                                @if ($i == 0)
+                                    <td contenteditable="true" class="name col-md-2"
+                                        rowspan="{{ $outcome->objectives->count() }}">{{ $outcome->name }}</td>
+                                @endif
+                                <td contenteditable="true" class="name col-md-4">{{ $objective->text }}</td>
+                                {{-- TODO: Use correct data --}}
+                                <td contenteditable="true" data-type="textarea" class="definition col-md-6">
+                                    {{ 'TODO' }}</td>
+                                <td contenteditable="true" class="expected-outcome col-md-1">
+                                    {{ $outcome->expected_outcome }}</td>
+                            </tr>
+                        @endforeach
                     @endforeach
-                @endforeach
 
                 </tbody>
             </table>

app/views/local/managers/admins/new-report.blade.php

@@ -1,11 +1,11 @@
 @extends('layouts.master')
 
 @section('navigation')
-    @if(Auth::user()->role==1)
-        @include('local.managers.admins._navigation')
-    @elseif(Auth::user()->role==2)
+    @if (Auth::user()->role == 1)
+        @include('local.managers.admins._new_navigation')
+    @elseif(Auth::user()->role == 2)
         @include('local.managers.sCoords._new_navigation')
-    @elseif(Auth::user()->role==3)
+    @elseif(Auth::user()->role == 3)
         @include('local.managers.pCoords._new_navigation')
     @endif
 @stop
@@ -13,23 +13,27 @@
 @section('main')
     <div class="row">
         <div class="col-md-12">
-            <p>Click on the values you want to change. Invalid values will be rejected automatically. To save your changes, click the 'Save' button at the bottom of the page.</p>
+            <p>Click on the values you want to change. Invalid values will be rejected automatically. To save your changes,
+                click the 'Save' button at the bottom of the page.</p>
             <table class="table table-striped table-condensed editable-table">
-                <thead><tr class="center-text">
-                    <th class="col-md-4">Learning Objectives</th>
-                    <th class="col-md-6">Transformative Actions</th>
-                    <th class="col-md-2">Expected Metric</th>
+                <thead>
+                    <tr class="center-text">
+                        <th class="col-md-4">Learning Objectives</th>
+                        <th class="col-md-6">Transformative Actions</th>
+                        <th class="col-md-2">Expected Metric</th>
 
                 </thead>
                 <tbody>
-                @foreach ($objectives as $objective)
-                    <tr data-id="{{ $objective->id }}">
-                        <td contenteditable="true" class="name col-md-4" >{{ $objective->text }}</td>
-                        {{-- TODO: Use correct data --}}
-                        <td contenteditable="true" data-type="textarea" class="definition col-md-6" >{{ 'TODO' }}</td>
-                        <td contenteditable="true" class="expected-outcome col-md-1" >{{ $outcome->expected_outcome }}</td>
-                    </tr>
-                @endforeach
+                    @foreach ($objectives as $objective)
+                        <tr data-id="{{ $objective->id }}">
+                            <td contenteditable="true" class="name col-md-4">{{ $objective->text }}</td>
+                            {{-- TODO: Use correct data --}}
+                            <td contenteditable="true" data-type="textarea" class="definition col-md-6">{{ 'TODO' }}
+                            </td>
+                            <td contenteditable="true" class="expected-outcome col-md-1">{{ $outcome->expected_outcome }}
+                            </td>
+                        </tr>
+                    @endforeach
                 </tbody>
             </table>
         </div>

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

@@ -2,7 +2,7 @@
 
 @section('navigation')
     @if (Auth::user()->role == 1)
-        @include('local.managers.admins._navigation')
+        @include('local.managers.admins._new_navigation')
     @elseif(Auth::user()->role == 2)
         @include('local.managers.sCoords._new_navigation')
     @elseif(Auth::user()->role == 3)
@@ -63,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')
                                     

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

@@ -1,7 +1,7 @@
 @extends('layouts.master')
 
 @section('navigation')
-    @include('local.managers.admins._navigation')
+    @include('local.managers.admins._new_navigation')
 @stop
 @section('main')
     <div class="row">
@@ -119,8 +119,8 @@
                         <select id="select-objective" name="id" class="form-control selectpicker">
                             @foreach ($objectives as $objective)
                                 <option value="{{ $objective->id }}" data-subtext="
-                                                 @if ($objective->program) &nbsp;&nbsp;&nbsp;[{{ $objective->program->name }}] @endif
-                                ">
+                                                     @if ($objective->program) &nbsp;&nbsp;&nbsp;[{{ $objective->program->name }}] @endif
+                                    ">
                                     {{ $objective->text }}
 
 

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

@@ -1,7 +1,7 @@
 @extends('layouts.master')
 
 @section('navigation')
-@include('local.managers.admins._navigation')
+@include('local.managers.admins._new_navigation')
 @stop
 
 @section('main')

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

@@ -1,311 +1,321 @@
 @extends('layouts.master_sin_semesterbar')
 
 @section('navigation')
-@include('local.managers.admins._navigation')
+    @include('local.managers.admins._new_navigation')
 @stop
 
 @section('main')
 
-<div>
-  <div class="">
-    <script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>
-    <script type="text/javascript">
-
-    function make_chart(outcomes_info, semesters) {
-      //////// Get values ready for chart
-      var target_line = {{$target}};
-      var x_label = 'Learning Outcomes';
-      var y_label = 'Percent of students';
-      var outcomes_labels = Array();
-      var i = 0;
-      outcomes_info.forEach(eachOutcome);
-      function eachOutcome(outcome, index) {
-        outcomes_labels.push({v: (index+1), f: outcome.name});
-        i = i + 1;
-      }
-
-      //
-      var outcomes_data = Array();
-
-      var legend = Array();
-      legend.push('');
-      legend.push('Target');
-      $.each(semesters, function(index, semester){
-        var name = semester.name;
-        name = name.split(' ');
-        var semester_number = name[0];
-        var semester_year = name[2];
-
-        if (semester_number == 'First'){
-          semester_number = '1';
-        }
-        else if (semester_number == 'Second'){
-          semester_number = '2';
-        }
-
-        name = semester_year + " Sem " + semester_number;
-        legend.push(name);
-      });
-      outcomes_data.push(legend);
-
-      //
-      var hidden_values = Array();
-      hidden_values.push(0);
-      hidden_values.push(target_line);
-      var k = 0;
-      while (k < semesters.length){
-        hidden_values.push(null);
-        k = k + 1;
-      }
-
-      //
-      outcomes_data.push(hidden_values);
-// 		console.log(semesters)
-
-      $.each(outcomes_info, function(index, outcome){
-        var temp_outcome_grouping_info = Array();
-        temp_outcome_grouping_info.push({v:(index+1),f:"Students acheiving Learning Outcomes"});
-        temp_outcome_grouping_info.push(target_line);
-		
-// 		console.log(outcome.semesters)
-        var i = 0;
-        $.each(outcome.semesters, function(index, semester){
-
-          // if semester is not the same, insert null.
-          //  else, insert info from expected semester.
-          if(semester.name != semesters[i].name){
-            while(semester.name != semesters[i].name && i < semesters.length){
-              temp_outcome_grouping_info.push(null);
-              i = i + 1;
-            }
-          }
-          i = i + 1;
-
-          var total = semester.total_evaluated;
-          var achievers = semester.total_achieved;
-
-          var percentage = achievers/total;
-          var display_percentage = percentage*100;
-          temp_outcome_grouping_info.push({v:percentage,f:'\nAchieved by ' + display_percentage.toFixed(2) + '%\n(' + achievers + ' achievers and ' + total + ' participants)'});
-        });
-
-        var i = temp_outcome_grouping_info.length;
-        while(i < semesters.length+2){
-          temp_outcome_grouping_info.push(null);
-          i = i + 1;
-        }
-
-        outcomes_data.push(temp_outcome_grouping_info);
-      });
-      var last_hidden_values = [...hidden_values];
-      last_hidden_values[0] = i+1;
-      outcomes_data.push(last_hidden_values);
-
-      ////////
-      google.charts.load('current', {
-        packages: ['corechart']
-      }).then(function () {
-        var data = google.visualization.arrayToDataTable(outcomes_data);
-        // var data = google.visualization.arrayToDataTable([
-        //   ['', 'Target', '2020-21 Sem 2', '2021-22 Sem 1', '2021-22 Sem 2'],
-        //   [0, 0.80, null, null, null],
-        //   [{v:1,f:"Students acheiving Learning Outcomes"}, 0.80, {v:0.8275,f:82.75}, {v:0.9075,f:'\nAchieved by '+(90.75).toString()+'%\n(60 achievers and 80 participants)'}, {v:0.8475,f:84.75}],
-        //   [{v:2,f:"Students acheiving Learning Outcomes"}, 0.80, {v:0.7475,f:74.75}, {v:0.8775,f:87.75}, {v:0.9975,f:60.75}],
-        //   [{v:3,f:"Students acheiving Learning Outcomes"}, 0.80, {v:0.6875,f:68.75}, {v:0.9175,f:91.75}, {v:0.8475,f:84.75}],
-        //   [4, 0.80, null, null, null]
-        // ]);
-
-        var chartDiv = document.getElementById('chart_div');
-        var chart = new google.visualization.ColumnChart(chartDiv);
-        chart.draw(data, {
-          // colors: ['lime', 'magenta'],
-          hAxis: {
-            title: x_label,
-            ticks: outcomes_labels,
-            viewWindow: {
-              min: 0.5,
-              max: outcomes_info.length + 0.5 // el total de outcomes + 0.5
-            },
-            textStyle : {
-              fontSize: 10,
-              bold: true,
-            }
-          },
-          legend: 'right',
-          series: {
-            0: {
-              type: 'line'
-            }
-          },
-          title: ' ',
-          chartArea: {
-            width: '70%',
-            // top: 10,
-            // height: '50%'
-          },
-          vAxis: {
-            title: y_label,
-            format: 'percent',
-            viewWindow: {
-              min: 0,
-              max: 1
-            }
-          }
-        });
-      });
-    }
-
-
-    // labels for each outcome grouping
-    var outcomes_info = <?= json_encode($outcomes, JSON_HEX_TAG); ?>;
-    var semesters = <?= json_encode($semesters, JSON_HEX_TAG); ?>;
-
-// 	console.log(outcomes_info);
-    make_chart(outcomes_info,semesters);
-
-    </script>
-    <script src="https://www.gstatic.com/charts/loader.js"></script>
-    <div class="">
-      <div class="filters">
-        <div class="row" style="display: flex;">
-          <div class="category" >
-            <label for="is_graduate">Level</label>
-            <div class="select">
-              <select class="selectpicker" name="is_graduate" id="is_graduate">
-                <option value="0" selected="selected">Undergradute</option>
-                <option value="1">Graduate</option>
-              </select>
-            </div>
-          </div>
-        </div>
-        <div class="row" style="display: flex;">
-          <div class="category" >
-            <label for="school">School</label>
-            <div class="select">
-              <select multiple class="selectpicker" name="school" id="school">
-                <option value="0" selected="selected">All</option>
-                @foreach ($filters['school'] as $school)
-                  <option value="{{$school->id}}">{{$school->name}}</option>
-                @endforeach
-              </select>
+    <div>
+        <div class="">
+            <script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>
+            <script type="text/javascript">
+                function make_chart(outcomes_info, semesters) {
+                    //////// Get values ready for chart
+                    var target_line = {{ $target }};
+                    var x_label = 'Learning Outcomes';
+                    var y_label = 'Percent of students';
+                    var outcomes_labels = Array();
+                    var i = 0;
+                    outcomes_info.forEach(eachOutcome);
+
+                    function eachOutcome(outcome, index) {
+                        outcomes_labels.push({
+                            v: (index + 1),
+                            f: outcome.name
+                        });
+                        i = i + 1;
+                    }
+
+                    //
+                    var outcomes_data = Array();
+
+                    var legend = Array();
+                    legend.push('');
+                    legend.push('Target');
+                    $.each(semesters, function(index, semester) {
+                        var name = semester.name;
+                        name = name.split(' ');
+                        var semester_number = name[0];
+                        var semester_year = name[2];
+
+                        if (semester_number == 'First') {
+                            semester_number = '1';
+                        } else if (semester_number == 'Second') {
+                            semester_number = '2';
+                        }
+
+                        name = semester_year + " Sem " + semester_number;
+                        legend.push(name);
+                    });
+                    outcomes_data.push(legend);
+
+                    //
+                    var hidden_values = Array();
+                    hidden_values.push(0);
+                    hidden_values.push(target_line);
+                    var k = 0;
+                    while (k < semesters.length) {
+                        hidden_values.push(null);
+                        k = k + 1;
+                    }
+
+                    //
+                    outcomes_data.push(hidden_values);
+                    // 		console.log(semesters)
+
+                    $.each(outcomes_info, function(index, outcome) {
+                        var temp_outcome_grouping_info = Array();
+                        temp_outcome_grouping_info.push({
+                            v: (index + 1),
+                            f: "Students acheiving Learning Outcomes"
+                        });
+                        temp_outcome_grouping_info.push(target_line);
+
+                        // 		console.log(outcome.semesters)
+                        var i = 0;
+                        $.each(outcome.semesters, function(index, semester) {
+
+                            // if semester is not the same, insert null.
+                            //  else, insert info from expected semester.
+                            if (semester.name != semesters[i].name) {
+                                while (semester.name != semesters[i].name && i < semesters.length) {
+                                    temp_outcome_grouping_info.push(null);
+                                    i = i + 1;
+                                }
+                            }
+                            i = i + 1;
+
+                            var total = semester.total_evaluated;
+                            var achievers = semester.total_achieved;
+
+                            var percentage = achievers / total;
+                            var display_percentage = percentage * 100;
+                            temp_outcome_grouping_info.push({
+                                v: percentage,
+                                f: '\nAchieved by ' + display_percentage.toFixed(2) + '%\n(' + achievers +
+                                    ' achievers and ' + total + ' participants)'
+                            });
+                        });
+
+                        var i = temp_outcome_grouping_info.length;
+                        while (i < semesters.length + 2) {
+                            temp_outcome_grouping_info.push(null);
+                            i = i + 1;
+                        }
+
+                        outcomes_data.push(temp_outcome_grouping_info);
+                    });
+                    var last_hidden_values = [...hidden_values];
+                    last_hidden_values[0] = i + 1;
+                    outcomes_data.push(last_hidden_values);
+
+                    ////////
+                    google.charts.load('current', {
+                        packages: ['corechart']
+                    }).then(function() {
+                        var data = google.visualization.arrayToDataTable(outcomes_data);
+                        // var data = google.visualization.arrayToDataTable([
+                        //   ['', 'Target', '2020-21 Sem 2', '2021-22 Sem 1', '2021-22 Sem 2'],
+                        //   [0, 0.80, null, null, null],
+                        //   [{v:1,f:"Students acheiving Learning Outcomes"}, 0.80, {v:0.8275,f:82.75}, {v:0.9075,f:'\nAchieved by '+(90.75).toString()+'%\n(60 achievers and 80 participants)'}, {v:0.8475,f:84.75}],
+                        //   [{v:2,f:"Students acheiving Learning Outcomes"}, 0.80, {v:0.7475,f:74.75}, {v:0.8775,f:87.75}, {v:0.9975,f:60.75}],
+                        //   [{v:3,f:"Students acheiving Learning Outcomes"}, 0.80, {v:0.6875,f:68.75}, {v:0.9175,f:91.75}, {v:0.8475,f:84.75}],
+                        //   [4, 0.80, null, null, null]
+                        // ]);
+
+                        var chartDiv = document.getElementById('chart_div');
+                        var chart = new google.visualization.ColumnChart(chartDiv);
+                        chart.draw(data, {
+                            // colors: ['lime', 'magenta'],
+                            hAxis: {
+                                title: x_label,
+                                ticks: outcomes_labels,
+                                viewWindow: {
+                                    min: 0.5,
+                                    max: outcomes_info.length + 0.5 // el total de outcomes + 0.5
+                                },
+                                textStyle: {
+                                    fontSize: 10,
+                                    bold: true,
+                                }
+                            },
+                            legend: 'right',
+                            series: {
+                                0: {
+                                    type: 'line'
+                                }
+                            },
+                            title: ' ',
+                            chartArea: {
+                                width: '70%',
+                                // top: 10,
+                                // height: '50%'
+                            },
+                            vAxis: {
+                                title: y_label,
+                                format: 'percent',
+                                viewWindow: {
+                                    min: 0,
+                                    max: 1
+                                }
+                            }
+                        });
+                    });
+                }
+
+
+                // labels for each outcome grouping
+                var outcomes_info = <?= json_encode($outcomes, JSON_HEX_TAG) ?>;
+                var semesters = <?= json_encode($semesters, JSON_HEX_TAG) ?>;
+
+                // 	console.log(outcomes_info);
+                make_chart(outcomes_info, semesters);
+            </script>
+            <script src="https://www.gstatic.com/charts/loader.js"></script>
+            <div class="">
+                <div class="filters">
+                    <div class="row" style="display: flex;">
+                        <div class="category">
+                            <label for="is_graduate">Level</label>
+                            <div class="select">
+                                <select class="selectpicker" name="is_graduate" id="is_graduate">
+                                    <option value="0" selected="selected">Undergradute</option>
+                                    <option value="1">Graduate</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row" style="display: flex;">
+                        <div class="category">
+                            <label for="school">School</label>
+                            <div class="select">
+                                <select multiple class="selectpicker" name="school" id="school">
+                                    <option value="0" selected="selected">All</option>
+                                    @foreach ($filters['school'] as $school)
+                                        <option value="{{ $school->id }}">{{ $school->name }}</option>
+                                    @endforeach
+                                </select>
+                            </div>
+                        </div>
+                        <div class="category">
+                            <label for="program">Academic Program</label>
+                            <div class="select">
+                                <select multiple class="selectpicker" name="program" id="program">
+                                    <option value="0" selected="selected">All</option>
+                                    @foreach ($filters['program'] as $program)
+                                        <option value="{{ $program->id }}">{{ $program->name }}</option>
+                                    @endforeach
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row" style="display: flex;">
+                        <div class="category">
+                            <label for="semester">Semester</label>
+                            <div class="select">
+                                <select multiple class="selectpicker" name="semester" id="semester">
+                                    <option value="0" selected="selected">All</option>
+                                    @foreach ($filters['semester'] as $semester)
+                                        <option value="{{ $semester->id }}">{{ $semester->name }}</option>
+                                    @endforeach
+                                </select>
+                            </div>
+                        </div>
+                        <div class="category">
+                            <label for="year">Academic Year</label>
+                            <div class="select">
+                                <select multiple class="selectpicker" name="year" id="year">
+                                    <option value="0" selected="selected">All</option>
+                                    @foreach ($filters['year'] as $year)
+                                        <option value="{{ $year->id }}">{{ $year->start }}</option>
+                                    @endforeach
+                                </select>
+                            </div>
+                        </div>
+                        <div class="category">
+                            <label for="outcome">Learning Outcomes</label>
+                            <div class="select">
+                                <select multiple class="selectpicker" name="outcome" id="outcome">
+                                    <option value="0" selected="selected">All</option>
+                                    @foreach ($filters['outcome'] as $outcome)
+                                        <option value="{{ $outcome->id }}">{{ $outcome->name }}</option>
+                                    @endforeach
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <h4 class="container">
+                    <b>Percent of Students Achieving Learning Outcomes By Academic Session</b>
+                </h4>
+                <div class="container" style="height:500px; width:1300px;" id="chart_div"></div>
+                <div class="" style="padding-left: 25px;">
+                    <h5>
+                        <b>Annotation</b>
+                    </h5>
+                    The target line represents the expected percent of students achieving the learning
+                    outcome({{ $target * 100 }}%).
+                </div>
             </div>
-          </div>
-          <div class="category" >
-            <label for="program" >Academic Program</label>
-            <div class="select">
-              <select multiple class="selectpicker" name="program" id="program">
-                <option value="0" selected="selected">All</option>
-                @foreach ($filters['program'] as $program)
-                  <option value="{{$program->id}}">{{$program->name}}</option>
-                @endforeach
-              </select>
-            </div>
-          </div>
-        </div>
-        <div class="row" style="display: flex;">
-          <div class="category" >
-            <label for="semester">Semester</label>
-            <div class="select">
-              <select multiple class="selectpicker" name="semester" id="semester">
-                <option value="0" selected="selected">All</option>
-                @foreach ($filters['semester'] as $semester)
-                  <option value="{{$semester->id}}">{{$semester->name}}</option>
-                @endforeach
-              </select>
-            </div>
-          </div>
-          <div class="category" >
-            <label for="year">Academic Year</label>
-            <div class="select">
-              <select multiple class="selectpicker" name="year" id="year">
-                <option value="0" selected="selected">All</option>
-                @foreach ($filters['year'] as $year)
-                  <option value="{{$year->id}}">{{$year->start}}</option>
-                @endforeach
-              </select>
-            </div>
-          </div>
-          <div class="category" >
-            <label for="outcome">Learning Outcomes</label>
-            <div class="select">
-              <select multiple class="selectpicker" name="outcome" id="outcome">
-                <option value="0" selected="selected">All</option>
-                @foreach ($filters['outcome'] as $outcome)
-                  <option value="{{$outcome->id}}">{{$outcome->name}}</option>
-                @endforeach
-              </select>
-            </div>
-          </div>
         </div>
-      </div>
-      <h4 class="container">
-        <b>Percent of Students Achieving Learning Outcomes By Academic Session</b>
-      </h4>
-      <div class="container" style="height:500px; width:1300px;" id="chart_div"></div>
-      <div class="" style="padding-left: 25px;">
-        <h5>
-          <b>Annotation</b>
-        </h5>
-        The target line represents the expected percent of students achieving the learning outcome({{$target*100}}%).
-      </div>
     </div>
-  </div>
-</div>
 
 @stop
 
 @section('included-js')
 
-<!-- HighCharts -->
-<script src="{{ asset('vendor/highcharts/highcharts.js') }}"></script>
+    <!-- HighCharts -->
+    <script src="{{ asset('vendor/highcharts/highcharts.js') }}"></script>
 
 @stop
 
 @section('javascript')
 
 
-$(document).ready(function()
-{
-  $("#year").parent().parent().parent().hide();
+    $(document).ready(function()
+    {
+    $("#year").parent().parent().parent().hide();
 
 
 
-  // when a filter is focused
-  var previous;
-  $(".category").find("button").focus(function() {
+    // when a filter is focused
+    var previous;
+    $(".category").find("button").focus(function() {
     previous = Array();
     $(this).parent().find("select option:selected").each(function() {
-      previous.push(this.value);
+    previous.push(this.value);
+    });
     });
-  });
 
-  // when a filter is changed
-  $(".category").find("select").change(function() {
+    // when a filter is changed
+    $(".category").find("select").change(function() {
     var new_value = Array();
     $(this).parent().find("select option:selected").each(function() {
-      new_value.push(this.value);
+    new_value.push(this.value);
     });
 
     //if statements so that "All" only can be selected alone and dont allow selecting no options
     if(jQuery.inArray("0",new_value) !== -1 && jQuery.inArray("0",previous) === -1){
-      $(this).parent().find("select option:selected").each(function() {
-        $(this).removeAttr('selected');
-        $(this).parent().val(0);
-        //$('.selectpicker').selectpicker('refresh');
-        new_value = ["0"];
-      });
-    }else if(jQuery.inArray("0",new_value) !== -1 && jQuery.inArray("0",previous) !== -1 && new_value.length > previous.length){
-      $(this).parent().find("select option:selected").each(function() {
-        if(this.value == "0"){
-          $(this).removeAttr('selected');
-          //$('.selectpicker').selectpicker('refresh');
-          new_value = Array(new_value[1]);
-        }
-      });
+    $(this).parent().find("select option:selected").each(function() {
+    $(this).removeAttr('selected');
+    $(this).parent().val(0);
+    //$('.selectpicker').selectpicker('refresh');
+    new_value = ["0"];
+    });
+    }else if(jQuery.inArray("0",new_value) !== -1 && jQuery.inArray("0",previous) !== -1 && new_value.length >
+    previous.length){
+    $(this).parent().find("select option:selected").each(function() {
+    if(this.value == "0"){
+    $(this).removeAttr('selected');
+    //$('.selectpicker').selectpicker('refresh');
+    new_value = Array(new_value[1]);
+    }
+    });
     }else if(new_value.length == 0){
-      $(this).parent().find("select").val(0);
-      //$('.selectpicker').selectpicker('refresh');
-      new_value = ["0"];
+    $(this).parent().find("select").val(0);
+    //$('.selectpicker').selectpicker('refresh');
+    new_value = ["0"];
     }
     previous = new_value;
 
@@ -321,33 +331,33 @@ $(document).ready(function()
 
     // query the values and get new data for chart
     $.post(
-        "{{ URL::action('AdministratorsController@overview2_filter_results') }}",
-      {
-        schools: (schools),
-        programs: (programs),
-        semesters: (semesters),
-        years: (years),
-        outcomes: (outcomes),
-        is_graduate: (is_graduate),
-      },
-      function(data)
-      {
-        var filters = data.filters;
-        var outcomes_info = data.outcomes_info;
-        var semesters = data.semesters;
-
-        //////// update chart
-        make_chart(outcomes_info,semesters);
-
-
-        ////////update filters
-        var new_all = $('<option/>',{
-          'value': "0",
-          'html': "All",
-        });;
-
-        {{--
-        //update school filter
+    "{{ URL::action('AdministratorsController@overview2_filter_results') }}",
+    {
+    schools: (schools),
+    programs: (programs),
+    semesters: (semesters),
+    years: (years),
+    outcomes: (outcomes),
+    is_graduate: (is_graduate),
+    },
+    function(data)
+    {
+    var filters = data.filters;
+    var outcomes_info = data.outcomes_info;
+    var semesters = data.semesters;
+
+    //////// update chart
+    make_chart(outcomes_info,semesters);
+
+
+    ////////update filters
+    var new_all = $('
+    <option />',{
+    'value': "0",
+    'html': "All",
+    });;
+
+    {{-- //update school filter
         var school_filter = $("#school");
         var new_school_options = filters.school;
         school_filter.find("option").remove();
@@ -361,145 +371,151 @@ $(document).ready(function()
             'html': html,
           });;
           school_filter.append(new_option);
-        });
-        --}}
+        }); --}}
 
-        //update school filter
-        var school_filter = $("#school");
-        var school_selected_options = Array();
-        school_filter.find("option:selected").each(function() {
-          school_selected_options.push(this.value);
-        });
-        var new_school_options = filters.school;
-        school_filter.find("option").remove();
-        if(Array("0")[0] == school_selected_options[0]){
-          school_filter.append(new_all.clone(true).attr("selected","selected"));
-        } else{
-          school_filter.append(new_all.clone(true));
-        }
-        $.each(new_school_options, function(index, school)
-        {
-          var value = school.id.toString();
-          var html = school.name;
-          var new_option;
-          if(jQuery.inArray(value,school_selected_options) === -1){
-            new_option = $('<option/>',{
-              'value': value,
-              'html': html,
-            });;
-          }else{
-            new_option = $('<option/>',{
-              'value': value,
-              'html': html,
-              'selected': 'selected',
-            });;
-          }
-          school_filter.append(new_option);
-        });
+    //update school filter
+    var school_filter = $("#school");
+    var school_selected_options = Array();
+    school_filter.find("option:selected").each(function() {
+    school_selected_options.push(this.value);
+    });
+    var new_school_options = filters.school;
+    school_filter.find("option").remove();
+    if(Array("0")[0] == school_selected_options[0]){
+    school_filter.append(new_all.clone(true).attr("selected","selected"));
+    } else{
+    school_filter.append(new_all.clone(true));
+    }
+    $.each(new_school_options, function(index, school)
+    {
+    var value = school.id.toString();
+    var html = school.name;
+    var new_option;
+    if(jQuery.inArray(value,school_selected_options) === -1){
+    new_option = $('
+    <option />',{
+    'value': value,
+    'html': html,
+    });;
+    }else{
+    new_option = $('
+    <option />',{
+    'value': value,
+    'html': html,
+    'selected': 'selected',
+    });;
+    }
+    school_filter.append(new_option);
+    });
 
-        //update semester filter
-        var semester_filter = $("#semester");
-        var semester_selected_options = Array();
-        semester_filter.find("option:selected").each(function() {
-          semester_selected_options.push(this.value);
-        });
-        var new_semester_options = filters.semester;
-        semester_filter.find("option").remove();
-        if(Array("0")[0] == semester_selected_options[0]){
-          semester_filter.append(new_all.clone(true).attr("selected","selected"));
-        } else{
-          semester_filter.append(new_all.clone(true));
-        }
-        $.each(new_semester_options, function(index, semester)
-        {
-          var value = semester.id.toString();
-          var html = semester.name;
-          var new_option;
-          if(jQuery.inArray(value,semester_selected_options) === -1){
-            new_option = $('<option/>',{
-              'value': value,
-              'html': html,
-            });;
-          }else{
-            new_option = $('<option/>',{
-              'value': value,
-              'html': html,
-              'selected': 'selected',
-            });;
-          }
-          semester_filter.append(new_option);
-        });
-
-        //update program filter
-        var program_filter = $("#program");
-        var program_selected_options = Array();
-        program_filter.find("option:selected").each(function() {
-          program_selected_options.push(this.value);
-        });
-        var new_program_options = filters.program;
-        program_filter.find("option").remove();
-        if(Array("0")[0] == program_selected_options[0]){
-          program_filter.append(new_all.clone(true).attr("selected","selected"));
-        } else{
-          program_filter.append(new_all.clone(true));
-        }
-        $.each(new_program_options, function(index, program)
-        {
-          var value = program.id.toString();
-          var html = program.name;
-          var new_option;
-          if(jQuery.inArray(value,program_selected_options) === -1){
-            new_option = $('<option/>',{
-              'value': value,
-              'html': html,
-            });;
-          }else{
-            new_option = $('<option/>',{
-              'value': value,
-              'html': html,
-              'selected': 'selected',
-            });;
-          }
-          program_filter.append(new_option);
-        });
-
-
-        //update outcome filter
-        var outcome_filter = $("#outcome");
-        var outcome_selected_options = Array();
-        outcome_filter.find("option:selected").each(function() {
-          outcome_selected_options.push(this.value);
-        });
-        var new_outcome_options = filters.outcome;
-        outcome_filter.find("option").remove();
-        if(Array("0")[0] == outcome_selected_options[0]){
-          outcome_filter.append(new_all.clone(true).attr("selected","selected"));
-        } else{
-          outcome_filter.append(new_all.clone(true));
-        }
-        $.each(new_outcome_options, function(index, outcome)
-        {
-          var value = outcome.id.toString();
-          var html = outcome.name;
-          var new_option;
-          if(jQuery.inArray(value,outcome_selected_options) === -1){
-            new_option = $('<option/>',{
-              'value': value,
-              'html': html,
-            });;
-          }else{
-            new_option = $('<option/>',{
-              'value': value,
-              'html': html,
-              'selected': 'selected',
-            });;
-          }
-          outcome_filter.append(new_option);
-        });
-
-
-        {{--
-        //update semester filter
+    //update semester filter
+    var semester_filter = $("#semester");
+    var semester_selected_options = Array();
+    semester_filter.find("option:selected").each(function() {
+    semester_selected_options.push(this.value);
+    });
+    var new_semester_options = filters.semester;
+    semester_filter.find("option").remove();
+    if(Array("0")[0] == semester_selected_options[0]){
+    semester_filter.append(new_all.clone(true).attr("selected","selected"));
+    } else{
+    semester_filter.append(new_all.clone(true));
+    }
+    $.each(new_semester_options, function(index, semester)
+    {
+    var value = semester.id.toString();
+    var html = semester.name;
+    var new_option;
+    if(jQuery.inArray(value,semester_selected_options) === -1){
+    new_option = $('
+    <option />',{
+    'value': value,
+    'html': html,
+    });;
+    }else{
+    new_option = $('
+    <option />',{
+    'value': value,
+    'html': html,
+    'selected': 'selected',
+    });;
+    }
+    semester_filter.append(new_option);
+    });
+
+    //update program filter
+    var program_filter = $("#program");
+    var program_selected_options = Array();
+    program_filter.find("option:selected").each(function() {
+    program_selected_options.push(this.value);
+    });
+    var new_program_options = filters.program;
+    program_filter.find("option").remove();
+    if(Array("0")[0] == program_selected_options[0]){
+    program_filter.append(new_all.clone(true).attr("selected","selected"));
+    } else{
+    program_filter.append(new_all.clone(true));
+    }
+    $.each(new_program_options, function(index, program)
+    {
+    var value = program.id.toString();
+    var html = program.name;
+    var new_option;
+    if(jQuery.inArray(value,program_selected_options) === -1){
+    new_option = $('
+    <option />',{
+    'value': value,
+    'html': html,
+    });;
+    }else{
+    new_option = $('
+    <option />',{
+    'value': value,
+    'html': html,
+    'selected': 'selected',
+    });;
+    }
+    program_filter.append(new_option);
+    });
+
+
+    //update outcome filter
+    var outcome_filter = $("#outcome");
+    var outcome_selected_options = Array();
+    outcome_filter.find("option:selected").each(function() {
+    outcome_selected_options.push(this.value);
+    });
+    var new_outcome_options = filters.outcome;
+    outcome_filter.find("option").remove();
+    if(Array("0")[0] == outcome_selected_options[0]){
+    outcome_filter.append(new_all.clone(true).attr("selected","selected"));
+    } else{
+    outcome_filter.append(new_all.clone(true));
+    }
+    $.each(new_outcome_options, function(index, outcome)
+    {
+    var value = outcome.id.toString();
+    var html = outcome.name;
+    var new_option;
+    if(jQuery.inArray(value,outcome_selected_options) === -1){
+    new_option = $('
+    <option />',{
+    'value': value,
+    'html': html,
+    });;
+    }else{
+    new_option = $('
+    <option />',{
+    'value': value,
+    'html': html,
+    'selected': 'selected',
+    });;
+    }
+    outcome_filter.append(new_option);
+    });
+
+
+    {{-- //update semester filter
         var semester_filter = $("#semester");
         var new_semester_options = filters.semester;
         semester_filter.find("option").remove();
@@ -513,20 +529,19 @@ $(document).ready(function()
             'html': html,
           });;
           semester_filter.append(new_option);
-        });
-        --}}
+        }); --}}
 
 
-        $('.selectpicker').selectpicker('refresh');
-      }
+    $('.selectpicker').selectpicker('refresh');
+    }
     );
 
-  });
+    });
 
-});
+    });
 
 
 
-{{-- @include('global.dummy-outcomes') --}}
+    {{-- @include('global.dummy-outcomes') --}}
 
 @stop

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

@@ -1,7 +1,7 @@
 @extends('layouts.master')
 
 @section('navigation')
-    @include('local.managers.admins._navigation')
+    @include('local.managers.admins._new_navigation')
 @stop
 @section('main')
 
@@ -13,60 +13,65 @@
                 </div>
                 <div class="panel-body">
 
-                    <p>Use this to reassign courses matching your specified criteria to the program of your choice. Use <strong>*</strong> (asterisk) to do a wildcard search at the beginning or end. At least <strong>one</strong> field is required.</p>
+                    <p>Use this to reassign courses matching your specified criteria to the program of your choice. Use
+                        <strong>*</strong> (asterisk) to do a wildcard search at the beginning or end. At least
+                        <strong>one</strong> field is required.</p>
 
-                    <p>As an example, the following will assign all courses with a code <strong>starting</strong> with 'MAT' and a number <strong>starting</strong> with '3' to the Mathematics Program.</p>
+                    <p>As an example, the following will assign all courses with a code <strong>starting</strong> with 'MAT'
+                        and a number <strong>starting</strong> with '3' to the Mathematics Program.</p>
                     <ul>
                         <li>Code: MAT*</li>
                         <li>Number: 3*</li>
                         <li>Program: Mathematics</li>
                     </ul>
 
-                    {{ Form::open(array('action' => 'CoursesController@update')) }}
-
-                        <div class="form-group">
-                            {{ Form::label('code', 'Code') }}
-                            {{ Form::text('code', Input::old('code'), array('class' => 'form-control', 'placeholder'=>'TEST', 'maxLength'=>5)) }}
-                        </div>
-
-                        <div class="form-group">
-                            {{ Form::label('number', 'Number') }}
-                            {{ Form::text('number', Input::old('number'), array('class' => 'form-control', 'placeholder'=>'3001', 'maxLength'=>5)) }}
-                        </div>
-
-                        <div class="form-group">
-                            {{ Form::label('section', 'Section') }}
-                            {{ Form::text('section', Input::old('section'), array('class' => 'form-control', 'placeholder'=>'001', 'maxLength'=>4)) }}
-                        </div>
-
-                        <!-- Program -->
-                        <div class="form-group">
-                            {{ Form::label('program', 'Program') }}
-                            <select id="program" name="program" class="form-control">
-                                @foreach ($programs as $program)
-                                    @if(Input::old('program')!=$program->id)
-                                        <option value="{{ $program->id }}">{{ $program->name }} ({{ $program->school->name }})</option>
-                                    @else
-                                        <option selected value="{{ $program->id }}">{{ $program->name }} ({{ $program->school->name }})</option>
-                                    @endif
-                                @endforeach
-                            </select>
-                        </div>
+                    {{ Form::open(['action' => 'CoursesController@update']) }}
+
+                    <div class="form-group">
+                        {{ Form::label('code', 'Code') }}
+                        {{ Form::text('code', Input::old('code'), ['class' => 'form-control', 'placeholder' => 'TEST', 'maxLength' => 5]) }}
+                    </div>
+
+                    <div class="form-group">
+                        {{ Form::label('number', 'Number') }}
+                        {{ Form::text('number', Input::old('number'), ['class' => 'form-control', 'placeholder' => '3001', 'maxLength' => 5]) }}
+                    </div>
+
+                    <div class="form-group">
+                        {{ Form::label('section', 'Section') }}
+                        {{ Form::text('section', Input::old('section'), ['class' => 'form-control', 'placeholder' => '001', 'maxLength' => 4]) }}
+                    </div>
+
+                    <!-- Program -->
+                    <div class="form-group">
+                        {{ Form::label('program', 'Program') }}
+                        <select id="program" name="program" class="form-control">
+                            @foreach ($programs as $program)
+                                @if (Input::old('program') != $program->id)
+                                    <option value="{{ $program->id }}">{{ $program->name }}
+                                        ({{ $program->school->name }})</option>
+                                @else
+                                    <option selected value="{{ $program->id }}">{{ $program->name }}
+                                        ({{ $program->school->name }})</option>
+                                @endif
+                            @endforeach
+                        </select>
+                    </div>
 
-                       <br>
+                    <br>
 
-                        {{ Form::submit('Submit', array('class' => 'btn btn-primary btn-block', 'name'=>'reassign_program')) }}
+                    {{ Form::submit('Submit', ['class' => 'btn btn-primary btn-block', 'name' => 'reassign_program']) }}
                     {{ Form::close() }}
 
                     <br>
 
-                    @if(Session::has('courses'))
+                    @if (Session::has('courses'))
                         <p><strong>The following courses were updated:</strong></p>
                         <ul>
-                            @foreach(json_decode(Session::get('courses')) as $course)
+                            @foreach (json_decode(Session::get('courses')) as $course)
                                 <li>
 
-                                    @if(Session::has('show_sections'))
+                                    @if (Session::has('show_sections'))
                                         {{ $course->code }}{{ $course->number }}-{{ $course->section }}
                                     @else
                                         {{ $course->code }}{{ $course->number }}
@@ -86,56 +91,59 @@
                 </div>
                 <div class="panel-body">
 
-                    <p>Use this to reassign a section to a specific professor. Write down the code, number and section of the course. Then, choose a professor from the list. <strong>All fields are required.</strong></p>
-
-                    {{ Form::open(array('action' => 'CoursesController@update')) }}
-
-                        <div class="form-group">
-                            {{ Form::label('code_prof', 'Code') }}
-                            {{ Form::text('code_prof', Input::old('code_prof'), array('class' => 'form-control', 'placeholder'=>'TEST', 'maxLength'=>4)) }}
-                        </div>
-
-                        <div class="form-group">
-                            {{ Form::label('number_prof', 'Number') }}
-                            {{ Form::text('number_prof', Input::old('number_prof'), array('class' => 'form-control', 'placeholder'=>'3001', 'maxLength'=>4)) }}
-                        </div>
-
-                        <div class="form-group">
-                            {{ Form::label('section_prof', 'Section') }}
-                            {{ Form::text('section_prof', Input::old('section_prof'), array('class' => 'form-control', 'placeholder'=>'001', 'maxLength'=>3)) }}
-                        </div>
-
-                        <!-- Program -->
-                        <div class="form-group">
-                            {{ Form::label('user_prof', 'User') }}
-                            <select id="user_prof" name="user_prof" class="form-control">
-                                @foreach ($users as $user)
-                                    @if(Input::old('user_prof')!=$user->id)
-                                        <option value="{{ $user->id }}">{{ $user->surnames }}, {{ $user->first_name }}</option>
-                                    @else
-                                        <option selected value="{{ $user->id }}">{{ $user->surnames }}, {{ $user->first_name }}</option>
-                                    @endif
-                                @endforeach
-                            </select>
-                        </div>
-
-                        <!-- Semester -->
-                        <div class="form-group">
-                            {{ Form::label('semester_prof', 'Semester') }}
-                            <select id="semester_prof" name="semester_prof" class="form-control">
-                                @foreach ($semesters as $semester)
-                                    @if(Input::old('semester_prof')!=$semester->id)
-                                        <option value="{{ $semester->id }}">{{ $semester->name }}</option>
-                                    @else
-                                        <option selected value="{{ $semester->id }}">{{ $semester->name }}</option>
-                                    @endif
-                                @endforeach
-                            </select>
-                        </div>
+                    <p>Use this to reassign a section to a specific professor. Write down the code, number and section of
+                        the course. Then, choose a professor from the list. <strong>All fields are required.</strong></p>
+
+                    {{ Form::open(['action' => 'CoursesController@update']) }}
+
+                    <div class="form-group">
+                        {{ Form::label('code_prof', 'Code') }}
+                        {{ Form::text('code_prof', Input::old('code_prof'), ['class' => 'form-control', 'placeholder' => 'TEST', 'maxLength' => 4]) }}
+                    </div>
+
+                    <div class="form-group">
+                        {{ Form::label('number_prof', 'Number') }}
+                        {{ Form::text('number_prof', Input::old('number_prof'), ['class' => 'form-control', 'placeholder' => '3001', 'maxLength' => 4]) }}
+                    </div>
+
+                    <div class="form-group">
+                        {{ Form::label('section_prof', 'Section') }}
+                        {{ Form::text('section_prof', Input::old('section_prof'), ['class' => 'form-control', 'placeholder' => '001', 'maxLength' => 3]) }}
+                    </div>
+
+                    <!-- Program -->
+                    <div class="form-group">
+                        {{ Form::label('user_prof', 'User') }}
+                        <select id="user_prof" name="user_prof" class="form-control">
+                            @foreach ($users as $user)
+                                @if (Input::old('user_prof') != $user->id)
+                                    <option value="{{ $user->id }}">{{ $user->surnames }},
+                                        {{ $user->first_name }}</option>
+                                @else
+                                    <option selected value="{{ $user->id }}">{{ $user->surnames }},
+                                        {{ $user->first_name }}</option>
+                                @endif
+                            @endforeach
+                        </select>
+                    </div>
+
+                    <!-- Semester -->
+                    <div class="form-group">
+                        {{ Form::label('semester_prof', 'Semester') }}
+                        <select id="semester_prof" name="semester_prof" class="form-control">
+                            @foreach ($semesters as $semester)
+                                @if (Input::old('semester_prof') != $semester->id)
+                                    <option value="{{ $semester->id }}">{{ $semester->name }}</option>
+                                @else
+                                    <option selected value="{{ $semester->id }}">{{ $semester->name }}</option>
+                                @endif
+                            @endforeach
+                        </select>
+                    </div>
 
-                       <br>
+                    <br>
 
-                        {{ Form::submit('Submit', array('class' => 'btn btn-primary btn-block', 'name'=>'reassign_professor')) }}
+                    {{ Form::submit('Submit', ['class' => 'btn btn-primary btn-block', 'name' => 'reassign_professor']) }}
                     {{ Form::close() }}
 
                 </div>

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

@@ -2,64 +2,69 @@
 
 @section('css')
 
-{{ HTML::style('vendor/datetimepicker-master/jquery.datetimepicker.css') }}
+    {{ HTML::style('vendor/datetimepicker-master/jquery.datetimepicker.css') }}
 
 @stop
 
 @section('navigation')
-    @include('local.managers.admins._navigation')
+    @include('local.managers.admins._new_navigation')
 @stop
 
 @section('main')
 
-<div class="row">
-    <div class="col-md-8">
-        <p>Use this page to change the available semesters' start dates, end dates, and visibility. Start dates and end dates determine the range of time within which users enter data for each semester. Visibility determines whether a user can select that semester for viewing and/or entering data. Users cannot enter new data in a closed semester, even if it is visible.</p>
-        <p><strong>Important: At least one semester must be visible, and must have started. While semesters may have overlapping dates, they cannot have the same dates.</strong></p>
-        <table class="table table-striped">
-            <thead>
-                <tr>
-                    <th>Code</th>
-                    <th>Name</th>
-                    <th>Start Date</th>
-                    <th>End Date</th>
-                    <th>Visible</th>
-                    <th>Save</th>
-                </tr>
-            </thead>
-            <tbody>
-
-            </tbody>
-            @foreach ($semesters as $semester)
-                <tr>
-                    <td data-id="{{ $semester->id }}" class="semester-code">{{ $semester->code }}</td>
-                    <td class="semester-name">{{ $semester->name }}</td>
-                    <td class="semester-start"><input class="datetimepicker" type="text" value="{{ date('m/d/y H:i:s', strtotime($semester->start)) }}"></td>
-                    <td class="semester-end"><input class="datetimepicker" type="text" value="{{ date('m/d/y H:i:s', strtotime($semester->end)) }}"></td>
-                    <td class="semester-visible">
-                        <select name="" id="">
-                            @if($semester->is_visible)
-                            <option selected="selected" value="1">Yes</option>
-                            <option value="0">No</option>
-                            @else
-                            <option value="1">Yes</option>
-                            <option selected="selected" value="0">No</option>
-                            @endif
-                        </select>
-                        
-                    </td>
-                    <td class="semester-save"><span class="glyphicon glyphicon-floppy-disk"></span></td>
-                </tr>
-
-            @endforeach
-        </table>
+    <div class="row">
+        <div class="col-md-8">
+            <p>Use this page to change the available semesters' start dates, end dates, and visibility. Start dates and end
+                dates determine the range of time within which users enter data for each semester. Visibility determines
+                whether a user can select that semester for viewing and/or entering data. Users cannot enter new data in a
+                closed semester, even if it is visible.</p>
+            <p><strong>Important: At least one semester must be visible, and must have started. While semesters may have
+                    overlapping dates, they cannot have the same dates.</strong></p>
+            <table class="table table-striped">
+                <thead>
+                    <tr>
+                        <th>Code</th>
+                        <th>Name</th>
+                        <th>Start Date</th>
+                        <th>End Date</th>
+                        <th>Visible</th>
+                        <th>Save</th>
+                    </tr>
+                </thead>
+                <tbody>
+
+                </tbody>
+                @foreach ($semesters as $semester)
+                    <tr>
+                        <td data-id="{{ $semester->id }}" class="semester-code">{{ $semester->code }}</td>
+                        <td class="semester-name">{{ $semester->name }}</td>
+                        <td class="semester-start"><input class="datetimepicker" type="text"
+                                value="{{ date('m/d/y H:i:s', strtotime($semester->start)) }}"></td>
+                        <td class="semester-end"><input class="datetimepicker" type="text"
+                                value="{{ date('m/d/y H:i:s', strtotime($semester->end)) }}"></td>
+                        <td class="semester-visible">
+                            <select name="" id="">
+                                @if ($semester->is_visible)
+                                    <option selected="selected" value="1">Yes</option>
+                                    <option value="0">No</option>
+                                @else
+                                    <option value="1">Yes</option>
+                                    <option selected="selected" value="0">No</option>
+                                @endif
+                            </select>
+
+                        </td>
+                        <td class="semester-save"><span class="glyphicon glyphicon-floppy-disk"></span></td>
+                    </tr>
+                @endforeach
+            </table>
+        </div>
     </div>
-</div>
 
 @stop
 
 @section('included-js')
-<script src="{{ asset('vendor/datetimepicker-master/jquery.datetimepicker.js') }}"></script>
+    <script src="{{ asset('vendor/datetimepicker-master/jquery.datetimepicker.js') }}"></script>
 @stop
 
 
@@ -68,11 +73,11 @@
     // ------------------------------------------------------------------------
     // Page Load
     // ------------------------------------------------------------------------
-    
+
     $('.datetimepicker').datetimepicker({
-        format: 'm/d/y H:i:s'
+    format: 'm/d/y H:i:s'
     });
-    
+
 
     // ------------------------------------------------------------------------
     // Events
@@ -80,28 +85,28 @@
 
     $('.semester-save').on('click', function(e)
     {
-        e.preventDefault();
-
-        var id = ($(this).siblings('.semester-code').data('id'));
-        var start = ($(this).siblings('.semester-start').find('.datetimepicker').val());
-        var end = ($(this).siblings('.semester-end').find('.datetimepicker').val());
-        var visible = ($(this).siblings('.semester-visible').find(':selected').val());
-
-        $.post(
-            "{{ URL::action('SemestersController@update') }}",
-            { 
-                id: id,
-                start: start,
-                end: end,
-                visible: visible
-            },
-            function(data)
-            {
-               location.reload(true);
-            }
-        ).fail(function() {
-            alert( "error" );
-        });
+    e.preventDefault();
+
+    var id = ($(this).siblings('.semester-code').data('id'));
+    var start = ($(this).siblings('.semester-start').find('.datetimepicker').val());
+    var end = ($(this).siblings('.semester-end').find('.datetimepicker').val());
+    var visible = ($(this).siblings('.semester-visible').find(':selected').val());
+
+    $.post(
+    "{{ URL::action('SemestersController@update') }}",
+    {
+    id: id,
+    start: start,
+    end: end,
+    visible: visible
+    },
+    function(data)
+    {
+    location.reload(true);
+    }
+    ).fail(function() {
+    alert( "error" );
+    });
     });
 
     // ------------------------------------------------------------------------
@@ -110,31 +115,29 @@
 
     function selectSchoolandProgram(semester, role)
     {
-        switch(role)
-        {
-            case 1:
-                $('#school option[value="0"]').prop('selected', true);
-                $('#program option[value="0"]').prop('selected', true);
-                break;
-            case 2:
-                var school_id = semester.find('.semester-school').data('school-id');
-                $('#school option[value="'+school_id+'"]').prop('selected', true);
-                fetchPrograms();
-                $('#program option[value="0"]').prop('selected', true);
-                break;
-            case 3:
-            case 4:
-                var school_id = semester.find('.semester-school').data('school-id');
-                var program_id = semester.find('.semester-program').data('program-id');
-
-                $('#school option[value="'+school_id+'"]').prop('selected', true);
-                fetchPrograms();
-                $('#program option[value="'+program_id+'"]').prop('selected', true);
-                break;
-        }
+    switch(role)
+    {
+    case 1:
+    $('#school option[value="0"]').prop('selected', true);
+    $('#program option[value="0"]').prop('selected', true);
+    break;
+    case 2:
+    var school_id = semester.find('.semester-school').data('school-id');
+    $('#school option[value="'+school_id+'"]').prop('selected', true);
+    fetchPrograms();
+    $('#program option[value="0"]').prop('selected', true);
+    break;
+    case 3:
+    case 4:
+    var school_id = semester.find('.semester-school').data('school-id');
+    var program_id = semester.find('.semester-program').data('program-id');
+
+    $('#school option[value="'+school_id+'"]').prop('selected', true);
+    fetchPrograms();
+    $('#program option[value="'+program_id+'"]').prop('selected', true);
+    break;
+    }
     }
 
 
 @stop
-
-

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

@@ -1,127 +1,150 @@
  @extends('layouts.master')
 
-@section('navigation')
-        @include('local.managers.admins._navigation')
-@stop
-
-@section('main')
-    <div class="row">
-        <div class="col-md-12">
-
-            <p>This report contains the Assessment for all Students for all Schools and Programs during the following semester(s):</p>
-            <ul>
-                @foreach (Session::get('semesters_info') as $semester_info)
-                    <li>{{ $semester_info }}</li>
-                @endforeach
-            </ul>
-
-
-            <!-- <h3>Table of Contents</h3> -->
-            <!-- <ol id="table-of-contents" class="upper-roman">
-
-            </ol> -->
-
-
-            <table class="table table-condensed table-bordered datatable">
-                <thead>
-                    <tr class="center-text">
-                        <th>Semester</th>
-                        <th>School or College</th>
-                        <th>Program ID</th>
-                        <th>Program Code</th>
-                        <th>Outcome</th>
-                        <th>Student Number</th>
-                        <th>Student Program</th>
-                        <th>Criteria</th>
-                        <th>Courses</th>
-                        <th>Expected Result For Achievement</th>
-                        <th>Student Result</th>
-                    </tr>
-                </thead>
-                <tfoot>
-                    <tr class="column-search">
-                        <th><select class="column-search-select form-control"><option value=""></option></select></th>
-                        <th><select class="column-search-select form-control"><option value=""></option></select></th>
-                        <th><select class="column-search-select form-control"><option value=""></option></select></th>
-                        <th><select class="column-search-select form-control"><option value=""></option></select></th>
-                        <th><select class="column-search-select form-control"><option value=""></option></select></th>
-                        <th><select class="column-search-select form-control"><option value=""></option></select></th>
-                        <th><select class="column-search-select form-control"><option value=""></option></select></th>
-                        <th><input class="column-search-bar form-control" type="text" placeholder="Buscar"/></th>
-                        <th><select class="column-search-select form-control"><option value=""></option></select></th>
-                        <th><select class="column-search-select form-control"><option value=""></option></select></th>
-                        <th><select class="column-search-select form-control"><option value=""></option></select></th>
-                    </tr>
-                </tfoot>
-                <tbody>
-                    @foreach ($total_assessments as $total_assessment)
-                                <tr>
-                                    <td>{{ $total_assessment->semester }}</td>
-                                    <td>{{ $total_assessment->school }}</td>
-                                    <td>{{ $total_assessment->program }}</td>
-                                    <td>{{ $total_assessment->program_code }}</td>
-                                    <td>{{ $total_assessment->outcome }}</td>
-                                    <td>{{ $total_assessment->student_number }}</td>
-                                    <td>{{ $total_assessment->student_conc_code }}</td>
-                                    <td>{{ $total_assessment->criterion }}</td>
-                                    <td>{{ $total_assessment->course }}</td>
-                                    <td>{{ $total_assessment->expected_result }}</td>
-                                    <td>{{ $total_assessment->result }}</td>
-                                </tr>
-                    @endforeach
-                </tbody>
-            </table>
-        </div>
-    </div>
-    <span class="js-vars"
-        data-pdf-url="{{ URL::action('OutcomesController@totalAssessmentReport') }}"
-    ></span>
-@stop
-
-@section('included-js')
-    @include('global._datatables_js')
-@stop
-
-
-@section('javascript')
-
-// Build table of contents
-var outcome = $('.outcome');
-var str ='';
-str+='<li><a href="#'+outcome.attr('id')+'">'+outcome.text()+'</a><ol class="schools upper-alpha">';
-
-/*$('[id^='+outcome.attr('id')+'-].school:visible').each(function(e){
-    var school = $(this);
-    str+='<li><a href="#'+school.attr('id')+'">'+school.text()+'</a><ol class="programs">';
-
-    $('[id^='+school.attr('id')+'-].program:visible').each(function(e){
-
-        var program = $(this);
-        if(!program.hasClass('no-courses'))
-            str+='<li><a href="#'+program.attr('id')+'">'+program.text()+'</a></li>';
-        else
-            str+='<li>'+program.text()+'</li>';
-
-    });
-
-    str+='</ol></li>';
-});*/
-
-str+='</ol></li>';
-
-//$('#table-of-contents').append(str);
-
-
-// ----------------------------------------------------------------------------
-// Events
-//
-
-$('.to-top').on('click', function(e) {
-    e.preventDefault();
+ @section('navigation')
+     @include('local.managers.admins._new_navigation')
+ @stop
+
+ @section('main')
+     <div class="row">
+         <div class="col-md-12">
+
+             <p>This report contains the Assessment for all Students for all Schools and Programs during the following
+                 semester(s):</p>
+             <ul>
+                 @foreach (Session::get('semesters_info') as $semester_info)
+                     <li>{{ $semester_info }}</li>
+                 @endforeach
+             </ul>
+
+
+             <!-- <h3>Table of Contents</h3> -->
+             <!-- <ol id="table-of-contents" class="upper-roman">
+
+                </ol> -->
+
+
+             <table class="table table-condensed table-bordered datatable">
+                 <thead>
+                     <tr class="center-text">
+                         <th>Semester</th>
+                         <th>School or College</th>
+                         <th>Program ID</th>
+                         <th>Program Code</th>
+                         <th>Outcome</th>
+                         <th>Student Number</th>
+                         <th>Student Program</th>
+                         <th>Criteria</th>
+                         <th>Courses</th>
+                         <th>Expected Result For Achievement</th>
+                         <th>Student Result</th>
+                     </tr>
+                 </thead>
+                 <tfoot>
+                     <tr class="column-search">
+                         <th><select class="column-search-select form-control">
+                                 <option value=""></option>
+                             </select></th>
+                         <th><select class="column-search-select form-control">
+                                 <option value=""></option>
+                             </select></th>
+                         <th><select class="column-search-select form-control">
+                                 <option value=""></option>
+                             </select></th>
+                         <th><select class="column-search-select form-control">
+                                 <option value=""></option>
+                             </select></th>
+                         <th><select class="column-search-select form-control">
+                                 <option value=""></option>
+                             </select></th>
+                         <th><select class="column-search-select form-control">
+                                 <option value=""></option>
+                             </select></th>
+                         <th><select class="column-search-select form-control">
+                                 <option value=""></option>
+                             </select></th>
+                         <th><input class="column-search-bar form-control" type="text" placeholder="Buscar" /></th>
+                         <th><select class="column-search-select form-control">
+                                 <option value=""></option>
+                             </select></th>
+                         <th><select class="column-search-select form-control">
+                                 <option value=""></option>
+                             </select></th>
+                         <th><select class="column-search-select form-control">
+                                 <option value=""></option>
+                             </select></th>
+                     </tr>
+                 </tfoot>
+                 <tbody>
+                     @foreach ($total_assessments as $total_assessment)
+                         <tr>
+                             <td>{{ $total_assessment->semester }}</td>
+                             <td>{{ $total_assessment->school }}</td>
+                             <td>{{ $total_assessment->program }}</td>
+                             <td>{{ $total_assessment->program_code }}</td>
+                             <td>{{ $total_assessment->outcome }}</td>
+                             <td>{{ $total_assessment->student_number }}</td>
+                             <td>{{ $total_assessment->student_conc_code }}</td>
+                             <td>{{ $total_assessment->criterion }}</td>
+                             <td>{{ $total_assessment->course }}</td>
+                             <td>{{ $total_assessment->expected_result }}</td>
+                             <td>{{ $total_assessment->result }}</td>
+                         </tr>
+                     @endforeach
+                 </tbody>
+             </table>
+         </div>
+     </div>
+     <span class="js-vars" data-pdf-url="{{ URL::action('OutcomesController@totalAssessmentReport') }}"></span>
+ @stop
+
+ @section('included-js')
+     @include('global._datatables_js')
+ @stop
+
+
+ @section('javascript')
+
+     // Build table of contents
+     var outcome = $('.outcome');
+     var str ='';
+     str+='<li><a href="#'+outcome.attr('id')+'">'+outcome.text()+'</a>
+         <ol class="schools upper-alpha">';
+
+             /*$('[id^='+outcome.attr('id')+'-].school:visible').each(function(e){
+             var school = $(this);
+             str+='<li><a href="#'+school.attr('id')+'">'+school.text()+'</a>
+                 <ol class="programs">';
+
+                     $('[id^='+school.attr('id')+'-].program:visible').each(function(e){
+
+                     var program = $(this);
+                     if(!program.hasClass('no-courses'))
+                     str+='<li><a href="#'+program.attr('id')+'">'+program.text()+'</a></li>';
+                     else
+                     str+='<li>'+program.text()+'</li>';
+
+                     });
+
+                     str+='</ol>
+             </li>';
+             });*/
+
+             str+='</ol>
+     </li>';
+
+     //$('#table-of-contents').append(str);
+
+
+     // ----------------------------------------------------------------------------
+     // Events
+     //
+
+     $('.to-top').on('click', function(e) {
+     e.preventDefault();
 
      $(this).scrollTop(0);
-    $('html').animate({scrollTop:0}, 1);
-    $('body').animate({scrollTop:0}, 1);
-})
+     $('html').animate({scrollTop:0}, 1);
+     $('body').animate({scrollTop:0}, 1);
+     })
 
-@stop
+ @stop

app/views/local/managers/admins/users.blade (4.29.2015 1.43.03 PM).php

@@ -1,7 +1,7 @@
 @extends('layouts.master')
 
 @section('navigation')
-@include('local.managers.admins._navigation')
+@include('local.managers.admins._new_navigation')
 @stop
 
 @section('main')

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

@@ -2,7 +2,7 @@
 
 @section('navigation')
         @if(Auth::user()->role==1)
-            @include('local.managers.admins._navigation')
+            @include('local.managers.admins._new_navigation')
         @elseif(Auth::user()->role==2)
             @include('local.managers.sCoords._new_navigation')
         @elseif(Auth::user()->role==3)

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

@@ -34,7 +34,8 @@
                     and Criterias<span class="caret"></span></a>
                 <ul class="dropdown-menu" role="menu">
                     <li>{{ HTML::linkAction('CriteriaController@index', 'Outcomes and Criteria') }}</li>
-                    <li>{{ HTML::linkAction('CriteriaController@objectivesIndex', 'Objectives and Criteria') }}</li>
+                    <li>{{ HTML::linkAction('objective2Controller@viewObjectives', 'Objectives and Criteria') }}
+                    </li>
                 </ul>
             </li>
             @if (count(Auth::user()->courses))

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

@@ -11,7 +11,7 @@
                     aria-expanded="false">Objectives<span class="caret"></span></a>
                 <ul class="dropdown-menu dropdown-menu-left" role="menu">
                     <li>{{ HTML::linkAction('Objective2Controller@edit', 'Create/Edit Objectives') }}</li>
-                    <li>{{ HTML::linkAction('CriteriaController@objectivesIndex', 'View Objectives and Criteria') }}
+                    <li>{{ HTML::linkAction('objective2Controller@viewObjectives', 'View Objectives and Criteria') }}
                     </li>
                 </ul>
             </li>

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

@@ -1,11 +1,11 @@
 @extends('layouts.master')
 
 @section('navigation')
-    @if(Auth::user()->role==1)
-        @include('local.managers.admins._navigation')
-    @elseif(Auth::user()->role==2)
+    @if (Auth::user()->role == 1)
+        @include('local.managers.admins._new_navigation')
+    @elseif(Auth::user()->role == 2)
         @include('local.managers.sCoords._new_navigation')
-    @elseif(Auth::user()->role==3)
+    @elseif(Auth::user()->role == 3)
         @include('local.managers.pCoords._new_navigation')
     @endif
 @stop
@@ -13,14 +13,15 @@
 @section('main')
     <div class="row">
         <div class="col-md-12">
-            <p>This report contains performance information for all your Program's assessed courses during the following semester(s):</p>
+            <p>This report contains performance information for all your Program's assessed courses during the following
+                semester(s):</p>
             <ul>
                 @foreach (Session::get('semesters_info') as $semester_info)
                     <li>{{ $semester_info }}</li>
                 @endforeach
             </ul>
 
-            @if($program)
+            @if ($program)
 
                 <h3 id="{{ $outcome->id }}" class="outcome">{{ $outcome->name }}</h3>
                 <table class="table table-condensed table-bordered">
@@ -31,87 +32,98 @@
                                     {{ $program->school->name }}: {{ $program->name }}
                                 </h4>
                             </th>
-                        </tr> 
+                        </tr>
                     </thead>
                     <tbody>
-                        @if($program->assessesOutcome($outcome->id))
-                                <!-- For each grouped course -->
-                                @foreach($program->courses as $index2=>$course)
-                                    <!-- If grouped course has activities that evaluate the outcome -->
+                        @if ($program->assessesOutcome($outcome->id))
+                            <!-- For each grouped course -->
+                            @foreach ($program->courses as $index2 => $course)
+                                <!-- If grouped course has activities that evaluate the outcome -->
 
-                                    <?php
-
-                                        /*$sections_evaluating = Course::has('activities')
-                                        ->whereNotNull('outcomes_attempted')
-                                        ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
-                                        ->with(array('activities'=>function($query) use(&$outcome){
-                                            $query->whereNotNull('outcomes_attempted');
-                                            $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
-                                        ->where('code', $course->code)->where('number',$course->number)
-                                        ->whereIn('semester_id', Session::get('semesters_ids'))
-                                        ->get();*/
-
-
-                                        $sections_evaluating = Course::has('activities')
-                            
-                            //->whereNotNull('outcomes_attempted')
-                            //->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
-                            ->with(array('activities'=>function($query) use(&$outcome, &$course){
-                                $activities = DB::table('activities')
-                                ->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
-                                ->join('assessments', 'assessments.activity_criterion_id', '=','activity_criterion.id')
-                                ->join('criterion_objective_outcome', 'activity_criterion.criterion_id', '=', 'criterion_objective_outcome.criterion_id')
-                                ->where('course_id', $course->id)
-                                ->where('criterion_objective_outcome.outcome_id', $outcome->id)
-                                ->select('activity_id')
-                                ->lists('activity_id');
-
-                                //$query->whereNotNull('outcomes_attempted');
-                                //$query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');
-                            $query->whereIn('id', $activities);
-                        } ))
+                                <?php
                                 
-
-                            ->where('code', $course->code)->where('number',$course->number)
-                            ->whereIn('semester_id', Session::get('semesters_ids'))
-                            ->get();
-                            
-                            
-                                    ?>
-
-                                    @if(count($sections_evaluating))
-                                        <tr>
-                                            <td>
-                                                <h4>{{ $course->code}}-{{ $course->number }}</h4>
-                                            </td>
-                                            <td>
+                                /*$sections_evaluating = Course::has('activities')
+                                                                        ->whereNotNull('outcomes_attempted')
+                                                                        ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
+                                                                        ->with(array('activities'=>function($query) use(&$outcome){
+                                                                            $query->whereNotNull('outcomes_attempted');
+                                                                            $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
+                                                                        ->where('code', $course->code)->where('number',$course->number)
+                                                                        ->whereIn('semester_id', Session::get('semesters_ids'))
+                                                                        ->get();*/
+                                
+                                $sections_evaluating = Course::has('activities')
+                                
+                                    //->whereNotNull('outcomes_attempted')
+                                    //->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
+                                    ->with([
+                                        'activities' => function ($query) use (&$outcome, &$course) {
+                                            $activities = DB::table('activities')
+                                                ->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
+                                                ->join('assessments', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
+                                                ->join('criterion_objective_outcome', 'activity_criterion.criterion_id', '=', 'criterion_objective_outcome.criterion_id')
+                                                ->where('course_id', $course->id)
+                                                ->where('criterion_objective_outcome.outcome_id', $outcome->id)
+                                                ->select('activity_id')
+                                                ->lists('activity_id');
+                                
+                                            //$query->whereNotNull('outcomes_attempted');
+                                            //$query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');
+                                            $query->whereIn('id', $activities);
+                                        },
+                                    ])
+                                
+                                    ->where('code', $course->code)
+                                    ->where('number', $course->number)
+                                    ->whereIn('semester_id', Session::get('semesters_ids'))
+                                    ->get();
+                                
+                                ?>
+
+                                @if (count($sections_evaluating))
+                                    <tr>
+                                        <td>
+                                            <h4>{{ $course->code }}-{{ $course->number }}</h4>
+                                        </td>
+                                        <td>
                                             <!-- For each section -->
-                                            @foreach($sections_evaluating as $index3 => $section)
-                                                <h5><u>Instance {{ $index3 + 1}}</u></h5>
+                                            @foreach ($sections_evaluating as $index3 => $section)
+                                                <h5><u>Instance {{ $index3 + 1 }}</u></h5>
 
                                                 <!-- For each activity in the section -->
-                                                @foreach($section->activities as $index4 => $activity)
-
+                                                @foreach ($section->activities as $index4 => $activity)
                                                     <!-- If activity has a rubric and the rubric has the outcome being evaluated -->
-                                                    @if($activity->draft ==0 && $activity->diagnostic == 0 && array_key_exists($outcome->id, (array)$activity->o_att_array) && $activity->o_att_array[$outcome->id] >=1)
+                                                    @if ($activity->draft == 0 && $activity->diagnostic == 0 && array_key_exists($outcome->id, (array) $activity->o_att_array) && $activity->o_att_array[$outcome->id] >= 1)
                                                         <h5>Measure {{ $index4 + 1 }}</h5>
-                                                        <p>A rubric was used in the {{ $section->code }}-{{ $section->number }} ({{ $section->name }}) course ({{ date('M Y', strtotime($course->updated_at))}}) to assess students’ <u>{{ strtolower($outcome->name) }}</u> in the activity: "<strong>{{ $activity->name }}</strong>". N= {{ count($section->students) }}. </p>
-                                                        <p>The expected performance level was that <strong>{{ $activity->rubric[0]->expected_percentage }}%</strong> of students participating in the activity would score <strong>{{ $activity->rubric[0]->expected_points }} points</strong> or more in the 1-8 point scale used.</p>
+                                                        <p>A rubric was used in the
+                                                            {{ $section->code }}-{{ $section->number }}
+                                                            ({{ $section->name }}) course
+                                                            ({{ date('M Y', strtotime($course->updated_at)) }}) to assess
+                                                            students’ <u>{{ strtolower($outcome->name) }}</u> in the
+                                                            activity: "<strong>{{ $activity->name }}</strong>". N=
+                                                            {{ count($section->students) }}. </p>
+                                                        <p>The expected performance level was that
+                                                            <strong>{{ $activity->rubric[0]->expected_percentage }}%</strong>
+                                                            of students participating in the activity would score
+                                                            <strong>{{ $activity->rubric[0]->expected_points }}
+                                                                points</strong> or more in the 1-8 point scale used.</p>
                                                         <p>The results for each criterion were as follows:</p>
 
                                                         <table class="table table-condensed table-bordered">
-                                                            @foreach((array)$activity->cap_array as $criterion_id => $criterion)
-                                                                @if(in_array($outcome->id, json_decode($criterion->outcome_id))  /*== $outcome->id*/ && $criterion->score_percentage >= $activity->rubric[0]->expected_percentage )
+                                                            @foreach ((array) $activity->cap_array as $criterion_id => $criterion)
+                                                                @if (in_array($outcome->id, json_decode($criterion->outcome_id)) /*== $outcome->id*/ && $criterion->score_percentage >= $activity->rubric[0]->expected_percentage)
                                                                     <tr>
                                                                         <td>{{ $criterion->name }}</td>
-                                                                        <td class="col-md-1 success">{{ $criterion->score_percentage }}%</td>
+                                                                        <td class="col-md-1 success">
+                                                                            {{ $criterion->score_percentage }}%</td>
                                                                     </tr>
-                                                                @elseif(in_array($outcome->id, json_decode($criterion->outcome_id)) && $criterion->score_percentage < $activity->rubric[0]->expected_percentage )
+                                                                @elseif(in_array($outcome->id, json_decode($criterion->outcome_id)) && $criterion->score_percentage < $activity->rubric[0]->expected_percentage)
                                                                     <tr>
                                                                         <td>{{ $criterion->name }}</td>
-                                                                        <td class="col-md-1 danger">{{ $criterion->score_percentage }}%</td>
+                                                                        <td class="col-md-1 danger">
+                                                                            {{ $criterion->score_percentage }}%</td>
                                                                     </tr>
-                                                                @endif  
+                                                                @endif
                                                             @endforeach
                                                         </table>
 
@@ -120,54 +132,71 @@
                                                         </ul>
                                                         <p>
 
-                                                        <?php
+                                                            <?php
                                                             $o_att_array = $activity->o_att_array;
                                                             $o_ach_array = $activity->o_ach_array;
-                                                            $percentage = ($o_ach_array[$outcome->id]/$o_att_array[$outcome->id])*100;
-                                                        ?>
-                                                        @if($percentage >= 100)
-                                                            The expected goal was reached in <strong>all</strong> (100%) of the criteria assessed. Therefore, the goal for this outcome ({{ $outcome->expected_outcome }}%) was <strong>met</strong>.
-                                                        @elseif ($percentage < 1)
-                                                            The expected goal was reached in <strong>none</strong> (0%) of the criteria assessed. Therefore, the goal for this outcome ({{ $outcome->expected_outcome }}%) was <strong>not met</strong>.
-                                                        @elseif ($percentage >= $outcome->expected_outcome)
-                                                            The expected goal was reached in <strong>{{ $o_ach_array[$outcome->id] }}</strong> out of the <strong>{{ $o_att_array[$outcome->id] }}</strong> ({{ round($percentage, 2) }}%) criteria assessed. Therefore, the goal for this outcome ({{ $outcome->expected_outcome }}%) was <strong>met</strong>.
-                                                        @elseif ($percentage < $outcome->expected_outcome)
-                                                            The expected goal was reached in <strong>{{ $o_ach_array[$outcome->id] }}</strong> out of the <strong>{{ $o_att_array[$outcome->id] }}</strong> ({{ round($percentage, 2) }}%) criteria assessed. Therefore, the goal for this outcome ({{ $outcome->expected_outcome }}%) was <strong> not met</strong>.
-                                                        @endif
+                                                            $percentage = ($o_ach_array[$outcome->id] / $o_att_array[$outcome->id]) * 100;
+                                                            ?>
+                                                            @if ($percentage >= 100)
+                                                                The expected goal was reached in <strong>all</strong> (100%)
+                                                                of the criteria assessed. Therefore, the goal for this
+                                                                outcome ({{ $outcome->expected_outcome }}%) was
+                                                                <strong>met</strong>.
+                                                            @elseif ($percentage < 1)
+                                                                The expected goal was reached in <strong>none</strong> (0%)
+                                                                of the criteria assessed. Therefore, the goal for this
+                                                                outcome ({{ $outcome->expected_outcome }}%) was
+                                                                <strong>not met</strong>.
+                                                            @elseif ($percentage >= $outcome->expected_outcome)
+                                                                The expected goal was reached in
+                                                                <strong>{{ $o_ach_array[$outcome->id] }}</strong> out of
+                                                                the <strong>{{ $o_att_array[$outcome->id] }}</strong>
+                                                                ({{ round($percentage, 2) }}%) criteria assessed.
+                                                                Therefore, the goal for this outcome
+                                                                ({{ $outcome->expected_outcome }}%) was
+                                                                <strong>met</strong>.
+                                                            @elseif ($percentage < $outcome->expected_outcome)
+                                                                The expected goal was reached in
+                                                                <strong>{{ $o_ach_array[$outcome->id] }}</strong> out of
+                                                                the <strong>{{ $o_att_array[$outcome->id] }}</strong>
+                                                                ({{ round($percentage, 2) }}%) criteria assessed.
+                                                                Therefore, the goal for this outcome
+                                                                ({{ $outcome->expected_outcome }}%) was <strong> not
+                                                                    met</strong>.
+                                                            @endif
                                                         </p>
 
                                                         <h5><strong>Transformative Actions</strong></h5>
-                                                        @if($activity->transforming_actions)
+                                                        @if ($activity->transforming_actions)
                                                             {{ $activity->transforming_actions }}
                                                         @else
                                                             None
                                                         @endif
                                                         <br><br>
-
-                                                    @elseif($activity->draft ==0)
+                                                    @elseif($activity->draft == 0)
                                                         <h5>Measure {{ $index4 + 1 }}</h5>
                                                         <em>Outcome not measured.</em>
                                                     @else
-                                                    
                                                     @endif
                                                 @endforeach
                                             @endforeach
-                                            </td>
-                                        </tr>
-                                    @else
-                                        <tr>
-                                            <td>
-                                                <h4>{{ $course->code}}-{{ $course->number }}</h4>
-                                            </td>
-                                            <td>
-                                                <h4>No assessment.</h4>
-                                            </td>
-                                        </tr>
-                                    @endif
-                                @endforeach
+                                        </td>
+                                    </tr>
+                                @else
+                                    <tr>
+                                        <td>
+                                            <h4>{{ $course->code }}-{{ $course->number }}</h4>
+                                        </td>
+                                        <td>
+                                            <h4>No assessment.</h4>
+                                        </td>
+                                    </tr>
+                                @endif
+                            @endforeach
                         @else
                             <tr>
-                                <td id="{{ $outcome->id }}-{{ $program->school->id }}-{{ $program->id }}" class="program no-courses col-md-3" >{{ $program->name }}</td>
+                                <td id="{{ $outcome->id }}-{{ $program->school->id }}-{{ $program->id }}"
+                                    class="program no-courses col-md-3">{{ $program->name }}</td>
                                 <td class="col-md-9">
                                     This program does not assess {{ $outcome->name }}.
                                 </td>
@@ -176,7 +205,8 @@
                     </tbody>
                 </table>
             @else
-                <p class="lead">No professors have assessed courses for your program during the selected semesters.</p>
+                <p class="lead">No professors have assessed courses for your program during the selected
+                    semesters.</p>
             @endif
         </div>
     </div>

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

@@ -1,11 +1,11 @@
 @extends('layouts.master')
 
 @section('navigation')
-    @if(Auth::user()->role==1)
-        @include('local.managers.admins._navigation')
-    @elseif(Auth::user()->role==2)
+    @if (Auth::user()->role == 1)
+        @include('local.managers.admins._new_navigation')
+    @elseif(Auth::user()->role == 2)
         @include('local.managers.sCoords._new_navigation')
-    @elseif(Auth::user()->role==3)
+    @elseif(Auth::user()->role == 3)
         @include('local.managers.pCoords._new_navigation')
     @endif
 @stop
@@ -13,7 +13,8 @@
 @section('main')
     <div class="row">
         <div class="col-md-12">
-            <p>Click the links below to see reports for your program's assessed courses during the following semester(s):</p>
+            <p>Click the links below to see reports for your program's assessed courses during the following semester(s):
+            </p>
             <ul>
                 @foreach (Session::get('semesters_info') as $semester_info)
                     <li>{{ $semester_info }}</li>
@@ -25,20 +26,21 @@
                 <thead>
                     <tr>
                         <td></td>
-                        @foreach($programs as $program)
+                        @foreach ($programs as $program)
                             <td><span class="active"></span> {{ $program->name }}</td>
                         @endforeach
                     </tr>
                 </thead>
-                @foreach($outcomes as $outcome)
+                @foreach ($outcomes as $outcome)
                     <tr>
                         <td>
                             {{ $outcome->name }}
                         </td>
 
-                        @foreach($programs as $program)
+                        @foreach ($programs as $program)
                             <td>
-                                <a href="{{ URL::action('OutcomesController@programAssessmentReport', array($outcome->id, $program->id))}}">
+                                <a
+                                    href="{{ URL::action('OutcomesController@programAssessmentReport', [$outcome->id, $program->id]) }}">
                                     <span class="glyphicon glyphicon-eye-open icon-btn"></span> View
                                 </a>
                             </td>

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

@@ -2,7 +2,7 @@
 
 @section('navigation')
     @if (Auth::user()->role == 1)
-        @include('local.managers.admins._navigation')
+        @include('local.managers.admins._new_navigation')
     @elseif(Auth::user()->role == 2)
         @include('local.managers.sCoords._new_navigation')
     @elseif(Auth::user()->role == 3)
@@ -42,14 +42,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')
                         
@@ -130,13 +130,15 @@
                                     <br>
                                     <h4>Performance of Students by Learning Outcome Criteria</h4>
                                     <h5 style="display: inline; margin:30px;">Target by criterion: </h5>
-                                    <p style="display: inline; margin:-30px"> <i>{{ $activity->rubric[0]->expected_points }} or
+                                    <p style="display: inline; margin:-30px">
+                                        <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; margin:-30px"> <i>{{ $activity->rubric[0]->expected_percentage }} %</i>
+                                    <p style="display: inline; margin:-30px">
+                                        <i>{{ $activity->rubric[0]->expected_percentage }} %</i>
                                     </p>
 
                                     <br>
@@ -206,24 +208,23 @@
 
                                     </table>
                                     <br>
-<!--                                     <h5 style="display: inline; margin:30px;">Formative Actions: </h5> -->
+                                    <!--                                     <h5 style="display: inline; margin:30px;">Formative Actions: </h5> -->
                                     <h5>Formative Actions: </h5>
                                     <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
                                     @if ($formative_actions)
                                         <p style="display: inline; margin:30px;">
-										@if ($formative_actions[0]->at_text!=$formative_actions[0]->description)
-
-                                            <u>{{ $formative_actions[0]->at_text }}:
-                                            </u>
-                                    @endif
+                                            @if ($formative_actions[0]->at_text != $formative_actions[0]->description)
+                                                <u>{{ $formative_actions[0]->at_text }}:
+                                                </u>
+                                            @endif
 
                                             <i>{{ $formative_actions[0]->description }}
                                             </i>
                                         </p>
                                         <br>
-<!--                                         <h5 style="display: inline; margin:30px;"> -->
+                                        <!--                                         <h5 style="display: inline; margin:30px;"> -->
                                         <h5>
-                                        Formative Action's Associated
+                                            Formative Action's Associated
                                             Criteria: </h5>
                                         <ul>
                                             @foreach ($formative_actions as $criteria)
@@ -232,15 +233,15 @@
                                         </ul>
                                     @endif
 
-<!--                                     <h5 style="display: inline; margin:30px;"> -->
+                                    <!--                                     <h5 style="display: inline; margin:30px;"> -->
                                     <h5>
-                                    Assessment Comments: </h5>
+                                        Assessment Comments: </h5>
                                     @if ($activity->assessment_comments != null)
                                         <p style="display: inline; margin:30px;">{{ $activity->assessment_comments }}</p>
                                     @endif
-<!--                                     <br> -->
+                                    <!--                                     <br> -->
                                     <hr>
-<!--                                     <br> -->
+                                    <!--                                     <br> -->
 
                                     <h4>Performance of Students by Learning Outcome</h4>
                                     <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>

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

@@ -10,7 +10,8 @@
                     and Criterias<span class="caret"></span></a>
                 <ul class="dropdown-menu" role="menu">
                     <li>{{ HTML::linkAction('CriteriaController@index', 'Outcomes and Criteria') }}</li>
-                    <li>{{ HTML::linkAction('CriteriaController@objectivesIndex', 'Objectives and Criteria') }}</li>
+                    <li>{{ HTML::linkAction('objective2Controller@viewObjectives', 'Objectives and Criteria') }}
+                    </li>
                 </ul>
             </li>
             <li class="dropdown">
@@ -50,7 +51,6 @@
                     @if (count(Auth::user()->courses))
                         <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReport', 'My Courses\' Results') }}
                         </li>
-
                     @endif
                     <li>{{ HTML::linkAction('AnnualPlansController@selectProgramPlan', 'Annual Reports') }}</li>
                     <li>{{ HTML::linkAction('TransformativeActionsController@viewFormativeActions', 'Formative Actions') }}

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

@@ -11,7 +11,7 @@
                     aria-expanded="false">Objectives<span class="caret"></span></a>
                 <ul class="dropdown-menu dropdown-menu-left" role="menu">
                     <li>{{ HTML::linkAction('Objective2Controller@edit', 'Create/Edit Objectives') }}</li>
-                    <li>{{ HTML::linkAction('CriteriaController@objectivesIndex', 'View Objectives and Criteria') }}
+                    <li>{{ HTML::linkAction('objective2Controller@viewObjectives', 'View Objectives and Criteria') }}
                     </li>
                 </ul>
             </li>

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

@@ -2,7 +2,7 @@
 
 @section('navigation')
     @if (Auth::user()->role == 1)
-        @include('local.managers.admins._navigation')
+        @include('local.managers.admins._new_navigation')
     @elseif(Auth::user()->role == 2)
         @include('local.managers.sCoords._new_navigation')
     @elseif(Auth::user()->role == 3)
@@ -88,13 +88,13 @@
 
                                                     <!-- For each activity in the section -->
                                                     @foreach ($section->activities as $index4 => $activity)
-
                                                         <!-- If activity has a rubric and the rubric has the outcome being evaluated -->
                                                         @if (array_key_exists($outcome->id, (array) $activity->o_att_array) && $activity->o_att_array[$outcome->id] >= 1)
                                                             <h5>Measure {{ $index4 + 1 }}</h5>
                                                             <p>A rubric was used in the
                                                                 {{ $section->code }}-{{ $section->number }}
-                                                                ({{ $section->name }}) course
+                                                                ({{ $section->name }})
+                                                                course
                                                                 ({{ date('M Y', strtotime($course->updated_at)) }}) to
                                                                 assess students’ <u>{{ strtolower($outcome->name) }}</u>
                                                                 in the activity:
@@ -104,7 +104,8 @@
                                                                 <strong>{{ $activity->rubric->expected_percentage }}%</strong>
                                                                 of students participating in the activity would score
                                                                 <strong>{{ $activity->rubric->expected_points }}
-                                                                    points</strong> or more in the 1-8 point scale used.</p>
+                                                                    points</strong> or more in the 1-8 point scale used.
+                                                            </p>
                                                             <p>The results for each criterion were as follows:</p>
 
                                                             <table class="table table-condensed table-bordered">
@@ -177,7 +178,6 @@
                                                                 None
                                                             @endif
                                                             <br><br>
-
                                                         @else
                                                             <h5>Measure {{ $index4 + 1 }}</h5>
                                                             <em>Outcome not measured.</em>

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

@@ -1,11 +1,11 @@
 @extends('layouts.master')
 
 @section('navigation')
-    @if(Auth::user()->role==1)
-        @include('local.managers.admins._navigation')
-    @elseif(Auth::user()->role==2)
+    @if (Auth::user()->role == 1)
+        @include('local.managers.admins._new_navigation')
+    @elseif(Auth::user()->role == 2)
         @include('local.managers.sCoords._new_navigation')
-    @elseif(Auth::user()->role==3)
+    @elseif(Auth::user()->role == 3)
         @include('local.managers.pCoords._new_navigation')
     @endif
 @stop
@@ -22,13 +22,13 @@
             <p>Due to the large amount of information in these reports, please allow them to load a few seconds.</p>
 
             <ol id="table-of-contents" class="upper-roman">
-            @foreach($outcomes as $outcome)
-                <li>
-                    <a href="{{ URL::action('OutcomesController@schoolAssessmentReport', array($outcome->id))}}">
-                        {{ $outcome->name }}
-                    </a>
-                </li>
-            @endforeach
+                @foreach ($outcomes as $outcome)
+                    <li>
+                        <a href="{{ URL::action('OutcomesController@schoolAssessmentReport', [$outcome->id]) }}">
+                            {{ $outcome->name }}
+                        </a>
+                    </li>
+                @endforeach
             </ol>
         </div>
     </div>

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

@@ -2,7 +2,7 @@
 
 @section('navigation')
     @if (Auth::user()->role == 1)
-        @include('local.managers.admins._navigation')
+        @include('local.managers.admins._new_navigation')
     @elseif(Auth::user()->role == 2)
         @include('local.managers.sCoords._new_navigation')
     @elseif(Auth::user()->role == 3)
@@ -64,14 +64,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')
                                     

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

@@ -2,7 +2,7 @@
 
 @section('navigation')
     @if (Auth::user()->role == 1)
-        @include('local.managers.admins._navigation')
+        @include('local.managers.admins._new_navigation')
     @elseif(Auth::user()->role == 2)
         @include('local.managers.sCoords._new_navigation')
     @elseif(Auth::user()->role == 3)

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

@@ -2,7 +2,7 @@
 
 @section('navigation')
     @if (Auth::user()->role == 1)
-        @include('local.managers.admins._navigation')
+        @include('local.managers.admins._new_navigation')
     @elseif(Auth::user()->role == 2)
         @include('local.managers.sCoords._new_navigation')
     @elseif(Auth::user()->role == 3)
@@ -68,14 +68,14 @@
 
 
                     <!-- <div class="table-responsive">
-                                                                                                                                                                                                                                                                                                                    <table class="table table-striped table-condensed datatable" style="table-layout: fixed ; width : 100%">
-                                                                                                                                                                                                                                                                                                                      <thead><tr><th>Objectives for courses</th><th>Criteria per Course</th><th>Transformative Actions</th></tr></thead>
-                                                                                                                                                                                                                                                                                                                      <tbody>
-                                                                                                                                                                                                                                                                                                                      </tbody>
-
-                                                                                                                                                                                                                                                                                                                    </table>
-                                                                                                                                                                                                                                                                                                                    
-                                                                                                                                                                                                                                                                                                                </div>-->
+                                                                                                                                                                                                                                                                                                                        <table class="table table-striped table-condensed datatable" style="table-layout: fixed ; width : 100%">
+                                                                                                                                                                                                                                                                                                                          <thead><tr><th>Objectives for courses</th><th>Criteria per Course</th><th>Transformative Actions</th></tr></thead>
+                                                                                                                                                                                                                                                                                                                          <tbody>
+                                                                                                                                                                                                                                                                                                                          </tbody>
+
+                                                                                                                                                                                                                                                                                                                        </table>
+                                                                                                                                                                                                                                                                                                                        
+                                                                                                                                                                                                                                                                                                                    </div>-->
 
                 </div>
             </div>

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

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

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

@@ -1,13 +1,14 @@
 @extends('layouts.master')
 
 @section('navigation')
-        @include('local.managers.admins._navigation')
+    @include('local.managers.admins._new_navigation')
 @stop
 
 @section('main')
     <div class="row">
         <div class="col-md-12">
-            <p>This report contains performance information for all Schools and Programs with assessed courses during the following semester(s):</p>
+            <p>This report contains performance information for all Schools and Programs with assessed courses during the
+                following semester(s):</p>
             <ul>
                 @foreach (Session::get('semesters_info') as $semester_info)
                     <li>{{ $semester_info }}</li>
@@ -16,139 +17,178 @@
 
             <p>Unlinked programs did not assess this outcome.</p>
 
-            
+
             <h3>Table of Contents</h3>
             <ol id="table-of-contents" class="upper-roman">
-                
+
             </ol>
 
             <h3 id="{{ $outcome->id }}" class="outcome">{{ $outcome->name }}</h3>
             @foreach ($schools as $school)
-            <table class="table table-condensed table-bordered">
-                <thead>
-                    <tr>
-                        <th colspan="12">
-                            <h4 id="{{ $outcome->id }}-{{ $school->id }}" class="school table-header" >{{ $school->name }}
-                                </h4>
-                            <a class="to-top" href="">
-                                <span class="glyphicon glyphicon-arrow-up hidden-print"></span>
-                                To Top
-                            </a>
-
-                        </th>
-                    </tr>
-                    <tr class="center-text">
-                        <th>Academic Program</th>
-                        <th>Findings</th>
-                    </tr
-                </thead>
-                <tbody>
-                @foreach ($school->programs as $program)
-                    @if($program->assessesOutcome($outcome->id))
+                <table class="table table-condensed table-bordered">
+                    <thead>
                         <tr>
-                            <td id="{{ $outcome->id }}-{{ $school->id }}-{{ $program->id }}" class="program col-md-3" >{{ $program->name }}</td>
-                            <td class="col-md-9">
-
-                            <!-- For each grouped course -->
-                            @foreach($program->courses as $index2=>$course)
-                                <!-- If grouped course has activities that evaluate the outcome -->
-
-                                <?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)
-                                    ->get();
-                                ?>
-
-                                @if(count($sections_evaluating))
-                                    <h4>Instance {{ $index2 +1 }}: {{ $course->code}}-{{ $course->number }}</h4>
-
-                                    <!-- For each section -->
-                                    @foreach($sections_evaluating as $index3 => $section)
-                                        <h5><u>Section {{ $index3 + 1}}</u></h5>
-
-                                        <!-- For each activity in the section -->
-                                        @foreach($section->activities as $index4 => $activity)
-
-                                            <!-- If activity has a rubric and the rubric has the outcome being evaluated -->
-                                            @if($activity->rubric_id != NULL && array_key_exists($outcome->id, (array)$activity->o_att_array) && $activity->o_att_array[$outcome->id] >=1)
-                                                <h5>Activity {{ $index4 + 1 }}</h5>
-                                                <p>A rubric was used in the {{ $section->code }}-{{ $section->number }} ({{ $section->name }}) course ({{ date('M Y', strtotime($course->updated_at))}}) to assess students’ <u>{{ strtolower($outcome->name) }}</u> in the activity: "{{ $activity->name }}". N= {{ count($section->students) }}. </p>  
-                                                <p>The expected performance level was that {{ $activity->rubric->expected_percentage }}% of students participating in the activity would score {{ $activity->rubric->expected_points }} points or more in the 1-8 point scale used.</p>
-                                                <p>The results for each criterion were as follows:</p>
-                                                
-                                                <table class="table table-condensed table-bordered">
-                                                    <tbody>
-                                                        @foreach((array)$activity->cap_array as $index5 => $cap)
-                                                            <tr>
-                                                            @if(Criterion::find($index5)['outcome_id'] == $outcome->id && $cap >= $activity->rubric->expected_percentage )
-                                                                <td>{{ Criterion::find($index5)['name'] }}</td>
-                                                                <td class="col-md-1 success">{{ $cap }}%</td>
-                                                            @elseif(Criterion::find($index5)['outcome_id'] == $outcome->id && $cap < $activity->rubric->expected_percentage )
-                                                                <td>{{ Criterion::find($index5)['name'] }}</td>
-                                                                <td class="col-md-1 danger">{{ $cap }}%</td>
+                            <th colspan="12">
+                                <h4 id="{{ $outcome->id }}-{{ $school->id }}" class="school table-header">
+                                    {{ $school->name }}
+                                </h4>
+                                <a class="to-top" href="">
+                                    <span class="glyphicon glyphicon-arrow-up hidden-print"></span>
+                                    To Top
+                                </a>
+
+                            </th>
+                        </tr>
+                        <tr class="center-text">
+                            <th>Academic Program</th>
+                            <th>Findings</th>
+                        </tr </thead>
+                    <tbody>
+                        @foreach ($school->programs as $program)
+                            @if ($program->assessesOutcome($outcome->id))
+                                <tr>
+                                    <td id="{{ $outcome->id }}-{{ $school->id }}-{{ $program->id }}"
+                                        class="program col-md-3">{{ $program->name }}</td>
+                                    <td class="col-md-9">
+
+                                        <!-- For each grouped course -->
+                                        @foreach ($program->courses as $index2 => $course)
+                                            <!-- If grouped course has activities that evaluate the outcome -->
+
+                                            <?php
+                                            
+                                            $sections_evaluating = Course::has('activities')
+                                                ->whereNotNull('outcomes_attempted')
+                                                ->whereRaw('outcomes_attempted not like \'%"' . $outcome->id . '":0%\'')
+                                                ->with([
+                                                    '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)
+                                                ->get();
+                                            ?>
+
+                                            @if (count($sections_evaluating))
+                                                <h4>Instance {{ $index2 + 1 }}:
+                                                    {{ $course->code }}-{{ $course->number }}</h4>
+
+                                                <!-- For each section -->
+                                                @foreach ($sections_evaluating as $index3 => $section)
+                                                    <h5><u>Section {{ $index3 + 1 }}</u></h5>
+
+                                                    <!-- For each activity in the section -->
+                                                    @foreach ($section->activities as $index4 => $activity)
+                                                        <!-- If activity has a rubric and the rubric has the outcome being evaluated -->
+                                                        @if ($activity->rubric_id != null && array_key_exists($outcome->id, (array) $activity->o_att_array) && $activity->o_att_array[$outcome->id] >= 1)
+                                                            <h5>Activity {{ $index4 + 1 }}</h5>
+                                                            <p>A rubric was used in the
+                                                                {{ $section->code }}-{{ $section->number }}
+                                                                ({{ $section->name }}) course
+                                                                ({{ date('M Y', strtotime($course->updated_at)) }}) to
+                                                                assess students’ <u>{{ strtolower($outcome->name) }}</u>
+                                                                in the activity: "{{ $activity->name }}". N=
+                                                                {{ count($section->students) }}. </p>
+                                                            <p>The expected performance level was that
+                                                                {{ $activity->rubric->expected_percentage }}% of students
+                                                                participating in the activity would score
+                                                                {{ $activity->rubric->expected_points }} points or more
+                                                                in the 1-8 point scale used.</p>
+                                                            <p>The results for each criterion were as follows:</p>
+
+                                                            <table class="table table-condensed table-bordered">
+                                                                <tbody>
+                                                                    @foreach ((array) $activity->cap_array as $index5 => $cap)
+                                                                        <tr>
+                                                                            @if (Criterion::find($index5)['outcome_id'] == $outcome->id && $cap >= $activity->rubric->expected_percentage)
+                                                                                <td>{{ Criterion::find($index5)['name'] }}
+                                                                                </td>
+                                                                                <td class="col-md-1 success">
+                                                                                    {{ $cap }}%</td>
+                                                                            @elseif(Criterion::find($index5)['outcome_id'] == $outcome->id && $cap < $activity->rubric->expected_percentage)
+                                                                                <td>{{ Criterion::find($index5)['name'] }}
+                                                                                </td>
+                                                                                <td class="col-md-1 danger">
+                                                                                    {{ $cap }}%</td>
+                                                                            @endif
+                                                                        </tr>
+                                                                    @endforeach
+                                                                </tbody>
+                                                            </table>
+
+                                                            <ul>
+
+                                                            </ul>
+                                                            <p>
+
+                                                                <?php
+                                                                $o_att_array = $activity->o_att_array;
+                                                                $o_ach_array = $activity->o_ach_array;
+                                                                $percentage = ($o_ach_array[$outcome->id] / $o_att_array[$outcome->id]) * 100;
+                                                                ?>
+                                                                @if ($percentage >= 100)
+                                                                    The expected goal was reached in <strong>all</strong>
+                                                                    (100%) of the criteria assessed. Therefore, the goal for
+                                                                    this outcome ({{ $outcome->expected_outcome }}%) was
+                                                                    <strong>met</strong>.
+                                                                @elseif ($percentage < 1)
+                                                                    The expected goal was reached in <strong>none</strong>
+                                                                    (0%) of the criteria assessed. Therefore, the goal for
+                                                                    this outcome ({{ $outcome->expected_outcome }}%) was
+                                                                    <strong>not met</strong>.
+                                                                @elseif ($percentage >= $outcome->expected_outcome)
+                                                                    The expected goal was reached in
+                                                                    <strong>{{ $o_ach_array[$outcome->id] }}</strong> out
+                                                                    of the
+                                                                    <strong>{{ $o_att_array[$outcome->id] }}</strong>
+                                                                    ({{ round($percentage, 2) }}%) criteria assessed.
+                                                                    Therefore, the goal for this outcome
+                                                                    ({{ $outcome->expected_outcome }}%) was
+                                                                    <strong>met</strong>.
+                                                                @elseif ($percentage < $outcome->expected_outcome)
+                                                                    The expected goal was reached in
+                                                                    <strong>{{ $o_ach_array[$outcome->id] }}</strong> out
+                                                                    of the
+                                                                    <strong>{{ $o_att_array[$outcome->id] }}</strong>
+                                                                    ({{ round($percentage, 2) }}%) criteria assessed.
+                                                                    Therefore, the goal for this outcome
+                                                                    ({{ $outcome->expected_outcome }}%) was <strong> not
+                                                                        met</strong>.
+                                                                @endif
+                                                            </p>
+
+                                                            <h5>Transformative Actions</h5>
+                                                            @if ($activity->transforming_actions)
+                                                                {{ $activity->transforming_actions }}
+                                                            @else
+                                                                None
                                                             @endif
-                                                            </tr>
-                                                        @endforeach
-                                                    </tbody>
-                                                </table>
-
-                                                <ul>
-                                                        
-                                                </ul>
-                                                <p>
-
-                                                <?php 
-                                                    $o_att_array = $activity->o_att_array;
-                                                    $o_ach_array = $activity->o_ach_array;
-                                                    $percentage = ($o_ach_array[$outcome->id]/$o_att_array[$outcome->id])*100;
-                                                ?>
-                                                @if($percentage >= 100)
-                                                    The expected goal was reached in <strong>all</strong> (100%) of the criteria assessed. Therefore, the goal for this outcome ({{ $outcome->expected_outcome }}%) was <strong>met</strong>.
-                                                @elseif ($percentage < 1)
-                                                    The expected goal was reached in <strong>none</strong> (0%) of the criteria assessed. Therefore, the goal for this outcome ({{ $outcome->expected_outcome }}%) was <strong>not met</strong>.
-                                                @elseif ($percentage >= $outcome->expected_outcome)
-                                                    The expected goal was reached in <strong>{{ $o_ach_array[$outcome->id] }}</strong> out of the <strong>{{ $o_att_array[$outcome->id] }}</strong> ({{ round($percentage, 2) }}%) criteria assessed. Therefore, the goal for this outcome ({{ $outcome->expected_outcome }}%) was <strong>met</strong>.
-                                                @elseif ($percentage < $outcome->expected_outcome)
-                                                    The expected goal was reached in <strong>{{ $o_ach_array[$outcome->id] }}</strong> out of the <strong>{{ $o_att_array[$outcome->id] }}</strong> ({{ round($percentage, 2) }}%) criteria assessed. Therefore, the goal for this outcome ({{ $outcome->expected_outcome }}%) was <strong> not met</strong>.
-                                                @endif
-                                                </p>
-
-                                                <h5>Transformative Actions</h5>
-                                                @if($activity->transforming_actions)
-                                                    {{ $activity->transforming_actions }}
-                                                @else
-                                                    None
-                                                @endif
-                                                <br><br>
-
-                                            @else
-                                                <h5>Activity {{ $index4 + 1 }}</h5>
-                                                <em>Outcome not measured.</em>
+                                                            <br><br>
+                                                        @else
+                                                            <h5>Activity {{ $index4 + 1 }}</h5>
+                                                            <em>Outcome not measured.</em>
+                                                        @endif
+                                                    @endforeach
+                                                @endforeach
+                                                <hr>
                                             @endif
                                         @endforeach
-                                    @endforeach
-                                <hr>    
-                                @endif                            
-                            @endforeach
-                            </td>
-                        </tr>
-                    @else
-                        <tr>
-                            <td id="{{ $outcome->id }}-{{ $school->id }}-{{ $program->id }}" class="program no-courses col-md-3" >{{ $program->name }}</td>
-                            <td class="col-md-9">
-                                This program does not assess {{ $outcome->name }}.
-                            </td>
-                        </tr>
-                    @endif
-                @endforeach
-                </tbody>
-            </table>
+                                    </td>
+                                </tr>
+                            @else
+                                <tr>
+                                    <td id="{{ $outcome->id }}-{{ $school->id }}-{{ $program->id }}"
+                                        class="program no-courses col-md-3">{{ $program->name }}</td>
+                                    <td class="col-md-9">
+                                        This program does not assess {{ $outcome->name }}.
+                                    </td>
+                                </tr>
+                            @endif
+                        @endforeach
+                    </tbody>
+                </table>
             @endforeach
         </div>
     </div>
@@ -156,43 +196,47 @@
 
 @section('javascript')
 
-// Build table of contents
-var outcome = $('.outcome');
-var str ='';
-str+='<li><a href="#'+outcome.attr('id')+'">'+outcome.text()+'</a><ol class="schools upper-alpha">';
+    // Build table of contents
+    var outcome = $('.outcome');
+    var str ='';
+    str+='<li><a href="#'+outcome.attr('id')+'">'+outcome.text()+'</a>
+        <ol class="schools upper-alpha">';
+
+            $('[id^='+outcome.attr('id')+'-].school').each(function(e){
+            var school = $(this);
+            str+='<li><a href="#'+school.attr('id')+'">'+school.text()+'</a>
+                <ol class="programs">';
+
+                    $('[id^='+school.attr('id')+'-].program').each(function(e){
 
-$('[id^='+outcome.attr('id')+'-].school').each(function(e){
-    var school = $(this);
-    str+='<li><a href="#'+school.attr('id')+'">'+school.text()+'</a><ol class="programs">';
-    
-    $('[id^='+school.attr('id')+'-].program').each(function(e){
+                    var program = $(this);
+                    if(!program.hasClass('no-courses'))
+                    str+='<li><a href="#'+program.attr('id')+'">'+program.text()+'</a></li>';
+                    else
+                    str+='<li>'+program.text()+'</li>';
 
-        var program = $(this);
-        if(!program.hasClass('no-courses'))
-            str+='<li><a href="#'+program.attr('id')+'">'+program.text()+'</a></li>';
-        else
-            str+='<li>'+program.text()+'</li>';
+                    });
 
-    });
-    
-    str+='</ol></li>';
-});
+                    str+='</ol>
+            </li>';
+            });
 
-str+='</ol></li>';
-console.log(str);
-$('#table-of-contents').append(str);
+            str+='</ol>
+    </li>';
+    console.log(str);
+    $('#table-of-contents').append(str);
 
 
-// ----------------------------------------------------------------------------
-// Events
-//
+    // ----------------------------------------------------------------------------
+    // Events
+    //
 
-$('.to-top').on('click', function(e) {
+    $('.to-top').on('click', function(e) {
     e.preventDefault();
 
-     $(this).scrollTop(0);
+    $(this).scrollTop(0);
     $('html').animate({scrollTop:0}, 1);
     $('body').animate({scrollTop:0}, 1);
-})
+    })
 
 @stop

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

@@ -1,77 +1,84 @@
 @extends('layouts.master')
 
 @section('navigation')
-    @if(Auth::user()->role==1)
-        @include('local.managers.admins._navigation')
-    @elseif(Auth::user()->role==2)
+    @if (Auth::user()->role == 1)
+        @include('local.managers.admins._new_navigation')
+    @elseif(Auth::user()->role == 2)
         @include('local.managers.sCoords._new_navigation')
-    @elseif(Auth::user()->role==3)
+    @elseif(Auth::user()->role == 3)
         @include('local.managers.pCoords._new_navigation')
     @endif
 @stop
 
 @section('main')
-<div class="row">
-	<div class="col-md-12">
-		<div id="quinquennium" data-quinquennium-id="{{ $current_quinquennium->id }}"></div>
-		<div id="program" data-program-id="{{ $program->id }}"></div>
-		<div class="plan">
-			<table class="table table-bordered">
-				<thead>
-					<tr class="bg-danger text-center">
-						<th class="text-center col-md-3">Learning Outcome to be assessed</th>
-						<th class="text-center col-md-4">Learning Objectives</th>
-						<th class="text-center col-md-4">Courses to use for assessment</th>
-						<th></th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td class="outcome-cell">
-							<select name="outcome" class="outcome form-control">
-								@foreach($outcomes as $outcome)
-									<option value="{{ $outcome->id }}">{{ $outcome->name }}</option>
-								@endforeach
-							</select>
-						</td>
-						<td class="objectives-cell">
-							<div class="objective-select-wrapper">
-								<select name="objectives[]" class="objective shortened-select form-control">
-								</select>
-								<span class="glyphicon glyphicon-remove text-danger icon-btn remove-objective"></span>
-								<br><br>
-							</div>
-							<button class="add-objective btn btn-success pull-right btn-xs"><span class="glyphicon glyphicon-plus"></span></button>
-						</td>
-						<td>
-							<div class="course-select-wrapper">
-								<select name="courses[]" class="course shortened-select form-control">
-									@foreach($courses as $course)
-										<option value="{{ $course->id }}" data-course-code="{{ $course->code }}" data-course-number="{{ $course->number }}" data-course-name="{{ $course->name }}">{{ $course->code }}{{ $course->number }}: {{ $course->name }}</option>
-									@endforeach
-								</select>
-								<span class="glyphicon glyphicon-remove text-danger icon-btn remove-course"></span>
-								<br><br>
-							</div>
-							<button class="add-course btn btn-success pull-right btn-xs"><span class="glyphicon glyphicon-plus"></span></button>
-						</td>
-						<td></td>
-					</tr>
-				</tbody>
-			</table>
-			<div>
-				<button class="add-outcome btn btn-success pull-right btn-sm"><span class="glyphicon glyphicon-plus"></span>Add Learning Outcome</button>
-				<br><br><br>
-			</div>
-		</div>
-		<div class="text-center">
-            <button id="button-create-rubric" class="btn btn-lg btn-primary save">
-                <span class="glyphicon glyphicon-floppy-disk"></span>
-                Save
-            </button>
+    <div class="row">
+        <div class="col-md-12">
+            <div id="quinquennium" data-quinquennium-id="{{ $current_quinquennium->id }}"></div>
+            <div id="program" data-program-id="{{ $program->id }}"></div>
+            <div class="plan">
+                <table class="table table-bordered">
+                    <thead>
+                        <tr class="bg-danger text-center">
+                            <th class="text-center col-md-3">Learning Outcome to be assessed</th>
+                            <th class="text-center col-md-4">Learning Objectives</th>
+                            <th class="text-center col-md-4">Courses to use for assessment</th>
+                            <th></th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr>
+                            <td class="outcome-cell">
+                                <select name="outcome" class="outcome form-control">
+                                    @foreach ($outcomes as $outcome)
+                                        <option value="{{ $outcome->id }}">{{ $outcome->name }}</option>
+                                    @endforeach
+                                </select>
+                            </td>
+                            <td class="objectives-cell">
+                                <div class="objective-select-wrapper">
+                                    <select name="objectives[]" class="objective shortened-select form-control">
+                                    </select>
+                                    <span class="glyphicon glyphicon-remove text-danger icon-btn remove-objective"></span>
+                                    <br><br>
+                                </div>
+                                <button class="add-objective btn btn-success pull-right btn-xs"><span
+                                        class="glyphicon glyphicon-plus"></span></button>
+                            </td>
+                            <td>
+                                <div class="course-select-wrapper">
+                                    <select name="courses[]" class="course shortened-select form-control">
+                                        @foreach ($courses as $course)
+                                            <option value="{{ $course->id }}" data-course-code="{{ $course->code }}"
+                                                data-course-number="{{ $course->number }}"
+                                                data-course-name="{{ $course->name }}">
+                                                {{ $course->code }}{{ $course->number }}: {{ $course->name }}
+                                            </option>
+                                        @endforeach
+                                    </select>
+                                    <span class="glyphicon glyphicon-remove text-danger icon-btn remove-course"></span>
+                                    <br><br>
+                                </div>
+                                <button class="add-course btn btn-success pull-right btn-xs"><span
+                                        class="glyphicon glyphicon-plus"></span></button>
+                            </td>
+                            <td></td>
+                        </tr>
+                    </tbody>
+                </table>
+                <div>
+                    <button class="add-outcome btn btn-success pull-right btn-sm"><span
+                            class="glyphicon glyphicon-plus"></span>Add Learning Outcome</button>
+                    <br><br><br>
+                </div>
+            </div>
+            <div class="text-center">
+                <button id="button-create-rubric" class="btn btn-lg btn-primary save">
+                    <span class="glyphicon glyphicon-floppy-disk"></span>
+                    Save
+                </button>
+            </div>
         </div>
-	</div>
-</div>
+    </div>
 
 @stop
 
@@ -81,291 +88,291 @@
 
 @section('javascript')
 
-// --------------------------------------------------------------------------
-// Page Load
-// --------------------------------------------------------------------------
-
-// Hide all 'x' buttons for courses and objectives
-$('.remove-course, .remove-objective').hide();
-
-$('.outcome').each(function()
-{
-	fetchObjectives($(this));
-});
-
-// --------------------------------------------------------------------------
-// Events
-// --------------------------------------------------------------------------
-
-// On clicking a button to add outcome
-$('.add-outcome').on('click', function(e)
-{
-	var table = $(this).closest('.plan').find('table');
-	addOutcome(table);
-});
-
-// On clicking a button to remove a course
-$('table').on('click', '.remove-objective', function(e)
-{
-	removeObjective($(this));
-});
-
-// On clicking a button to remove a course
-$('table').on('click', '.remove-course', function(e)
-{
-	removeCourse($(this));
-});
-
-// On clicking the x to remove an outcome from the plan
-$('table').on('click', '.remove-outcome', function(e)
-{
-	var table = $(this).closest('.plan').find('table');
-	var row = $(this).closest('tr');
-	removeOutcome(table, row);
-});
-
-// On clicking a button to add a objective
-$('.add-objective').on('click', function(e)
-{
-	var table = $(this).closest('.plan').find('table');
-	var objective_select_wrapper = $(this).parent().find('.objective-select-wrapper:last');
-	var select = $(this).parent().find('select:last');
-	var selected_objective_id = select.find(':selected').val();
-	var clone = objective_select_wrapper.clone();
-	clone.insertAfter(objective_select_wrapper);
-	objective_select_wrapper.parent().find('.remove-objective').show();
-});
-
-// On clicking a button to add a course
-$('.add-course').on('click', function(e)
-{
-	var table = $(this).closest('.plan').find('table');
-	var course_select_wrapper = $(this).parent().find('.course-select-wrapper:last');
-	var select = $(this).parent().find('select:last');
-	var selected_course_id = select.find(':selected').val();
-	var clone = course_select_wrapper.clone();
-	clone.insertAfter(course_select_wrapper);
-	course_select_wrapper.parent().find('.remove-course').show();
-});
-
-// When user selects another outcome
-$('.outcome').on('change', function(e)
-{
-	fetchObjectives($(this));
-});
-
-// Gather, structure and send data to server for saving
-$('.save').on('click', function(e)
-{
-	var five_year_plan = new Object();
-	five_year_plan.quinquennium_id = $('#quinquennium').data('quinquennium-id');
-	five_year_plan.program_id = $('#program').data('program-id');
-	five_year_plan.mini_plans = new Array();
-
-	$('.plan').each(function(index){
-
-		var mini_plan = new Object();
-
-		mini_plan.year_start = $(this).find('.year-start').text();
-		mini_plan.year_end = $(this).find('.year-end').text();
-
-		// Array for outcome objects
-		mini_plan.outcomes = new Array();
-
-		$(this).find('.outcome').each(function(index){
-
-			// Outcome object
-			var outcome = new Object();
-
-			outcome.id = $(this).find(':selected').val();
-			outcome.objectives = new Array();
-			outcome.courses = new Array();
-
-			// Gather objective information
-			$(this).closest('tr').find('.objective').each(function()
-			{
-				var objective = new Object();
-
-				objective.original_id = $(this).find(':selected').val();
-				objective.text = $(this).find(':selected').text();
-
-				outcome.objectives.push(jQuery.extend({}, objective));
-
-				objective = null;
-			});
-
-			// Gather course information
-			$(this).closest('tr').find('.course').each(function()
-			{
-				var course = new Object();
-
-				course.code = $(this).find(':selected').data('course-code');
-				course.number = $(this).find(':selected').data('course-number');
-				course.name = $(this).find(':selected').data('course-name');
-
-				outcome.courses.push(jQuery.extend({}, course));
-				course = null;
-			});
-
-			mini_plan.outcomes.push(jQuery.extend({}, outcome));
-			outcome = null;
-
-		});
-
-		five_year_plan.mini_plans.push(jQuery.extend({}, mini_plan));
-		mini_plan = null;
-	});
-
-	//console.log(five_year_plan);
-
-	$.post(
-		"{{ URL::action('FiveYearPlansController@store', array($program->id)) }}",
-		{
-			five_year_plan: JSON.stringify(five_year_plan)
-		},
-		function(data)
-		{
-			//console.log(data);
-			var response = data;
-
-			//console.log('status: '+response.status);
-			if(response.status == 'success')
-			{
-				//console.log('success');
-				window.location = response.redirect_url;
-			}
-			else
-			{
-				jsError(response.message);
-			}
-		},
-		"json"
-	)
-	.fail( function(xhr, status, error) {
-
-		//console.log('fail:'+error);
-		// Always scroll to the top
-        $(this).scrollTop(0);
-        $('html').animate({scrollTop:0}, 1);
-        $('body').animate({scrollTop:0}, 1);
-
-		jsError(error);
-
-		// Show js error with default message
-		$('#js-error-row').fadeIn('slow', function () {
-			$(this).delay(3000).fadeOut('slow');
-		});
-	}
-	);
-});
-
-// --------------------------------------------------------------------------
-// Functions
-// --------------------------------------------------------------------------
-
-// Removes a objective
-function removeObjective(button)
-{
-	var objective_select_wrapper = button.parent();
-
-	// If only one objective will remain, hide 'x' button
-	if(objective_select_wrapper.siblings('.objective-select-wrapper').length == 1)
-	{
-		objective_select_wrapper.siblings('.objective-select-wrapper').find('.remove-objective').hide();
-	}
-
-	// Remove objective
-	objective_select_wrapper.remove();
-}
-
-// Removes a course
-function removeCourse(button)
-{
-	var course_select_wrapper = button.parent();
-
-	// If only one course will remain, hide 'x' button
-	if(course_select_wrapper.siblings('.course-select-wrapper').length == 1)
-	{
-		course_select_wrapper.siblings('.course-select-wrapper').find('.remove-course').hide();
-	}
-
-	// Remove course
-	course_select_wrapper.remove();
-}
-
-
-// Checks whether a plan has outcomes
-function hasOutcomes(table)
-{
-	if(table.find('.outcome-cell').length > 0)
-		return true;
-	else
-		return false;
-}
-
-// Add an outcome to an annual plan
-function addOutcome(table)
-{
-	var header_rowspan = Number(table.find('.academic-year').attr('rowspan'));
-
-	var clone = table.find('tbody tr:first').clone(true, true);
-
-	// Remove all objectives and course except the first ones
-	clone.find('.objective-select-wrapper').not(':first').remove();
-	clone.find('.course-select-wrapper').not(':first').remove();
-
-	// Add removal button
-	clone.children(':last').append('<span class="glyphicon glyphicon-remove text-danger icon-btn remove-outcome"></span>');
-
-	if(hasOutcomes(table))
-	{
-		table.find('tbody').append(clone);
-
-		table.find('.academic-year').attr('rowspan', header_rowspan+1);
-	}
-}
-
-// Remove an Outcome
-function removeOutcome(table, row)
-{
-	var header_rowspan = Number(table.find('.academic-year').attr('rowspan'));
-
-	row.remove();
-	table.find('.academic-year').attr('rowspan', header_rowspan-1);
-}
-
-// Fetch objectives associated to an outcome and program
-function fetchObjectives(outcome)
-{
-	var outcome_id = outcome.find(':selected').val();
-	var program_id = $('#program').data('program-id');
-
-	$.post(
-		"{{ URL::action('ObjectivesController@fetch') }}",
-		{
-			outcome_id: outcome_id,
-			program_id: program_id,
-			format: 'select'
-		},
-		function(data)
-		{
-			var select = outcome.closest('tr').find('.objective');
-			if(data == '')
-			{
-				select.prop('disabled', true);
-				select.empty().append('<option value="0"><span class="glyphicon glyphicon-remove"></span> None</option>');
-			}
-			else
-			{
-				select.prop('disabled', false);
-				select.empty().append(data);
-			}
-
-			if(select.length > 1) {
-				select.first().parent().siblings('.objective-select-wrapper').remove();
-			}
-		}
-	);
-}
+    // --------------------------------------------------------------------------
+    // Page Load
+    // --------------------------------------------------------------------------
+
+    // Hide all 'x' buttons for courses and objectives
+    $('.remove-course, .remove-objective').hide();
+
+    $('.outcome').each(function()
+    {
+    fetchObjectives($(this));
+    });
+
+    // --------------------------------------------------------------------------
+    // Events
+    // --------------------------------------------------------------------------
+
+    // On clicking a button to add outcome
+    $('.add-outcome').on('click', function(e)
+    {
+    var table = $(this).closest('.plan').find('table');
+    addOutcome(table);
+    });
+
+    // On clicking a button to remove a course
+    $('table').on('click', '.remove-objective', function(e)
+    {
+    removeObjective($(this));
+    });
+
+    // On clicking a button to remove a course
+    $('table').on('click', '.remove-course', function(e)
+    {
+    removeCourse($(this));
+    });
+
+    // On clicking the x to remove an outcome from the plan
+    $('table').on('click', '.remove-outcome', function(e)
+    {
+    var table = $(this).closest('.plan').find('table');
+    var row = $(this).closest('tr');
+    removeOutcome(table, row);
+    });
+
+    // On clicking a button to add a objective
+    $('.add-objective').on('click', function(e)
+    {
+    var table = $(this).closest('.plan').find('table');
+    var objective_select_wrapper = $(this).parent().find('.objective-select-wrapper:last');
+    var select = $(this).parent().find('select:last');
+    var selected_objective_id = select.find(':selected').val();
+    var clone = objective_select_wrapper.clone();
+    clone.insertAfter(objective_select_wrapper);
+    objective_select_wrapper.parent().find('.remove-objective').show();
+    });
+
+    // On clicking a button to add a course
+    $('.add-course').on('click', function(e)
+    {
+    var table = $(this).closest('.plan').find('table');
+    var course_select_wrapper = $(this).parent().find('.course-select-wrapper:last');
+    var select = $(this).parent().find('select:last');
+    var selected_course_id = select.find(':selected').val();
+    var clone = course_select_wrapper.clone();
+    clone.insertAfter(course_select_wrapper);
+    course_select_wrapper.parent().find('.remove-course').show();
+    });
+
+    // When user selects another outcome
+    $('.outcome').on('change', function(e)
+    {
+    fetchObjectives($(this));
+    });
+
+    // Gather, structure and send data to server for saving
+    $('.save').on('click', function(e)
+    {
+    var five_year_plan = new Object();
+    five_year_plan.quinquennium_id = $('#quinquennium').data('quinquennium-id');
+    five_year_plan.program_id = $('#program').data('program-id');
+    five_year_plan.mini_plans = new Array();
+
+    $('.plan').each(function(index){
+
+    var mini_plan = new Object();
+
+    mini_plan.year_start = $(this).find('.year-start').text();
+    mini_plan.year_end = $(this).find('.year-end').text();
+
+    // Array for outcome objects
+    mini_plan.outcomes = new Array();
+
+    $(this).find('.outcome').each(function(index){
+
+    // Outcome object
+    var outcome = new Object();
+
+    outcome.id = $(this).find(':selected').val();
+    outcome.objectives = new Array();
+    outcome.courses = new Array();
+
+    // Gather objective information
+    $(this).closest('tr').find('.objective').each(function()
+    {
+    var objective = new Object();
+
+    objective.original_id = $(this).find(':selected').val();
+    objective.text = $(this).find(':selected').text();
+
+    outcome.objectives.push(jQuery.extend({}, objective));
+
+    objective = null;
+    });
+
+    // Gather course information
+    $(this).closest('tr').find('.course').each(function()
+    {
+    var course = new Object();
+
+    course.code = $(this).find(':selected').data('course-code');
+    course.number = $(this).find(':selected').data('course-number');
+    course.name = $(this).find(':selected').data('course-name');
+
+    outcome.courses.push(jQuery.extend({}, course));
+    course = null;
+    });
+
+    mini_plan.outcomes.push(jQuery.extend({}, outcome));
+    outcome = null;
+
+    });
+
+    five_year_plan.mini_plans.push(jQuery.extend({}, mini_plan));
+    mini_plan = null;
+    });
+
+    //console.log(five_year_plan);
+
+    $.post(
+    "{{ URL::action('FiveYearPlansController@store', [$program->id]) }}",
+    {
+    five_year_plan: JSON.stringify(five_year_plan)
+    },
+    function(data)
+    {
+    //console.log(data);
+    var response = data;
+
+    //console.log('status: '+response.status);
+    if(response.status == 'success')
+    {
+    //console.log('success');
+    window.location = response.redirect_url;
+    }
+    else
+    {
+    jsError(response.message);
+    }
+    },
+    "json"
+    )
+    .fail( function(xhr, status, error) {
+
+    //console.log('fail:'+error);
+    // Always scroll to the top
+    $(this).scrollTop(0);
+    $('html').animate({scrollTop:0}, 1);
+    $('body').animate({scrollTop:0}, 1);
+
+    jsError(error);
+
+    // Show js error with default message
+    $('#js-error-row').fadeIn('slow', function () {
+    $(this).delay(3000).fadeOut('slow');
+    });
+    }
+    );
+    });
+
+    // --------------------------------------------------------------------------
+    // Functions
+    // --------------------------------------------------------------------------
+
+    // Removes a objective
+    function removeObjective(button)
+    {
+    var objective_select_wrapper = button.parent();
+
+    // If only one objective will remain, hide 'x' button
+    if(objective_select_wrapper.siblings('.objective-select-wrapper').length == 1)
+    {
+    objective_select_wrapper.siblings('.objective-select-wrapper').find('.remove-objective').hide();
+    }
+
+    // Remove objective
+    objective_select_wrapper.remove();
+    }
+
+    // Removes a course
+    function removeCourse(button)
+    {
+    var course_select_wrapper = button.parent();
+
+    // If only one course will remain, hide 'x' button
+    if(course_select_wrapper.siblings('.course-select-wrapper').length == 1)
+    {
+    course_select_wrapper.siblings('.course-select-wrapper').find('.remove-course').hide();
+    }
+
+    // Remove course
+    course_select_wrapper.remove();
+    }
+
+
+    // Checks whether a plan has outcomes
+    function hasOutcomes(table)
+    {
+    if(table.find('.outcome-cell').length > 0)
+    return true;
+    else
+    return false;
+    }
+
+    // Add an outcome to an annual plan
+    function addOutcome(table)
+    {
+    var header_rowspan = Number(table.find('.academic-year').attr('rowspan'));
+
+    var clone = table.find('tbody tr:first').clone(true, true);
+
+    // Remove all objectives and course except the first ones
+    clone.find('.objective-select-wrapper').not(':first').remove();
+    clone.find('.course-select-wrapper').not(':first').remove();
+
+    // Add removal button
+    clone.children(':last').append('<span class="glyphicon glyphicon-remove text-danger icon-btn remove-outcome"></span>');
+
+    if(hasOutcomes(table))
+    {
+    table.find('tbody').append(clone);
+
+    table.find('.academic-year').attr('rowspan', header_rowspan+1);
+    }
+    }
+
+    // Remove an Outcome
+    function removeOutcome(table, row)
+    {
+    var header_rowspan = Number(table.find('.academic-year').attr('rowspan'));
+
+    row.remove();
+    table.find('.academic-year').attr('rowspan', header_rowspan-1);
+    }
+
+    // Fetch objectives associated to an outcome and program
+    function fetchObjectives(outcome)
+    {
+    var outcome_id = outcome.find(':selected').val();
+    var program_id = $('#program').data('program-id');
+
+    $.post(
+    "{{ URL::action('ObjectivesController@fetch') }}",
+    {
+    outcome_id: outcome_id,
+    program_id: program_id,
+    format: 'select'
+    },
+    function(data)
+    {
+    var select = outcome.closest('tr').find('.objective');
+    if(data == '')
+    {
+    select.prop('disabled', true);
+    select.empty().append('<option value="0"><span class="glyphicon glyphicon-remove"></span> None</option>');
+    }
+    else
+    {
+    select.prop('disabled', false);
+    select.empty().append(data);
+    }
+
+    if(select.length > 1) {
+    select.first().parent().siblings('.objective-select-wrapper').remove();
+    }
+    }
+    );
+    }
 
 @stop

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

@@ -1,82 +1,92 @@
 @extends('layouts.master')
 
 @section('navigation')
-    @if(Auth::user()->role==1)
-        @include('local.managers.admins._navigation')
-    @elseif(Auth::user()->role==2)
+    @if (Auth::user()->role == 1)
+        @include('local.managers.admins._new_navigation')
+    @elseif(Auth::user()->role == 2)
         @include('local.managers.sCoords._new_navigation')
-    @elseif(Auth::user()->role==3)
+    @elseif(Auth::user()->role == 3)
         @include('local.managers.pCoords._new_navigation')
     @endif
 @stop
 
 @section('main')
-<div class="row">
-	<div class="col-md-12">
-		<div id="quinquennium" data-quinquennium-id="{{ $current_quinquennium->id }}"></div>
-		<div id="program" data-program-id="{{ $program->id }}"></div>
-		@for($i = date('Y', strtotime($current_quinquennium->start_date)); $i< date('Y', strtotime($current_quinquennium->end_date)) ; $i++)
-			<div class="mini-plan">
-				<table class="table table-bordered">
-					<thead>
-						<tr class="bg-danger text-center">
-							<th class="text-center col-md-1">Academic Year</th>
-							<th class="text-center col-md-3">Learning Outcome to be assessed</th>
-							<th class="text-center col-md-4">Learning Objectives</th>
-							<th class="text-center col-md-4">Courses to use for assessment</th>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr>
-							<th class="active academic-year text-center" rowspan ="1"><span class="year-start">{{ $i }}</span>-<span class="year-end">{{ $i+1 }}</span></th>
-							<td class="outcome-cell">
-								<select name="outcome" class="outcome form-control">
-									@foreach($outcomes as $outcome)
-										<option value="{{ $outcome->id }}">{{ $outcome->name }}</option>
-									@endforeach
-								</select>
-							</td>
-							<td class="objectives-cell">
-								<div class="objective-select-wrapper">
-									<select name="objectives[]" class="objective shortened-select form-control">
-									</select>
-									<span class="glyphicon glyphicon-remove text-danger icon-btn remove-objective"></span>
-									<br><br>
-								</div>
-								<button class="add-objective btn btn-success pull-right btn-xs"><span class="glyphicon glyphicon-plus"></span></button>
-							</td>
-							<td>
-								<div class="course-select-wrapper">
-									<select name="courses[]" class="course shortened-select form-control">
-										@foreach($courses as $course)
-											<option value="{{ $course->id }}" data-course-code="{{ $course->code }}" data-course-number="{{ $course->number }}" data-course-name="{{ $course->name }}">{{ $course->code }}{{ $course->number }}: {{ $course->name }}</option>
-										@endforeach
-									</select>
-									<span class="glyphicon glyphicon-remove text-danger icon-btn remove-course"></span>
-									<br><br>
-								</div>
-								<button class="add-course btn btn-success pull-right btn-xs"><span class="glyphicon glyphicon-plus"></span></button>
-							</td>
-							<td></td>
-						</tr>
-					</tbody>
-				</table>
-				<div>
-					<button class="add-outcome btn btn-success pull-right btn-sm"><span class="glyphicon glyphicon-plus"></span>Add Learning Outcome</button>
-					<br><br><br>
-				</div>
-			</div>
-		@endfor
-
-		<div class="text-center">
-            <button id="button-create-rubric" class="btn btn-lg btn-primary save">
-                <span class="glyphicon glyphicon-floppy-disk"></span>
-                Save
-            </button>
+    <div class="row">
+        <div class="col-md-12">
+            <div id="quinquennium" data-quinquennium-id="{{ $current_quinquennium->id }}"></div>
+            <div id="program" data-program-id="{{ $program->id }}"></div>
+            @for ($i = date('Y', strtotime($current_quinquennium->start_date)); $i < date('Y', strtotime($current_quinquennium->end_date)); $i++)
+                <div class="mini-plan">
+                    <table class="table table-bordered">
+                        <thead>
+                            <tr class="bg-danger text-center">
+                                <th class="text-center col-md-1">Academic Year</th>
+                                <th class="text-center col-md-3">Learning Outcome to be assessed</th>
+                                <th class="text-center col-md-4">Learning Objectives</th>
+                                <th class="text-center col-md-4">Courses to use for assessment</th>
+                                <th></th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <tr>
+                                <th class="active academic-year text-center" rowspan="1"><span
+                                        class="year-start">{{ $i }}</span>-<span
+                                        class="year-end">{{ $i + 1 }}</span></th>
+                                <td class="outcome-cell">
+                                    <select name="outcome" class="outcome form-control">
+                                        @foreach ($outcomes as $outcome)
+                                            <option value="{{ $outcome->id }}">{{ $outcome->name }}</option>
+                                        @endforeach
+                                    </select>
+                                </td>
+                                <td class="objectives-cell">
+                                    <div class="objective-select-wrapper">
+                                        <select name="objectives[]" class="objective shortened-select form-control">
+                                        </select>
+                                        <span
+                                            class="glyphicon glyphicon-remove text-danger icon-btn remove-objective"></span>
+                                        <br><br>
+                                    </div>
+                                    <button class="add-objective btn btn-success pull-right btn-xs"><span
+                                            class="glyphicon glyphicon-plus"></span></button>
+                                </td>
+                                <td>
+                                    <div class="course-select-wrapper">
+                                        <select name="courses[]" class="course shortened-select form-control">
+                                            @foreach ($courses as $course)
+                                                <option value="{{ $course->id }}" data-course-code="{{ $course->code }}"
+                                                    data-course-number="{{ $course->number }}"
+                                                    data-course-name="{{ $course->name }}">
+                                                    {{ $course->code }}{{ $course->number }}: {{ $course->name }}
+                                                </option>
+                                            @endforeach
+                                        </select>
+                                        <span class="glyphicon glyphicon-remove text-danger icon-btn remove-course"></span>
+                                        <br><br>
+                                    </div>
+                                    <button class="add-course btn btn-success pull-right btn-xs"><span
+                                            class="glyphicon glyphicon-plus"></span></button>
+                                </td>
+                                <td></td>
+                            </tr>
+                        </tbody>
+                    </table>
+                    <div>
+                        <button class="add-outcome btn btn-success pull-right btn-sm"><span
+                                class="glyphicon glyphicon-plus"></span>Add Learning Outcome</button>
+                        <br><br><br>
+                    </div>
+                </div>
+            @endfor
+
+            <div class="text-center">
+                <button id="button-create-rubric" class="btn btn-lg btn-primary save">
+                    <span class="glyphicon glyphicon-floppy-disk"></span>
+                    Save
+                </button>
+            </div>
         </div>
-	</div>
-</div>
+    </div>
 
 @stop
 
@@ -86,294 +96,294 @@
 
 @section('javascript')
 
-// --------------------------------------------------------------------------
-// Page Load
-// --------------------------------------------------------------------------
-
-// Hide all 'x' buttons for courses and objectives
-$('.remove-course, .remove-objective').hide();
-
-$('.outcome').each(function()
-{
-	fetchObjectives($(this));
-});
-
-// --------------------------------------------------------------------------
-// Events
-// --------------------------------------------------------------------------
-
-// On clicking a button to add outcome
-$('.add-outcome').on('click', function(e)
-{
-	var table = $(this).closest('.mini-plan').find('table');
-	addOutcome(table);
-});
-
-// On clicking a button to remove a course
-$('table').on('click', '.remove-objective', function(e)
-{
-	removeObjective($(this));
-});
-
-// On clicking a button to remove a course
-$('table').on('click', '.remove-course', function(e)
-{
-	removeCourse($(this));
-});
-
-// On clicking the x to remove an outcome from the plan
-$('table').on('click', '.remove-outcome', function(e)
-{
-	var table = $(this).closest('.mini-plan').find('table');
-	var row = $(this).closest('tr');
-	removeOutcome(table, row);
-});
-
-// On clicking a button to add a objective
-$('.add-objective').on('click', function(e)
-{
-	var table = $(this).closest('.mini-plan').find('table');
-	var objective_select_wrapper = $(this).parent().find('.objective-select-wrapper:last');
-	var select = $(this).parent().find('select:last');
-	var selected_objective_id = select.find(':selected').val();
-	var clone = objective_select_wrapper.clone();
-	clone.insertAfter(objective_select_wrapper);
-	objective_select_wrapper.parent().find('.remove-objective').show();
-});
-
-// On clicking a button to add a course
-$('.add-course').on('click', function(e)
-{
-	var table = $(this).closest('.mini-plan').find('table');
-	var course_select_wrapper = $(this).parent().find('.course-select-wrapper:last');
-	var select = $(this).parent().find('select:last');
-	var selected_course_id = select.find(':selected').val();
-	var clone = course_select_wrapper.clone();
-	clone.insertAfter(course_select_wrapper);
-	course_select_wrapper.parent().find('.remove-course').show();
-});
-
-// When user selects another outcome
-$('.outcome').on('change', function(e)
-{
-	fetchObjectives($(this));
-});
-
-// Gather, structure and send data to server for saving
-$('.save').on('click', function(e)
-{
-	var five_year_plan = new Object();
-	five_year_plan.quinquennium_id = $('#quinquennium').data('quinquennium-id');
-	five_year_plan.program_id = $('#program').data('program-id');
-	five_year_plan.mini_plans = new Array();
-
-	$('.mini-plan').each(function(index){
-
-		var mini_plan = new Object();
-
-		mini_plan.year_start = $(this).find('.year-start').text();
-		mini_plan.year_end = $(this).find('.year-end').text();
-
-		// Array for outcome objects
-		mini_plan.outcomes = new Array();
-
-		$(this).find('.outcome').each(function(index){
-
-			// Outcome object
-			var outcome = new Object();
-
-			outcome.id = $(this).find(':selected').val();
-			outcome.objectives = new Array();
-			outcome.courses = new Array();
-
-			// Gather objective information
-			$(this).closest('tr').find('.objective').each(function()
-			{
-				var objective = new Object();
-
-				objective.original_id = $(this).find(':selected').val();
-				objective.text = $(this).find(':selected').text();
-
-				outcome.objectives.push(jQuery.extend({}, objective));
-
-				objective = null;
-			});
-
-			// Gather course information
-			$(this).closest('tr').find('.course').each(function()
-			{
-				var course = new Object();
-
-				course.code = $(this).find(':selected').data('course-code');
-				course.number = $(this).find(':selected').data('course-number');
-				course.name = $(this).find(':selected').data('course-name');
-
-				outcome.courses.push(jQuery.extend({}, course));
-				course = null;
-			});
-
-			mini_plan.outcomes.push(jQuery.extend({}, outcome));
-			outcome = null;
-
-		});
-
-		five_year_plan.mini_plans.push(jQuery.extend({}, mini_plan));
-		mini_plan = null;
-	});
-
-	//console.log(five_year_plan);
-
-	$.post(
-		"{{ URL::action('FiveYearPlansController@store', array($program->id)) }}",
-		{
-			five_year_plan: JSON.stringify(five_year_plan)
-		},
-		function(data)
-		{
-			//console.log(data);
-			var response = data;
-
-			//console.log('status: '+response.status);
-			if(response.status == 'success')
-			{
-				//console.log('success');
-				window.location = response.redirect_url;
-			}
-			else
-			{
-				jsError(response.message);
-			}
-		},
-		"json"
-	)
-	.fail( function(xhr, status, error) {
-
-		//console.log('fail:'+error);
-		// Always scroll to the top
-        $(this).scrollTop(0);
-        $('html').animate({scrollTop:0}, 1);
-        $('body').animate({scrollTop:0}, 1);
-
-		jsError(error);
-
-		// Show js error with default message
-		$('#js-error-row').fadeIn('slow', function () {
-			$(this).delay(3000).fadeOut('slow');
-		});
-	}
-	);
-});
-
-// --------------------------------------------------------------------------
-// Functions
-// --------------------------------------------------------------------------
-
-// Removes a objective
-function removeObjective(button)
-{
-	var objective_select_wrapper = button.parent();
-
-	// If only one objective will remain, hide 'x' button
-	if(objective_select_wrapper.siblings('.objective-select-wrapper').length == 1)
-	{
-		objective_select_wrapper.siblings('.objective-select-wrapper').find('.remove-objective').hide();
-	}
-
-	// Remove objective
-	objective_select_wrapper.remove();
-}
-
-// Removes a course
-function removeCourse(button)
-{
-	var course_select_wrapper = button.parent();
-
-	// If only one course will remain, hide 'x' button
-	if(course_select_wrapper.siblings('.course-select-wrapper').length == 1)
-	{
-		course_select_wrapper.siblings('.course-select-wrapper').find('.remove-course').hide();
-	}
-
-	// Remove course
-	course_select_wrapper.remove();
-}
-
-
-// Checks whether a mini plan has outcomes
-function hasOutcomes(table)
-{
-	if(table.find('.outcome-cell').length > 0)
-		return true;
-	else
-		return false;
-}
-
-// Add an outcome to a mini (annual) plan
-function addOutcome(table)
-{
-	var header_rowspan = Number(table.find('.academic-year').attr('rowspan'));
-
-	var clone = table.find('tbody tr:first').clone(true, true);
-
-	// Remove academic year
-	clone.children(':first').remove();
-
-	// Remove all objectives and course except the first ones
-	clone.find('.objective-select-wrapper').not(':first').remove();
-	clone.find('.course-select-wrapper').not(':first').remove();
-
-	// Add removal button
-	clone.children(':last').append('<span class="glyphicon glyphicon-remove text-danger icon-btn remove-outcome"></span>');
-
-	if(hasOutcomes(table))
-	{
-		table.find('tbody').append(clone);
-
-		table.find('.academic-year').attr('rowspan', header_rowspan+1);
-	}
-}
-
-// Remove an Outcome
-function removeOutcome(table, row)
-{
-	var header_rowspan = Number(table.find('.academic-year').attr('rowspan'));
-
-	row.remove();
-	table.find('.academic-year').attr('rowspan', header_rowspan-1);
-}
-
-// Fetch objectives associated to an outcome and program
-function fetchObjectives(outcome)
-{
-	var outcome_id = outcome.find(':selected').val();
-	var program_id = $('#program').data('program-id');
-
-	$.post(
-		"{{ URL::action('ObjectivesController@fetch') }}",
-		{
-			outcome_id: outcome_id,
-			program_id: program_id,
-			format: 'select'
-		},
-		function(data)
-		{
-			var select = outcome.closest('tr').find('.objective');
-			if(data == '')
-			{
-				select.prop('disabled', true);
-				select.empty().append('<option value="0"><span class="glyphicon glyphicon-remove"></span> None</option>');
-			}
-			else
-			{
-				select.prop('disabled', false);
-				select.empty().append(data);
-			}
-
-			if(select.length > 1) {
-				select.first().parent().siblings('.objective-select-wrapper').remove();
-			}
-		}
-	);
-}
+    // --------------------------------------------------------------------------
+    // Page Load
+    // --------------------------------------------------------------------------
+
+    // Hide all 'x' buttons for courses and objectives
+    $('.remove-course, .remove-objective').hide();
+
+    $('.outcome').each(function()
+    {
+    fetchObjectives($(this));
+    });
+
+    // --------------------------------------------------------------------------
+    // Events
+    // --------------------------------------------------------------------------
+
+    // On clicking a button to add outcome
+    $('.add-outcome').on('click', function(e)
+    {
+    var table = $(this).closest('.mini-plan').find('table');
+    addOutcome(table);
+    });
+
+    // On clicking a button to remove a course
+    $('table').on('click', '.remove-objective', function(e)
+    {
+    removeObjective($(this));
+    });
+
+    // On clicking a button to remove a course
+    $('table').on('click', '.remove-course', function(e)
+    {
+    removeCourse($(this));
+    });
+
+    // On clicking the x to remove an outcome from the plan
+    $('table').on('click', '.remove-outcome', function(e)
+    {
+    var table = $(this).closest('.mini-plan').find('table');
+    var row = $(this).closest('tr');
+    removeOutcome(table, row);
+    });
+
+    // On clicking a button to add a objective
+    $('.add-objective').on('click', function(e)
+    {
+    var table = $(this).closest('.mini-plan').find('table');
+    var objective_select_wrapper = $(this).parent().find('.objective-select-wrapper:last');
+    var select = $(this).parent().find('select:last');
+    var selected_objective_id = select.find(':selected').val();
+    var clone = objective_select_wrapper.clone();
+    clone.insertAfter(objective_select_wrapper);
+    objective_select_wrapper.parent().find('.remove-objective').show();
+    });
+
+    // On clicking a button to add a course
+    $('.add-course').on('click', function(e)
+    {
+    var table = $(this).closest('.mini-plan').find('table');
+    var course_select_wrapper = $(this).parent().find('.course-select-wrapper:last');
+    var select = $(this).parent().find('select:last');
+    var selected_course_id = select.find(':selected').val();
+    var clone = course_select_wrapper.clone();
+    clone.insertAfter(course_select_wrapper);
+    course_select_wrapper.parent().find('.remove-course').show();
+    });
+
+    // When user selects another outcome
+    $('.outcome').on('change', function(e)
+    {
+    fetchObjectives($(this));
+    });
+
+    // Gather, structure and send data to server for saving
+    $('.save').on('click', function(e)
+    {
+    var five_year_plan = new Object();
+    five_year_plan.quinquennium_id = $('#quinquennium').data('quinquennium-id');
+    five_year_plan.program_id = $('#program').data('program-id');
+    five_year_plan.mini_plans = new Array();
+
+    $('.mini-plan').each(function(index){
+
+    var mini_plan = new Object();
+
+    mini_plan.year_start = $(this).find('.year-start').text();
+    mini_plan.year_end = $(this).find('.year-end').text();
+
+    // Array for outcome objects
+    mini_plan.outcomes = new Array();
+
+    $(this).find('.outcome').each(function(index){
+
+    // Outcome object
+    var outcome = new Object();
+
+    outcome.id = $(this).find(':selected').val();
+    outcome.objectives = new Array();
+    outcome.courses = new Array();
+
+    // Gather objective information
+    $(this).closest('tr').find('.objective').each(function()
+    {
+    var objective = new Object();
+
+    objective.original_id = $(this).find(':selected').val();
+    objective.text = $(this).find(':selected').text();
+
+    outcome.objectives.push(jQuery.extend({}, objective));
+
+    objective = null;
+    });
+
+    // Gather course information
+    $(this).closest('tr').find('.course').each(function()
+    {
+    var course = new Object();
+
+    course.code = $(this).find(':selected').data('course-code');
+    course.number = $(this).find(':selected').data('course-number');
+    course.name = $(this).find(':selected').data('course-name');
+
+    outcome.courses.push(jQuery.extend({}, course));
+    course = null;
+    });
+
+    mini_plan.outcomes.push(jQuery.extend({}, outcome));
+    outcome = null;
+
+    });
+
+    five_year_plan.mini_plans.push(jQuery.extend({}, mini_plan));
+    mini_plan = null;
+    });
+
+    //console.log(five_year_plan);
+
+    $.post(
+    "{{ URL::action('FiveYearPlansController@store', [$program->id]) }}",
+    {
+    five_year_plan: JSON.stringify(five_year_plan)
+    },
+    function(data)
+    {
+    //console.log(data);
+    var response = data;
+
+    //console.log('status: '+response.status);
+    if(response.status == 'success')
+    {
+    //console.log('success');
+    window.location = response.redirect_url;
+    }
+    else
+    {
+    jsError(response.message);
+    }
+    },
+    "json"
+    )
+    .fail( function(xhr, status, error) {
+
+    //console.log('fail:'+error);
+    // Always scroll to the top
+    $(this).scrollTop(0);
+    $('html').animate({scrollTop:0}, 1);
+    $('body').animate({scrollTop:0}, 1);
+
+    jsError(error);
+
+    // Show js error with default message
+    $('#js-error-row').fadeIn('slow', function () {
+    $(this).delay(3000).fadeOut('slow');
+    });
+    }
+    );
+    });
+
+    // --------------------------------------------------------------------------
+    // Functions
+    // --------------------------------------------------------------------------
+
+    // Removes a objective
+    function removeObjective(button)
+    {
+    var objective_select_wrapper = button.parent();
+
+    // If only one objective will remain, hide 'x' button
+    if(objective_select_wrapper.siblings('.objective-select-wrapper').length == 1)
+    {
+    objective_select_wrapper.siblings('.objective-select-wrapper').find('.remove-objective').hide();
+    }
+
+    // Remove objective
+    objective_select_wrapper.remove();
+    }
+
+    // Removes a course
+    function removeCourse(button)
+    {
+    var course_select_wrapper = button.parent();
+
+    // If only one course will remain, hide 'x' button
+    if(course_select_wrapper.siblings('.course-select-wrapper').length == 1)
+    {
+    course_select_wrapper.siblings('.course-select-wrapper').find('.remove-course').hide();
+    }
+
+    // Remove course
+    course_select_wrapper.remove();
+    }
+
+
+    // Checks whether a mini plan has outcomes
+    function hasOutcomes(table)
+    {
+    if(table.find('.outcome-cell').length > 0)
+    return true;
+    else
+    return false;
+    }
+
+    // Add an outcome to a mini (annual) plan
+    function addOutcome(table)
+    {
+    var header_rowspan = Number(table.find('.academic-year').attr('rowspan'));
+
+    var clone = table.find('tbody tr:first').clone(true, true);
+
+    // Remove academic year
+    clone.children(':first').remove();
+
+    // Remove all objectives and course except the first ones
+    clone.find('.objective-select-wrapper').not(':first').remove();
+    clone.find('.course-select-wrapper').not(':first').remove();
+
+    // Add removal button
+    clone.children(':last').append('<span class="glyphicon glyphicon-remove text-danger icon-btn remove-outcome"></span>');
+
+    if(hasOutcomes(table))
+    {
+    table.find('tbody').append(clone);
+
+    table.find('.academic-year').attr('rowspan', header_rowspan+1);
+    }
+    }
+
+    // Remove an Outcome
+    function removeOutcome(table, row)
+    {
+    var header_rowspan = Number(table.find('.academic-year').attr('rowspan'));
+
+    row.remove();
+    table.find('.academic-year').attr('rowspan', header_rowspan-1);
+    }
+
+    // Fetch objectives associated to an outcome and program
+    function fetchObjectives(outcome)
+    {
+    var outcome_id = outcome.find(':selected').val();
+    var program_id = $('#program').data('program-id');
+
+    $.post(
+    "{{ URL::action('ObjectivesController@fetch') }}",
+    {
+    outcome_id: outcome_id,
+    program_id: program_id,
+    format: 'select'
+    },
+    function(data)
+    {
+    var select = outcome.closest('tr').find('.objective');
+    if(data == '')
+    {
+    select.prop('disabled', true);
+    select.empty().append('<option value="0"><span class="glyphicon glyphicon-remove"></span> None</option>');
+    }
+    else
+    {
+    select.prop('disabled', false);
+    select.empty().append(data);
+    }
+
+    if(select.length > 1) {
+    select.first().parent().siblings('.objective-select-wrapper').remove();
+    }
+    }
+    );
+    }
 
 @stop

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

@@ -2,7 +2,7 @@
 
 @section('navigation')
     @if (Auth::user()->role == 1)
-        @include('local.managers.admins._navigation')
+        @include('local.managers.admins._new_navigation')
     @elseif(Auth::user()->role == 2)
         @include('local.managers.sCoords._new_navigation')
     @elseif(Auth::user()->role == 3)
@@ -26,7 +26,7 @@
                             <div class="form-group col-md-12 selectOutcome">
                                 <label>Outcome 1</label>
 
-                                {{ Form::select('outcome[]', $outcomes, reset($outcomes), ['class' => 'form-control selectpicker','id' => 'outcome0','onchange' => 'fetchObjectiveForSelect("outcome0", "objectiveGroupFor0")']) }}
+                                {{ Form::select('outcome[]', $outcomes, reset($outcomes), ['class' => 'form-control selectpicker', 'id' => 'outcome0', 'onchange' => 'fetchObjectiveForSelect("outcome0", "objectiveGroupFor0")']) }}
                             </div>
 
                             <div id='objectiveGroupFor0' class='createObjective' data-value='1'>
@@ -95,11 +95,11 @@
                     <div class="form-group">
                         {{ Form::label('subcriteria', 'Subcriteria') }}
                         <p class="help-block"><strong>Manually add</strong> bullets or numbering.</p>
-                        {{ Form::textarea('subcriteria', '', ['class' => 'form-control','rows' => 3,'aria-labelledby' => 'subcriteria']) }}
+                        {{ Form::textarea('subcriteria', '', ['class' => 'form-control', 'rows' => 3, 'aria-labelledby' => 'subcriteria']) }}
                     </div>
                     <div class="form-group form_validation maximum_form">
                         {{ Form::label('maximum_score', 'Maximum Score') }}
-                        {{ Form::text('maximum_score', '8', ['class' => 'form-control','id' => 'maximum_score','oninput' => 'addOptions("Num_scale", "maximum_score", "Scales")']) }}
+                        {{ Form::text('maximum_score', '8', ['class' => 'form-control', 'id' => 'maximum_score', 'oninput' => 'addOptions("Num_scale", "maximum_score", "Scales")']) }}
                     </div>
                     <div class="form-group form_validation number_of_scales">
                         {{ Form::label('scales', 'Number of Scales') }}
@@ -115,15 +115,15 @@
 
                     <div class="form-group">
                         {{ Form::label('copyright', 'Copyright') }}
-                        {{ Form::textarea('copyright', '', ['class' => 'form-control','rows' => 2,'placeholder' => '(optional)','aria-labelledby' => 'copyright']) }}
+                        {{ Form::textarea('copyright', '', ['class' => 'form-control', 'rows' => 2, 'placeholder' => '(optional)', 'aria-labelledby' => 'copyright']) }}
                     </div>
 
                     <div class="form-group">
                         {{ Form::label('notes', 'Notes') }}
-                        {{ Form::textarea('notes', '', ['class' => 'form-control','rows' => 2,'placeholder' => '(optional)','aria-labelledby' => 'notes']) }}
+                        {{ Form::textarea('notes', '', ['class' => 'form-control', 'rows' => 2, 'placeholder' => '(optional)', 'aria-labelledby' => 'notes']) }}
                     </div>
 
-                    {{ Form::submit('Create', ['class' => 'btn btn-primary btn-block','id' => 'create_the_criterion_button','data-form-id' => 'create_criterion']) }}
+                    {{ Form::submit('Create', ['class' => 'btn btn-primary btn-block', 'id' => 'create_the_criterion_button', 'data-form-id' => 'create_criterion']) }}
                     {{ Form::close() }}
                 </div>
             </div>
@@ -135,7 +135,7 @@
                     Edit
                 </div>
                 <div class="panel-body">
-                    {{ Form::open(['action' => 'CriteriaController@update','id' => 'update_criterion','data-form-id' => 'update_criterion']) }}
+                    {{ Form::open(['action' => 'CriteriaController@update', 'id' => 'update_criterion', 'data-form-id' => 'update_criterion']) }}
 
                     <button class="btn btn-md btn-secondary filterButton">
                         <span class="glyphicon glyphicon-minus">
@@ -157,7 +157,7 @@
                         </div>
                         <div class="form-group">
                             <label>Associated Outcome</label>
-                            {{ Form::select('assoc_outcome_fetch', $outcomes, null, ['class' => 'form-control selectpicker','id' => 'assoc_outcomes_fetch','onchange' => 'fetchAllCriterion("select-program", "assoc_outcomes_fetch")']) }}
+                            {{ Form::select('assoc_outcome_fetch', $outcomes, null, ['class' => 'form-control selectpicker', 'id' => 'assoc_outcomes_fetch', 'onchange' => 'fetchAllCriterion("select-program", "assoc_outcomes_fetch")']) }}
 
                         </div>
                     </div>
@@ -175,7 +175,7 @@
                         <div id='assocOutcomeGroup0' class='createOutcome' data-value="1">
                             <div class="form-group col-md-12 selectOutcome">
                                 <label>Outcome 1</label>
-                                {{ Form::select('outcome[]', $outcomes, null, ['class' => 'form-control selectpicker','id' => 'assoc_outcome_0','onchange' => 'fetchObjectiveForSelect("assoc_outcome_0", "assoc_objectiveGroupFor0")']) }}
+                                {{ Form::select('outcome[]', $outcomes, null, ['class' => 'form-control selectpicker', 'id' => 'assoc_outcome_0', 'onchange' => 'fetchObjectiveForSelect("assoc_outcome_0", "assoc_objectiveGroupFor0")']) }}
 
                             </div>
                             <div id='assoc_objectiveGroupFor0' class='createObjective' data-value="1">
@@ -267,7 +267,7 @@
                     </div>
                     <div class="form-group form_validation maximum_form">
                         {{ Form::label('maximum_score', 'Maximum Score') }}
-                        {{ Form::text('maximum_score', '', ['class' => 'form-control','id' => 'assoc_maximum_score','oninput' => 'addOptions("Num_assoc_scale", "assoc_maximum_score", "Assoc_Scales")']) }}
+                        {{ Form::text('maximum_score', '', ['class' => 'form-control', 'id' => 'assoc_maximum_score', 'oninput' => 'addOptions("Num_assoc_scale", "assoc_maximum_score", "Assoc_Scales")']) }}
                     </div>
 
 
@@ -287,15 +287,15 @@
 
                     <div class="form-group">
                         {{ Form::label('copyright', 'Copyright Information') }}
-                        {{ Form::textarea('copyright', Input::old('copyright'), ['class' => 'form-control','rows' => 2,'id' => 'criterion_copyright','placeholder' => '(optional)']) }}
+                        {{ Form::textarea('copyright', Input::old('copyright'), ['class' => 'form-control', 'rows' => 2, 'id' => 'criterion_copyright', 'placeholder' => '(optional)']) }}
                     </div>
 
                     <div class="form-group">
                         {{ Form::label('notes', 'Additional Notes') }}
-                        {{ Form::textarea('notes', Input::old('notes'), ['class' => 'form-control','rows' => 2,'id' => 'criterion_notes','placeholder' => '(optional)']) }}
+                        {{ Form::textarea('notes', Input::old('notes'), ['class' => 'form-control', 'rows' => 2, 'id' => 'criterion_notes', 'placeholder' => '(optional)']) }}
                     </div>
 
-                    {{ Form::submit('Update', ['class' => 'btn btn-primary btn-block','id' => 'update_the_criterion_button','data-form-id' => 'update_criterion']) }}
+                    {{ Form::submit('Update', ['class' => 'btn btn-primary btn-block', 'id' => 'update_the_criterion_button', 'data-form-id' => 'update_criterion']) }}
                     {{ Form::close() }}
                     {{ Form::open(['action' => 'CriteriaController@delete', 'id' => 'deleteCriterionForm']) }}
 

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

@@ -1,133 +1,155 @@
 @extends('layouts.master')
 
 @section('navigation')
-    @if(Auth::user()->role==1)
-        @include('local.managers.admins._navigation')
-    @elseif(Auth::user()->role==2)
+    @if (Auth::user()->role == 1)
+        @include('local.managers.admins._new_navigation')
+    @elseif(Auth::user()->role == 2)
         @include('local.managers.sCoords._new_navigation')
-    @elseif(Auth::user()->role==3)
+    @elseif(Auth::user()->role == 3)
         @include('local.managers.pCoords._new_navigation')
     @endif
 @stop
 
 @section('main')
-<div class="row">
-	<div class="col-md-12">
-		<div id="plan" data-plan-id="{{ $plan->id }}"></div>
-		<div id="quinquennium" data-quinquennium-id="{{ $current_quinquennium->id }}"></div>
-		<div id="program" data-program-id="{{ $program->id }}"></div>
-
-		<div class="text-right">
-            <button id="button-create-rubric" class="btn btn-primary save">
-                <span class="glyphicon glyphicon-floppy-disk"></span>
-                Save
-            </button>
-            <a href="{{ URL::action('FiveYearPlansController@show', array('program'=>$program->id, 'plan'=>$plan->id) )}}" id="button-create-rubric" class="btn btn-primary">
-                <span class="glyphicon glyphicon-arrow-left"></span>
-                Back to Plan
-            </a>
-            <br><br>
+    <div class="row">
+        <div class="col-md-12">
+            <div id="plan" data-plan-id="{{ $plan->id }}"></div>
+            <div id="quinquennium" data-quinquennium-id="{{ $current_quinquennium->id }}"></div>
+            <div id="program" data-program-id="{{ $program->id }}"></div>
+
+            <div class="text-right">
+                <button id="button-create-rubric" class="btn btn-primary save">
+                    <span class="glyphicon glyphicon-floppy-disk"></span>
+                    Save
+                </button>
+                <a href="{{ URL::action('FiveYearPlansController@show', ['program' => $program->id, 'plan' => $plan->id]) }}"
+                    id="button-create-rubric" class="btn btn-primary">
+                    <span class="glyphicon glyphicon-arrow-left"></span>
+                    Back to Plan
+                </a>
+                <br><br>
+            </div>
+
+            @foreach ($plan->fypParts as $mini_plan)
+                <div class="mini-plan">
+                    <table class="table table-bordered">
+                        <thead>
+                            <tr class="bg-danger text-center">
+                                <th class="text-center col-md-1">Academic Year</th>
+                                <th class="text-center col-md-3">Learning Outcome to be assessed</th>
+                                <th class="text-center col-md-4">Learning Objectives</th>
+                                <th class="text-center col-md-4">Courses to use for assessment</th>
+                                <th></th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            @foreach ($mini_plan->fypPartOutcomes as $index => $fyp_outcome)
+                                <tr>
+                                    <!-- If outcome is the first, include multi-row year column -->
+                                    @if ($index == 0)
+                                        <th class="active academic-year text-center"
+                                            rowspan="{{ count($mini_plan->fypPartOutcomes) }}">
+                                            <span class="year-start">{{ $mini_plan->year_start }}</span>
+                                            -<span class="year-end">{{ $mini_plan->year_end }}</span>
+                                        </th>
+                                    @endif
+
+                                    <td class="outcome-cell">
+                                        <select name="outcome" class="outcome form-control">
+                                            @foreach ($outcomes as $outcome)
+                                                @if ($fyp_outcome->outcome_id == $outcome->id)
+                                                    <option selected value="{{ $outcome->id }}">{{ $outcome->name }}
+                                                    </option>
+                                                @else
+                                                    <option value="{{ $outcome->id }}">{{ $outcome->name }}</option>
+                                                @endif
+                                            @endforeach
+                                        </select>
+                                    </td>
+                                    <td class="objectives-cell">
+                                        @foreach (json_decode($fyp_outcome->objectives) as $fyp_objective)
+                                            <div class="objective-select-wrapper">
+                                                <select name="objectives[]" class="objective shortened-select form-control">
+                                                    @foreach (Objective::where('outcome_id', $fyp_outcome->outcome_id)->get() as $objective)
+                                                        @if ($fyp_objective->original_id == $objective->id)
+                                                            <option selected value="{{ $objective->id }}">
+                                                                {{ $objective->text }}</option>
+                                                        @else
+                                                            <option value="{{ $objective->id }}">
+                                                                {{ $objective->text }}</option>
+                                                        @endif
+                                                    @endforeach
+                                                </select>
+                                                <span
+                                                    class="glyphicon glyphicon-remove text-danger icon-btn remove-objective"></span>
+                                                <br><br>
+                                            </div>
+                                        @endforeach
+                                        <button class="add-objective btn btn-success pull-right btn-xs"><span
+                                                class="glyphicon glyphicon-plus"></span></button>
+                                    </td>
+                                    <td>
+                                        @foreach (json_decode($fyp_outcome->courses) as $fyp_course)
+                                            <div class="course-select-wrapper">
+                                                <select name="courses[]" class="course shortened-select form-control">
+                                                    @foreach ($courses as $course)
+                                                        @if ($fyp_course->code == $course->code && $fyp_course->number == $course->number && $fyp_course->name == $course->name)
+                                                            <option selected value="{{ $course->id }}"
+                                                                data-course-code="{{ $course->code }}"
+                                                                data-course-number="{{ $course->number }}"
+                                                                data-course-name="{{ $course->name }}">
+                                                                {{ $course->code }}{{ $course->number }}:
+                                                                {{ $course->name }}</option>
+                                                        @else
+                                                            <option value="{{ $course->id }}"
+                                                                data-course-code="{{ $course->code }}"
+                                                                data-course-number="{{ $course->number }}"
+                                                                data-course-name="{{ $course->name }}">
+                                                                {{ $course->code }}{{ $course->number }}:
+                                                                {{ $course->name }}</option>
+                                                        @endif
+                                                    @endforeach
+                                                </select>
+                                                <span
+                                                    class="glyphicon glyphicon-remove text-danger icon-btn remove-course"></span>
+                                                <br><br>
+                                            </div>
+                                        @endforeach
+                                        <button class="add-course btn btn-success pull-right btn-xs"><span
+                                                class="glyphicon glyphicon-plus"></span></button>
+                                    </td>
+                                    <td>
+                                        @if ($index != 0)
+                                            <span
+                                                class="glyphicon glyphicon-remove text-danger icon-btn remove-outcome"></span>
+                                        @endif
+                                    </td>
+                                </tr>
+                            @endforeach
+                        </tbody>
+                    </table>
+                    <div>
+                        <button class="add-outcome btn btn-success pull-right btn-sm"><span
+                                class="glyphicon glyphicon-plus"></span>Add Learning Outcome</button>
+                        <br><br><br>
+                    </div>
+                </div>
+            @endforeach
+
+            <div class="text-right">
+                <button id="button-create-rubric" class="btn btn-primary save">
+                    <span class="glyphicon glyphicon-floppy-disk"></span>
+                    Save
+                </button>
+                <a href="{{ URL::action('FiveYearPlansController@show', ['program' => $program->id, 'plan' => $plan->id]) }}"
+                    id="button-create-rubric" class="btn btn-primary">
+                    <span class="glyphicon glyphicon-arrow-left"></span>
+                    Back to Plan
+                </a>
+                <br><br>
+            </div>
         </div>
-
-		@foreach($plan->fypParts as $mini_plan)
-			<div class="mini-plan">
-				<table class="table table-bordered">
-					<thead>
-						<tr class="bg-danger text-center">
-							<th class="text-center col-md-1">Academic Year</th>
-							<th class="text-center col-md-3">Learning Outcome to be assessed</th>
-							<th class="text-center col-md-4">Learning Objectives</th>
-							<th class="text-center col-md-4">Courses to use for assessment</th>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						@foreach($mini_plan->fypPartOutcomes as $index => $fyp_outcome)
-							<tr>
-								<!-- If outcome is the first, include multi-row year column -->
-								@if($index == 0)
-									<th class="active academic-year text-center" rowspan ="{{ count($mini_plan->fypPartOutcomes) }}">
-										<span class="year-start">{{ $mini_plan->year_start }}</span>
-										-<span class="year-end">{{ $mini_plan->year_end }}</span>
-									</th>
-								@endif
-
-								<td class="outcome-cell">
-									<select name="outcome" class="outcome form-control">
-										@foreach($outcomes as $outcome)
-											@if($fyp_outcome->outcome_id == $outcome->id)
-												<option selected value="{{ $outcome->id }}">{{ $outcome->name }}</option>
-											@else
-												<option value="{{ $outcome->id }}">{{ $outcome->name }}</option>
-											@endif
-										@endforeach
-									</select>
-								</td>
-								<td class="objectives-cell">
-									@foreach(json_decode($fyp_outcome->objectives) as $fyp_objective)
-										<div class="objective-select-wrapper">
-											<select name="objectives[]" class="objective shortened-select form-control">
-												@foreach(Objective::where('outcome_id', $fyp_outcome->outcome_id)->get() as $objective)
-													@if($fyp_objective->original_id == $objective->id)
-														<option selected value="{{ $objective->id }}">{{ $objective->text }}</option>
-													@else
-														<option value="{{ $objective->id }}">{{ $objective->text }}</option>
-													@endif
-												@endforeach
-											</select>
-											<span class="glyphicon glyphicon-remove text-danger icon-btn remove-objective"></span>
-											<br><br>
-										</div>
-									@endforeach
-									<button class="add-objective btn btn-success pull-right btn-xs"><span class="glyphicon glyphicon-plus"></span></button>
-								</td>
-								<td>
-									@foreach(json_decode($fyp_outcome->courses) as $fyp_course)
-										<div class="course-select-wrapper">
-											<select name="courses[]" class="course shortened-select form-control">
-												@foreach($courses as $course)
-													@if($fyp_course->code == $course->code && $fyp_course->number == $course->number && $fyp_course->name == $course->name)
-														<option selected value="{{ $course->id }}" data-course-code="{{ $course->code }}" data-course-number="{{ $course->number }}" data-course-name="{{ $course->name }}">{{ $course->code }}{{ $course->number }}: {{ $course->name }}</option>
-													@else
-														<option value="{{ $course->id }}" data-course-code="{{ $course->code }}" data-course-number="{{ $course->number }}" data-course-name="{{ $course->name }}">{{ $course->code }}{{ $course->number }}: {{ $course->name }}</option>
-													@endif
-												@endforeach
-											</select>
-											<span class="glyphicon glyphicon-remove text-danger icon-btn remove-course"></span>
-											<br><br>
-										</div>
-									@endforeach
-									<button class="add-course btn btn-success pull-right btn-xs"><span class="glyphicon glyphicon-plus"></span></button>
-								</td>
-								<td>
-									@if($index != 0)
-										<span class="glyphicon glyphicon-remove text-danger icon-btn remove-outcome"></span>
-									@endif
-								</td>
-							</tr>
-						@endforeach
-					</tbody>
-				</table>
-				<div>
-					<button class="add-outcome btn btn-success pull-right btn-sm"><span class="glyphicon glyphicon-plus"></span>Add Learning Outcome</button>
-					<br><br><br>
-				</div>
-			</div>
-		@endforeach
-
-		<div class="text-right">
-            <button id="button-create-rubric" class="btn btn-primary save">
-                <span class="glyphicon glyphicon-floppy-disk"></span>
-                Save
-            </button>
-            <a href="{{ URL::action('FiveYearPlansController@show', array('program'=>$program->id, 'plan'=>$plan->id) )}}" id="button-create-rubric" class="btn btn-primary">
-                <span class="glyphicon glyphicon-arrow-left"></span>
-                Back to Plan
-            </a>
-            <br><br>
-        </div>
-	</div>
-</div>
+    </div>
 
 @stop
 
@@ -137,294 +159,294 @@
 
 @section('javascript')
 
-// --------------------------------------------------------------------------
-// Page Load
-// --------------------------------------------------------------------------
-
-// Hide 'x' buttons for courses and objectives that are alone
-$('.objective-select-wrapper:only-of-type, .course-select-wrapper:only-of-type')
-	.find('.remove-course, .remove-objective')
-	.hide();
-
-
-
-// --------------------------------------------------------------------------
-// Events
-// --------------------------------------------------------------------------
-
-// On clicking a button to add outcome
-$('.add-outcome').on('click', function(e)
-{
-	var table = $(this).closest('.mini-plan').find('table');
-	addOutcome(table);
-});
-
-// On clicking a button to remove a course
-$('table').on('click', '.remove-objective', function(e)
-{
-	removeObjective($(this));
-});
-
-// On clicking a button to remove a course
-$('table').on('click', '.remove-course', function(e)
-{
-	removeCourse($(this));
-});
-
-// On clicking the x to remove an outcome from the plan
-$('table').on('click', '.remove-outcome', function(e)
-{
-	var table = $(this).closest('.mini-plan').find('table');
-	var row = $(this).closest('tr');
-	removeOutcome(table, row);
-});
-
-// On clicking a button to add a objective
-$('.add-objective').on('click', function(e)
-{
-	var table = $(this).closest('.mini-plan').find('table');
-	var objective_select_wrapper = $(this).parent().find('.objective-select-wrapper:last');
-	var select = $(this).parent().find('select:last');
-	var selected_objective_id = select.find(':selected').val();
-	var clone = objective_select_wrapper.clone();
-	clone.insertAfter(objective_select_wrapper);
-	objective_select_wrapper.parent().find('.remove-objective').show();
-});
-
-// On clicking a button to add a course
-$('.add-course').on('click', function(e)
-{
-	var table = $(this).closest('.mini-plan').find('table');
-	var course_select_wrapper = $(this).parent().find('.course-select-wrapper:last');
-	var select = $(this).parent().find('select:last');
-	var selected_course_id = select.find(':selected').val();
-	var clone = course_select_wrapper.clone();
-	clone.insertAfter(course_select_wrapper);
-	course_select_wrapper.parent().find('.remove-course').show();
-});
-
-// When user selects another outcome
-$('.outcome').on('change', function(e)
-{
-	fetchObjectives($(this));
-});
-
-// Gather, structure and send data to server for saving
-$('.save').on('click', function(e)
-{
-	var five_year_plan = new Object();
-	five_year_plan.plan_id = $('#plan').data('plan-id');
-	five_year_plan.quinquennium_id = $('#quinquennium').data('quinquennium-id');
-	five_year_plan.program_id = $('#program').data('program-id');
-	five_year_plan.mini_plans = new Array();
-
-	$('.mini-plan').each(function(index){
-
-		var mini_plan = new Object();
-
-		mini_plan.year_start = $(this).find('.year-start').text();
-		mini_plan.year_end = $(this).find('.year-end').text();
-
-		// Array for outcome objects
-		mini_plan.outcomes = new Array();
-
-		$(this).find('.outcome').each(function(index){
-
-			// Outcome object
-			var outcome = new Object();
-
-			outcome.id = $(this).find(':selected').val();
-			outcome.objectives = new Array();
-			outcome.courses = new Array();
-
-			// Gather objective information
-			$(this).closest('tr').find('.objective').each(function()
-			{
-				var objective = new Object();
-
-				objective.original_id = $(this).find(':selected').val();
-				objective.text = $(this).find(':selected').text();
-
-				outcome.objectives.push(jQuery.extend({}, objective));
-
-				objective = null;
-			});
-
-			// Gather course information
-			$(this).closest('tr').find('.course').each(function()
-			{
-				var course = new Object();
-
-				course.code = $(this).find(':selected').data('course-code');
-				course.number = $(this).find(':selected').data('course-number');
-				course.name = $(this).find(':selected').data('course-name');
-
-				outcome.courses.push(jQuery.extend({}, course));
-				course = null;
-			});
-
-			mini_plan.outcomes.push(jQuery.extend({}, outcome));
-			outcome = null;
-
-		});
-
-		five_year_plan.mini_plans.push(jQuery.extend({}, mini_plan));
-		mini_plan = null;
-	});
-
-	console.log(five_year_plan);
-
-	$.post(
-		"{{ URL::action('FiveYearPlansController@update', array($program->id)) }}",
-		{
-			five_year_plan: JSON.stringify(five_year_plan)
-		},
-		function(data)
-		{
-			console.log(data);
-			var response = data;
-
-			console.log('status: '+response.status);
-			if(response.status == 'success')
-			{
-				console.log('success');
-				window.location = response.redirect_url;
-			}
-			else
-			{
-				jsError(response.message);
-			}
-		},
-		"json"
-	)
-	.fail( function(xhr, status, error) {
-
-		console.log('fail:'+error);
-		// Always scroll to the top
-        $(this).scrollTop(0);
-        $('html').animate({scrollTop:0}, 1);
-        $('body').animate({scrollTop:0}, 1);
-
-		jsError(error);
-
-		// Show js error with default message
-		$('#js-error-row').fadeIn('slow', function () {
-			$(this).delay(3000).fadeOut('slow');
-		});
-	}
-	);
-});
-
-// --------------------------------------------------------------------------
-// Functions
-// --------------------------------------------------------------------------
-
-// Removes a objective
-function removeObjective(button)
-{
-	var objective_select_wrapper = button.parent();
-
-	// If only one objective will remain, hide 'x' button
-	if(objective_select_wrapper.siblings('.objective-select-wrapper').length == 1)
-	{
-		objective_select_wrapper.siblings('.objective-select-wrapper').find('.remove-objective').hide();
-	}
-
-	// Remove objective
-	objective_select_wrapper.remove();
-}
-
-// Removes a course
-function removeCourse(button)
-{
-	var course_select_wrapper = button.parent();
-
-	// If only one course will remain, hide 'x' button
-	if(course_select_wrapper.siblings('.course-select-wrapper').length == 1)
-	{
-		course_select_wrapper.siblings('.course-select-wrapper').find('.remove-course').hide();
-	}
-
-	// Remove course
-	course_select_wrapper.remove();
-}
-
-
-// Checks whether a mini plan has outcomes
-function hasOutcomes(table)
-{
-	if(table.find('.outcome-cell').length > 0)
-		return true;
-	else
-		return false;
-}
-
-// Add an outcome to a mini (annual) plan
-function addOutcome(table)
-{
-	var header_rowspan = Number(table.find('.academic-year').attr('rowspan'));
-
-	var clone = table.find('tbody tr:first').clone(true, true);
-
-	// Remove academic year
-	clone.children(':first').remove();
-
-	// Remove all objectives and course except the first ones
-	clone.find('.objective-select-wrapper').not(':first').remove();
-	clone.find('.course-select-wrapper').not(':first').remove();
-
-	// Add removal button
-	clone.children(':last').append('<span class="glyphicon glyphicon-remove text-danger icon-btn remove-outcome"></span>');
-
-	if(hasOutcomes(table))
-	{
-		table.find('tbody').append(clone);
-
-		table.find('.academic-year').attr('rowspan', header_rowspan+1);
-	}
-}
-
-// Remove an Outcome
-function removeOutcome(table, row)
-{
-	var header_rowspan = Number(table.find('.academic-year').attr('rowspan'));
-
-	row.remove();
-	table.find('.academic-year').attr('rowspan', header_rowspan-1);
-}
-
-// Fetch objectives associated to an outcome and program
-function fetchObjectives(outcome)
-{
-	var outcome_id = outcome.find(':selected').val();
-	var program_id = $('#program').data('program-id');
-
-	$.post(
-		"{{ URL::action('ObjectivesController@fetch') }}",
-		{
-			outcome_id: outcome_id,
-			program_id: program_id,
-			format: 'select'
-		},
-		function(data)
-		{
-			var select = outcome.closest('tr').find('.objective');
-			if(data == '')
-			{
-				select.prop('disabled', true);
-				select.empty().append('<option value="0"><span class="glyphicon glyphicon-remove"></span> None</option>');
-			}
-			else
-			{
-				select.prop('disabled', false);
-				select.empty().append(data);
-			}
-
-			if(select.length > 1) {
-				select.first().parent().siblings('.objective-select-wrapper').remove();
-			}
-		}
-	);
-}
+    // --------------------------------------------------------------------------
+    // Page Load
+    // --------------------------------------------------------------------------
+
+    // Hide 'x' buttons for courses and objectives that are alone
+    $('.objective-select-wrapper:only-of-type, .course-select-wrapper:only-of-type')
+    .find('.remove-course, .remove-objective')
+    .hide();
+
+
+
+    // --------------------------------------------------------------------------
+    // Events
+    // --------------------------------------------------------------------------
+
+    // On clicking a button to add outcome
+    $('.add-outcome').on('click', function(e)
+    {
+    var table = $(this).closest('.mini-plan').find('table');
+    addOutcome(table);
+    });
+
+    // On clicking a button to remove a course
+    $('table').on('click', '.remove-objective', function(e)
+    {
+    removeObjective($(this));
+    });
+
+    // On clicking a button to remove a course
+    $('table').on('click', '.remove-course', function(e)
+    {
+    removeCourse($(this));
+    });
+
+    // On clicking the x to remove an outcome from the plan
+    $('table').on('click', '.remove-outcome', function(e)
+    {
+    var table = $(this).closest('.mini-plan').find('table');
+    var row = $(this).closest('tr');
+    removeOutcome(table, row);
+    });
+
+    // On clicking a button to add a objective
+    $('.add-objective').on('click', function(e)
+    {
+    var table = $(this).closest('.mini-plan').find('table');
+    var objective_select_wrapper = $(this).parent().find('.objective-select-wrapper:last');
+    var select = $(this).parent().find('select:last');
+    var selected_objective_id = select.find(':selected').val();
+    var clone = objective_select_wrapper.clone();
+    clone.insertAfter(objective_select_wrapper);
+    objective_select_wrapper.parent().find('.remove-objective').show();
+    });
+
+    // On clicking a button to add a course
+    $('.add-course').on('click', function(e)
+    {
+    var table = $(this).closest('.mini-plan').find('table');
+    var course_select_wrapper = $(this).parent().find('.course-select-wrapper:last');
+    var select = $(this).parent().find('select:last');
+    var selected_course_id = select.find(':selected').val();
+    var clone = course_select_wrapper.clone();
+    clone.insertAfter(course_select_wrapper);
+    course_select_wrapper.parent().find('.remove-course').show();
+    });
+
+    // When user selects another outcome
+    $('.outcome').on('change', function(e)
+    {
+    fetchObjectives($(this));
+    });
+
+    // Gather, structure and send data to server for saving
+    $('.save').on('click', function(e)
+    {
+    var five_year_plan = new Object();
+    five_year_plan.plan_id = $('#plan').data('plan-id');
+    five_year_plan.quinquennium_id = $('#quinquennium').data('quinquennium-id');
+    five_year_plan.program_id = $('#program').data('program-id');
+    five_year_plan.mini_plans = new Array();
+
+    $('.mini-plan').each(function(index){
+
+    var mini_plan = new Object();
+
+    mini_plan.year_start = $(this).find('.year-start').text();
+    mini_plan.year_end = $(this).find('.year-end').text();
+
+    // Array for outcome objects
+    mini_plan.outcomes = new Array();
+
+    $(this).find('.outcome').each(function(index){
+
+    // Outcome object
+    var outcome = new Object();
+
+    outcome.id = $(this).find(':selected').val();
+    outcome.objectives = new Array();
+    outcome.courses = new Array();
+
+    // Gather objective information
+    $(this).closest('tr').find('.objective').each(function()
+    {
+    var objective = new Object();
+
+    objective.original_id = $(this).find(':selected').val();
+    objective.text = $(this).find(':selected').text();
+
+    outcome.objectives.push(jQuery.extend({}, objective));
+
+    objective = null;
+    });
+
+    // Gather course information
+    $(this).closest('tr').find('.course').each(function()
+    {
+    var course = new Object();
+
+    course.code = $(this).find(':selected').data('course-code');
+    course.number = $(this).find(':selected').data('course-number');
+    course.name = $(this).find(':selected').data('course-name');
+
+    outcome.courses.push(jQuery.extend({}, course));
+    course = null;
+    });
+
+    mini_plan.outcomes.push(jQuery.extend({}, outcome));
+    outcome = null;
+
+    });
+
+    five_year_plan.mini_plans.push(jQuery.extend({}, mini_plan));
+    mini_plan = null;
+    });
+
+    console.log(five_year_plan);
+
+    $.post(
+    "{{ URL::action('FiveYearPlansController@update', [$program->id]) }}",
+    {
+    five_year_plan: JSON.stringify(five_year_plan)
+    },
+    function(data)
+    {
+    console.log(data);
+    var response = data;
+
+    console.log('status: '+response.status);
+    if(response.status == 'success')
+    {
+    console.log('success');
+    window.location = response.redirect_url;
+    }
+    else
+    {
+    jsError(response.message);
+    }
+    },
+    "json"
+    )
+    .fail( function(xhr, status, error) {
+
+    console.log('fail:'+error);
+    // Always scroll to the top
+    $(this).scrollTop(0);
+    $('html').animate({scrollTop:0}, 1);
+    $('body').animate({scrollTop:0}, 1);
+
+    jsError(error);
+
+    // Show js error with default message
+    $('#js-error-row').fadeIn('slow', function () {
+    $(this).delay(3000).fadeOut('slow');
+    });
+    }
+    );
+    });
+
+    // --------------------------------------------------------------------------
+    // Functions
+    // --------------------------------------------------------------------------
+
+    // Removes a objective
+    function removeObjective(button)
+    {
+    var objective_select_wrapper = button.parent();
+
+    // If only one objective will remain, hide 'x' button
+    if(objective_select_wrapper.siblings('.objective-select-wrapper').length == 1)
+    {
+    objective_select_wrapper.siblings('.objective-select-wrapper').find('.remove-objective').hide();
+    }
+
+    // Remove objective
+    objective_select_wrapper.remove();
+    }
+
+    // Removes a course
+    function removeCourse(button)
+    {
+    var course_select_wrapper = button.parent();
+
+    // If only one course will remain, hide 'x' button
+    if(course_select_wrapper.siblings('.course-select-wrapper').length == 1)
+    {
+    course_select_wrapper.siblings('.course-select-wrapper').find('.remove-course').hide();
+    }
+
+    // Remove course
+    course_select_wrapper.remove();
+    }
+
+
+    // Checks whether a mini plan has outcomes
+    function hasOutcomes(table)
+    {
+    if(table.find('.outcome-cell').length > 0)
+    return true;
+    else
+    return false;
+    }
+
+    // Add an outcome to a mini (annual) plan
+    function addOutcome(table)
+    {
+    var header_rowspan = Number(table.find('.academic-year').attr('rowspan'));
+
+    var clone = table.find('tbody tr:first').clone(true, true);
+
+    // Remove academic year
+    clone.children(':first').remove();
+
+    // Remove all objectives and course except the first ones
+    clone.find('.objective-select-wrapper').not(':first').remove();
+    clone.find('.course-select-wrapper').not(':first').remove();
+
+    // Add removal button
+    clone.children(':last').append('<span class="glyphicon glyphicon-remove text-danger icon-btn remove-outcome"></span>');
+
+    if(hasOutcomes(table))
+    {
+    table.find('tbody').append(clone);
+
+    table.find('.academic-year').attr('rowspan', header_rowspan+1);
+    }
+    }
+
+    // Remove an Outcome
+    function removeOutcome(table, row)
+    {
+    var header_rowspan = Number(table.find('.academic-year').attr('rowspan'));
+
+    row.remove();
+    table.find('.academic-year').attr('rowspan', header_rowspan-1);
+    }
+
+    // Fetch objectives associated to an outcome and program
+    function fetchObjectives(outcome)
+    {
+    var outcome_id = outcome.find(':selected').val();
+    var program_id = $('#program').data('program-id');
+
+    $.post(
+    "{{ URL::action('ObjectivesController@fetch') }}",
+    {
+    outcome_id: outcome_id,
+    program_id: program_id,
+    format: 'select'
+    },
+    function(data)
+    {
+    var select = outcome.closest('tr').find('.objective');
+    if(data == '')
+    {
+    select.prop('disabled', true);
+    select.empty().append('<option value="0"><span class="glyphicon glyphicon-remove"></span> None</option>');
+    }
+    else
+    {
+    select.prop('disabled', false);
+    select.empty().append(data);
+    }
+
+    if(select.length > 1) {
+    select.first().parent().siblings('.objective-select-wrapper').remove();
+    }
+    }
+    );
+    }
 
 @stop

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

@@ -1,11 +1,11 @@
 @extends('layouts.master')
 
 @section('navigation')
-    @if($role==1)
-        @include('local.managers.admins._navigation')
-    @elseif($role==2)
+    @if ($role == 1)
+        @include('local.managers.admins._new_navigation')
+    @elseif($role == 2)
         @include('local.managers.sCoords._new_navigation')
-    @elseif($role==3)
+    @elseif($role == 3)
         @include('local.managers.pCoords._new_navigation')
     @else
         @include('local.professors._navigation')
@@ -16,7 +16,9 @@
 
     <div class="row">
         <div class="col-md-9">
-            <p class="lead">You should establish at least one objective per Learning Outcome. Inactive objectives will not be available to new rubrics, but the criteria already associated to them will remain unaffected.</p>
+            <p class="lead">You should establish at least one objective per Learning Outcome. Inactive objectives
+                will not be available to new rubrics, but the criteria already associated to them will remain unaffected.
+            </p>
 
             <table class="table table-bordered">
                 <thead>
@@ -26,25 +28,25 @@
                     </tr>
                 </thead>
                 <tbody>
-                    @foreach($objectives_by_outcome as $outcome)
+                    @foreach ($objectives_by_outcome as $outcome)
                         <?php $first_objective = true; ?>
 
-                            <?php
-                                // $criteria = DB::table('criterion_objective_program')
-                                //     ->where('objective_id', $objective->objective_id)
-                                //     ->where('criterion_objective_program.program_id', $program->id)
-                                //     ->join('criteria', 'criterion_objective_program.criterion_id', '=', 'criteria.id')
-                                //     ->get();
-                            ?>
-                            <tr>
-                                <td>{{ $outcome->outcome_name }} {{ json_encode($outcome) }}</td>
-                            </tr>
-
+                        <?php
+                        // $criteria = DB::table('criterion_objective_program')
+                        //     ->where('objective_id', $objective->objective_id)
+                        //     ->where('criterion_objective_program.program_id', $program->id)
+                        //     ->join('criteria', 'criterion_objective_program.criterion_id', '=', 'criteria.id')
+                        //     ->get();
+                        ?>
+                        <tr>
+                            <td>{{ $outcome->outcome_name }} {{ json_encode($outcome) }}</td>
+                        </tr>
                     @endforeach
                 </tbody>
             </table>
 
-            <a href="{{ action('ProgramsController@show', array($program->id)) }}" class="btn btn-primary pull-right"> Back to Program</a>
+            <a href="{{ action('ProgramsController@show', [$program->id]) }}" class="btn btn-primary pull-right"> Back
+                to Program</a>
         </div>
         <div class="col-md-3">
             <br><br>
@@ -56,32 +58,33 @@
                     <strong>Create</strong>
                 </div>
                 <div class="panel-body">
-                    {{ Form::open(array('action' => 'ObjectivesController@create')) }}
+                    {{ Form::open(['action' => 'ObjectivesController@create']) }}
 
-                        <p class="small">Write the name or description of the objective you want to create. Then, select the Learning Outcome to which it be associated. Finally, click Create.</p>
+                    <p class="small">Write the name or description of the objective you want to create. Then,
+                        select the Learning Outcome to which it be associated. Finally, click Create.</p>
 
-                        {{ Form::hidden('program_id', $program->id) }}
+                    {{ Form::hidden('program_id', $program->id) }}
 
-                        <div class="form-group">
-                            {{ Form::label('learning_objective', 'Objective') }}
-                            {{ Form::textarea('learning_objective', '', array('class' => 'form-control', 'rows'=>2)) }}
+                    <div class="form-group">
+                        {{ Form::label('learning_objective', 'Objective') }}
+                        {{ Form::textarea('learning_objective', '', ['class' => 'form-control', 'rows' => 2]) }}
 
-                        </div>
+                    </div>
 
-                        <div class="form-group">
-                            {{ Form::label('outcome_id', 'Select the Learning Outcome') }}
-                            <select name="outcome_id" class="form-control">
+                    <div class="form-group">
+                        {{ Form::label('outcome_id', 'Select the Learning Outcome') }}
+                        <select name="outcome_id" class="form-control">
                             @foreach ($outcomes as $outcome)
-                                @if(Input::old('outcome_id')==$outcome->id)
+                                @if (Input::old('outcome_id') == $outcome->id)
                                     <option selected="selected" value="{{ $outcome->id }}">{{ $outcome->name }}</option>
                                 @else
                                     <option value="{{ $outcome->id }}">{{ $outcome->name }}</option>
                                 @endif
                             @endforeach
-                            </select>
-                        </div>
+                        </select>
+                    </div>
 
-                        {{ Form::submit('Create', array('class' => 'btn btn-primary btn-block')) }}
+                    {{ Form::submit('Create', ['class' => 'btn btn-primary btn-block']) }}
                     {{ Form::close() }}
                 </div>
             </div>
@@ -94,53 +97,58 @@
                     <strong>Edit</strong>
                 </div>
                 <div class="panel-body">
-                    {{ Form::open(array('action' => 'ObjectivesController@update')) }}
+                    {{ Form::open(['action' => 'ObjectivesController@update']) }}
 
-                        <p class="small">Select the objective you want to edit. Its information will be automatically loaded. You can change the name and select a different Learning Outcome if you wish. Click Update to save the changes.</p>
+                    <p class="small">Select the objective you want to edit. Its information will be automatically
+                        loaded. You can change the name and select a different Learning Outcome if you wish. Click Update to
+                        save the changes.</p>
 
-                        {{ Form::hidden('edit_program_id', $program->id) }}
+                    {{ Form::hidden('edit_program_id', $program->id) }}
 
-                        <div class="form-group">
-                            {{ Form::label('edit_objective_id', 'Objective Selection') }}
+                    <div class="form-group">
+                        {{ Form::label('edit_objective_id', 'Objective Selection') }}
 
-                            <select name="edit_objective_id" id="edit_objective_id" class="form-control">
+                        <select name="edit_objective_id" id="edit_objective_id" class="form-control">
                             @foreach ($program->objectives() as $objective)
-                                @if(false)
-                                    <option selected="selected" value="{{ $objective->objective_id }}">{{ $objective->objective }}</option>
+                                @if (false)
+                                    <option selected="selected" value="{{ $objective->objective_id }}">
+                                        {{ $objective->objective }}</option>
                                 @else
-                                    <option value="{{ $objective->objective_id }}">{{ $objective->objective }}</option>
+                                    <option value="{{ $objective->objective_id }}">{{ $objective->objective }}
+                                    </option>
                                 @endif
                             @endforeach
-                            </select>
-                        </div>
+                        </select>
+                    </div>
 
-                        <div class="form-group">
-                            {{ Form::label('edit_learning_objective', 'Objective Name') }}
-                            {{ Form::textarea('edit_learning_objective', '', array('class' => 'form-control', 'rows'=>2)) }}
-                        </div>
+                    <div class="form-group">
+                        {{ Form::label('edit_learning_objective', 'Objective Name') }}
+                        {{ Form::textarea('edit_learning_objective', '', ['class' => 'form-control', 'rows' => 2]) }}
+                    </div>
 
-                        <div class="form-group">
-                            {{ Form::label('edit_outcome_id', 'Associated Learning Outcome') }}
-                            <select name="edit_outcome_id" id="edit_outcome_id" class="form-control">
+                    <div class="form-group">
+                        {{ Form::label('edit_outcome_id', 'Associated Learning Outcome') }}
+                        <select name="edit_outcome_id" id="edit_outcome_id" class="form-control">
                             @foreach ($outcomes as $outcome)
-                                @if(Input::old('edit_outcome_id')==$outcome->id)
-                                    <option selected="selected" value="{{ $outcome->id }}">{{ $outcome->name }}</option>
+                                @if (Input::old('edit_outcome_id') == $outcome->id)
+                                    <option selected="selected" value="{{ $outcome->id }}">{{ $outcome->name }}
+                                    </option>
                                 @else
                                     <option value="{{ $outcome->id }}">{{ $outcome->name }}</option>
                                 @endif
                             @endforeach
-                            </select>
-                        </div>
-
-                        <div class="form-group">
-                            {{ Form::label('edit_active', 'Status') }}
-                            <select name="edit_active" id="edit_active" class="form-control">
-                                <option value="1">Active</option>
-                                <option value="0">Inactive</option>
-                            </select>
-                        </div>
-
-                        {{ Form::submit('Update', array('class' => 'btn btn-primary btn-block')) }}
+                        </select>
+                    </div>
+
+                    <div class="form-group">
+                        {{ Form::label('edit_active', 'Status') }}
+                        <select name="edit_active" id="edit_active" class="form-control">
+                            <option value="1">Active</option>
+                            <option value="0">Inactive</option>
+                        </select>
+                    </div>
+
+                    {{ Form::submit('Update', ['class' => 'btn btn-primary btn-block']) }}
                     {{ Form::close() }}
                 </div>
             </div>
@@ -152,67 +160,67 @@
 
 @section('javascript')
 
-// ----------------------------------------------------------------------------
-// Page Load
-// ----------------------------------------------------------------------------
+    // ----------------------------------------------------------------------------
+    // Page Load
+    // ----------------------------------------------------------------------------
 
-$('.panel-body').hide();
+    $('.panel-body').hide();
 
-loadObjective();
+    loadObjective();
 
-// ----------------------------------------------------------------------------
-// Events
-// ----------------------------------------------------------------------------
+    // ----------------------------------------------------------------------------
+    // Events
+    // ----------------------------------------------------------------------------
 
-// Toggle visibility for accordion panels
-$('.panel-heading').on('click', function()
-{
+    // Toggle visibility for accordion panels
+    $('.panel-heading').on('click', function()
+    {
     toggleTriangles($(this));
     $(this).siblings('.panel-body').stop().slideToggle();
-});
+    });
 
-$('#edit_objective_id').on('change', function()
-{
+    $('#edit_objective_id').on('change', function()
+    {
     loadObjective();
-});
+    });
 
-// ----------------------------------------------------------------------------
-// Functions
-// ----------------------------------------------------------------------------
+    // ----------------------------------------------------------------------------
+    // Functions
+    // ----------------------------------------------------------------------------
 
-function toggleTriangles(element)
-{
+    function toggleTriangles(element)
+    {
     if(element.find('.glyphicon').hasClass('glyphicon-triangle-right'))
     {
-        element.find('.glyphicon').removeClass('glyphicon-triangle-right');
-        element.find('.glyphicon').addClass('glyphicon-triangle-bottom');
+    element.find('.glyphicon').removeClass('glyphicon-triangle-right');
+    element.find('.glyphicon').addClass('glyphicon-triangle-bottom');
     }
     else if(element.find('.glyphicon').hasClass('glyphicon-triangle-bottom'))
     {
-        element.find('.glyphicon').removeClass('glyphicon-triangle-bottom');
-        element.find('.glyphicon').addClass('glyphicon-triangle-right');
+    element.find('.glyphicon').removeClass('glyphicon-triangle-bottom');
+    element.find('.glyphicon').addClass('glyphicon-triangle-right');
+    }
     }
-}
 
-function loadObjective()
-{
+    function loadObjective()
+    {
     $.post(
-        '{{ action('ObjectivesController@fetchObjective') }}',
-        {
-            objective_id: $('#edit_objective_id').find(':selected').val()
-        },
-        function(data)
-        {
-            if(data == '')
-                return;
-
-            objective = JSON.parse(data);
-
-            $('#edit_learning_objective').text(objective.text);
-            $('#edit_active').val(objective.active);
-            $('#edit_outcome_id').val(objective.outcome_id);
-        }
+    '{{ action('ObjectivesController@fetchObjective') }}',
+    {
+    objective_id: $('#edit_objective_id').find(':selected').val()
+    },
+    function(data)
+    {
+    if(data == '')
+    return;
+
+    objective = JSON.parse(data);
+
+    $('#edit_learning_objective').text(objective.text);
+    $('#edit_active').val(objective.active);
+    $('#edit_outcome_id').val(objective.outcome_id);
+    }
     )
-}
+    }
 
 @stop

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

@@ -2,7 +2,7 @@
 
 @section('navigation')
     @if($role==1)
-        @include('local.managers.admins._navigation')
+        @include('local.managers.admins._new_navigation')
     @elseif($role==2)
         @include('local.managers.sCoords._new_navigation')
     @elseif($role==3)

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

@@ -1,72 +1,77 @@
 @extends('layouts.master')
 
 @section('navigation')
-    @if(Auth::user()->role==1)
-        @include('local.managers.admins._navigation')
-    @elseif(Auth::user()->role==2)
+    @if (Auth::user()->role == 1)
+        @include('local.managers.admins._new_navigation')
+    @elseif(Auth::user()->role == 2)
         @include('local.managers.sCoords._new_navigation')
-    @elseif(Auth::user()->role==3)
+    @elseif(Auth::user()->role == 3)
         @include('local.managers.pCoords._new_navigation')
     @endif
 @stop
 
 @section('main')
-<div class="row">
-	<div class="table-responsive">
-		<table class="table table-bordered datatable">
-			<thead>
-				<tr>
-					<th class="active col-sm-2 col-md-2">Program</th>
-					<th class="active col-sm-2 col-md-2">School</th>
-					@foreach($quinquenniums as $quinquennium)
-						@for($year = date('Y', strtotime($quinquennium->start_date)); $year < date('Y', strtotime($quinquennium->end_date)); $year++)
-							<th class="active">{{ $year }} - {{ $year+1 }}</th>
-						@endfor
-					@endforeach
-				</tr>
-			</thead>
-			@foreach($programs as $program)
-				<tr>
-					<th class="active col-sm-2 col-md-2"> {{ $program->name }} </th>
-					<td class="col-sm-2 col-md-2"> {{ $program->school->name }} </td>
-					@foreach($quinquenniums as $quinquennium)
-						@for($year = date('Y', strtotime($quinquennium->start_date)); $year < date('Y', strtotime($quinquennium->end_date)); $year++)
-							<td>
-								<?php $annual_plan = AnnualPlan::where('program_id', $program->id)->where('quinquennium_id', $quinquennium->id)->where('year_start', $year)->first(); ?>
-								@if($annual_plan)
-									<a class="btn btn-sm btn-default" href="{{ URL::action('AnnualPlansController@show', array($program->id, $annual_plan->id)) }}">
-										<span class="glyphicon glyphicon-eye-open"></span>
-										View
-									</a>
-									@if($quinquennium->id == $current_quinquennium->id  // Quinquennium is running
-										&& date('Y') == $year // Current year is the same as year
-										&& date('m') <= date('m', strtotime($current_quinquennium->annual_plan_due_date)) // Current month (and day, below) is the same or before the due month (and day)
-										&& date('d') <= date('d', strtotime($current_quinquennium->annual_plan_due_date)))
-										<a class="btn btn-sm btn-default" href="{{ URL::action('AnnualPlansController@edit', array($program->id, $annual_plan->id)) }}">
-											<span class="glyphicon glyphicon-pencil"></span>
-											Edit
-										</a>
-									@endif
-								@elseif(
-									$quinquennium->id == $current_quinquennium->id  // Quinquennium is running
-									&& date('Y') == $year // Current year is the same as year
-									&& date('m') <= date('m', strtotime($current_quinquennium->annual_plan_due_date)) // Current month (and day, below) is the same or before the due month (and day)
-									&& date('d') <= date('d', strtotime($current_quinquennium->annual_plan_due_date)))
-										<a class="btn btn-sm btn-default" href="{{ URL::action('AnnualPlansController@create', array($program->id)) }}">
-											<span class="glyphicon glyphicon-plus"></span>
-											Create
-										</a>
-								@else
-									Plan unavailable
-								@endif
-							</td>
-						@endfor
-					@endforeach
-				</tr>
-			@endforeach
-		</table>
-	</div>
-</div>
+    <div class="row">
+        <div class="table-responsive">
+            <table class="table table-bordered datatable">
+                <thead>
+                    <tr>
+                        <th class="active col-sm-2 col-md-2">Program</th>
+                        <th class="active col-sm-2 col-md-2">School</th>
+                        @foreach ($quinquenniums as $quinquennium)
+                            @for ($year = date('Y', strtotime($quinquennium->start_date)); $year < date('Y', strtotime($quinquennium->end_date)); $year++)
+                                <th class="active">{{ $year }} - {{ $year + 1 }}</th>
+                            @endfor
+                        @endforeach
+                    </tr>
+                </thead>
+                @foreach ($programs as $program)
+                    <tr>
+                        <th class="active col-sm-2 col-md-2"> {{ $program->name }} </th>
+                        <td class="col-sm-2 col-md-2"> {{ $program->school->name }} </td>
+                        @foreach ($quinquenniums as $quinquennium)
+                            @for ($year = date('Y', strtotime($quinquennium->start_date)); $year < date('Y', strtotime($quinquennium->end_date)); $year++)
+                                <td>
+                                    <?php $annual_plan = AnnualPlan::where('program_id', $program->id)
+                                        ->where('quinquennium_id', $quinquennium->id)
+                                        ->where('year_start', $year)
+                                        ->first(); ?>
+                                    @if ($annual_plan)
+                                        <a class="btn btn-sm btn-default"
+                                            href="{{ URL::action('AnnualPlansController@show', [$program->id, $annual_plan->id]) }}">
+                                            <span class="glyphicon glyphicon-eye-open"></span>
+                                            View
+                                        </a>
+                                        @if ($quinquennium->id == $current_quinquennium->id && // Quinquennium is running
+                                        date('Y') == $year && // Current year is the same as year
+                                        date('m') <= date('m', strtotime($current_quinquennium->annual_plan_due_date)) && // Current month (and day, below) is the same or before the due month (and day)
+                                            date('d') <= date('d', strtotime($current_quinquennium->annual_plan_due_date)))
+                                            <a class="btn btn-sm btn-default"
+                                                href="{{ URL::action('AnnualPlansController@edit', [$program->id, $annual_plan->id]) }}">
+                                                <span class="glyphicon glyphicon-pencil"></span>
+                                                Edit
+                                            </a>
+                                        @endif
+                                    @elseif($quinquennium->id == $current_quinquennium->id && // Quinquennium is running
+                                    date('Y') == $year && // Current year is the same as year
+                                    date('m') <= date('m', strtotime($current_quinquennium->annual_plan_due_date)) && // Current month (and day, below) is the same or before the due month (and day)
+                                        date('d') <= date('d', strtotime($current_quinquennium->annual_plan_due_date)))
+                                        <a class="btn btn-sm btn-default"
+                                            href="{{ URL::action('AnnualPlansController@create', [$program->id]) }}">
+                                            <span class="glyphicon glyphicon-plus"></span>
+                                            Create
+                                        </a>
+                                    @else
+                                        Plan unavailable
+                                    @endif
+                                </td>
+                            @endfor
+                        @endforeach
+                    </tr>
+                @endforeach
+            </table>
+        </div>
+    </div>
 @stop
 
 @section('included-js')
@@ -75,13 +80,13 @@
 
 @section('javascript')
 
-table = $('.datatable').dataTable({
+    table = $('.datatable').dataTable({
     "columnDefs": [
-    	{ "searchable": true, "sortable": true, "targets": [0, 1]},
-  	]
-});
+    { "searchable": true, "sortable": true, "targets": [0, 1]},
+    ]
+    });
 
-$('a.toggle-vis').on('click', function (e) {
+    $('a.toggle-vis').on('click', function (e) {
     e.preventDefault();
 
     // Get the column API object
@@ -89,6 +94,6 @@ $('a.toggle-vis').on('click', function (e) {
 
     // Toggle the visibility
     column.visible( ! column.visible() );
-} );
+    } );
 
 @stop

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

@@ -1,67 +1,72 @@
 @extends('layouts.master')
 
 @section('navigation')
-    @if(Auth::user()->role==1)
-        @include('local.managers.admins._navigation')
-    @elseif(Auth::user()->role==2)
+    @if (Auth::user()->role == 1)
+        @include('local.managers.admins._new_navigation')
+    @elseif(Auth::user()->role == 2)
         @include('local.managers.sCoords._new_navigation')
-    @elseif(Auth::user()->role==3)
+    @elseif(Auth::user()->role == 3)
         @include('local.managers.pCoords._new_navigation')
     @endif
 @stop
 
 @section('main')
-<div class="row">
-	<div class="table-responsive">
-		<table class="table table-bordered datatable">
-			<thead>
-				<tr>
-					<th class="active col-sm-2 col-md-2">Program</th>
-					<th class="active col-sm-2 col-md-2">School</th>
-					@foreach($quinquenniums as $quinquennium)
-						<th class="active">{{ date('Y', strtotime($quinquennium->start_date)) }}-{{ date('Y', strtotime($quinquennium->end_date)) }} Quinquennium</th>
-					@endforeach
-				</tr>
-			</thead>
-			@foreach($programs as $program)
-				<tr>
-					<th class="active col-sm-2 col-md-2"> {{ $program->name }} </th>
-					<td class="col-sm-2 col-md-2"> {{ $program->school->name }} </td>
-					@foreach($quinquenniums as $quinquennium)
-						<td>
-							<?php $five_year_plan = FiveYearPlan::where('program_id', $program->id)->where('quinquennium_id', $quinquennium->id)->first(); ?>
-							@if($five_year_plan)
-								<a class="btn btn-sm btn-default" href="{{ URL::action('FiveYearPlansController@show', array($program->id, $five_year_plan->id)) }}">
-									<span class="glyphicon glyphicon-eye-open"></span>
-									View
-								</a>
-								@if(date('Y-m-d') <= $current_quinquennium->five_year_plan_due_date)
-									<a class="btn btn-sm btn-default" href="{{ URL::action('FiveYearPlansController@edit', array($program->id, $five_year_plan->id)) }}">
-										<span class="glyphicon glyphicon-pencil"></span>
-										Edit
-									</a>
-								@endif
-							@elseif(
-								$quinquennium->id == $current_quinquennium->id  // Quinquennium is running
-								&& date('Y-m-d') >= $current_quinquennium->start_date // Current date
-								&& date('Y-m-d') <= $current_quinquennium->end_date)
-									<a class="btn btn-sm btn-default" href="{{ URL::action('FiveYearPlansController@create', array($program->id)) }}">
-										<span class="glyphicon glyphicon-plus"></span>
-										Create
-									</a>
-
-							@elseif( $current_quinquennium->start_date < $quinquennium->start_date)
-								Available {{ date('M/d/Y', strtotime($quinquennium->start_date)) }}
-							@else
-								Plan not available
-							@endif
-						</td>
-					@endforeach
-				</tr>
-			@endforeach
-		</table>
-	</div>
-</div>
+    <div class="row">
+        <div class="table-responsive">
+            <table class="table table-bordered datatable">
+                <thead>
+                    <tr>
+                        <th class="active col-sm-2 col-md-2">Program</th>
+                        <th class="active col-sm-2 col-md-2">School</th>
+                        @foreach ($quinquenniums as $quinquennium)
+                            <th class="active">
+                                {{ date('Y', strtotime($quinquennium->start_date)) }}-{{ date('Y', strtotime($quinquennium->end_date)) }}
+                                Quinquennium</th>
+                        @endforeach
+                    </tr>
+                </thead>
+                @foreach ($programs as $program)
+                    <tr>
+                        <th class="active col-sm-2 col-md-2"> {{ $program->name }} </th>
+                        <td class="col-sm-2 col-md-2"> {{ $program->school->name }} </td>
+                        @foreach ($quinquenniums as $quinquennium)
+                            <td>
+                                <?php $five_year_plan = FiveYearPlan::where('program_id', $program->id)
+                                    ->where('quinquennium_id', $quinquennium->id)
+                                    ->first(); ?>
+                                @if ($five_year_plan)
+                                    <a class="btn btn-sm btn-default"
+                                        href="{{ URL::action('FiveYearPlansController@show', [$program->id, $five_year_plan->id]) }}">
+                                        <span class="glyphicon glyphicon-eye-open"></span>
+                                        View
+                                    </a>
+                                    @if (date('Y-m-d') <= $current_quinquennium->five_year_plan_due_date)
+                                        <a class="btn btn-sm btn-default"
+                                            href="{{ URL::action('FiveYearPlansController@edit', [$program->id, $five_year_plan->id]) }}">
+                                            <span class="glyphicon glyphicon-pencil"></span>
+                                            Edit
+                                        </a>
+                                    @endif
+                                @elseif($quinquennium->id == $current_quinquennium->id && // Quinquennium is running
+                                date('Y-m-d') >= $current_quinquennium->start_date && // Current date
+                                    date('Y-m-d') <= $current_quinquennium->end_date)
+                                    <a class="btn btn-sm btn-default"
+                                        href="{{ URL::action('FiveYearPlansController@create', [$program->id]) }}">
+                                        <span class="glyphicon glyphicon-plus"></span>
+                                        Create
+                                    </a>
+                                @elseif($current_quinquennium->start_date < $quinquennium->start_date)
+                                    Available {{ date('M/d/Y', strtotime($quinquennium->start_date)) }}
+                                @else
+                                    Plan not available
+                                @endif
+                            </td>
+                        @endforeach
+                    </tr>
+                @endforeach
+            </table>
+        </div>
+    </div>
 @stop
 
 @section('included-js')
@@ -70,13 +75,13 @@
 
 @section('javascript')
 
-table = $('.datatable').dataTable({
+    table = $('.datatable').dataTable({
     "columnDefs": [
-    	{ "searchable": true, "sortable": true, "targets": [0, 1]},
-  	]
-});
+    { "searchable": true, "sortable": true, "targets": [0, 1]},
+    ]
+    });
 
-$('a.toggle-vis').on('click', function (e) {
+    $('a.toggle-vis').on('click', function (e) {
     e.preventDefault();
 
     // Get the column API object
@@ -84,6 +89,6 @@ $('a.toggle-vis').on('click', function (e) {
 
     // Toggle the visibility
     column.visible( ! column.visible() );
-} );
+    } );
 
 @stop

app/views/local/managers/shared/limited-course.blade.php

@@ -2,7 +2,7 @@
 
 @section('navigation')
     @if($role==1)
-        @include('local.managers.admins._navigation')
+        @include('local.managers.admins._new_navigation')
     @elseif($role==2)
         @include('local.managers.sCoords._new_navigation')
     @elseif($role==3)

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

@@ -2,7 +2,7 @@
 
 @section('navigation')
     @if (Auth::user()->role == 1)
-        @include('local.managers.admins._navigation')
+        @include('local.managers.admins._new_navigation')
     @elseif(Auth::user()->role == 2)
         @include('local.managers.sCoords._new_navigation')
     @elseif(Auth::user()->role == 3)

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

@@ -2,7 +2,7 @@
 
 @section('navigation')
     @if (Auth::user()->role == 1)
-        @include('local.managers.admins._navigation')
+        @include('local.managers.admins._new_navigation')
     @elseif(Auth::user()->role == 2)
         @include('local.managers.sCoords._new_navigation')
     @elseif(Auth::user()->role == 3)

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

@@ -2,7 +2,7 @@
 
 @section('navigation')
     @if (Auth::user()->role == 1)
-        @include('local.managers.admins._navigation')
+        @include('local.managers.admins._new_navigation')
     @elseif(Auth::user()->role == 2)
         @include('local.managers.sCoords._new_navigation')
     @elseif(Auth::user()->role == 3)
@@ -141,8 +141,8 @@
                             @foreach ($objectives as $objective)
                                 <option value="{{ $objective->id }}"
                                     data-subtext="
-                                                                                                                                                                                                                                         @if ($objective->program) &nbsp;&nbsp;&nbsp;[{{ $objective->program->name }}] @endif
-                                                                                                                                                                                                                        ">
+                                                                                                                                                                                                                                             @if ($objective->program) &nbsp;&nbsp;&nbsp;[{{ $objective->program->name }}] @endif
+                                                                                                                                                                                                                            ">
                                     {{ $objective->text }}
 
 
@@ -249,7 +249,8 @@
             <div class="modal-content">
                 <div class="modal-header">
                     <button type="button" class="close" data-dismiss="modal">&times;</button>
-                    <h5 class="modal-title">Would you like to pair these new Learning Outcomes to all the Criteria associated to
+                    <h5 class="modal-title">Would you like to pair these new Learning Outcomes to all the Criteria
+                        associated to
                         this Objective?</h5>
 
                 </div>

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

@@ -2,7 +2,7 @@
 
 @section('navigation')
     @if($role==1)
-        @include('local.managers.admins._navigation')
+        @include('local.managers.admins._new_navigation')
     @elseif($role==2)
         @include('local.managers.sCoords._new_navigation')
     @elseif($role==3)

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

@@ -2,7 +2,7 @@
 
 @section('navigation')
 @if($role==1)
-@include('local.managers.admins._navigation')
+@include('local.managers.admins._new_navigation')
 @elseif($role==2)
 @include('local.managers.sCoords._new_navigation')
 @elseif($role==3)

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

@@ -3,7 +3,7 @@
 
 @section('navigation')
     @if($role==1)
-        @include('local.managers.admins._navigation')
+        @include('local.managers.admins._new_navigation')
     @elseif($role==2)
         @include('local.managers.sCoords._new_navigation')
      @endif

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

@@ -1,143 +1,152 @@
 @extends('layouts.master')
 
 @section('navigation')
-    @if($role==1)
-        @include('local.managers.admins._navigation')
-    @elseif($role==2)
+    @if ($role == 1)
+        @include('local.managers.admins._new_navigation')
+    @elseif($role == 2)
         @include('local.managers.sCoords._new_navigation')
-    @elseif($role==3)
+    @elseif($role == 3)
         @include('local.managers.pCoords._new_navigation')
     @endif
 @stop
 
 @section('main')
-  <button class="btn btn-lg btn-primary pull-right" id='show'>Custom Report</button>
-  <div class="" id='make_report'>
-    <hr>
-    <b><h3>Report Options</h3><br></b>
-    {{-- For for adding a new outcome --}}
-    {{ Form::open(array('action' => 'ProgramsController@showReport')) }}
-    <div class="row">
-      <div class="col-md-1">
-      </div>
-      <div class="col-md-5">
-      {{ Form::label('name', 'Select which semesters to report on') }}<br>
-          @foreach ($semesters as $semester)
-            @if ($semester->is_visible)
-              <div class="form-group">
-                <input type="checkbox" id="semester{{$semester->id}}" name="semester{{$semester->id}}" value="semester{{$semester->id}}">
-                <label for="semester{{$semester->id}}">{{$semester->name}}({{$semester->code}})</label>
-                {{-- {{ Form::checkbox('semester'.$semester->id, $semester->name, array('class' => 'form-control', 'id'=>$semester->id)) }}
+    <button class="btn btn-lg btn-primary pull-right" id='show'>Custom Report</button>
+    <div class="" id='make_report'>
+        <hr>
+        <b>
+            <h3>Report Options</h3><br>
+        </b>
+        {{-- For for adding a new outcome --}}
+        {{ Form::open(['action' => 'ProgramsController@showReport']) }}
+        <div class="row">
+            <div class="col-md-1">
+            </div>
+            <div class="col-md-5">
+                {{ Form::label('name', 'Select which semesters to report on') }}<br>
+                @foreach ($semesters as $semester)
+                    @if ($semester->is_visible)
+                        <div class="form-group">
+                            <input type="checkbox" id="semester{{ $semester->id }}" name="semester{{ $semester->id }}"
+                                value="semester{{ $semester->id }}">
+                            <label for="semester{{ $semester->id }}">{{ $semester->name }}({{ $semester->code }})</label>
+                            {{-- {{ Form::checkbox('semester'.$semester->id, $semester->name, array('class' => 'form-control', 'id'=>$semester->id)) }}
                 {{ Form::label('semester'.$semester->id, $semester->name.'('.$semester->code.')') }}<br> --}}
-              </div>
-            @endif
-          @endforeach
-      </div>
-      <div class="col-md-6">
-        {{ Form::label('divulgacion', 'Select metodos de divulgacion') }}<br>
-        <div class="form-group">
-          <input type="checkbox" id="profesores" name="profesores" value="Profesores (pares)">
-          <label for="profesores">Profesores (pares)</label>
-        </div>
-        <div class="form-group">
-          <input type="checkbox" id="comiteDepartamental" name="comiteDepartamental" value="Comites de curriculo departamental">
-          <label for="comiteDepartamental">Comites de curriculo departamental</label>
-        </div>
-        <div class="form-group">
-          <input type="checkbox" id="comiteFacultadEscuela" name="comiteFacultadEscuela" value="Comites de curriculo  de Facultad o Escuela">
-          <label for="comiteFacultadEscuela">Comites de curriculo  de Facultad o Escuela</label>
-        </div>
-        <div class="form-group">
-          <input type="checkbox" id="pleno" name="pleno" value="Pleno de la Facultad">
-          <label for="pleno">Pleno de la Facultad</label>
-        </div>
-        <div class="form-group">
-          <input type="checkbox" id="estudiantes" name="estudiantes" value="Estudiantes">
-          <label for="estudiantes">Estudiantes</label>
-        </div>
-        <div class="form-group">
-          <input type="checkbox" id="administrativos" name="administrativos" value="Administrativos">
-          <label for="administrativos">Administrativos</label>
+                        </div>
+                    @endif
+                @endforeach
+            </div>
+            <div class="col-md-6">
+                {{ Form::label('divulgacion', 'Select metodos de divulgacion') }}<br>
+                <div class="form-group">
+                    <input type="checkbox" id="profesores" name="profesores" value="Profesores (pares)">
+                    <label for="profesores">Profesores (pares)</label>
+                </div>
+                <div class="form-group">
+                    <input type="checkbox" id="comiteDepartamental" name="comiteDepartamental"
+                        value="Comites de curriculo departamental">
+                    <label for="comiteDepartamental">Comites de curriculo departamental</label>
+                </div>
+                <div class="form-group">
+                    <input type="checkbox" id="comiteFacultadEscuela" name="comiteFacultadEscuela"
+                        value="Comites de curriculo  de Facultad o Escuela">
+                    <label for="comiteFacultadEscuela">Comites de curriculo de Facultad o Escuela</label>
+                </div>
+                <div class="form-group">
+                    <input type="checkbox" id="pleno" name="pleno" value="Pleno de la Facultad">
+                    <label for="pleno">Pleno de la Facultad</label>
+                </div>
+                <div class="form-group">
+                    <input type="checkbox" id="estudiantes" name="estudiantes" value="Estudiantes">
+                    <label for="estudiantes">Estudiantes</label>
+                </div>
+                <div class="form-group">
+                    <input type="checkbox" id="administrativos" name="administrativos" value="Administrativos">
+                    <label for="administrativos">Administrativos</label>
+                </div>
+                <div class="form-group">
+                    <input type="checkbox" id="senado" name="senado" value="Senado">
+                    <label for="senado">Senado</label>
+                </div>
+                <div class="form-group">
+                    <input type="checkbox" id="comunidadWeb" name="comunidadWeb" value="Comunidad (pagina web)">
+                    <label for="comunidadWeb">Comunidad (pagina web)</label>
+                </div>
+                <div class="form-group">
+                    <input type="checkbox" id="otros" name="otros" value="Otros">
+                    <label for="otros">Otro- <input type="text" id='otherBox'></label>
+                </div>
+            </div>
         </div>
-        <div class="form-group">
-          <input type="checkbox" id="senado" name="senado" value="Senado">
-          <label for="senado">Senado</label>
+        <div class="row">
+            <div class=""><button type="submit" id='submit' class="btn btn-lg btn-primary center-block">Create
+                    Report</button></div>
         </div>
-        <div class="form-group">
-          <input type="checkbox" id="comunidadWeb" name="comunidadWeb" value="Comunidad (pagina web)">
-          <label for="comunidadWeb">Comunidad (pagina web)</label>
-        </div>
-        <div class="form-group">
-          <input type="checkbox" id="otros" name="otros" value="Otros">
-          <label for="otros">Otro- <input type="text" id='otherBox'></label>
-        </div>
-      </div>
+        {{ Form::close() }}
+        <hr>
+        <button class="btn btn-lg btn-primary pull-right" id='hide'>Hide Form</button>
     </div>
+
     <div class="row">
-      <div class=""><button type="submit" id='submit' class="btn btn-lg btn-primary center-block">Create Report</button></div>
+        <div class="col-md-12">
+            <table class="table table-condensed table-stripedd datatable">
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>School</th>
+                    </tr>
+                </thead>
+                <tfoot>
+                    <tr class="column-search">
+                        <th><input class="column-search-bar form-control" type="text" placeholder="Buscar" /></th>
+                        <th><select class="column-search-select form-control">
+                                <option value=""></option>
+                            </select></th>
+                    </tr>
+                </tfoot>
+                <tbody>
+                    @foreach ($programs as $program)
+                        <tr>
+                            <td>{{ HTML::linkAction('ProgramsController@show', $program->name, [$program->id]) }}
+                            </td>
+                            <td>{{ $program->school->name }}</td>
+                        </tr>
+                    @endforeach
+                </tbody>
+            </table>
+        </div>
     </div>
-    {{ Form::close() }}
-    <hr>
-    <button class="btn btn-lg btn-primary pull-right" id='hide'>Hide Form</button>
-  </div>
-
-<div class="row">
-  <div class="col-md-12">
-      <table class="table table-condensed table-stripedd datatable">
-        <thead>
-          <tr>
-            <th>Name</th>
-            <th>School</th>
-          </tr>
-        </thead>
-        <tfoot>
-            <tr class="column-search">
-                <th><input class="column-search-bar form-control" type="text" placeholder="Buscar"/></th>
-                <th><select class="column-search-select form-control"><option value=""></option></select></th>
-            </tr>
-        </tfoot>
-        <tbody>
-          @foreach($programs as $program)
-            <tr>
-              <td>{{ HTML::linkAction('ProgramsController@show', $program->name, array($program->id)) }}</td>
-              <td>{{ $program->school->name }}</td>
-            </tr>
-          @endforeach
-        </tbody>
-      </table>
-  </div>
-</div>
 
 @stop
 
 
 @section('included-js')
 
-<!-- Datatables -->
-@include('global._datatables_js')
+    <!-- Datatables -->
+    @include('global._datatables_js')
 
 @stop
 
 @section('javascript')
 
-      $('#make_report').hide();
+    $('#make_report').hide();
 
-      //show form
-      $('#show').on('click', function(e)
-      {
-        $('#make_report').show();
-        $('#show').hide();
-      });
+    //show form
+    $('#show').on('click', function(e)
+    {
+    $('#make_report').show();
+    $('#show').hide();
+    });
 
-      //hide form
-      $('#hide').on('click', function(e)
-      {
-        $('#make_report').hide();
-        $('#show').show();
-      });
+    //hide form
+    $('#hide').on('click', function(e)
+    {
+    $('#make_report').hide();
+    $('#show').show();
+    });
 
-      //on submit, change value of the checkbox input of id 'other'
-      $('#submit').click(function(){
-        $('#otros').val('Otro- '+$('#otherBox').val());
-      });
+    //on submit, change value of the checkbox input of id 'other'
+    $('#submit').click(function(){
+    $('#otros').val('Otro- '+$('#otherBox').val());
+    });
 @stop

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

@@ -2,7 +2,7 @@
 
 @section('navigation')
     @if ($role == 1)
-        @include('local.managers.admins._navigation')
+        @include('local.managers.admins._new_navigation')
     @elseif($role == 2)
         @include('local.managers.sCoords._new_navigation')
     @elseif($role == 3)

app/views/local/managers/shared/rubrics-old.blade.php

@@ -2,7 +2,7 @@
 
 @section('navigation')
         @if(Auth::user()->role==1)
-            @include('local.managers.admins._navigation')
+            @include('local.managers.admins._new_navigation')
         @elseif(Auth::user()->role==2)
             @include('local.managers.sCoords._new_navigation')
         @elseif(Auth::user()->role==3)

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

@@ -2,7 +2,7 @@
 
 @section('navigation')
         @if(Auth::user()->role==1)
-            @include('local.managers.admins._navigation')
+            @include('local.managers.admins._new_navigation')
         @elseif(Auth::user()->role==2)
             @include('local.managers.sCoords._new_navigation')
         @elseif(Auth::user()->role==3)

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

@@ -2,7 +2,7 @@
 
 @section('navigation')
         @if(Auth::user()->role==1)
-            @include('local.managers.admins._navigation')
+            @include('local.managers.admins._new_navigation')
         @elseif(Auth::user()->role==2)
             @include('local.managers.sCoords._new_navigation')
         @elseif(Auth::user()->role==3)

app/views/local/managers/shared/school-uhs.blade.php

@@ -2,7 +2,7 @@
 
 @section('navigation')
     @if($role==1)
-        @include('local.managers.admins._navigation')
+        @include('local.managers.admins._new_navigation')
     @elseif($role==2)
         @include('local.managers.sCoords._new_navigation')
     @endif

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

@@ -2,7 +2,7 @@
 
 @section('navigation')
     @if($role==1)
-        @include('local.managers.admins._navigation')
+        @include('local.managers.admins._new_navigation')
     @elseif($role==2)
         @include('local.managers.sCoords._new_navigation')
     @endif

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

@@ -3,7 +3,7 @@
 
 @section('navigation')
     @if($role==1)
-        @include('local.managers.admins._navigation')
+        @include('local.managers.admins._new_navigation')
     @elseif($role==2)
         @include('local.managers.sCoords._new_navigation')
     @endif

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

@@ -1,365 +1,384 @@
 @extends('layouts.master')
 
 @section('navigation')
-    @if(Auth::user()->role==1)
-        @include('local.managers.admins._navigation')
-    @elseif(Auth::user()->role==2)
+    @if (Auth::user()->role == 1)
+        @include('local.managers.admins._new_navigation')
+    @elseif(Auth::user()->role == 2)
         @include('local.managers.sCoords._new_navigation')
-    @elseif(Auth::user()->role==3)
+    @elseif(Auth::user()->role == 3)
         @include('local.managers.pCoords._new_navigation')
     @endif
 @stop
 
 @section('main')
 
-<div class="row">
-	<div class="col-md-12">
-
-		<div id="quinquennium" data-quinquennium-id="{{ $plan->quinquennium->id }}"></div>
-		<div id="program" data-program-id="{{ $program->id }}"></div>
-
-		@if(!$plan->is_submitted)
-			@if(date('Y-m-d') <= $plan->quinquennium->five_year_plan_due_date)
-				<span class="glyphicon glyphicon-info-sign"></span>
-				<strong>Note:</strong> This plan is saved as a <strong>draft.</strong> Remember to submit it by <strong>{{ date('F d', strtotime($plan->quinquennium->five_year_plan_due_date)) }}</strong>. After the due date, unsubmitted drafts will not be considered.</strong>
-
-				<div class="text-right">
-					<br>
-
-		            {{ Form::open(array('action'=>'FiveYearPlansController@update', 'class'=>"form-inline")) }}
-			            <a href="{{ URL::action('FiveYearPlansController@edit', array('program'=>$program->id, 'plan'=>$plan->id) )}}" class="btn btn-primary edit">
-			                <span class="glyphicon glyphicon-pencil"></span>
-			                Edit
-			            </a>
-
-			            <button class="btn btn-primary pdf">
-			                <span class="glyphicon glyphicon-arrow-left"></span>
-			                PDF
-			            </button>
-
-			            <a href="{{ URL::action('FiveYearPlansController@msWord', array('plan'=>$plan->id))}}" class="btn btn-primary">
-			                <span class="glyphicon glyphicon-download-alt"></span>
-			                MS Word
-			            </a>
-
-		            	<button type="submit" class="btn btn-primary">
-		            		<span class="glyphicon glyphicon-send"></span>
-		            		Submit
-		            	</button>
-
-						<a href="{{ URL::action('FiveYearPlansController@index')}}" class="btn btn-primary submit">
-			                <span class="glyphicon glyphicon-arrow-left"></span>
-			                Back to Five Year Plans
-		            	</a>
-		            {{ Form::close() }}
-
-		            <br>
-	        	</div>
-			@else
-
-				<span class="glyphicon glyphicon-info-sign"></span>
-				<strong>Note:</strong> This plan was not submitted on time.</strong>
-			@endif
-		@else
-			<span class="glyphicon glyphicon-ok-sign"></span>
-			<strong>Note:</strong> This plan was submitted on {{ date('F j, Y', strtotime($plan->submitted_on)) }}
-
-
-			<div class="text-right">
-				@if(date('Y-m-d') < $plan->quinquennium->five_year_plan_due_date)
-					<br>
-		            <a href="{{ URL::action('FiveYearPlansController@edit', array('program'=>$program->id, 'plan'=>$plan->id) )}}" class="btn btn-primary revert">
-		                <span class="glyphicon glyphicon-backward"></span>
-		                 Revert Submission
-		            </a>
-		        @endif
-
-	            <br><br>
-	        </div>
-		@endif
-
-		<!-- Nav tabs -->
-		<ul class="nav nav-tabs" role="tablist">
-		<li role="presentation" class="active"><a href="#full-plan" aria-controls="full-plan" role="tab" data-toggle="tab"><h4>Full Plan</h4></a></li>
-		<li role="presentation"><a href="#summary" aria-controls="summary" role="tab" data-toggle="tab"><h4>Summary</h4></a></li>
-		</ul>
-		<br>
-
-		<!-- Tab panes -->
-		<div class="tab-content">
-			<div role="tabpanel" class="tab-pane active" id="full-plan">
-				@foreach($plan->fypParts as $mini_plan)
-					<div class="mini-plan">
-						<table class="table table-bordered" id="table">
-							<thead>
-								<tr class="bg-warning text-center">
-									<th class="text-center col-md-1">Academic Year</th>
-									<th class="text-center col-md-3">Learning Outcome to be assessed</th>
-									<th class="text-center col-md-4">Learning Objectives</th>
-									<th class="text-center col-md-4">Courses to use for assessment</th>
-								</tr>
-							</thead>
-							<tbody>
-								@foreach($mini_plan->fypPartOutcomes as $index => $outcome)
-									<tr>
-										<!-- If outcome is the first, include multi-row year column -->
-										@if($index == 0)
-											<th class="active academic-year text-center" rowspan ="{{ count($mini_plan->fypPartOutcomes) }}">{{ $mini_plan->year_start }}-{{ $mini_plan->year_end }}</th>
-										@else
-											<th class="hidden">{{ $mini_plan->year_start }}-{{ $mini_plan->year_end }}</th>
-										@endif
-										<td class="outcome-cell">
-											{{ $outcome->outcome->name }}
-										</td>
-										<td class="objectives-cell">
-											<ul>
-												@foreach(json_decode($outcome->objectives) as $objective)
-													<li class="objective">{{ $objective->text }}</li>
-												@endforeach
-											</ul>
-										</td>
-										<td>
-											<ul>
-												@foreach(json_decode($outcome->courses) as $course)
-													<li class="course">{{ $course->code }}{{ $course->number }}: {{ $course->name }}</li>
-												@endforeach
-											</ul>
-										</td>
-									</tr>
-								@endforeach
-							</tbody>
-						</table>
-					</div>
-					<br>
-				@endforeach
-			</div>
-			<div role="tabpanel" class="tab-pane" id="summary">
-
-				<p>This summary is automatically generated using the information from the Full Plan. Any changes to the plan will be reflected here.</p>
-
-				<table class="table table-bordered text-center">
-					<thead>
-						<tr class="bg-warning">
-							<th class="col-md-4">Learning Outcome</th>
-							@foreach($plan->fypParts as $mini_plan)
-								<th class="academic-year text-center">{{ $mini_plan->year_start }}-{{ $mini_plan->year_end }}</th>
-							@endforeach
-						</tr>
-					</thead>
-					<tbody>
-						@foreach($outcomes as $outcome)
-							<tr>
-								<th class="active">{{ $outcome->name }}</th>
-								@foreach($plan->fypParts as $mini_plan)
-									@if($mini_plan->willAssessOutcome($outcome->id))
-										<td><span class="glyphicon glyphicon-ok"></span></td>
-									@else
-										<td></td>
-									@endif
-								@endforeach
-							</tr>
-						@endforeach
-					</tbody>
-				</table>
-			</div>
-		</div>
-
-		@if(!$plan->is_submitted)
-			@if(date('Y-m-d') <= $plan->quinquennium->five_year_plan_due_date)
-				<div class="text-right">
-					<br>
-
-		            {{ Form::open(array('action'=>'FiveYearPlansController@update', 'class'=>"form-inline")) }}
-			            <a href="{{ URL::action('FiveYearPlansController@edit', array('program'=>$program->id, 'plan'=>$plan->id) )}}" class="btn btn-primary edit">
-			                <span class="glyphicon glyphicon-pencil"></span>
-			                Edit
-			            </a>
-
-			            <button class="btn btn-primary pdf">
-			                <span class="glyphicon glyphicon-arrow-left"></span>
-			                PDF
-			            </button>
-
-			            <a href="{{ URL::action('FiveYearPlansController@msWord', array('plan'=>$plan->id))}}" class="btn btn-primary">
-			                <span class="glyphicon glyphicon-download-alt"></span>
-			                MS Word
-			            </a>
-
-		            	<button type="submit" class="btn btn-primary">
-		            		<span class="glyphicon glyphicon-send"></span>
-		            		Submit
-		            	</button>
-
-						<a href="{{ URL::action('FiveYearPlansController@index')}}" class="btn btn-primary submit">
-			                <span class="glyphicon glyphicon-arrow-left"></span>
-			                Back to Five Year Plans
-		            	</a>
-		            {{ Form::close() }}
-
-		            <br>
-	        	</div>
-			@else
-
-				<span class="glyphicon glyphicon-info-sign"></span>
-				<strong>Note:</strong> This plan was not submitted on time.</strong>
-			@endif
-		@else
-			<span class="glyphicon glyphicon-ok-sign"></span>
-			<strong>Note:</strong> This plan was submitted on {{ date('F j, Y', strtotime($plan->submitted_on)) }}
-
-
-			<div class="text-right">
-				@if(date('Y-m-d') < $plan->quinquennium->five_year_plan_due_date)
-					<br>
-		            <a href="{{ URL::action('FiveYearPlansController@edit', array('program'=>$program->id, 'plan'=>$plan->id) )}}" class="btn btn-primary revert">
-		                <span class="glyphicon glyphicon-backward"></span>
-		                 Revert Submission
-		            </a>
-		        @endif
-
-	            <br><br>
-	        </div>
-		@endif
-	</div>
-</div>
+    <div class="row">
+        <div class="col-md-12">
+
+            <div id="quinquennium" data-quinquennium-id="{{ $plan->quinquennium->id }}"></div>
+            <div id="program" data-program-id="{{ $program->id }}"></div>
+
+            @if (!$plan->is_submitted)
+                @if (date('Y-m-d') <= $plan->quinquennium->five_year_plan_due_date)
+                    <span class="glyphicon glyphicon-info-sign"></span>
+                    <strong>Note:</strong> This plan is saved as a <strong>draft.</strong> Remember to submit it by
+                    <strong>{{ date('F d', strtotime($plan->quinquennium->five_year_plan_due_date)) }}</strong>. After the
+                    due date, unsubmitted drafts will not be considered.</strong>
+
+                    <div class="text-right">
+                        <br>
+
+                        {{ Form::open(['action' => 'FiveYearPlansController@update', 'class' => 'form-inline']) }}
+                        <a href="{{ URL::action('FiveYearPlansController@edit', ['program' => $program->id, 'plan' => $plan->id]) }}"
+                            class="btn btn-primary edit">
+                            <span class="glyphicon glyphicon-pencil"></span>
+                            Edit
+                        </a>
+
+                        <button class="btn btn-primary pdf">
+                            <span class="glyphicon glyphicon-arrow-left"></span>
+                            PDF
+                        </button>
+
+                        <a href="{{ URL::action('FiveYearPlansController@msWord', ['plan' => $plan->id]) }}"
+                            class="btn btn-primary">
+                            <span class="glyphicon glyphicon-download-alt"></span>
+                            MS Word
+                        </a>
+
+                        <button type="submit" class="btn btn-primary">
+                            <span class="glyphicon glyphicon-send"></span>
+                            Submit
+                        </button>
+
+                        <a href="{{ URL::action('FiveYearPlansController@index') }}" class="btn btn-primary submit">
+                            <span class="glyphicon glyphicon-arrow-left"></span>
+                            Back to Five Year Plans
+                        </a>
+                        {{ Form::close() }}
+
+                        <br>
+                    </div>
+                @else
+                    <span class="glyphicon glyphicon-info-sign"></span>
+                    <strong>Note:</strong> This plan was not submitted on time.</strong>
+                @endif
+            @else
+                <span class="glyphicon glyphicon-ok-sign"></span>
+                <strong>Note:</strong> This plan was submitted on {{ date('F j, Y', strtotime($plan->submitted_on)) }}
+
+
+                <div class="text-right">
+                    @if (date('Y-m-d') < $plan->quinquennium->five_year_plan_due_date)
+                        <br>
+                        <a href="{{ URL::action('FiveYearPlansController@edit', ['program' => $program->id, 'plan' => $plan->id]) }}"
+                            class="btn btn-primary revert">
+                            <span class="glyphicon glyphicon-backward"></span>
+                            Revert Submission
+                        </a>
+                    @endif
+
+                    <br><br>
+                </div>
+            @endif
+
+            <!-- Nav tabs -->
+            <ul class="nav nav-tabs" role="tablist">
+                <li role="presentation" class="active"><a href="#full-plan" aria-controls="full-plan" role="tab"
+                        data-toggle="tab">
+                        <h4>Full Plan</h4>
+                    </a></li>
+                <li role="presentation"><a href="#summary" aria-controls="summary" role="tab" data-toggle="tab">
+                        <h4>Summary</h4>
+                    </a></li>
+            </ul>
+            <br>
+
+            <!-- Tab panes -->
+            <div class="tab-content">
+                <div role="tabpanel" class="tab-pane active" id="full-plan">
+                    @foreach ($plan->fypParts as $mini_plan)
+                        <div class="mini-plan">
+                            <table class="table table-bordered" id="table">
+                                <thead>
+                                    <tr class="bg-warning text-center">
+                                        <th class="text-center col-md-1">Academic Year</th>
+                                        <th class="text-center col-md-3">Learning Outcome to be assessed</th>
+                                        <th class="text-center col-md-4">Learning Objectives</th>
+                                        <th class="text-center col-md-4">Courses to use for assessment</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    @foreach ($mini_plan->fypPartOutcomes as $index => $outcome)
+                                        <tr>
+                                            <!-- If outcome is the first, include multi-row year column -->
+                                            @if ($index == 0)
+                                                <th class="active academic-year text-center"
+                                                    rowspan="{{ count($mini_plan->fypPartOutcomes) }}">
+                                                    {{ $mini_plan->year_start }}-{{ $mini_plan->year_end }}</th>
+                                            @else
+                                                <th class="hidden">
+                                                    {{ $mini_plan->year_start }}-{{ $mini_plan->year_end }}</th>
+                                            @endif
+                                            <td class="outcome-cell">
+                                                {{ $outcome->outcome->name }}
+                                            </td>
+                                            <td class="objectives-cell">
+                                                <ul>
+                                                    @foreach (json_decode($outcome->objectives) as $objective)
+                                                        <li class="objective">{{ $objective->text }}</li>
+                                                    @endforeach
+                                                </ul>
+                                            </td>
+                                            <td>
+                                                <ul>
+                                                    @foreach (json_decode($outcome->courses) as $course)
+                                                        <li class="course">
+                                                            {{ $course->code }}{{ $course->number }}:
+                                                            {{ $course->name }}</li>
+                                                    @endforeach
+                                                </ul>
+                                            </td>
+                                        </tr>
+                                    @endforeach
+                                </tbody>
+                            </table>
+                        </div>
+                        <br>
+                    @endforeach
+                </div>
+                <div role="tabpanel" class="tab-pane" id="summary">
+
+                    <p>This summary is automatically generated using the information from the Full Plan. Any changes to the
+                        plan will be reflected here.</p>
+
+                    <table class="table table-bordered text-center">
+                        <thead>
+                            <tr class="bg-warning">
+                                <th class="col-md-4">Learning Outcome</th>
+                                @foreach ($plan->fypParts as $mini_plan)
+                                    <th class="academic-year text-center">
+                                        {{ $mini_plan->year_start }}-{{ $mini_plan->year_end }}</th>
+                                @endforeach
+                            </tr>
+                        </thead>
+                        <tbody>
+                            @foreach ($outcomes as $outcome)
+                                <tr>
+                                    <th class="active">{{ $outcome->name }}</th>
+                                    @foreach ($plan->fypParts as $mini_plan)
+                                        @if ($mini_plan->willAssessOutcome($outcome->id))
+                                            <td><span class="glyphicon glyphicon-ok"></span></td>
+                                        @else
+                                            <td></td>
+                                        @endif
+                                    @endforeach
+                                </tr>
+                            @endforeach
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+
+            @if (!$plan->is_submitted)
+                @if (date('Y-m-d') <= $plan->quinquennium->five_year_plan_due_date)
+                    <div class="text-right">
+                        <br>
+
+                        {{ Form::open(['action' => 'FiveYearPlansController@update', 'class' => 'form-inline']) }}
+                        <a href="{{ URL::action('FiveYearPlansController@edit', ['program' => $program->id, 'plan' => $plan->id]) }}"
+                            class="btn btn-primary edit">
+                            <span class="glyphicon glyphicon-pencil"></span>
+                            Edit
+                        </a>
+
+                        <button class="btn btn-primary pdf">
+                            <span class="glyphicon glyphicon-arrow-left"></span>
+                            PDF
+                        </button>
+
+                        <a href="{{ URL::action('FiveYearPlansController@msWord', ['plan' => $plan->id]) }}"
+                            class="btn btn-primary">
+                            <span class="glyphicon glyphicon-download-alt"></span>
+                            MS Word
+                        </a>
+
+                        <button type="submit" class="btn btn-primary">
+                            <span class="glyphicon glyphicon-send"></span>
+                            Submit
+                        </button>
+
+                        <a href="{{ URL::action('FiveYearPlansController@index') }}" class="btn btn-primary submit">
+                            <span class="glyphicon glyphicon-arrow-left"></span>
+                            Back to Five Year Plans
+                        </a>
+                        {{ Form::close() }}
+
+                        <br>
+                    </div>
+                @else
+                    <span class="glyphicon glyphicon-info-sign"></span>
+                    <strong>Note:</strong> This plan was not submitted on time.</strong>
+                @endif
+            @else
+                <span class="glyphicon glyphicon-ok-sign"></span>
+                <strong>Note:</strong> This plan was submitted on {{ date('F j, Y', strtotime($plan->submitted_on)) }}
+
+
+                <div class="text-right">
+                    @if (date('Y-m-d') < $plan->quinquennium->five_year_plan_due_date)
+                        <br>
+                        <a href="{{ URL::action('FiveYearPlansController@edit', ['program' => $program->id, 'plan' => $plan->id]) }}"
+                            class="btn btn-primary revert">
+                            <span class="glyphicon glyphicon-backward"></span>
+                            Revert Submission
+                        </a>
+                    @endif
+
+                    <br><br>
+                </div>
+            @endif
+        </div>
+    </div>
 
 @stop
 
 @section('included-js')
 
-<script src="{{ asset('vendor/jsPDF-master/dist/jspdf.min.js') }}"></script>
-<script src="{{ asset('vendor/jsPDF-AutoTable-master/dist/jspdf.plugin.autotable.js') }}"></script>
+    <script src="{{ asset('vendor/jsPDF-master/dist/jspdf.min.js') }}"></script>
+    <script src="{{ asset('vendor/jsPDF-AutoTable-master/dist/jspdf.plugin.autotable.js') }}"></script>
 
 @stop
 
 @section('javascript')
 
-// --------------------------------------------------------------------------
-// Page Load
-// --------------------------------------------------------------------------
-$('.datatable').DataTable(
-{
-	"searching": false,
-	"paging": false,
-	"ordering": false,
-	"info": false
-});
+    // --------------------------------------------------------------------------
+    // Page Load
+    // --------------------------------------------------------------------------
+    $('.datatable').DataTable(
+    {
+    "searching": false,
+    "paging": false,
+    "ordering": false,
+    "info": false
+    });
 
-// --------------------------------------------------------------------------
-// Events
-// --------------------------------------------------------------------------
+    // --------------------------------------------------------------------------
+    // Events
+    // --------------------------------------------------------------------------
 
-$('.pdf').on('click', function(e)
-{
-	e.preventDefault();
+    $('.pdf').on('click', function(e)
+    {
+    e.preventDefault();
 
-	console.log('start');
+    console.log('start');
 
-	var doc = new jsPDF('l', 'pt');
-		doc.setFontSize(10);
-	    doc.text("From HTML", 40, 50);
+    var doc = new jsPDF('l', 'pt');
+    doc.setFontSize(10);
+    doc.text("From HTML", 40, 50);
 
 
-	var columns = ['Academic Year', 'Learning Outcome to be assessed', 'Learning Objectives', 'Courses to use for assessment'];
+    var columns = ['Academic Year', 'Learning Outcome to be assessed', 'Learning Objectives', 'Courses to use for
+    assessment'];
 
-	$('table').each(function(index, value)
-	{
-		if(index != 0 )
-		{
-			doc.addPage();
-		}
+    $('table').each(function(index, value)
+    {
+    if(index != 0 )
+    {
+    doc.addPage();
+    }
 
-		console.log('start table');
+    console.log('start table');
 
-		var rows = new Array();
+    var rows = new Array();
 
-		var table = $(this);
+    var table = $(this);
 
-		var disp_table = new Object();
-		disp_table.columns = columns;
+    var disp_table = new Object();
+    disp_table.columns = columns;
 
-		// Iterate tables
-		table.find('tbody tr').each(function(index, value)
-		{
-			console.log('row: '+(index+1));
-			var tr = $(this);
-			var row = new Array();
-			var academic_year = tr.find(':nth-child(1)').html();
-			var outcome = $.trim(tr.find(':nth-child(2)').html());
-			var objectives_dom = tr.find(':nth-child(3)');
-			var courses_dom = tr.find(':nth-child(4)');
-			var objectives = new Array();
-			var courses = new Array();
+    // Iterate tables
+    table.find('tbody tr').each(function(index, value)
+    {
+    console.log('row: '+(index+1));
+    var tr = $(this);
+    var row = new Array();
+    var academic_year = tr.find(':nth-child(1)').html();
+    var outcome = $.trim(tr.find(':nth-child(2)').html());
+    var objectives_dom = tr.find(':nth-child(3)');
+    var courses_dom = tr.find(':nth-child(4)');
+    var objectives = new Array();
+    var courses = new Array();
 
 
-			objectives_dom.find('.objective').each(function()
-			{
-				objectives.push('• '+$.trim($(this).text()));
-			});
+    objectives_dom.find('.objective').each(function()
+    {
+    objectives.push('• '+$.trim($(this).text()));
+    });
 
-			courses_dom.find('.course').each(function()
-			{
-				courses.push('• '+$.trim($(this).text()));
-			});
+    courses_dom.find('.course').each(function()
+    {
+    courses.push('• '+$.trim($(this).text()));
+    });
 
-			console.log(academic_year);
-			console.log(outcome);
-			console.log(objectives);
-			console.log(courses);
+    console.log(academic_year);
+    console.log(outcome);
+    console.log(objectives);
+    console.log(courses);
 
-			row.push(academic_year);
-			row.push(outcome);
-			row.push(jQuery.extend([], objectives));
-			row.push(jQuery.extend([], courses));
+    row.push(academic_year);
+    row.push(outcome);
+    row.push(jQuery.extend([], objectives));
+    row.push(jQuery.extend([], courses));
 
-			rows.push(jQuery.extend([], row));
+    rows.push(jQuery.extend([], row));
 
-			disp_table.rows = jQuery.extend([], rows);
+    disp_table.rows = jQuery.extend([], rows);
 
-			console.log('end row: '+(index+1));
-		});
+    console.log('end row: '+(index+1));
+    });
 
-		console.log(disp_table);
+    console.log(disp_table);
 
-		doc.autoTable(columns, rows,
-		{
-			theme: "grid",
-			styles: {
-				overflow: 'linebreak'
-			},
-			drawCell: function (cell, data) {
-				console.log('CELL DRAW START');
+    doc.autoTable(columns, rows,
+    {
+    theme: "grid",
+    styles: {
+    overflow: 'linebreak'
+    },
+    drawCell: function (cell, data) {
+    console.log('CELL DRAW START');
 
-				console.log(cell);
-				if (data.column.index == 2 || data.column.index == 3)
-				{
-					doc.rect(cell.x, cell.y, cell.width, cell.height, 'S');
-					doc.text(cell.raw, cell.x + 5, cell.y + 12);
+    console.log(cell);
+    if (data.column.index == 2 || data.column.index == 3)
+    {
+    doc.rect(cell.x, cell.y, cell.width, cell.height, 'S');
+    doc.text(cell.raw, cell.x + 5, cell.y + 12);
 
-					console.log('CELL DRAW END');
+    console.log('CELL DRAW END');
 
-					return false;
-				}
+    return false;
+    }
 
-				console.log('CELL DRAW END');
+    console.log('CELL DRAW END');
 
-				return true;
-			}
-		});
+    return true;
+    }
+    });
 
-		console.log('end table');
+    console.log('end table');
 
 
-	});
+    });
 
-	//doc.save();
-	return;
+    //doc.save();
+    return;
 
-});
+    });
 
-// --------------------------------------------------------------------------
-// Functions
-// --------------------------------------------------------------------------
+    // --------------------------------------------------------------------------
+    // Functions
+    // --------------------------------------------------------------------------
 
 
 @stop

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

@@ -2,7 +2,7 @@
 
 @section('navigation')
     @if (Auth::user()->role == 1)
-        @include('local.managers.admins._navigation')
+        @include('local.managers.admins._new_navigation')
     @elseif(Auth::user()->role == 2)
         @include('local.managers.sCoords._new_navigation')
     @elseif(Auth::user()->role == 3)
@@ -84,11 +84,8 @@
                 placeholder="Search for Learning Outcomes..">
             <div class="list-group" id='list'>
                 @foreach ($outcomes as $outcome)
-
-
                     <li data-outcome-id="{{ $outcome->id }}" class="list-group-item"
                         onclick="fetchData($(this),$('#semesters'), $('#program') )">{{ $outcome->name }} </li>
-
                 @endforeach
             </div>
         </div>
@@ -98,21 +95,21 @@
 
             </div>
             <!--<div id="outcome-display" class="panel panel-default">
-                                                                        <div class="panel-heading">
-                                                                          <h4 class=" panel-title" style="cursor:auto!important;">
-                                                                          </h4>
-                                                                        </div>
-                                                                        <div class="panel-body">
-                                                                          <p class="outcome-definition "></p>
+                                                                            <div class="panel-heading">
+                                                                              <h4 class=" panel-title" style="cursor:auto!important;">
+                                                                              </h4>
+                                                                            </div>
+                                                                            <div class="panel-body">
+                                                                              <p class="outcome-definition "></p>
 
 
 
-                                                                          <div class="table-responsive table-responsive-0">
-                                                                            {{-- tables are appended here --}}
-                                                                            {{-- <table id="example" class="table table-striped table-condensed" width="100%"></table> --}}
-                                                                          </div>
-                                                                        </div>
-                                                                      </div>-->
+                                                                              <div class="table-responsive table-responsive-0">
+                                                                                {{-- tables are appended here --}}
+                                                                                {{-- <table id="example" class="table table-striped table-condensed" width="100%"></table> --}}
+                                                                              </div>
+                                                                            </div>
+                                                                          </div>-->
         </div>
 
         <div class="col-md-9">

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

@@ -2,7 +2,7 @@
 
 @section('navigation')
   @if($role==1)
-    @include('local.managers.admins._navigation')
+    @include('local.managers.admins._new_navigation')
   @elseif($role==2)
     @include('local.managers.sCoords._new_navigation')
   @elseif($role==3)

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

@@ -14,7 +14,8 @@
                     and Criterias<span class="caret"></span></a>
                 <ul class="dropdown-menu" role="menu">
                     <li>{{ HTML::linkAction('CriteriaController@index', 'Outcomes and Criteria') }}</li>
-                    <li>{{ HTML::linkAction('CriteriaController@objectivesIndex', 'Objectives and Criteria') }}</li>
+                    <li>{{ HTML::linkAction('objective2Controller@viewObjectives', 'Objectives and Criteria') }}
+                    </li>
                 </ul>
             </li>
             @if (count(Auth::user()->courses))

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

@@ -7,7 +7,7 @@
 
 @section('navigation')
     @if ($role == 1)
-        @include('local.managers.admins._navigation')
+        @include('local.managers.admins._new_navigation')
     @elseif($role == 2)
         @include('local.managers.sCoords._new_navigation')
     @elseif($role == 3)
@@ -36,7 +36,7 @@
                     </div>
                     <div class="form-group">
                         {{ Form::label('description', 'Description') }}
-                        {{ Form::textarea('description', $activity->description, ['class' => 'form-control','rows' => 4,'placeholder' => 'Minimum 10 characters']) }}
+                        {{ Form::textarea('description', $activity->description, ['class' => 'form-control', 'rows' => 4, 'placeholder' => 'Minimum 10 characters']) }}
                     </div>
 
                     <div class="form-group">
@@ -102,7 +102,7 @@
 
                     <div class="form-group">
                         {{ Form::label('transforming_actions', 'Formative Actions') }}
-                        {{ Form::textarea('transforming_actions', $activity->transforming_actions, ['class' => 'form-control','rows' => 4,'placeholder' => 'Actions to improve student performance after assessment (optional)']) }}
+                        {{ Form::textarea('transforming_actions', $activity->transforming_actions, ['class' => 'form-control', 'rows' => 4, 'placeholder' => 'Actions to improve student performance after assessment (optional)']) }}
                     </div>
                 </div>
                 <div class="modal-footer">
@@ -131,7 +131,7 @@
 
                     <div class="form-group">
                         {{ Form::label('assessment_comments', 'Assessment Comments') }}
-                        {{ Form::textarea('assessment_comments', $activity->assessment_comments, ['class' => 'form-control','rows' => 4,'placeholder' => '(optional)']) }}
+                        {{ Form::textarea('assessment_comments', $activity->assessment_comments, ['class' => 'form-control', 'rows' => 4, 'placeholder' => '(optional)']) }}
                     </div>
                 </div>
                 <div class="modal-footer">
@@ -203,32 +203,32 @@
 
                 <!-- If no rubric is assigned and the semester is active -->
                 @if (count($activity->rubric) == 0 && in_array($course->semester->id, $active_semesters))
-                    {{ HTML::linkAction('RubricsController@newRubric','Assign Rubric',[$activity->id],['class' => 'btn btn-primary btn-sm btn-block']) }}
-                    <!--{{ HTML::linkAction('RubricsController@newOtherMethod','Assign Other Assessment Method',[$activity->id],['class' => 'btn btn-primary btn-sm btn-block']) }}-->
+                    {{ HTML::linkAction('RubricsController@newRubric', 'Assign Rubric', [$activity->id], ['class' => 'btn btn-primary btn-sm btn-block']) }}
+                    <!--{{ HTML::linkAction('RubricsController@newOtherMethod', 'Assign Other Assessment Method', [$activity->id], ['class' => 'btn btn-primary btn-sm btn-block']) }}-->
                 @else
                     @if (count($activity->rubric) != 0)
-                        {{ HTML::linkAction('RubricsController@show','View Rubric',[$activity->id],['class' => 'btn btn-primary btn-sm btn-block']) }}
+                        {{ HTML::linkAction('RubricsController@show', 'View Rubric', [$activity->id], ['class' => 'btn btn-primary btn-sm btn-block']) }}
                     @else
                         <h5>No rubric associated to this activity</h5>
                     @endif
                     <!-- If semester is active, allow users to change rubrics -->
                     @if (in_array($course->semester->id, $active_semesters))
-                        {{ HTML::linkAction('RubricsController@newRubric','Change Rubric',[$activity->id],['class' => 'btn btn-primary btn-sm btn-block']) }}
+                        {{ HTML::linkAction('RubricsController@newRubric', 'Change Rubric', [$activity->id], ['class' => 'btn btn-primary btn-sm btn-block']) }}
                     @endif
 
                     <!-- If there is no assessment and the semester is active -->
                     @if (!$activity->is_assessed() && in_array($course->semester->id, $active_semesters))
-                        {{ HTML::linkAction('ActivitiesController@assess','Assess',[$activity->id],['class' => 'btn btn-primary btn-sm btn-block']) }}
+                        {{ HTML::linkAction('ActivitiesController@assess', 'Assess', [$activity->id], ['class' => 'btn btn-primary btn-sm btn-block']) }}
                     @else
                         @if ($activity->is_assessed())
-                            {{ HTML::linkAction('ActivitiesController@viewAssessment','View Assessment Sheet',[$activity->id],['class' => 'btn btn-primary btn-sm btn-block']) }}
+                            {{ HTML::linkAction('ActivitiesController@viewAssessment', 'View Assessment Sheet', [$activity->id], ['class' => 'btn btn-primary btn-sm btn-block']) }}
                         @else
                             <h5>No assessment associated to this activity</h5>
                         @endif
 
                         <!-- If semester is active, allow users to edit assessments -->
                         @if (in_array($course->semester->id, $active_semesters))
-                            {{ HTML::linkAction('ActivitiesController@assess','Edit Assessment',[$activity->id],['class' => 'btn btn-primary btn-sm btn-block']) }}
+                            {{ HTML::linkAction('ActivitiesController@assess', 'Edit Assessment', [$activity->id], ['class' => 'btn btn-primary btn-sm btn-block']) }}
                             <button class="btn btn-primary btn-sm btn-block" btn-block data-toggle="modal"
                                 data-target="#modal-confirm-delete-assessment">Delete Assessment</button>
                             <button class="btn btn-primary btn-sm btn-block" btn-block data-toggle="modal"
@@ -244,7 +244,7 @@
                     <button class="btn btn-primary btn-sm btn-block" btn-block data-toggle="modal"
                         data-target="#modal-confirm-delete-activity">Delete Activity</button>
                 @endif
-                {{ HTML::linkAction('CoursesController@show','Back to Section',[$course->id],['class' => 'btn btn-primary btn-sm btn-block']) }}
+                {{ HTML::linkAction('CoursesController@show', 'Back to Section', [$course->id], ['class' => 'btn btn-primary btn-sm btn-block']) }}
             </div>
 
             <hr>
@@ -256,7 +256,8 @@
             @if ($formative_actions != null)
                 <hr>
                 <h5>Formative Actions</h5>
-                <p><strong>{{ $formative_actions[0]->at_text }}: </strong> {{ $formative_actions[0]->description }}</p>
+                <p><strong>{{ $formative_actions[0]->at_text }}: </strong> {{ $formative_actions[0]->description }}
+                </p>
                 <h5>Formative Action's Associated Criteria</h5>
                 <ul>
                     @foreach ($formative_actions as $criteria)
@@ -429,12 +430,17 @@
     },
 
     tooltip: {
-    headerFormat: '<span style="font-size:10px">{point.key}</span><table>',
-        pointFormat: '<tr><td style="color:{series.color};padding:0">{series.name}: </td>' +
-            '<td style="padding:0"><b>{point.y:.2f}%</b></td></tr>'+
-            '{point.outcomes}',
-        //'<tr><td style="color:{series.color};padding:0">Learning Outcomes:</td>'+
-        //    '<td style="padding:0">{point.outcomes}, <br>Outcome2</td></tr>',
+    headerFormat: '<span style="font-size:10px">{point.key}</span>
+    <table>',
+        pointFormat: '<tr>
+            <td style="color:{series.color};padding:0">{series.name}: </td>' +
+            '<td style="padding:0"><b>{point.y:.2f}%</b></td>
+        </tr>'+
+        '{point.outcomes}',
+        //'<tr>
+            <td style="color:{series.color};padding:0">Learning Outcomes:</td>'+
+            // '<td style="padding:0">{point.outcomes}, <br>Outcome2</td>
+        </tr>',
         footerFormat: '</table>',
     shared: true,
     useHTML: true
@@ -470,9 +476,9 @@
         @foreach ($activity->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)
-                {y: {{ $crit->score_percentage }}, outcomes: "{{$crit->outcome_names_html}}"},
+                {y: {{ $crit->score_percentage }}, outcomes: "{{ $crit->outcome_names_html }}"},
             @else
-                {y:0, outcomes:"{{$crit->outcome_names_html}}"},
+                {y:0, outcomes:"{{ $crit->outcome_names_html }}"},
             @endif
         @endforeach
     @endif
@@ -515,9 +521,12 @@
     }
     },
     tooltip: {
-    headerFormat: '<span style="font-size:10px">{point.key}</span><table>',
-        pointFormat: '<tr><td style="color:{series.color};padding:0">{series.name}: </td>' +
-            '<td style="padding:0"><b>{point.y:.2f}</b></td></tr>',
+    headerFormat: '<span style="font-size:10px">{point.key}</span>
+    <table>',
+        pointFormat: '<tr>
+            <td style="color:{series.color};padding:0">{series.name}: </td>' +
+            '<td style="padding:0"><b>{point.y:.2f}</b></td>
+        </tr>',
         footerFormat: '</table>',
     shared: true,
     useHTML: true

app/views/local/professors/assessment(before change to handsontable).blade.php

@@ -2,7 +2,7 @@
 
 @section('navigation')
     @if($role==1)
-        @include('local.managers.admins._navigation')
+        @include('local.managers.admins._new_navigation')
     @elseif($role==2)
         @include('local.managers.sCoords._new_navigation')
     @elseif($role==3)

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

@@ -2,7 +2,7 @@
 
 @section('navigation')
     @if($role==1)
-        @include('local.managers.admins._navigation')
+        @include('local.managers.admins._new_navigation')
     @elseif($role==2)
         @include('local.managers.sCoords._new_navigation')
     @elseif($role==3)

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

@@ -2,7 +2,7 @@
 
 @section('navigation')
     @if($role==1)
-        @include('local.managers.admins._navigation')
+        @include('local.managers.admins._new_navigation')
     @elseif($role==2)
         @include('local.managers.sCoords._new_navigation')
     @elseif($role==3)

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

@@ -1,11 +1,11 @@
 @extends('layouts.master')
 
 @section('navigation')
-    @if($role==1)
-        @include('local.managers.admins._navigation')
-    @elseif($role==2)
+    @if ($role == 1)
+        @include('local.managers.admins._new_navigation')
+    @elseif($role == 2)
         @include('local.managers.sCoords._new_navigation')
-    @elseif($role==3)
+    @elseif($role == 3)
         @include('local.managers.pCoords._new_navigation')
     @else
         @include('local.professors._navigation')
@@ -15,7 +15,8 @@
 @section('main')
     <div class="row">
         <div class="col-md-12">
-            <p>This report contains performance information for all your Program's assessed courses during the following semester(s):</p>
+            <p>This report contains performance information for all your Program's assessed courses during the following
+                semester(s):</p>
             <ul>
                 @foreach (Session::get('semesters_info') as $semester_info)
                     <li>{{ $semester_info }}</li>
@@ -33,136 +34,161 @@
                 </thead>
                 <tfoot>
                     <tr class="column-search">
-                        <th><input class="column-search-bar form-control" type="text" placeholder="Buscar"/></th>
-                        <th><select class="column-search-select form-control"><option value=""></option></select></th>
-                        <th><input class="column-search-bar form-control" type="text" placeholder="Buscar"/></th>
+                        <th><input class="column-search-bar form-control" type="text" placeholder="Buscar" /></th>
+                        <th><select class="column-search-select form-control">
+                                <option value=""></option>
+                            </select></th>
+                        <th><input class="column-search-bar form-control" type="text" placeholder="Buscar" /></th>
                     </tr>
                 </tfoot>
                 <tbody>
                     <!-- For each grouped course -->
-                    @foreach($courses as $index2=>$course)
-
+                    @foreach ($courses as $index2 => $course)
                         <!-- If grouped course has activities that evaluate the outcome -->
 
                         <?php
-
-
-                            $sections_evaluating = Course::has('activities')
-                            
+                        
+                        $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)
+                            ->where('code', $course->code)
+                            ->where('number', $course->number)
                             ->whereIn('semester_id', Session::get('semesters_ids'))
                             ->get();
-                            
-                            $semester_code = DB::table('semesters')->where('id', '=', $course->semester_id)->first();
-                            $program = DB::table('programs')->where('id', $course->program_id)->first();
-                            
+                        
+                        $semester_code = DB::table('semesters')
+                            ->where('id', '=', $course->semester_id)
+                            ->first();
+                        $program = DB::table('programs')
+                            ->where('id', $course->program_id)
+                            ->first();
+                        
                         ?>
 
-                        @if(count($sections_evaluating))
+                        @if (count($sections_evaluating))
                             <tr>
                                 <td>
-                                    {{ $course->code}}-{{ $course->number }} ({{ $semester_code->code }})
+                                    {{ $course->code }}-{{ $course->number }} ({{ $semester_code->code }})
                                 </td>
                                 <td>{{ $program->name }}</td>
                                 <td>
-                                <!-- For each section -->
-                                @foreach($sections_evaluating as $index3 => $section)
-                                    <h5><u>Instance {{ $section->section }}</u></h5>
-
-                                    <!-- For each activity in the section -->
-                                    @foreach($section->activities as $index4 => $activity)
-<?php Log::info($section); Log::info($section->activities) ;
-Log::info($activity->o_att_array);
-Log::info("this is the cap_array for ". $activity->name);
-Log::info($activity->cap_array);
-Log::info('aqui papi');?>
-
-                                        <!-- If activity is not draft, has a rubric and the rubric has the outcome being evaluated -->
-                                        @if($activity->draft ==0 && $activity->diagnostic ==0&& array_key_exists($outcome->id, (array)$activity->o_att_array))
-                                            <h5>Measure {{ $index4 + 1 }}</h5>
-                                            <p>A rubric was used in the {{ $section->code }}-{{ $section->number }} ({{ $section->name }}) course ({{ date('M Y', strtotime($course->updated_at))}}) to assess students’ <u>{{ strtolower($outcome->name) }}</u> in the activity: "<strong>{{ $activity->name }}</strong>". At the time of assessment there were {{ $activity->amount_of_assessed_students() }} students in the section.</p>
-                                            <p>The expected performance level was that <strong>{{ $activity->rubric[0]->expected_percentage }}%</strong> of students participating in the activity would score <strong>{{ $activity->rubric[0]->expected_points }} points</strong>  or more in the 1-{{$activity->rubric[0]->max_score}} point scale used.</p>
-                                            <p>The results for each criterion were as follows:</p>
-
-                                            <table class="table table-condensed table-bordered datatable">
-
-                                                @foreach($activity->cap_array as $criterion_id => $criterion)
-                                                    
-                                                        
-                                                    
-
-                                                    @if(in_array($outcome->id, json_decode($criterion->outcome_id))  /*== $outcome->id*/ && $criterion->score_percentage >= $activity->rubric[0]->expected_percentage )
-                                                        <tr>
-                                                            <td>{{ $criterion->name }}</td>
-                                                            <td class="col-md-1 success">{{ $criterion->score_percentage }}%</td>
-                                                        </tr>
-                                                    @elseif(in_array($outcome->id, json_decode($criterion->outcome_id)) && $criterion->score_percentage < $activity->rubric[0]->expected_percentage )
-                                                        <tr>
-                                                            <td>{{ $criterion->name }}</td>
-                                                            <td class="col-md-1 danger">{{ $criterion->score_percentage }}%</td>
-                                                        </tr>
+                                    <!-- For each section -->
+                                    @foreach ($sections_evaluating as $index3 => $section)
+                                        <h5><u>Instance {{ $section->section }}</u></h5>
+
+                                        <!-- For each activity in the section -->
+                                        @foreach ($section->activities as $index4 => $activity)
+                                            <?php Log::info($section);
+                                            Log::info($section->activities);
+                                            Log::info($activity->o_att_array);
+                                            Log::info('this is the cap_array for ' . $activity->name);
+                                            Log::info($activity->cap_array);
+                                            Log::info('aqui papi'); ?>
+
+                                            <!-- If activity is not draft, has a rubric and the rubric has the outcome being evaluated -->
+                                            @if ($activity->draft == 0 && $activity->diagnostic == 0 && array_key_exists($outcome->id, (array) $activity->o_att_array))
+                                                <h5>Measure {{ $index4 + 1 }}</h5>
+                                                <p>A rubric was used in the {{ $section->code }}-{{ $section->number }}
+                                                    ({{ $section->name }}) course
+                                                    ({{ date('M Y', strtotime($course->updated_at)) }}) to assess
+                                                    students’ <u>{{ strtolower($outcome->name) }}</u> in the activity:
+                                                    "<strong>{{ $activity->name }}</strong>". At the time of assessment
+                                                    there were {{ $activity->amount_of_assessed_students() }} students in
+                                                    the section.</p>
+                                                <p>The expected performance level was that
+                                                    <strong>{{ $activity->rubric[0]->expected_percentage }}%</strong> of
+                                                    students participating in the activity would score
+                                                    <strong>{{ $activity->rubric[0]->expected_points }} points</strong>
+                                                    or more in the 1-{{ $activity->rubric[0]->max_score }} point scale
+                                                    used.</p>
+                                                <p>The results for each criterion were as follows:</p>
+
+                                                <table class="table table-condensed table-bordered datatable">
+
+                                                    @foreach ($activity->cap_array as $criterion_id => $criterion)
+                                                        @if (in_array($outcome->id, json_decode($criterion->outcome_id)) /*== $outcome->id*/ && $criterion->score_percentage >= $activity->rubric[0]->expected_percentage)
+                                                            <tr>
+                                                                <td>{{ $criterion->name }}</td>
+                                                                <td class="col-md-1 success">
+                                                                    {{ $criterion->score_percentage }}%</td>
+                                                            </tr>
+                                                        @elseif(in_array($outcome->id, json_decode($criterion->outcome_id)) && $criterion->score_percentage < $activity->rubric[0]->expected_percentage)
+                                                            <tr>
+                                                                <td>{{ $criterion->name }}</td>
+                                                                <td class="col-md-1 danger">
+                                                                    {{ $criterion->score_percentage }}%</td>
+                                                            </tr>
+                                                        @endif
+                                                    @endforeach
+                                                </table>
+
+                                                <ul>
+
+                                                </ul>
+                                                <p>
+
+                                                    <?php
+                                                    $o_att_array = $activity->o_att_array;
+                                                    $o_ach_array = $activity->o_ach_array;
+                                                    Log::info($o_att_array);
+                                                    Log::info($o_ach_array);
+                                                    Log::info('los outcomes');
+                                                    $percentage = ($o_ach_array[$outcome->id] / $o_att_array[$outcome->id]) * 100;
+                                                    ?>
+                                                    @if ($percentage >= 100)
+                                                        The expected goal was reached in <strong>all</strong> (100%) of the
+                                                        criteria assessed. Therefore, the goal for this outcome
+                                                        ({{ $outcome->expected_outcome }}%) was <strong>met</strong>.
+                                                    @elseif ($percentage < 1)
+                                                        The expected goal was reached in <strong>none</strong> (0%) of the
+                                                        criteria assessed. Therefore, the goal for this outcome
+                                                        ({{ $outcome->expected_outcome }}%) was <strong>not met</strong>.
+                                                    @elseif ($percentage >= $outcome->expected_outcome)
+                                                        The expected goal was reached in
+                                                        <strong>{{ $o_ach_array[$outcome->id] }}</strong> out of the
+                                                        <strong>{{ $o_att_array[$outcome->id] }}</strong>
+                                                        ({{ round($percentage, 2) }}%) criteria assessed. Therefore, the
+                                                        goal for this outcome ({{ $outcome->expected_outcome }}%) was
+                                                        <strong>met</strong>.
+                                                    @elseif ($percentage < $outcome->expected_outcome)
+                                                        The expected goal was reached in
+                                                        <strong>{{ $o_ach_array[$outcome->id] }}</strong> out of the
+                                                        <strong>{{ $o_att_array[$outcome->id] }}</strong>
+                                                        ({{ round($percentage, 2) }}%) criteria assessed. Therefore, the
+                                                        goal for this outcome ({{ $outcome->expected_outcome }}%) was
+                                                        <strong> not met</strong>.
                                                     @endif
-                                                @endforeach
-                                            </table>
-
-                                            <ul>
-
-                                            </ul>
-                                            <p>
-
-                                            <?php
-                                                $o_att_array = $activity->o_att_array;
-                                                $o_ach_array = $activity->o_ach_array;
-                                                Log::info($o_att_array);
-                                                Log::info($o_ach_array);
-                                                Log::info('los outcomes');
-                                                $percentage = ($o_ach_array[$outcome->id]/$o_att_array[$outcome->id])*100;
-                                            ?>
-                                            @if($percentage >= 100)
-                                                The expected goal was reached in <strong>all</strong> (100%) of the criteria assessed. Therefore, the goal for this outcome ({{ $outcome->expected_outcome }}%) was <strong>met</strong>.
-                                            @elseif ($percentage < 1)
-                                                The expected goal was reached in <strong>none</strong> (0%) of the criteria assessed. Therefore, the goal for this outcome ({{ $outcome->expected_outcome }}%) was <strong>not met</strong>.
-                                            @elseif ($percentage >= $outcome->expected_outcome)
-                                                The expected goal was reached in <strong>{{ $o_ach_array[$outcome->id] }}</strong> out of the <strong>{{ $o_att_array[$outcome->id] }}</strong> ({{ round($percentage, 2) }}%) criteria assessed. Therefore, the goal for this outcome ({{ $outcome->expected_outcome }}%) was <strong>met</strong>.
-                                            @elseif ($percentage < $outcome->expected_outcome)
-                                                The expected goal was reached in <strong>{{ $o_ach_array[$outcome->id] }}</strong> out of the <strong>{{ $o_att_array[$outcome->id] }}</strong> ({{ round($percentage, 2) }}%) criteria assessed. Therefore, the goal for this outcome ({{ $outcome->expected_outcome }}%) was <strong> not met</strong>.
-                                            @endif
-                                            </p>
-
-                                            <h5><strong>Transforming Actions</strong></h5>
-                                            @if($activity->transforming_actions)
-                                                {{ $activity->transforming_actions }}
+                                                </p>
+
+                                                <h5><strong>Transforming Actions</strong></h5>
+                                                @if ($activity->transforming_actions)
+                                                    {{ $activity->transforming_actions }}
+                                                @else
+                                                    None
+                                                @endif
+                                            @elseif ($activity->draft == 0)
+                                                <h5>Measure {{ $index4 + 1 }}</h5>
+                                                <em>Outcome not measured.</em>
                                             @else
-                                                None
                                             @endif
-
-                                        @elseif ($activity->draft == 0)
-                                            <h5>Measure {{ $index4 + 1 }}</h5>
-                                            <em>Outcome not measured.</em>
-                                        @else
-                                        
-                                            @endif
-
+                                        @endforeach
                                     @endforeach
-                                @endforeach
                                 </td>
                             </tr>
                         @else
                             <tr>
                                 <td>
-                                    <h4>{{ $course->code}}-{{ $course->number }}</h4>
+                                    <h4>{{ $course->code }}-{{ $course->number }}</h4>
                                 </td>
                                 <td>
                                     <p>No assessment.</p>
                                 </td>
-                        </tr>
+                            </tr>
                         @endif
-
                     @endforeach
                 </tbody>
             </table>
@@ -176,34 +202,34 @@ Log::info('aqui papi');?>
 
 @section('javascript')
 
-// Hide tables that have no courses
-$('.no-courses').each(function() {
+    // Hide tables that have no courses
+    $('.no-courses').each(function() {
 
     //$(this).closest('tr').hide();
 
-});
+    });
 
-// Hide tables with empty bodies
-$('tbody').each(function() {
-   if($(this).children(':visible').length==0)
-   {
-       //$(this).closest('table').hide();
-   }
-});
+    // Hide tables with empty bodies
+    $('tbody').each(function() {
+    if($(this).children(':visible').length==0)
+    {
+    //$(this).closest('table').hide();
+    }
+    });
 
 
 
 
-// ----------------------------------------------------------------------------
-// Events
-//
+    // ----------------------------------------------------------------------------
+    // Events
+    //
 
-$('.to-top').on('click', function(e) {
+    $('.to-top').on('click', function(e) {
     e.preventDefault();
 
-     $(this).scrollTop(0);
+    $(this).scrollTop(0);
     $('html').animate({scrollTop:0}, 1);
     $('body').animate({scrollTop:0}, 1);
-})
+    })
 
 @stop

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

@@ -1,11 +1,11 @@
 @extends('layouts.master')
 
 @section('navigation')
-    @if($role==1)
-        @include('local.managers.admins._navigation')
-    @elseif($role==2)
+    @if ($role == 1)
+        @include('local.managers.admins._new_navigation')
+    @elseif($role == 2)
         @include('local.managers.sCoords._new_navigation')
-    @elseif($role==3)
+    @elseif($role == 3)
         @include('local.managers.pCoords._new_navigation')
     @else
         @include('local.professors._navigation')
@@ -22,17 +22,16 @@
                 @endforeach
             </ul>
             <p>Due to the large amount of information in these reports, please allow them to load a few seconds.</p>
-            
+
             <ol id="table-of-contents" class="upper-roman">
-            @foreach($outcomes as $outcome)
-                <li>
-                    <a href="{{ URL::action('OutcomesController@professorAssessmentReport', array($outcome->id))}}">
-                        {{ $outcome->name }}
-                    </a>
-                </li>
-            @endforeach
+                @foreach ($outcomes as $outcome)
+                    <li>
+                        <a href="{{ URL::action('OutcomesController@professorAssessmentReport', [$outcome->id]) }}">
+                            {{ $outcome->name }}
+                        </a>
+                    </li>
+                @endforeach
             </ol>
         </div>
     </div>
 @stop
-

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

@@ -7,7 +7,7 @@
 
 @section('navigation')
     @if ($role == 1)
-        @include('local.managers.admins._navigation')
+        @include('local.managers.admins._new_navigation')
     @elseif($role == 2)
         @include('local.managers.sCoords._new_navigation')
     @elseif($role == 3)
@@ -567,7 +567,7 @@
         </div>
     </div>
 
-  
+
 
 @stop
 @section('included-js')
@@ -649,7 +649,7 @@
         pointFormat: '<tr>'+
             '<td style="color:{series.color};padding:0"> {series.name}: </td>' +
             '<td style="padding:0"><b>{point.y:.2f}%</b></td>'+
-        '</tr>',
+            '</tr>',
         footerFormat: '</table>',
     shared: true,
     useHTML: true
@@ -759,7 +759,7 @@
         pointFormat: '<tr>'+
             '<td style="color:{series.color};padding:0"> {series.name}: </td>' +
             '<td style="padding:0"><b>{point.y:.2f}%</b></td>'+
-        '</tr>',
+            '</tr>',
         footerFormat: '</table>',
     shared: true,
     useHTML: true
@@ -845,7 +845,7 @@
         pointFormat: '<tr>'+
             '<td style="color:{series.color};padding:0"> {series.name}: </td>' +
             '<td style="padding:0"><b>{point.y:.2f}</b></td>'+
-        '</tr>',
+            '</tr>',
         footerFormat: '</table>',
     shared: true,
     useHTML: true
@@ -950,7 +950,7 @@
         pointFormat: '<tr>'+
             '<td style="color:{series.color};padding:0"> {series.name}: </td>' +
             '<td style="padding:0"><b>{point.y:.2f}</b></td>'+
-        '</tr>',
+            '</tr>',
         footerFormat: '</table>',
     shared: true,
     useHTML: true

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

@@ -2,7 +2,7 @@
 
 @section('navigation')
     @if($role==1)
-        @include('local.managers.admins._navigation')
+        @include('local.managers.admins._new_navigation')
     @elseif($role==2)
         @include('local.managers.sCoords._new_navigation')
     @elseif($role==3)

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

@@ -2,7 +2,7 @@
 
 @section('navigation')
     @if($role==1)
-        @include('local.managers.admins._navigation')
+        @include('local.managers.admins._new_navigation')
     @elseif($role==2)
         @include('local.managers.sCoords._new_navigation')
     @elseif($role==3)

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

@@ -2,7 +2,7 @@
 
 @section('navigation')
     @if($role==1)
-        @include('local.managers.admins._navigation')
+        @include('local.managers.admins._new_navigation')
     @elseif($role==2)
         @include('local.managers.sCoords._new_navigation')
     @elseif($role==3)

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

@@ -2,7 +2,7 @@
 
 @section('navigation')
     @if (Auth::user()->role == 1)
-        @include('local.managers.admins._navigation')
+        @include('local.managers.admins._new_navigation')
     @elseif(Auth::user()->role == 2)
         @include('local.managers.sCoords._new_navigation')
     @elseif(Auth::user()->role == 3)
@@ -44,14 +44,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')
                     
@@ -132,12 +132,14 @@
                                 <br>
                                 <h4>Performance of Students by Learning Outcome Criteria</h4>
                                 <h5 style="display: inline; margin:30px;">Target by criterion: </h5>
-                                <p style="display: inline; margin:-30px;"> <i>{{ $activity->rubric[0]->expected_points }} or more</i>
+                                <p style="display: inline; margin:-30px;"> <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; margin:-30px;"> <i>{{ $activity->rubric[0]->expected_percentage }} %</i>
+                                <p style="display: inline; margin:-30px;">
+                                    <i>{{ $activity->rubric[0]->expected_percentage }} %</i>
                                 </p>
 
                                 <br>
@@ -213,23 +215,23 @@
 
                                 </table>
                                 <br>
-<!--                                 <h5 style="display: inline; margin:30px;">Formative Actions: </h5> -->
+                                <!--                                 <h5 style="display: inline; margin:30px;">Formative Actions: </h5> -->
                                 <h5>Formative Actions: </h5>
                                 <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
                                 @if ($formative_actions)
                                     <p style="display: inline; margin:30px;">
-                                     <u>{{ $formative_actions[0]->at_text }}:
+                                        <u>{{ $formative_actions[0]->at_text }}:
                                         </u>
 
                                         <i>{{ $formative_actions[0]->description }}
                                         </i>
                                     </p>
 
-<!--                                     <h5 style="display: inline; margin:30px;"> -->
+                                    <!--                                     <h5 style="display: inline; margin:30px;"> -->
                                     <h5>
-                                    Formative Action's Associated
+                                        Formative Action's Associated
                                         Criteria: </h5>
-<!--                                     <ul style="margin:30px;"> -->
+                                    <!--                                     <ul style="margin:30px;"> -->
                                     <ul>
                                         @foreach ($formative_actions as $criteria)
                                             <li> <i>{{ $criteria->name }} </i></li>
@@ -238,24 +240,24 @@
                                 @endif
 
 
-<!--                                 <h5 style="display: inline; margin:30px;"> -->
+                                <!--                                 <h5 style="display: inline; margin:30px;"> -->
                                 <h5>
-                                Assessment Comments: </h5>
+                                    Assessment Comments: </h5>
                                 @if ($activity->assessment_comments != null)
                                     <p style="display: inline; margin:30px;">
-                                    {{ $activity->assessment_comments }}
+                                        {{ $activity->assessment_comments }}
                                     </p>
                                 @endif
-<!--                                 <br> -->
+                                <!--                                 <br> -->
                                 <hr>
-<!--                                 <br> -->
+                                <!--                                 <br> -->
 
                                 <h4>Performance of Students by Learning Outcome</h4>
                                 <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5><br>
-<!--                                 <p style="display: inline;"> -->
+                                <!--                                 <p style="display: inline;"> -->
                                 {{ $activity->name }}
-                                    <strong>({{ $activity->date }})</strong>
-<!--                                 </p> -->
+                                <strong>({{ $activity->date }})</strong>
+                                <!--                                 </p> -->
                                 <br>
                                 <br>
                                 <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
@@ -265,8 +267,8 @@
                                 <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
                                     target
                                     by learning outcome: </h5>
- 								<p style="display: inline; margin:-30px;"> 
-                                 <i>
+                                <p style="display: inline; margin:-30px;">
+                                    <i>
                                         <?php
                                         $expected = DB::table('target_outcomes_program')
                                             ->where('program_id', $course->program_id)
@@ -452,7 +454,7 @@
 
                                 </table>
                                 <br>
-<!--                                 <h5 style="display: inline; margin:30px;">Formative Actions: </h5> -->
+                                <!--                                 <h5 style="display: inline; margin:30px;">Formative Actions: </h5> -->
                                 <h5>Formative Actions: </h5>
                                 <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
                                 @if ($formative_actions)
@@ -465,7 +467,7 @@
                                     <br>
                                     <h5 style="display: inline; margin:30px;">Formative Action's Associated
                                         Criteria: </h5>
-<!--                                     <ul style="margin:30px;"> -->
+                                    <!--                                     <ul style="margin:30px;"> -->
                                     <ul>
                                         @foreach ($formative_actions as $criteria)
                                             <li> <i>{{ $criteria->name }} </i></li>
@@ -474,14 +476,14 @@
                                 @endif
 
 
-<!--                                 <h5 style="display: inline; margin:30px;">Assessment Comments: </h5> -->
+                                <!--                                 <h5 style="display: inline; margin:30px;">Assessment Comments: </h5> -->
                                 <h5>Assessment Comments: </h5>
                                 @if ($activity->assessment_comments != null)
                                     <p style="display: inline;">{{ $activity->assessment_comments }}</p>
                                 @endif
-<!--                                 <br> -->
+                                <!--                                 <br> -->
                                 <hr>
-<!--                                 <br> -->
+                                <!--                                 <br> -->
 
                                 <h4>Performance of Students by Learning Outcome</h4>
                                 <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5><br>
@@ -489,11 +491,11 @@
                                     <strong>({{ $activity->date }})</strong>
                                 </p>
                                 <br><br>
-<!--                                 <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5> -->
+                                <!--                                 <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5> -->
                                 <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
-<!--                                 <p style="display: inline;">  -->
+                                <!--                                 <p style="display: inline;">  -->
                                 <i>>= 66.67% of the attempts</i>
-<!--                                 </p> -->
+                                <!--                                 </p> -->
                                 <br>
                                 <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
                                     target

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

@@ -2,7 +2,7 @@
 
 @section('navigation')
     @if($role==1)
-        @include('local.managers.admins._navigation')
+        @include('local.managers.admins._new_navigation')
     @elseif($role==2)
         @include('local.managers.sCoords._new_navigation')
     @elseif($role==3)

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

@@ -2,7 +2,7 @@
 
 @section('navigation')
     @if($role==1)
-        @include('local.managers.admins._navigation')
+        @include('local.managers.admins._new_navigation')
     @elseif($role==2)
         @include('local.managers.sCoords._new_navigation')
     @elseif($role==3)

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

@@ -2,7 +2,7 @@
 
 @section('navigation')
   @if($role==1)
-    @include('local.managers.admins._navigation')
+    @include('local.managers.admins._new_navigation')
   @elseif($role==2)
     @include('local.managers.sCoords._new_navigation')
   @elseif($role==3)

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

@@ -2,7 +2,7 @@
 
 @section('navigation')
     @if($role==1)
-        @include('local.managers.admins._navigation')
+        @include('local.managers.admins._new_navigation')
     @elseif($role==2)
         @include('local.managers.sCoords._new_navigation')
     @elseif($role==3)

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

@@ -2,7 +2,7 @@
 
 @section('navigation')
     @if($role==1)
-        @include('local.managers.admins._navigation')
+        @include('local.managers.admins._new_navigation')
     @elseif($role==2)
         @include('local.managers.sCoords._new_navigation')
     @elseif($role==3)