v1.5.20 - Removed event_end & Updated Migration
Updated Delete of multiple event Started on deletion of single event & multiple-event edit Removed userevent $key variable Updated multipdf Fixed web.php
This commit is contained in:
Anders
@@ -85,7 +85,7 @@
|
||||
@foreach(\App\MultipleEventsParent::query()->orderBY('id' , 'desc')->get() as $event)
|
||||
<tr id="row2_{{ $event->id }}">
|
||||
<td>{{ $event->week}}</td>
|
||||
<td><a href="{{ route("multiple-events.signups", $event->id) }}"><img class="w-100" src="{{ asset('/images/icons/eye-dark.svg') }}" alt="Show"></a></td>
|
||||
<td><a href="{{ route("multiple-events.signups", ["multipleEvent" => $event->id]) }}"><img class="w-100" src="{{ asset('/images/icons/eye-dark.svg') }}" alt="Show"></a></td>
|
||||
<td><a id="preview" onclick="modalMultiEventContent({{$event->id}})" style="cursor: pointer"><img class="w-100" src="{{ asset('/images/icons/preview-dark.svg') }}" alt="preview"></a></td>
|
||||
<td><a href="{{ route("multiPdf.genPDF", [ "multiEvent" => $event->id ]) }}" target="_blank"><img class="w-100" src="{{ asset('/images/icons/print.svg') }}" alt="Print"></a></td>
|
||||
@if(auth()->user()->can('event.edit'))
|
||||
@@ -132,6 +132,7 @@
|
||||
</div>
|
||||
@endsection
|
||||
@section('scripts')
|
||||
<script src="{{ asset("/js/moment-with-locales.min.js") }}"></script>
|
||||
<script>
|
||||
var modalEvent = document.getElementById("eventModal");
|
||||
var modalMultiEvent = document.getElementById("eventMultiModal");
|
||||
@@ -173,8 +174,10 @@
|
||||
$("#eventmultiimg").attr('src', data[0].filename);
|
||||
|
||||
for (var i = 0; i < data[1].length; i++) {
|
||||
var d = new Date(data[1][i].date);
|
||||
var day = moment().lang("da").day(d.getDay()).format("dddd");
|
||||
$("#events").append("<div class='container text-center'><div class='row justify-content-center'><div class='col'><h1 class='mb-0'>"+data[1][i].name+"</h1>" +
|
||||
"<h3 class='mt-0 mb-0'>"+data[1][i].date+" - "+data[1][i].event_end+"</h3>" +
|
||||
"<h3 class='mt-0 mb-0'>"+d.getDate()+"/"+(d.getMonth()+1)+"/"+d.getFullYear()+" "+d.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })+" ["+ day.charAt(0).toUpperCase() + day.slice(1) +"]</h3>" +
|
||||
"<h3 class='mt-0'>Tovholder: "+data[1][i].accountable+"</h3>" +
|
||||
"<h3 class='mb-0'>Beskrivelse:</h3>" +
|
||||
"<p class='mt-0'>"+data[1][i].description+"</p>" +
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
@csrf
|
||||
@method("delete")
|
||||
|
||||
<button name="signup" value="{{ $event->user_id }}" 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>
|
||||
<button name="signup" value="{{ $event->user_id }}" class="w-100 nostyle" onclick="delete_userevent();" type="submit"><img class="w-100 cursor-pointer" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></button>
|
||||
</form>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -46,5 +46,43 @@
|
||||
]
|
||||
});
|
||||
});
|
||||
|
||||
function delete_userevent() {
|
||||
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 Menuplanen',
|
||||
cancelButtonText: 'Annuller'
|
||||
}).then((result) => {
|
||||
if (result.isConfirmed) {
|
||||
$.ajax({
|
||||
type: "POST",
|
||||
url: "menu-plans/"+id,
|
||||
data:{'_token':token, _method: 'DELETE'},
|
||||
success: function () {
|
||||
$('#table_id').DataTable().row($('#row_'+id)[0]).remove().draw();
|
||||
|
||||
Swal.fire(
|
||||
'Menuplanen er slettet!',
|
||||
'',
|
||||
'success'
|
||||
)
|
||||
|
||||
return false;
|
||||
},
|
||||
error:function (data) {
|
||||
console.log(data);
|
||||
}
|
||||
});
|
||||
}
|
||||
})
|
||||
return false;
|
||||
}
|
||||
</script>
|
||||
@endsection
|
||||
|
||||
@@ -34,48 +34,27 @@
|
||||
</style>
|
||||
<link href="{{ asset("/css/quill/quill.snow.css") }}" rel="stylesheet">
|
||||
<h1 id="errormesseages" >Opret ugentligt aktivitet: [Vi er i uge <?php echo date('W'); ?>]</h1>
|
||||
<form method="post" action="{{ route("multiple-events.store") }}" enctype="multipart/form-data">
|
||||
<!--datetime-local-->
|
||||
<form method="post" action="{{ route("multiple-events.update", $parentEvent) }}" enctype="multipart/form-data">
|
||||
@csrf
|
||||
@method("PUT")
|
||||
<input type="text" name="week" placeholder="Uge">
|
||||
<label id="fileuploadee"for="fileuploade">Baggrundsbillede til nyheden (Valgfri)</label>
|
||||
<input id="fileuploade" type="file" name="resource" accept="image/*">
|
||||
<table>
|
||||
<tr>
|
||||
<th>Ugedag</th>
|
||||
<th>Aktivitets navn</th>
|
||||
<th>Aktivitets beskrivelse</th>
|
||||
<th>Tovholder</th>
|
||||
<th>Tidsrum (Start)</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Mandag</td>
|
||||
<td><input type="text" name="name[]" max="255" value="{{ $multiEvent->name[1] }}"></td>
|
||||
<td><input type="text" name="description[]" max="255" value="{{ old("description.0") }}"></td>
|
||||
<td><input type="text" name="accountable[]" value="{{ old("accountable.0") }}"></td>
|
||||
<td><input type="datetime-local" name="date[]" value="{{ old("date.0") }}"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Tirsdag</td>
|
||||
<td><input type="text" name="name[]" max="255" value="{{ old("name.1") }}"></td>
|
||||
<td><input type="text" name="description[]" max="255" value="{{ old("description.1") }}"></td>
|
||||
<td><input type="text" name="accountable[]" value="{{ old("accountable.1") }}"></td>
|
||||
<td><input type="datetime-local" name="date[]" value="{{ old("date.1") }}"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Onsdag</td>
|
||||
<td><input type="text" name="name[]" max="255" value="{{ old("name.2") }}"></td>
|
||||
<td><input type="text" name="description[]" max="255" value="{{ old("description.2") }}"></td>
|
||||
<td><input type="text" name="accountable[]" value="{{ old("accountable.2") }}"></td>
|
||||
<td><input type="datetime-local" name="date[]" value="{{ old("date.2") }}"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Torsdag</td>
|
||||
<td><input type="text" name="name[]" max="255" value="{{ old("name.3") }}"></td>
|
||||
<td><input type="text" name="description[]" max="255" value="{{ old("description.3") }}"></td>
|
||||
<td><input type="text" name="accountable[]" value="{{ old("accountable.3") }}"></td>
|
||||
<td><input type="datetime-local" name="date[]" value="{{ old("date.3") }}"></td>
|
||||
</tr>
|
||||
@foreach($multiEvents as $multiEvent)
|
||||
<tr>
|
||||
<td><input type="text" name="name[][]" max="255" value="{{ $multiEvent->name }}"></td>
|
||||
<td><input type="text" name="description[][]" max="255" value="{{ $multiEvent->description }}"></td>
|
||||
<td><input type="text" name="accountable[][]" value="{{ $multiEvent->accountable }}"></td>
|
||||
<td><input type="datetime-local" name="date[][]" value="{{ $multiEvent->date }}"></td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</table>
|
||||
|
||||
<label class="toggle">
|
||||
|
||||
@@ -73,7 +73,7 @@
|
||||
|
||||
for (var i = 0; i < data[1].length; i++) {
|
||||
$("#events").append("<div class='container text-center'><div class='row justify-content-center'><div class='col'><h1 class='mb-0'>"+data[1][i].name+"</h1>" +
|
||||
"<h3 class='mt-0 mb-0'>"+data[1][i].date+" - "+data[1][i].event_end+"</h3>" +
|
||||
"<h3 class='mt-0 mb-0'>"+data[1][i].date+"</h3>" +
|
||||
"<h3 class='mt-0'>Tovholder: "+data[1][i].accountable+"</h3>" +
|
||||
"<h3 class='mb-0'>Beskrivelse:</h3>" +
|
||||
"<p class='mt-0'>"+data[1][i].description+"</p>" +
|
||||
|
||||
@@ -6,45 +6,80 @@
|
||||
@endsection
|
||||
|
||||
@section("path")
|
||||
<a href="{{ route("multiple-events.index") }}" class="text-white">Vis Events</a> / <a href="" class="text-white">Vis Tilmeldte - {{ $multiEvent[0]->name }}</a> /
|
||||
<a href="{{ route("events.index") }}" class="text-white">Vis Events</a> / <a href="" class="text-white">Vis Tilmeldte</a> /
|
||||
@endsection
|
||||
|
||||
@section("content")
|
||||
<table class="tbl mt-1" id="table_id">
|
||||
<thead>
|
||||
@foreach($multiEvent as $event)
|
||||
<h1 class="text-center">{{ $event->name }}</h1>
|
||||
<table class="tbl mt-1" id="table_id{{ $event->id }}">
|
||||
<thead>
|
||||
<th>Tilmeldtes Fornavn</th>
|
||||
<th>Tilmeldtes Efternavn</th>
|
||||
<th>Tilmeldtes Tlf Nr</th>
|
||||
<th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($multiEvent as $event)
|
||||
@if ($event->name_first != null && $event->name_last != null && $event->phone != null && $event->multiple_event_id != null && $event->user_id != null)
|
||||
<tr>
|
||||
<td>{{ $event->name_first }}</td>
|
||||
<td>{{ $event->name_last }}</td>
|
||||
<td>{{ $event->phone }}</td>
|
||||
<td><form method="post" action="{{ route("multiple-events.destroy", [ "multiEvent" => $event->event_id ]) }}" class="w-100 nostyle">
|
||||
@csrf
|
||||
@method("delete")
|
||||
|
||||
<button name="signup" value="{{ $event->user_id }}" 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>
|
||||
@endif
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach (\App\UserEvent::join('users', 'users.id', '=', 'user_events.user_id')->where('multiple_event_id', '=', $event->id)->select('user_events.*', 'users.name_first', 'users.name_last', 'users.phone')->get() as $ue)
|
||||
<tr id="row_{{ $ue->id }}">
|
||||
<td>{{ $ue->name_first }}</td>
|
||||
<td>{{ $ue->name_last }}</td>
|
||||
<td>{{ $ue->phone }}</td>
|
||||
<td>
|
||||
@csrf
|
||||
<a class="w-100 nostyle" onclick="delete_userevent({{ $ue->id }}, {{ $event->id }})"><img class="w-100 cursor-pointer" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a>
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
</tbody>
|
||||
</table>
|
||||
@endforeach
|
||||
@endsection
|
||||
@section('scripts')
|
||||
<script>
|
||||
$(document).ready( function () {
|
||||
$('#table_id').DataTable({
|
||||
columnDefs: [
|
||||
{ orderable: false, targets: [-1] }
|
||||
]
|
||||
@foreach($multiEvent as $event)
|
||||
$(document).ready( function () {
|
||||
$('#table_id'+{{ $event->id }}).DataTable({
|
||||
columnDefs: [
|
||||
{ orderable: false, targets: [-1] }
|
||||
]
|
||||
});
|
||||
});
|
||||
});
|
||||
@endforeach
|
||||
|
||||
function delete_userevent(id, tableid) {
|
||||
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: 'Fjern brugeren fra aktiviteten',
|
||||
cancelButtonText: 'Annuller'
|
||||
}).then((result) => {
|
||||
if (result.isConfirmed) {
|
||||
$.ajax({
|
||||
type: "POST",
|
||||
url: "/multiple-events/"+id,
|
||||
data:{'_token':token, _method: 'DELETE', 'signup': true},
|
||||
success: function () {
|
||||
$('#table_id'+tableid).DataTable().row($('#row_'+id)[0]).remove().draw();
|
||||
|
||||
Swal.fire(
|
||||
'Brugeren er hermed fjernet fra aktiviteten!',
|
||||
'',
|
||||
'success'
|
||||
)
|
||||
},
|
||||
error:function (data) {
|
||||
console.log(data);
|
||||
}
|
||||
});
|
||||
}
|
||||
})
|
||||
}
|
||||
</script>
|
||||
@endsection
|
||||
|
||||
Reference in New Issue
Block a user