arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-16 21:12:13 +00:00
Code Issues Projects Releases Wiki Activity

Test work, some CSS fixes, mild reversion pokage

Browse Source
This commit is contained in:
FreneticScribbler
2022-01-27 00:51:08 +00:00
parent 8ef520619a
commit eda314c092
6 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
training/models.py
View File

@@ -11,7 +11,7 @@ class TraineeManager(models.Manager):
return super().get_queryset().filter(is_active=True, is_approved=True)
@reversion.register(for_concrete_model=False, fields=[])
@reversion.register(for_concrete_model=False, fields=['is_supervisor'])
class Trainee(Profile, RevisionMixin):
class Meta:
proxy = True
@@ -50,10 +50,6 @@ class Trainee(Profile, RevisionMixin):
def display_id(self):
return str(self)
@property
def full_name(self):
return self.first_name + " " + self.last_name
class TrainingCategory(models.Model):
reference_number = models.IntegerField(unique=True)
@@ -226,9 +222,9 @@ class TrainingLevel(models.Model, RevisionMixin):
if self.level == self.TA:
return self.get_level_display()
else:
return "{} Common Competencies".format(self.get_level_display())
return f"{self.get_level_display()} Common Competencies"
else:
return "{} {}".format(self.get_department_display(), self.get_level_display())
return f"{self.get_department_display()} {self.get_level_display()}"
@property
def activity_feed_string(self):
@@ -243,7 +239,7 @@ class TrainingLevel(models.Model, RevisionMixin):
icon = f"<span class='fas fa-{self.icon}'></span>"
else:
icon = "".join([w[0] for w in str(self).split()])
return mark_safe("<span class='badge badge-{} badge-pill' data-toggle='tooltip' title='{}'>{}</span>".format(self.department_colour, str(self), icon))
return mark_safe(f"<span class='badge badge-{self.department_colour} badge-pill' data-toggle='tooltip' title='{str(self)}'>{icon}</span>")
@reversion.register
@@ -252,8 +248,6 @@ class TrainingLevelRequirement(models.Model, RevisionMixin):
item = models.ForeignKey('TrainingItem', on_delete=models.CASCADE)
depth = models.IntegerField(choices=TrainingItemQualification.CHOICES)
reversion_hide = True
def __str__(self):
depth = TrainingItemQualification.CHOICES[self.depth][1]
return f"{depth} in {self.item}"
@@ -269,8 +263,6 @@ class TrainingLevelQualification(models.Model, RevisionMixin):
confirmed_on = models.DateTimeField(null=True)
confirmed_by = models.ForeignKey('Trainee', related_name='confirmer', on_delete=models.CASCADE, null=True)
reversion_hide = True
@property
def get_icon(self):
return self.level.get_icon