Ultimas ediciones de Jose en junio

app/controllers/ActivitiesController.php

@@ -135,7 +135,8 @@ class ActivitiesController extends \BaseController {
         }
             // Added the function htmlspecialchars to activity name string because it was corrupting Jquery code while using quotes on page rendering. - Carlos R Caraballo 1/18/2019
         $title = $course->code.$course->number.'-'.$course->section.': '.htmlspecialchars($activity->name, ENT_QUOTES).' <span class="small attention">('.$course->semester->code.')</span>';
-        $outcomes = Outcome::orderBy('name', 'asc')->get();
+        //$outcomes = Outcome::orderBy('name', 'asc')->get();
+        $outcomes = Outcome::active();
         $outcomes_achieved = json_decode($activity->outcomes_achieved, true);
         $outcomes_attempted = json_decode($activity->outcomes_attempted, true);
 

app/models/Outcome.php

@@ -24,4 +24,11 @@ class Outcome extends Eloquent
 	    return $this->hasMany('Objective');
 //		return $this->belongsToMany('Objective', 'objective_outcome');
 	}
+
+	public static function active()
+    {
+        //TODO: Check when semester doesnt exist or session is empty
+        $selected_semester = Semester::find(Session::get('semesters_ids')[0]);
+        return Outcome::withTrashed()->where('deactivation_date', '>=', $selected_semester->start)->orWhere('deactivation_date', null)->orderBy('name', 'ASC')->get();
+    }
 }

bootstrap/start.php

@@ -26,7 +26,7 @@ $app = new Illuminate\Foundation\Application;
 
 $env = $app->detectEnvironment(array(
 
-	'local' => array(gethostname(), 'RPV20111.rrp.campus', 'homestead'),
+	'local' => array(gethostname(), 'ubuntu', 'RPV20111.rrp.campus', 'homestead'),
     'production' => array('*.com', '*.edu', '*.org'),
 
 ));