From 7104f05d47b6f8df5bd32e08626350e075868d1b Mon Sep 17 00:00:00 2001
From: Eike Cochu <eike@cochu.com>
Date: Sat, 2 Jul 2016 14:58:04 +0200
Subject: [PATCH] fixed search results
---
.../java/de/vipra/rest/resource/SearchResource.java | 2 +-
vipra-ui/app/html/index.html | 13 +++++++------
vipra-ui/app/js/controllers.js | 2 +-
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/vipra-backend/src/main/java/de/vipra/rest/resource/SearchResource.java b/vipra-backend/src/main/java/de/vipra/rest/resource/SearchResource.java
index d3f01991..2ebcb267 100644
--- a/vipra-backend/src/main/java/de/vipra/rest/resource/SearchResource.java
+++ b/vipra-backend/src/main/java/de/vipra/rest/resource/SearchResource.java
@@ -137,7 +137,7 @@ public class SearchResource {
articles.add(article);
}
- res.addHeader("total", articles.size());
+ res.addHeader("total", hits.getTotalHits());
return res.ok(articles);
}
diff --git a/vipra-ui/app/html/index.html b/vipra-ui/app/html/index.html
index a9a87355..ca74dd38 100644
--- a/vipra-ui/app/html/index.html
+++ b/vipra-ui/app/html/index.html
@@ -76,19 +76,20 @@
<h4>No Results</h4>
</div>
<div class="col-md-12" ng-show="searchResults.length > 0" ng-cloak>
- <h4>Results</h4>
+ <h4>Results <small class="text-muted" ng-bind-template="({{totalResults}} in total)"></small></h4>
+ <p>Showing results 1 to <span ng-bind="searchResults.length"></span></p>
<ul class="list-unstyled search-results">
<li class="search-result" ng-repeat="article in searchResults track by article.id">
- <a ui-sref="articles.show({id:article.id})" ng-bind="article.title"></a>
- <p>
- <span class="text" ng-bind="article.text"></span>
+ <article-link details="false" article="article"/>
+ <p class="text-justify">
+ <span class="text" style="text-align:justify" ng-bind="article.text"></span>
<br>
- <small class="text-muted" ng-bind-template="{{::article.meta.score.toFixed(3)}} – {{::Vipra.formatDate(article.date)}}" ng-attr-title="Score: {{::article.meta.score.toFixed(3)}}, Date: {{::Vipra.formatDate(article.date)}}"></small>
+ <small class="text-muted" ng-bind-template="Score: {{::article.meta.score.toFixed(3)}}" ng-attr-title="Score: {{::article.meta.score.toFixed(3)}}"></small>
</p>
</li>
</ul>
<div class="text-center" ng-hide="noMoreResults">
- <button class="btn btn-default" ng-click="loadMoreResults()" analytics-on analytics-event="Index Search Results (More)" analytics-category="Index actions">Load more</button>
+ <button class="btn btn-default" ng-click="loadMoreResults()" style="margin-bottom:70px" analytics-on analytics-event="Index Search Results (More)" analytics-category="Index actions">Load more</button>
</div>
</div>
</div>
diff --git a/vipra-ui/app/js/controllers.js b/vipra-ui/app/js/controllers.js
index 50c43a34..ac05975b 100644
--- a/vipra-ui/app/js/controllers.js
+++ b/vipra-ui/app/js/controllers.js
@@ -283,7 +283,7 @@
$scope.searchResults.push.apply($scope.searchResults, data);
$scope.skip += $scope.searchResultsStep;
$scope.totalResults = headers("V-Total");
- $scope.noMoreResults = data.length < $scope.searchResultsStep;
+ $scope.noMoreResults = $scope.skip >= $scope.totalResults;
}, function() {
$scope.searching = false;
});
--
GitLab