From 9a4760aef532e8ee5a790833becaa0eb38ba27e8 Mon Sep 17 00:00:00 2001
From: Adrian Dmitra
Date: Mon, 14 Aug 2023 11:20:31 -0600
Subject: [PATCH 1/2] disable animation for dev site
it spins laptop fans full speed
---
webclient/src/Footer.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/webclient/src/Footer.js b/webclient/src/Footer.js
index 1668159..c66a97c 100644
--- a/webclient/src/Footer.js
+++ b/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.
{' '}
-
+
@@ -101,4 +101,4 @@ export const Footer = () => {
);
-};
+};
\ No newline at end of file
From 8315aa7b5df1273384f88b12788f40c1ed14cc92 Mon Sep 17 00:00:00 2001
From: Adrian Dmitra
Date: Mon, 14 Aug 2023 11:23:07 -0600
Subject: [PATCH 2/2] close #114
introduced "Failed" status for instructor
polite wording for member
---
apiserver/apiserver/api/serializers.py | 3 ++-
webclient/src/Classes.js | 6 +++---
webclient/src/InstructorClasses.js | 6 +++++-
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/apiserver/apiserver/api/serializers.py b/apiserver/apiserver/api/serializers.py
index e7b1531..b1dc133 100644
--- a/apiserver/apiserver/api/serializers.py
+++ b/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
\ No newline at end of file
diff --git a/webclient/src/Classes.js b/webclient/src/Classes.js
index 1f2422c..4fa7133 100644
--- a/webclient/src/Classes.js
+++ b/webclient/src/Classes.js
@@ -669,7 +669,8 @@ export function ClassDetail(props) {
{clazz.instructor !== user.id &&
(userTraining ?
-
Status: {userTraining.attendance_status}
+ { userTraining.attendance_status !== 'Failed' &&
Status: {userTraining.attendance_status}
}
+ { userTraining.attendance_status === 'Failed' &&
Status: Attempted
}
{userTraining.attendance_status === 'Withdrawn' ?
+
+
@@ -495,4 +499,4 @@ export function InstructorClassList(props) {
}
);
-};
+};
\ No newline at end of file