kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 23:45:10 +00:00
Code Issues Projects Releases Wiki Activity

Fix search

Browse Source
This commit is contained in:
James Cole
2019-08-02 05:32:30 +02:00
parent fc70afa3ea
commit ac903b88ba
4 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/Http/Controllers/SearchController.php
View File

@@ -22,11 +22,9 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers; namespace FireflyIII\Http\Controllers;
use FireflyIII\Support\CacheProperties;
use FireflyIII\Support\Search\SearchInterface; use FireflyIII\Support\Search\SearchInterface;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Collection;
use Log; use Log;
use Throwable; use Throwable;
@@ -62,15 +60,18 @@ class SearchController extends Controller
*/ */
public function index(Request $request, SearchInterface $searcher) public function index(Request $request, SearchInterface $searcher)
{ {
$fullQuery = (string)$request->get('q'); $fullQuery = (string)$request->get('search');
// parse search terms: // parse search terms:
$searcher->parseQuery($fullQuery); $searcher->parseQuery($fullQuery);
$query = $searcher->getWordsAsString(); $query = $searcher->getWordsAsString();
$modifiers = $searcher->getModifiers(); $modifiers = $searcher->getModifiers();
$subTitle = (string)trans('breadcrumbs.search_result', ['query' => $query]); $subTitle = (string)trans('breadcrumbs.search_result', ['query' => $query]);
return view('search.index', compact('query','modifiers', 'fullQuery', 'subTitle')); return view(
'search.index',
compact('query', 'modifiers', 'fullQuery', 'subTitle')
);
} }
/** /**
@@ -83,15 +84,15 @@ class SearchController extends Controller
*/ */
public function search(Request $request, SearchInterface $searcher): JsonResponse public function search(Request $request, SearchInterface $searcher): JsonResponse
{ {
$fullQuery = (string)$request->get('search'); $fullQuery = (string)$request->get('query');
$searcher->parseQuery($fullQuery); $searcher->parseQuery($fullQuery);
$searcher->setLimit((int)config('firefly.search_result_limit')); $searcher->setLimit((int)config('firefly.search_result_limit'));
$transactions = $searcher->searchTransactions(); $groups = $searcher->searchTransactions();
$searchTime = $searcher->searchTime(); // in seconds $searchTime = $searcher->searchTime(); // in seconds
try { try {
$html = view('search.search', compact('transactions','searchTime'))->render(); $html = view('search.search', compact('groups','searchTime'))->render();
// @codeCoverageIgnoreStart // @codeCoverageIgnoreStart
} catch (Throwable $e) { } catch (Throwable $e) {
Log::error(sprintf('Cannot render search.search: %s', $e->getMessage())); Log::error(sprintf('Cannot render search.search: %s', $e->getMessage()));
@@ -100,6 +101,6 @@ class SearchController extends Controller
// @codeCoverageIgnoreEnd // @codeCoverageIgnoreEnd
return response()->json(['count' => $transactions->count(), 'html' => $html]); return response()->json(['count' => $groups->count(), 'html' => $html]);
} }
} }

3
app/Support/Search/Search.php
View File

@@ -168,13 +168,12 @@ class Search implements SearchInterface
$collector->setLimit($pageSize)->setPage($page)->withAccountInformation(); $collector->setLimit($pageSize)->setPage($page)->withAccountInformation();
$collector->withCategoryInformation()->withBudgetInformation(); $collector->withCategoryInformation()->withBudgetInformation();
$collector->setSearchWords($this->words); $collector->setSearchWords($this->words);
// Most modifiers can be applied to the collector directly. // Most modifiers can be applied to the collector directly.
$collector = $this->applyModifiers($collector); $collector = $this->applyModifiers($collector);
return $collector->getPaginatedTransactions(); return $collector->getPaginatedGroups();
} }

4
resources/views/v1/layout/default.twig
View File

@@ -104,9 +104,9 @@
<section class="sidebar"> <section class="sidebar">
<form action="{{ route('search.index') }}" method="get" class="sidebar-form"> <form action="{{ route('search.index') }}" method="get" class="sidebar-form">
<div class="input-group"> <div class="input-group">
<input autocomplete="off" type="text" name="q" class="form-control" placeholder="{{ 'searchPlaceholder'|_ }}" value="{{ query }}"/> <input autocomplete="off" type="text" name="search" class="form-control" placeholder="{{ 'searchPlaceholder'|_ }}" value="{{ query }}"/>
<span class="input-group-btn"> <span class="input-group-btn">
<button type='submit' name='search' id='search-btn' class="btn btn-flat"><i class="fa fa-search"></i></button> <button type='submit' name='go' id='search-btn' class="btn btn-flat"><i class="fa fa-search"></i></button>
</span> </span>
</div> </div>
</form> </form>

3
resources/views/v1/search/search.twig
View File

@@ -3,5 +3,4 @@
{{ trans('firefly.search_found_transactions', {count: transactions.count, time: searchTime}) }} {{ trans('firefly.search_found_transactions', {count: transactions.count, time: searchTime}) }}
</p> </p>
{# TODO REPLACE ME#} {% include 'list.groups' %}
<h1 style="color:red;">REPLACE ME</h1>