jfjyfjygkjh

app/controllers/AnnualPlansController.php

@@ -463,7 +463,34 @@ class AnnualPlansController extends \BaseController
 
     $academic_year = (int) explode(",", $academic_year)[0];
 
-    $course_codes = DB::table('typ_semester_courses')
+    $course_codes = DB::table('annual_plan_objective as apo')
+      ->join('typ_semester_courses as tyc', 'apo.typ_semester_course_id', '=', 'tyc.id')
+      ->join('courses', 'tyc.course_id', '=', 'courses.id')
+      ->where('annual_plan_id', $annual_plan_id)
+      ->select('courses.code', 'courses.number')
+      ->distinct()
+      ->get();
+    Log::info($course_codes);
+    $all_courses_info = [];
+
+    foreach ($course_codes as $index => $course_code) {
+      //$all_courses_info['course_code'][] = $course_code->code . '_' . $course_code->number;
+      $courses = Course::where(function ($query) use (&$semester_end, &$semester_start) {
+        $query->where('semester_id', $semester_end)
+          ->orWhere('semester_id', $semester_start);
+      })
+        ->where('code', $course_code->code)
+        ->where('number', $course_code->number)
+        ->where('program_id', $program_id)
+        ->get();
+      Log::info("run number " . $index);
+      Log::info($courses);
+      foreach ($courses as $course) {
+        $all_courses_info[$course_code->code . '_' . $course_code->number][] = $course->getReportObject();
+      }
+    }
+
+    /*$course_codes = DB::table('typ_semester_courses')
       ->join('typ_semester_objectives as tso', 'tso.id', '=', 'typ_semester_courses.typ_semester_objective_id')
       ->join('courses', 'courses.id', '=', 'typ_semester_courses.course_id')
       ->join('typ_semester_outcome as typ_out', 'typ_out.id', '=', 'tso.typ_semester_outcome_id')
@@ -475,8 +502,12 @@ class AnnualPlansController extends \BaseController
       ->where('typ_program.program_id', $program_id)
       ->select('courses.code', 'courses.number', 'typ_semester_courses.id as typ_sem_cou_id')
       ->distinct()
-      ->get();
-    foreach ($course_codes as $course_code) {
+      ->get();*/
+
+
+
+
+    /*foreach ($course_codes as $course_code) {
 
       $course_code->sections = DB::table('courses')
         ->join('activities', 'activities.course_id', '=', 'courses.id')
@@ -490,6 +521,8 @@ class AnnualPlansController extends \BaseController
         ->toSql();
 
       Log::info($course_code->sections);
-    }
+    }*/
+
+    return $all_courses_info;
   }
 }

app/models/Activity.php

@@ -179,13 +179,13 @@ class Activity extends Eloquent
 
     }*/
 
-    $students_attempted =  DB::table('assessments')
+    /* $students_attempted =  DB::table('assessments')
       ->join('activity_criterion', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
       ->where('activity_criterion.activity_id', $this->id)
 
-      ->get();
+      ->get();*/
+
 
-    $student_criteria = [];
 
     foreach ($outcomes as $outcome) {
       $ac_criteria = DB::table('criterion_objective_outcome as cobo')

app/models/Course.php

@@ -80,6 +80,8 @@ class Course extends Eloquent
     //   	SELECT distinct cr.outcome_id FROM  courses c, activities a, activity_criterion ac, criteria cr WHERE c.id=a.course_id and a.id=ac.activity_id and ac.criterion_id=cr.id and c.id=1
     // 	return $this->id;
   }
+
+
   public function outcomes_att()
   {
     $criteria_attempted = DB::table('courses')
@@ -111,6 +113,48 @@ class Course extends Eloquent
     return $outcomes_attempted;
   }
 
