kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-09 23:41:10 +00:00
Code Issues Projects Releases Wiki Activity

Build code for tag report.

Browse Source
This commit is contained in:
James Cole
2017-02-15 20:07:10 +01:00
parent ae06f1b8f0
commit a5f8aa914f
17 changed files with 265 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
resources/lang/en_US/firefly.php
View File

@@ -554,6 +554,7 @@ return [
'select_more_than_one_account' => 'Please select more than one account',
'select_more_than_one_category' => 'Please select more than one category',
'select_more_than_one_budget' => 'Please select more than one budget',
'select_more_than_one_tag' => 'Please select more than one tag',
'from_to' => 'From :start to :end',
// categories:
@@ -711,6 +712,7 @@ return [
'report_type_audit' => 'Transaction history overview (audit)',
'report_type_category' => 'Category report',
'report_type_budget' => 'Budget report',
'report_type_tag' => 'Tag report',
'report_type_meta-history' => 'Categories, budgets and bills overview',
'more_info_help' => 'More information about these types of reports can be found in the help pages. Press the (?) icon in the top right corner.',
'report_included_accounts' => 'Included accounts',
@@ -729,8 +731,9 @@ return [
'report_has_no_extra_options' => 'This report has no extra options',
'reports_submit' => 'View report',
'end_after_start_date' => 'End date of report must be after start date.',
'select_category' => 'Select one or more categories.',
'select_budget' => 'Select one or more budgets.',
'select_category' => 'Select category(ies)',
'select_budget' => 'Select budget(s).',
'select_tag' => 'Select tag(s).',
'income_per_category' => 'Income per category',
'expense_per_category' => 'Expense per category',
'expense_per_budget' => 'Expense per budget',
@@ -961,5 +964,5 @@ return [
'import_finished_text_with_link' => 'You can find a list of your imported transactions on the page of the <a href="tags/show/:tag">tag that was created for this import</a>.',
// sandstorm.io errors and messages:
'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.',
'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.',
];

1
resources/views/reports/index.twig
View File

@@ -28,6 +28,7 @@
<option label="{{ 'report_type_audit'|_ }}" value="audit">{{ 'report_type_audit'|_ }}</option>
<option label="{{ 'report_type_budget'|_ }}" value="budget">{{ 'report_type_budget'|_ }}</option>
<option label="{{ 'report_type_category'|_ }}" value="category">{{ 'report_type_category'|_ }}</option>
<option label="{{ 'report_type_tag'|_ }}" value="tag">{{ 'report_type_tag'|_ }}</option>
</select>
</div>
</div>

18
resources/views/reports/options/budget.twig
View File

@@ -1,8 +1,10 @@
<p>
{{ 'select_budget'|_ }}
</p>
<select id="inputBudgets" name="budget[]" multiple="multiple" class="form-control">
{% for budget in budgets %}
<option value="{{ budget.id }}" label="{{ budget.name }}">{{ budget.name }}</option>
{% endfor %}
</select>
<div class="form-group">
<label for="inputBudgets" class="col-sm-3 control-label">{{ 'select_budget'|_ }}</label>
<div class="col-sm-9">
<select id="inputBudgets" name="budget[]" multiple="multiple" class="form-control">
{% for budget in budgets %}
<option value="{{ budget.id }}" label="{{ budget.name }}">{{ budget.name }}</option>
{% endfor %}
</select>
</div>
</div>

19
resources/views/reports/options/category.twig
View File

@@ -1,8 +1,11 @@
<p>
{{ 'select_category'|_ }}
</p>
<select id="inputCategories" name="category[]" multiple="multiple" class="form-control">
{% for category in categories %}
<option value="{{ category.id }}" label="{{ category.name }}">{{ category.name }}</option>
{% endfor %}
</select>
<div class="form-group">
<label for="inputCategories" class="col-sm-3 control-label">{{ 'select_category'|_ }}</label>
<div class="col-sm-9">
<select id="inputCategories" name="category[]" multiple="multiple" class="form-control">
{% for category in categories %}
<option value="{{ category.id }}" label="{{ category.name }}">{{ category.name }}</option>
{% endfor %}
</select>
</div>
</div>

10
resources/views/reports/options/tag.twig Normal file
View File

@@ -0,0 +1,10 @@
<div class="form-group">
<label for="inputTags" class="col-sm-3 control-label">{{ 'select_tag'|_ }}</label>
<div class="col-sm-9">
<select id="inputTags" name="tag[]" multiple="multiple" class="form-control">
{% for tag in tags %}
<option value="{{ tag.tag }}" label="{{ tag.tag }}">{{ tag.tag }}</option>
{% endfor %}
</select>
</div>
</div>