Added button to specify parameters and execute the job

app/Http/Controllers/RuleGroupController.php

@@ -4,10 +4,14 @@ declare(strict_types = 1);
 namespace FireflyIII\Http\Controllers;
 
 use Auth;
+use Carbon\Carbon;
 use ExpandedForm;
 use FireflyIII\Http\Requests\RuleGroupFormRequest;
+use FireflyIII\Http\Requests\SelectTransactionsRequest;
+use FireflyIII\Jobs\ExecuteRuleGroupOnExistingTransactions;
 use FireflyIII\Models\RuleGroup;
 use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use Input;
 use Preferences;
 use Session;
@@ -205,4 +209,47 @@ class RuleGroupController extends Controller
 
     }
 
+    /**
+     * Shows a form for the user to select a range of transactions to execute this rulegroup for
+     * @param RuleGroup $ruleGroup
+     */
+    public function selectTransactions(AccountRepositoryInterface $repository, RuleGroup $ruleGroup) 
+    {
+        // does the user have shared accounts?
+        $accounts           = $repository->getAccounts(['Default account', 'Asset account']);
+        $accountList        = ExpandedForm::makeSelectList($accounts);
+        $checkedAccounts    = array_keys($accountList);
+        $first              = session('first')->format('Y-m-d');
+        $today              = Carbon::create()->format('Y-m-d');
+        
+        return view('rules.rule-group.select-transactions', compact('checkedAccounts', 'accountList', 'first', 'today', 'ruleGroup'));
+    }
+    
+    /**
+     * Execute the given rulegroup on a set of existing transactions
+     * @param RuleGroup $ruleGroup
+     */
+    public function execute(SelectTransactionsRequest $request, AccountRepositoryInterface $repository, RuleGroup $ruleGroup) 
+    {
+        // Get parameters specified by the user
+        $accounts = $repository->get($request->get('accounts'));
+        $startDate = new Carbon($request->get('start_date'));
+        $endDate = new Carbon($request->get('end_date'));
+        
+        // Create a job to do the work asynchronously
+        $job = new ExecuteRuleGroupOnExistingTransactions($ruleGroup);
+        
+        // Apply parameters to the job
+        $job->setUser(Auth::user());
+        $job->setAccounts($accounts);
+        $job->setStartDate($startDate);
+        $job->setEndDate($endDate);
+        
+        // Dispatch a new job to execute it in a queue
+        $this->dispatch($job);
+        
+        // Tell the user that the job is queued
+        Session::flash('success', trans('firefly.executed_group_on_existing_transactions', ['title' => $ruleGroup->title]));
+        return redirect()->route('rules.index');
+    }
 }

app/Http/Requests/SelectTransactionsRequest.php

@@ -0,0 +1,50 @@
+<?php
+declare(strict_types = 1);
+/**
+ * SelectTransactionsRequest.php
+ * Copyright (C) 2016 Robert Horlings
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+namespace FireflyIII\Http\Requests;
+
+use Auth;
+use Carbon\Carbon;
+
+/**
+ * Class ExportFormRequest
+ *
+ *
+ * @package FireflyIII\Http\Requests
+ */
+class SelectTransactionsRequest extends Request
+{
+    /**
+     * @return bool
+     */
+    public function authorize()
+    {
+        // Only allow logged in users
+        return Auth::check();
+    }
+
+    /**
+     * @return array
+     */
+    public function rules()
+    {
+        $sessionFirst = clone session('first');
+
+        $first   = $sessionFirst->subDay()->format('Y-m-d');
+        $today   = Carbon::create()->addDay()->format('Y-m-d');
+
+        return [
+            'start_date'          => 'required|date|after:' . $first,
+            'end_date'            => 'required|date|before:' . $today,
+            'accounts'            => 'required',
+            'accounts.*'          => 'required|exists:accounts,id|belongsToUser:accounts',
+        ];
+    }
+}

app/Http/routes.php

