Skip to content

Commit

Permalink
Fixes #46
Browse files Browse the repository at this point in the history
  • Loading branch information
snipe committed Nov 25, 2013
1 parent e235a45 commit e87e5b9
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 5 deletions.
9 changes: 4 additions & 5 deletions app/views/backend/users/index.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
<tr role="row">
<th class="span3">@lang('admin/users/table.name')</th>
<th class="span2">@lang('admin/users/table.email')</th>
<th class="span1">@lang('admin/users/table.checkedout')</th>
<th class="span1">Assets</th>
<th class="span1">Licenses</th>
<th class="span1">@lang('admin/users/table.activated')</th>
<th class="span2">@lang('admin/users/table.last_login')</th>
<th class="span1">@lang('admin/users/table.created_at')</th>
Expand All @@ -50,10 +51,8 @@

</td>
<td>{{ $user->email }}</td>
<td>
{{ ($user->assets->count()) }}
</td>

<td>{{ $user->assets->count() }}</td>
<td>{{ $user->licenses->count() }}</td>
<td>{{ $user->isActivated() ? '<i class="icon-ok"></i>' : ''}}</td>
<td>
@if (is_object($user->last_login))
Expand Down
42 changes: 42 additions & 0 deletions app/views/backend/users/view.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,48 @@
</div>
@endif

<h6>Software Checked Out to {{ $user->first_name }}</h6>
<br>
<!-- checked out assets table -->
@if (count($user->licenses) > 0)
<table class="table table-hover">
<thead>
<tr>
<th class="span3">Asset Type</th>
<th class="span3">Serial</th>
<th class="span3"><span class="line"></span>Name</th>
<th class="span3"><span class="line"></span>Actions</th>
</tr>
</thead>
<tbody>
@foreach ($user->licenses as $license)
<tr>
<td>
@if ($license->physical=='0')
Hardware
@else
Software
@endif
</td>
<td><a href="{{ route('view/asset', $license->id) }}">{{ $license->serial }}</a></td>
<td><a href="{{ route('view/asset', $license->id) }}">{{ $license->name }}</a></td>

<td> <a href="{{ route('checkin/asset', $asset->id) }}" class="btn-flat info">Checkin</a></td>
</tr>
@endforeach
</tbody>
</table>
@else

<div class="col-md-6">
<div class="alert alert-warning alert-block">
<i class="icon-warning-sign"></i>
@lang('admin/users/table.noresults')
</div>
</div>
@endif



<h6>History for {{ $user->first_name }}</h6>
<br>
Expand Down

0 comments on commit e87e5b9

Please sign in to comment.