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

app/controllers/CoursesController.php

@@ -231,7 +231,18 @@ CoursesController extends \BaseController
             ->where('semester_id', $semester->id)
             ->groupBy(array('code', 'number'))->get();
 
-        $outcomes = Outcome::orderBy('name', 'asc')->get();
+//         Log::info($grouped_courses[0]->id);
+// exit();
+        $level = DB::table('courses')
+            ->join('programs', 'programs.id', '=', 'courses.program_id')
+            ->where('courses.id', $grouped_courses[0]->id)
+            ->select('programs.is_graduate')
+            ->first();
+
+        $outcomes = Outcome::active_by_semesters(array($semester), $level->is_graduate);
+
+
+//         $outcomes = Outcome::orderBy('name', 'asc')->get();
         $outcomeCount = Outcome::all()->count();
 
         foreach ($grouped_courses as $index => $grouped_course) {
@@ -246,15 +257,31 @@ CoursesController extends \BaseController
                 ->get();
 
             // For each of the sections, add the attempted and achieved criteria per outcome
-            foreach ($sections as $section) {
-                if ($section->outcomes_achieved != NULL) {
-                    $section_outcomes_achieved = json_decode($section->outcomes_achieved, true);
-                    $section_outcomes_attempted = json_decode($section->outcomes_attempted, true);
-                    for ($i = 1; $i <= count($outcomes_attempted); $i++) {
-                        $outcomes_achieved[$i] += $section_outcomes_achieved[$i];
-                        $outcomes_attempted[$i] += $section_outcomes_attempted[$i];
-                    }
-                }
+            foreach ($sections as &$section) {
+                        if ($section->outcomes_ach()) {
+						$section->outcomes_attempted=true;
+						$course_outcomes_achieved = $section->outcomes_ach();
+						$course_outcomes_attempted = $section->outcomes_att();
+						foreach ($course_outcomes_achieved as $outcome => $score) {
+							if (array_key_exists($outcome, $outcomes_achieved))
+								$outcomes_achieved[$outcome] += $score;
+							else $outcomes_achieved[$outcome] = $score;
+						}
+						foreach ($course_outcomes_attempted as $outcome => $score) {
+							if (array_key_exists($outcome, $outcomes_attempted))
+								$outcomes_attempted[$outcome] += $score;
+							else $outcomes_attempted[$outcome] = $score;
+						}
+					}
+            
+//                 if ($section->outcomes_achieved != NULL) {
+//                     $section_outcomes_achieved = json_decode($section->outcomes_achieved, true);
+//                     $section_outcomes_attempted = json_decode($section->outcomes_attempted, true);
+//                     for ($i = 1; $i <= count($outcomes_attempted); $i++) {
+//                         $outcomes_achieved[$i] += $section_outcomes_achieved[$i];
+//                         $outcomes_attempted[$i] += $section_outcomes_attempted[$i];
+//                     }
+//                 }
             }
         }
 
@@ -264,7 +291,8 @@ CoursesController extends \BaseController
             ->lists('id');
 
         // Activities with transforming actions
-        $activities = Activity::with('course')->whereNotNull('transforming_actions')->whereIn('course_id', $section_ids)->orderBy('name')->groupBy('transforming_actions')->get();
+//         $activities = Activity::with('course')->whereNotNull('transforming_actions')->whereIn('course_id', $section_ids)->orderBy('name')->groupBy('transforming_actions')->get();
+        $activities = Activity::with('course')->whereIn('course_id', $section_ids)->orderBy('name')->get();
 
         return View::make('local.managers.shared.print_course', compact('role', 'title', 'grouped_courses', 'outcomes', 'outcomes_attempted', 'outcomes_achieved', 'sections', 'activities'));
     }

app/controllers/ProgramsController.php

@@ -328,43 +328,85 @@ class ProgramsController extends \BaseController
 
     $program = Program::find($id);
     $title = $program->name . ' Assessment Report - ' . date('m/d/Y');
