Completed inline filtering - moved loading indicator into tbody to avoid reloading the header (with filter contents)

Packages/worklist/components/worklistResult/worklistResult.html

@@ -1,5 +1,4 @@
 <template name="worklistResult">
-    {{ #if studies.count }}
     <table id="tblStudyList" class="table table-striped noselect">
         <thead>
         <tr>
@@ -40,7 +39,7 @@
                     Modality
                 </div>
                 <div class="modality-input">
-                    <input type="search" class="form-control worklist-search" id="modality">
+                    <input type="search" class="form-control worklist-search" id="modality" style="visibility: hidden; ">
                 </div>
             </th>
             <th>
@@ -48,7 +47,7 @@
                     StudyDescription
                 </div>
                 <div class="study-description-input">
-                    <input type="search" class="form-control worklist-search" id="studyDescription">
+                    <input type="search" class="form-control worklist-search" id="studyDescription" style="visibility: hidden; ">
                 </div>
             </th>
             <th>
@@ -56,7 +55,7 @@
                     # Images
                 </div>
                 <div class="worklist-input">
-                    <input type="search" class="form-control worklist-search" id="numberOfImages">
+                    <input type="search" class="form-control worklist-search" id="numberOfImages" style="visibility: hidden; ">
                 </div>
             </th>
         </tr>
@@ -67,7 +66,7 @@
         {{/each}}
         </tbody>
     </table>
-    {{ else }}
+    {{ #unless studies.count }}
         {{ >loadingText }}
-    {{ /if }}
+    {{ /unless }}
 </template>

Packages/worklist/components/worklistResult/worklistResult.js

@@ -19,6 +19,7 @@ var studyDateFrom;
 var studyDateTo;
 var checkFrom = false;
 var checkTo = false;
+var filter;
 
 /**
  * Transforms an input string into a search filter for
@@ -72,7 +73,7 @@ function convertStringToStudyDate (dateStr) {
  */
 function search() {
     // Create the filters to be used for the Worklist Search
-    var filter = {
+    filter = {
         patientName: getFilter($('#patientName').val()),
         patientId: getFilter($('#patientId').val()),
         accessionNumber: getFilter($('#patientAccessionNumber').val())
@@ -103,7 +104,6 @@ function search() {
             }
         });
     });
-
 }
 
 Template.worklistResult.events({
@@ -112,5 +112,6 @@ Template.worklistResult.events({
     },
     'onsearch': function(event) {
         search();
+
     }
 });