Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tweak the messaging on find missing, and fix bug in showing the results. #455

Merged
merged 2 commits into from
Dec 17, 2021
+53 −42
Merged

Tweak the messaging on find missing, and fix bug in showing the results. #455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04ae021
be smarter about number of matches text
Dec 17, 2021
40d46e4
properly reset the docFinder so we can look up our original rated docs.
Dec 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/assets/javascripts/controllers/docFinder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,11 @@ angular.module('QuepidApp')

$scope.resetToAllRatedDocs = function(){
$scope.docFinder.queryText = '';
$scope.docFinder.docs = [];
$scope.initializeToRatedDocs();

};

$scope.initializeToRatedDocs = function() {
// Initialize to rated docs
var fieldSpec = currSettings.createFieldSpec();
Expand Down
92 changes: 51 additions & 41 deletions app/assets/templates/views/targetedSearchModal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,62 +26,72 @@ <h3 class="modal-title">Find and Rate Missing Documents</h3>
</p>
</form>
<form ng-submit="resetToAllRatedDocs()">
<p>
<input type="submit" class="btn btn-default form-control" ng-class="{ disabled: defaultList }" value="Show Only Rated Docs"></input>
</p>
<p>
<input type="submit" class="btn btn-default form-control" ng-disabled="defaultList" value="Reset to All Rated Docs"></input>
</p>
</form>
</div>
</div>
</div>
</div>

<div style="padding-top: 20px">
</div>
<div style="padding-top: 20px">
</div>

<div>
<div class="row alert alert-warning" ng-if="this.docFinder.numFound == 0">
Your query <em>{{docFinder.lastQuery}}</em> returned no results
</div>
<div>
<div class="row alert alert-warning" ng-if="this.docFinder.numFound == 0">
Your query <em>{{docFinder.lastQuery}}</em> returned no results
</div>

<div ng-if="this.docFinder.numFound > 0">
<p ng-if="!defaultList">
Your query <em>{{docFinder.lastQuery}}</em> returned <em>{{docFinder.numFound}}</em> results
</p>
<div ng-if="this.docFinder.numFound > 0">
<p ng-if="!defaultList">
Your query <em>{{docFinder.lastQuery}}</em> returned
<ng-pluralize count="docFinder.numFound"
when="{'0': 'no matching documents.',
'1': 'one matching document.',
'other': '{} matching documents.'}">
</ng-pluralize>

<p ng-if="defaultList">
Your original query <em>{{query.queryText}}</em> has a total of <em>{{docFinder.numFound}}</em> ratings
</p>


<div class="score-all pull-left">
<strong>Score All</strong>
<div class="ratings">
<div class="single-rating" ng-click="ratings.open()" uib-popover-template="'views/ratings/popover.html'" popover-trigger="outsideClick" popover-placement="auto right" popover-is-open="ratings.ratingsOn">
<span class="btn" style="background-color: rgb(119, 119, 119);">- <span class="caret"></span></span>
</div>
</div>
</div>
</p>
<p ng-if="defaultList">
<ng-pluralize count="docFinder.numFound"
when="{'0': 'There are no ratings created yet',
'1': 'There is one rating',
'other': 'There are {} ratings'}">
</ng-pluralize>
for your original query <em>{{query.queryText}}</em>.
</p>

<div class="alert alert-warning pull-left score-all-alert">
Changing ratings will affect the query score.
</div>

<search-result class="search-result" max-doc-score="query.maxDocScore()" explain-view="'full'" explain-viewport="'#targeted-search-modal'" ng-repeat="doc in docFinder.docs" doc="doc" field-spec="query.fieldSpec" rank="{{$index + 1}}" query="query" doc-id="doc.id">
</search-result>
<div class="score-all pull-left">
<strong>Score All</strong>
<div class="ratings">
<div class="single-rating" ng-click="ratings.open()" uib-popover-template="'views/ratings/popover.html'" popover-trigger="outsideClick" popover-placement="auto right" popover-is-open="ratings.ratingsOn">
<span class="btn" style="background-color: rgb(119, 119, 119);">- <span class="caret"></span></span>
</div>
</div>
</div>

<div class='row'>
<span ng-if="docFinder.numFound > docFinder.docs.length">
<a class="btn btn-default" ng-click="paginate()">
Peek at the next page of results
</a>
</span>

<span ng-show="docFinder.paging">
<i class="fa fa-spin fa-circle-o-notch"></i>
</span>
<div class="alert alert-warning pull-left score-all-alert">
Changing ratings will affect the query score.
</div>

<search-result class="search-result" max-doc-score="query.maxDocScore()" explain-view="'full'" explain-viewport="'#targeted-search-modal'" ng-repeat="doc in docFinder.docs" doc="doc" field-spec="query.fieldSpec" rank="{{$index + 1}}" query="query" doc-id="doc.id">
</search-result>
</div>
</div>

<div class='row'>
<span ng-if="docFinder.numFound > docFinder.docs.length">
<a class="btn btn-default" ng-click="paginate()">
Peek at the next page of results
</a>
</span>

<span ng-show="docFinder.paging">
<i class="fa fa-spin fa-circle-o-notch"></i>
</span>
</div>
<div class="modal-footer">
<button class="btn btn-default" ng-click="targetedSearchModalModel.closeModal()">Close</button>
</div>