Browse Source

Pal de bugs

parent
commit
954612721e

+ 5
- 1
app/controllers/Objective2Controller.php View File

129
 		$program_id = Input::get('program_fetch');
129
 		$program_id = Input::get('program_fetch');
130
 		$outcome_id = Input::get('outcome_fetch');
130
 		$outcome_id = Input::get('outcome_fetch');
131
 		$json = array();
131
 		$json = array();
132
+
133
+
132
 		$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})");
134
 		$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})");
135
+		Log::info('En mi sueño');
136
+		Log::info($json);
133
 		return json_encode($json);
137
 		return json_encode($json);
134
 	}
138
 	}
135
 	public function delete()
139
 	public function delete()
477
 	{
481
 	{
478
 		//
482
 		//
479
 	}
483
 	}
480
-}
484
+}

+ 2
- 1
app/routes.php View File

260
         'as' => 'fetchRubricCriterion',
260
         'as' => 'fetchRubricCriterion',
261
         'uses' => 'RubricsController@fetchRubricCriterion'
261
         'uses' => 'RubricsController@fetchRubricCriterion'
262
     ));
262
     ));
263
+    Route::post('fetchObjectives', 'Objective2Controller@fetchAllObjectives');
263
 
264
 
264
     // Load a rubric template
265
     // Load a rubric template
265
     Route::post('loadTemplate', array('uses' => 'TemplatesController@fetch'));
266
     Route::post('loadTemplate', array('uses' => 'TemplatesController@fetch'));
321
         Route::post('createCriterion', array('before' => 'csrf', 'uses' => 'CriteriaController@create'));
322
         Route::post('createCriterion', array('before' => 'csrf', 'uses' => 'CriteriaController@create'));
322
 
323
 
323
         Route::get('learning-outcomes', 'OutcomesController@index');
324
         Route::get('learning-outcomes', 'OutcomesController@index');
324
-        Route::post('fetchObjectives', 'Objective2Controller@fetchAllObjectives');
325
+        //Route::post('fetchObjectives', 'Objective2Controller@fetchAllObjectives');
325
         // TODO: Change later
326
         // TODO: Change later
326
         Route::get('new-learning-outcomes', 'OutcomesController@newIndex');
327
         Route::get('new-learning-outcomes', 'OutcomesController@newIndex');
327
 
328
 

+ 2
- 2
app/views/local/managers/admins/new_assessment_report.blade.php View File

279
                                             </p>
279
                                             </p>
280
                                             <br>
280
                                             <br>
281
 
281
 
282
-                                            <h5 style="display: inline; margin:30px;">Target by outcome: </h5>
282
+                                            <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
283
                                             <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
283
                                             <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
284
                                             </p>
284
                                             </p>
285
                                             <br>
285
                                             <br>
286
                                             <h5 style="display: inline; margin:30px;">Expected percent of students
286
                                             <h5 style="display: inline; margin:30px;">Expected percent of students
287
                                                 achieving
287
                                                 achieving
288
                                                 the
288
                                                 the
289
-                                                target by outcome: </h5>
289
+                                                target by learning outcome: </h5>
290
                                             <p style="display: inline;"> <i>
290
                                             <p style="display: inline;"> <i>
291
                                                     <?php
291
                                                     <?php
292
                                                     $expected = DB::table('target_outcomes_program')
292
                                                     $expected = DB::table('target_outcomes_program')

+ 1
- 1
app/views/local/managers/admins/objectives.blade.php View File

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

+ 2
- 2
app/views/local/managers/pCoords/new_assessment_report.blade.php View File

256
                                         <strong>({{ $activity->date }})</strong>
256
                                         <strong>({{ $activity->date }})</strong>
257
                                     </p>
257
                                     </p>
258
                                     <br>
258
                                     <br>
259
-                                    <h5 style="display: inline; margin:30px;">Target by outcome: </h5>
259
+                                    <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
260
                                     <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
260
                                     <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
261
                                     </p>
261
                                     </p>
262
                                     <br>
262
                                     <br>
263
                                     <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
263
                                     <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
264
-                                        target by outcome: </h5>
264
+                                        target by learning outcome: </h5>
265
                                     <p style="display: inline;"> <i>
265
                                     <p style="display: inline;"> <i>
