Fixed a number of bugs; added a few fields.

imports/ui/Assets/Assignments.svelte

@@ -2,14 +2,9 @@
     import {Meteor} from "meteor/meteor";
     import {onMount} from "svelte";
     import {Sites} from "../../api/sites";
-    import GridTable from "./../GridTable.svelte";
-    import {writable} from "svelte/store";
     import TextField from '@smui/textfield';
-    import HelperText from '@smui/textfield/helper-text';
     import {Students} from "../../api/students";
     import Select, { Option } from '@smui/select';
-    import Dialog, { Title, Content, Actions } from '@smui/dialog';
-    import Button, { Label } from '@smui/button';
     import {Staff} from "/imports/api/staff";
     import List, {Item, Graphic, Meta, Text, PrimaryText, SecondaryText} from '@smui/list';
     import Paper from '@smui/paper';
@@ -30,12 +25,14 @@
     let selectedSiteId;
     let categories = ['Email', 'First Name', 'Last Name'];
     let selectedCategory = 'Email';
-    let selectedGrade = 'All';
+    let selectedGrade = 'All Grades';
     let searchText = "";
-    let searchResults = [];
+    let searchResults;
     let selectedResult;
 
     $: {
+    	console.log("Site ID")
+	    console.log(selectedSiteId)
         if(selectedSiteId) {
             Meteor.subscribe('students', selectedSiteId);
             Meteor.subscribe('staff', selectedSiteId);
@@ -44,34 +41,37 @@
 
     $: {
         selectedResult = null;
+        console.log("Starting search")
 
         // Require at least two characters in the search field before we start filtering.
-        if(selectedSiteId && selectedGrade && selectedCategory && searchText && searchText.length > 1) {
+        if(selectedSiteId && selectedGrade && selectedCategory) {
             let query = {};
 
-            if(selectedCategory === 'Email') {
-                query.email = {$regex: searchText, $options: 'i'};
-            }
-            else if(selectedCategory === 'First Name') {
-                query.firstName = {$regex: searchText, $options: 'i'};
-            }
-            else {
-                query.lastName = {$regex: searchText, $options: 'i'};
+            if(searchText && searchText.length > 0) {
+	            if (selectedCategory === 'Email') {
+		            query.email = {$regex: searchText, $options: 'i'};
+	            } else if (selectedCategory === 'First Name') {
+		            query.firstName = {$regex: searchText, $options: 'i'};
+	            } else {
+		            query.lastName = {$regex: searchText, $options: 'i'};
+	            }
             }
 
             if(selectedCategory === "Staff") {
                 searchResults = Staff.find(query);
             }
             else {
-                if(selectedGrade !== 'All') {
+                if(selectedGrade !== 'All Grades') {
                     query.grade = selectedGrade;
                 }
 
-                searchResults = Students.find(query).fetch();
+                console.log("Searching")
+	            console.log(query)
+                searchResults = Students.find(query);
             }
         }
         else {
-            searchResults = [];
+            searchResults = undefined;
         }
     }
 </script>
@@ -117,7 +117,8 @@
 <!--        </Button>-->
     </div>
     <List twoLine singleSelection>
-        {#each searchResults as result}
+	    {#if searchResults}
+        {#each $searchResults as result}
             <Item selected={selectedResult === result}>
                 <Text>
                     <PrimaryText>{result.firstName} {result.lastName}</PrimaryText>
@@ -125,6 +126,7 @@
                 </Text>
             </Item>
         {/each}
+	    {/if}
     </List>
 </div>