Merge pull request #118 from Dmitra/feat-class-failed

Feat class failed

apiserver/apiserver/api/serializers.py

@@ -569,6 +569,7 @@ class TrainingSerializer(serializers.ModelSerializer):
         'Waiting for payment',
         'Withdrawn',
         'Rescheduled',
+        'Failed',
         'No-show',
         'Attended',
         'Confirmed'
@@ -1076,4 +1077,4 @@ class MyLoginSerializer(LoginSerializer):
         if not user:
             raise ValidationError(dict(password='Incorrect password. Check caps lock.'))
 
-        return user
+        return user

webclient/src/Classes.js

@@ -668,7 +668,8 @@ export function ClassDetail(props) {
 						{clazz.instructor !== user.id &&
 							(userTraining ?
 								<div>
-									<p>Status: {userTraining.attendance_status}</p>
+									{ userTraining.attendance_status !== 'Failed' && <p>Status: {userTraining.attendance_status}</p>}
+								  { userTraining.attendance_status === 'Failed' && <p>Status: Attempted</p>}
 									<p>
 										{userTraining.attendance_status === 'Withdrawn' ?
 											<Button loading={loading} onClick={() => handleToggle('Waiting for payment')}>
@@ -749,5 +750,4 @@ export function ClassDetail(props) {
 			}
 		</Container>
 	);
-};
-
+};

webclient/src/Footer.js

@@ -10,7 +10,7 @@ export const Footer = () => {
 	useEffect(() => {
 		if (!footerRef.current) return;
 		if (footerRef.current.clientWidth < 650) return
-		scene({ ref: footerRef });
+		if (window.location.hostname === 'my.protospace.ca') scene({ ref: footerRef });
 	}, [footerRef]);
 
 	return (
@@ -51,7 +51,7 @@ export const Footer = () => {
 					>
 						View the source code and license on GitHub.
 					</a>{' '}
-					
+
 				</p>
 
 				<p>
@@ -101,4 +101,4 @@ export const Footer = () => {
 			</Container>
 		</div>
 	);
-};
+};

webclient/src/InstructorClasses.js

@@ -116,6 +116,10 @@ function AttendanceRow(props) {
 				Rescheduled
 			</Button>
 
+			<Button {...makeProps('Failed')}>
+				Failed
+			</Button>
+
 			<Button {...makeProps('No-show')}>
 				No-show
 			</Button>
@@ -495,4 +499,4 @@ export function InstructorClassList(props) {
 			}
 		</div>
 	);
-};
+};