266
                                             <?php
266
                                             <?php
267
                                             $expected = DB::table('target_outcomes_program')
267
                                             $expected = DB::table('target_outcomes_program')

+ 1
- 1
app/views/local/managers/pCoords/objectives.blade.php View File

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

+ 2
- 2
app/views/local/managers/sCoords/new_assessment_report.blade.php View File

274
                                             <strong>({{ $activity->date }})</strong>
274
                                             <strong>({{ $activity->date }})</strong>
275
                                         </p>
275
                                         </p>
276
                                         <br>
276
                                         <br>
277
-                                        <h5 style="display: inline; margin:30px;">Target by outcome: </h5>
277
+                                        <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
278
                                         <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
278
                                         <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
279
                                         </p>
279
                                         </p>
280
                                         <br>
280
                                         <br>
281
                                         <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
281
                                         <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
282
-                                            target by outcome: </h5>
282
+                                            target by learning outcome: </h5>
283
                                         <p style="display: inline;"> <i>
283
                                         <p style="display: inline;"> <i>
284
                                                 <?php
284
                                                 <?php
285
                                                 $expected = DB::table('target_outcomes_program')
285
                                                 $expected = DB::table('target_outcomes_program')

+ 3
- 3
app/views/local/managers/sCoords/objectives.blade.php View File

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

+ 2
- 2
app/views/local/managers/shared/annual_report.blade.php View File

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

+ 4
- 4
app/views/local/professors/compare_activities.blade.php View File

274
                 <h4>Performance of Students by Learning Outcome</h4>
274
                 <h4>Performance of Students by Learning Outcome</h4>
275
 
275
 
276
                 <h5 style="text-align: center;">{{ $activity_1->name }} </h5>
276
                 <h5 style="text-align: center;">{{ $activity_1->name }} </h5>
277
-                <h5 style="display: inline; margin:30px;">Target by outcome: </h5>
277
+                <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
278
                 <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
278
                 <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
279
                 </p>
279
                 </p>
280
                 <br>
280
                 <br>
281
                 <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
281
                 <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
282
-                    target by outcome: </h5>
282
+                    target by learning outcome: </h5>
283
                 <p style="display: inline;"> <i>
283
                 <p style="display: inline;"> <i>
284
                         <?php
284
                         <?php
285
                         $expected = DB::table('target_outcomes_program')
285
                         $expected = DB::table('target_outcomes_program')
515
                 <br>
515
                 <br>
516
 
516
 
517
                 <h4>Performance of Students by Learning Outcome</h4>
517
                 <h4>Performance of Students by Learning Outcome</h4>
518
-                <h5 style="display: inline; margin:30px;">Target by outcome: </h5>
518
+                <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
519
                 <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
519
                 <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
520
                 </p>
520
                 </p>
521
                 <br>
521
                 <br>
522
                 <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
522
                 <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
523
-                    target by outcome: </h5>
523
+                    target by learning outcome: </h5>
524
                 <p style="display: inline;"> <i>
524
                 <p style="display: inline;"> <i>
525
                         <?php
525
                         <?php
526
                         $expected = DB::table('target_outcomes_program')
526
                         $expected = DB::table('target_outcomes_program')

+ 2
- 2
app/views/local/professors/new_assessment_report.blade.php View File

270
                                 <p style="display: inline;">{{ $activity->name }}
270
                                 <p style="display: inline;">{{ $activity->name }}
271
                                     <strong>({{ $activity->date }})</strong>
271
                                     <strong>({{ $activity->date }})</strong>
272
                                 </p>
272
                                 </p>
273
-                                <h5 style="display: inline; margin:30px;">Target by outcome: </h5>
273
+                                <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
274
                                 <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
274
                                 <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
275
                                 </p>
275
                                 </p>
276
                                 <br>
276
                                 <br>
277
                                 <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
277
                                 <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
278
                                     target
278
                                     target
279
-                                    by outcome: </h5>
279
+                                    by learning outcome: </h5>
280
                                 <p style="display: inline;"> <i>
280
                                 <p style="display: inline;"> <i>
281
                                         <?php
281
                                         <?php
282
                                         $expected = DB::table('target_outcomes_program')
282
                                         $expected = DB::table('target_outcomes_program')