Added some code for searching for assignments. Needs a lot more.

imports/api/asset-assignments.js

@@ -39,16 +39,29 @@ AssetAssignments.attachSchema(AssetAssignmentsSchema);
 
 if (Meteor.isServer) {
 	// Drop any old indexes we no longer will use.  Create indexes we need.
-	//try {AssetTypes._dropIndex("name")} catch(e) {}
+	//try {AssetAssignments._dropIndex("name")} catch(e) {}
-	//AssetTypes.createIndex({name: "text"}, {name: "name", unique: false});
+	//AssetAssignments.createIndex({name: "text"}, {name: "name", unique: false});
-	AssetTypes.createIndex({assetId: 1}, {name: "AssetID", unique: false});
+
+	try {AssetTypes._dropIndex("AssetID")} catch(e) {}  //Typo put this as an index in AssetTypes instead of AssetAssignments.
+	AssetAssignments.createIndex({assetId: 1}, {name: "AssetID", unique: false});
 
 	// This code only runs on the server
-	Meteor.publish('assetAssignments', function() {
+	Meteor.publish('assetAssignments', function(assetId) {
-		return AssetAssignments.find({});
+		let query = {};
+
+		if(assetId) {
+			query.assetId = assetId;
+		}
+
+		return AssetAssignments.find(query);
 	});
 }
 Meteor.methods({
+	'AssetAssignments.getOne'(assetId) {
+		check(assetId, String);
+
+		return AssetAssignments.findOne(assetId);
+	},
 	/**
 	 * Assigns the asset to the assignee.  The assignee should either be a Student or Staff member.
 	 * @param assetId The Mongo ID of the asset (asset._id).

imports/ui/Assets/Assignments.svelte

@@ -23,7 +23,7 @@
     // Load the sites (reactive).
     let sites = Sites.find({});
     let selectedSiteId;
-    let categories = ['Email', 'First Name', 'Last Name'];
+    let categories = ['Asset ID', 'Email', 'First Name', 'Last Name'];
     let selectedCategory = 'Email';
     let selectedGrade = 'All Grades';
     let searchText = "";
@@ -46,18 +46,45 @@
         // Require at least two characters in the search field before we start filtering.
         if(selectedSiteId && selectedGrade && selectedCategory) {
             let query = {};
+            let queryType = (selectedGrade === "Staff") ? 1 : 0;
 
             if(searchText && searchText.length > 0) {
 	            if (selectedCategory === 'Email') {
 		            query.email = {$regex: searchText, $options: 'i'};
-	            } else if (selectedCategory === 'First Name') {
+	            } else if( selectedCategory === 'Asset ID') {
+                    //Do not do anything yet...
+                } else if (selectedCategory === 'First Name') {
 		            query.firstName = {$regex: searchText, $options: 'i'};
 	            } else {
 		            query.lastName = {$regex: searchText, $options: 'i'};
 	            }
             }
 
-            if(selectedCategory === "Staff") {
+            if(selectedCategory === 'Asset ID') {
+                Meteor.call('AssetAssignments.getOne', searchText, (err, result) => {
+                   if(err) {
+                       console.error(err);
+                   }
+                   else {
+                       if(result && result.assigneeType && result.assigneeId) {
+                           if (result.assigneeType === 'Staff') {
+                                query._id = result.assigneeId;
+                                queryType = 1;
+                           } else if (result.assigneeType === 'Student') {
+                               query._id = result.assigneeId;
+                               queryType = 0;
+                           } else {
+                               console.error("Invalid AssigneeType");
+                           }
+                       }
+                       else {
+                           console.error('Invalid result from AssetAssignments.getOne');
+                       }
+                   }
+                });
+            }
+
+            if(queryType === 1) {
                 searchResults = Staff.find(query);
             }
             else {
@@ -65,8 +92,8 @@
                     query.grade = selectedGrade;
                 }
 
-                console.log("Searching")
+                // console.log("Searching")
-	            console.log(query)
+	            // console.log(query)
                 searchResults = Students.find(query);
             }
         }