diff --git a/skolehjem/.htaccess b/skolehjem/.htaccess new file mode 100644 index 0000000..91c7448 --- /dev/null +++ b/skolehjem/.htaccess @@ -0,0 +1,3 @@ +RewriteEngine On +RewriteRule ^/((?!\.well-known)(/.*)?)$ [L] +RewriteRule ^(.*)$ public/$1 [L] diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index 38b695e..c0352a4 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -289,11 +289,11 @@ class EventController extends Controller } public function previewPages(Request $request){ - if(!Resource::find($request->preview)){ - $event = Event::find($request->preview); - }else{ - $event = Event::where('events.id', '=', $request->preview)->join('resources', 'resources.id', '=', 'events.resource_id')->first(); - } + //if(!Resource::find($request->preview)){ + // $event = Event::find($request->preview); + //}else{ + $event = Event::where('events.id', '=', $request->preview)->leftJoin('resources', 'resources.id', '=', 'events.resource_id')->first(); + //} $convertToJsonArray = json_encode($event); return $convertToJsonArray; } diff --git a/skolehjem/app/Http/Controllers/MultipleEventsController.php b/skolehjem/app/Http/Controllers/MultipleEventsController.php index 72e7e20..fd59cc9 100644 --- a/skolehjem/app/Http/Controllers/MultipleEventsController.php +++ b/skolehjem/app/Http/Controllers/MultipleEventsController.php @@ -33,8 +33,7 @@ class MultipleEventsController extends Controller */ public function index() { - $multiEvents = MultipleEventsParent::query()->orderBY('id' , 'desc')->get(); - return Response::detect("multiple-events.index", [ "multiEvents" => $multiEvents]); + // } /** @@ -65,7 +64,6 @@ class MultipleEventsController extends Controller "name.*" => "max:255", "description.*" => "max:255", "accountable.*" => "max:255", - "date.*" => "max:255" ]); $multipleParent = new MultipleEventsParent(); @@ -86,7 +84,7 @@ class MultipleEventsController extends Controller $multi_event->description = $requestBody['description'][$i]; $multi_event->accountable = $requestBody['accountable'][$i]; $multi_event->name = $requestBody['name'][$i]; - $multi_event->event_end = "2021-27-04 16:00:00"; + $multi_event->event_end = "2021-04-04 16:00:00"; $multi_event->multiple_events_parent_id = $multipleParent->id; $multi_event->save(); } @@ -107,7 +105,7 @@ class MultipleEventsController extends Controller } - return redirect()->route('multiple-events.index', ['multiEvents' => $multiEvents]); + return redirect()->route('events.index'); } diff --git a/skolehjem/database/migrations/2020_07_28_061420_create_user_events_table.php b/skolehjem/database/migrations/2021_07_28_061420_create_user_events_table.php similarity index 100% rename from skolehjem/database/migrations/2020_07_28_061420_create_user_events_table.php rename to skolehjem/database/migrations/2021_07_28_061420_create_user_events_table.php diff --git a/skolehjem/resources/views/admin/events/index.blade.php b/skolehjem/resources/views/admin/events/index.blade.php index f66ea4d..5d97428 100644 --- a/skolehjem/resources/views/admin/events/index.blade.php +++ b/skolehjem/resources/views/admin/events/index.blade.php @@ -17,6 +17,10 @@ .letterSpaceTable{ letter-spacing: 1.2px; } + + #table_id2_wrapper { + margin-top: 3rem; + }
@@ -64,6 +68,36 @@ + + + + + @if(auth()->user()->can('event.edit')) + + @endif + @if(auth()->user()->can('event.delete')) + + @endif + + + @foreach(\App\MultipleEventsParent::query()->orderBY('id' , 'desc')->get() as $event) + + + + @if(auth()->user()->can('event.edit')) + + @endif + @if(auth()->user()->can('event.delete')) + + @endif + + @endforeach + +
UgepreviewUpdateDelete
{{ $event->week}}previewUpdate + @csrf + Delete +
+ + + @endsection @section('scripts') @@ -136,6 +222,12 @@ { orderable: false, targets: [-1, -2, -3, -4] } ] }); + + $('#table_id2').DataTable({ + columnDefs: [ + { orderable: false, targets: [-1, -2, -3, -4] } + ] + }); }); function delete_event(id) { @@ -172,5 +264,40 @@ } }) } + + function delete_multievent(id) { + var token = $("input[name='_token']").val(); + + Swal.fire({ + title: 'Er du sikker?', + text: "Dette kan ikke blive ændret tilbage!", + icon: 'warning', + showCancelButton: true, + confirmButtonColor: '#3085d6', + cancelButtonColor: '#d33', + confirmButtonText: 'Slet Ugentlig Aktivitet', + cancelButtonText: 'Annuller' + }).then((result) => { + if (result.isConfirmed) { + $.ajax({ + type: "POST", + url: "multiple-events/"+id, + data:{'_token':token, _method: 'DELETE'}, + success: function () { + $('#table_id2').DataTable().row($('#row2_'+id)[0]).remove().draw(); + + Swal.fire( + 'Den ugentlige aktivitet er slettet!', + '', + 'success' + ) + }, + error:function (data) { + console.log(data); + } + }); + } + }) + } @endsection diff --git a/skolehjem/resources/views/admin/multiple-events/create.blade.php b/skolehjem/resources/views/admin/multiple-events/create.blade.php index 23b4c4e..84bf0a1 100644 --- a/skolehjem/resources/views/admin/multiple-events/create.blade.php +++ b/skolehjem/resources/views/admin/multiple-events/create.blade.php @@ -53,28 +53,28 @@ - + Tirsdag - + Onsdag - + Torsdag - + diff --git a/skolehjem/resources/views/admin/multiple-events/index.blade.php b/skolehjem/resources/views/admin/multiple-events/index.blade.php index a6120f6..89e7edf 100644 --- a/skolehjem/resources/views/admin/multiple-events/index.blade.php +++ b/skolehjem/resources/views/admin/multiple-events/index.blade.php @@ -24,7 +24,6 @@ @foreach($multiEvents as $event) - {{ $event->week}} preview @@ -48,10 +47,8 @@


