FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove subfleet_expenses and combine into main expenses table; select expense type on subfleet #130 #136

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-03-05 21:24:49 -06:00
parent 8c05ad134e
commit 88a8fd2bbd
20 changed files with 160 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/admin/expenses/index.blade.php
View File

@@ -14,7 +14,7 @@
<div class="content">
@if(!filled($expenses))
<p class="text-center">
You must add a subfleet before you can add an aircraft!
There are no expenses
</p>
@else
@include('admin.expenses.table')

18
resources/views/admin/subfleets/expenses.blade.php
View File

@@ -11,6 +11,7 @@
<thead>
<th>Name</th>
<th>Cost&nbsp;<span class="small">{!! currency(config('phpvms.currency')) !!}</span></th>
<th>Type</th>
<th></th>
</thead>
@endif
@@ -19,16 +20,24 @@
<tr>
<td>
<p>
<a href="#" data-pk="{!! $expense->id !!}"
<a class="text" href="#" data-pk="{!! $expense->id !!}"
data-name="name">{!! $expense->name !!}</a>
</p>
</td>
<td>
<p>
<a href="#" data-pk="{!! $expense->id !!}"
<a class="text" href="#" data-pk="{!! $expense->id !!}"
data-name="amount">{!! $expense->amount !!}</a>
</p>
</td>
<td>
<p>
<a href="#"
class="dropdown"
data-pk="{!! $expense->id !!}"
data-name="type">{!! \App\Models\Enums\ExpenseType::label($expense->type) !!}</a>
</p>
</td>
<td align="right">
{!! Form::open(['url' => url('/admin/subfleets/'.$subfleet->id.'/expenses'),
'method' => 'delete', 'class' => 'modify_expense form-inline']) !!}
@@ -49,8 +58,9 @@
<div class="text-right">
{!! Form::open(['url' => url('/admin/subfleets/'.$subfleet->id.'/expenses'),
'method' => 'post', 'class' => 'modify_expense form-inline']) !!}
{!! Form::input('text', 'name', null, ['class' => 'form-control input-sm']) !!}
{!! Form::number('cost', null, ['class' => 'form-control input-sm']) !!}
{!! Form::input('text', 'name', null, ['class' => 'form-control input-sm', 'placeholder' => 'Name']) !!}
{!! Form::number('cost', null, ['class' => 'form-control input-sm', 'placeholder' => 'Amount']) !!}
{!! Form::select('type', \App\Models\Enums\ExpenseType::select(), null, ['class' => 'select2']) !!}
{!! Form::button('<i class="fa fa-plus"></i> Add', ['type' => 'submit',
'class' => 'btn btn-success btn-small']) !!}
{!! Form::close() !!}

21
resources/views/admin/subfleets/script.blade.php
View File

@@ -33,9 +33,7 @@ function setEditable() {
}
});
$('#subfleet-expenses a').editable({
type: 'text',
mode: 'inline',
$('#subfleet-expenses a.text').editable({
emptytext: '0',
url: '{!! url('/admin/subfleets/'.$subfleet->id.'/expenses') !!}',
title: 'Enter override value',
@@ -48,6 +46,23 @@ function setEditable() {
}
}
});
$('#subfleet-expenses a.dropdown').editable({
type: 'select',
emptytext: '0',
source: {!! json_encode(list_to_editable(\App\Models\Enums\ExpenseType::select())) !!},
url: '{!! url('/admin/subfleets/'.$subfleet->id.'/expenses') !!}',
title: 'Enter override value',
ajaxOptions: {'type': 'put'},
params: function (params) {
console.log(params);
return {
expense_id: params.pk,
name: params.name,
value: params.value
}
}
});
}
$(document).ready(function() {