Navigation

app/controllers/OutcomesController.php

@@ -892,6 +892,11 @@ class OutcomesController extends \BaseController
                             ->has('activities')
                             //                             ->whereNotNull('outcomes_attempted')
                             // ->where('outcomes_attempted', 'NOT LIKE', '%"'.$outcome_id.'":0%')
+                            ->join('activities', 'activities.course_id', '=', 'courses.id')
+                            ->join('activity_criterion as ac', 'ac.activity_id', '=', 'activities.id')
+                            ->join('assessments', 'assessments.activity_criterion_id', '=', 'ac.id')
+                            ->where('activities.draft', 0)
+                            ->select('courses.*')->distinct()
                             ->whereIn('semester_id', Session::get('semesters_ids'))
                             ->groupBy(array('code', 'number'));
                     }));

app/controllers/ProgramsController.php

@@ -73,18 +73,26 @@ class ProgramsController extends \BaseController
      * List of grouped courses (grouped sections)
      */
 
-//     $grouped_courses = Course::select(DB::raw('name, code, number, max(outcomes_attempted) as outcomes_attempted, semester_id, program_id'))
-    $grouped_courses = Course::select(DB::raw('name, code, number, semester_id, program_id'))
+    //     $grouped_courses = Course::select(DB::raw('name, code, number, max(outcomes_attempted) as outcomes_attempted, semester_id, program_id'))
+    $grouped_courses = Course::select(DB::raw('courses.name, code, number, semester_id, program_id, activities.id as activity_assessed'))
+      ->leftJoin('activities', function ($query) {
+        $query->on('activities.course_id', '=', 'courses.id');
+        $query->on('activities.draft', '=', DB::raw('0'));
+      })
       ->with('semester')
       ->with('program')
       ->where('program_id', $program->id)
+
       ->whereIn('semester_id', Session::get('semesters_ids'))
+
       ->groupBy(array('code', 'number', 'semester_id'))
       ->orderBy('code')
       ->orderBy('number')
       ->orderBy('semester_id')
       ->get();
 
+
+
     // Program contact information
     $users = User::select('users.*')
       ->leftJoin('program_user', 'users.id', '=', 'program_user.user_id')
