Pal de bugs

app/controllers/Objective2Controller.php

@@ -129,7 +129,11 @@ class Objective2Controller extends \BaseController
 		$program_id = Input::get('program_fetch');
 		$outcome_id = Input::get('outcome_fetch');
 		$json = array();
+
+
 		$json['objective'] = DB::select("SELECT * FROM `objectives` where id in (select objective_id from objective_outcome where outcome_id ={$outcome_id}) and id in (select objective_id from objective_program where program_id = {$program_id})");
+		Log::info('En mi sueño');
+		Log::info($json);
 		return json_encode($json);
 	}
 	public function delete()
@@ -477,4 +481,4 @@ class Objective2Controller extends \BaseController
 	{
 		//
 	}
-}
+}

app/routes.php

@@ -260,6 +260,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
         'as' => 'fetchRubricCriterion',
         'uses' => 'RubricsController@fetchRubricCriterion'
     ));
+    Route::post('fetchObjectives', 'Objective2Controller@fetchAllObjectives');
 
     // Load a rubric template
     Route::post('loadTemplate', array('uses' => 'TemplatesController@fetch'));
@@ -321,7 +322,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
         Route::post('createCriterion', array('before' => 'csrf', 'uses' => 'CriteriaController@create'));
 
         Route::get('learning-outcomes', 'OutcomesController@index');
-        Route::post('fetchObjectives', 'Objective2Controller@fetchAllObjectives');
+        //Route::post('fetchObjectives', 'Objective2Controller@fetchAllObjectives');
         // TODO: Change later
         Route::get('new-learning-outcomes', 'OutcomesController@newIndex');
 

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

@@ -279,14 +279,14 @@
                                             </p>
                                             <br>
 
-                                            <h5 style="display: inline; margin:30px;">Target by outcome: </h5>
+                                            <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
                                             <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
                                             </p>
                                             <br>
                                             <h5 style="display: inline; margin:30px;">Expected percent of students
                                                 achieving
                                                 the
-                                                target by outcome: </h5>
+                                                target by learning outcome: </h5>
                                             <p style="display: inline;"> <i>
                                                     <?php
                                                     $expected = DB::table('target_outcomes_program')

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

@@ -101,7 +101,7 @@
                         <div class="form-group">
                             <label>Associated Outcome</label>
                             {{-- Form::select('assoc_outcome_fetch', $outcomes, null, ['class'=>'form-control selectpicker', 'id'=>'assoc_outcomes_fetch', 'onchange'=>'fetchAllObjectives("select-program", "assoc_outcomes_fetch")']) --}}
-                            <select id="'assoc_outcomes_fetch" name="assoc_outcome_fetch" class="form-control selectpicker"
+                            <select id="assoc_outcomes_fetch" name="assoc_outcome_fetch" class="form-control selectpicker"
                                 onchange="fetchAllObjectives('select-program', 'assoc_outcomes_fetch')">
                                 @foreach ($outcomes as $outcome)
                                     <option value="{{ $outcome->id }}">

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

@@ -256,12 +256,12 @@
                                         <strong>({{ $activity->date }})</strong>
                                     </p>
                                     <br>
-                                    <h5 style="display: inline; margin:30px;">Target by outcome: </h5>
+                                    <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
                                     <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
                                     </p>
                                     <br>
                                     <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
-                                        target by outcome: </h5>
+                                        target by learning outcome: </h5>
                                     <p style="display: inline;"> <i>
                                             <?php
                                             $expected = DB::table('target_outcomes_program')

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

@@ -115,7 +115,7 @@
                         <div class="form-group">
                             <label>Associated Outcome</label>
                             {{-- Form::select('assoc_outcome_fetch', $outcomes, null, ['class'=>'form-control selectpicker', 'id'=>'assoc_outcomes_fetch', 'onchange'=>'fetchAllObjectives("select-program", "assoc_outcomes_fetch")']) --}}
-                            <select id="'assoc_outcomes_fetch" name="assoc_outcome_fetch" class="form-control selectpicker"
+                            <select id="assoc_outcomes_fetch" name="assoc_outcome_fetch" class="form-control selectpicker"
                                 onchange="fetchAllObjectives('select-program', 'assoc_outcomes_fetch')">
                                 @foreach ($outcomes as $outcome)
                                     <option value="{{ $outcome->id }}">

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

