Merge branch 'Merge_gabriel_mayo' of https://git.ccom.uprrp.edu/CDCC/OLAS into Merge_gabriel_mayo

No tengo idea

app/controllers/CriteriaController.php

@@ -1261,4 +1261,149 @@ class CriteriaController extends \BaseController
 
         return $json;
     }
+
+    public function fetchObjectiveCriteria()
+    {
+        $array_to_send = [];
+        $program_id =  Input::get('program_id');
+        $objective_id = Input::get('objective_id');
+
+        Log::info(Input::all());
+
+        $array_to_send['objective'] = Objective::find($objective_id);
+
+        $outcomes = DB::table('outcomes')
+            ->join('objective_outcome', 'outcomes.id', '=', 'objective_outcome.outcome_id')
+            ->join('objective_program', 'objective_program.objective_id', '=', 'objective_outcome.objective_id')
+            ->where('program_id', $program_id)
+            ->where('objective_outcome.objective_id', $objective_id)
+            ->select('outcomes.*')
+            ->distinct()
+            ->get();
+
+        foreach ($outcomes as $out) {
+
+            $out->criteria = DB::table("program_criterion_objective_outcome as poco")
+                ->join('criterion_objective_outcome as cobo', 'cobo.id', '=', 'poco.cri_obj_out_id')
+                ->join('criteria', 'criteria.id', '=', 'cobo.criterion_id')
+                ->where('outcome_id', $out->id)
+                ->where('program_id', $program_id)
+                ->where('objective_id', $objective_id)
+                ->select("criteria.*")
+                ->groupBy('criteria.id')
+                ->get();
+            Log::info("outcome_id: " . $out->id);
+        }
+
+
+        $array_to_send['outcomes'] = $outcomes;
+
+        return $array_to_send;
+    }
+
+    function viewCriteriaOutcome()
+    {
+        $title = "Learning Criteria and Outcomes";
+
+        $role = Auth::user()->role;
+
+        switch ($role) {
+            case 1:
+                $programs = Program::select('programs.*')->get();
+                break;
+
+            case 2:
+                $programs = Auth::user()->school->programs;
+                break;
+            case 3:
+                # code...
+
+            case 4:
+
+                $programs = Auth::user()->programs;
+
+                break;
+        }
+
+        return View::make('local.managers.shared.view-criteria-outcome', compact('title', 'programs'));
+    }
+
+    public function fetchCriteriaOutcomes()
+    {
+        $program = Program::find(Input::get('program_id'));
+        $outcomes = Outcome::active_by_semesters(Semester::whereIn('id', Session::get('semesters_ids'))->get(), $program->is_graduate);
+        $outcome_ids = [];
+        foreach ($outcomes as $o) {
+            $outcome_ids[] = $o->id;
+        }
+
+        $criteria = DB::table('criteria')
+            ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
+            ->join('program_criterion_objective_outcome', 'program_criterion_objective_outcome.cri_obj_out_id', '=', 'criterion_objective_outcome.id')
+            ->whereIn('outcome_id', $outcome_ids)
+            ->where('program_id', $program->id)
+            //->where('criteria.id', '<>', '0')
+            ->select('criteria.*')
+            ->groupBy('criteria.id')
+            ->get();
+
+        foreach ($criteria as $criterion)
+            $criterion->outcome_ids = DB::table('criterion_objective_outcome as cobo')
+                ->join('program_criterion_objective_outcome as poco', 'poco.cri_obj_out_id', '=', 'cobo.id')
+                ->where('program_id', $program->id)
+                ->where('criterion_id', $criterion->id)
+                ->lists('outcome_id');
+        //Log::info($objectives->outcomes);
+        $array_to_send = [
+            'outcomes' => $outcomes,
+            'criteria' => $criteria
+
+        ];
+
+        return $array_to_send;
+    }
+
+    public function fetchCriteriaObjectiveOutcomes()
+    {
+        $array_to_send = [];
+        $program_id =  Input::get('program_id');
+        $criterion_id = Input::get('criterion_id');
+
+        Log::info(Input::all());
+
+        $array_to_send['criterion'] = Criterion::find($criterion_id);
+
+        //coger outcomes de program_criterion, solo dominios  que esten conectados a criterion_id,
+        // bajo el programa_id
+
+        $outcomes = DB::table('outcomes')
+            ->join('criterion_objective_outcome', 'outcomes.id', '=', 'criterion_objective_outcome.outcome_id')
+            ->join('program_criterion_objective_outcome', 'program_criterion_objective_outcome.cri_obj_out_id', '=', 'criterion_objective_outcome.id')
+            ->where('program_id', $program_id)
+            ->where('criterion_id', $criterion_id)
+            ->select('outcomes.*')
+            ->distinct()
+            ->get();
+
+        foreach ($outcomes as $out) {
+
+            // get objectivos del dominio pareados a este criterio_id bajo program_id
+
+            $out->objectives = DB::table("program_criterion_objective_outcome as poco")
+                ->join('criterion_objective_outcome as cobo', 'cobo.id', '=', 'poco.cri_obj_out_id')
+                ->join('objectives', 'objectives.id', '=', 'cobo.objective_id')
+                ->where('outcome_id', $out->id)
+                ->where('program_id', $program_id)
+                ->where('criterion_id', $criterion_id)
+                ->select("objectives.*")
+                ->groupBy('objectives.id')
+                ->get();
+            //Log::info("outcome_id: " . $out->id);
+        }
+
+
+        $array_to_send['outcomes'] = $outcomes;
+
+        return $array_to_send;
+    }
 }

