IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Improve sortability in various lists.

Browse Source
This commit is contained in:
James Cole 2016-11-20 15:30:16 +01:00
parent 78f297e18f
commit 0b613c3b8c
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
7 changed files with 83 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/Admin/UserController.php
View File

@ -57,20 +57,22 @@ class UserController extends Controller
// add meta stuff. // add meta stuff.
$users->each( $users->each(
function (User $user) use ($mustConfirmAccount) { function (User $user) use ($mustConfirmAccount) {
// is user activated? $list = ['user_confirmed', 'twoFactorAuthEnabled', 'twoFactorAuthSecret', 'registration_ip_address', 'confirmation_ip_address'];
$isConfirmed = Preferences::getForUser($user, 'user_confirmed', false)->data; $preferences = Preferences::getArrayForUser($user, $list);
$user->activated = true; $user->activated = true;
if ($isConfirmed === false && $mustConfirmAccount === true) { if (!($preferences['user_confirmed'] === true) && $mustConfirmAccount === true) {
$user->activated = false; $user->activated = false;
} }
$user->isAdmin = $user->hasRole('owner'); $user->isAdmin = $user->hasRole('owner');
$is2faEnabled = Preferences::getForUser($user, 'twoFactorAuthEnabled', false)->data; $is2faEnabled = $preferences['twoFactorAuthEnabled'] === true;
$has2faSecret = !is_null(Preferences::getForUser($user, 'twoFactorAuthSecret')); $has2faSecret = !is_null($preferences['twoFactorAuthSecret']);
$user->has2FA = false; $user->has2FA = false;
if ($is2faEnabled && $has2faSecret) { if ($is2faEnabled && $has2faSecret) {
$user->has2FA = true; $user->has2FA = true;
} }
$user->prefs = $preferences;
} }
); );

24
app/Support/Preferences.php
View File

@ -57,6 +57,30 @@ class Preferences
return $this->getForUser(auth()->user(), $name, $default); return $this->getForUser(auth()->user(), $name, $default);
} }
/**
* @param User $user
* @param array $list
*
* @return array
*/
public function getArrayForUser(User $user, array $list): array
{
$result = [];
$preferences = Preference::where('user_id', $user->id)->whereIn('name', $list)->get(['id', 'name', 'data']);
/** @var Preference $preference */
foreach ($preferences as $preference) {
$result[$preference->name] = $preference->data;
}
foreach ($list as $name) {
if (!isset($result[$name])) {
$result[$name] = null;
}
}
return $result;
}
/** /**
* @param \FireflyIII\User $user * @param \FireflyIII\User $user
* @param string $name * @param string $name

30
resources/views/admin/domains/index.twig
View File

@ -5,19 +5,18 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<div class="row"> <div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12"> <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="box box-primary"> <div class="box box-primary">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'all_blocked_domains'|_ }}</h3> <h3 class="box-title">{{ 'all_blocked_domains'|_ }}</h3>
</div> </div>
<div class="box-body table-responsive"> <div class="box-body table-responsive no-padding">
{% if domains|length > 0 %} {% if domains|length > 0 %}
<table class="table table-condensed sortable"> <table class="table table-condensed table-hover sortable">
<thead> <thead>
<tr> <tr>
<th style="width:20%;">&nbsp;</th> <th data-defaultsort="disabled" style="width:20%;">&nbsp;</th>
<th>{{ trans('list.domain') }}</th> <th data-defaultsign="az">{{ trans('list.domain') }}</th>
<th>{{ trans('list.is_blocked') }}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -27,9 +26,9 @@
<a href="{{ route('admin.users.domains.block-toggle', [domain]) }}" class="btn btn-sm btn-success"><i <a href="{{ route('admin.users.domains.block-toggle', [domain]) }}" class="btn btn-sm btn-success"><i
class="fa fa-fw fa-times"></i> unblock</a> class="fa fa-fw fa-times"></i> unblock</a>
</td> </td>
<td>{{ domain }}</td> <td data-value="{{ domain }}">
<td> <a href="http://{{ domain }}/">{{ domain }}</a>
<small class="text-success"><i class="fa fa-fw fa-check"></i></small> (<a href="http://whois.domaintools.com/{{ domain }}">whois</a>)
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}
@ -43,12 +42,9 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<!-- domains found in users (not in top list) -->
<!-- domains found in users (not in top list) --> <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<div class="box box-primary"> <div class="box box-primary">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'all_user_domains'|_ }}</h3> <h3 class="box-title">{{ 'all_user_domains'|_ }}</h3>
@ -59,11 +55,11 @@
{{ 'all_domains_is_filtered'|_ }} {{ 'all_domains_is_filtered'|_ }}
</p> </p>
<table class="table table-condensed sortable"> <table class="table table-condensed table-hover sortable">
<thead> <thead>
<tr> <tr>
<th style="width:20%;">&nbsp;</th> <th data-defaultsort="disabled" style="width:20%;">&nbsp;</th>
<th>{{ trans('list.domain') }}</th> <th data-defaultsign="az">{{ trans('list.domain') }}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>

26
resources/views/admin/users/index.twig
View File

@ -14,16 +14,16 @@
<table class="table table-condensed sortable"> <table class="table table-condensed sortable">
<thead> <thead>
<tr> <tr>
<th class="hidden-xs" colspan="2">&nbsp;</th> <th data-defaultsign="_19" class="hidden-xs" colspan="2">&nbsp;</th>
<th>{{ trans('list.email') }}</th> <th data-defaultsign="az">{{ trans('list.email') }}</th>
<th class="hidden-xs">{{ trans('list.registered_at') }}</th> <th data-defaultsign="month" class="hidden-xs">{{ trans('list.registered_at') }}</th>
<th class="hidden-xs">{{ trans('list.registered_from') }}</th> <th data-defaultsign="az" class="hidden-xs">{{ trans('list.registered_from') }}</th>
<th class="hidden-xs">{{ trans('list.confirmed_from') }}</th> <th data-defaultsign="az" class="hidden-xs">{{ trans('list.confirmed_from') }}</th>
<th class="hidden-xs">{{ trans('list.is_admin') }}</th> <th class="hidden-xs">{{ trans('list.is_admin') }}</th>
<th class="hidden-xs">{{ trans('list.has_two_factor') }}</th> <th class="hidden-xs">{{ trans('list.has_two_factor') }}</th>
<th>{{ trans('list.is_activated') }}</th> <th>{{ trans('list.is_activated') }}</th>
<th>{{ trans('list.is_blocked') }}</th> <th>{{ trans('list.is_blocked') }}</th>
<th class="hidden-xs">{{ trans('list.blocked_code') }}</th> <th data-defaultsign="az" class="hidden-xs">{{ trans('list.blocked_code') }}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -41,11 +41,17 @@
{{ user.created_at.formatLocalized(monthAndDayFormat) }} {{ user.created_at.formatLocalized(monthAndDayFormat) }}
{{ user.created_at.format('H:i') }} {{ user.created_at.format('H:i') }}
</td> </td>
<td class="hidden-xs"> <td data-value="{{ user.prefs.registration_ip_address }}" class="hidden-xs">
{{ Preferences.getForUser(user,"registration_ip_address").data }} {{ user.prefs.registration_ip_address }}
{% if user.prefs.registration_ip_address|length > 0 %}
(<a href="http://whois.domaintools.com/{{ user.prefs.registration_ip_address }}">whois</a>)
{% endif %}
</td> </td>
<td class="hidden-xs"> <td data-value="{{ user.prefs.confirmation_ip_address }}" class="hidden-xs">
{{ Preferences.getForUser(user,"confirmation_ip_address").data }} {{ user.prefs.confirmation_ip_address }}
{% if user.prefs.confirmation_ip_address|length > 0 %}
(<a href="http://whois.domaintools.com/{{ user.prefs.confirmation_ip_address }}">whois</a>)
{% endif %}
</td> </td>
<td class="hidden-xs" data-value="{% if user.isAdmin %}1{% else %}0{% endif %}"> <td class="hidden-xs" data-value="{% if user.isAdmin %}1{% else %}0{% endif %}">
{% if user.isAdmin %} {% if user.isAdmin %}

16
resources/views/list/accounts.twig
View File

@ -2,15 +2,15 @@
<thead> <thead>
<tr> <tr>
<th class="hidden-sm hidden-xs" data-defaultsort="disabled">&nbsp;</th> <th class="hidden-sm hidden-xs" data-defaultsort="disabled">&nbsp;</th>
<th>{{ trans('list.name') }}</th> <th data-defaultsign="az">{{ trans('list.name') }}</th>
{% if what == 'asset' %} {% if what == 'asset' %}
<th class="hidden-sm hidden-xs">{{ trans('list.role') }}</th> <th data-defaultsign="az" class="hidden-sm hidden-xs">{{ trans('list.role') }}</th>
{% endif %} {% endif %}
<th class="hidden-sm hidden-xs">{{ trans('list.iban') }}</th> <th data-defaultsign="az" class="hidden-sm hidden-xs">{{ trans('list.iban') }}</th>
<th>{{ trans('list.currentBalance') }}</th> <th data-defaultsign="_19">{{ trans('list.currentBalance') }}</th>
<th class="hidden-sm hidden-xs">{{ trans('list.active') }}</th> <th class="hidden-sm hidden-xs">{{ trans('list.active') }}</th>
<th class="hidden-sm hidden-xs">{{ trans('list.lastActivity') }}</th> <th data-defaultsign="month" class="hidden-sm hidden-xs">{{ trans('list.lastActivity') }}</th>
<th class="hidden-sm hidden-xs">{{ trans('list.balanceDiff', {'start' : Session.get('start').formatLocalized(monthAndDayFormat),'end' : Session.get('end').formatLocalized(monthAndDayFormat)}) }}</th> <th data-defaultsign="_19" class="hidden-sm hidden-xs">{{ trans('list.balanceDiff', {'start' : Session.get('start').formatLocalized(monthAndDayFormat),'end' : Session.get('end').formatLocalized(monthAndDayFormat)}) }}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -42,11 +42,11 @@
{% endif %} {% endif %}
</td> </td>
{% if account.lastActivityDate %} {% if account.lastActivityDate %}
<td class="hidden-sm hidden-xs" data-value="{{ account.lastActivityDate.format('U') }} "> <td class="hidden-sm hidden-xs" data-value="{{ account.lastActivityDate.format('Y-m-d-H-i-s') }} ">
{{ account.lastActivityDate.formatLocalized(monthAndDayFormat) }} {{ account.lastActivityDate.formatLocalized(monthAndDayFormat) }}
</td> </td>
{% else %} {% else %}
<td class="hidden-sm hidden-xs" data-value="0"> <td class="hidden-sm hidden-xs" data-value="0000-00-00-00-00-00">
<em>{{ 'never'|_ }}</em> <em>{{ 'never'|_ }}</em>
</td> </td>
{% endif %} {% endif %}

26
resources/views/list/bills.twig
View File

@ -3,13 +3,13 @@
<tr> <tr>
<th class="hidden-sm hidden-xs" data-defaultsort="disabled">&nbsp;</th> <th class="hidden-sm hidden-xs" data-defaultsort="disabled">&nbsp;</th>
<th>{{ trans('list.name') }}</th> <th>{{ trans('list.name') }}</th>
<th class="hidden-sm hidden-xs">{{ trans('list.matchesOn') }}</th> <th data-defaultsign="az" class="hidden-sm hidden-xs">{{ trans('list.matchesOn') }}</th>
<th colspan="2">{{ trans('list.matchingAmount') }}</th> <th data-defaultsign="_19" colspan="2">{{ trans('list.matchingAmount') }}</th>
<th class="hidden-sm hidden-xs" data-defaultsort="disabled">{{ trans('list.paid_current_period') }}</th> <th data-defaultsign="month" class="hidden-sm hidden-xs">{{ trans('list.paid_current_period') }}</th>
<th class="hidden-sm hidden-xs" data-defaultsort="disabled">{{ trans('list.next_expected_match') }}</th> <th data-defaultsign="month" class="hidden-sm hidden-xs">{{ trans('list.next_expected_match') }}</th>
<th class="hidden-sm hidden-xs">{{ trans('list.active') }}</th> <th class="hidden-sm hidden-xs">{{ trans('list.active') }}</th>
<th class="hidden-sm hidden-xs">{{ trans('list.automatch') }}</th> <th class="hidden-sm hidden-xs">{{ trans('list.automatch') }}</th>
<th class="hidden-sm hidden-xs">{{ trans('list.repeat_freq') }}</th> <th data-defaultsign="az" class="hidden-sm hidden-xs">{{ trans('list.repeat_freq') }}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -37,36 +37,36 @@
</td> </td>
{% if entry.paidDates.count() == 0 and entry.payDates.count() == 0 and entry.active %} {% if entry.paidDates.count() == 0 and entry.payDates.count() == 0 and entry.active %}
<td class="text-muted"> <td class="text-muted" data-value="0001-00-00-00-00-00">
{{ 'not_expected_period'|_ }} {{ 'not_expected_period'|_ }}
</td> </td>
<td class=" hidden-sm hidden-xs"> <td class=" hidden-sm hidden-xs" data-value="{{ entry.nextExpectedMatch.format('Y-m-d-H-i-s') }}">
{{ entry.nextExpectedMatch.formatLocalized(monthAndDayFormat) }} {{ entry.nextExpectedMatch.formatLocalized(monthAndDayFormat) }}
</td> </td>
{% endif %} {% endif %}
{% if entry.paidDates.count() == 0 and entry.payDates.count() > 0 and entry.active %} {% if entry.paidDates.count() == 0 and entry.payDates.count() > 0 and entry.active %}
<td class="text-danger"> <td class="text-danger" data-value="0002-00-00-00-00-00">
{{ 'not_or_not_yet'|_ }} {{ 'not_or_not_yet'|_ }}
</td> </td>
<td class=" hidden-sm hidden-xs"> <td class=" hidden-sm hidden-xs" data-value="{{ entry.nextExpectedMatch.format('Y-m-d-H-i-s') }}">
{{ entry.nextExpectedMatch.formatLocalized(monthAndDayFormat) }} {{ entry.nextExpectedMatch.formatLocalized(monthAndDayFormat) }}
</td> </td>
{% endif %} {% endif %}
{% if entry.paidDates.count() == entry.payDates.count() and entry.payDates.count() > 0 and entry.active %} {% if entry.paidDates.count() == entry.payDates.count() and entry.payDates.count() > 0 and entry.active %}
<td class="text-success"> <td class="text-success" data-value="{{ entry.paidDates.first.format('Y-m-d-H-i-s') }}">
{% for date in entry.paidDates %} {% for date in entry.paidDates %}
{{ date.formatLocalized(monthAndDayFormat) }}<br/> {{ date.formatLocalized(monthAndDayFormat) }}<br/>
{% endfor %} {% endfor %}
</td> </td>
<td class=" hidden-sm hidden-xs"> <td class=" hidden-sm hidden-xs" data-value="{{ entry.nextExpectedMatch.format('Y-m-d-H-i-s') }}">
{{ entry.nextExpectedMatch.formatLocalized(monthAndDayFormat) }} {{ entry.nextExpectedMatch.formatLocalized(monthAndDayFormat) }}
</td> </td>
{% endif %} {% endif %}
{% if not entry.active %} {% if not entry.active %}
<td class="text-muted"> <td class="text-muted" data-value="0000-00-00-00-00-00">
~ ~
</td> </td>
<td class="text-muted hidden-sm hidden-xs"> <td class="text-muted hidden-sm hidden-xs" data-value="0">
~ ~
</td> </td>
{% endif %} {% endif %}

4
resources/views/list/categories.twig
View File

@ -24,11 +24,11 @@
<a href="{{ route('categories.show', category.id) }}" title="{{ category.name }}">{{ category.name }}</a> <a href="{{ route('categories.show', category.id) }}" title="{{ category.name }}">{{ category.name }}</a>
</td> </td>
{% if category.lastActivity.year != "1900" %} {% if category.lastActivity.year != "1900" %}
<td class="hidden-sm hidden-xs" data-value="{{ category.lastActivity.format('U') }}"> <td class="hidden-sm hidden-xs" data-value="{{ category.lastActivity.format('Y-m-d-H-i-s') }}">
{{ category.lastActivity.formatLocalized(monthAndDayFormat) }} {{ category.lastActivity.formatLocalized(monthAndDayFormat) }}
</td> </td>
{% else %} {% else %}
<td class="hidden-sm hidden-xs" data-value="0"> <td class="hidden-sm hidden-xs" data-value="0000-00-00-00-00-00">
<em>{{ 'never'|_ }}</em> <em>{{ 'never'|_ }}</em>
</td> </td>
{% endif %} {% endif %}