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

Permission fixes and washing reservation fixes

Browse Source
This commit is contained in:
frederikpyt
2020-07-29 11:53:37 +02:00
parent fc0f97b04e
commit 569ace008a
11 changed files with 73 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/app/Http/Controllers/CalendarController.php
-12
View File
@@ -1,12 +0,0 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
class CalendarController extends Controller
{
// public function index()
}
skolehjem/app/Http/Controllers/CalendarDateController.php
-95
View File
@@ -1,95 +0,0 @@
<?php
//
//namespace App\Http\Controllers;
//
//use App\CalendarDate;
//use Illuminate\Http\Request;
//
//class CalendarDateController extends Controller
//{
// /**
// * Display a listing of the resource.
// *
// * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
// */
// public function index(Request $request)
// {
// $calendarDates = CalendarDate::query()->paginate($request->input("limit", 20));
//
// return view("calendar-date.index", [
// "calendarDates" => $calendarDates
// ]);
// }
//
// /**
// * Show the form for creating a new resource.
// *
// * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
// */
// public function create()
// {
// return view("calendar-date.create");
// }
//
// /**
// * Store a newly created resource in storage.
// *
// * @param \Illuminate\Http\Request $request
// * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
// */
// public function store(Request $request)
// {
// $fields = $request->validate([
// "" => ""
// ]);
//
// $calendarDate = new CalendarDate()
//
// return view("calendar-date.store");
// }
//
// /**
// * Display the specified resource.
// *
// * @param int $id
// * @return \Illuminate\Http\Response
// */
// public function show($id)
// {
// //
// }
//
// /**
// * Show the form for editing the specified resource.
// *
// * @param int $id
// * @return \Illuminate\Http\Response
// */
// public function edit($id)
// {
// //
// }
//
// /**
// * Update the specified resource in storage.
// *
// * @param \Illuminate\Http\Request $request
// * @param int $id
// * @return \Illuminate\Http\Response
// */
// public function update(Request $request, $id)
// {
// //
// }
//
// /**
// * Remove the specified resource from storage.
// *
// * @param int $id
// * @return \Illuminate\Http\Response
// */
// public function destroy($id)
// {
// //
// }
//}
skolehjem/app/Http/Controllers/RolesController.php
+11
View File
@@ -9,6 +9,17 @@ use Spatie\Permission\Models\Role;
class rolesController extends Controller
{
public function __construct()
{
$this->middleware([ "auth" ]);
$this->middleware([ "check.auth:roles.list" ])->only("index");
$this->middleware([ "check.auth:roles.show" ])->only("show");
$this->middleware([ "check.auth:roles.create" ])->only("create", "store");
$this->middleware([ "check.auth:roles.edit" ])->only("edit", "update");
$this->middleware([ "check.auth:roles.delete" ])->only("delete");
}
/**
* Display a listing of the resource.
*
skolehjem/app/Http/Controllers/UserController.php
+1
View File
@@ -227,6 +227,7 @@ class UserController extends Controller
if(Auth::attempt($data)) {
//TODO: Implement home?
return redirect()->route("root.index");
}
skolehjem/app/Http/Controllers/WashingReservationController.php
+17 -6
View File
@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
use App\WashingMachine;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\View\Factory;
use Illuminate\Foundation\Auth\User;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
@@ -46,7 +47,8 @@ class WashingReservationController extends Controller
public function create()
{
$machines = WashingMachine::all();
return Response::detect("washing-reservations.create", [ 'machines' => $machines ]);
$users = User::all();
return Response::detect("washing-reservations.create", [ 'machines' => $machines, 'users' => $users ]);
}
/**
@@ -59,7 +61,8 @@ class WashingReservationController extends Controller
{
$data = $request->validate([
"time" => "required",
"machine" => "required"
"machine_id" => "required|unique:washing_reservations,machine_id,NULL,id,time,' . $request->time",
"user_id" => "required"
]);
$machineReservation = new WashingReservation($data);
@@ -67,14 +70,14 @@ class WashingReservationController extends Controller
$saved = $machineReservation->save();
if(!$saved){
if (!$saved) {
return Response::detect("washing-reservations.store", [
"washing_reservation" => $machineReservation
]);
}else{
} else {
$reservations = WashingReservation::query()->paginate($request->input("limit", 20));
return Response::detect("washing-reservations.index", [ "reservations" => $reservations]);
return Response::detect("washing-reservations.index", ["reservations" => $reservations]);
}
}
@@ -160,7 +163,15 @@ class WashingReservationController extends Controller
$machines = WashingMachine::all();
$output = json_encode(['date' => $date, 'washingmachines' => $machines]);
$reservations = WashingReservation::query()->where("time", "LIKE", substr($date, 1, strpos($date, "T"))."%")->get();
$times = [];
foreach ($reservations as $reservation){
array_push($times, $reservation->time);
}
//2020-07-28%
$output = json_encode(['date' => $date, 'washingmachines' => $machines, 'unavailable_times' => $times]);
return Response($output);
}
}
skolehjem/app/WashingReservation.php
+1 -1
View File
@@ -14,6 +14,6 @@ class WashingReservation extends Model
{
//protected variable which contains name of database field(s) to be filled.
protected $fillable = [
'time', 'machine'
'time', 'machine_id', 'user_id'
];
}