Including occupied username and renaming DB field

Now it shows the username of who is using an item.
Item db field 'usedBy' was renamed to 'used_by' to keep consistence.
This commit is contained in:
2018-09-14 12:52:07 -03:00
parent bb4cc93723
commit 882609fed0
11 changed files with 59 additions and 36 deletions

View File

@@ -5,7 +5,7 @@
<div class="row justify-content-center">
<div class="col-md-8">
<div class="card">
<div class="card-header">Dashboard</div>
<div class="card-header"><h3>Your items</h3></div>
<div class="card-body">
@if (session('status'))
@@ -14,37 +14,21 @@
</div>
@endif
<h4>Your itens</h4>
@forelse ($items as $item)
<hr class="ml-5 mr-5">
<li class="mt-1 mb-1">
@if (!$loop->first)
<hr class="m-3">
@endif
<div class="my-4 p-2">
<strong>{{$item->name}}</strong> ({{$item->product->name}})
@if ($item->usedBy)
@if ($item->usedBy == \Auth::id())
<span class="float-right">
<form action="/return" method="POST">
{{ csrf_field() }}
<input type="hidden" name="item" value="{{$item->id}}">
<button type="submit" class="btn-xm btn-danger">Return It</button>
</form>
</span>
<span class="float-right mr-3"><em>{{\Carbon\Carbon::parse($item->updated_at)->diffForHumans()}}</em></span>
@else
<div class="alert alert-danger" role="alert">In use by {{$item->usedBy}}, since {{$item->updated_at->diffForHumans()}}</div>
@endif
@if ($item->used_by)
@include('home.usedItem')
@else
<span class="float-right">
<form action="/take" method="POST">
{{ csrf_field() }}
<input type="hidden" name="item" value="{{$item->id}}">
<button type="submit" class="btn-xm btn-success">Take It</button>
</form>
</span>
@include('home.unusedItem')
@endif
</li>
</div>
@empty
<p>There are no items for you yet. Include a product or an item <a href="/product">here.</a></p>
<p>There are no items shared with you yet. <a href="/product">Share an item!</a></p>
@endforelse
</div>
</div>