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

app/controllers/AnnualPlansController.php

@@ -135,9 +135,10 @@ class AnnualPlansController extends \BaseController
     $title = "Annual Plans";
     //$typ_parts = DB::select("select * from typ_parts");
 
-    $current_typ = DB::select("select * from three_year_plan where year_start <=" . date('Y') . " and year_end >=" . date('Y'))[0];
-
-
+//     $current_typ = DB::select("select * from three_year_plan where year_start <=" . date('Y') . " and year_end >=" . date('Y'))[0];
+    $current_typ_arr = DB::select("select * from three_year_plan where year_start <=" . date('Y') . " and year_end >=" . date('Y'));
+// 	var_dump($current_typ);exit();
+	if(!empty($current_typ_arr))$current_typ=$current_typ_arr[0];else {$current_typ= new stdClass();$current_typ->id=0;}
 
 
     $program = Program::where('id', '=', $program_id)->first();

app/controllers/OutcomesController.php

@@ -709,7 +709,7 @@ class OutcomesController extends \BaseController
                     ->with(array('courses' => function ($query2) use ($outcome_id) {
                         $query2
                             ->has('activities')
-                            ->whereNotNull('outcomes_attempted')
+//                             ->whereNotNull('outcomes_attempted')
                             // ->where('outcomes_attempted', 'NOT LIKE', '%"'.$outcome_id.'":0%')
                             ->whereIn('semester_id', Session::get('semesters_ids'))
                             ->groupBy(array('code', 'number'));
@@ -736,7 +736,7 @@ class OutcomesController extends \BaseController
                     ->with(array('courses' => function ($query2) use ($outcome_id) {
                         $query2
                             ->has('activities')
-                            ->whereNotNull('outcomes_attempted')
+//                             ->whereNotNull('outcomes_attempted')
                             // ->where('outcomes_attempted', 'NOT LIKE', '%"'.$outcome_id.'":0%')
                             ->whereIn('semester_id', Session::get('semesters_ids'))
                             ->groupBy(array('code', 'number'));

app/controllers/ProgramCoordinatorsController.php

@@ -75,8 +75,8 @@ class ProgramCoordinatorsController extends \BaseController
 
       $program_array['assessed_courses_count'] = 0;
       foreach ($program_array['program_courses'] as $course) {
-        if (!empty($course->outcomes_ach())) {
-          $program_array['course_outcomes_achieved'] = $course->outcomes_ach();
+        if (!($program_array['course_outcomes_achieved'] = $course->outcomes_ach())) {
+//           $program_array['course_outcomes_achieved'] = $course->outcomes_ach();
           $program_array['course_outcomes_attempted'] = $course->outcomes_att();
           Log::info($program_array['course_outcomes_achieved']);
           foreach ($program_array['course_outcomes_achieved'] as $i => $score) {
@@ -146,7 +146,6 @@ class ProgramCoordinatorsController extends \BaseController
       $programs_contact[] = $users;
     }
 
-
     return View::make('local.managers.pCoords.overview', compact('title', 'programs', 'outcomes', 'programs_array', 'programs_contact'));
   }
 }

app/controllers/ProgramsController.php

@@ -73,7 +73,8 @@ class ProgramsController extends \BaseController
      * List of grouped courses (grouped sections)
      */
 
-    $grouped_courses = Course::select(DB::raw('name, code, number, max(outcomes_attempted) as outcomes_attempted, semester_id, program_id'))
+//     $grouped_courses = Course::select(DB::raw('name, code, number, max(outcomes_attempted) as outcomes_attempted, semester_id, program_id'))
+    $grouped_courses = Course::select(DB::raw('name, code, number, semester_id, program_id'))
       ->with('semester')
       ->with('program')
       ->where('program_id', $program->id)
@@ -363,8 +364,8 @@ class ProgramsController extends \BaseController
 
       $program_array['assessed_courses_count'] = 0;
       foreach ($program_array['program_courses'] as $course) {
-        if (!empty($course->outcomes_ach())) {
-          $program_array['course_outcomes_achieved'] = $course->outcomes_ach();
+        if (!$program_array['course_outcomes_achieved'] = $course->outcomes_ach()) {
+//           $program_array['course_outcomes_achieved'] = $course->outcomes_ach();
           $program_array['course_outcomes_attempted'] = $course->outcomes_att();
           Log::info($program_array['course_outcomes_achieved']);
           foreach ($program_array['course_outcomes_achieved'] as $i => $score) {

app/controllers/SchoolCoordinatorsController.php

@@ -238,7 +238,7 @@ class SchoolCoordinatorsController extends \BaseController
                     $course_outcomes_attempted2 = $course->outcomes_att(); //json_decode($course->outcomes_attempted, true);
                     $course_outcomes_achieved2 = $course->outcomes_ach(); //json_decode($course->outcomes_achieved, true);
                     if (
-                        array_key_exists($outcome->id, $course_outcomes_attempted2)
+                        array_key_exists($outcome->id, $course_outcomes_attempted2) && array_key_exists($outcome->id, $course_outcomes_achieved2)
                         && $course_outcomes_attempted2[$outcome->id] > 0
                     ) {
                         $achieved_outcomes_per_undergrad_program[$outcome->id] += $course_outcomes_achieved2[$outcome->id];
@@ -312,7 +312,7 @@ class SchoolCoordinatorsController extends \BaseController
                     $course_outcomes_attempted2 = $course->outcomes_att();  // json_decode($course->outcomes_attempted, true);
                     $course_outcomes_achieved2 = $course->outcomes_ach(); //json_decode($course->outcomes_achieved, true);
                     if (
-                        array_key_exists($outcome->id, $course_outcomes_attempted2)
+                        array_key_exists($outcome->id, $course_outcomes_attempted2) && array_key_exists($outcome->id, $course_outcomes_achieved2)
                         && $course_outcomes_attempted2[$outcome->id] > 0
                     ) {
                         $achieved_outcomes_per_grad_program[$outcome->id] += $course_outcomes_achieved2[$outcome->id];

app/controllers/SchoolsController.php

@@ -45,7 +45,8 @@ class SchoolsController extends \BaseController
    
 
         $grad_grouped_courses = Course::
-            select(DB::raw('courses.name, courses.code, courses.number, max(courses.outcomes_attempted) as outcomes_attempted, courses.semester_id, courses.program_id'))
+//             select(DB::raw('courses.name, courses.code, courses.number, max(courses.outcomes_attempted) as outcomes_attempted, courses.semester_id, courses.program_id'))
+            select(DB::raw('courses.name, courses.code, courses.number, courses.semester_id, courses.program_id'))
             ->with('semester')
             ->with('program')
             ->whereIn('courses.program_id', $program_ids)
@@ -59,7 +60,8 @@ class SchoolsController extends \BaseController
             ->get();
 
         $undergrad_grouped_courses = Course::
-            select(DB::raw('courses.name, courses.code, courses.number, max(courses.outcomes_attempted) as outcomes_attempted, courses.semester_id, courses.program_id'))
+//             select(DB::raw('courses.name, courses.code, courses.number, max(courses.outcomes_attempted) as outcomes_attempted, courses.semester_id, courses.program_id'))
+            select(DB::raw('courses.name, courses.code, courses.number, courses.semester_id, courses.program_id'))
             ->with('semester')
             ->with('program')
             ->whereIn('courses.program_id', $program_ids)
@@ -153,7 +155,7 @@ class SchoolsController extends \BaseController
         {
             // For each program with courses that do assessment
             $programs_with_courses = Program::with(array('courses' => function($query){
-                $query->whereNotNull('outcomes_attempted');
+//                 $query->whereNotNull('outcomes_attempted');
                 $query->whereIn('semester_id', Session::get('semesters_ids'));
             }))->where('is_graduate', 0)->where('school_id', $school->id)->orderBy('name', 'asc')->get();
 
@@ -170,9 +172,11 @@ class SchoolsController extends \BaseController
                 foreach ($program->courses as $course)
                 {
                     // If the outcome in question is being evaluated
-                    $course_outcomes_attempted2 = json_decode($course->outcomes_attempted, true);
-                    $course_outcomes_achieved2 = json_decode($course->outcomes_achieved, true);
-                    if(array_key_exists($outcome->id, $course_outcomes_attempted2 )
+                    $course_outcomes_attempted2 = $course->outcomes_att();
+//                     $course_outcomes_attempted2 = json_decode($course->outcomes_attempted, true);
+//                     $course_outcomes_achieved2 = json_decode($course->outcomes_achieved, true);
+                    $course_outcomes_achieved2 = $course->outcomes_ach();
+                    if(array_key_exists($outcome->id, $course_outcomes_attempted2 ) && array_key_exists($outcome->id, $course_outcomes_achieved2 )
                         && $course_outcomes_attempted2[$outcome->id]>0)
                     {
                         $achieved_outcomes_per_undergrad_program[$outcome->id]+=$course_outcomes_achieved2[$outcome->id];
@@ -225,7 +229,7 @@ class SchoolsController extends \BaseController
         {
             // For each program with courses that do assessment
             $programs_with_courses = Program::with(array('courses' => function($query){
-                $query->whereNotNull('outcomes_attempted');
+//                 $query->whereNotNull('outcomes_attempted');
                 $query->whereIn('semester_id', Session::get('semesters_ids'));
             }))->where('is_graduate', 1)->where('school_id', $school->id)->orderBy('name', 'asc')->get();
 
@@ -242,9 +246,11 @@ class SchoolsController extends \BaseController
                 foreach ($program->courses as $course)
                 {
                     // If the outcome in question is being evaluated
-                    $course_outcomes_attempted2 = json_decode($course->outcomes_attempted, true);
-                    $course_outcomes_achieved2 = json_decode($course->outcomes_achieved, true);
-                    if(array_key_exists($outcome->id, $course_outcomes_attempted2 )
+//                     $course_outcomes_attempted2 = json_decode($course->outcomes_attempted, true);
+                    $course_outcomes_attempted2 = ($course->outcomes_att());
+                    $course_outcomes_achieved2 = ($course->outcomes_ach());
+//                     $course_outcomes_achieved2 = json_decode($course->outcomes_achieved, true);
+                    if(array_key_exists($outcome->id, $course_outcomes_attempted2 ) && array_key_exists($outcome->id, $course_outcomes_achieved2 )
                         && $course_outcomes_attempted2[$outcome->id]>0)
                     {
                         $achieved_outcomes_per_grad_program[$outcome->id]+=$course_outcomes_achieved2[$outcome->id];
@@ -298,7 +304,8 @@ class SchoolsController extends \BaseController
         $program_ids= $school->programs->lists('id');
 
         $grouped_courses = Course::
-            select(DB::raw('name, code, number, max(outcomes_attempted) as outcomes_attempted, semester_id, program_id'))
+//             select(DB::raw('name, code, number, max(outcomes_attempted) as outcomes_attempted, semester_id, program_id'))
+            select(DB::raw('name, code, number, semester_id, program_id'))
             ->with('semester')
             ->with('program')
             ->whereIn('program_id', $program_ids)
@@ -359,7 +366,7 @@ class SchoolsController extends \BaseController
         {
             // For each program with courses that do assessment
             foreach (Program::with(array('courses' => function($query){
-                $query->whereNotNull('outcomes_attempted');
+//                 $query->whereNotNull('outcomes_attempted');
                 $query->whereIn('semester_id', Session::get('semesters_ids'));
             }))->where('school_id', $school->id)->orderBy('name', 'asc')->get() as $program)
             {

app/controllers/ThreeYearPlanController.php

@@ -585,7 +585,7 @@ class ThreeYearPlanController extends \BaseController
     }
   }
 
-  public function print($program_id, $typ)
+  public function printPlan($program_id, $typ)
   {
 
     $program = DB::table('programs')->where('id', $program_id)->first();

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

@@ -59,11 +59,13 @@
                                         <?php
 
                                             $sections_evaluating_outcome = Course::has('activities')
-                                            ->whereNotNull('outcomes_attempted')
-                                            ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
+//                                             ->whereNotNull('outcomes_attempted')
+//                                             ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
                                             ->with(array('activities'=>function($query) use(&$outcome){
-                                                $query->whereNotNull('outcomes_attempted');
-                                                $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
+//                                                 $query->whereNotNull('outcomes_attempted');
+//                                                 $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
+//                                                 $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');
+                                                } ))
                                             ->where('code', $course->code)->where('number',$course->number)
                                             ->whereIn('semester_id', Session::get('semesters_ids'))
                                             ->get();
@@ -181,7 +183,7 @@
                                     <td>{{ $program->name }}</td>
                                     <td>No</td>
                                     <td>
-                                        This program does not assess {{ $outcome->name }}.
+                                        This program did not assess {{ $outcome->name }}.
                                     </td>
                                 </tr>
                             @endif

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

@@ -1,7 +1,13 @@
 @extends('layouts.master')
 
 @section('navigation')
-@include('local.managers.sCoords._navigation')
+    @if(Auth::user()->role==1)
+        @include('local.managers.admins._navigation')
+    @elseif(Auth::user()->role==2)
+        @include('local.managers.sCoords._navigation')
+    @elseif(Auth::user()->role==3)
+        @include('local.managers.pCoords._navigation')
+    @endif
 @stop
 @section('main')
 

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

@@ -0,0 +1,127 @@
+ @extends('layouts.master')
+
+@section('navigation')
+        @include('local.managers.admins._navigation')
+@stop
+
+@section('main')
+    <div class="row">
+        <div class="col-md-12">
+
+            <p>This report contains the Assessment for all Students for all Schools and Programs during the following semester(s):</p>
+            <ul>
+                @foreach (Session::get('semesters_info') as $semester_info)
+                    <li>{{ $semester_info }}</li>
+                @endforeach
+            </ul>
+
+
+            <!-- <h3>Table of Contents</h3> -->
+            <!-- <ol id="table-of-contents" class="upper-roman">
+
+            </ol> -->
+
+
+            <table class="table table-condensed table-bordered datatable">
+                <thead>
+                    <tr class="center-text">
+                        <th>Semester</th>
+                        <th>School or College</th>
+                        <th>Program ID</th>
+                        <th>Program Code</th>
+                        <th>Outcome</th>
+                        <th>Student Number</th>
+                        <th>Student Program</th>
+                        <th>Criteria</th>
+                        <th>Courses</th>
+                        <th>Expected Result For Achievement</th>
+                        <th>Student Result</th>
+                    </tr>
+                </thead>
+                <tfoot>
+                    <tr class="column-search">
+                        <th><select class="column-search-select form-control"><option value=""></option></select></th>
+                        <th><select class="column-search-select form-control"><option value=""></option></select></th>
+                        <th><select class="column-search-select form-control"><option value=""></option></select></th>
+                        <th><select class="column-search-select form-control"><option value=""></option></select></th>
+                        <th><select class="column-search-select form-control"><option value=""></option></select></th>
+                        <th><select class="column-search-select form-control"><option value=""></option></select></th>
+                        <th><select class="column-search-select form-control"><option value=""></option></select></th>
+                        <th><input class="column-search-bar form-control" type="text" placeholder="Buscar"/></th>
+                        <th><select class="column-search-select form-control"><option value=""></option></select></th>
+                        <th><select class="column-search-select form-control"><option value=""></option></select></th>
+                        <th><select class="column-search-select form-control"><option value=""></option></select></th>
+                    </tr>
+                </tfoot>
+                <tbody>
+                    @foreach ($total_assessments as $total_assessment)
+                                <tr>
+                                    <td>{{ $total_assessment->semester }}</td>
+                                    <td>{{ $total_assessment->school }}</td>
+                                    <td>{{ $total_assessment->program }}</td>
+                                    <td>{{ $total_assessment->program_code }}</td>
+                                    <td>{{ $total_assessment->outcome }}</td>
+                                    <td>{{ $total_assessment->student_number }}</td>
+                                    <td>{{ $total_assessment->student_conc_code }}</td>
+                                    <td>{{ $total_assessment->criterion }}</td>
+                                    <td>{{ $total_assessment->course }}</td>
+                                    <td>{{ $total_assessment->expected_result }}</td>
+                                    <td>{{ $total_assessment->result }}</td>
+                                </tr>
+                    @endforeach
+                </tbody>
+            </table>
+        </div>
+    </div>
+    <span class="js-vars"
+        data-pdf-url="{{ URL::action('OutcomesController@totalAssessmentReport') }}"
+    ></span>
+@stop
+
+@section('included-js')
+    @include('global._datatables_js')
+@stop
+
+
+@section('javascript')
+
+// Build table of contents
+var outcome = $('.outcome');
+var str ='';
+str+='<li><a href="#'+outcome.attr('id')+'">'+outcome.text()+'</a><ol class="schools upper-alpha">';
+
+/*$('[id^='+outcome.attr('id')+'-].school:visible').each(function(e){
+    var school = $(this);
+    str+='<li><a href="#'+school.attr('id')+'">'+school.text()+'</a><ol class="programs">';
+
+    $('[id^='+school.attr('id')+'-].program:visible').each(function(e){
+
+        var program = $(this);
+        if(!program.hasClass('no-courses'))
+            str+='<li><a href="#'+program.attr('id')+'">'+program.text()+'</a></li>';
+        else
+            str+='<li>'+program.text()+'</li>';
+
+    });
+
+    str+='</ol></li>';
+});*/
+
+str+='</ol></li>';
+
+//$('#table-of-contents').append(str);
+
+
+// ----------------------------------------------------------------------------
+// Events
+//
+
+$('.to-top').on('click', function(e) {
+    e.preventDefault();
+
+     $(this).scrollTop(0);
+    $('html').animate({scrollTop:0}, 1);
+    $('body').animate({scrollTop:0}, 1);
+})
+
+@stop

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

@@ -364,6 +364,7 @@
                         @if(
                             is_array($program_item['outcomes_attempted'])
                             && array_key_exists($outcome->id, $program_item['outcomes_attempted'])
+                            && array_key_exists($outcome->id, $program_item['outcomes_achieved'])
                             && $program_item['outcomes_attempted'][$outcome->id]!=0)
                             {{{ ($program_item['outcomes_achieved'][$outcome->id]/$program_item['outcomes_attempted'][$outcome->id])*100 }}},
                         @else

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

@@ -174,10 +174,10 @@ function loadGraphs() {
                 data:[
                     @foreach($outcomes as $outcome)
                     <?php
-Log::info($grouped_outcomes_attempted_results[$index]);
-Log::info(array_key_exists($outcome->id, $grouped_outcomes_attempted_results[$index]));
-
-Log::info($grouped_outcomes_attempted_results[$index][$outcome->id]);
+// Log::info($grouped_outcomes_attempted_results[$index]);
+// Log::info(array_key_exists($outcome->id, $grouped_outcomes_attempted_results[$index]));
+// 
+// Log::info($grouped_outcomes_attempted_results[$index][$outcome->id]);
                          
                     ?>
                         @if(