Update Laravel to 7.0

This commit is contained in:
George Frederick "Buzz" Beurling
2020-06-20 17:03:30 -04:00
parent f104c1b61b
commit 8866cafd31
57 changed files with 8739 additions and 2281 deletions

View File

@@ -3,6 +3,7 @@
namespace App\Http\Controllers;
use App\Event;
use App\GoogleDriveFile;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
@@ -38,7 +39,25 @@ class EventController extends Controller
{
$event = new Event();
if (\App\GoogleDriveFile::checkConfig())
{
if (\request()->hasFile('files'))
{
$dir = \App\GoogleDriveFile::findByPath('.Systeme/.Fichier/.MessageDeLaSemaine');
$files = [];
foreach (\request()->file('files') as $f)
{
$name = urlencode(pathinfo($f->getClientOriginalName())['filename'].'_'.uniqid().'.'.$f->getClientOriginalExtension());
\Storage::cloud()->putFileAs($dir->id,$f,$name);
array_push($files,$name);
}
$event->weekly_msg_file = $files;
}
else
{
$event->weekly_msg_file = [''];
}
}
$event->name = request('name');
$event->date_begin = request('begin_time');
@@ -58,7 +77,7 @@ class EventController extends Controller
if(\request("use_weekly_msg"))
{
$event->use_weekly_msg = 1;
$event->msg = request('msg');
$event->msg = request('admin_desc');
}
else
{
@@ -132,15 +151,23 @@ class EventController extends Controller
{
$course->name = request('name_n'.$l.'_p'.$p);
$course->ocom = request('ocom_n'.$l.'_p'.$p);
$course->comment = "";
$course->desc = "";
}
else
{
$course->name = "";
$course->ocom = "";
$course->comment = request('desc_n'.$l.'_p'.$p);
if (request('desc_n'.$l.'_p'.$p) == null)
{
$course->desc = "";
}
else
{
$course->desc = request('desc_n'.$l.'_p'.$p);
}
}
$course->comment_officer = "";
$course->comment = "";
$course->save();
$ocom = \App\OCOM::where('ocom','=',request('ocom_n'.$l.'_p'.$p))->first();
@@ -251,7 +278,7 @@ class EventController extends Controller
$course->location = request('loc_n'.$l.'_p'.$p);
$course->periode = $p;
$course->level = $l;
$course->comment_officer = "";
$course->comment = "";
$course->event_id = $event->id;