diff --git a/app/Http/Controllers/EventController.php b/app/Http/Controllers/EventController.php index 68e14510..801ccf98 100644 --- a/app/Http/Controllers/EventController.php +++ b/app/Http/Controllers/EventController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers; +use App\Course; use App\Event; use App\EventType; use App\GoogleDriveFile; @@ -86,7 +87,7 @@ class EventController extends Controller else { $event->use_weekly_msg = 0; - $event->weekly_msg_publication_time = null; + $event->weekly_msg_publication_time = ""; $event->msg = ""; } @@ -267,7 +268,7 @@ class EventController extends Controller else { $event->use_weekly_msg = 0; - $event->weekly_msg_publication_time = null; + $event->weekly_msg_publication_time = ""; $event->msg = ""; } @@ -315,6 +316,10 @@ class EventController extends Controller for ($p=1; $p < $nbPeriode; $p++) { $course = $event->course($p,$l); + if ($course == null) + { + $course = new Course(); + } $users = \App\User::all(); $instructor = request('instruc_n'.$l.'_p'.$p); @@ -325,7 +330,6 @@ class EventController extends Controller $instructor = $user->id; } } - $course->user_id = $instructor; $course->location = request('location_n'.$l.'_p'.$p); $course->periode = $p; @@ -391,28 +395,30 @@ class EventController extends Controller $event = Event::findOrFail($id); $model = $event->schedule; $default_value = []; - foreach ($model['periodes'] as $periode_index => $periode) - { - $niveau_array = []; - foreach ($model['niveaux'] as $niveau_index => $niveau) + if ($event->use_schedule == 1) { + foreach ($model['periodes'] as $periode_index => $periode) { - $course = $event->course($periode_index+1,$niveau_index+1); - $use_course = "on"; - if ($course->name == null) { - $use_course = "off"; + $niveau_array = []; + foreach ($model['niveaux'] as $niveau_index => $niveau) + { + $course = $event->course($periode_index+1,$niveau_index+1); + $use_course = "on"; + if ($course->name == null) { + $use_course = "off"; + } + array_push($niveau_array,[ + 'ocom' => $course->ocom, + 'name' => $course->name, + 'location' => $course->location, + 'instructor' => $course->instructor(), + 'desc' => $course->desc, + 'use_course' => $use_course + ]); } - array_push($niveau_array,[ - 'ocom' => $course->ocom, - 'name' => $course->name, - 'location' => $course->location, - 'instructor' => $course->instructor(), - 'desc' => $course->desc, - 'use_course' => $use_course - ]); + array_push($default_value,$niveau_array); } - array_push($default_value,$niveau_array); + $model['default_value'] = $default_value; } - $model['default_value'] = $default_value; $event->schedule_model = $model; return $event->toArray(); } diff --git a/app/News.php b/app/News.php index 6cdaac1b..edfef7f3 100644 --- a/app/News.php +++ b/app/News.php @@ -3,6 +3,7 @@ namespace App; use Illuminate\Database\Eloquent\Model; +use Illuminate\Support\Facades\Date; /** * App\News @@ -63,7 +64,10 @@ class News extends Model { if($event->use_weekly_msg == 1) { - $news->push(self::getWeeklyMsg($event)); + if (strtotime($event->weekly_msg_publication_time) <= time()) + { + $news->push(self::getWeeklyMsg($event)); + } } } diff --git a/config/version.yml b/config/version.yml index 96688756..233416bd 100644 --- a/config/version.yml +++ b/config/version.yml @@ -5,7 +5,7 @@ current: major: 3 minor: 2 patch: 5 - prerelease: 10-g8d22092e + prerelease: 11-g4c5d635d buildmetadata: '' commit: 41845 timestamp: diff --git a/resources/views/admin/dashboard.blade.php b/resources/views/admin/dashboard.blade.php index 7288dd19..10bbba9e 100644 --- a/resources/views/admin/dashboard.blade.php +++ b/resources/views/admin/dashboard.blade.php @@ -21,7 +21,11 @@