diff --git a/apiserver/apiserver/api/models.py b/apiserver/apiserver/api/models.py index 3dafda6..14a3cb3 100644 --- a/apiserver/apiserver/api/models.py +++ b/apiserver/apiserver/api/models.py @@ -51,7 +51,8 @@ class Member(models.Model): mill_cert_date = models.DateField(blank=True, null=True, default=None) wood_cert_date = models.DateField(blank=True, null=True, default=None) wood2_cert_date = models.DateField(blank=True, null=True, default=None) - cnc_cert_date = models.DateField(blank=True, null=True, default=None) + tormach_cnc_cert_date = models.DateField(blank=True, null=True, default=None) + precix_cnc_cert_date = models.DateField(blank=True, null=True, default=None) rabbit_cert_date = models.DateField(blank=True, null=True, default=None) trotec_cert_date = models.DateField(blank=True, null=True, default=None) paused_date = models.DateField(blank=True, null=True) diff --git a/apiserver/apiserver/api/serializers.py b/apiserver/apiserver/api/serializers.py index c4f857e..1d6ae4a 100644 --- a/apiserver/apiserver/api/serializers.py +++ b/apiserver/apiserver/api/serializers.py @@ -180,7 +180,8 @@ class MemberSerializer(serializers.ModelSerializer): 'mill_cert_date', 'wood_cert_date', 'wood2_cert_date', - 'cnc_cert_date', + 'tormach_cnc_cert_date', + 'precix_cnc_cert_date', 'rabbit_cert_date', 'trotec_cert_date', ] diff --git a/apiserver/apiserver/api/views.py b/apiserver/apiserver/api/views.py index 636fbca..cd3f49f 100644 --- a/apiserver/apiserver/api/views.py +++ b/apiserver/apiserver/api/views.py @@ -261,7 +261,11 @@ class TrainingViewSet(Base, Retrieve, Create, Update): elif session.course.id == 283: member.mill_cert_date = utils.today_alberta_tz() if status == 'Attended' else None elif session.course.id == 259: - member.cnc_cert_date = utils.today_alberta_tz() if status == 'Attended' else None + member.tormach_cnc_cert_date = utils.today_alberta_tz() if status == 'Attended' else None + elif session.course.id == 428: + member.precix_cnc_cert_date = utils.today_alberta_tz() if status == 'Attended' else None + + # TODO: change group membership elif session.course.id == 247: member.rabbit_cert_date = utils.today_alberta_tz() if status == 'Attended' else None @@ -477,7 +481,8 @@ class LockoutViewSet(viewsets.ViewSet, List): authorization['mill'] = bool(member.mill_cert_date) and authorization['common'] authorization['wood'] = bool(member.wood_cert_date) and authorization['common'] authorization['wood2'] = bool(member.wood2_cert_date) and authorization['common'] - authorization['cnc'] = bool(member.cnc_cert_date) and authorization['common'] + authorization['tormach_cnc'] = bool(member.tormach_cnc_cert_date) and authorization['common'] + authorization['precix_cnc'] = bool(member.precix_cnc_cert_date) and authorization['common'] active_member_cards[card.card_number] = authorization diff --git a/webclient/src/AdminMembers.js b/webclient/src/AdminMembers.js index 79411a1..fc6ed4f 100644 --- a/webclient/src/AdminMembers.js +++ b/webclient/src/AdminMembers.js @@ -669,10 +669,16 @@ export function AdminMemberCertifications(props) { - CNC - {member.cnc_cert_date ? 'Yes, ' + member.cnc_cert_date : 'No'} + Tormach CNC + {member.tormach_cnc_cert_date ? 'Yes, ' + member.tormach_cnc_cert_date : 'No'} Tormach: CAM and Tormach Intro - + + + + Precix CNC + {member.precix_cnc_cert_date ? 'Yes, ' + member.precix_cnc_cert_date : 'No'} + Basic CNC Wood Router + Rabbit Laser diff --git a/webclient/src/Training.js b/webclient/src/Training.js index b099c02..758a6fa 100644 --- a/webclient/src/Training.js +++ b/webclient/src/Training.js @@ -53,10 +53,15 @@ export function CertList(props) { Metal: Manual Mill & Advanced Lathe - CNC {MoreCert('Tormach metal CNC, CNC wood router.')} - {member.cnc_cert_date ? 'Yes, ' + member.cnc_cert_date : 'No'} + Tormach CNC + {member.tormach_cnc_cert_date ? 'Yes, ' + member.tormach_cnc_cert_date : 'No'} Tormach: CAM and Tormach Intro + + Precix CNC + {member.precix_cnc_cert_date ? 'Yes, ' + member.precix_cnc_cert_date : 'No'} + Basic CNC Wood Router + Rabbit Laser {member.rabbit_cert_date ? 'Yes, ' + member.rabbit_cert_date : 'No'}