@@ -166,6 +174,18 @@ class ProgramsController extends \BaseController
     //OUTCOMES Join criteria join program
     foreach ($programs as $program) {
       $info_by_id = Program::find($program->id);
+      $domains = DB::table('outcomes')
+        ->join('criterion_objective_outcome as cobo', 'cobo.outcome_id', '=', 'outcomes.id')
+        ->join('criteria', 'criteria.id', '=', 'cobo.criterion_id')
+        ->join('program_criterion', 'criteria.id', '=', 'program_criterion.criterion_id')
+        ->join('courses', 'courses.program_id', '=', 'program_criterion.program_id')
+        ->where('program_criterion.program_id', $program->id)
+        ->select('outcomes.name', 'outcomes.activation_date')
+        ->distinct()
+        ->orderBy('outcomes.name', 'asc')
+        ->get();
+
+      /*
 
       $domains = DB::table('outcomes')
         ->join('criteria', 'criteria.outcome_id', '=', 'outcomes.id')
@@ -176,7 +196,20 @@ class ProgramsController extends \BaseController
         ->distinct()
         ->orderBy('outcomes.name', 'asc')
         ->get();
+        */
+
+      $courses_used =  DB::table('outcomes')
+        ->join('criterion_objective_outcome as cobo', 'cobo.outcome_id', '=', 'outcomes.id')
+        ->join('criteria', 'criteria.id', '=', 'cobo.criterion_id')
+        ->join('program_criterion', 'criteria.id', '=', 'program_criterion.criterion_id')
+        ->join('courses', 'courses.program_id', '=', 'program_criterion.program_id')
+        ->where('program_criterion.program_id', $program->id)
+        ->select('courses.number', 'outcomes.name as domain_name', 'courses.code')
+        ->distinct()
+        ->orderBy('courses.name', 'asc')
+        ->get();
 
+      /*
       $courses_used = DB::table('outcomes')
         ->join('criteria', 'criteria.outcome_id', '=', 'outcomes.id')
         ->join('programs', 'programs.id', '=', 'criteria.program_id')
@@ -185,18 +218,22 @@ class ProgramsController extends \BaseController
         ->select('courses.number', 'outcomes.name as domain_name', 'courses.code')
         ->distinct()
         ->orderBy('courses.name', 'asc')
-        ->get();
+        ->get(); */
 
       $transformative_actions = DB::table('outcomes')
-        ->join('criteria', 'criteria.outcome_id', '=', 'outcomes.id')
-        ->join('programs', 'programs.id', '=', 'criteria.program_id')
-        ->join('courses', 'courses.program_id', '=', 'programs.id')
+        ->join('criterion_objective_outcome as cobo', 'cobo.outcome_id', '=', 'outcomes.id')
+        ->join('criteria', 'criteria.id', '=', 'cobo.criterion_id')
+        ->join('program_criterion', 'criteria.id', '=', 'program_criterion.criterion_id')
+        ->join('courses', 'courses.program_id', '=', 'program_criterion.program_id')
+
         ->join('activities', 'activities.course_id', '=', 'courses.id')
         ->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
-        ->where('programs.id', $program->id)
-        ->select('activity_criterion.transformative_actions', 'outcomes.name as domain_name')
+        ->join('transformative_activity_criterion as taa', 'taa.activity_criterion_id', '=', 'activity_criterion.id')
+        ->join('transformative_actions', 'transformative_actions.id', '=', 'taa.trans_action_id')
+        ->where('program_criterion.program_id', $program->id)
+        ->select('transformative_actions.description', 'outcomes.name as domain_name')
         ->distinct()
-        ->orderBy('activity_criterion.transformative_actions', 'asc')
+        ->orderBy('transformative_actions.description', 'asc')
         ->get();
       $info = array($info_by_id, $domains, $courses_used, $transformative_actions);
       array_push($programs_info, $info);
@@ -365,7 +402,7 @@ class ProgramsController extends \BaseController
       $program_array['assessed_courses_count'] = 0;
       foreach ($program_array['program_courses'] as $course) {
         if (!$program_array['course_outcomes_achieved'] = $course->outcomes_ach()) {
-//           $program_array['course_outcomes_achieved'] = $course->outcomes_ach();
+          //           $program_array['course_outcomes_achieved'] = $course->outcomes_ach();
           $program_array['course_outcomes_attempted'] = $course->outcomes_att();
           Log::info($program_array['course_outcomes_achieved']);
           foreach ($program_array['course_outcomes_achieved'] as $i => $score) {

app/controllers/RubricsController.php

@@ -460,6 +460,7 @@ class RubricsController extends \BaseController
                 ->join('criterion_objective_outcome', 'outcomes.id', '=', 'criterion_objective_outcome.outcome_id')
                 ->where('criterion_objective_outcome.criterion_id', '=', $single_cr->criterion_id)->lists('name'));
         }
+
         $title = $activity->name . ': ' . $rubric->name;
         return View::make('local.professors.printrubric', compact('rubric', 'rubric_criterion', 'activity', 'title', 'course'));
     }

app/controllers/TemplatesController.php

@@ -15,7 +15,36 @@ class TemplatesController extends \BaseController
 		$schools = School::with('programs.templates')
 			->orderBy('name')
 			->get();
+		$role = Auth::user()->role;
+		switch ($role) {
+			case 1:
+				$templates = Template::orderBy('name')->get();
+				break;
+
+			case 2:
+
+				$templates = Template::orderBy('name')
+					->whereNull("school_id")
+					->orWhere('school_id', Auth::user()->school_id)
+					->get();
+				break;
+			case 3:
+				$program_id = DB::table("program_user")
+					->where('user_id', Auth::user()->id)
+					->lists('program_id')[0];
+				$school_id = DB::table('programs')
+					->where('id', $program_id)
+					->lists('school_id')[0];
+
 
+				$templates = Template::orderBy('name')
+					->whereNull("school_id")
+					->orWhere('school_id', $school_id)
+					->orWhere('program_id', $program_id)
+
+					->get();
+				break;
+		}
 		$templates = Template::orderBy('name')->get();
 
 		return View::make('local.managers.admins.rubric_list', compact('title', 'global_templates', 'schools', 'templates'));
@@ -40,6 +69,32 @@ class TemplatesController extends \BaseController
 	{
 		$title = $template->name;
 
+		$template->titles = DB::table('titles')
+			->join('template_title', 'template_title.title_id', '=', "titles.id")
+			->where('template_id', $template->id)
+			->orderBy('position', 'ASC')
+			->lists('text');
+
+		$template->criteria = DB::table('criteria')
+			->join('template_criterion', 'template_criterion.criterion_id', '=', 'criteria.id')
+			->where('template_id', $template->id)
+			->orderBy('position')
+			->get();
+
+		foreach ($template->criteria as $criterion) {
+			$criterion->scales = DB::table('criterion_scale')
+				->join('scales', 'scales.id', '=', 'criterion_scale.scale_id')
+				->where('criterion_id', $criterion->criterion_id)
+				->orderBy('position')
+				->lists('description');
+			$criterion->outcomes = DB::table('criterion_objective_outcome as cobo')
+				->join('outcomes', 'outcomes.id', '=', 'cobo.outcome_id')
+				->where('cobo.criterion_id', $criterion->criterion_id)
+				->select('outcomes.*')
+				->distinct()
+				->get();
+		}
+
 		return View::make('local.managers.admins.view_template', compact('template', 'title'));
 	}
 

app/controllers/TransformativeActionsController.php

@@ -393,7 +393,7 @@ class TransformativeActionsController extends \BaseController
 
       //
       // // insert the multiple TA_course
-      DB::table('TA_course')->insert(
+      DB::table('ta_course')->insert(
         array(
           'ta_id' => $ta_id,
           'course_number' => $course_code_number[1],

app/models/Activity.php

@@ -38,8 +38,6 @@ class Activity extends Eloquent
     $activity_criterion = DB::table('activity_criterion')
       ->where('activity_id', '=', $this->id)
       ->get();
-    Log::info('activity_criterion');
-    Log::info($activity_criterion);
 
     $criteria_achieved = [];
     foreach ($activity_criterion as $index => $single_ac) {
@@ -83,38 +81,29 @@ class Activity extends Eloquent
       )
       ->addSelect('criteria.name', 'criteria.subcriteria')
       ->get();
-    Log::info($criterias);
-    Log::info($this->rubric);
-    Log::info("this is rubric");
+
     foreach ($criterias as $index => $single_crit) {
 
 
       $single_crit->outcome_id = json_encode(DB::table('criterion_objective_outcome')
         ->where('criterion_id', '=', $single_crit->criterion_id)
         ->lists('outcome_id'));
-      Log::info(json_decode($single_crit->outcome_id));
       $amount_of_students = count(DB::table('assessments')
         ->where("activity_criterion_id", '=', $single_crit->id)
         ->lists('student_id'));
-      Log::info($amount_of_students);
-      Log::info($single_crit->id);
-      Log::info('lmaoOOOO');
+
 
       $student_pass = DB::table('assessments')
         ->where("activity_criterion_id", '=', $single_crit->id)
         ->where('score', '>=', $this->rubric[0]->expected_points)
         ->lists('student_id');
-      Log::info($student_pass);
       $amount_of_students_passed = count(DB::table('assessments')
         ->where("activity_criterion_id", '=', $single_crit->id)
         ->where('score', '>=', $this->rubric[0]->expected_points)
         ->lists('student_id'));
-      Log::info($amount_of_students_passed);
-      Log::info('es aqui');
 
       $single_crit->score_percentage = ($amount_of_students_passed / $amount_of_students) * 100;
       $criteria_achieved_percentage[$single_crit->criterion_id] = $single_crit;
-      Log::info("?");
     }
     return $criteria_achieved_percentage;
   }
@@ -209,7 +198,7 @@ class Activity extends Eloquent
       ->whereIn('activity_criterion_id', $all_criterion)
       ->lists('id');
 
-//     return boolval(count($assessments));
+    //     return boolval(count($assessments));
     return (bool)(count($assessments));
   }
 

app/models/Program.php

@@ -157,6 +157,17 @@ class Program extends Eloquent
 			->where('programs.id', '=', $this->id)
 			->whereIn('courses.semester_id', $semesters_array)
 			->count(DB::raw('DISTINCT criterion_objective_outcome.outcome_id'));
+
+
+		Log::info(DB::table('activity_criterion')
+			->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+			->join('courses', 'activities.course_id', '=', 'courses.id')
+			->join('programs', 'programs.id', '=', 'courses.program_id')
+			->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'activity_criterion.criterion_id')
+			->where('criterion_objective_outcome.outcome_id', '=', $outcome_id)
+			->where('programs.id', '=', $this->id)
+			->whereIn('courses.semester_id', $semesters_array)
+			->toSql());
 		return $conteo;
 	}
 

