This commit is contained in:
James Cole
2024-11-30 06:19:21 +01:00
parent f5c56e02da
commit 9ad005e31f
9 changed files with 154 additions and 37 deletions

View File

@@ -25,6 +25,10 @@
<div class="form-group">
<input step="any" class="form-control" id="amount" value="" autocomplete="off" name="amount" type="number"/>
</div>
<div class="form-group">
<textarea name="notes" class="form-control" rows="3" placeholder="{{ 'notes'|_ }}"></textarea>
<span class="help-block">{{ trans('firefly.field_supports_markdown')|raw }}</span>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button>

View File

@@ -0,0 +1,28 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal"><span>&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
</button>
<h4 class="modal-title">
{{ trans('firefly.edit_bl_notes') }}
</h4>
</div>
<form style="display: inline;" action="{{ route('budget-limits.update', [budgetLimit.id]) }}" method="POST">
<div class="modal-body">
<input type="hidden" name="_token" value="{{ csrf_token() }}"/>
<input type="hidden" name="redirect" value="true"/>
<input type="hidden" name="amount" value="{{ budgetLimit.amount }}"/>
<div class="form-group">
<textarea name="notes" class="form-control" rows="3" placeholder="{{ 'notes'|_ }}">{{ notes }}</textarea>
<span class="help-block">{{ trans('firefly.field_supports_markdown')|raw }}</span>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button>
<button type="submit" class="btn btn-primary">{{ 'update_bl_notes'|_ }}</button>
</div>
</form>
</div>
</div>

View File

@@ -0,0 +1,20 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal"><span>&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
</button>
<h4 class="modal-title">
{{ trans('firefly.set_budget_limit_notes') }}
</h4>
</div>
<div class="modal-body">
<div>
{{ notes|markdown }}
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button>
</div>
</div>
</div>

View File

@@ -212,6 +212,7 @@
</tr>
</thead>
<tbody>
{# START OF BUDGET ROW #}
{% for budget in budgets %}
<tr data-id="{{ budget.id }}">
<td class="hidden-sm hidden-xs">
@@ -269,7 +270,6 @@
{% if not budgetLimit.in_range %}
<small class="text-muted">
{{ trans('firefly.budget_limit_not_in_range', {start: budgetLimit.start_date, end: budgetLimit.end_date}) }}
</small><br>
{% endif %}
<div class="input-group bl_entry" data-budget-limit-id="{{ budgetLimit.id }}">
@@ -285,7 +285,13 @@
<li>
<a class="delete_bl" href="#" data-budget-limit-id="{{ budgetLimit.id }}">{{ trans('firefly.remove_budgeted_amount', {currency: budgetLimit.currency_name }) }}</a>
</li>
<li>
<a class="edit_bl" href="#" data-id="{{ budgetLimit.id }}">{{ trans('firefly.edit_bl_notes') }}</a>
</li>
</ul>
{% if '' != budgetLimit.notes %}
<a href="#" class="btn btn-default show_bl" data-id="{{ budgetLimit.id }}"><em title="{{ 'view_notes'|_ }}" class="fa fa-commenting-o" aria-hidden="true"></em></a>
{% endif %}
</div>
</div>
<span class="text-danger budget_warning" data-id="{{ budget.id }}" data-budgetLimit="{{ budgetLimit.id }}"
@@ -368,6 +374,7 @@
</td>
</tr>
{% endfor %}
{# END OF BUDGET ROW #}
</tbody>
</table>
</div>
@@ -444,6 +451,8 @@
var createBudgetLimitUrl = "{{ route('budget-limits.create', ['REPLACEME', start.format('Y-m-d'), end.format('Y-m-d')]) }}";
var storeBudgetLimitUrl = "{{ route('budget-limits.store') }}";
var updateBudgetLimitUrl = "{{ route('budget-limits.update', ['REPLACEME']) }}";
var showBudgetLimitUrl = "{{ route('budget-limits.show', ['REPLACEME']) }}";
var editBudgetLimitUrl = "{{ route('budget-limits.edit', ['REPLACEME']) }}";
var deleteBudgetLimitUrl = "{{ route('budget-limits.delete', ['REPLACEME']) }}";
var totalBudgetedUrl = "{{ route('json.budget.total-budgeted', ['REPLACEME', start.format('Y-m-d'), end.format('Y-m-d')]) }}";