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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anders
2020-08-06 14:47:28 +02:00
parent 708313a4b3 c472ae80fa
commit 1b7738fd09
46 changed files with 961 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/app/Http/Controllers/ContactController.php
+1 -1
View File
@@ -57,7 +57,7 @@ class ContactController extends Controller
"contactname" => "required|max:255",
"title" => "required|max:255",
"email" => "required|max:255",
"phone" => "required|max:255",
"phone" => "max:255",
]);
$contact = new Contact($requestContact);
skolehjem/app/Http/Controllers/GuideController.php
+7 -7
View File
@@ -9,18 +9,18 @@ use Illuminate\Http\Request;
class GuideController extends Controller
{
/*
public function __construct()
{
$this->middleware([ "auth" ]);
$this->middleware([ "check.auth:contact.list" ])->only("index");
$this->middleware([ "check.auth:contact.show" ])->only("show");
$this->middleware([ "check.auth:contact.create" ])->only("create", "store");
$this->middleware([ "check.auth:contact.edit" ])->only("edit", "update");
$this->middleware([ "check.auth:contact.delete" ])->only("delete");
$this->middleware([ "check.auth:guides.list" ])->only("index");
$this->middleware([ "check.auth:guides.show" ])->only("show");
$this->middleware([ "check.auth:guides.create" ])->only("create", "store");
$this->middleware([ "check.auth:guides.edit" ])->only("edit", "update");
$this->middleware([ "check.auth:guides.delete" ])->only("delete");
}
*/
/**
skolehjem/app/Http/Controllers/LocationController.php
+133
View File
@@ -0,0 +1,133 @@
<?php
namespace App\Http\Controllers;
use App\Location;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
class LocationController extends Controller
{
public function __construct()
{
$this->middleware([ "auth" ]);
$this->middleware([ "check.auth:locations.list" ])->only("index");
$this->middleware([ "check.auth:locations.show" ])->only("show");
$this->middleware([ "check.auth:locations.create" ])->only("create", "store");
$this->middleware([ "check.auth:locations.edit" ])->only("edit", "update");
$this->middleware([ "check.auth:locations.delete" ])->only("delete");
}
/**
* Display a listing of the resource.
*
* @param Request $request
* @return \Illuminate\Http\Response
*/
public function index(Request $request)
{
$locations = Location::query()->paginate($request->input("limit", 20));
return Response::detect("locations.index", [ "locations" => $locations ]);
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
{
return Response::detect("locations.create");
}
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
{
$data = $request->validate([
"name" => "required",
]);
$location = new Location($data);
$locations = Location::query()->where('name', '=', $request->name)->get();
// If there already is a washing machine with that name, then don't add it
if (count($locations) > 0)
return redirect()->route("locations.store")->with('NameExists', '<p><b>Der findes allerede en lokation med det navn!</b></p>');
else { // Else - Add it
$location->save();
$locations = Location::query()->paginate($request->input("limit", 20));
return redirect()->route("locations.index", ['locations' => $locations]);
}
}
/**
* Display the specified resource.
*
* @param \App\Location $location
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function show(Location $location)
{
return view("admin.locations.show", [ "location" => $location]);
}
/**
* Show the form for editing the specified resource.
*
* @param \App\Location $location
* @return \Illuminate\Http\Response
*/
public function edit(Location $location)
{
return Response::detect("locations.edit", [ "location" => $location] );
}
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param \App\Location $location
* @return \Illuminate\Http\Response
*/
public function update(Request $request, $id)
{
$data = $request->validate([
"name" => "required",
]);
$location = Location::find($id);
$allMachines = Location::query()->where('name', '=', $request->name)->where('id', '!=', $id)->get();
// If there already is a washing machine with that name, then don't change it
if (count($allMachines) > 0)
return redirect()->route("locations.store")->with('NameExists', '<p><b>Der findes allerede en lokation med det navn!</b></p>');
else { // Else - Change the name
$location->update($data);
$location->save();
$locations = Location::query()->paginate($request->input("limit", 20));
return redirect()->route("locations.index", ["locations" => $locations]);
}
}
/**
* Remove the specified resource from storage.
*
* @param \App\Location $location
* @return \Illuminate\Http\Response
*/
public function destroy(Location $location)
{
}
}
skolehjem/app/Http/Controllers/NewsController.php
+116
View File
@@ -0,0 +1,116 @@
<?php
namespace App\Http\Controllers;
use App\News;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
class NewsController extends Controller
{
public function __construct()
{
$this->middleware([ "auth" ]);
$this->middleware([ "check.auth:news.list" ])->only("index");
$this->middleware([ "check.auth:news.show" ])->only("show");
$this->middleware([ "check.auth:news.create" ])->only("create", "store");
$this->middleware([ "check.auth:news.edit" ])->only("edit", "update");
$this->middleware([ "check.auth:news.delete" ])->only("delete");
}
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index(Request $request)
{
$news = News::query()->paginate($request->input("limit", 20));
return Response::detect("news.index", [ "news" => $news ]);
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
{
return Response::detect("news.create");
}
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\RedirectResponse
*/
public function store(Request $request)
{
$data = $request->validate([
"name" => "required",
"content" => "required"
]);
$news = new News($data);
$news->save();
return redirect()->route("news.index");
}
/**
* Display the specified resource.
*
* @param \App\News $news
* @return \Illuminate\Http\Response
*/
public function show(News $news)
{
//
}
/**
* Show the form for editing the specified resource.
*
* @param \App\News $news
* @return \Illuminate\Http\Response
*/
public function edit(News $news)
{
return Response::detect("news.edit", [ "news" => $news ]);
}
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param \App\News $news
* @return \Illuminate\Http\RedirectResponse
*/
public function update(Request $request, News $news)
{
$data = $request->validate([
"name" => "required",
"content" => "required"
]);
$news->update($data);
return redirect()->route("news.index");
}
/**
* Remove the specified resource from storage.
*
* @param \App\News $news
* @return \Illuminate\Http\RedirectResponse
* @throws \Exception
*/
public function destroy(News $news)
{
$news->delete();
return redirect()->route("news.index");
}
}
skolehjem/app/Http/Controllers/UserController.php
+2 -7
View File
@@ -53,7 +53,6 @@ class UserController extends Controller
{
$roles = Role::all();
return Response::detect("users.create", ['roles' => $roles]);
}
/**
@@ -169,9 +168,7 @@ class UserController extends Controller
}
$users = User::query()->paginate(20);
return Response::detect("users.index", [
"users" => $users
]);
return redirect()->route("users.index");
}
/**
@@ -309,9 +306,7 @@ class UserController extends Controller
}
$users = User::query()->paginate(20);
return Response::detect("users.index", [
"users" => $users
]);
return redirect()->route("users.index");
}
public function search(Request $request){
skolehjem/app/Http/Controllers/WashingMachineController.php
+13 -10
View File
@@ -2,6 +2,7 @@
namespace App\Http\Controllers;
use App\Location;
use App\WashingReservation;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\View\Factory;
@@ -44,7 +45,9 @@ class WashingMachineController extends Controller
*/
public function create()
{
return Response::detect("washing-machines.create");
$locations = Location::all();
return Response::detect("washing-machines.create", ["locations" => $locations] );
}
/**
@@ -56,12 +59,13 @@ class WashingMachineController extends Controller
public function store(Request $request)
{
$data = $request->validate([
"name" => "required"
"name" => "required",
"location_id" => "required"
]);
$machine = new WashingMachine($data);
$allMachines = WashingMachine::query()->where('name', '=', $request->name)->get();
$allMachines = WashingMachine::query()->where('name', '=', $request->name)->where('location_id', "=", $request->location_id)->get();
// If there already is a washing machine with that name, then don't add it
if (count($allMachines) > 0)
@@ -81,11 +85,7 @@ class WashingMachineController extends Controller
*/
public function show($id)
{
$machine = WashingMachine::find($id);
return Response::detect("washing-machines.show", [
"machine" => $machine
]);
}
/**
@@ -97,9 +97,11 @@ class WashingMachineController extends Controller
public function edit($id)
{
$machine = WashingMachine::find($id);
$locations = Location::all();
return Response::detect("washing-machines.edit", [
"machine" => $machine
"machine" => $machine,
"locations" => $locations
]);
}
@@ -113,13 +115,14 @@ class WashingMachineController extends Controller
public function update(Request $request, $id)
{
$data = $request->validate([
"name" => "required"
"name" => "required",
"location_id" => "required",
]);
$machine = WashingMachine::find($id);
$allMachines = WashingMachine::query()->where('name', '=', $request->name)->where('id', '!=', $id)->get();
$allMachines = WashingMachine::query()->where('name', '=', $request->name)->where('location_id', "=", $request->location_id)->where('id', '!=', $id)->get();
// If there already is a washing machine with that name, then don't change it
if (count($allMachines) > 0)
skolehjem/app/Http/Controllers/WashingReservationController.php
+9 -26
View File
@@ -2,6 +2,7 @@
namespace App\Http\Controllers;
use App\Location;
use App\WashingMachine;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\View\Factory;
@@ -103,10 +104,7 @@ class WashingReservationController extends Controller
*/
public function edit($id)
{
$reservation = WashingReservation::query()->find($id);
$machines = WashingMachine::all();
return Response::detect("washing-reservations.edit", ['washing_reservation' => $reservation, 'machines' => $machines ]);
}
/**
@@ -118,26 +116,7 @@ class WashingReservationController extends Controller
*/
public function update(Request $request, $id)
{
$data = $request->validate([
"time" => "required",
"machine" => "required"
]);
$machineReservation = WashingReservation::find($id);
$machineReservation->update($data);
$saved = $machineReservation->save();
if(!$saved){
return Response::detect("washing-reservations.update", [
"washing_reservation" => $machineReservation
]);
}else{
$reservations = WashingReservation::query()->paginate($request->query("limit", 20));
return Response::detect("washing-reservations.index", [ "reservations" => $reservations]);
}
}
/**
@@ -164,10 +143,13 @@ class WashingReservationController extends Controller
$date = $request->date;
$datetext = $request->datetext;
$machines = WashingMachine::all();
if($request->location_id == 0)
$request->location_id = Location::all()->first()->id;
$machines = WashingMachine::query()->where("location_id", "=", $request->location_id)->orderBy("name", "asc")->get();
if($request->machine_id == 0)
$request->machine_id = WashingMachine::all()->first()->id;
$request->machine_id = WashingMachine::query()->orderBy("name", "asc")->first()->id;
$reservations = WashingReservation::query()->where("machine_id", "=", $request->machine_id)->where("time", "LIKE", $datetext."%")->get();
@@ -177,7 +159,9 @@ class WashingReservationController extends Controller
array_push($times, $reservation->time);
}
$output = json_encode(['date' => $date, 'washingmachines' => $machines, 'unavailable_times' => $times ]);
$locations = Location::query()->orderBy("name", "asc")->get();
$output = json_encode(['date' => $date, 'washingmachines' => $machines, 'unavailable_times' => $times, "locations" => $locations ]);
return Response($output);
}
}
@@ -246,4 +230,3 @@ class WashingReservationController extends Controller
return Response::detect("washing-reservations.index", [ "reservations" => $reservations]);
}
}