app/routes.php

@@ -345,6 +345,8 @@ Route::group(array('before' => 'auth|has_access'), function () {
         Route::get('school/{id}', 'SchoolsController@show');
         Route::get('program/{id}', 'ProgramsController@show');
         Route::post('programs/report', 'ProgramsController@showReport');
+        Route::get('template/{template}', 'TemplatesController@show');
+
         // Route::post('storeTypInfo', 'OutcomesController@storeCycleInfo'); //TODO: where is this route supposed to be placed?
         Route::get('programs', 'ProgramsController@index');
         Route::get('template-list', 'TemplatesController@schoolCoordinatorIndex');
@@ -397,6 +399,8 @@ Route::group(array('before' => 'auth|has_access'), function () {
         Route::get('program-coordinator', 'ProgramCoordinatorsController@overview');
         Route::post('deleteObjective', 'Objective2Controller@delete');
         Route::get('rubrics', 'TemplatesController@newTemplate');
+        Route::get('template/{template}', 'TemplatesController@show');
+
         Route::post('saveTemplate', array('before' => 'csrf', 'uses' => 'TemplatesController@create'));
         Route::post('updateTemplate', array('before' => 'csrf', 'uses' => 'TemplatesController@update'));
         Route::post('deleteTemplate', array('before' => 'csrf', 'uses' => 'TemplatesController@destroy'));
@@ -407,6 +411,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
         Route::get('printRubric/{id}', 'TemplatesController@printview');
         Route::get('rubric/{rubric_id}', 'RubricsController@show_limited');
         Route::get('grouped_course/{code}/{number}/{semester_code}', 'CoursesController@showGrouped');
+        Route::get('template-list', 'TemplatesController@schoolCoordinatorIndex');
 
         //Criteria and objectives
         Route::get('program-criteria', 'CriteriaController@editProgram');

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

@@ -58,7 +58,7 @@
 
                                         <?php
 
-                                            $sections_evaluating_outcome = Course::has('activities')
+                                           /* $sections_evaluating_outcome = Course::has('activities')
 //                                             ->whereNotNull('outcomes_attempted')
 //                                             ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
                                             ->with(array('activities'=>function($query) use(&$outcome){
@@ -68,7 +68,29 @@
                                                 } ))
                                             ->where('code', $course->code)->where('number',$course->number)
                                             ->whereIn('semester_id', Session::get('semesters_ids'))
-                                            ->get();
+                                            ->get();*/
+
+                                            $sections_evaluating_outcome = Course::has('activities')
+                            
+                          ->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')
+                                ->join('courses','courses.id','=','activities.course_id')
+                                ->where('courses.code', $course->code)
+                                ->where('courses.number',$course->number)
+                                ->where('criterion_objective_outcome.outcome_id', $outcome->id)
+                                ->select('activity_id')
+                                ->lists('activity_id');
+
+                               $query->whereIn('id', $activities);
+                        } ))
+                                
+
+                            ->where('code', $course->code)->where('number',$course->number)
+                            ->whereIn('semester_id', Session::get('semesters_ids'))
+                            ->get();
 
                                             
                                         ?>
@@ -82,9 +104,17 @@
 
                                                 <!-- For each activity in the section -->
                                                 @foreach($section->activities as $activity_index => $activity)
+                                                        <?php
 
+Log::info($activity->o_att_array);
+Log::info(array_key_exists($outcome->id, $activity->o_att_array));
+Log::info($activity->o_att_array[$outcome->id] >=1);
+Log::info(isset($section)); 
+Log::info($activity->rubric[0]);
+
+?>
                                                     <!-- 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 && isset($section)&& isset($activity->rubric))
