From 04ae02148284b87c58fec3c690d912ad05dd096d Mon Sep 17 00:00:00 2001
From: "epugh@opensourceconnections.com" <>
Date: Fri, 17 Dec 2021 09:59:14 -0500
Subject: [PATCH 1/2] be smarter about number of matches text

---
 .../templates/views/targetedSearchModal.html  | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/app/assets/templates/views/targetedSearchModal.html b/app/assets/templates/views/targetedSearchModal.html
index e534d72c3..9daff5ae4 100644
--- a/app/assets/templates/views/targetedSearchModal.html
+++ b/app/assets/templates/views/targetedSearchModal.html
@@ -27,7 +27,8 @@ <h3 class="modal-title">Find and Rate Missing Documents</h3>
     </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>
+          defaultList?  {{defaultList}}
+          <input type="submit" class="btn btn-default form-control" ng-disabled="defaultList" ng-class="{ disabled: defaultList }" value="Show All Rated Docs"></input>
           </p>
     </form>
         </div>
@@ -43,11 +44,23 @@ <h3 class="modal-title">Find and Rate Missing Documents</h3>
 
       <div ng-if="this.docFinder.numFound > 0">
         <p ng-if="!defaultList">
-          Your query <em>{{docFinder.lastQuery}}</em> returned <em>{{docFinder.numFound}}</em> results
-        </p>
+          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>
         <p ng-if="defaultList">
-          Your original query <em>{{query.queryText}}</em> has a total of <em>{{docFinder.numFound}}</em> ratings
+          <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>
 
 

From 40d46e4c1316c5394d4e0917448cca1db72b596f Mon Sep 17 00:00:00 2001
From: "epugh@opensourceconnections.com" <>
Date: Fri, 17 Dec 2021 13:26:05 -0500
Subject: [PATCH 2/2] properly reset the docFinder so we can look up our
 original rated docs.

---
 .../javascripts/controllers/docFinder.js      |   3 +-
 .../templates/views/targetedSearchModal.html  | 103 +++++++++---------
 2 files changed, 52 insertions(+), 54 deletions(-)

diff --git a/app/assets/javascripts/controllers/docFinder.js b/app/assets/javascripts/controllers/docFinder.js
index ac00528f9..3d10ba744 100644
--- a/app/assets/javascripts/controllers/docFinder.js
+++ b/app/assets/javascripts/controllers/docFinder.js
@@ -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();
diff --git a/app/assets/templates/views/targetedSearchModal.html b/app/assets/templates/views/targetedSearchModal.html
index 9daff5ae4..f5a397d5f 100644
--- a/app/assets/templates/views/targetedSearchModal.html
+++ b/app/assets/templates/views/targetedSearchModal.html
@@ -26,75 +26,72 @@ <h3 class="modal-title">Find and Rate Missing Documents</h3>
           </p>
     </form>
     <form ng-submit="resetToAllRatedDocs()">
-          <p>
-          defaultList?  {{defaultList}}
-          <input type="submit" class="btn btn-default form-control" ng-disabled="defaultList" ng-class="{ disabled: defaultList }" value="Show All 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 style="padding-top: 20px">
-    </div>
+  </div>
+</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 style="padding-top: 20px">
+</div>
 
-      <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>
+<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
+      <ng-pluralize count="docFinder.numFound"
+             when="{'0': 'no matching documents.',
+                 '1': 'one matching document.',
+                 'other': '{} matching documents.'}">
+      </ng-pluralize>
 
 
-        </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>
 
+    </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="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="alert alert-warning pull-left score-all-alert">
-          Changing ratings will affect the query score.
+    <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>
-
-        <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 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>