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

app/controllers/OutcomesController.php

@@ -724,6 +724,80 @@ class OutcomesController extends \BaseController
         return View::make('local.managers.admins.assessment_report', compact('title', 'outcome', 'schools'));
     }
 
+    public function totalAssessmentReport()
+    {
+    	//SELECT sm.name, s.name, p.name, p.code, a.outcomes_attempted, stu.number, ass.scores, c.code, c.number, r.expected_points 
+//     	FROM students stu, schools s, programs p, courses c, activities a, assessments ass, rubrics r, semesters sm 
+//     	where stu.id=ass.student_id and sm.id=c.semester_id and s.id=p.school_id and p.id=c.program_id and a.course_id=c.id and ass.activity_id=a.id and a.rubric_id=r.id 
+//     	and c.semester_id in (12,13) and a.outcomes_attempted is not null
+    ini_set('memory_limit', -1);
+	ini_set('max_execution_time', 300);
+// 		$total_assessments_temp = DB::table('assessments')
+//          						->join('students', 'students.id', '=', 'assessments.student_id')
+//          						->join('activities', 'activities.id', '=', 'assessments.activity_id')
+//          						->join('rubrics', 'rubrics.id', '=', 'activities.rubric_id')
+//          						->join('courses', 'courses.id', '=', 'activities.course_id')
+//          						->join('programs', 'programs.id', '=', 'courses.program_id')
+//          						->join('schools', 'schools.id', '=', 'programs.school_id')
+//           						->join('semesters', 'semesters.id', '=', 'courses.semester_id')
+//                    			   	->whereIn('courses.semester_id', Session::get('semesters_ids'))
+//                     			->whereRaw('activities.outcomes_attempted is not null')
+//                     			->select('activities.id as activity_id','semesters.name as semester','schools.name as school','programs.name as program','programs.id as program_id','programs.code as program_code','students.number as student_number','students.conc_code as student_conc_code','assessments.scores as results','courses.name as course','courses.code as course_code','courses.number as course_number','rubrics.expected_points as expected_result')
+//                     			->orderBy('semesters.id','school','program','course','student_number')
+// 								->distinct()
+//                     			->get();
+//                     			    
+//         $total_assessments=array();
+// 		foreach($total_assessments_temp as $total_assessment)
+// 		{
+// 			$results=json_decode($total_assessment->results, TRUE);
+// 			$total_assessment->course=$total_assessment->course_code.$total_assessment->course_number." ".$total_assessment->course;
+// 			foreach($results as $criterion_id => $result)
+// 			{	
+// 				if($result and $result!="N/A")
+// 				{
+// 					$trans_temp=clone $total_assessment;
+// 					$criterion=Criterion::find($criterion_id);
+// 					if($criterion)
+// 					{
+// 	// 					var_dump($total_assessment->activity_id);
+// 	// 					var_dump($criterion_id);
+// 						if($criterion_id==1398)var_dump($criterion);
+// 	// 					exit();
+// 						$trans_temp->result=$result;
+// 						$trans_temp->criterion=$criterion->name;
+// 						$trans_temp->outcome=Outcome::find($criterion->outcome_id)->name;
+// 						$total_assessments[]=$trans_temp;
+// 					}
+// 				}
+// 			}
+// 		
+// 		}
+		$total_assessments = DB::table('assessments')
+         						->join('students', 'students.id', '=', 'assessments.student_id')
+         						->join('activity_criterion', 'activity_criterion.id', '=', 'assessments.activity_criterion_id')
+         						->join('activities', 'activities.id', '=', 'activity_criterion.activity_id')
+         						->join('criteria', 'criteria.id', '=', 'activity_criterion.criterion_id')
+         						->join('criterion_objective_outcome', 'criteria.id', '=', 'criterion_objective_outcome.criterion_id')
+         						->join('outcomes', 'outcomes.id', '=', 'criterion_objective_outcome.outcome_id')
+         						->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
+         						->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
+         						->join('courses', 'courses.id', '=', 'activities.course_id')
+         						->join('programs', 'programs.id', '=', 'courses.program_id')
+         						->join('schools', 'schools.id', '=', 'programs.school_id')
+          						->join('semesters', 'semesters.id', '=', 'courses.semester_id')
+                   			   	->whereIn('courses.semester_id', Session::get('semesters_ids'))
+                    			->select('criteria.name as criterion','outcomes.name as outcome','activities.id as activity_id','semesters.name as semester','schools.name as school','programs.name as program','programs.id as program_id','programs.code as program_code','students.number as student_number','students.conc_code as student_conc_code','assessments.score as result','courses.name as course','courses.code as course_code','courses.number as course_number','rubrics.expected_points as expected_result')
+                    			->orderBy('semesters.id','school','program','course','student_number')
+								->distinct()
+                    			->get();
+
+
+       $title = "Total Assessment Report";
+		
+        return View::make('local.managers.admins.total_assessment', compact('title', 'total_assessments'));
+    }
+
     // TODO: Change later
     public function newAssessmentReport($outcome_id)
     {

app/routes.php

@@ -334,6 +334,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
         Route::post('courses/update', array('before' => 'csrf', 'uses' => 'CoursesController@update'));
 
         Route::get('activities/create', 'ActivitiesController@newCreate');
+        Route::get('total_assessment-report', 'OutcomesController@totalAssessmentReport');
     });
 
     /**

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

@@ -52,7 +52,8 @@
         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Reports<span class="caret"></span></a>
         <ul class="dropdown-menu" role="menu">
           <li>{{ HTML::linkAction('OutcomesController@managerAssessmentReports', 'Campus Reports') }}</li>
-          @if(count(Auth::user()->courses))
+          <li>{{ HTML::linkAction('OutcomesController@totalAssessmentReport', 'Total Assessment Reports') }}</li>
+         @if(count(Auth::user()->courses))
           <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReports', 'My Courses\' Reports') }}</li>
 
           @endif
@@ -71,18 +72,14 @@
       </li>
       <li class="dropdown">
         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Account<span class="caret"></span></a>
-        <ul class="dropdown-menu" role="menu">
+{{--         <ul class="dropdown-menu" role="menu">
           <li>{{ HTML::linkAction('UsersController@edit', 'Profile') }}</li>
           <li>{{ HTML::linkAction('AuthController@logout', 'Log out ('.Auth::user()->email.')') }}</li>
         </ul>
       </li>
-      <li class="dropdown">
-        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">NEW<span class="caret"></span></a>
-        <ul class="dropdown-menu" role="menu">
-          <li>{{ HTML::linkAction('OutcomesController@newIndex', 'New Index') }}</li>
-          {{-- <li>{{ HTML::linkAction('AuthController@logout', 'Log out ('.Auth::user()->email.')') }}
-      </li>--}}
-    </ul>
+          <li>{{ HTML::linkAction('AuthController@logout', 'Log out ('.Auth::user()->email.')') }}
+      </li>
+    </ul>--}}
     </li>
     </ul>
   </div>