Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master

2020-08-04 13:21:39 +02:00
parent c223cb967c 408eb7090b
commit 210aa00fc6
85 changed files with 1502 additions and 87 deletions
@@ -18,7 +18,7 @@
        <label for="description">Beskrivelse:</label>
        <input type="text" name="description" id="description" max="500" required>
        <label for="date">Aktivitet dato:</label>
-        <input type="date" name="date" id="date" required>
+        <input type="datetime-local" name="date" id="date" required>
        <input type="submit" class="btn btn-dark text-white" value="Opret">
    </form>

@@ -19,7 +19,7 @@
        <label for="description">Beskrivelse</label>
        <input value="{{$event->description}}" type="text" name="description" id="description" required>
        <label for="date">Beskrivelse</label>
-        <input value="{{$event->date}}" type="date" name="date" id="date" required>
+        <input value="{{$event->date}}" type="datetime-local" name="date" id="date" required>

        <input type="submit" class="btn btn-dark text-white" value="Rediger">
    </form>
@@ -17,8 +17,9 @@
            @csrf
            <input type="text" class="form-controller" id="search" name="search" placeholder="Søg på Evt Navn, Evt Dato"></input>
        </form>
-
    </div>
+    {!! session()->get('EventNameExists') !!}
+
    <table class="tbl mt-2">
        <tr>
            <th>Event Navn</th>
@@ -32,7 +33,7 @@
            <tr>
                <td>{{ $event->name }}</td>
                <td>{{ $event->description }}</td>
-                <td>{{ $event->date }}</td>
+                <td>{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}</td>
                <td><a href="{{ route("events.signups", [ "event" => $event ]) }}"><img class="w-100" src="{{ asset('/images/icons/eye-dark.svg') }}" alt="Update"></a></td>
                <td><a href="{{ route("events.edit", [ "event" => $event ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
                <td><form method="post" action="{{ route("events.destroy", [ "event" => $event ]) }}" class="w-100 nostyle">
@@ -47,7 +47,6 @@
                url: '{{route('feedbacks.search')}}',
                data: {'option':$value},
                success:function (data) {
-                    console.log($value);
                    $('tbody').html(data);
                },
                error:function (data) {
@@ -18,8 +18,9 @@
            @csrf
            <input type="number" class="form-controller" id="search" name="search" pattern="[0-9]{2}" placeholder="Søg efter ugenummer"></input>
        </form>
-
    </div>
+    {!! session()->get('WeekExists') !!}
+
    <table class="tbl mt-2">
        <tr>
            <th>Uge</th>
@@ -17,9 +17,9 @@
            @csrf
            <input type="text" class="form-controller" id="search" name="search"  placeholder="Søg efter navn"></input>
        </form>
-
-
    </div>
+    {!! session()->get('RoleNameExists') !!}
+
    <table class="tbl mt-2">
        <tr>
            <th>Navn</th>
@@ -12,6 +12,8 @@
@section("content")
    <h1>Opret Bruger:</h1>
    {!! session()->get('error#notsamepass') !!}
+    {!! session()->get('EmailExists') !!}
+    {!! session()->get('PhoneExists') !!}
    <form method="post" action="{{ route("users.store") }}">
        @csrf
        <label for="name_first">Fornavn:</label>
@@ -12,6 +12,8 @@
@section("content")
    <h1>Rediger Bruger:</h1>
    {!! session()->get('error#notsamepass') !!}
+    {!! session()->get('EmailExists') !!}
+    {!! session()->get('PhoneExists') !!}
    <form method="post" action="{{ route("users.update", ['user' => $user]) }}">
        @csrf
        @method("put")
@@ -13,6 +13,7 @@
    <div class="row align-items-center">
        <a class="btn btn-inline btn-sde-blue mb-0" href="{{ route('washing-machines.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Vaskemaskine</a>
    </div>
+    {!! session()->get('WashingNameExists') !!}
    <table class="tbl mt-2">
        <tr>
            <th>Navn</th>
@@ -33,15 +33,13 @@
            <th>Vaskemaskine</th>
            <th>Tidspunkt</th>
            <th>Bruger</th>
-            <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
            <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
        </tr>
        @foreach($reservations as $reservation)
        <tr>
            <td>{{ \App\WashingMachine::query()->find($reservation->machine_id)->name }}</td>
-            <td>{{ $reservation->time }}</td>
+            <td>{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($reservation->time))->format('d/m/Y \k\l\. H:i') }}</td>
            <td>{{ ucfirst(\App\User::query()->find($reservation->user_id)->name_first) }} {{ ucfirst(\App\User::query()->find($reservation->user_id)->name_last) }}</td>
-            <td><a href="{{ route('washing-reservations.edit', ['washing_reservation' => $reservation]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
            <td><form method="post" action="{{ route('washing-reservations.destroy', ['washing_reservation' => $reservation]) }}" class="w-100 nostyle">
                    @csrf
                    @method("delete")
@@ -65,7 +63,6 @@
                url: '{{route('washing-reservations.search')}}',
                data: {'search':$value, 'isCheck': $checkboxValue},
                success:function (data) {
-                    console.log($checkboxValue);
                    $('tbody').html(data);
                },
                error:function (data) {