diff --git a/webclient/src/AdminMembers.js b/webclient/src/AdminMembers.js index 03714bb..e173088 100644 --- a/webclient/src/AdminMembers.js +++ b/webclient/src/AdminMembers.js @@ -693,7 +693,7 @@ export function AdminCert(props) { onClick={handleUncert} loading={loading} > - Uncertify + Disable : ); } @@ -712,15 +712,15 @@ export function AdminMemberCertifications(props) { return (
-
Member Certifications
+
Machine Access
-

These certifications control access to the lockouts.

+

These control access to the lockouts.

Name - Certification + Enabled Course @@ -734,29 +734,29 @@ export function AdminMemberCertifications(props) { - Wood 1 + SawStop {member.wood_cert_date ? 'Yes, ' + member.wood_cert_date : 'No'} - Woodworking Tools 1: Intro to Saws - + SawStop course (WIP) + - Wood 2 + Drum Sander {member.wood2_cert_date ? 'Yes, ' + member.wood2_cert_date : 'No'} Woodworking Tools 2: Jointer, Thickness Planer, Drum Sander - + - + {false && Lathe {member.lathe_cert_date ? 'Yes, ' + member.lathe_cert_date : 'No'} Metal: Metal Cutting & Manual Lathe - - + } + {false && Mill {member.mill_cert_date ? 'Yes, ' + member.mill_cert_date : 'No'} Metal: Manual Mill & Advanced Lathe - + } Tormach CNC {member.tormach_cnc_cert_date ? 'Yes, ' + member.tormach_cnc_cert_date : 'No'} diff --git a/webclient/src/Training.js b/webclient/src/Training.js index 6f52be8..eaf32e4 100644 --- a/webclient/src/Training.js +++ b/webclient/src/Training.js @@ -21,55 +21,55 @@ export function CertList(props) { {!isMobile && Name - Certification + Enabled Course } - Common {MoreCert('Anything larger than a screwdriver.')} - {isMobile && 'Certified: '}{member.vetted_date || member.orientation_date ? 'Yes' : 'No'} + Common {MoreCert('Any tool larger than a screwdriver.')} + {isMobile && 'Enabled: '}{member.vetted_date || member.orientation_date ? 'Yes' : 'No'} New Members: Orientation and Basic Safety - Wood 1 {MoreCert('Table saw, band saw, chop saw, router.')} - {isMobile && 'Certified: '}{member.wood_cert_date ? 'Yes, ' + member.wood_cert_date : 'No'} - Woodworking Tools 1: Intro to Saws + SawStop + {isMobile && 'Enabled: '}{member.wood_cert_date ? 'Yes, ' + member.wood_cert_date : 'No'} + SawStop course (WIP) - Wood 2 {MoreCert('Jointer, thickness planer, drum sander.')} - {isMobile && 'Certified: '}{member.wood2_cert_date ? 'Yes, ' + member.wood2_cert_date : 'No'} + Drum Sander + {isMobile && 'Enabled: '}{member.wood2_cert_date ? 'Yes, ' + member.wood2_cert_date : 'No'} Woodworking Tools 2: Jointer, Thickness Planer, Drum Sander - + {false && Lathe {MoreCert('Manual metal lathe.')} - {isMobile && 'Certified: '}{member.lathe_cert_date ? 'Yes, ' + member.lathe_cert_date : 'No'} + {isMobile && 'Enabled: '}{member.lathe_cert_date ? 'Yes, ' + member.lathe_cert_date : 'No'} Metal: Metal Cutting & Manual Lathe - - + } + {false && Mill {MoreCert('Manual metal mill.')} - {isMobile && 'Certified: '}{member.mill_cert_date ? 'Yes, ' + member.mill_cert_date : 'No'} + {isMobile && 'Enabled: '}{member.mill_cert_date ? 'Yes, ' + member.mill_cert_date : 'No'} Metal: Manual Mill & Advanced Lathe - + } Tormach CNC - {isMobile && 'Certified: '}{member.tormach_cnc_cert_date ? 'Yes, ' + member.tormach_cnc_cert_date : 'No'} + {isMobile && 'Enabled: '}{member.tormach_cnc_cert_date ? 'Yes, ' + member.tormach_cnc_cert_date : 'No'} Tormach: CAM and Tormach Intro Precix CNC - {isMobile && 'Certified: '}{member.precix_cnc_cert_date ? 'Yes, ' + member.precix_cnc_cert_date : 'No'} + {isMobile && 'Enabled: '}{member.precix_cnc_cert_date ? 'Yes, ' + member.precix_cnc_cert_date : 'No'} Basic CNC Wood Router Rabbit Laser - {isMobile && 'Certified: '}{member.rabbit_cert_date ? 'Yes, ' + member.rabbit_cert_date : 'No'} + {isMobile && 'Enabled: '}{member.rabbit_cert_date ? 'Yes, ' + member.rabbit_cert_date : 'No'} Laser: Cutting and Engraving Trotec Laser - {isMobile && 'Certified: '}{member.trotec_cert_date ? 'Yes, ' + member.trotec_cert_date : 'No'} + {isMobile && 'Enabled: '}{member.trotec_cert_date ? 'Yes, ' + member.trotec_cert_date : 'No'} Laser: Trotec Course @@ -122,13 +122,13 @@ export function Training(props) {

No training yet! Sign up for a course to take a class.

} -
Your Certifications
+
Your Machine Access
-

⚠️ Everyone's been decertified on Wood Working I since the installation of the SawStop Table Saw.

+

These control access to the machine lockout devices.

-

Certifications are based on the courses you've taken. If there's any errors, please email directors@protospace.ca.

+

Access is based on the courses you've taken. If there's any errors, please email directors@protospace.ca.

); };