Working schedule v2

This commit is contained in:
Mathieu Lagace
2020-07-30 17:46:11 -04:00
parent 8d22092ea8
commit 4c5d635d5b
25 changed files with 1174 additions and 497 deletions

View File

@@ -59,19 +59,27 @@ class Course extends Model
public function instructor()
{
if (\App\User::find($this->user_id))
{
if (\App\User::find($this->user_id)) {
return \App\User::find($this->user_id)->fullname();
}
else
{
} else {
return $this->user_id;
}
}
public function ocom()
{
if ($this->ocom != null) {
$ocom = \App\OCOM::findByOCOM($this->ocom);
if ($ocom != null) {
return $ocom;
}
}
return null;
}
public function event()
{
return $this->belongsTo('App\Event');
return $this->belongsTo('App\Event');
}
public function logs()
@@ -92,10 +100,8 @@ class Course extends Model
public static function allFuture()
{
$courses = Course::all();
foreach ($courses as $key => $course)
{
if (date('c',strtotime($course->event->date_begin)) <= date('c'))
{
foreach ($courses as $key => $course) {
if (date('c', strtotime($course->event->date_begin)) <= date('c')) {
$courses->forget($key);
}
}
@@ -105,14 +111,11 @@ class Course extends Model
public static function allThisYear()
{
$courses = Course::all();
foreach ($courses as $key => $course)
{
if (date('c',strtotime($course->event->date_begin)) <= date('c',strtotime(\App\Config::getData('instruction_year_begin'))))
{
foreach ($courses as $key => $course) {
if (date('c', strtotime($course->event->date_begin)) <= date('c', strtotime(\App\Config::getData('instruction_year_begin')))) {
$courses->forget($key);
}
if (date('c',strtotime($course->event->date_begin)) >= date('c',strtotime(\App\Config::getData('instruction_year_end'))))
{
if (date('c', strtotime($course->event->date_begin)) >= date('c', strtotime(\App\Config::getData('instruction_year_end')))) {
$courses->forget($key);
}
}
@@ -122,10 +125,8 @@ class Course extends Model
public static function allForUser($user_id)
{
$courses = Course::all();
foreach ($courses as $key => $course)
{
if ($course->user_id != $user_id)
{
foreach ($courses as $key => $course) {
if ($course->user_id != $user_id) {
$courses->forget($key);
}
}
@@ -140,14 +141,11 @@ class Course extends Model
public static function allFutureForUser($user_id)
{
$courses = Course::all();
foreach ($courses as $key => $course)
{
if (date('c',strtotime($course->event->date_begin)) <= date('c'))
{
foreach ($courses as $key => $course) {
if (date('c', strtotime($course->event->date_begin)) <= date('c')) {
$courses->forget($key);
}
if ($course->user_id != $user_id)
{
if ($course->user_id != $user_id) {
$courses->forget($key);
}
}