app/controllers/Objective2Controller.php

@@ -1266,4 +1266,66 @@ class Objective2Controller extends \BaseController
 			}
 		}*/
 	}
+
+	function viewObjectiveOutcome()
+	{
+		$title = "Learning Objectives and Outcomes";
+
+		$role = Auth::user()->role;
+
+		switch ($role) {
+			case 1:
+				$programs = Program::select('programs.*')->get();
+				break;
+
+			case 2:
+				$programs = Auth::user()->school->programs;
+				break;
+			case 3:
+				# code...
+
+			case 4:
+
+				$programs = Auth::user()->programs;
+
+				break;
+		}
+
+		return View::make('local.managers.shared.view-objectives-outcome', compact('title', 'programs'));
+	}
+
+	public function fetchObjectiveOutcome()
+	{
+		$program = Program::find(Input::get('program_id'));
+		$outcomes = Outcome::active_by_semesters(Semester::whereIn('id', Session::get('semesters_ids'))->get(), $program->is_graduate);
+		$outcome_ids = [];
+		foreach ($outcomes as $o) {
+			$outcome_ids[] = $o->id;
+		}
+
+		$objectives = DB::table('objectives')
+			->join('objective_outcome', 'objective_outcome.objective_id', '=', 'objectives.id')
+			->join('objective_program', 'objective_program.objective_id', '=', 'objectives.id')
+			->whereIn('outcome_id', $outcome_ids)
+			->where('program_id', $program->id)
+			->where('objectives.id', '<>', '0')
+			->select('objectives.*')
+			->groupBy('objectives.id')
+			->get();
+
+		foreach ($objectives as $objective)
+			$objective->outcome_ids = DB::table("objective_outcome")
+				->join('objective_program', 'objective_outcome.objective_id', '=', 'objective_program.objective_id')
+				->where('program_id', $program->id)
+				->where('objective_outcome.objective_id', $objective->id)
+				->lists('outcome_id');
+		//Log::info($objectives->outcomes);
+		$array_to_send = [
+			'outcomes' => $outcomes,
+			'objectives' => $objectives
+
+		];
+
+		return $array_to_send;
+	}
 }

app/models/Outcome.php

@@ -257,7 +257,7 @@ class Outcome extends Eloquent
 				->get();
 			//return $objectives;
 		}
-		Log::info("Lol");
+		//Log::info("Lol");
 		return null;
 	}
 	/**
@@ -265,10 +265,17 @@ class Outcome extends Eloquent
 	 *
 	 * @return Illuminate\Database\Eloquent\Model
 	 */
-	public function objectives()
+	public function getObjectivesAttribute()
 	{
-		return $this->hasMany('Objective');
+		//return $this->hasManyThrough('Objective', "Objective_Outcome", 'outcome_id', 'id');
 		//		return $this->belongsToMany('Objective', 'objective_outcome');
+		$objectives = Objective::join('objective_outcome', 'objectives.id', '=', 'objective_outcome.objective_id')
+			->where('outcome_id', $this->id);
+		if (isset($this->program_id)) {
+			$objectives = $objectives->join('objective_program', 'objective_program.objective_id', '=', 'objectives.id')
+				->where('program_id', $this->program_id);
+		}
+		return $objectives->get();
 	}
 
 	public function scopeObjectivesFromProgram($query, $programs)

app/routes.php

@@ -349,8 +349,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
 
     Export criteria from annual plans, rubrics
 