+                                                    @if($activity->draft == 0 && array_key_exists($outcome->id, $activity->o_att_array) && $activity->o_att_array[$outcome->id] >=1 && isset($section)&& isset($activity->rubric[0]))
                                                         <h5>Measure {{ $activity_index + 1 }}</h5>
                                                         <?php
                                                         /*
@@ -104,49 +134,39 @@
 
                                                         <p>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) }}. </p>
                                                         
-                                                        <p>The expected performance level was that <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>
+                                                        <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>
 
                                                         <?php
 
-                                                            $rubric_contents = json_decode($activity->rubric->contents);
+                                                            //$rubric_contents = json_decode($activity->rubric->contents);
                                                         ?>
 
                                                         <table class="table table-condensed table-bordered">
                                                             <tbody>
-                                                                @foreach((array)$activity->cap_array as $criterion_id => $criteria_achieved_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>
+                                                                    </tr>
+                                                                @elseif(in_array($outcome->id, json_decode($criterion->outcome_id)) && $criterion->score_percentage < $activity->rubric[0]->expected_percentage )
                                                                     <tr>
-                                                                    <?php
-                                                                        $rubric_criterion_outcome_id = NULL;
-                                                                        foreach ($rubric_contents as $rubric_criterion) {
-                                                                            if($rubric_criterion->id == $criterion_id) {
-                                                                                $rubric_criterion_outcome_id = $rubric_criterion->outcome_id;
-                                                                                break;
-                                                                            }
-
-                                                                        }
-                                                                        $criterion = Criterion::find($criterion_id);
-
-                                                                    ?>
-                                                                    @if($rubric_criterion_outcome_id == $outcome->id && $criteria_achieved_percentage >= $activity->rubric->expected_percentage )
-                                                                        <td>{{ $criterion['name'] }}</td>
-                                                                        <td class="col-md-1 success">{{ $criteria_achieved_percentage }}%</td>
-                                                                    @elseif($rubric_criterion_outcome_id == $outcome->id && $criteria_achieved_percentage < $activity->rubric->expected_percentage )
-                                                                        <td>{{ $criterion['name'] }}</td>
-                                                                        <td class="col-md-1 danger">{{ $criteria_achieved_percentage }}%</td>
-                                                                    @endif
+                                                                        <td>{{ $criterion->name }}</td>
+                                                                        <td class="col-md-1 danger">{{ $criterion->score_percentage }}%</td>
                                                                     </tr>
-                                                                @endforeach
+                                                                @endif  
+                                                            @endforeach
                                                             </tbody>
                                                         </table>
 
                                                         <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;
-                                                            ?>
+                                                                  $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)

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

@@ -24,7 +24,7 @@
             
             <th>Criterion</th>
             @for($i = 0; $i <$template->num_scales; $i++)
-              <th>Scale {{$i+1}} ({{1+($i*($template->max_score/$template->num_scales))}} - {{(1+$i)*($template->max_score/$template->num_scales)}})</th>
+              <th>{{$template->titles[$i]}}  ({{1+($i*($template->max_score/$template->num_scales))}} - {{(1+$i)*($template->max_score/$template->num_scales)}})</th>
               
                            
             @endfor
@@ -33,6 +33,33 @@
           </tr>
         </thead>
       <tbody id ="bodyRubric">
+        @foreach($template->criteria as $index=> $criterion)
+      <tr data-criterion-copyright="{{$criterion->copyright}}" data-criterion-notes="{{$criterion->notes}}">
+        <td>{{$index+1}}.</td>
+
+        @if($criterion->notes)
+            
+          <td><span><em data-toggle="tooltip" data-placement="top" title="{{$criterion->notes}}">{{$criterion->name}}</em></span><sup></sup></td>
+          
+
+        
+        @else
+          
+          <td><span>{{$criterion->name}}</span><sup></sup></td>
+
+        
+@endif
+
+@foreach ($criterion->scales as $scale)
+<td>{{$scale}}</td>
+    
+@endforeach
+<td><ol>
+@foreach ($criterion->outcomes as $outcome)
+    <li>{{$outcome->name}}</li>
+@endforeach
+</ol></td>
+        @endforeach
 
       </tbody>
     </table>
@@ -56,7 +83,8 @@
   </div>
 </div>
 
-<script>
+<script> 
+/*
   function createTable(){
     $.post("{{URL::action('TemplatesController@onLoadFetch')}}",
         {id :{{$template->id}}},
@@ -96,7 +124,7 @@
         
         }, 'json'
         );
-  }
+  }**/
   </script>
 @stop
 