@@ -289,12 +289,14 @@ Route::group(
     Route::get('/rules/groups/delete/{ruleGroup}', ['uses' => 'RuleGroupController@delete', 'as' => 'rules.rule-group.delete']);
     Route::get('/rules/groups/up/{ruleGroup}', ['uses' => 'RuleGroupController@up', 'as' => 'rules.rule-group.up']);
     Route::get('/rules/groups/down/{ruleGroup}', ['uses' => 'RuleGroupController@down', 'as' => 'rules.rule-group.down']);
-
+    Route::get('/rules/groups/select_transactions/{ruleGroup}', ['uses' => 'RuleGroupController@selectTransactions', 'as' => 'rules.rule-group.select_transactions']);
+    
     // rule groups POST
     Route::post('/rules/groups/store', ['uses' => 'RuleGroupController@store', 'as' => 'rules.rule-group.store']);
     Route::post('/rules/groups/update/{ruleGroup}', ['uses' => 'RuleGroupController@update', 'as' => 'rules.rule-group.update']);
     Route::post('/rules/groups/destroy/{ruleGroup}', ['uses' => 'RuleGroupController@destroy', 'as' => 'rules.rule-group.destroy']);
-
+    Route::post('/rules/groups/execute/{ruleGroup}', ['uses' => 'RuleGroupController@execute', 'as' => 'rules.rule-group.execute']);
+    
     /**
      * Search Controller
      */

resources/lang/en_US/firefly.php

@@ -133,6 +133,13 @@ return [
     'warning_no_matching_transactions'   => 'No matching transactions found. Please note that for performance reasons, only the last :num_transactions transactions have been checked.',
     'warning_no_valid_triggers'          => 'No valid triggers provided.',
 
+    'execute_on_existing_transactions'          => 'Execute for existing transactions',
+    'execute_on_existing_transactions_intro'    => 'When a rule or group has been changed or added, you can execute it for existing transactions',
+    'execute_on_existing_transactions_short'    => 'Existing transactions',
+    'executed_group_on_existing_transactions'   => 'Executed group ":title" for existing transactions',
+    'include_transactions_from_accounts'        => 'Include transactions from these accounts',
+    'execute'                                   => 'Execute',
+    
     // actions and triggers
     'rule_trigger_user_action'           => 'User action is ":trigger_value"',
     'rule_trigger_from_account_starts'   => 'Source account starts with ":trigger_value"',

resources/lang/nl_NL/firefly.php

@@ -131,6 +131,13 @@ return [
     'warning_transaction_subset'         => 'Je ziet hier maximaal :max_num_transactions transacties omdat je anders veel te lang moet wachten',
     'warning_no_matching_transactions'   => 'Niks gevonden in je laatste :num_transactions transacties.',
     'warning_no_valid_triggers'          => 'Geen geldige triggers gevonden.',
+
+    'execute_on_existing_transactions'          => 'Uitvoeren op bestaande transacties',
+    'execute_on_existing_transactions_intro'    => 'Wanneer een regel of groep is veranderd of toegevoegd, kun je hem hier uitvoeren voor bestaande transacties.',
+    'execute_on_existing_transactions_short'    => 'Bestaande transacties',
+    'executed_group_on_existing_transactions'   => 'Groep :title is uitgevoerd op bestaande transacties',    
+    'include_transactions_from_accounts'        => 'Gebruik transacties van deze rekeningen',
+    'execute'                                   => 'Uitvoeren',
     
     // actions and triggers
     'rule_trigger_user_action'           => 'Gebruikersactie is ":trigger_value"',

resources/views/rules/index.twig

@@ -47,6 +47,8 @@
                                                     class="fa fa-fw fa-pencil"></i> {{ 'edit'|_ }}</a></li>
                                     <li><a href="{{ route('rules.rule-group.delete',ruleGroup.id) }}"><i
                                                     class="fa fa-fw fa-trash"></i> {{ 'delete'|_ }}</a></li>
+                                    <li><a href="{{ route('rules.rule-group.select_transactions',ruleGroup.id) }}"><i
+                                                    class="fa fa-fw fa-anchor"></i> {{ 'execute_on_existing_transactions_short'|_ }}</a></li>
                                         {% if ruleGroup.order > 1 %}
                                     <li><a href="{{ route('rules.rule-group.up',ruleGroup.id) }}"><i
                                                     class="fa fa-fw fa-arrow-up"></i> {{ 'move_rule_group_up'|_ }}</a></li>

resources/views/rules/rule-group/select-transactions.twig

@@ -0,0 +1,42 @@
+{% extends "./layout/default.twig" %}
+
+{% block breadcrumbs %}
+    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
+{% endblock %}
+
+{% block content %}
+
+    <form method="POST" action="{{ route('rules.rule-group.execute', ruleGroup.id) }}" accept-charset="UTF-8" class="form-horizontal" id="execute-rule-group">
+        <input name="_token" type="hidden" value="{{ csrf_token() }}">
+
+        <div class="row">
+            <div class="col-lg-12 col-sm-12 col-xs-12">
+
+                <div class="box box-primary">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">{{ 'execute_on_existing_transactions'|_ }}</h3>
+                    </div>
+                    <div class="box-body">
+                        <div id="form-body">
+                            <p>
+                                {{ 'execute_on_existing_transactions_intro'|_ }}
+                            </p>
+                            <div class="row">
+                                <div class="col-lg-6 col-md-8 col-sm-12 col-xs-12">
+                                    {{ ExpandedForm.date('start_date', first) }}
+                                    {{ ExpandedForm.date('end_date', today) }}
+
+                                    <!-- ACCOUNTS -->
+                                    {{ ExpandedForm.multiCheckbox('accounts',accountList, checkedAccounts, {' class': 'account-checkbox', 'label': trans('firefly.include_transactions_from_accounts') }) }}
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="box-footer">
+                        <input type="submit" name="submit" value="{{ 'execute'|_ }}" id="do-execute-button" class="btn btn-success pull-right"/>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </form>
+{% endblock %}