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

app/controllers/Objective2Controller.php

@@ -141,10 +141,10 @@ class Objective2Controller extends \BaseController
 				return Redirect::to('objectives')->withInput();
 
 			case 2:
-				return Redirect::to('school-objectives')->withInput();
+				return Redirect::to('school-objective')->withInput();
 
 			case 3:
-				return Redirect::to('program-objectives')->withInput();
+				return Redirect::to('program-objective')->withInput();
 		}
 	}
 	/**

app/controllers/ProfessorsController.php

@@ -13,17 +13,17 @@ class ProfessorsController extends \BaseController
     public function overview()
     {
         $title = 'My Courses';
-        $grouped_courses = Course::where('user_id', Auth::user()->id)->whereIn('semester_id', Session::get('semesters_ids'))->groupBy(array('code', 'number', 'semester_id'))->get();
+        $grouped_courses = Course::with('program')->where('user_id', Auth::user()->id)->whereIn('semester_id', Session::get('semesters_ids'))->groupBy(array('code', 'number', 'semester_id'))->get();
         $semesters = Session::get('semesters_ids');
         $semesters = DB::table('semesters')->whereIn('id', $semesters)->orderBy('start', 'ASC')->first();
         Log::info($semesters->start);
-        $outcomes = Outcome::select(array('id', 'name', 'expected_outcome'))
+        $outcomes = Outcome::select(array('id', 'name', 'expected_outcome', 'level'))
             ->whereNull('deleted_at')
             ->whereRaw("(deactivation_date IS NULL or deactivation_date >= '{$semesters->start}')")
             ->orderBy('name', 'ASC')->get();
         $outcomeCount = count($outcomes);
 
-
+Log::info($grouped_courses);
         $grouped_outcomes_achieved_results = array();
         $grouped_outcomes_attempted_results = array();
         $grouped_sections = array();
@@ -38,13 +38,16 @@ class ProfessorsController extends \BaseController
             $outcomes_attempted = [];
 
             // Find sections belonging to user with identifier of one course
-            $sections = Course::where('user_id', Auth::user()->id)
+            $sections = Course::with('program')
+            	->where('user_id', Auth::user()->id)
                 ->where('code', $grouped_course->code)
                 ->whereIn('semester_id', Session::get('semesters_ids'))
                 ->where('number', $grouped_course->number)
                 ->where('semester_id', $grouped_course->semester_id)
                 ->get();
 
+// 			        Log::info($sections);
+			        
             // For each of the professor's course sections, add the attempted and achieved criteria per outcome
             foreach ($sections as $section) {
 
@@ -94,12 +97,15 @@ class ProfessorsController extends \BaseController
         $program_courses = Course::where('program_id', '=', $program->id)->whereIn('semester_id', Session::get('semesters_ids'))->get();
         $semesters = Session::get('semesters_ids');
         $semesters = DB::table('semesters')->whereIn('id', $semesters)->orderBy('start', 'ASC')->first();
-
-        $outcomes = Outcome::select(array('id', 'name', 'expected_outcome'))
-            ->whereNull('deleted_at')
-            ->whereRaw("(deactivation_date IS NULL or deactivation_date >= '{$semesters->start}')")
-            ->orderBy('name', 'ASC')->get();
-        $outcomeCount = count($outcomes);
+        $semesters2 = Semester::whereIn('id',Session::get('semesters_ids'))->get();
+
+//         $outcomes = Outcome::select(array('id', 'name', 'expected_outcome'))
+//         	->where('level','=',)
+//             ->whereNull('deleted_at')
+//             ->whereRaw("(deactivation_date IS NULL or deactivation_date >= '{$semesters->start}')")
+//             ->orderBy('name', 'ASC')->get();
+        $outcomes = Outcome::active_by_semesters($semesters2, $program->is_graduate);
+	    $outcomeCount = count($outcomes);
         $outcomes_achieved = [];
         $outcomes_attempted = [];
 

app/controllers/RubricsController.php

@@ -33,7 +33,8 @@ class RubricsController extends \BaseController
         $outcomes = Outcome::orderBy('name', 'ASC')->get();
         $criteria = Criterion::orderBy('name', 'ASC')->get();
         $rubric = $activity->rubric;
-        Log::info($rubric);
+//         $draft=$activity->draft;
+//         Log::info("*****".$activity);
 
 
 
@@ -318,13 +319,15 @@ class RubricsController extends \BaseController
     {
         $activity = Activity::find($activity_id);
         // Get activity's course
+//         Log::info("actv".$activity);
         $course = Course::where('id', '=', $activity->course_id)->firstOrFail();
+//         Log::info("user".$course->user_id);
 
         // If activity does not belong to the requesting user, display 403
         if ($course->user_id != Auth::id())
             App::abort('403', 'Access Forbidden');
-        Log::info($activity->rubric[0]->id);
-
+//         Log::info("rubric".$activity->rubric);
+// exit();
         $rubric = Rubric::where('id', '=', $activity->rubric[0]->id)->firstOrFail();
         $rubric_criterion = DB::table('criteria')
             ->join('rubric_criterion', 'rubric_criterion.criterion_id', '=', 'criteria.id')

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

@@ -1,7 +1,13 @@
 @extends('layouts.master')
 
 @section('navigation')
-  @include('local.managers.admins._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')
@@ -17,7 +23,7 @@
       <span id="expected_points">{{{$template->expected_points}}}</span> points
     </p>
 
-    <table class="table table-striped table-condensed datatable" id= "RubricTable">
+    <table class="table datatable" id= "RubricTable">
       <thead>
           <tr>
             <th></th>
@@ -56,7 +62,7 @@
 @endforeach
 <td><ol>
 @foreach ($criterion->outcomes as $outcome)
-    <li>{{$outcome->name}}</li>
+    <p>{{$outcome->name}}</p>
 @endforeach
 </ol></td>
         @endforeach

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

@@ -199,9 +199,11 @@
                 {{ HTML::linkAction('RubricsController@newRubric', 'Assign Rubric', array($activity->id), array('class'=>'btn btn-primary btn-sm btn-block')) }}
                 <!--{{ HTML::linkAction('RubricsController@newOtherMethod', 'Assign Other Assessment Method', array($activity->id), array('class'=>'btn btn-primary btn-sm btn-block')) }}-->
             @else
-
+				@if(count($activity->rubric) != 0)
                 {{ HTML::linkAction('RubricsController@show', 'View Rubric', array($activity->id), array('class'=>'btn btn-primary btn-sm btn-block')) }}
-
+                @else
+                <h5>No rubric associated to this activity</h5>
+				@endif
                 <!-- If semester is active, allow users to change rubrics -->
                 @if (in_array($course->semester->id, $active_semesters))
                 {{ HTML::linkAction('RubricsController@newRubric', 'Change Rubric', array($activity->id), array('class'=>'btn btn-primary btn-sm btn-block')) }}
@@ -211,8 +213,11 @@
                 @if(!$activity->is_assessed() && in_array($course->semester->id, $active_semesters))
                     {{ HTML::linkAction('ActivitiesController@assess', 'Assess', array($activity->id), array('class'=>'btn btn-primary btn-sm btn-block')) }}
                 @else
+                	 @if($activity->is_assessed())
                     {{ HTML::linkAction('ActivitiesController@viewAssessment', 'View Assessment Sheet', array($activity->id), array('class'=>'btn btn-primary btn-sm btn-block')) }}
-
+                @else
+                <h5>No assessment associated to this activity</h5>
+				@endif
 
                     <!-- If semester is active, allow users to edit assessments -->
                     @if (in_array($course->semester->id, $active_semesters))

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

@@ -139,7 +139,8 @@
                         <!-- For each criterion in the rubric, there's a score field -->
                         @for ($i = 0; $i<sizeof($rubric_criterion); $i++)
                             <td class="score-field">
-                                <select name="" id="" class="form-control" data-toggle="tooltip" data-placement="right" title="{{{ $student->name }}}">
+                                <select name="" id="" class="form-control" data-toggle="tooltip" data-placement="right" title="{{{ $student->name }}} 
+{{{ $rubric_criterion[$i]->name }}}">
                                 <!-- Option from 0-8 -->
                                 
                                 @for ($j=0; $j<=$rubric->max_score; $j++)

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

@@ -117,7 +117,9 @@ function loadGraphs() {
             xAxis: {
                 categories: [
                     @foreach($outcomes as $outcome)
+                    	@if($outcome->level==3 || ($grouped_course->program->is_graduate==0 && $outcome->level==1))
                         "{{{ $outcome->name }}}",
+                        @endif
                     @endforeach
                 ],
                 labels: {
@@ -177,9 +179,15 @@ function loadGraphs() {
 // 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_course);
+// Log::info($outcome->level);
+// Log::info($grouped_course->is_graduate);
+// Log::info($grouped_course->is_graduate==0);
+// Log::info($outcome->level==3 || ($grouped_course->program->is_graduate==0 && $outcome->level==1));
+//                          
                     ?>
+					@if($outcome->level==3 || ($grouped_course->program->is_graduate==0 && $outcome->level==1))
                         @if(
                             is_array($grouped_outcomes_attempted_results[$index])
                             && array_key_exists($outcome->id, $grouped_outcomes_attempted_results[$index])
@@ -188,6 +196,7 @@ function loadGraphs() {
                         @else
                             0,
                         @endif
+                        @endif
                     @endforeach
                 ],
                 pointPadding: 0,
@@ -207,7 +216,8 @@ function loadGraphs() {
                 },
                 data: [
                     @foreach($outcomes as $outcome)
-                        @if(
+   					@if($outcome->level==3 || ($grouped_course->program->is_graduate==0 && $outcome->level==1))
+                     @if(
                             is_array($grouped_outcomes_attempted_results[$index])
                             && array_key_exists($outcome->id, $grouped_outcomes_attempted_results[$index])
                             && $grouped_outcomes_attempted_results[$index][$outcome->id]!=0)
@@ -215,6 +225,7 @@ function loadGraphs() {
                         @else
                             0,
                         @endif
+                        @endif
                     @endforeach
                 ],
                 pointPadding: 0,

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

@@ -48,8 +48,13 @@
       <input id="activity_id" type="hidden" value="{{{ $activity->id}}}">
 
       <div class="form-group">
+        @if($activity->draft)
         <label>Select a Rubric:</label>
         <select id="select-template" class="form-control selectpicker">
+        @else
+        <label>Rubric (Assessment was published):</label>
+        <select id="select-template" class="form-control selectpicker" disabled>
+        @endif
           @foreach ($templates as $template)
             @if(count($activity->rubric)!=0 && $template->name == Rubric::find($activity->rubric[0]->id)->name)
               <option data-template-id="{{ $template->id }}" class="template" selected="selected">{{ $template->name }}</option>
@@ -84,7 +89,8 @@
 <div id="rubric-container" class="row">
   <div class="col-md-12">
 
-    <table class="table" style="table-layout: fixed">
+<!--     <table class="table" style="table-layout: fixed"> -->
+    <table class="table  table-striped table-condensed">
       <thead><tr><th colspan="6 "><h3 id="rubric-name"></h3></th></tr></thead>
       <thead><tr id ="criterion-header"><th>Criterion</th><th>Beginning (1-2)</th><th>In Progress (3-4)</th><th>Good (5-6)</th><th>Excellent (7-8)</th></tr></thead>
       <tbody>

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

@@ -75,7 +75,8 @@
             <td>
             
             @foreach (json_decode($criterion->outcomes) as $index => $outcome)
-            {{$index+1}}. {{$outcome}}<br>                 
+<!--             {{$index+1}}. {{$outcome}}<br>                  -->
+            {{$outcome}}<br>                 
             @endforeach  
             </td>
           </tr>