@@ -109,7 +137,7 @@
 // --------------------------------------------------------------------------
 // Page load
 // --------------------------------------------------------------------------
-createTable();
+
 buildCopyrightList();
 
 // --------------------------------------------------------------------------

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

@@ -9,8 +9,11 @@
         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Management<span class="caret"></span></a>
         <ul class="dropdown-menu" role="menu">
           <li>{{ HTML::linkAction('TemplatesController@newTemplate', 'Rubrics') }}</li>
-        <li>{{ HTML::linkAction('Objective2Controller@editProgram', 'Objectives')}}</li>
-      <li>{{ HTML::linkAction('CriteriaController@editProgram', 'Criteria') }}</li>
+          <li>{{ HTML::linkAction('TemplatesController@index', 'Rubric List') }}</li>
+      
+          <li>{{ HTML::linkAction('Objective2Controller@editProgram', 'Objectives')}}</li>
+      
+        <li>{{ HTML::linkAction('CriteriaController@editProgram', 'Criteria') }}</li>
       <li>{{ HTML::linkAction('TransformativeActionsController@editTA', 'Transformative Actions') }}</li>
 
     

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

@@ -18,6 +18,8 @@
 <li>{{ HTML::linkAction('Objective2Controller@editSchool', 'Objectives')}}</li>
       <li>{{ HTML::linkAction('CriteriaController@editSchool', 'Criteria') }}</li>
  <li>{{ HTML::linkAction('TemplatesController@newTemplate', 'Rubrics') }}</li>
