Update dashboard

This commit is contained in:
Mathieu Lagace
2020-07-30 18:42:43 -04:00
parent 4c5d635d5b
commit 65876e5b78
7 changed files with 81 additions and 72 deletions

View File

@@ -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();
}