rubricas solo con critrios pareados.

app/controllers/AnnualPlansController.php

@@ -129,8 +129,10 @@ class AnnualPlansController extends \BaseController
   }*/
   public function adminIndex()
   {
+  	Log::info("Entre".json_encode($this));
+
     $title = "Annual Plans";
-    $programs = Program::where("school_id", $school_id)->get();
+    $programs = Program::get();
 
     return View::make('local.managers.admins.appraisal-program', compact('title', 'programs'));
   }

app/controllers/CriteriaController.php

@@ -124,6 +124,13 @@ class CriteriaController extends \BaseController
                     ->lists('program_id');
 
                 break;
+            case 4:
+
+                $program_ids = DB::table('program_user')
+                    ->where('user_id', Auth::user()->id)
+                    ->lists('program_id');
+
+                break;
         }
         $outcome_id = Input::get('outcomeID');
         Log::info($outcome_id);

app/controllers/FeedbackController.php

@@ -80,6 +80,7 @@ class FeedbackController extends \BaseController {
           	Mail::send('emails.feedback-email-copy', $data, function($message){
         		$message
         		->to(Input::get('email'), Auth::user()->first_name.' '.Auth::user()->surnames)
+//                 ->cc('oeae.rrp@upr.edu')
                 ->cc('peticiones.diia@upr.edu')
         		->subject('Feedback for OLAS');
     		});

app/controllers/OutcomesController.php

@@ -13,7 +13,8 @@ class OutcomesController extends \BaseController
     public function index()
     {
         $title = "Learning Outcomes";
-        $outcomes = Outcome::withTrashed()->orderBy('name', 'ASC')->get();
+        $outcomes = Outcome::withTrashed()->orderBy('id', 'ASC')->get();
+//         $outcomes = Outcome::withTrashed()->orderBy('name', 'ASC')->get();
         $schools = School::orderBy('name', 'ASC')->get();
         // $semesters_ids = Session::get('semesters_ids');
         // $semesters = Semester::whereIn('id',$semesters_ids)->get();
@@ -339,11 +340,31 @@ class OutcomesController extends \BaseController
     /**
      *Copy of update(), but also updates activation_date, deactivation_date and level
      */
+    public function delete()
+    {
+        $outcomeArray = json_decode(Input::get('outcomeArray'), true);
+// 		Log::info("delete".json_encode($outcomeArray));
+		$outcome = Outcome::withTrashed()
+			->where('id', '=', $outcomeArray['id'])
+			->firstOrFail();
+// 		Log::info("delete2".json_encode($outcome));
+		$outcome->forceDelete();
+// 		Log::info("sal".json_encode($sal));
+// 		if($sal)
+		{
+			Session::flash('status', 'success');
+			Session::flash('message', 'Learning Outcome deleted.');
+			
+		}
+
+	}
+    
     public function updateMore()
     {
         $outcomeArray = json_decode(Input::get('outcomeArray'), true);
         Session::flash('status', 'success');
         Session::flash('message', 'Learning Outcomes updated.');
+		Log::info("Ahora1".json_encode($outcomeArray));
 
         foreach ($outcomeArray as $outcomeObject) {
 
@@ -352,13 +373,21 @@ class OutcomesController extends \BaseController
                 array(
                     'name' => $outcomeObject['name'],
                     'definition' => $outcomeObject['definition'],
-                    'expected_outcome' => $outcomeObject['expected_outcome']
+                    'expected_outcome' => $outcomeObject['expected_outcome'],
+                    'activation_date' => $outcomeObject['activation_date'],
+//                     'deactivation_date' => (isset($outcomeObject['deactivation_date'])?$outcomeObject['deactivation_date']:NULL),
+                    'level' => $outcomeObject['level'],
+//                     'new_outcome_id'=>$outcomeObject['new_outcome_id']
                     // TODO- validar los otros 3 valores
                 ),
                 array(
                     'name' => 'required',
                     'definition' => 'required',
-                    'expected_outcome' => 'required|numeric'
+                    'expected_outcome' => 'required|numeric',
+                    'activation_date' => 'required|date',
+//                     'deactivation_date' => 'sometimes|required|date',
+                    'level' => 'required|numeric'
+//                     'new_outcome_id' => 'required|numeric'
                     // TODO- los requisitos de los otros 3 valores
                 )
             );
@@ -372,8 +401,19 @@ class OutcomesController extends \BaseController
                     $outcome->definition = $outcomeObject['definition'];
                     $outcome->expected_outcome = $outcomeObject['expected_outcome'];
                     $outcome->activation_date = $outcomeObject['activation_date'];
-                    $outcome->deactivation_date = $outcomeObject['deactivation_date'];
+                    if($outcomeObject['deactivation_date']!="")
+                    {
+                    	$outcome->deactivation_date = $outcomeObject['deactivation_date'];
+	                    if(isset($outcomeObject['new_outcome_id']))$outcome->new_outcome_id = $outcomeObject['new_outcome_id'];
+                    }
+                    else 
+                    {
+                    	$outcome->deactivation_date = NULL;
+                    	$outcome->new_outcome_id=NULL;
+                    }
                     $outcome->level = $outcomeObject['level'];
+		Log::info("Ahora2".json_encode($outcome));
+
                     $outcome->save();
 
                     // If delete is 1, and outcome isn't already trashed, delete

app/controllers/RubricsController.php

@@ -21,7 +21,9 @@ class RubricsController extends \BaseController
         // Select templates that belong to everyone or belong to the activity's course's school
         $usable_templates = DB::table('templates')->join('template_criterion', 'template_criterion.template_id', '=', 'templates.id')
             ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'template_criterion.criterion_id')
+            ->join('program_criterion_objective_outcome', 'criterion_objective_outcome.id', '=', 'program_criterion_objective_outcome.cri_obj_out_id')
             ->where('objective_id', '<>', 0)
+            ->where('program_criterion_objective_outcome.program_id', $activity->course->program->id)
             ->groupBy('template_id')
             ->lists('template_id');
         $templates = Template::where('is_visible', '=', 1)

app/controllers/TemplatesController.php

@@ -11,6 +11,7 @@ class TemplatesController extends \BaseController
 	{
 		return $this->show($template);
 	}
+
 	public function ProfIndex()
 	{
 		$title = 'Rubric List';
@@ -192,6 +193,11 @@ class TemplatesController extends \BaseController
 		return View::make('local.managers.shared.rubrics', compact('title', 'templates', 'outcomes', 'criteria', 'schools', 'programs'));
 	}
 
+	public function newTemplateProf()
+	{
+		return $this->newTemplate_new();
+			
+	}
 	public function newTemplate_new()
 	{
 		$title = "Rubric Builder";
@@ -218,6 +224,11 @@ class TemplatesController extends \BaseController
 				$programs = Auth::user()->programs()->get();
 				$school_id_user=Auth::user()->programs[0]->school->id;
 			}
+			if ($role == 4) {
+				$programs = Auth::user()->programs()->get();
+				$school_id_user=Auth::user()->programs[0]->school->id;
+			}
+			Log::info(json_encode($school_id_user));
 			$program_ids = array();
 			foreach ($programs as $program) {
 				$program_ids[] = $program->id;
@@ -227,11 +238,21 @@ class TemplatesController extends \BaseController
 				function ($q) use ($program_ids) {
 					$q->whereIn('program_id', $program_ids);
 				}
-			)->orderBy('name', 'ASC')->get();
+			)
+			->whereHas('getObjectivesAttribute', function ($q)
+				{
+					$q->where('objective_id','!=',0);
+				}
+			)
+			->orderBy('name', 'ASC')->get();
 			}
