{foundAsset && foundAsset.assetType.name}
- {foundAsset && foundAsset.serial}
+ {foundAsset && {foundAsset.assetId}}
+ {foundAsset && {foundAsset.serial}}
{foundAsset && foundAsset.assignee && (
Assigned To: {foundAsset.assignee.firstName} {foundAsset.assignee.lastName}
)}
@@ -246,8 +248,8 @@ const AssignmentsByPerson = () => {
return (
{next.assetType.name}
- {next.assetId}
- {next.serial}
+ {next.assetId}
+ {next.serial}
Missing Equipment
+-
+ {missingAssets.map((next, i) => {
+ return (
+
)} - {new Date(next.startTime).toLocaleDateString("en-US") + "-" + new Date(next.endTime).toLocaleDateString("en-US")}
+ {new Date(next.startTime).toLocaleDateString("en-US") + "-" + new Date(next.endTime).toLocaleDateString("en-US") + " @ " + new Date(next.endTime).toLocaleTimeString("en-US")}
{next.assignedTo && ( <>Currently assigned to: {next.assignedTo.firstName} {next.assignedTo.lastName} {next.assignedTo.grade ? "~ " + next.assignedTo.grade : ""} ({next.assignedTo.email}) )} diff --git a/imports/ui/pages/Student/StudentPage.jsx b/imports/ui/pages/Student/StudentPage.jsx new file mode 100644 index 0000000..98de2bf --- /dev/null +++ b/imports/ui/pages/Student/StudentPage.jsx @@ -0,0 +1,80 @@ +import { Meteor } from 'meteor/meteor'; +import {Roles} from 'meteor/alanning:roles'; +import React, { useState } from 'react'; +import { useTracker } from 'meteor/react-meteor-data'; +import {Link} from 'react-router-dom'; +import _ from 'lodash'; +import Button from "@mui/material/Button"; +import {Box, Grid} from "@mui/material"; + +export const StudentPage = (props) => { + const {user, canManageLaptops, isAdmin} = useTracker(() => { + const user = Meteor.user(); + const canManageLaptops = user && Roles.userIsInRole(user._id, 'laptop-management', 'global'); + const isAdmin = user && Roles.userIsInRole(user._id, 'admin', 'global'); + + return { + user, + canManageLaptops, + isAdmin + } + }) + + function performLogin() { + //Login style can be "popup" or "redirect". I am not sure we need to request and offline token. + Meteor.loginWithGoogle({loginStyle: "popup", requestOfflineToken: true}, (err) => { + if (err) { + console.log(err); + } else { + //console.log("Logged in"); + } + }) + } + + function performLogout() { + Meteor.logout(); + } + + return ( + <> + {!user && ( + <> +
+ */}
+
+
+ )}
+ {user && (
+ <>
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+ Tempest
+
+
+
+
+
+
+
+
+ {props.children}
+
+
+ )}
+
+ )
+}
\ No newline at end of file
diff --git a/imports/ui/pages/Student/Workshops.jsx b/imports/ui/pages/Student/Workshops.jsx
new file mode 100644
index 0000000..3ac8c8b
--- /dev/null
+++ b/imports/ui/pages/Student/Workshops.jsx
@@ -0,0 +1,138 @@
+import React, { useState } from 'react';
+import {Meteor} from "meteor/meteor";
+import {Roles} from 'meteor/alanning:roles';
+import { useTracker } from 'meteor/react-meteor-data';
+import {Link} from 'react-router-dom';
+import _ from 'lodash';
+import Button from "@mui/material/Button";
+import TextField from "@mui/material/TextField";
+import MenuItem from '@mui/material/MenuItem';
+import {InputLabel, List, ListItem, ListItemButton, ListItemText, Paper} from "@mui/material";
+import Box from "@mui/material/Box";
+import ToggleButton from '@mui/material/ToggleButton';
+import ToggleButtonGroup from '@mui/material/ToggleButtonGroup';
+import Dialog from '@mui/material/Dialog';
+import DialogActions from '@mui/material/DialogActions';
+import DialogContent from '@mui/material/DialogContent';
+import DialogContentText from '@mui/material/DialogContentText';
+import DialogTitle from '@mui/material/DialogTitle';
+import {Editor} from 'react-draft-wysiwyg'
+import 'react-draft-wysiwyg/dist/react-draft-wysiwyg.css'
+import {Students} from "/imports/api/students";
+import {Staff} from "/imports/api/staff";
+import {conditions} from "/imports/api/assets";
+
+const cssTwoColumnContainer = {
+ display: 'grid',
+ gridTemplateColumns: "1fr 1fr",
+ columnGap: '1rem',
+ rowGap: '0.4rem',
+}
+
+export const Workshops = () => {
+ Meteor.subscribe('students');
+ Meteor.subscribe('staff');
+ Meteor.subscribe('workshops');
+
+ const user = Meteor.user();
+ const isAdmin = user && Roles.userIsInRole(user._id, 'admin', 'global');
+ const [selectedWorkshop, setSelectedWorkshop] = useState("")
+
+ const {workshops} = useTracker(() => {
+ let workshops = [];
+
+ workshops = Workshops.find({isComplete: false}).fetch();
+
+ for(let workshop of workshops) {
+ for(let user of workshop.signupSheet) {
+ user.data = Students.findOne({_id: user._id})
+ if(!user.data) user.data = Staff.findOne({_id: user._id})
+ }
+ }
+
+ return {workshops}
+ });
+
+ const getListItemStyle = (item) => {
+ return {
+ backgroundColor: selectedWorkshop === item ? '#EECFA6' : 'white'
+ }
+ }
+
+ const newWorkshop = () => {
+ if(isAdmin) {
+ setEditedWorkshop({})
+ setOpenWorkshopEditor(true)
+ }
+ }
+ const editWorkshop = () => {
+ if(isAdmin && selectedWorkshop) {
+ setEditedWorkshop({...selectedWorkshop})
+ setOpenWorkshopEditor(true)
+ }
+ }
+
+ const [openWorkshopEditor, setOpenWorkshopEditor] = useState(false)
+ const [editedWorkshop, setEditedWorkshop] = useState(false)
+ const workshopEditorClosed = (save) => {
+ const completeHandler = (err, result) => {
+ if(err) console.error(err)
+ else {
+ setOpenWorkshopEditor(false)
+ setEditedWorkshop(null)
+ }
+ }
+
+ if(save) {
+ if(editedWorkshop._id) Meteor.call('workshops.update', editedWorkshop._id, editedWorkshop.name, editedWorkshop.description, editedWorkshop.signupLimit, completeHandler)
+ else Meteor.call('workshops.add', editedWorkshop.name, editedWorkshop.description, editedWorkshop.signupLimit, completeHandler)
+ }
+ else completeHandler()
+ }
+
+ return (
+ <>
+
+
+ -
+ {workshops.map((next, i) => {
+ return (
+
-
+ {selectedWorkshop.signupSheet.map((next, i) => {
+ return (
+