-    */ ////////////////
-
+     ////////////////*/
     Route::post('fetchOutcomesFromPlan', "AnnualPlansController@fetchOutcomesFromPlan");
     Route::post('fetchObjectivesFromPlan', 'AnnualPlansController@fetchObjectivesFromPlan');
     Route::post("fetchSemestersFromPlan", 'AnnualPlansController@fetchSemestersFromPlan');
@@ -358,7 +357,28 @@ Route::group(array('before' => 'auth|has_access'), function () {
     Route::post('fetchCriteriaFromPlan', 'AnnualPlansController@fetchCriteriaFromPlan');
 
 
-    ///////////////////////////////////////////////////////
+    /*////////////////////////
+    //
+    //  Routes: view for objective_outcome
+    //
+    */ ////////////////////////
+
+    Route::get('view-objective-outcome', 'Objective2Controller@viewObjectiveOutcome');
+    Route::post('fetchObjectiveOutcome', 'Objective2Controller@fetchObjectiveOutcome');
+    Route::post('fetchObjectiveCriteria', 'CriteriaController@fetchObjectiveCriteria');
+
+    /*////////////////////////
+    //
+    //  Routes view for criteria_outcome
+    //
+    */ ////////////////////////
+
+    Route::get("view-criteria-outcome", "CriteriaController@viewCriteriaOutcome");
+    Route::post('fetchCriteriaOutcomes', 'CriteriaController@fetchCriteriaOutcomes');
+    Route::post('fetchCriteriaObjectiveOutcomes', 'CriteriaController@fetchCriteriaObjectiveOutcomes');
+
+
+
 
     Route::get('viewFormative', array(
         'as' => 'viewFormative',
@@ -759,5 +779,14 @@ Route::group(array('before' => 'auth|has_access'), function () {
 
         Route::get('general-studies-overview', 'ProfessorsController@generalStudiesOverview');
         Route::get('template/{template}', 'TemplatesController@profShow');
+
+        /////////////////////////////////////////
+        //
+        // Routes for view. 
+        //
+        //
+        //////////////////////////////////////////
+        Route::get('fetchObjectiveOutcome', 'Objective2Controller@viewObjectiveOutcome');
+        Route::get('viewObjectiveOutcome', 'Objective2Controller@viewObjectiveOutcome');
     });
 });

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

@@ -14,6 +14,8 @@
                     <li>{{ HTML::linkAction('Objective2Controller@edit', 'Create/Edit Objectives') }}</li>
                     <li>{{ HTML::linkAction('Objective2Controller@viewObjectives', 'View Objectives and Criteria') }}
                     </li>
+                    <li>{{HTML::linkAction('Objective2Controller@viewObjectiveOutcome', 'View Objectives and Outcome')}}</li>
+
                 </ul>
             </li>
             <li class='dropdown'>
@@ -23,6 +25,7 @@
 
                     <li>{{ HTML::linkAction('CriteriaController@edit', 'Create/Edit Criteria') }}</li>
                     <li>{{ HTML::linkAction('CriteriaController@index', 'View Criteria') }}</li>
+                    <li>{{HTML::linkAction('CriteriaController@viewCriteriaOutcome', 'View Criteria with Outcome')}}</li>
 
                 </ul>
             </li>

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

@@ -13,6 +13,8 @@
                     <li>{{ HTML::linkAction('Objective2Controller@edit', 'Create/Edit Objectives') }}</li>
                     <li>{{ HTML::linkAction('Objective2Controller@viewObjectives', 'View Objectives and Criteria') }}
                     </li>
+                    <li>{{HTML::linkAction('Objective2Controller@viewObjectiveOutcome', 'View Objectives and Outcome')}}</li>
+
                 </ul>
             </li>
 
@@ -46,6 +48,7 @@
 
                     <li>{{ HTML::linkAction('CriteriaController@edit', 'Create/Edit Criteria') }}</li>
                     <li>{{ HTML::linkAction('CriteriaController@index', 'View Criteria') }}</li>
+                    <li>{{HTML::linkAction('CriteriaController@viewCriteriaOutcome', 'View Criteria with Outcome')}}</li>
 
                 </ul>
             </li>

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

@@ -11,8 +11,9 @@
                     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>{{ HTML::linkAction('Objective2Controller@viewObjectives', 'View/Pair Objectives and Criteria') }}
                     </li>
+                    <li>{{HTML::linkAction('Objective2Controller@viewObjectiveOutcome', 'View Objectives and Outcome')}}</li>
                 </ul>
             </li>
 
@@ -46,6 +47,7 @@
 
                     <li>{{ HTML::linkAction('CriteriaController@edit', 'Create/Edit Criteria') }}</li>
                     <li>{{ HTML::linkAction('CriteriaController@index', 'View Criteria') }}</li>
+                    <li>{{HTML::linkAction('CriteriaController@viewCriteriaOutcome', 'View Criteria with Outcome')}}</li>
 
                 </ul>
             </li>

app/views/local/managers/shared/view-criteria-outcome.blade.php

@@ -0,0 +1,243 @@
+@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')
+    @elseif(Auth::user()->role == 4)
+        @include('local.professors._navigation')
+    @endif
+@stop
+
+
+@section('main')
+    <div class ='row'>
+        <div  class ='col-md-3'>
+            <div class="form-group">
+                {{ Form::label('program_id2', 'Select Program') }}
+                <select id='select-program' class="form-control selectpicker"
+                    onchange='fetchAllObjectives("#select-program")'>
+                    @foreach ($programs as $program)
+                        <option value='{{ $program->id }}' data-is-graduate = "{{$program->is_graduate}}" data-subtext="{{ $program->code }}">
+                            {{ $program->name }}</option>
+                    @endforeach
+                </select>
+            </div>
+        </div>
+    </div>
+
+    <div class = 'row'>
+        <div class = 'col-md-12' id ='div_table'>
+        
+        </div>
+
+
+    </div>
+
+            <!-- Modal -->
+            <div id="criteria-modal" class="modal fade" role="dialog">
+                <div class="modal-dialog">
+                    <!-- Modal content-->
+                    <div class="modal-content">
+                        <div class="modal-header">
+                            <button type="button" class="close" data-dismiss="modal">&times;</button>
+                            <h4 class="modal-title"></h4>
+                        </div>
+                        <div class="modal-body">
+                           
+                        </div>
+                        <div class="modal-footer">
+                            <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+
+                        </div>
+                    </div>
+    
+                </div>
+            </div>
+
+    
+
+    <script>
+
+        $(document).ready(function(){
+            onLoad();
+        });
+
+        function onLoad(){
+
+            fetchAllObjectives('#select-program');
+
+        }
+
+        function fetchAllObjectives(select){
+            program_id =$(select).val();
+            is_graduate = $(select).find(':selected').data('is-graduate');
+
+
+            $.post(
+                "{{URL::action('CriteriaController@fetchCriteriaOutcomes')}}", 
+                {
+                    program_id:program_id
+                },
+                function(criteria_outcomes){
+
+                    
+                    drawTable(criteria_outcomes.criteria, criteria_outcomes.outcomes, is_graduate);
+
+                }
+            )
+        }
+
+        function drawTable(criteria, outcomes, is_graduate){
+            
+            
+            table = $('<table>',{
+                'id': 'theMainTable',
+                'class': 'table table-striped table-condensed datatable'
+            });
+
+            thead = $("<thead>");
+                thead_row = $('<tr>');
+            
+            th= $('<th>').html('Criteria');
+            thead_row.append(th);
+
+            
+
+            outcomes_th = [];
+            $.each(outcomes, function(ind, outcomes){
+
+                th = $('<th>', {
+                    'class':'th-outcomes th-out-id',
+                    'data-outcome-id':outcomes.id
+                }).html(outcomes.name);
+
+                outcomes_th.push(th);
+
+                thead_row.append(th);
+                        
+                    
+            })
+            th = $('<th>', {
+                    'class':'th-outcomes'
+                }).html('Objectives');
+
+            thead_row.append(th);
+
+            thead.append(thead_row);
+
+            tbody = $('<tbody>');
+            
+            
+            $.each(criteria, function(ind, criterion){
+
+                tr = $("<tr>", {
+                    'class':'criteria',
+                    'data-criterion-id':criterion.id,
+                })
+
+                td = $("<td>", {
+                    'class': 'objective',
+                    'data-criterion-id':criterion.id,
+                }).html(criterion.name);
+
+                tr.append(td);
+                
+                $(outcomes_th).each(function(id, th){
+
+                    var td = $('<td>');
+                    outcome_id = $(th).data('outcome-id');
+                    //console.log(outcome_id);
+                    if(criterion.outcome_ids.includes(outcome_id)){
+                        var span = $("<span>", {
+                            'class':'glyphicon glyphicon-ok'
+                        })
+                        td.append(span);
+                    }
+                    tr.append(td);
+
+                });
+
+                td_link = $('<td>');
+                a = $("<a>",{
+                    'onclick':'fetchObjectiveCriteria("'+criterion.id+'", "#select-program")'
+                }).html('View Objectives');
+
+                td_link.append(a);
+                tr.append(td_link);
+
+                tbody.append(tr);
+
+
+            });
+
+            table.append(thead)
+            table.append(tbody);
+            $('#div_table').html(table);
+
+            table = $("#theMainTable").DataTable();
+            table.draw();
+        }
+
+
+        function fetchObjectiveCriteria(criterion_id,program_select){
+            program_id = $(program_select).val();
+            $.post(
+                "{{URL::action('CriteriaController@fetchCriteriaObjectiveOutcomes')}}",
+                {
+                    program_id:program_id,
+                    criterion_id:criterion_id
+                },
+                function(data){
+                    modal = "#criteria-modal";
+
+
+                    $(modal).find('.modal-body').html(createModalContent(data.outcomes));
+                    
+                    $(modal).find('.modal-title').html("Objectives for <strong>"+data.criterion.name+"</strong>")
+                    $(modal).modal('show');
+                }
+            )
+        }
+
+        function createModalContent(outcomes){
+            ol_out = $("<ol>")
+            $.each(outcomes, function(ind, out){
+                //ol_out = $("<ol>")
+                if(out.objectives.length == 0)
+                return;
+                li = $('<li>').html("<p><strong>"+out.name+"</strong></p>");
+                
+                ul = $('<ul>');
+                
+
+                $.each(out.objectives, function(ind, obj){
+                    li2 = $("<li>").html(obj.text);
+                    ul.append(li2);    
+                });
+                li.append(ul);
+                ol_out.append(li)
+
+                //div.append(ol_out)
+                
+                
+                
+            })
+
+            return ol_out;
+        }
+
+    </script>
+
+@stop
+
+
+@section('included-js')
+    @include('global._datatables_js')
+@stop
+
+@section('javascript')
+@stop

app/views/local/managers/shared/view-objectives-outcome.blade.php

@@ -0,0 +1,255 @@
+@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')
+    @elseif(Auth::user()->role == 4)
+        @include('local.professors._navigation')
+    @endif
+@stop
+
+
+@section('main')
+    <div class ='row'>
+        <div  class ='col-md-3'>
+            <div class="form-group">
+                {{ Form::label('program_id2', 'Select Program') }}
+                <select id='select-program' class="form-control selectpicker"
+                    onchange='fetchAllObjectives("#select-program")'>
+                    @foreach ($programs as $program)
+                        <option value='{{ $program->id }}' data-is-graduate = "{{$program->is_graduate}}" data-subtext="{{ $program->code }}">
+                            {{ $program->name }}</option>
+                    @endforeach
+                </select>
+            </div>
+        </div>
+    </div>
+
+    <div class = 'row'>
+        <div class = 'col-md-12' id ='div_table'>
+        <table id = 'theMainTable' class ='table table-striped table-condensed datatable'>
+        <thead>
+            <tr id = 'outcomes-thead'>
+                <th>Objectives</th>
+            </tr>
+            
+            
+            
+        </thead>
+        <tbody id = 'objectves-outcomes'>
+
+        </tbody>
+        </table>
+        </div>
+
+
+    </div>
+
+            <!-- Modal -->
+            <div id="criteria-modal" class="modal fade" role="dialog">
+                <div class="modal-dialog">
+                    <!-- Modal content-->
+                    <div class="modal-content">
+                        <div class="modal-header">
+                            <button type="button" class="close" data-dismiss="modal">&times;</button>
+                            <h4 class="modal-title"></h4>
+                        </div>
+                        <div class="modal-body">
+                           
+                        </div>
+                        <div class="modal-footer">
+                            <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+
+                        </div>
+                    </div>
+    
+                </div>
+            </div>
+
+    
+
+    <script>
+
+        $(document).ready(function(){
+            onLoad();
+        });
+
+        function onLoad(){
+
+            fetchAllObjectives('#select-program');
+
+        }
+
+        function fetchAllObjectives(select){
+            program_id =$(select).val();
+            is_graduate = $(select).find(':selected').data('is-graduate');
+
+
+            $.post(
+                "{{URL::action('Objective2Controller@fetchObjectiveOutcome')}}", 
+                {
+                    program_id:program_id
+                },
+                function(objectives_outcomes){
+
+                    
+                    drawTable(objectives_outcomes.objectives, objectives_outcomes.outcomes, is_graduate);
+
+                }
+            )
+        }
+
+        function drawTable(objectives, outcomes, is_graduate){
+            
+            
+            table = $('<table>',{
+                'id': 'theMainTable',
+                'class': 'table table-striped table-condensed datatable'
+            });
+
+            thead = $("<thead>");
+                thead_row = $('<tr>');
+            
+            th= $('<th>').html('Objectives');
+            thead_row.append(th);
+
+            
+
+            outcomes_th = [];
+            $.each(outcomes, function(ind, outcomes){
+
+                th = $('<th>', {
+                    'class':'th-outcomes th-out-id',
+                    'data-outcome-id':outcomes.id
+                }).html(outcomes.name);
+
+                outcomes_th.push(th);
+
+                thead_row.append(th);
+                        
+                    
+            })
+            th = $('<th>', {
+                    'class':'th-outcomes'
+                }).html('Criteria');
+
+            thead_row.append(th);
+
+            thead.append(thead_row);
+
+            tbody = $('<tbody>');
+            
+            
+            $.each(objectives, function(ind, objective){
+
+                tr = $("<tr>", {
+                    'class':'objectives',
+                    'data-objective-id':objective.id,
+                })
+
+                td = $("<td>", {
+                    'class': 'objective',
+                    'data-objective-id':objective.id,
+                }).html(objective.text);
+
+                tr.append(td);
+                
+                $(outcomes_th).each(function(id, th){
+
+                    var td = $('<td>');
+                    outcome_id = $(th).data('outcome-id');
+                    //console.log(outcome_id);
+                    if(objective.outcome_ids.includes(outcome_id)){
+                        var span = $("<span>", {
+                            'class':'glyphicon glyphicon-ok'
+                        })
+                        td.append(span);
+                    }
+                    tr.append(td);
+
+                });
+
+                td_link = $('<td>');
+                a = $("<a>",{
+                    'onclick':'fetchObjectiveCriteria("'+objective.id+'", "#select-program")'
+                }).html('View Criteria');
+
+                td_link.append(a);
+                tr.append(td_link);
+
+                tbody.append(tr);
+
+
+            });
+
+            table.append(thead)
+            table.append(tbody);
+            $('#div_table').html(table);
+
+            table = $("#theMainTable").DataTable();
+            table.draw();
+        }
+
+
+        function fetchObjectiveCriteria(objective_id,program_select){
+            program_id = $(program_select).val();
+            $.post(
+                "{{URL::action('CriteriaController@fetchObjectiveCriteria')}}",
+                {
+                    program_id:program_id,
+                    objective_id:objective_id
+                },
+                function(data){
+                    modal = "#criteria-modal";
+
+
+                    $(modal).find('.modal-body').html(createModalContent(data.outcomes));
+                    
+                    $(modal).find('.modal-title').html("Criteria for <strong>"+data.objective.text+"</strong>")
+                    $(modal).modal('show');
+                }
+            )
+        }
+
+        function createModalContent(outcomes){
+            ol_out = $("<ol>")
+            $.each(outcomes, function(ind, out){
+                //ol_out = $("<ol>")
+                if(out.criteria.length == 0)
+                return;
+                li = $('<li>').html("<p><strong>"+out.name+"</strong></p>");
+                
+                ul = $('<ul>');
+                
+
+                $.each(out.criteria, function(ind, crit){
+                    li2 = $("<li>").html(crit.name);
+                    ul.append(li2);    
+                });
+                li.append(ul);
+                ol_out.append(li)
+
+                //div.append(ol_out)
+                
+                
+                
+            })
+
+            return ol_out;
+        }
+
+    </script>
+
+@stop
+
+
+@section('included-js')
+    @include('global._datatables_js')
+@stop
+
+@section('javascript')
+@stop

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

@@ -16,7 +16,12 @@
                 <ul class="dropdown-menu" role="menu">
                     <li>{{ HTML::linkAction('CriteriaController@index', 'Outcomes and Criteria') }}</li>
                     <li>{{ HTML::linkAction('Objective2Controller@viewObjectives', 'Objectives and Criteria') }}
+
                     </li>
+                    <li>{{HTML::linkAction('Objective2Controller@viewObjectiveOutcome', 'View Objectives and Outcome')}}</li>
+                    <li>{{HTML::linkAction('CriteriaController@viewCriteriaOutcome', 'View Criteria with Outcome')}}</li>
+
+
                 </ul>
             </li>
             @if (count(Auth::user()->courses))