+// 			Log::info("aqui".(count($criteria)));
+// 			Log::info(json_encode(count($criteria)));
+			
 			$templates = Template::where('school_id', '=', $school_id_user)->orWhere('school_id', '=', NULL)
 				->orderBy('name', 'ASC')->get();
 			$criteria_ids = array();
+			
 			foreach ($criteria as $criterion) {
 				$criteria_ids[] = $criterion->id;
 			}
@@ -239,6 +260,8 @@ class TemplatesController extends \BaseController
 				$q->whereNotIn('criterion_id', $criteria_ids);
 			})
 				->orderBy('name', 'ASC')->get();
+				
+				
 			$templates_fuera_ids = array();
 			foreach ($templates_fuera as $tf) {
 				$templates_fuera_ids[] = $tf->id;

app/controllers/ThreeYearPlanController.php

@@ -41,6 +41,28 @@ class ThreeYearPlanController extends \BaseController
       return Redirect::to("three-years-plan/{$program_id}");
     }
   }
+    public function adminIndex()
+  {
+  	Log::info("Entre".json_encode($this));
+
+    $title = "Three Years Plans";
+    $programs = Program::get();
+
+    return View::make('local.managers.admins.show-typ-program', compact('title', 'programs'));
+  }
+
+    public function manageSemesterCycle()
+  {
+//   	Log::info("Entre".json_encode($this));
+
+    $title = "Semesters Cycles";
+//     $programs = Program::get();
+
+		return $this->adminIndex();
+//     return View::make('local.managers.admins.show-typ-program', compact('title', 'programs'));
+  }
+
+
   // load the Three year Plan page
   public function threeYearsReport($program_id)
   {

app/models/Criterion.php

@@ -29,7 +29,7 @@ class Criterion extends Eloquent
 
 	public function getObjectivesAttribute()
 	{
-		return $this->belongsToMany('Objective');
+		return $this->belongsToMany('Objective','criterion_objective_outcome');
 	}
 
 	public function rubrics()

app/routes.php

@@ -407,8 +407,8 @@ Route::group(array('before' => 'auth|has_access'), function () {
 
 
         //Plans routes
-        Route::post('showThreeYearPlans', 'ThreeYearPlanController@adminIndex');
-        Route::post('showAnnualPlans', 'AnnualPlansController@adminIndex');
+        Route::get('showThreeYearPlans', 'ThreeYearPlanController@adminIndex');
+        Route::get('showAnnualPlans', 'AnnualPlansController@adminIndex');
 
 
         //endhere
@@ -421,7 +421,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
         Route::get('new-learning-outcomes', 'OutcomesController@newIndex');
 
         Route::post('learning-outcomes/update', array('before' => 'csrf', 'uses' => 'OutcomesController@updateMore'));
-        Route::post('learning-outcomes/update', array('before' => 'csrf', 'uses' => 'OutcomesController@update'));
+        Route::post('learning-outcomes/delete', array('before' => 'csrf', 'uses' => 'OutcomesController@delete'));
         Route::post('criteria/update', array('before' => 'csrf', 'uses' => 'CriteriaController@update'));
         Route::delete('critteria/delete', array('before' => 'csrf', 'uses' => 'CriteriaController@destroy'));
 
@@ -634,7 +634,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
      */
     Route::group(array('prefix' => 'professor', 'before' => 'prof'), function () {
 
-
+        Route::get('rubrics', 'TemplatesController@newTemplateProf');
         Route::get('templateForProfessor', 'TemplatesController@ProfIndex');
         Route::post('program', array('before' => 'csrf', 'uses' => 'ProfessorsController@program'));
         Route::get('activities/{activity_id}/rubrics', 'RubricsController@newRubric');

app/views/global/agreement.blade.php

@@ -18,6 +18,22 @@ Your login to this platform and the reading of the information related to the ma
 <li>	you act within the framework of its role as coordinator of the learning assessment  and/or professor and
 <li>	you are committed to safeguarding the principle of privacy and confidentiality of the student.
 </ul>
+<hr>
+<p>
+La Ley federal de Derechos Educativos y Privacidad Familiar, 1974 (FERPA) establece los parámetros para la protección a la confidencialidad de la información académica de los estudiantes, reconociéndoles el derecho a inspeccionar y revisar sus expedientes académicos. En 2012 se aprobó una enmienda que amplía las condiciones de acceso a cualquier tercero designado, a la información privada de identificación personal y a la que se encuentra en los registros educativos, incluyendo las calificaciones, para propósito de evaluar el progreso educativo y en consecuencia mejorar, entre otras cosas, la efectividad de dicho programa educativo.
+</p><p>
+La evaluación del aprendizaje estudiantil es una actividad mandatada por la normativa institucional y una práctica atada al proceso de enseñanza que busca medir la efectividad y propiciar las transformaciones dirigidas a la excelencia. OLAS, plataforma en línea creada en el Recinto, recopila información sobre el desempeño de estudiantes a través de rúbricas de avalúo desarrolladas y utilizadas por los usuarios (coordinadores de avalúo de la DIIA y de las facultades; y profesores) que recogen y reciben datos.
+</p><p>
+FERPA define representante autorizado a cualquiera entidad o individuo designado por un estado o autoridad local, que lleva a cabo cualquier auditoría o evaluación o cualquier actividad de cumplimiento en conexión con requerimientos legales federales, que se relacionan con los programas. Puede ser un oficial o funcionario universitario que tenga interés educativo legítimo como parte de sus responsabilidades profesionales-administrativas, supervisión académica, de investigación o de apoyo-bajo las tareas que desempeña.
+</p><p>
+La DIIA durante el proceso de recibir, analizar y divulgar la información contenida en los informes de avalúo del aprendizaje generados por las facultades, utiliza métodos razonables, como monitoreo continuo en la plataforma en línea, acceso controlado al programado, entre otras medidas, para asegurar que se mantiene protegida la identidad del estudiante.
+</p><p>
+Su ingreso a esta plataforma y la lectura de la información relacionada al manejo del expediente del estudiante, arriba expuesta, implica que:
+</p><ul>
+<li>	concuerda con que los datos ubicados y extraídos de la plataforma tienen un propósito educativo
+<li>	actúa en el marco de su rol de coordinador de avalúo del aprendizaje y/o profesor y 
+<li>	se compromete a resguardar el principio de privacidad y confidencialidad que le asiste al estudiante.
+</ul>
 
             {{ Form::open(['action' => 'AgreementController@agree', 'class' => 'form-horizontal']) }}
             <div class="form-group">

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

@@ -4,8 +4,8 @@
       {{ 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>{{ HTML::linkAction('AdministratorsController@overview', 'Overview') }}</li>-->
+            <li>{{ HTML::linkAction('AdministratorsController@overview2', 'Overview') }}</li>
 
             <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"

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

@@ -16,10 +16,10 @@
             <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">
+            <ol id="table-of-contents">
                 @foreach ($programs as $program)
                     <li>
-                        <a href="{{ URL::action('AnnualPlansController@showPlan', [$program->id]) }}">
+                        <a href="{{ URL::action('AnnualPlansController@annualPlansShow', ['plan',$program->id]) }}">
                             {{ $program->name }}
                         </a>
                     </li>

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

@@ -16,54 +16,55 @@
         <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>
+                
             <table class="table table-striped table-condensed editable-table" id='outcomes_table'>
                 <thead>
                     <tr class="center-text">
+                        <th class="col-md-1">ID</th>
                         <th class="col-md-4">Learning Outcome</th>
-                        <th class="col-md-7">Definition</th>
+                        <th class="col-md-6">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>
+                        <th class="col-md-1">Level<br><font size="-5">1:undergrad, 2:grad, 3:both</font></th>
+                        <th class="col-md-1">Equivalent to</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))
+                        @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 class="id col-md-1">{{ $outcome->id }}</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" 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>
+                                <td></td>
+                                <td><button class="btn btn-sm btn-primary center-block del" id='del{{ $outcome->id }}'>Del</button></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 != ''))
+                        @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 class="id col-md-1">{{ $outcome->id }}</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" 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="new_outcome_id col-md-1">{{ $outcome->new_outcome_id }}</td>
+                                <td><button class="btn btn-sm btn-primary center-block del" id='del{{ $outcome->id }}'>Del</button></td>
                             </tr>
                         @endif
                         {{-- @endforeach --}}
@@ -112,6 +113,40 @@
 @stop
 
 @section('javascript')
+@foreach ($outcomes as $outcome)
+     $('#del{{ $outcome->id }}').on('click', function(e)
+    {
+    	e.preventDefault();
+    	//outcomeObject.id= $(this).data('id');
+    	if(confirm("Are you sure you want to delete the outcome with id {{ $outcome->id }}"))
+    	{
+    		console.log("si");
+			var outcomeObject = new Object();
+
+			outcomeObject.id= {{ $outcome->id }};
+	    	outcomeObject.delete=1;
+	    	console.log("algo"+JSON.stringify({{ $outcome->id }}));
+	    	console.log("algo"+JSON.stringify(outcomeObject));
+			var clone = jQuery.extend({}, outcomeObject);
+		//	outcomeArray.push(clone);
+	    //	console.log("algo"+JSON.stringify(outcomeArray));
+			$.post(
+			"{{ URL::action('OutcomesController@delete') }}",
+			{ outcomeArray: JSON.stringify(outcomeObject)},
+			function(data)
+			{
+				location.reload();
+			}
+			);
+			
+   		}
+    	else 
+    	{
+	    	console.log("no");
+//			outcomeObject.delete=0;
+		}
+	});
+@endforeach
 
     $('#new_outcome_form').hide();
 
@@ -129,6 +164,7 @@
     $('#show').show();
     });
 
+	
     $('#save').on('click', function(e)
     {
     e.preventDefault();
@@ -147,15 +183,17 @@
     outcomeObject.activation_date= $(this).children('.activation-date').text();
     outcomeObject.deactivation_date= $(this).children('.deactivation-date').text();
     outcomeObject.level= $(this).children('.level').text();
+    if($(this).children('.new_outcome_id').text()!="")outcomeObject.new_outcome_id= $(this).children('.new_outcome_id').text();
 
     if($(this).find('.glyphicon-eye-close').length>0)
     {
-    outcomeObject.delete=1;
+    	outcomeObject.delete=1;
     }
 
     else
-    outcomeObject.delete=0;
-
+   	{
+	   	outcomeObject.delete=0;
+	}
     var clone = jQuery.extend({}, outcomeObject);
     outcomeArray.push(clone);
     });

app/views/local/managers/admins/show-typ-program.blade.php

@@ -0,0 +1,30 @@
+@extends('layouts.master')
+
+@section('navigation')
+    @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)
+        @include('local.managers.pCoords._new_navigation')
+    @endif
+@stop
+
+@section('main')
+    <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">
+                @foreach ($programs as $program)
+                    <li>
+                        <a href="{{ URL::action('ThreeYearPlanController@showPDFs', [$program->id]) }}">
+                            {{ $program->name }}
+                        </a>
+                    </li>
+                @endforeach
+            </ol>
+        </div>
+    </div>
+@stop

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