-    $program_courses = $program->courses;
-    /* //$outcomes = Outcome::orderBy('name', 'asc')->get();
     $schools = School::all();
    // $outcomeCount = Outcome::all()->count();
     $semesters = Session::get('semesters_ids');
-    $semesters = DB::table('semesters')->where('id', $course->semester_id)->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();
+//     $semesters = DB::table('semesters')->where('id', $course->semester_id)->orderBy('start', 'ASC')->first();
+        $semesters2 = Semester::whereIn('id',Session::get('semesters_ids'))->get();
 
-    $outcomes_achieved = array_fill(1, $outcomeCount, 0);
-    $outcomes_attempted = array_fill(1, $outcomeCount, 0);
+    $program_courses = $program->courses;
+     //$outcomes = Outcome::orderBy('name', 'asc')->get();
+	$outcomes = Outcome::active_by_semesters($semesters2, $program->is_graduate);
+	$outcomeCount = count($outcomes);
+	$outcomes_achieved = [];
+	$outcomes_attempted = [];
+
+// 	Log::info($program_courses);
+	foreach($outcomes as $outcome)
+	{
+			$outcomes_attempted[$outcome->id]=0;
+			$outcomes_achieved[$outcome->id]=0;
+	}
 
     $assessed_courses_count=0;
-    foreach ($program_courses as $course)
-    {
-      if($course->outcomes_achieved!=NULL)
-      {
-        $course_outcomes_achieved =json_decode($course->outcomes_achieved, true);
-        $course_outcomes_attempted =json_decode($course->outcomes_attempted, true);
-        for($i=1; $i<=count($outcomes_attempted); $i++)
-        {
-          $outcomes_achieved[$i]+=$course_outcomes_achieved[$i];
-          $outcomes_attempted[$i]+=$course_outcomes_attempted[$i];
-        }
-        $assessed_courses_count+=1;
-      }
-    }
+	foreach ($program_courses as $course) {
+
+		if ($course->outcomes_att()) {
+			$course_outcomes_attempted = $course->outcomes_att();
+			foreach ($course_outcomes_attempted as $outcome => $score) {
+				if (array_key_exists($outcome, $outcomes_attempted))
+					$outcomes_attempted[$outcome] += $score;
+				else $outcomes_attempted[$outcome] = $score;
+			}
+	        $assessed_courses_count+=1;
+		}
+
+		if ($course->outcomes_ach()) {
+
+			$course_outcomes_achieved = $course->outcomes_ach();
+			foreach ($course_outcomes_achieved as $outcome => $score) {
+				if (array_key_exists($outcome, $outcomes_achieved))
+					$outcomes_achieved[$outcome] += $score;
+				else $outcomes_achieved[$outcome] = $score;
+			}
+			}
+			
+	}
+
+    
+    
+
+//     $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();
+// 
+//     $outcomes_achieved = array_fill(1, $outcomeCount, 0);
+//     $outcomes_attempted = array_fill(1, $outcomeCount, 0);
+
+//     $assessed_courses_count=0;
+//     foreach ($program_courses as $course)
+//     {
+//       if($course->outcomes_achieved!=NULL)
+//       {
+//         $course_outcomes_achieved =json_decode($course->outcomes_achieved, true);
+//         $course_outcomes_attempted =json_decode($course->outcomes_attempted, true);
+//         for($i=1; $i<=count($outcomes_attempted); $i++)
+//         {
+//           $outcomes_achieved[$i]+=$course_outcomes_achieved[$i];
+//           $outcomes_attempted[$i]+=$course_outcomes_attempted[$i];
+//         }
+//         $assessed_courses_count+=1;
+//       }
+//     }
 
     /**
      * 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'))
+//       select(DB::raw('name, code, number, max(outcomes_attempted) as outcomes_attempted, semester_id, program_id'))
+    $grouped_courses = Course::
+      select(DB::raw('id, name, code, number, semester_id, program_id'))
       ->with('semester')
       ->with('program')
       ->where('program_id', $program->id)
@@ -374,8 +416,19 @@ class ProgramsController extends \BaseController
       ->orderBy('number')
       ->orderBy('semester_id')
       ->get();
-*/
 
