v1.4.1 - Small fixes

This commit is contained in:
frederikpyt 2020-10-07 08:23:26 +02:00
parent 505ed3710b
commit 159c3f3764
10 changed files with 44 additions and 68 deletions

View File

@ -18,7 +18,7 @@ class CreateResourceCategories extends Migration
Schema::create('resource_categories', function (Blueprint $table) { Schema::create('resource_categories', function (Blueprint $table) {
$table->id(); $table->id();
$table->string("name", 60)->unique(); $table->string("name", 60)->unique();
$table->text("description"); $table->longText("description");
$table->string("slug", 255)->unique(); $table->string("slug", 255)->unique();
$table->timestamps(); $table->timestamps();
}); });

View File

@ -18,7 +18,7 @@ class CreateResourceExtension extends Migration
Schema::create('resource_extensions', function (Blueprint $table) { Schema::create('resource_extensions', function (Blueprint $table) {
$table->id(); $table->id();
$table->string("extension", 60)->unique(); $table->string("extension", 60)->unique();
$table->text("description"); $table->longText("description");
$table->timestamps(); $table->timestamps();
$table->foreignid("resource_category_id")->constrained("resource_categories", "id"); $table->foreignid("resource_category_id")->constrained("resource_categories", "id");

View File

@ -18,8 +18,8 @@ class CreateFailedJobsTable extends Migration
{ {
Schema::create('failed_jobs', function (Blueprint $table) { Schema::create('failed_jobs', function (Blueprint $table) {
$table->id(); $table->id();
$table->text('connection'); $table->longText('connection');
$table->text('queue'); $table->longText('queue');
$table->longText('payload'); $table->longText('payload');
$table->longText('exception'); $table->longText('exception');
$table->timestamp('failed_at')->useCurrent(); $table->timestamp('failed_at')->useCurrent();

View File

@ -23,7 +23,7 @@ class CreateMenuPlans extends Migration
$table->string('wednesday', 255); $table->string('wednesday', 255);
$table->string('thursday', 255); $table->string('thursday', 255);
$table->timestamps(); $table->timestamps();
//$table->text('description'); //$table->longText('description');
}); });
} }

View File

@ -17,7 +17,7 @@ class CreateNewsTable extends Migration
$table->id(); $table->id();
$table->string("name"); $table->string("name");
$table->string('subname'); $table->string('subname');
$table->text("content"); $table->longText("content");
$table->foreignId('resource_id')->nullable()->constrained('resources', 'id'); $table->foreignId('resource_id')->nullable()->constrained('resources', 'id');
$table->integer("arrangement_id")->nullable(); //Gets ID from given event, menu, guide or news $table->integer("arrangement_id")->nullable(); //Gets ID from given event, menu, guide or news
$table->foreignid("type_id")->nullable()->constrained("news_types", "id"); $table->foreignid("type_id")->nullable()->constrained("news_types", "id");

View File

@ -16,7 +16,7 @@ class ContactSeeder extends Seeder
'contactname' => "Claus Trasbo", 'contactname' => "Claus Trasbo",
'email' => "ctr@sde.dk", 'email' => "ctr@sde.dk",
'title' => "Forstander for Erhvervskollegiet", 'title' => "Forstander for Erhvervskollegiet",
'phone' => "40886515", 'phone' => "",
'phonetimes' => "", 'phonetimes' => "",
], ],
[ [
@ -33,20 +33,6 @@ class ContactSeeder extends Seeder
'phone' => null, 'phone' => null,
'phonetimes' => "", 'phonetimes' => "",
], ],
[
'contactname' => "Anja Holm Brix",
'email' => "ahb@sde.dk",
'title' => "Kollegieassistent",
'phone' => null,
'phonetimes' => "",
],
[
'contactname' => "Britta Overgaard Brink Olsen",
'email' => "brio@sde.dk",
'title' => "Kollegieassistent",
'phone' => null,
'phonetimes' => "",
],
[ [
'contactname' => "Jesper Sandberg", 'contactname' => "Jesper Sandberg",
'email' => "jesa@sde.dk", 'email' => "jesa@sde.dk",

View File

@ -10,47 +10,41 @@
@endsection @endsection
@section("content") @section("content")
<table class="tbl mt-1"> <table class="tbl mt-1" id="table_id">
<tr> <thead>
<th>Tilmeldtes Fornavn</th> <th>Tilmeldtes Fornavn</th>
<th>Tilmeldtes Efternavn</th> <th>Tilmeldtes Efternavn</th>
<th>Tilmeldtes Tlf Nr</th> <th>Tilmeldtes Tlf Nr</th>
<th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th> <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
</tr> </thead>
@foreach($events as $event) <tbody>
@if ($event->name_first != null && $event->name_last != null && $event->phone != null && $event->event_id != null && $event->user_id != null) @foreach($events as $event)
<tr> @if ($event->name_first != null && $event->name_last != null && $event->phone != null && $event->event_id != null && $event->user_id != null)
<td>{{ $event->name_first }}</td> <tr>
<td>{{ $event->name_last }}</td> <td>{{ $event->name_first }}</td>
<td>{{ $event->phone }}</td> <td>{{ $event->name_last }}</td>
<td><form method="post" action="{{ route("events.destroy", [ "event" => $event->event_id ]) }}" class="w-100 nostyle"> <td>{{ $event->phone }}</td>
@csrf <td><form method="post" action="{{ route("events.destroy", [ "event" => $event->event_id ]) }}" class="w-100 nostyle">
@method("delete") @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="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> </form>
</td> </td>
</tr> </tr>
@endif @endif
@endforeach @endforeach
</tbody>
</table> </table>
@endsection
@section('scripts')
<script> <script>
$('#search').on('keyup', function () { $(document).ready( function () {
$value = $(this).val(); $('#table_id').DataTable({
$.ajax({ columnDefs: [
type: 'get', { orderable: false, targets: [-1] }
url: '{{route('events.search')}}', ]
data: {'search':$value}, });
success:function (data) { });
$('tbody').html(data); </script>
},
error:function (data) {
console.log(data);
}
});
})
</script>
@endsection @endsection

View File

@ -2,7 +2,11 @@
@extends("admin.layout.header") @extends("admin.layout.header")
@section("title") @section("title")
Home - Admin Panel Dashboard - Admin Panel
@endsection
@section("path")
<a href="{{ route('root.index') }}" class="text-white">Dashboard</a> /
@endsection @endsection
@section("content") @section("content")

View File

@ -6,7 +6,7 @@
@endsection @endsection
@section("path") @section("path")
<a href="{{ route('news.index') }}" class="text-white">Opret Nyheder</a> / <a href="{{ route('news.index') }}" class="text-white">Vis Nyheder</a> /
@endsection @endsection
@section("content") @section("content")

View File

@ -23,13 +23,5 @@
{!!$event->description!!} {!!$event->description!!}
</div> </div>
<button style="margin-top: auto" onclick="window.history.back()" class="btn btn-sde-blue text-white mb-1 mt-1" >{{__('msg.tilbage')}}</button> <button style="margin-top: auto" onclick="window.history.back()" class="btn btn-sde-blue text-white mb-1 mt-1" >{{__('msg.tilbage')}}</button>
</main> </main>
@endsection @endsection