Potentially fix tests

This commit is contained in:
2022-01-04 19:43:19 +00:00
parent 6c484b984c
commit e6af66a964
7 changed files with 597 additions and 323 deletions

View File

@@ -0,0 +1,59 @@
# Generated by Django 3.2.11 on 2022-01-04 19:40
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('training', '0012_auto_20220102_2051'),
]
operations = [
migrations.AlterField(
model_name='trainingitem',
name='category',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='items', to='training.trainingcategory'),
),
migrations.AlterField(
model_name='trainingitemqualification',
name='item',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='training.trainingitem'),
),
migrations.AlterField(
model_name='trainingitemqualification',
name='supervisor',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='qualifications_granted', to='training.trainee'),
),
migrations.AlterField(
model_name='trainingitemqualification',
name='trainee',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='qualifications_obtained', to='training.trainee'),
),
migrations.AlterField(
model_name='traininglevelqualification',
name='confirmed_by',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='confirmer', to='training.trainee'),
),
migrations.AlterField(
model_name='traininglevelqualification',
name='level',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='training.traininglevel'),
),
migrations.AlterField(
model_name='traininglevelqualification',
name='trainee',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='level_qualifications', to='training.trainee'),
),
migrations.AlterField(
model_name='traininglevelrequirement',
name='item',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='training.trainingitem'),
),
migrations.AlterField(
model_name='traininglevelrequirement',
name='level',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='requirements', to='training.traininglevel'),
),
]

View File

@@ -57,7 +57,7 @@ class TrainingCategory(models.Model):
class TrainingItem(models.Model):
reference_number = models.IntegerField()
category = models.ForeignKey('TrainingCategory', related_name='items', on_delete=models.RESTRICT)
category = models.ForeignKey('TrainingCategory', related_name='items', on_delete=models.CASCADE)
name = models.CharField(max_length=50)
active = models.BooleanField(default=True)
@@ -90,12 +90,12 @@ class TrainingItemQualification(models.Model):
(COMPLETE, 'Training Complete'),
(PASSED_OUT, 'Passed Out'),
)
item = models.ForeignKey('TrainingItem', on_delete=models.RESTRICT)
item = models.ForeignKey('TrainingItem', on_delete=models.CASCADE)
depth = models.IntegerField(choices=CHOICES)
trainee = models.ForeignKey('Trainee', related_name='qualifications_obtained', on_delete=models.RESTRICT)
trainee = models.ForeignKey('Trainee', related_name='qualifications_obtained', on_delete=models.CASCADE)
date = models.DateField()
# TODO Remember that some training is external. Support for making an organisation the trainer?
supervisor = models.ForeignKey('Trainee', related_name='qualifications_granted', on_delete=models.RESTRICT)
supervisor = models.ForeignKey('Trainee', related_name='qualifications_granted', on_delete=models.CASCADE)
notes = models.TextField(blank=True)
# TODO Maximum depth - some things stop at Complete and you can't be passed out in them
@@ -232,8 +232,8 @@ class TrainingLevel(models.Model, RevisionMixin):
@reversion.register
class TrainingLevelRequirement(models.Model, RevisionMixin):
level = models.ForeignKey('TrainingLevel', related_name='requirements', on_delete=models.RESTRICT)
item = models.ForeignKey('TrainingItem', on_delete=models.RESTRICT)
level = models.ForeignKey('TrainingLevel', related_name='requirements', on_delete=models.CASCADE)
item = models.ForeignKey('TrainingItem', on_delete=models.CASCADE)
depth = models.IntegerField(choices=TrainingItemQualification.CHOICES)
reversion_hide = True
@@ -247,10 +247,10 @@ class TrainingLevelRequirement(models.Model, RevisionMixin):
@reversion.register(follow=['trainee'])
class TrainingLevelQualification(models.Model, RevisionMixin):
trainee = models.ForeignKey('Trainee', related_name='level_qualifications', on_delete=models.RESTRICT)
level = models.ForeignKey('TrainingLevel', on_delete=models.RESTRICT)
trainee = models.ForeignKey('Trainee', related_name='level_qualifications', on_delete=models.CASCADE)
level = models.ForeignKey('TrainingLevel', on_delete=models.CASCADE)
confirmed_on = models.DateTimeField(null=True)
confirmed_by = models.ForeignKey('Trainee', related_name='confirmer', on_delete=models.RESTRICT, null=True)
confirmed_by = models.ForeignKey('Trainee', related_name='confirmer', on_delete=models.CASCADE, null=True)
reversion_hide = True