+	foreach($grouped_courses as &$course)
+	{
+		$course->outcomes_attempted=null;
+		if(count($course->assessedActivities) and count($course->publishedActivities))
+		{
+			$course->outcomes_attempted=true;
+		}
+	
+	}
+
+// 	Log::info($grouped_courses);
+// exit();
     $semesters = Session::get('semesters_ids');
     $semesters = DB::table('semesters')->whereIn('id', $semesters)->orderBy('start', 'ASC')->first();
     Log::info($semesters->start);

app/controllers/UsersController.php

@@ -11,58 +11,60 @@ class UsersController extends \BaseController
 	public function index()
 	{
 		$title = "Users";
-
+$a=microtime();
 		$users = User::with('programs', 'school')
 			->orderBy('surnames')
 			->orderBy('first_name')
 			->get();
-		Log::info('LmaOOOOO get cocked');
+$b=microtime();
+			
+		Log::info(($b-$a));
 
 
 		$schools = School::orderBy('name', 'asc')->get();
 		$access_level  = count(User::select('role')->where('has_access', 1)->groupBy('role')->get());
-		try {
-			Log::info("Schools");
-			foreach ($schools as $school) {
-				Log::info(print_r($school, true));
-			}
-			foreach ($users as $user) {
-				Log::info("ID");
-				Log::info($user->id);
-				Log::info("Name");
-				Log::info($user->surname . $user->first_name);
-				Log::info("if funciona??");
-				Log::info($user->school_id);
-				Log::info("elseif??");
-				Log::info(count($user->programs));
-				if ($user->school_id) {
-					Log::info("Schoool");
-					Log::info($user->school->name);
-					Log::info($user->school_id);
-				} elseif (count($user->programs) > 0) {
-					Log::info("Entre aqui");
-					Log::info($user->programs[0]->school_id);
-					Log::info($user->programs[0]->school->name);
-				} else Log::info("Not so cocked");
-
-				Log::info("bueno vamos a ver que hay???");
-				Log::info(count($user->programs));
-				if (count($user->programs)) {
-					foreach ($user->programs as $program) {
-						Log::info($program->id);
-						Log::info($program->name);
-					}
-				} else Log::info("Tal vez cocked");
-				Log::info("email");
-				Log::info($user->email);
-				Log::info("Role" . $user->role);
-				Log::info($user->office_phone);
-				Log::info($user->cell_phone);
-			}
-		} catch (Exception $e) {
-			Log::info("get Cocked" . $e);
-		}
-		Log::info("el error era en la base de datos XDDDDDDD");
+// 		try {
+// 			Log::info("Schools");
+// 			foreach ($schools as $school) {
+// 				Log::info(print_r($school, true));
+// 			}
+// 			foreach ($users as $user) {
+// 				Log::info("ID");
+// 				Log::info($user->id);
+// 				Log::info("Name");
+// 				Log::info($user->surname . $user->first_name);
+// 				Log::info("if funciona??");
+// 				Log::info($user->school_id);
+// 				Log::info("elseif??");
+// 				Log::info(count($user->programs));
+// 				if ($user->school_id) {
+// 					Log::info("Schoool");
+// 					Log::info($user->school->name);
+// 					Log::info($user->school_id);
+// 				} elseif (count($user->programs) > 0) {
+// 					Log::info("Entre aqui");
+// 					Log::info($user->programs[0]->school_id);
+// 					Log::info($user->programs[0]->school->name);
+// 				} else Log::info("Not so cocked");
+// 
+// 				Log::info("bueno vamos a ver que hay???");
+// 				Log::info(count($user->programs));
+// 				if (count($user->programs)) {
+// 					foreach ($user->programs as $program) {
+// 						Log::info($program->id);
+// 						Log::info($program->name);
+// 					}
+// 				} else Log::info("Tal vez cocked");
+// 				Log::info("email");
+// 				Log::info($user->email);
+// 				Log::info("Role" . $user->role);
+// 				Log::info($user->office_phone);
+// 				Log::info($user->cell_phone);
+// 			}
+// 		} catch (Exception $e) {
+// 			Log::info("get Cocked" . $e);
+// 		}
+// 		Log::info("el error era en la base de datos XDDDDDDD");
 
 
 		return View::make('local.managers.admins.users', compact('title', 'users', 'schools', 'access_level'));
@@ -235,14 +237,19 @@ class UsersController extends \BaseController
 				array(
 					'office_phone' => 'string|max:20|required_with:office_extension',
 					'office_extension' => 'digits_between:1,5|required_with:office_phone|unique:users,office_extension,' . $user->id,
-					'cell_phone' => 'string|max:20'
+					'cell_phone' => 'string|max:20',
 				)
 			);
