Quellcode durchsuchen

resuelve asunto de la uhs. asunto de templates que usaba program_criteria. bug en users si no tenia role. algo en typ. updates de seeders.

Carlos J Corrada Bravo vor 2 Jahren
Ursprung
Commit
3c032b94df

+ 10
- 10
app/controllers/SchoolCoordinatorsController.php Datei anzeigen

209
                 $query->whereIn('semester_id', Session::get('semesters_ids'));
209
                 $query->whereIn('semester_id', Session::get('semesters_ids'));
210
             }))->where('is_graduate', 1)->where('school_id', $school->id)->orderBy('name', 'asc')->get();
210
             }))->where('is_graduate', 1)->where('school_id', $school->id)->orderBy('name', 'asc')->get();
211
         }
211
         }
212
-        if ($school->id == 13) {
213
-            //             return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
214
-            return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
215
-        } else {
212
+//         if ($school->id == 13) {
213
+//             //             return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
214
+//             return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
215
+//         } else {
216
             //             return View::make('local.managers.shared.school', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
216
             //             return View::make('local.managers.shared.school', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
217
             return View::make('local.managers.shared.schoolTest', compact('title', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
217
             return View::make('local.managers.shared.schoolTest', compact('title', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
218
-        }
218
+//         }
219
     }
219
     }
220
     public function overview()
220
     public function overview()
221
     {
221
     {
402
         }
402
         }
403
 
403
 
404
 
404
 
405
-        if ($school->id == 13) {
406
-            //             return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
407
-            return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
408
-        } else {
405
+//         if ($school->id == 13) {
406
+//             //             return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
407
+//             return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
408
+//         } else {
409
             //             return View::make('local.managers.shared.school', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
409
             //             return View::make('local.managers.shared.school', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
410
             return View::make('local.managers.shared.school', compact('title', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
410
             return View::make('local.managers.shared.school', compact('title', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
411
-        }
411
+//         }
412
     }
412
     }
413
     public function overviewOri()
413
     public function overviewOri()
414
     {
414
     {

+ 15
- 15
app/controllers/SchoolsController.php Datei anzeigen

507
 
507
 
508
 
508
 
509
 
509
 
510
-        if ($school->id == 13) {
511
-            //             return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
512
-            return View::make('local.managers.shared.school-uhs', compact('title', 'expected_target_for_undergradprograms', 'expected_target_for_gradprograms', 'undergrad_programs', 'grad_programs', 'default_undergrad', 'default_grad', 'linea_undergrad', 'linea_grad', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
513
-        } else {
510
+//         if ($school->id == 13) {
511
+//             //             return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
512
+//             return View::make('local.managers.shared.school-uhs', compact('title', 'expected_target_for_undergradprograms', 'expected_target_for_gradprograms', 'undergrad_programs', 'grad_programs', 'default_undergrad', 'default_grad', 'linea_undergrad', 'linea_grad', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
513
+//         } else {
514
             //             return View::make('local.managers.shared.school', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
514
             //             return View::make('local.managers.shared.school', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
515
             return View::make('local.managers.shared.school', compact('title', 'expected_target_for_undergradprograms', 'expected_target_for_gradprograms', 'undergrad_programs', 'grad_programs', 'default_undergrad', 'default_grad', 'linea_undergrad', 'linea_grad', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
515
             return View::make('local.managers.shared.school', compact('title', 'expected_target_for_undergradprograms', 'expected_target_for_gradprograms', 'undergrad_programs', 'grad_programs', 'default_undergrad', 'default_grad', 'linea_undergrad', 'linea_grad', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
516
-        }
516
+//         }
517
     }
517
     }
518
 
518
 
519
     private function cmp($a, $b)
519
     private function cmp($a, $b)
1214
                 }
1214
                 }
1215
             }
1215
             }
1216
         }
1216
         }
1217
-        if ($school->id == 13) {
1218
-            //             return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
1219
-            return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
1220
-        } else {
1217
+//         if ($school->id == 13) {
1218
+//             //             return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
1219
+//             return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
1220
+//         } else {
1221
             //             return View::make('local.managers.shared.school', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
1221
             //             return View::make('local.managers.shared.school', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
1222
             return View::make('local.managers.shared.school', compact('title', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
1222
             return View::make('local.managers.shared.school', compact('title', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
1223
-        }
1223
+//         }
1224
     }
1224
     }
1225
 
1225
 
1226
     public function print_school($id)
1226
     public function print_school($id)
1651
 
1651
 
1652
 
1652
 
1653
 
1653
 
1654
-        if ($school->id == 13) {
1655
-            //             return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
1656
-            return View::make('local.managers.shared.print_school', compact('title',  'expected_target_for_undergradprograms', 'expected_target_for_gradprograms', 'undergrad_programs', 'grad_programs', 'default_undergrad', 'default_grad', 'linea_undergrad', 'linea_grad', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
1657
-        } else {
1654
+//         if ($school->id == 13) {
1655
+//             //             return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
1656
+//             return View::make('local.managers.shared.print_school', compact('title',  'expected_target_for_undergradprograms', 'expected_target_for_gradprograms', 'undergrad_programs', 'grad_programs', 'default_undergrad', 'default_grad', 'linea_undergrad', 'linea_grad', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
1657
+//         } else {
1658
             //             return View::make('local.managers.shared.school', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
1658
             //             return View::make('local.managers.shared.school', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
1659
             return View::make('local.managers.shared.print_school', compact('title',  'expected_target_for_undergradprograms', 'expected_target_for_gradprograms', 'undergrad_programs', 'grad_programs', 'default_undergrad', 'default_grad', 'linea_undergrad', 'linea_grad', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
1659
             return View::make('local.managers.shared.print_school', compact('title',  'expected_target_for_undergradprograms', 'expected_target_for_gradprograms', 'undergrad_programs', 'grad_programs', 'default_undergrad', 'default_grad', 'linea_undergrad', 'linea_grad', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
1660
-        }
1660
+//         }
1661
 
1661
 
1662
 
1662
 
1663
         $grouped_courses = Course::
1663
         $grouped_courses = Course::

+ 4
- 3
app/controllers/TemplatesController.php Datei anzeigen

84
 							->whereNull('program_id');
84
 							->whereNull('program_id');
85
 					})
85
 					})
86
 					->orWhere(function ($query) use (&$program_ids, &$school_ids) {
86
 					->orWhere(function ($query) use (&$program_ids, &$school_ids) {
87
-						$query->where('school_id', $school_ids)
88
-							->where('program_id', $program_ids);
87
+						$query->whereIn('school_id', $school_ids)
88
+							->whereIn('program_id', $program_ids);
89
 					});
89
 					});
90
 				Log::info($templates->toSql());
90
 				Log::info($templates->toSql());
91
+				Log::info($program_ids);
91
 
92
 
92
 				$templates =  $templates->get();
93
 				$templates =  $templates->get();
93
 				break;
94
 				break;
250
 				->orderBy('name', 'ASC')->get();
251
 				->orderBy('name', 'ASC')->get();
251
 		}
252
 		}
252
 		// 			Log::info("aqui".(count($criteria)));
253
 		// 			Log::info("aqui".(count($criteria)));
253
-		// 			Log::info(json_encode(count($criteria)));
254
+					Log::info(json_encode(($criteria)));
254
 
255
 
255
 
256
 
256
 
257
 

+ 2
- 1
app/controllers/ThreeYearPlanController.php Datei anzeigen

542
               ->select('courses.id as course_id', 'courses.name', 'courses.code', 'courses.number', 'courses.program_id')
542
               ->select('courses.id as course_id', 'courses.name', 'courses.code', 'courses.number', 'courses.program_id')
543
               ->orderBy('courses.code', 'asc')
543
               ->orderBy('courses.code', 'asc')
544
               ->orderBy('courses.number', 'asc')
544
               ->orderBy('courses.number', 'asc')
545
-              ->groupBy('courses.name', 'courses.code')
545
+//               ->groupBy('courses.name', 'courses.code')
546
+              ->groupBy('courses.code','courses.number')
546
               ->get();
547
               ->get();
547
 
548
 
548
             #los cursos resultantes creo que deberian ser: todos los que se estan dando en mi programa
549
             #los cursos resultantes creo que deberian ser: todos los que se estan dando en mi programa

+ 1
- 0
app/controllers/UsersController.php Datei anzeigen

15
 		$users = User::with('programs', 'school')
15
 		$users = User::with('programs', 'school')
16
 			->orderBy('surnames')
16
 			->orderBy('surnames')
17
 			->orderBy('first_name')
17
 			->orderBy('first_name')
18
+// 			->skip(0)->take(50)
18
 			->get();
19
 			->get();
19
 $b=microtime();
20
 $b=microtime();
20
 			
21
 			

+ 34
- 0
app/database/migrations/2022_12_16_144507_change_program_criterion_to_view.php Datei anzeigen

1
+<?php
2
+
3
+use Illuminate\Database\Schema\Blueprint;
4
+use Illuminate\Database\Migrations\Migration;
5
+
6
+class ChangeProgramCriterionToView extends Migration {
7
+
8
+	/**
9
+	 * Run the migrations.
10
+	 *
11
+	 * @return void
12
+	 */
13
+	public function up()
14
+	{
15
+		Schema::drop("program_criterion");
16
+		DB::statement("
17
+				   CREATE VIEW `program_criterion`
18
+		AS select distinct program_id, criterion_id from `criterion_objective_outcome` coo join `program_criterion_objective_outcome` pcoo on pcoo.`cri_obj_out_id`=coo.id
19
+		");
20
+		//
21
+	}
22
+
23
+	/**
24
+	 * Reverse the migrations.
25
+	 *
26
+	 * @return void
27
+	 */
28
+	public function down()
29
+	{
30
+		//
31
+		    DB::statement('DROP VIEW IF EXISTS student_criteria_evaluated');
32
+	}
33
+
34
+}

+ 4
- 4
app/database/seeds/CourseStudentTableSeeder.php Datei anzeigen

15
         $time_start = microtime(true);
15
         $time_start = microtime(true);
16
 
16
 
17
         // Open file
17
         // Open file
18
-        if($file = fopen('app/database/csv/estudiante_curso.csv', 'r'))
18
+        if($file = fopen('app/database/csv/ARCEXTPR-20-20220829-030414.TXT', 'r'))
19
         {
19
         {
20
             // Initialize count variables
20
             // Initialize count variables
21
             $read = 0;
21
             $read = 0;
25
             $semester_id = NULL;
25
             $semester_id = NULL;
26
 
26
 
27
             // Read each row
27
             // Read each row
28
-            while($data = fgetcsv($file, 5000)) // se cambio delimitador para evitar problemas con nombre separados del apellido con coma
28
+            while($data = fgetcsv($file, 0, ";"))
29
             {
29
             {
30
                 // Add read count
30
                 // Add read count
31
                 $read++;
31
                 $read++;
32
 
32
 
33
                 try
33
                 try
34
                 {
34
                 {
35
-                    $student_number = trim($data[1]);
36
-                    $code_number_section = trim($data[2]);
35
+                    $student_number = trim($data[2]);
36
+                    $code_number_section = trim($data[4]);
37
                     $term_code = trim($data[3]);
37
                     $term_code = trim($data[3]);
38
 
38
 
39
                     // If any required field is empty, raise an exception
39
                     // If any required field is empty, raise an exception

+ 1
- 1
app/database/seeds/CourseTableSeeder.php Datei anzeigen

13
         $time_start = microtime(true);
13
         $time_start = microtime(true);
14
 
14
 
15
         // Open file
15
         // Open file
16
-        if($file = fopen('app/database/csv/PSR010223_C12.txt', 'r'))
16
+        if($file = fopen('app/database/csv/psr010223_c21.dat', 'r'))
17
         {
17
         {
18
             // Initialize count variables
18
             // Initialize count variables
19
             $read = 0;
19
             $read = 0;

+ 5
- 5
app/database/seeds/StudentTableSeeder.php Datei anzeigen

5
     public function run()
5
     public function run()
6
     {
6
     {
7
         // Set term
7
         // Set term
8
-        $term = "C12";
8
+        $term = "C21";
9
 		$semester_id = Semester::select('id')->where('code', $term)->first();
9
 		$semester_id = Semester::select('id')->where('code', $term)->first();
10
 
10
 
11
         // Disable query logging to avoid memory exhaustion
11
         // Disable query logging to avoid memory exhaustion
15
 
15
 
16
         // Initiates time
16
         // Initiates time
17
         $time_start = microtime(true);
17
         $time_start = microtime(true);
18
-/*
18
+
19
 		//Primero entra la informacion basica eg. numero_estu, nombre, email
19
 		//Primero entra la informacion basica eg. numero_estu, nombre, email
20
         // Open file
20
         // Open file
21
         $file_path = 'app/database/csv/';
21
         $file_path = 'app/database/csv/';
22
 //         $file_name = 'ARCEXTRT-20-C12-20220411-164329.TXT';
22
 //         $file_name = 'ARCEXTRT-20-C12-20220411-164329.TXT';
23
-        $file_name = 'ARCEXT-20-C12-20220411-164329.TXT';
23
+        $file_name = 'ARCEXT-20-20220829-030414.TXT';
24
 
24
 
25
         if($file = fopen($file_path.$file_name, 'r'))
25
         if($file = fopen($file_path.$file_name, 'r'))
26
         {
26
         {
142
         {
142
         {
143
             $this->command->info('File '.$file_name.' could not be opened. Make sure it is located in the app/database/csv directory of this project.');
143
             $this->command->info('File '.$file_name.' could not be opened. Make sure it is located in the app/database/csv directory of this project.');
144
         }
144
         }
145
-*/    
145
+   
146
 		//  Segundo entra la informacion de programa, grado, nivel, anho y anhade en program_student_semester
146
 		//  Segundo entra la informacion de programa, grado, nivel, anho y anhade en program_student_semester
147
          $file_path = 'app/database/csv/';
147
          $file_path = 'app/database/csv/';
148
-        $file_name = 'ARCEXTRT-20-C12-20220411-164329.TXT';
148
+        $file_name = 'ARCEXTRT-20-20220829-030414.TXT';
149
 //         $file_name = 'ARCEXT-20-C12-20220411-164329.TXT';
149
 //         $file_name = 'ARCEXT-20-C12-20220411-164329.TXT';
150
 
150
 
151
         if($file = fopen($file_path.$file_name, 'r'))
151
         if($file = fopen($file_path.$file_name, 'r'))

+ 21
- 7
app/database/seeds/UserTableSeeder.php Datei anzeigen

20
             ));
20
             ));
21
 
21
 
22
         // Open file
22
         // Open file
23
-        if($file = fopen('app/database/csv/users.csv', 'r'))
23
+        if($file = fopen('app/database/csv/empleados.txt', 'r'))
24
         {
24
         {
25
             // Initialize count variables
25
             // Initialize count variables
26
             $read = 0;
26
             $read = 0;
29
             $error = 0;
29
             $error = 0;
30
 
30
 
31
             // Read each row
31
             // Read each row
32
-            while($data = fgetcsv($file, 5000))
32
+            while($data = fgetcsv($file, 0,";"))
33
             {
33
             {
34
                 // Add read count
34
                 // Add read count
35
                 $read++;
35
                 $read++;
37
                 try
37
                 try
38
                 {
38
                 {
39
                     // Get row info
39
                     // Get row info
40
+//                     $ssn = trim($data[14]);
41
+//                     // $number = (NOT YET ADDED)
42
+//                     $first_name = strtoupper(trim($data[3]))." ".strtoupper(trim($data[4]));
43
+//                     $surnames = strtoupper(trim($data[5]));
44
+//                     $email = strtolower(trim($data[15]));
45
+//                     $emp_number = strtolower(trim($data[0]));
40
                     $ssn = trim($data[0]);
46
                     $ssn = trim($data[0]);
41
                     // $number = (NOT YET ADDED)
47
                     // $number = (NOT YET ADDED)
42
-                    $first_name = strtoupper(trim($data[1]));
43
-                    $surnames = strtoupper(trim($data[2]));
44
-                    $email = strtolower(trim($data[3]));
45
-                    $emp_number = strtolower(trim($data[4]));
46
-
48
+                    $first_name = strtoupper(trim($data[1]))." ".strtoupper(trim($data[2]));
49
+                    $surnames = strtoupper(trim($data[3]));
50
+                    $email = strtolower(trim($data[4]));
51
+                    $emp_number = strtolower(trim($data[5]));
52
+
53
+//                     var_dump($ssn);
54
+//                     // $number = (NOT YET ADDED)
55
+//                     var_dump($first_name);
56
+//                    var_dump($surnames);
57
+//                     var_dump($email);
58
+//                     var_dump($emp_number);
59
+// 
60
+// exit();
47
                     if($email=="null" or $email=="")
61
                     if($email=="null" or $email=="")
48
                     {
62
                     {
49
                     	$email="email".rand()."@upr.edu";
63
                     	$email="email".rand()."@upr.edu";

+ 1
- 1
app/views/global/view-three-year-plan.blade.php Datei anzeigen

165
                             </style>
165
                             </style>
166
                             <thead>
166
                             <thead>
167
                                 <tr style="background-color:#FDD8B5;">
167
                                 <tr style="background-color:#FDD8B5;">
168
-                                    <th rowspan="0" style="background-color:#F5DEDD;" class="text-center">Learning
168
+                                    <th rowspan="2" style="background-color:#F5DEDD;" class="text-center">Learning
169
                                         Outcomes</th>
169
                                         Outcomes</th>
170
                                     <th colspan="2" class="text-center" id="cycle1"></th>
170
                                     <th colspan="2" class="text-center" id="cycle1"></th>
171
                                     <th colspan="2" class="text-center" id="cycle2"></th>
171
                                     <th colspan="2" class="text-center" id="cycle2"></th>

+ 2
- 0
app/views/local/managers/admins/users.blade.php Datei anzeigen

238
                                         <td data-role-number="2" class="user-role">School Coordinator</td>
238
                                         <td data-role-number="2" class="user-role">School Coordinator</td>
239
                                     @elseif($user->role == 1)
239
                                     @elseif($user->role == 1)
240
                                         <td data-role-number="1" class="user-role">Administrator</td>
240
                                         <td data-role-number="1" class="user-role">Administrator</td>
241
+                                    @else
242
+                                        <td data-role-number="0" class="user-role">Undefined</td>
241
                                     @endif
243
                                     @endif
242
 
244
 
243
                                     @if ($user->has_access)
245
                                     @if ($user->has_access)