+  public function getReportObject()
+  {
+    $reportObject = new stdClass();
+
+    $reportObject->criteriaReport = DB::table('courses')
+      ->join('activities', 'activities.course_id', '=', 'courses.id')
+      ->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
+      ->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
+      ->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
+      ->join('criteria', 'criteria.id', '=', 'activity_criterion.criterion_id')
+      ->join('assessments', 'activity_criterion.id', '=', 'assessments.activity_criterion_id')
+      ->select(DB::raw(
+        "count(assessments.score) as assessed,
+       count(case when assessments.score >= rubrics.expected_points then 1 else NULL end) as achieved,
+       criteria.*"
+      ))
+      ->where('courses.id', $this->id)
+      ->groupBy('criteria.id')
+      ->get();
+    Log::info($this->id);
+    $reportObject->outcomesReport = DB::table('courses')
+      ->join('activities', 'activities.course_id', '=', 'courses.id')
+      ->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
+      ->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
+      ->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
+      ->join('assessments', 'activity_criterion.id', '=', 'assessments.activity_criterion_id')
+      ->join('criterion_objective_outcome', 'activity_criterion.criterion_id', '=', 'criterion_objective_outcome.criterion_id')
+      ->join('outcomes', 'criterion_objective_outcome.outcome_id', '=', 'outcomes.id')
+      ->select(
+        DB::raw(
+          "student_id, outcomes.name, outcomes.id,
+        count(activity_criterion.criterion_id) as attempted,
+        count(case when assessments.score >= rubrics.expected_points then 1 else null end) as achieved"
+        )
+      )
+      ->where('courses.id', $this->id)
+      ->groupBy(array('outcome_id', 'student_id'))
+      ->get();
+
+    return $reportObject;
+  }
+
   public function outcomes_ach()
   {
     $criteria = DB::table('criteria')

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

@@ -12,6 +12,7 @@
 
 @section('main')
     <div class="row">
+        <div class="col-md-3">
             <div class="category" >
               <label for="annual_plans">Annual Plan</label>
               <div class="select">
@@ -23,6 +24,17 @@
                 </select>
               </div>
             </div>
+        </div>
+
+        <div class='col-md-9' id='report'>
+            <ul id = 'levelTabs' class = "nav nav-tabs" role = "tablist">
+ 
+
+            </ul>
+<div id ='allLists' class="tab-content">
+</div>
+        </div>
+        
 
     </div>
 
@@ -48,7 +60,48 @@
         },
         function(data)
         {
+            $('#levelTabs').html(' ');
+        $.each(data, function(course_code, course_data){
+            
+            li = $("<li/>", {
+                'role':'presentation'
+            });
+            li.append($('<a/>',{
+                'onclick': "$(this).tab('show')",
+                'data-toggle':'tab',
+                'href':'#'+course_code,
+                'role':'tab'
+            }).html(course_code.replace('_',' ')));
+
+            div = $("<div/>",{
+                'role':'tabpanel',
+                'class':'tab-pane',
+                'id':course_code,
+            });
+
+            title = $("<h3/>",{
+                'style':'text-align: center'
+            }).html('Course: '+course_code.replace('_',' '));
+
+            criteriaAssessed = $("<h5/>",{
+                'style':'display: inline'
+            })
 
+            $('#levelTabs').append(li);
+            $("#allLists").append(div);
+            
+
+            $.each(course_data, function(index, reports){
+
+                $.each(reports.criteriaReport, function(index2, criterion){
+
+                })
+            })
+            
+
+        })
+
+                  
         }
         );
 

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

@@ -64,6 +64,7 @@
 
                             ->where('code', $course->code)->where('number',$course->number)
                             ->whereIn('semester_id', Session::get('semesters_ids'))
+                            ->orderBy('semester_id')
                             ->get();
                             
                             
@@ -76,10 +77,10 @@
                                         @section('lists')
                                         <div role = "tabpanel" class = 'tab-pane' id = "{{$course->code}}-{{$course->number}}">
                                             @foreach($sections_evaluating as $index3 => $section)
-                                            <h3 style="text-align: center"> Course: {{$course->code}} {{$course->number}}-{{$section->section}}</h3> 
+                                            <h3 style="text-align: center"> Course: {{$course->code}} {{$course->number}}-{{$section->section}} </h3> 
                                             @foreach($section->publishedActivities as $index4 => $activity)
 
-                                            <h5 style="display: inline;">Activity {{$index4+1}}: </h4>
+                                            <h5 style="display: inline;">Activity {{$index4+1}}: </h5>
                                             <p style="display: inline;">{{$activity->name}} <strong>({{$activity->date}})</strong></p>
                                             <br>
                                             <br>