-
+// 				Log::info("email");	
+// 				Log::info($user->email);
+// 				Log::info(Input::get('email'));
+// 				$user->email = Input::get('email');
+// 				Log::info($user->email);
+		
 			/** If validation fails */
 			if ($validator->fails()) {
 				/** Prepare error message */
-				$message = 'Error(s) updating your Contact nformation<ul>';
+				$message = 'Error(s) updating your Contact Information<ul>';
 
 				foreach ($validator->messages()->all('<li>:message</li>') as $validationError) {
 					$message .= $validationError;
@@ -288,6 +295,45 @@ class UsersController extends \BaseController
 			try {
 				$exception = DB::transaction(function () {
 					$user = User::find(Input::get('id'));
+					$validator = Validator::make(
+						array(
+							'email' => Input::get('email'),
+						),
+						array(
+							'email' => 'required|email|unique:users'
+						)
+					);
+// 						Log::info("email");	
+// 						Log::info($user->email);
+// 						Log::info(Input::get('email'));
+// 						$user->email = Input::get('email');
+// 						Log::info($user->email);
+		
+					/** If validation fails */
+					if ($validator->fails()) {
+						/** Prepare error message */
+						$message = 'Error(s) updating your Contact Information<ul>';
+
+						foreach ($validator->messages()->all('<li>:message</li>') as $validationError) {
+							$message .= $validationError;
+						}
+
+						$message .= '</ul>';
+
+						/** Send error message and old data */
+						Session::flash('status', 'danger');
+						Session::flash('message', $message);
+						return Redirect::back()->withInput();
+					} else {
+			
+			
+// 						Log::info("email");	
+// 						Log::info($user->email);
+// 						Log::info(Input::get('email'));
+						$user->email = Input::get('email');
+// 						Log::info($user->email);
+
+					}
 
 					switch (Input::get('role')) {
 						case '1':

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

@@ -55,13 +55,13 @@
 
             <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"
-                    aria-expanded="false">Reports<span class="caret"></span></a>
+                    aria-expanded="false">Results<span class="caret"></span></a>
                 <ul class="dropdown-menu" role="menu">
-                    <li>{{ HTML::linkAction('OutcomesController@assessmentReport', 'Campus Reports') }}</li>
-                    <li>{{ HTML::linkAction('OutcomesController@totalAssessmentReport', 'Total Assessment Reports') }}
+                    <li>{{ HTML::linkAction('OutcomesController@assessmentReport', 'Campus Results') }}</li>
+                    <li>{{ HTML::linkAction('OutcomesController@totalAssessmentReport', 'Total Assessment Results') }}
                     </li>
                     @if (count(Auth::user()->courses))
-                        <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReport', 'My Courses\' Reports') }}
+                        <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReport', 'My Courses\' Results') }}
                         </li>
 
                     @endif

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

@@ -22,9 +22,22 @@
                     <p id="name" name="name" class="form-control-static"></p>
                 </div>
                 <div class="form-group">
+<!--                     <label for="email" class="control-label">Email</label> -->
+                      {{ Form::label('email', 'Email') }}
+                   {{ Form::email('email', Input::old('email'), array('class'=>'form-control'))}}
+ 					<span style="color: red;">Changing the email may cause the user to lose access to OLAS.</span>
+                </div>
+<!-- 
+                <div class="form-group">
                     <label for="" class="control-label">Email</label>
                     <p id="email" name="email" class="form-control-static"></p>
-                </div>
+<!~~ 
+                     {{ Form::label('email', 'Email') }}
+                    <input id="email" type="email" name="email" class="role form-control" value="">
+                    </input>
+ ~~>
+               </div>
+ -->
                 <div class="form-group">
                     {{ Form::label('role', 'Role') }}
                     <select id="role" name="role" class="role form-control">
@@ -310,8 +323,8 @@
         var user= element.closest('tr');
         $('#id').val(user.find('.user-name').data('user-id'));
         $('#name').text(user.find('.user-name').text());