@@ -274,12 +274,12 @@
                                             <strong>({{ $activity->date }})</strong>
                                         </p>
                                         <br>
-                                        <h5 style="display: inline; margin:30px;">Target by outcome: </h5>
+                                        <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
                                         <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
                                         </p>
                                         <br>
                                         <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
-                                            target by outcome: </h5>
+                                            target by learning outcome: </h5>
                                         <p style="display: inline;"> <i>
                                                 <?php
                                                 $expected = DB::table('target_outcomes_program')

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

@@ -103,7 +103,7 @@
                         <div class="form-group">
                             <label>Associated Outcome</label>
                             {{-- Form::select('assoc_outcome_fetch', $outcomes, null, ['class'=>'form-control selectpicker', 'id'=>'assoc_outcomes_fetch', 'onchange'=>'fetchAllObjectives("select-program", "assoc_outcomes_fetch")']) --}}
-                            <select id="'assoc_outcomes_fetch" name="assoc_outcome_fetch" class="form-control selectpicker"
+                            <select id="assoc_outcomes_fetch" name="assoc_outcome_fetch" class="form-control selectpicker"
                                 onchange="fetchAllObjectives('select-program', 'assoc_outcomes_fetch')">
                                 @foreach ($outcomes as $outcome)
                                     <option value="{{ $outcome->id }}">
@@ -233,8 +233,8 @@
 
 
         function fetchAllObjectives(program, outcome) {
-            var program_id_fetch = $('#' + program).find(':selected').val();
-            var outcome_fetch = $('#' + outcome).find(':selected').val();
+            var program_id_fetch = $('#' + program).val();
+            var outcome_fetch = $('#' + outcome).val();
             $.post(
                 "{{ URL::action('Objective2Controller@fetchAllObjectives') }}", {
                     program_fetch: program_id_fetch,

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

@@ -130,10 +130,10 @@
                         $('#levelTabs').empty();
                         $('.no-outcome').hide();
                         var outcomeHTML = "<h4>Performance of Students by Learning Outcome</h4>" +
-                            '<h5 style = "display: inline; margin:30px;">Target by outcome: </h5>' +
+                            '<h5 style = "display: inline; margin:30px;">Target learning by learning outcome: </h5>' +
                             '<p  style = "display: inline;"> <i>>= ' + outcome.expected_outcome +
                             ' of the attempts</i>' + '</p>' +
-                            '<br><h5 style = "display: inline; margin:30px;">Expected percent of students achieving the target by outcome: </h5>' +
+                            '<br><h5 style = "display: inline; margin:30px;">Expected percent of students achieving the target by learning outcome: </h5>' +
                             '<p  style = "display: inline;"> <i>' + outcome.outcome_program_goal + '</i></p>';
                         $('#outcomeInfo').html('<p class="outcome-definition">' + outcome.definition + '</p>' +
                             outcomeHTML);

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

@@ -274,12 +274,12 @@
                 <h4>Performance of Students by Learning Outcome</h4>
 
                 <h5 style="text-align: center;">{{ $activity_1->name }} </h5>
-                <h5 style="display: inline; margin:30px;">Target by outcome: </h5>
+                <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
                 <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
                 </p>
                 <br>
                 <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
-                    target by outcome: </h5>
+                    target by learning outcome: </h5>
                 <p style="display: inline;"> <i>
                         <?php
                         $expected = DB::table('target_outcomes_program')
@@ -515,12 +515,12 @@
                 <br>
 
                 <h4>Performance of Students by Learning Outcome</h4>
-                <h5 style="display: inline; margin:30px;">Target by outcome: </h5>
+                <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
                 <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
                 </p>
                 <br>
                 <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
-                    target by outcome: </h5>
+                    target by learning outcome: </h5>
                 <p style="display: inline;"> <i>
                         <?php
                         $expected = DB::table('target_outcomes_program')

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

@@ -270,13 +270,13 @@
                                 <p style="display: inline;">{{ $activity->name }}
                                     <strong>({{ $activity->date }})</strong>
                                 </p>
-                                <h5 style="display: inline; margin:30px;">Target by outcome: </h5>
+                                <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
                                 <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
                                 </p>
                                 <br>
                                 <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
                                     target
-                                    by outcome: </h5>
+                                    by learning outcome: </h5>
                                 <p style="display: inline;"> <i>
                                         <?php
                                         $expected = DB::table('target_outcomes_program')