Skip to content

Commit

Permalink
Added extra information to user table and user profile
Browse files Browse the repository at this point in the history
  • Loading branch information
clemoberti committed Oct 20, 2016
1 parent 5e78b0e commit 6f0a01f
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
json.extract! user, :id, :uid, :email, :phone, :name, :surname, :admin_role, :created_at, :confirmed_at, :last_sign_in_at
json.extract! user, :id, :uid, :email, :phone, :name, :surname, :admin_role, :created_at, :confirmed_at, :last_sign_in_at, :sign_in_count
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
<thead>
<tr>
<th>Username</th>
<th style="width: 100px;">Creation</th>
<th width="110">Last login</th>
<th width="100">Creation</th>
</tr>
</thead>
<tbody>
Expand All @@ -20,6 +21,11 @@
<small>{{::user.email}}</small>
</a>
</td>
<td>
<span data-toggle="tooltip" title="{{::user.last_sign_in_at | date: 'H:m - dd/MM/yyyy'}}">
{{(user.last_sign_in_at | amTimeAgo) || 'never'}}
</span>
</td>
<td>{{::user.created_at | date: 'dd/MM/yyyy'}}</td>
</tr>
</tbody>
Expand Down
4 changes: 4 additions & 0 deletions frontend-admin/src/app/views/user/user.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ <h3 ng-show="!user.name && !user.surname" class="panel-title">{{::vm.user.email}
<div class="col-sm-3"><div class="label-cell">Last sign in</div></div>
<div class="col-sm-3">{{(vm.user.last_sign_in_at | amCalendar) || '(Never signed in yet)'}}</div>
</div>
<div class="bs-row row">
<div class="col-sm-3"><div class="label-cell">Number of sign in</div></div>
<div class="col-sm-3">{{vm.user.sign_in_count}}</div>
</div>
</div>
</div>
</div>
Expand Down

0 comments on commit 6f0a01f

Please sign in to comment.