+ <li>{{ HTML::linkAction('TemplatesController@index', 'Rubric List') }}</li>
+         
  <li>{{ HTML::linkAction('TransformativeActionsController@editTA', 'Transformative Actions') }}</li>
 
 

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

@@ -136,7 +136,7 @@ echo
       <td>
         {{{ $criterion->name }}}
 
-        @if(property_exists($criterion, 'subcriteria'))
+        @if($criterion->subcriteria)
           <ul class="list-unstyled">
             @foreach(json_decode($criterion->subcriteria) as $subcriterion)
                 <li>{{ $subcriterion }}</li>

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

@@ -62,7 +62,7 @@
                                 <td class="col-md-4">{{{ $grouped_course->name}}}</td>
                                 <td class="col-md-3">{{{ $grouped_course->program->name }}}</td>
                                 <td class="col-md-1">
-                                    @if($grouped_course->outcomes_attempted!=NULL)
+                                    @if($grouped_course->activity_assessed!=NULL)
                                     Yes
                                     @else
                                     No
@@ -111,7 +111,7 @@
                                 <td>{{{ $course->name}}}</td>
                                 <td>{{{ $course->user->surnames }}}, {{{ $course->user->first_name }}}</td>
                                 <td>
-                                    @if($course->outcomes_attempted!=NULL)
+                                    @if($course->outcomes_att())
                                     Yes
                                     @else
                                     No