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

v1.3.3 - Added comments and removed code

This commit is contained in:
frederikpyt 2020-09-22 08:56:03 +02:00
parent 13197b8be8
commit cc3d78200a
11 changed files with 31 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
skolehjem/app/Http/Controllers/EventController.php
View File

@ -277,6 +277,7 @@ class EventController extends Controller
}
}
//Used for checking if the currently typed event name is unique. Create version
public function nameCheck(Request $request){
$event = Event::query()->where('name', 'LIKE',$request->nameCheck)->get();
if(count($event) > 0 && $request->nameCheck !== NULL){
@ -284,6 +285,7 @@ class EventController extends Controller
}
}
//Used for checking if the currently typed event name is unique. Edit version
public function nameCheckUpdate(Request $request){
$event = Event::query()->where('name', 'LIKE',$request->nameCheck)->where('id', '!=', $request->id)->get();
if(count($event) > 0 && $request->nameCheck !== NULL){

41
skolehjem/app/Http/Controllers/FeedbackController.php
View File

@ -127,45 +127,6 @@ class FeedbackController extends Controller
return redirect()->route("feedbacks.index");
}
public function search(Request $request){
if($request->ajax()){
$output = "<tr>".
"<th style='width: 6em;'>Dato</th>".
"<th>Feedback Besked</th>".
"<th style='width: 7em;'>Feedback type</th>".
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/trashcan.svg')." alt=\"Delete\"></th>".
"</tr>";
//$value = Feedbacks::query('feedbacks')->select('suggestion_form ')->dump();
//$value = DB::table('feedbacks')->select('suggestion_form ')->dump();
if($request->option === "Ris" || $request->option === "Ros" || $request->option === "Andet")
$feedbacks = Feedbacks::query()->orderBy('created_at', 'desc')->where('suggestion_form', '=', $request->option)
->get();
else
$feedbacks = Feedbacks::all();
if(count($feedbacks) !== 0){
foreach ($feedbacks as $key => $feedback){
$output.='<tr>'.
'<td>' . date('d-m-Y', strtotime($feedback->created_at)) . '</td>'.
'<td>' . $feedback->message . '</td>'.
'<td>' . $feedback->suggestion_form . '</td>'.
'<td><form method="post" action="' .route("feedbacks.destroy", [ "feedback" => $feedback ]). '" class="w-100 nostyle">'.
csrf_field().
method_field("delete").
'<button class="w-100 nostyle" onclick="return confirm(\'Are you sure you want to delete?\');" type="submit"><img class="w-100 cursor-pointer" src="'. asset('/images/icons/trashcan-dark.svg') . '" alt="Delete"></button>'.
'</form>'.
'</td>'.
'</tr>';
}
}
return Response($output);
}
}
public function storeajax(Request $request) {
$requestBody = $request->validate([
"message" => "required",
@ -175,6 +136,4 @@ class FeedbackController extends Controller
$feedbacks = new Feedbacks($requestBody);
$feedbacks->save();
}
}

6
skolehjem/app/Http/Controllers/GuideController.php
View File

@ -63,6 +63,7 @@ class GuideController extends Controller
$guide = new Guide($requestGuide);
//If an image has been uploaded, store the file
if($request->file("resource")) {
$guide->resource_id = ResourceController::store($request)->id;
}
@ -179,6 +180,7 @@ class GuideController extends Controller
return redirect()->route("guides.index");
}
//Used to fix html, that have been substringed
public function closetags($html) {
preg_match_all('#<(?!meta|img|br|hr|input\b)\b([a-z]+)(?: .*)?(?<![/|/ ])>#iU', $html, $result);
$openedtags = $result[1];
@ -199,8 +201,7 @@ class GuideController extends Controller
return $html;
}
//Used for checking if the currently typed guide name is unique. Create version
public function nameCheck(Request $request) {
$guide = Guide::query()->where('name', 'LIKE',$request->nameCheck)->get();
if(count($guide) > 0 && $request->nameCheck !== NULL){
@ -208,6 +209,7 @@ class GuideController extends Controller
}
}
//Used for checking if the currently typed guide name is unique. Edit version
public function nameCheckUpdate(Request $request) {
$guide = Guide::query()->where('name', 'LIKE',$request->nameCheck)->where('id', '!=', $request->id)->get();
if(count($guide) > 0 && $request->nameCheck !== NULL){

2
skolehjem/app/Http/Controllers/GuidesCategoryController.php
View File

@ -132,6 +132,7 @@ class GuidesCategoryController extends Controller
return redirect()->route("guides.index");
}
//Used for checking if the currently typed Guide Category name is unique. Create version
public function nameCheck(Request $request) {
$guide = GuidesCategory::query()->where('guidesCategoryName', 'LIKE',$request->nameCheck)->get();
if(count($guide) > 0 && $request->nameCheck !== NULL){
@ -139,6 +140,7 @@ class GuidesCategoryController extends Controller
}
}
//Used for checking if the currently typed Guide Category name is unique. Edit version
public function nameCheckUpdate(Request $request) {
$guide = GuidesCategory::query()->where('guidesCategoryName', 'LIKE',$request->nameCheck)->where('id', '!=', $request->id)->get();
if(count($guide) > 0 && $request->nameCheck !== NULL){

1
skolehjem/app/Http/Controllers/MenuPlanController.php
View File

@ -156,6 +156,7 @@ class MenuPlanController extends Controller
$menuPlans = MenuPlan::query()->paginate(20);
//Create news
if($request->newsoption == true){
$news = new News();

5
skolehjem/app/Http/Controllers/RolesController.php
View File

@ -104,6 +104,7 @@ class RolesController extends Controller
*/
public function edit($id)
{
//Disables editing of roles: Administrator & Bruger
if($id == 1 || $id == 2)
return redirect()->route("roles.index");
@ -150,6 +151,7 @@ class RolesController extends Controller
$allRoles = Role::query()->where('name', '=', $request->name)->where('id', '!=', $id)->get();
//Check if role already exist if not save
if(count($allRoles) > 0){
return redirect()->route("roles.index", [ "role" => $role ]);
}else{
@ -170,6 +172,7 @@ class RolesController extends Controller
*/
public function destroy($id)
{
//Disables deletion of roles: Administrator & Bruger
if($id == 1 || $id == 2)
return redirect()->route("roles.index");
@ -178,6 +181,7 @@ class RolesController extends Controller
return redirect()->route("roles.index");
}
//Used for checking if the currently typed role name is unique. Create version
public function nameCheck(Request $request){
$roles = Role::query()->where('name', 'LIKE',$request->nameCheck)->get();
if(count($roles) > 0 && $request->nameCheck !== NULL){
@ -185,6 +189,7 @@ class RolesController extends Controller
}
}
//Used for checking if the currently typed role name is unique. Edit version
public function nameCheckUpdate(Request $request){
$roles = Role::query()->where('name', 'LIKE',$request->nameCheck)->where('id', '!=', $request->id)->get();
if(count($roles) > 0 && $request->nameCheck !== NULL){

3
skolehjem/app/Http/Controllers/RootController.php
View File

@ -18,8 +18,10 @@ class RootController extends Controller
public function index() {
$perPage = 5;
//All news
$newsCollection = News::query()->orderBy('id', 'desc')->paginate($perPage);
//Runs through all the news and deletes the old stuff
foreach ($newsCollection as $new)
{
if($new->type_id == 3)
@ -27,6 +29,7 @@ class RootController extends Controller
$new->delete();
}
//Return either the admin or app index page without the old news
if(auth()->user()->can('admin.panel.show')) {
if(Response::detect("root.index")->name() == "admin.root.index")
return view("admin.root.index");

15
skolehjem/app/Http/Controllers/UserEventController.php
View File

@ -46,8 +46,7 @@ class UserEventController extends Controller
]);
// Check the UserEvent table if there is a row that has the user_id AND the event_id
$getTableInfo = UserEvent::where('user_id', auth()->user()->id)
->where('event_id', $request->event_id)->get();
$getTableInfo = UserEvent::where('user_id', auth()->user()->id)->where('event_id', $request->event_id)->get();
// If the row has both, then go back and show an error - Cause you're not allowed to be on the same event twice.
if (count($getTableInfo) > 0) {
@ -81,8 +80,6 @@ class UserEventController extends Controller
public function destroy($id)
{
// Check the UserEvent table if there is a row that has the user_id AND the event_id
//$UserEvent = UserEvent::find($eventid)
$UserEvent = UserEvent::query()->where('user_id', "=", auth()->user()->id)->where('event_id', "=", $id);
$UserEvent->delete();
@ -101,14 +98,15 @@ class UserEventController extends Controller
{
}
public function edit() {
public function edit()
{
}
public function update() {
public function update()
{
}
//Signs a user up to an event via ajax
public function createajax(Request $request)
{
// Get written data from events.index
@ -143,6 +141,7 @@ class UserEventController extends Controller
return '<p class="text-center"><b>Du er hermed tilmeldt denne aktivitet!</b></p>';
}
//Removes a users participation in an event via ajax
public function createajaxcancel(Request $request)
{
// Check the UserEvent table if there is a row that has the user_id AND the event_id

2
skolehjem/app/Http/Controllers/WashingMachineController.php
View File

@ -154,6 +154,7 @@ class WashingMachineController extends Controller
return redirect()->route("washing-machines.index");
}
//Used for checking if the currently typed washingmachine name is unique. Create version
public function nameCheck(Request $request){
$washing = WashingMachine::query()->where('name', 'LIKE',$request->nameCheck)->where('location_id', '=', $request->location)->get();
if(count($washing) > 0 && $request->nameCheck !== NULL){
@ -161,6 +162,7 @@ class WashingMachineController extends Controller
}
}
//Used for checking if the currently typed washingmachine name is unique. Edit version
public function nameCheckUpdate(Request $request){
$washing = WashingMachine::query()->where('name', 'LIKE',$request->nameCheck)->where('location_id', '=', $request->location)->where('id', '!=', $request->id)->get();
if(count($washing) > 0 && $request->nameCheck !== NULL){

5
skolehjem/app/Http/Controllers/WashingReservationController.php
View File

@ -76,6 +76,7 @@ class WashingReservationController extends Controller
$allMachineReservations = WashingReservation::query()->where('time', '=', $request->time)->where('machine_id', '=', $request->machine_id)->get();
//Check if a reservation at that time on that machine already exists
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 {
@ -143,6 +144,7 @@ class WashingReservationController extends Controller
return redirect()->route("washing-reservations.index", [ "reservations" => $reservations]);
}
//Used for creating the "create reservation" form in the app
public function api(Request $request){
if($request->ajax()){
$date = $request->date;
@ -171,6 +173,7 @@ class WashingReservationController extends Controller
}
}
//Returns the washingmachines to an ajax request
public function getMachines(Request $request){
if($request->ajax()){
if($request->location_id == 0)
@ -183,6 +186,7 @@ class WashingReservationController extends Controller
}
}
//Returns the unavailable reservation times to an ajax request
public function getTimes(Request $request){
if($request->ajax()){
if($request->location_id == 0)
@ -203,6 +207,7 @@ class WashingReservationController extends Controller
$output = json_encode(["unavailable_times" => $times]);
return Response($output);
}
return null;
}
public function appindex(Request $request)

10
skolehjem/routes/web.php
View File

@ -44,16 +44,6 @@ Route::post("/feedbacks/store", "FeedbackController@storeajax")->name("feedbacks
Route::get("/signup", "UserController@signup")->name("users.signup");
Route::post("/signupStore", "UserController@signupStore")->name("users.signupStore");
//Search/Filter
Route::get("/contactsapi", "ContactController@search")->name("contacts.search");
Route::get("/eventsapi", "EventController@search")->name("events.search");
Route::get("/menuplansapi", "MenuPlanController@search")->name("menu-plans.search");
Route::get("/rolesapi", "RolesController@search")->name("roles.search");
Route::get("/userapi", "UserController@search")->name("users.search");
Route::get("/vaskeapi", "WashingReservationController@search")->name("washing-reservations.search");
Route::get("/risrosapi", "FeedbackController@search")->name("feedbacks.search");
Route::get("/machineapi", "WashingMachineController@search")->name("washing-machines.search");
//Cookies
Route::get("/languages", "UserController@setLanguages")->name("users.setLanguages");
Route::get("/darkmode", "UserController@setDarkMode")->name("users.setDarkMode");