Continued work on the historical pages.

imports/api/data-collection.js

@@ -46,6 +46,9 @@ if (Meteor.isServer) {
 			if(Roles.userIsInRole(Meteor.userId(), "laptop-management", {anyScope:true})) {
 				let query = {};
 
+				if(params.studentId) check(params.studentId, String)
+				if(params.staffId) check(params.staffId, String)
+
 				// For asset ID's, we need to get the serial from the asset collection first.
 				if(params.assetId) {
 					let asset = Assets.findOne({assetId : params.assetId});
@@ -55,6 +58,8 @@ if (Meteor.isServer) {
 						params.regex = false;
 					}
 				}
+				// console.log('chromebook data')
+				// console.log(params)
 
 				if (params.deviceId) query.deviceId = params.regex ? {
 					$regex: params.deviceId,
@@ -64,14 +69,19 @@ if (Meteor.isServer) {
 					$regex: params.serial,
 					$options: "i"
 				} : params.serial;
-				// else if (params.assetId) {
-				// 	let asset = Assets.findOne({assetId: params.assetId});
-				//
-				// 	if(asset.serial) {
-				// 		// An exact search.
-				// 		query.serial = asset.serial;
-				// 	}
-				// }
+				else if(params.studentId) {
+					const student = Students.findOne({_id: params.studentId})
+
+					console.log(student)
+					if(student) query.email = student.email;
+					else query = undefined
+				}
+				else if(params.staffId) {
+					const staff = Staff.findOne({_id: params.staffId})
+
+					if(staff) query.email = staff.email;
+					else query = undefined
+				}
 				else if (params.email) query.email = params.regex ? {
 					$regex: params.email,
 					$options: "i"
@@ -82,6 +92,9 @@ if (Meteor.isServer) {
 				else {
 					query = undefined;
 				}
+				
+				// console.log("query")
+				// console.log(query)
 
 				if(query) {
 					// console.log("Collecting Chromebook Data: ");
@@ -113,6 +126,8 @@ if (Meteor.isServer) {
 						}
 					}
 
+					// console.log('returning')
+					// console.log(result)
 					return result;
 				} else return null;
 			}