改了一下数据库表,把history的序列化器改为模型序列化器

2022-05-09 18:49:41 +08:00
parent 31cad86054
commit 9c960aa1da
17 changed files with 228 additions and 352 deletions
@@ -3,30 +3,30 @@ from .models import *


 # Register your models here.
-class DepartmentAdmin(admin.ModelAdmin):
-    # 定制哪些字段需要展示
-    list_display = ('id', 'name', 'picture')
-
-    # sortable_by # 排序
-
-    list_editable = ('name', 'picture',)
-
-
-    list_per_page = 10
-
-
-    list_max_show_all = 200  # default
-
-
-    search_fields = ['title']
-
-   # date_hierarchy = 'create_date'
-
-    '''默认空值'''
-    empty_value_display = 'NA'
-
-    '''过滤选项'''
-    list_filter = ()
+# class DepartmentAdmin(admin.ModelAdmin):
+#     # 定制哪些字段需要展示
+#     list_display = ('id', 'name', 'picture')
+#
+#     # sortable_by # 排序
+#
+#     list_editable = ('name', 'picture',)
+#
+#
+#     list_per_page = 10
+#
+#
+#     list_max_show_all = 200  # default
+#
+#
+#     search_fields = ['title']
+#
+#    # date_hierarchy = 'create_date'
+#
+#     '''默认空值'''
+#     empty_value_display = 'NA'
+#
+#     '''过滤选项'''
+#     list_filter = ()

 class New_memberAdmin(admin.ModelAdmin):
    # 定制哪些字段需要展示
@@ -50,6 +50,6 @@ class New_memberAdmin(admin.ModelAdmin):
    '''过滤选项'''
    list_filter = ()

-admin.site.register(Department ,DepartmentAdmin)
+# admin.site.register(Department ,DepartmentAdmin)
 admin.site.register(NewMember)
 # admin.site.register(EmailVerifyRecord)
@@ -1,46 +0,0 @@
-# Generated by Django 4.0.4 on 2022-04-15 17:46
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Department',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=10, verbose_name='部门名称')),
-                ('picture', models.ImageField(upload_to='', verbose_name='部门图标')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='EmailVerifyRecord',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('code', models.CharField(max_length=20, verbose_name='验证码')),
-                ('email', models.EmailField(max_length=50, verbose_name='邮箱')),
-                ('send_time', models.DateTimeField(auto_now=True, verbose_name='发送时间')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='New_member',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=20, verbose_name='姓名')),
-                ('major', models.CharField(max_length=20, verbose_name='年级专业')),
-                ('phone_number', models.CharField(max_length=11, verbose_name='手机号码')),
-                ('email', models.EmailField(max_length=254, verbose_name='邮箱')),
-                ('department', models.CharField(max_length=10, verbose_name='意向部门')),
-                ('expectation', models.CharField(max_length=10, verbose_name='期待的话')),
-                ('schedule', models.SmallIntegerField(choices=[(0, '尚未提交'), (1, '已报名'), (2, '初审中'), (3, '面试中'), (4, '笔试中'), (5, '成功录取'), (-1, '初审失败'), (-2, '面试失败'), (-3, '笔试失败'), (-4, '复试失败'), (-5, '未录取')], verbose_name='报名状态')),
-                ('verification_code', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='enroll.emailverifyrecord', verbose_name='邮箱验证码')),
-            ],
-        ),
-    ]
@@ -1,23 +0,0 @@
-# Generated by Django 4.0.4 on 2022-04-15 18:20
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('enroll', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='new_member',
-            name='schedule',
-            field=models.SmallIntegerField(choices=[(0, '尚未提交'), (1, '已报名'), (2, '初审中'), (3, '面试中'), (4, '笔试中'), (5, '成功录取'), (-1, '初审失败'), (-2, '面试失败'), (-3, '笔试失败'), (-4, '复试失败'), (-5, '未录取')], default=0, verbose_name='报名状态'),
-        ),
-        migrations.AlterField(
-            model_name='new_member',
-            name='verification_code',
-            field=models.CharField(max_length=4),
-        ),
-    ]
@@ -1,23 +0,0 @@
-# Generated by Django 4.0.4 on 2022-04-16 06:33
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('enroll', '0002_alter_new_member_schedule_and_more'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='new_member',
-            name='email',
-            field=models.EmailField(max_length=254, unique=True, verbose_name='邮箱'),
-        ),
-        migrations.AlterField(
-            model_name='new_member',
-            name='phone_number',
-            field=models.CharField(max_length=11, unique=True, verbose_name='手机号码'),
-        ),
-    ]
@@ -1,18 +0,0 @@
-# Generated by Django 4.0.4 on 2022-04-17 13:12
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('enroll', '0003_alter_new_member_email_alter_new_member_phone_number'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='emailverifyrecord',
-            name='send_time',
-            field=models.DateTimeField(auto_now_add=True, verbose_name='发送时间'),
-        ),
-    ]
@@ -1,18 +0,0 @@
-# Generated by Django 4.0.4 on 2022-04-17 21:29
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('enroll', '0004_alter_emailverifyrecord_send_time'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='emailverifyrecord',
-            name='code',
-            field=models.CharField(max_length=5, verbose_name='验证码'),
-        ),
-    ]
@@ -1,17 +0,0 @@
-# Generated by Django 4.0.4 on 2022-05-05 18:52
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('enroll', '0005_alter_emailverifyrecord_code'),
-    ]
-
-    operations = [
-        migrations.RenameModel(
-            old_name='New_member',
-            new_name='NewMember',
-        ),
-    ]
@@ -6,7 +6,7 @@ from django.db import models
 #     class Meta:
 #         verbose_name_plural = u"部门信息"
 #