- -
-

+

@@ -68,17 +65,20 @@ dataType: 'JSON', success:function (data) { modalEvent.style.display = "flex"; - $("#week").html(data[0].week); + $("#week").html('Uge: '+data[0].week); if (data[0].resource_id != null) $("#eventimg").attr('src', data[0].filename); - /*var l = JSON.parse(data); - $("#name").html(l.name); - $("#date").html(l.date); - $("#accountable").html(l.accountable); - $("#description").html(l.description); - if (l.filename) - $("#eventimg").attr('src', l.filename);*/ + for (var i = 0; i < data[1].length; i++) { + $("#events").append("

"+data[1][i].name+"

" + + "

"+data[1][i].date+" - "+data[1][i].event_end+"

" + + "

Tovholder: "+data[1][i].accountable+"

" + + "

Beskrivelse:

" + + "

"+data[1][i].description+"

" + + "
" + + "
" + + "

"); + } }, error:function (data) { console.log(data); @@ -89,22 +89,18 @@ function closeModal() { modalEvent.style.display = "none"; - $("#name").html(''); - $("#date").html(''); - $("#accountable").html(''); - $("#description").html(''); + $("#week").html(''); $("#eventimg").attr('src', ''); + $("#events").html(''); } window.onmousedown = function(event) { if (event.target == modalEvent) { modalEvent.style.display = "none"; - $("#name").html(''); - $("#date").html(''); - $("#accountable").html(''); - $("#description").html(''); + $("#week").html(''); $("#eventimg").attr('src', ''); + $("#events").html(''); } }