Update rule controller to have some auto complete functionality.

This commit is contained in:
James Cole
2017-01-20 19:50:22 +01:00
parent 8635fe7ebb
commit 50e39a4a75
8 changed files with 179 additions and 34 deletions

View File

@@ -21,6 +21,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Account\AccountTaskerInterface;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\Repositories\Category\CategoryRepositoryInterface as CRI;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Repositories\Tag\TagRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use Illuminate\Http\Request;
@@ -61,6 +62,27 @@ class JsonController extends Controller
return Response::json(['html' => $view]);
}
/**
* Returns a JSON list of all accounts.
*
* @param AccountRepositoryInterface $repository
*
* @return \Illuminate\Http\JsonResponse
*
*/
public function allAccounts(AccountRepositoryInterface $repository)
{
$return = array_unique(
$repository->getAccountsByType(
[AccountType::REVENUE, AccountType::EXPENSE, AccountType::BENEFICIARY, AccountType::DEFAULT, AccountType::ASSET]
)->pluck('name')->toArray()
);
sort($return);
return Response::json($return);
}
/**
* @param BillRepositoryInterface $repository
*
@@ -166,11 +188,8 @@ class JsonController extends Controller
*/
public function categories(CRI $repository)
{
$list = $repository->getCategories();
$return = [];
foreach ($list as $entry) {
$return[] = $entry->name;
}
$return = array_unique($repository->getCategories()->pluck('name')->toArray());
sort($return);
return Response::json($return);
}
@@ -195,14 +214,10 @@ class JsonController extends Controller
*/
public function expenseAccounts(AccountRepositoryInterface $repository)
{
$list = $repository->getAccountsByType([AccountType::EXPENSE, AccountType::BENEFICIARY]);
$return = [];
foreach ($list as $entry) {
$return[] = $entry->name;
}
$return = array_unique($repository->getAccountsByType([AccountType::EXPENSE, AccountType::BENEFICIARY])->pluck('name')->toArray());
sort($return);
return Response::json($return);
}
/**
@@ -213,14 +228,10 @@ class JsonController extends Controller
*/
public function revenueAccounts(AccountRepositoryInterface $repository)
{
$list = $repository->getAccountsByType([AccountType::REVENUE]);
$return = [];
foreach ($list as $entry) {
$return[] = $entry->name;
}
$return = array_unique($repository->getAccountsByType([AccountType::REVENUE])->pluck('name')->toArray());
sort($return);
return Response::json($return);
}
/**
@@ -232,11 +243,8 @@ class JsonController extends Controller
*/
public function tags(TagRepositoryInterface $tagRepository)
{
$list = $tagRepository->get();
$return = [];
foreach ($list as $entry) {
$return[] = $entry->tag;
}
$return = array_unique($tagRepository->get()->pluck('tag')->toArray());
sort($return);
return Response::json($return);
@@ -270,6 +278,22 @@ class JsonController extends Controller
return Response::json(['steps' => $steps, 'template' => $template]);
}
/**
* @param JournalCollectorInterface $collector
*
* @return \Illuminate\Http\JsonResponse
*/
public function allTransactionJournals(JournalCollectorInterface $collector)
{
$collector->setLimit(100)->setPage(1);
$return = array_unique($collector->getJournals()->pluck('description')->toArray());
sort($return);
return Response::json($return);
}
/**
* @param JournalCollectorInterface $collector
* @param string $what
@@ -278,25 +302,29 @@ class JsonController extends Controller
*/
public function transactionJournals(JournalCollectorInterface $collector, string $what)
{
$descriptions = [];
$type = config('firefly.transactionTypesByWhat.' . $what);
$types = [$type];
// use journal collector instead:
$collector->setTypes($types)->setLimit(100)->setPage(1);
$journals = $collector->getJournals();
foreach ($journals as $j) {
$descriptions[] = $j->description;
}
$return = array_unique($collector->getJournals()->pluck('description')->toArray());
sort($return);
$descriptions = array_unique($descriptions);
sort($descriptions);
return Response::json($descriptions);
return Response::json($return);
}
/**
*
*/
public function transactionTypes(JournalRepositoryInterface $repository)
{
$return = array_unique($repository->getTransactionTypes()->pluck('type')->toArray());
sort($return);
return Response::json($return);
}
/**
* @param Request $request
*