-#     # department = [
+#     # department_cn = [
 #     #     (0, "系统维护"),
 #     #     (1, "APP开发"),
 #     #     (2, "Web开发"),
@@ -14,7 +14,7 @@ from django.db import models
 #     #     (4, "游戏开发"),
 #     #     (5, "UI设计")
 #     # ]
-#     # id = models.IntegerField(verbose_name="部门ID", choices=department, primary_key=True)
+#     # id = models.IntegerField(verbose_name="部门ID", choices=department_cn, primary_key=True)
 #     name = models.CharField(max_length=10, verbose_name="部门名称")
 #     picture = models.ImageField(verbose_name="部门图标")
 #
@@ -1,6 +1,7 @@
 from rest_framework import serializers
 from rest_framework.validators import UniqueValidator
-from apps.enroll.models import Department, NewMember, EmailVerifyRecord
+from apps.enroll.models import NewMember, EmailVerifyRecord
+from apps.history.models import Department
 import time
 from utils.get_error_msg import get_error_msg

@@ -10,7 +11,7 @@ class DepartmentSerializer(serializers.ModelSerializer):

    class Meta:
        model = Department
-        fields = "__all__"
+        fields = ["department_cn", "picture"]


 class NewMemberSerializer(serializers.ModelSerializer):
@@ -47,7 +48,7 @@ class NewMemberSerializer(serializers.ModelSerializer):
                    "max_length": get_error_msg(42035)
                }
            },
-            "department": {
+            "department_cn": {
                "error_messages": {
                    "invalid_choice": get_error_msg(42036)
                }
@@ -4,7 +4,7 @@ from . import views
 # from rest_framework.routers import DefaultRouter

 urlpatterns = [
-    path("department/", views.DepartmentMessageView.as_view()),
+    path("department_cn/", views.DepartmentMessageView.as_view()),
    path("sign_up/", views.SignUpView.as_view()),
    path("sign_up/verification_code/", views.SendEmailView.as_view()),
    # path("sign_up/<string:pk>", views.Sign_in.as_view({"get": "get"}))
@@ -1,6 +1,7 @@
 from rest_framework.response import Response
 from rest_framework.generics import GenericAPIView
-from apps.enroll.models import Department, EmailVerifyRecord, NewMember
+from apps.history.models import Department
+from apps.enroll.models import EmailVerifyRecord, NewMember
 from apps.enroll.serializers import DepartmentSerializer, NewMemberSerializer, NewMemberScheduleSerializer, \
    SendEmailSerializer
 from rest_framework import status