mirror of
https://github.com/lemeow125/DocManagerBackend.git
synced 2025-04-27 18:21:23 +08:00
Move sex and age fields from questionnaire to user and add planning role restrictions
This commit is contained in:
parent
724132e396
commit
e0eba6ca21
25 changed files with 157 additions and 320 deletions
|
@ -1,4 +1,4 @@
|
|||
# Generated by Django 5.1.3 on 2024-11-23 17:01
|
||||
# Generated by Django 5.1.3 on 2024-12-03 16:27
|
||||
|
||||
import django.db.models.deletion
|
||||
import django.utils.timezone
|
||||
|
@ -48,6 +48,14 @@ class Migration(migrations.Migration):
|
|||
max_length=32,
|
||||
),
|
||||
),
|
||||
(
|
||||
"type",
|
||||
models.CharField(
|
||||
choices=[("softcopy", "Softcopy"), ("hardcopy", "Hardcopy")],
|
||||
default="softcopy",
|
||||
max_length=16,
|
||||
),
|
||||
),
|
||||
(
|
||||
"requester",
|
||||
models.ForeignKey(
|
||||
|
|
|
@ -1,22 +0,0 @@
|
|||
# Generated by Django 5.1.3 on 2024-11-24 02:12
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("document_requests", "0001_initial"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name="documentrequest",
|
||||
name="type",
|
||||
field=models.CharField(
|
||||
choices=[("softcopy", "Softcopy"), ("hardcopy", "Hardcopy")],
|
||||
default="softcopy",
|
||||
max_length=16,
|
||||
),
|
||||
),
|
||||
]
|
|
@ -24,8 +24,7 @@ class DocumentRequestCreationSerializer(serializers.ModelSerializer):
|
|||
documents = DocumentRequestUnitCreationSerializer(many=True, required=True)
|
||||
college = serializers.CharField(max_length=64)
|
||||
purpose = serializers.CharField(max_length=512)
|
||||
type = serializers.ChoiceField(
|
||||
choices=DocumentRequest.TYPE_CHOICES, required=True)
|
||||
type = serializers.ChoiceField(choices=DocumentRequest.TYPE_CHOICES, required=True)
|
||||
|
||||
class Meta:
|
||||
model = DocumentRequest
|
||||
|
@ -75,7 +74,10 @@ class DocumentRequestUnitWithFileSerializer(serializers.ModelSerializer):
|
|||
class DocumentRequestSerializer(serializers.ModelSerializer):
|
||||
documents = serializers.SerializerMethodField()
|
||||
requester = serializers.SlugRelatedField(
|
||||
many=False, slug_field="email", queryset=CustomUser.objects.all(), required=False
|
||||
many=False,
|
||||
slug_field="email",
|
||||
queryset=CustomUser.objects.all(),
|
||||
required=False,
|
||||
)
|
||||
purpose = serializers.CharField(max_length=512)
|
||||
date_requested = serializers.DateTimeField(
|
||||
|
@ -116,7 +118,10 @@ class DocumentRequestSerializer(serializers.ModelSerializer):
|
|||
class FullDocumentRequestSerializer(serializers.ModelSerializer):
|
||||
documents = DocumentRequestUnitWithFileSerializer()
|
||||
requester = serializers.SlugRelatedField(
|
||||
many=False, slug_field="email", queryset=CustomUser.objects.all(), required=False
|
||||
many=False,
|
||||
slug_field="email",
|
||||
queryset=CustomUser.objects.all(),
|
||||
required=False,
|
||||
)
|
||||
purpose = serializers.CharField(max_length=512)
|
||||
date_requested = serializers.DateTimeField(
|
||||
|
|
|
@ -3,7 +3,7 @@ from .views import (
|
|||
DocumentRequestCreateView,
|
||||
DocumentRequestListView,
|
||||
DocumentRequestUpdateView,
|
||||
DocumentRequestFullListView
|
||||
DocumentRequestFullListView,
|
||||
)
|
||||
|
||||
urlpatterns = [
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue