Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-08 20:22:42 +01:00
Code Issues Releases Activity

Add totals to the tasks report

Browse Source
This commit is contained in:
Hillel Coren 2017-12-31 23:24:57 +02:00
parent d12ddb9beb
commit 3e39100eda
4 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Ninja/Datatables/ProjectDatatable.php
View File

@ -33,7 +33,7 @@ class ProjectDatatable extends EntityDatatable
return Utils::getClientDisplayName($model);
}
return link_to("clients/{$model->client_public_id}", Utils::getClientDisplayName($model))->toHtml();
return link_to("clients/{$model->client_public_id}", $model->client_name)->toHtml();
} else {
return '';
}

19
app/Ninja/Reports/TaskReport.php
View File

@ -13,24 +13,39 @@ class TaskReport extends AbstractReport
'project',
'description',
'duration',
'amount',
];
public function run()
{
$startDate = date_create($this->startDate);
$endDate = date_create($this->endDate);
$tasks = Task::scope()
->orderBy('created_at', 'desc')
->with('client.contacts')
->with('client.contacts', 'project', 'account')
->withArchived()
->dateRange($this->startDate, $this->endDate);
->dateRange($startDate, $endDate);
foreach ($tasks->get() as $task) {
$amount = $task->getRate() * ($task->getDuration() / 60 / 60);
if ($task->client && $task->client->currency_id) {
$currencyId = $task->client->currency_id;
} else {
$currencyId = auth()->user()->account->getCurrencyId();
}
$this->data[] = [
$task->client ? ($this->isExport ? $task->client->getDisplayName() : $task->client->present()->link) : trans('texts.unassigned'),
$this->isExport ? $task->getStartTime() : link_to($task->present()->url, $task->getStartTime()),
$task->present()->project,
$task->description,
Utils::formatTime($task->getDuration()),
Utils::formatMoney($amount, $currencyId),
];
$this->addToTotals($currencyId, 'duration', $task->getDuration());
$this->addToTotals($currencyId, 'amount', $amount);
}
}
}

2
app/Ninja/Repositories/ClientRepository.php
View File

@ -38,7 +38,7 @@ class ClientRepository extends BaseRepository
->select(
DB::raw('COALESCE(clients.currency_id, accounts.currency_id) currency_id'),
DB::raw('COALESCE(clients.country_id, accounts.country_id) country_id'),
DB::raw("CONCAT(contacts.first_name, ' ', contacts.last_name) contact"),
DB::raw("CONCAT(COALESCE(contacts.first_name, ''), ' ', COALESCE(contacts.last_name, '')) contact"),
'clients.public_id',
'clients.name',
'clients.private_notes',

10
resources/views/reports/report_builder.blade.php
View File

@ -262,8 +262,14 @@
- {{ $dimension }}
@endif
</td>
@foreach ($val as $id => $field)
<td>{!! Utils::formatMoney($field, $currencyId) !!}</td>
@foreach ($val as $field => $value)
<td>
@if ($field == 'duration')
{{ Utils::formatTime($value) }}
@else
{{ Utils::formatMoney($value, $currencyId) }}
@endif
</td>
@endforeach
</tr>
@endforeach