Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
Conflicts: skolehjem/app/Http/Controllers/WashingReservationController.php
This commit is contained in:
frederikpyt
@@ -1,25 +0,0 @@
|
||||
<?php
|
||||
|
||||
//The Model to a certain Controller, should contain a class with Controller name to which it belongs.
|
||||
// Allows needed strings to passed onto the database. if there is none. class should appear empty.
|
||||
|
||||
//Reference to where the file belongs.
|
||||
|
||||
namespace App;
|
||||
|
||||
//allows the use of Model library
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
|
||||
//Class of which should extend Model Library
|
||||
class ExternalLink extends Model
|
||||
{
|
||||
/**
|
||||
* The attributes that are mass assignable.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
//protected variable which contains name of database field(s) to be filled.
|
||||
protected $fillable = [
|
||||
'name', "link"
|
||||
];
|
||||
}
|
||||
@@ -146,6 +146,18 @@ class ContactController extends Controller
|
||||
"<th style=\"width: 1em;\"><img class=\"w-100\" src=\"http://127.0.0.1:8000/images/icons/pencil.svg\" alt=\"Update\"></th>".
|
||||
"<th style=\"width: 1em;\"><img class=\"w-100\" src=\"http://127.0.0.1:8000/images/icons/trashcan.svg\" alt=\"Delete\"></th>".
|
||||
"</tr>";
|
||||
|
||||
|
||||
|
||||
if($request->isCheck === "navn")
|
||||
$users = Contact::query()->where('contactname', 'LIKE',$request->search.'%')->get();
|
||||
elseif ($request->isCheck === "titel")
|
||||
$users = Contact::query()->where('title', 'LIKE',$request->search.'%')->get();
|
||||
elseif ($request->isCheck === "email")
|
||||
$users = Contact::query()->where('email', 'LIKE',$request->search.'%')->get();
|
||||
elseif ($request->isCheck === "tf")
|
||||
$users = Contact::query()->where('phone', 'LIKE',$request->search.'%')->get();
|
||||
else
|
||||
$users = DB::table('contacts')->where('contactname', 'LIKE',$request->search.'%')
|
||||
->orWhere('title','LIKE', $request->search.'%')
|
||||
->orWhere('phone','LIKE', $request->search.'%')
|
||||
@@ -170,7 +182,7 @@ class ContactController extends Controller
|
||||
}
|
||||
}else{
|
||||
$output.='<tr>'.
|
||||
'<td>Din søgning matchede ikke nogen personer</td>'.
|
||||
'<td>Intet match</td>'.
|
||||
'<td></td>'.
|
||||
'<td></td>'.
|
||||
'<td></td>'.
|
||||
|
||||
@@ -1,130 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\ExternalLink;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Response;
|
||||
|
||||
|
||||
class ExternalLinkController extends Controller
|
||||
{
|
||||
function __construct()
|
||||
{
|
||||
$this->middleware([ "auth" ]);
|
||||
|
||||
$this->middleware("permission:link.external.list")->only("index");
|
||||
$this->middleware("permission:link.external.create")->only(["create", "store"]);
|
||||
$this->middleware("permission:link.external.show")->only("show");
|
||||
$this->middleware("permission:link.external.edit")->only(["edit", "update"]);
|
||||
$this->middleware("permission:link.external.delete")->only("destroy");
|
||||
}
|
||||
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
*
|
||||
* @param Request $request
|
||||
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
|
||||
*/
|
||||
public function index(Request $request)
|
||||
{
|
||||
$externalLink = ExternalLink::query()->paginate($request->input("limit", 20));
|
||||
|
||||
return Response::detect("external-links.index", [ "links" => $externalLink ]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the form for creating a new resource.
|
||||
*
|
||||
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
|
||||
*/
|
||||
public function create()
|
||||
{
|
||||
return Response::detect("external-links.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)
|
||||
{
|
||||
$requestBody = $request->validate([
|
||||
"name" => "required|max:255",
|
||||
"link" => "required|max:255"
|
||||
]);
|
||||
|
||||
$externalLink = new ExternalLink($requestBody);
|
||||
$saved = $externalLink->save();
|
||||
|
||||
if(!$saved){
|
||||
return Response::detect("external-links.store");
|
||||
}else{
|
||||
$externalLink = ExternalLink::query()->paginate($request->input("limit", 20));
|
||||
return Response::detect("external-links.index", ['links' => $externalLink]);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param int $id
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function show($id)
|
||||
{
|
||||
return Response::detect("external-links.show", [ "link" => $id]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
*
|
||||
* @param int $id
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function edit($id)
|
||||
{
|
||||
$link = ExternalLink::find($id);
|
||||
return Response::detect("external-links.edit", ["link" => $link]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param int $id
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function update(Request $request, $id)
|
||||
{
|
||||
$data = $request->all();
|
||||
|
||||
$link = ExternalLink::find($id);
|
||||
$link->update($data);
|
||||
$saved = $link->save();
|
||||
|
||||
if(!$saved){
|
||||
return Response::detect("external-links.update", [ "link" => $link]);
|
||||
}else{
|
||||
$externalLink = ExternalLink::query()->paginate($request->input("limit", 20));
|
||||
return Response::detect("external-links.index", ['links' => $externalLink]);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param int $id
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function destroy($id)
|
||||
{
|
||||
$link = ExternalLink::find($id);
|
||||
$link->delete();
|
||||
return redirect()->route("external-links.index");
|
||||
}
|
||||
}
|
||||
@@ -67,15 +67,13 @@ class WashingReservationController extends Controller
|
||||
|
||||
$machineReservation = new WashingReservation($data);
|
||||
$machineReservation->user_id = auth()->user()->id;
|
||||
$machineReservation->save();
|
||||
|
||||
$saved = $machineReservation->save();
|
||||
$allMachineReservations = WashingReservation::query()->where('time', '=', $request->time)->where('machine_id', '=', $request->machine_id)->get();
|
||||
|
||||
if (!$saved) {
|
||||
return Response::detect("washing-reservations.store", [
|
||||
"washing_reservation" => $machineReservation
|
||||
]);
|
||||
if (count($allMachineReservations) > 0) {
|
||||
return redirect()->route("washing-reservations.create", ["washing_reservation" => $machineReservation])->with('ReservationExists', '<p class="text-center"><b>Der findes allerede en reservation til denne tid, men denne vaskemaskine!</b></p>');
|
||||
} else {
|
||||
$machineReservation->save();
|
||||
$reservations = WashingReservation::query()->paginate($request->input("limit", 20));
|
||||
|
||||
return redirect()->route('washing-reservations.appindex', ["reservations" => $reservations]);
|
||||
@@ -175,7 +173,7 @@ class WashingReservationController extends Controller
|
||||
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);
|
||||
}
|
||||
@@ -232,7 +230,6 @@ class WashingReservationController extends Controller
|
||||
'<td></td>'.
|
||||
'<td></td>'.
|
||||
'<td></td>'.
|
||||
'<td></td>'.
|
||||
'</tr>';
|
||||
}
|
||||
return Response($output);
|
||||
|
||||
Reference in New Issue
Block a user