-        $('#email').text(user.find('.user-email').text());
-
+<!--         $('#email').text(user.find('.user-email').text()); -->
+		$('#email').val(user.find('.user-email').text());
         $('#has_access').val(user.find('.user-has-access').data('value'));
 
 

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

@@ -53,23 +53,23 @@
 
             <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"
-                    aria-expanded="false">Reports<span class="caret"></span></a>
+                    aria-expanded="false">Results<span class="caret"></span></a>
                 <ul class="dropdown-menu" role="menu">
                     <li><a
                             href="{{ URL::action('OutcomesController@programAssessmentReport', Auth::user()->programs[0]->id) }}">Program
-                            Reports</a></li>
+                            Results</a></li>
 
             </li>
 
             @if (count(Auth::user()->courses))
-                <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReport', 'My Courses\' Reports') }}
+                <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReport', 'My Courses\' Results') }}
                 </li>
             @endif
 
 
             </li>
             <li><a href="{{ URL::action('OutcomesController@annualReport', Auth::user()->programs[0]->id) }}">Annual
-                    Reports</a></li>
+                    Results</a></li>
 
             <li>{{ HTML::linkAction('TransformativeActionsController@viewFormativeActions', 'Formative Actions') }}
 

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

@@ -44,15 +44,15 @@
 
             <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"
-                    aria-expanded="false">Reports<span class="caret"></span></a>
+                    aria-expanded="false">Results<span class="caret"></span></a>
                 <ul class="dropdown-menu" role="menu">
-                    <li>{{ HTML::linkAction('OutcomesController@schoolAssessmentReport', 'School Reports') }}</li>
+                    <li>{{ HTML::linkAction('OutcomesController@schoolAssessmentReport', 'School Results') }}</li>
                     @if (count(Auth::user()->courses))
-                        <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReport', 'My Courses\' Reports') }}
+                        <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReport', 'My Courses\' Results') }}
                         </li>
 
                     @endif
-                    <li>{{ HTML::linkAction('AnnualPlansController@selectProgramPlan', 'Annual Reports') }}</li>
+                    <li>{{ HTML::linkAction('AnnualPlansController@selectProgramPlan', 'Annual Results') }}</li>
                     <li>{{ HTML::linkAction('TransformativeActionsController@viewFormativeActions', 'Formative Actions') }}
 
                 </ul>

app/views/local/managers/shared/print_course.blade.php

@@ -16,7 +16,7 @@
 
 <p class="header-text">{{{ $grouped_courses[0]->program->name }}}</p>
 <p class="header-text">{{{ $grouped_courses[0]->name }}}</p>
-<h1 class="header-text">Assessment Report for {{{ $grouped_courses[0]->code }}}{{{ $grouped_courses[0]->number }}} ({{{ $grouped_courses[0]->semester->code }}})</h1>
+<h1 class="header-text">Assessment Results for {{{ $grouped_courses[0]->code }}}{{{ $grouped_courses[0]->number }}} ({{{ $grouped_courses[0]->semester->code }}})</h1>
 
 @stop
 

app/views/local/managers/shared/print_program.blade.php

@@ -9,7 +9,7 @@
         @endif
     @endforeach
 </p>
-<p class="header-text">Program Assessment Report</p>
+<p class="header-text">Program Assessment Results</p>
 <h1 class="header-text">{{{ $program->name}}}</h1>
 @stop
 

app/views/local/managers/shared/print_school.blade.php

@@ -9,7 +9,7 @@
         @endif
     @endforeach
 </p>
-<p class="header-text">Assessment Report</p>
+<p class="header-text">Assessment Results</p>
 <h1 class="header-text">School of {{{ $school->name}}}</h1>
 @stop
 

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

@@ -30,7 +30,7 @@
                 </li>
             @endif
             <li> {{ HTML::linkAction('ProfessorsController@program', 'Program') }}</li>
-            <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReport', 'Reports') }}</li>
+            <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReport', 'Results') }}</li>
             <li>{{ HTML::linkAction('TemplatesController@ProfIndex', 'Rubric List') }}</li>
             <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Help<span