adicion de 'objectives and criteria'

-se creo una pagina para ver objectives and criteria, similar a ver learning outcomes and criteria.

app/controllers/CriteriaController.php

@@ -300,11 +300,8 @@ class CriteriaController extends \BaseController {
 
     public function index()
     {
-        // para conseguir el ID de los semestres que el usuario tiene seleccionado.
-        $semesters_ids = array();
-        foreach(Session::get('semesters_ids') as $id){
-          array_push($semesters_ids, $id);
-        }
+        // el ID de los semestres que el usuario tiene seleccionado.
+        $semesters_ids = Session::get('semesters_ids');
         // buscar informacion de los semestres seleccionados
         $semesters = Semester::whereIn('id',$semesters_ids)->get();
 
@@ -318,6 +315,47 @@ class CriteriaController extends \BaseController {
 
     }
 
+    // copie index() y lo edite
+    public function objectivesIndex()
+    {
+        if(Auth::user()->role==1)
+        {
+          //uscar todos los objetivos
+          $objectives = DB::table('program_user')
+                                ->join('objectives','objectives.program_id','=','program_user.program_id')
+                                ->join('programs','programs.id','=','program_user.program_id')
+                                ->select('objectives.id','objectives.text','programs.name')
+                                ->orderBy('objectives.text', 'asc')
+                                ->get();
+        }
+        elseif(Auth::user()->role==2)
+        {
+          //buscar los objetivos de la departamento (school)
+          $objectives = DB::table('program_user')
+                                ->join('objectives','objectives.program_id','=','program_user.program_id')
+                                ->join('programs','programs.id','=','program_user.program_id')
+                                ->where('programs.school_id',Auth::user()->school_id)
+                                ->select('objectives.id','objectives.text','programs.name')
+                                ->orderBy('objectives.text', 'asc')
+                                ->get();
+        }
+        elseif((Auth::user()->role==3) || (Auth::user()->role==4))
+        {
+          //buscar los objetivos de los programas cuales el profesor esta
+          $objectives = DB::table('program_user')
+                                ->join('objectives','objectives.program_id','=','program_user.program_id')
+                                ->join('programs','programs.id','=','program_user.program_id')
+                                ->where('program_user.user_id',Auth::user()->id)
+                                ->select('objectives.id','objectives.text','programs.name')
+                                ->orderBy('objectives.text', 'asc')
+                                ->get();
+        }
+
+        $title = "Learning Objectives and Criteria";
+
+        return View::make('global.view-objectives-criteria', compact('title', 'objectives'));
+    }
+
     public function destroy()
     {
         $criterion = Criterion::withTrashed()->find(Input::get('id'));

app/controllers/ObjectivesController.php

@@ -234,4 +234,19 @@ class ObjectivesController extends \BaseController {
 
     return json_encode($res);
   }
+
+  public function fetchObjectiveForCriteria()
+  {
+      $id = Input::get('id');
+
+      $objective = Objective::find($id);
+
+      $objective->program;
+      $objective->criteria;
+
+      return array
+      (
+          'objective' => $objective
+      );
+  }
 }

app/routes.php

@@ -226,6 +226,9 @@ Route::group(array('before' => 'auth|has_access'), function()
     // Show users all learning outcomes and criteria
     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::post('fetchObjectiveForCriteria', array('before' => 'csrf', 'uses'=>'ObjectivesController@fetchObjectiveForCriteria'));
 
     // Show professor overview to users with courses
     Route::get('professor', 'ProfessorsController@overview');
@@ -392,6 +395,7 @@ 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('export_grades/{id}', 'CoursesController@exportGrades');
 
         // Assessment reports

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

@@ -19,11 +19,9 @@
       <div class="list-group">
         @foreach ($outcomes as $outcome)
           @foreach ($semesters as $semester)
-            {{-- activation_date --}}
             @if(!$outcome->deleted_at && $outcome->activation_date >= $semester->start && $outcome->activation_date <= $semester->end)
               {{-- <li data-outcome-id="{{ $outcome->id }}"class="list-group-item">{{ $outcome->name }}</li> --}}
               <li data-outcome-id="{{ $outcome->id }}"class="list-group-item">{{ $outcome->name }} [{{$semester->code}}]</li>
-              {{-- <li data-outcome-id="{{ $outcome->id }}"class="list-group-item">[{{$semester->code}}] {{ $outcome->name }}</li> --}}
             @endif
           @endforeach
         @endforeach

app/views/global/view-objectives-criteria.blade.php

@@ -0,0 +1,145 @@
+@extends('layouts.master')
+
+@section('navigation')
+    @if(Auth::user()->role==1)
+      @include('local.managers.admins._navigation')
+    @elseif(Auth::user()->role==2)
+      @include('local.managers.sCoords._navigation')
+    @elseif(Auth::user()->role==3)
+      @include('local.managers.pCoords._navigation')
+    @elseif(Auth::user()->role==4)
+      @include('local.professors._navigation')
+    @endif
+@stop
+
+@section('main')
+
+  <div class="row">
+    <div class="col-md-3">
+      <div class="list-group">
+        @foreach ($objectives as $objective)
+          <li data-objective-id="{{ $objective->id }}"class="list-group-item">{{ $objective->text }}</li>
+        @endforeach
+      </div>
+    </div>
+
+    <div class="col-md-9">
+      <div id="objective-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="objective-definition "></p>
+            <div class="table-responsive">
+                <table class="table table-striped table-condensed datatable">
+                  <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>
+                  <tfoot>
+                      <tr class="column-search">
+                          <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><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><input class="column-search-bar form-control" type="text" placeholder="Buscar"/></th>
+                      </tr>
+                  </tfoot>
+                  <tbody>
+                  </tbody>
+                </table>
+            </div>
+
+        </div>
+      </div>
+    </div>
+
+    <div class="col-md-9">
+      <div class="no-objective alert alert-info">
+        <p>Select a Learning Objective to view its information</p>
+      </div>
+    </div>
+
+  </div>
+@stop
+
+@section('included-js')
+    @include('global._datatables_js')
+@stop
+
+@section('javascript')
+
+$(document).ready(function()
+{
+  // --------------------------------------------------------------------------
+  // Page load
+  // --------------------------------------------------------------------------
+
+  // Hide accordion panel contents by default
+  $('.panel-group .panel-body').hide();
+
+  $('#objective-display').parent().hide();
+
+  // --------------------------------------------------------------------------
+  // Functions
+  // --------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------
+  // Events
+  // --------------------------------------------------------------------------
+
+  // When list item is clicked, load corresponding info
+  $('.list-group-item').on('click', function()
+  {
+    var id = $(this).data('objective-id');
+
+    $.post(
+    "{{ URL::action('ObjectivesController@fetchObjectiveForCriteria') }}",
+    { id: id },
+    function(json)
+    {
+        // Retrieve datatable instance
+        var table = $('.datatable').DataTable();
+
+        var name = json.objective.text;
+        var definition = json.objective.program.name;
+        var criteria =json.objective.criteria;
+
+        $('#objective-display').parent().show();
+        $('.no-objective').parent().hide();
+
+        //Display title and definition
+        $('#objective-display .panel-title').html(name);
+        $('#objective-display .objective-definition').html(definition);
+
+        //Empty table
+        table.clear();
+
+        // Add new criteria
+        if(criteria.length>0)
+        {
+          $('table').show();
+          $.each(criteria, function(index, value)
+          {
+              table.row.add([
+                value.name,
+                value.description12,
+                value.description34,
+                value.description56,
+                value.description78
+              ]);
+          });
+        }
+        else
+        {
+          $('table').hide();
+        }
+
+        // Update display
+        table.draw();
+    },
+    'json'
+    );
+
+  })
+});
+
+@stop

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

@@ -16,7 +16,15 @@
           <li>{{ HTML::linkAction('UsersController@index', 'Users') }}</li>
         </ul>
       </li>
-      <li>{{ HTML::linkAction('CriteriaController@index', 'Learning Outcomes and Criteria') }}</li>
+      {{-- la linea siguiente comentada es lo que habia originalmente. tanto la linea como este comentario se pueden borrar --}}
+      {{-- <li>{{ HTML::linkAction('CriteriaController@index', 'Learning Outcomes and Criteria') }}</li> --}}
+      <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Learning 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>
+        </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" role="menu">

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

@@ -6,7 +6,15 @@
     <ul class="nav navbar-nav navbar-right">
       <li>{{ HTML::linkAction('ProgramCoordinatorsController@overview', 'Overview') }}</li>
       <li>{{ HTML::linkAction('TemplatesController@newTemplate', 'Rubrics') }}</li>
-      <li>{{ HTML::linkAction('CriteriaController@index', 'Learning Outcomes and Criteria') }}</li>
+      {{-- la linea siguiente comentada es lo que habia originalmente. tanto la linea como este comentario se pueden borrar --}}
+      {{-- <li>{{ HTML::linkAction('CriteriaController@index', 'Learning Outcomes and Criteria') }}</li> --}}
+      <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Learning 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>
+        </ul>
+      </li>
       @if(count(Auth::user()->courses))
       <li> {{ HTML::linkAction('ProfessorsController@overview', 'My Courses', NULL) }}</li>
       <li class="dropdown">

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

@@ -6,7 +6,15 @@
     <ul class="nav navbar-nav navbar-right">
       <li>{{ HTML::linkAction('SchoolCoordinatorsController@overview', 'Overview') }}</li>
       <li>{{ HTML::linkAction('TemplatesController@newTemplate', 'Rubrics') }}</li>
-      <li>{{ HTML::linkAction('CriteriaController@index', 'Learning Outcomes and Criteria') }}</li>
+      {{-- la linea siguiente comentada es lo que habia originalmente. tanto la linea como este comentario se pueden borrar --}}
+      {{-- <li>{{ HTML::linkAction('CriteriaController@index', 'Learning Outcomes and Criteria') }}</li> --}}
+      <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Learning 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>
+        </ul>
+      </li>
       @if(count(Auth::user()->courses))
       <li> {{ HTML::linkAction('ProfessorsController@overview', 'My Courses', NULL) }}</li>
       <li class="dropdown">

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

@@ -6,7 +6,15 @@
     </div>-->
     <ul class="nav navbar-nav navbar-right">
       <li>{{ HTML::linkAction('ProfessorsController@overview', 'My Courses') }}</li>
-      <li>{{ HTML::linkAction('CriteriaController@index', 'Learning Outcomes and Criteria') }}</li>
+      {{-- la linea siguiente comentada es lo que habia originalmente. tanto la linea como este comentario se pueden borrar --}}
+      {{-- <li>{{ HTML::linkAction('CriteriaController@index', 'Learning Outcomes and Criteria') }}</li> --}}
+      <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Learning 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>
+        </ul>
+      </li>
       @if(count(Auth::user()->courses))
         <li class="dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Sections<span class="caret"></span></a>