vict3459/Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master

Browse Source
This commit is contained in:
Neerholt
2020-08-25 14:07:29 +02:00
parent e758a3ddac 5a1c1ee6fd
commit f5e3e0c6e0
4 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/app/Http/Controllers/EventController.php
+6 -1
View File
@@ -33,7 +33,12 @@ class EventController extends Controller
*/
public function index(Request $request)
{
DB::table('events')->where('date', '<=', date('Y-m-d H:i', strtotime('-1 day')))->delete();
DB::table('user_events')
->where('event_id')
->delete();
DB::table('events')
->where('events.date', '<=', date('Y-m-d H:i', strtotime('-1 day')))
->delete();
$events = Event::query()->orderBY('date' , 'asc')->paginate($request->input("limit", 20));
skolehjem/app/Http/Controllers/WashingReservationController.php
+6
View File
@@ -15,6 +15,8 @@ use App\WashingReservation;
use Illuminate\Support\Facades\DB;
use Illuminate\View\View;
date_default_timezone_set('Europe/Copenhagen');
class WashingReservationController extends Controller
{
public function __construct()
@@ -37,6 +39,8 @@ class WashingReservationController extends Controller
*/
public function index(Request $request)
{
WashingReservation::query()->where('time', '<', date('Y-m-d H:i:s', strtotime('-1 hour')))->delete();
$reservations = WashingReservation::query()->orderBY('time' , 'asc')->paginate($request->query("limit", 20));
return Response::detect("washing-reservations.index", [ "reservations" => $reservations]);
@@ -260,6 +264,8 @@ class WashingReservationController extends Controller
public function appindex(Request $request)
{
WashingReservation::query()->where('time', '<', date('Y-m-d H:i:s', strtotime('-1 hour')))->delete();
$reservations = WashingReservation::query()->where("user_id", "=", auth()->user()->id)->orderBY('time' , 'asc')->paginate($request->query("limit", 20));
return Response::detect("washing-reservations.index", [ "reservations" => $reservations]);