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

Improve search and display of results.

Browse Source
This commit is contained in:
James Cole
2017-07-15 17:19:12 +02:00
parent 22144b78ea
commit accbdea942
18 changed files with 225 additions and 587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,7 @@ namespace FireflyIII\Http\Controllers;
use FireflyIII\Support\Search\SearchInterface;
use Illuminate\Http\Request;
use Illuminate\Support\Collection;
use Response;
use View;
/**
@@ -51,9 +52,14 @@ class SearchController extends Controller
*/
public function index(Request $request, SearchInterface $searcher)
{
$query = $request->get('q');
$fullQuery = $request->get('q');
return view('search.index',compact('query'));
// parse search terms:
$searcher->parseQuery($fullQuery);
$query = $searcher->getWordsAsString();
$subTitle = trans('breadcrumbs.search_result', ['query' => $query]);
return view('search.index', compact('query', 'fullQuery', 'subTitle'));
// yes, hard coded values:
$minSearchLen = 1;
@@ -98,4 +104,19 @@ class SearchController extends Controller
return view('search.index', compact('rawQuery', 'hasModifiers', 'modifiers', 'subTitle', 'limit', 'query', 'result'));
}
public function search(Request $request, SearchInterface $searcher)
{
$fullQuery = $request->get('query');
// parse search terms:
$searcher->parseQuery($fullQuery);
$searcher->setLimit(20);
$transactions = $searcher->searchTransactions();
$html = view('search.search', compact('transactions'))->render();
return Response::json(['count' => $transactions->count(), 'html' => $html]);
}
}