@@ -112,7 +112,25 @@
             </li>
 
 
+            <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Annual
+                    Report<span class="caret"></span></a>
+                <ul class="dropdown-menu dropdown-menu-left" role="menu">
 
+                    <h6 class='dropdown-header'>Create/Edit Annual Report for:</h6>
+                    @foreach (Auth::user()->programs as $program)
+                        <li><a
+                                href="{{ URL::action('OutcomesController@annualReport', $program->id) }}">{{ $program->name }}</a>
+                        </li>
+                    @endforeach
+                    <h6 class="dropdown-header">View Annual Report from:</h6>
+                    @foreach (Auth::user()->programs as $program)
+                        <li><a
+                                href="{{ URL::action('AnnualPlansController@annualPlansShow', ['report', $program->id]) }}">{{ $program->name }}</a>
+                        </li>
+                    @endforeach
+                </ul>
+            </li>
 
 
             @if (count(Auth::user()->courses))
@@ -137,31 +155,6 @@
 
 
 
-
-            <li class="dropdown">
-                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Annual
-                    Report<span class="caret"></span></a>
-                <ul class="dropdown-menu dropdown-menu-left" role="menu">
-
-                    <h6 class='dropdown-header'>Create/Edit Annual Report for:</h6>
-                    @foreach (Auth::user()->programs as $program)
-                        <li><a
-                                href="{{ URL::action('OutcomesController@annualReport', $program->id) }}">{{ $program->name }}</a>
-                        </li>
-                    @endforeach
-                    <h6 class="dropdown-header">View Annual Report from:</h6>
-                    @foreach (Auth::user()->programs as $program)
-                        <li><a
-                                href="{{ URL::action('AnnualPlansController@annualPlansShow', ['report', $program->id]) }}">{{ $program->name }}</a>
-                        </li>
-                    @endforeach
-                </ul>
-            </li>
-
-
-
-
-
             <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Help<span
                         class="caret"></span></a>

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

