Commit 0f38b5b3 authored by Matheus Miranda's avatar Matheus Miranda
Browse files

Merge branch 'develop' into 'master'

Format access report info

See merge request !53
parents 7b18bba8 dd067c9b
{% verbatim %}
<dl>
<div class="classroom-report--table classroom-report--kv-table">
<dl ng-if="$ctrl.last_login">
<dt>Último login:</dt>
<dd>{{ $ctrl.last_login }}</dd>
</dl>
<dl>
<dl ng-if="$ctrl.last_access">
<dt>Último acesso na plataforma:</dt>
<dd>{{ $ctrl.last_access }}</dd>
</dl>
......@@ -15,4 +16,5 @@
<dt>Acessos nos últimos 30 dias:</dt>
<dd>{{ $ctrl.accesses_30_days }}</dd>
</dl>
</div>
{% endverbatim %}
......@@ -25,7 +25,7 @@
</div>
</div>
</div>
<ul uib-pagination boundary-links="true" total-items="$ctrl.filteredUsers.length" ng-model="$ctrl.page" rotate="false" force-ellipses="true" max-size="20" items-per-page="20" class="pagination pagination-md" previous-text="&lsaquo;" next-text="&rsaquo;" first-text="primeira" last-text="última"></ul>
<ul uib-pagination boundary-links="true" total-items="$ctrl.filteredUsers.length" ng-model="$ctrl.page" rotate="false" force-ellipses="true" max-size="100" items-per-page="100" class="pagination pagination-md" previous-text="&lsaquo;" next-text="&rsaquo;" first-text="primeira" last-text="última"></ul>
</section>
</div>
</div>
......
......@@ -22,9 +22,7 @@
<div class="classroom-report--details" ng-if="$ctrl.showDetails">
<div>
<h3 class="widget-title">Acessos</h3>
<div class="classroom-report--table classroom-report--kv-table">
<user-access-report user="$ctrl.user"></user-access-report>
</div>
<user-access-report user="$ctrl.user"></user-access-report>
<h3 class="widget-title">Fórum</h3>
<div class="classroom-report--table classroom-report--kv-table">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment