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

Better order and display.

Browse Source
This commit is contained in:
James Cole 2016-01-15 10:52:35 +01:00
parent 209258b507
commit fcf6cdb134
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/RuleController.php
View File

@ -548,10 +548,12 @@ class RuleController extends Controller
{ {
$ruleGroups = Auth::user() $ruleGroups = Auth::user()
->ruleGroups() ->ruleGroups()
->orderBy('active', 'DESC')
->orderBy('order', 'ASC') ->orderBy('order', 'ASC')
->with( ->with(
[ [
'rules' => function ($query) { 'rules' => function ($query) {
$query->orderBy('active', 'DESC');
$query->orderBy('order', 'ASC'); $query->orderBy('order', 'ASC');
}, },

36
resources/views/rules/index.twig
View File

@ -28,7 +28,13 @@
<div class="col-lg-12 col-md-12 col-sm-12"> <div class="col-lg-12 col-md-12 col-sm-12">
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ ruleGroup.title }}</h3> <h3 class="box-title">
{% if ruleGroup.active %}
{{ ruleGroup.title }}
{% else %}
<s>{{ ruleGroup.title }}</s> (inactive)
{% endif %}
</h3>
<!-- ACTIONS MENU --> <!-- ACTIONS MENU -->
<div class="box-tools pull-right"> <div class="box-tools pull-right">
@ -104,13 +110,22 @@
</div> </div>
</td> </td>
<td>{{ rule.title }} <td>
{% if rule.active %}
{{ rule.title }}
{% else %}
<s>{{ rule.title }}</s> (inactive)
{% endif %}
{% if rule.stop_processing %} {% if rule.stop_processing %}
<i class="fa fa-stop-circle-o"></i> <i class="fa fa-stop-circle-o"></i>
{% endif %} {% endif %}
{% if rule.description != "" %} {% if rule.description != "" %}
<small><br/>{{ rule.description }}</small> <small
{% if not rule.active %}
class="text-muted"
{% endif %}
><br/>{{ rule.description }}</small>
{% endif %} {% endif %}
</td> </td>
@ -119,7 +134,11 @@
<ul class="small rule-triggers" data-id="{{ rule.id }}"> <ul class="small rule-triggers" data-id="{{ rule.id }}">
{% for trigger in rule.ruleTriggers %} {% for trigger in rule.ruleTriggers %}
{% if trigger.trigger_type != "user_action" %} {% if trigger.trigger_type != "user_action" %}
<li data-id="{{ trigger.id }}">{{ trans(('firefly.rule_trigger_' ~ trigger.trigger_type), {trigger_value: trigger.trigger_value}) }} <li
{% if not rule.active %}
class="text-muted"
{% endif %}
data-id="{{ trigger.id }}">{{ trans(('firefly.rule_trigger_' ~ trigger.trigger_type), {trigger_value: trigger.trigger_value}) }}
{% if trigger.stop_processing %} {% if trigger.stop_processing %}
<i class="fa fa-stop-circle-o"></i> <i class="fa fa-stop-circle-o"></i>
@ -134,7 +153,11 @@
{% if rule.ruleActions.count > 0 %} {% if rule.ruleActions.count > 0 %}
<ul class="small rule-actions" data-id="{{ rule.id }}"> <ul class="small rule-actions" data-id="{{ rule.id }}">
{% for action in rule.ruleActions %} {% for action in rule.ruleActions %}
<li data-id="{{ action.id }}">{{ trans(('firefly.rule_action_' ~ action.action_type), {action_value: action.action_value}) }} <li
{% if not rule.active %}
class="text-muted"
{% endif %}
data-id="{{ action.id }}">{{ trans(('firefly.rule_action_' ~ action.action_type), {action_value: action.action_value}) }}
{% if action.stop_processing %} {% if action.stop_processing %}
<i class="fa fa-stop-circle-o"></i> <i class="fa fa-stop-circle-o"></i>
{% endif %} {% endif %}
@ -154,7 +177,8 @@
{% endif %} {% endif %}
<p> <p>
<br/> <br/>
<a href="{{ route('rules.rule.create', ruleGroup.id) }}" class="btn btn-success">{{ 'new_rule'|_ }}</a> <a href="{{ route('rules.rule.create', ruleGroup.id) }}"
class="btn btn-success">{{ 'new_rule'|_ }}</a>
</p> </p>
</div> </div>
</div> </div>