wcrisman/DistrictCentral
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reorganized assignment UI. Added searching by person.

Browse Source
This commit is contained in:
DESKTOP-C9V2M01\Zeeri
2022-08-16 07:39:15 -07:00
parent 571f3da1d6
commit 1501a36801
9 changed files with 3816 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

174
imports/ui/Assignments/AssignmentByPerson.svelte
View File

@@ -9,97 +9,49 @@
import List, {Item, Graphic, Meta, Text, PrimaryText, SecondaryText} from '@smui/list';
import Paper from '@smui/paper';
import LayoutGrid, {Cell} from '@smui/layout-grid';
import {Assets} from "/imports/api/assets";
import {AssetTypes} from "/imports/api/asset-types";
let grades = ['Staff', 'All Grades'];
onMount(async () => {
Meteor.subscribe('sites');
Meteor.call('students.getPossibleGrades', (err, result) => {
if(err) console.log(err);
else {
grades = ['Staff', 'All Grades', ...result];
}
});
Meteor.subscribe('students');
Meteor.subscribe('staff');
Meteor.subscribe('assets');
Meteor.subscribe('assetTypes');
});
// Load the sites (reactive).
let sites = Sites.find({});
let selectedSiteId;
let categories = ['Asset ID', 'Email', 'First Name', 'Last Name'];
let categories = ['Email', 'First Name', 'Last Name'];
let selectedCategory = 'Email';
let selectedGrade = 'All Grades';
let searchText = "";
let searchResults;
let selectedResult;
let staffSearchResults;
let studentSearchResults;
$: {
console.log("Site ID")
console.log(selectedSiteId)
if(selectedSiteId) {
Meteor.subscribe('students', selectedSiteId);
Meteor.subscribe('staff', selectedSiteId);
}
if(searchText && searchText.length > 1) {
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'};
}
staffSearchResults = Staff.find(query);
studentSearchResults = Students.find(query);
}
else {
staffSearchResults = undefined;
studentSearchResults = undefined;
}
}
$: {
selectedResult = null;
console.log("Starting search")
// 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 === '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 === '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 {
if(selectedGrade !== 'All Grades') {
query.grade = selectedGrade;
}
// console.log("Searching")
// console.log(query)
searchResults = Students.find(query);
}
}
else {
searchResults = undefined;
}
const assignedAssets = (person) => {
let result = Assets.find({assigneeId: person._id}).fetch();
for(next of result) {
next.type = AssetTypes.findOne({_id: next.assetTypeId})
}
return result;
}
</script>
@@ -108,20 +60,6 @@
<Paper>
<LayoutGrid>
<Cell span="{6}">
<Select bind:value={selectedSiteId} label="Site">
{#each $sites as site}
<Option value={site._id}>{site.name}</Option>
{/each}
</Select>
</Cell>
<Cell span="{6}">
<Select bind:value={selectedGrade} label="Grade">
{#each grades as grade}
<Option value={grade}>{grade}</Option>
{/each}
</Select>
</Cell>
<Cell span="{6}">
<Select bind:value={selectedCategory} label="Category">
{#each categories as category}
@@ -143,18 +81,38 @@
<!-- <Label style="color: white">Create</Label>-->
<!-- </Button>-->
</div>
<List twoLine singleSelection>
{#if searchResults}
{#each $searchResults as result}
<Item selected={selectedResult === result}>
<Text>
<PrimaryText>{result.firstName} {result.lastName}</PrimaryText>
<SecondaryText>{result.email} {result.grade ? '(' + result.grade + ')' : ""}</SecondaryText>
</Text>
</Item>
{/each}
{/if}
</List>
{#if staffSearchResults}
<ul>
{#each $staffSearchResults as next}
<li>
{next.firstName} {next.lastName} ({next.email})
<div style="margin-left: 2rem">
{#each (assignedAssets(next)) as asset}
Type: {asset.type.name}<br/>
AssetId: {asset.assetId}<br/>
Serial: {asset.serial}<br/>
{/each}
</div>
</li>
{/each}
</ul>
{/if}
{#if studentSearchResults}
<ul>
{#each $studentSearchResults as next}
<li>
{next.firstName} {next.lastName} ~ {next.grade} ({next.email})
<div style="margin-left: 2rem">
{#each (assignedAssets(next)) as asset}
Type: {asset.type.name}<br/>
AssetId: {asset.assetId}<br/>
Serial: {asset.serial}<br/>
{/each}
</div>
</li>
{/each}
</ul>
{/if}
</div>
<style>