fix:edu 增加用户ID
This commit is contained in:
parent
7c9c8af963
commit
88a25232d8
|
@ -0,0 +1,21 @@
|
|||
# Generated by Django 3.2.12 on 2024-06-06 02:26
|
||||
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||
('edu', '0008_certificate_用户id'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='certificate',
|
||||
name='用户ID',
|
||||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
|
||||
),
|
||||
]
|
|
@ -26,8 +26,8 @@ class Certificate(CommonADModel):
|
|||
是否需要北京标研培训合格 = models.BooleanField(default=False)
|
||||
课程列表 = models.ManyToManyField(Course, blank=True)
|
||||
培训日期 = models.DateField(null=True, blank=True)
|
||||
培训结束日期 = models.DateField(null=True, blank=True)
|
||||
培训结束日期 = models.DateField(null=True, blank=True)
|
||||
发证日期 = models.DateField(null=True, blank=True)
|
||||
证书地址 = models.CharField(max_length=100, null=True, blank=True)
|
||||
用户ID = models.IntegerField(null=True, blank=True, max_length=32)
|
||||
用户ID = models.ForeignKey(null=True, blank=True, to='system.User', on_delete=models.CASCADE)
|
||||
examrecord = models.OneToOneField('exam.ExamRecord', on_delete=models.CASCADE, null=True, blank=True, related_name='cert_er')
|
||||
|
|
|
@ -557,7 +557,9 @@ class ExamRecordViewSet(ListModelMixin, DestroyModelMixin, RetrieveModelMixin, G
|
|||
|
||||
def get_serializer_class(self):
|
||||
if self.action == 'retrieve':
|
||||
return ExamRecordDetailSerializer
|
||||
now = timezone.now()
|
||||
if now > self.get_object().exam.end_time:
|
||||
return ExamRecordDetailSerializer
|
||||
return super().get_serializer_class()
|
||||
|
||||
def perform_destroy(self, instance): # 考试记录物理删除
|
||||
|
|
|
@ -0,0 +1,20 @@
|
|||
# Generated by Django 3.2.12 on 2024-06-06 02:26
|
||||
|
||||
import datetime
|
||||
from django.db import migrations, models
|
||||
from django.utils.timezone import utc
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('information', '0049_alter_qualification_change_date'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='qualification',
|
||||
name='change_date',
|
||||
field=models.DateField(blank=True, default=datetime.datetime(2024, 6, 6, 2, 26, 43, 23224, tzinfo=utc), null=True, verbose_name='变更日期'),
|
||||
),
|
||||
]
|
Loading…
Reference in New Issue