@@ -100,7 +100,25 @@
             <li>{{ HTML::linkAction('OutcomesController@schoolAssessmentReport', 'School Results') }}</li>
 
 
+            <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Annual
+                    Report<span class="caret"></span></a>
+                <ul class="dropdown-menu dropdown-menu-left" role="menu">
 
+                    <h6 class='dropdown-header'>Create/Edit Annual Report for:</h6>
+                    @foreach (Auth::user()->school->programs as $program)
+                        <li><a
+                                href="{{ URL::action('OutcomesController@annualReport', $program->id) }}">{{ $program->name }}</a>
+                        </li>
+                    @endforeach
+                    <h6 class="dropdown-header">View Annual Report from:</h6>
+                    @foreach (Auth::user()->programs as $program)
+                        <li><a
+                                href="{{ URL::action('AnnualPlansController@annualPlansShow', ['report', $program->id]) }}">{{ $program->name }}</a>
+                        </li>
+                    @endforeach
+                </ul>
+            </li>
 
 
             @if (count(Auth::user()->courses))
@@ -125,31 +143,6 @@
 
 
 
-
-            <li class="dropdown">
-                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Annual
-                    Report<span class="caret"></span></a>
-                <ul class="dropdown-menu dropdown-menu-left" role="menu">
-
-                    <h6 class='dropdown-header'>Create/Edit Annual Report for:</h6>
-                    @foreach (Auth::user()->school->programs as $program)
-                        <li><a
-                                href="{{ URL::action('OutcomesController@annualReport', $program->id) }}">{{ $program->name }}</a>
-                        </li>
-                    @endforeach
-                    <h6 class="dropdown-header">View Annual Report from:</h6>
-                    @foreach (Auth::user()->programs as $program)
-                        <li><a
-                                href="{{ URL::action('AnnualPlansController@annualPlansShow', ['report', $program->id]) }}">{{ $program->name }}</a>
-                        </li>
-                    @endforeach
-                </ul>
-            </li>
-
-
-
-
-
             <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Help<span
                         class="caret"></span></a>

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

@@ -7,6 +7,8 @@
             @include('local.managers.sCoords._new_navigation')
         @elseif(Auth::user()->role==3)
             @include('local.managers.pCoords._new_navigation')
+        @elseif(Auth::user()->role==4)
+            @include('local.professors._navigation')
         @endif
 @stop
 

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

@@ -35,7 +35,14 @@
                 <li> {{ HTML::linkAction('ProfessorsController@program', 'Program') }}</li>
             @endif
             <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReport', 'Results') }}</li>
-            <li>{{ HTML::linkAction('TemplatesController@ProfIndex', 'Rubric List') }}</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@newTemplateProf', 'Create/Edit Rubrics') }}</li>
+                    <li>{{ HTML::linkAction('TemplatesController@ProfIndex', 'View Rubric List') }}</li>
+                </ul>
+            </li>
             <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"
                     aria-expanded="false">Help<span class="caret"></span></a>
@@ -48,6 +55,7 @@
                     </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>