diff --git a/docmanager_backend/document_requests/views.py b/docmanager_backend/document_requests/views.py index b604dbd..4272030 100644 --- a/docmanager_backend/document_requests/views.py +++ b/docmanager_backend/document_requests/views.py @@ -1,7 +1,7 @@ from rest_framework import generics from rest_framework.permissions import IsAuthenticated from rest_framework.pagination import PageNumberPagination -from accounts.permissions import IsHead, IsStaff +from accounts.permissions import IsHead from rest_framework.pagination import PageNumberPagination from .serializers import ( DocumentRequestCreationSerializer, @@ -45,13 +45,13 @@ class DocumentRequestListView(generics.ListAPIView): class DocumentRequestFullListView(generics.ListAPIView): """ Returns document requests. Always returns the link to download the document. - Head is able to view all document requests here. Clients have no access, only staff. + Head is able to view all document requests here. Staff and clients have no access """ http_method_names = ["get"] serializer_class = DocumentRequestSerializer pagination_class = PageNumberPagination - permission_classes = [IsAuthenticated, IsStaff] + permission_classes = [IsAuthenticated, IsHead] queryset = DocumentRequest.objects.all() diff --git a/docmanager_backend/questionnaires/admin.py b/docmanager_backend/questionnaires/admin.py index 50ec7bc..8c38f3f 100644 --- a/docmanager_backend/questionnaires/admin.py +++ b/docmanager_backend/questionnaires/admin.py @@ -1,11 +1,3 @@ from django.contrib import admin -from unfold.admin import ModelAdmin -from .models import Questionnaire - - -@admin.register(Questionnaire) -class QuestionnaireAdmin(ModelAdmin): - model = Questionnaire - search_fields = ["id", "date_submitted"] - list_display = ["id", "date_submitted"] +# Register your models here. diff --git a/docmanager_backend/questionnaires/migrations/0002_alter_questionnaire_sqd0_answer_and_more.py b/docmanager_backend/questionnaires/migrations/0002_alter_questionnaire_sqd0_answer_and_more.py deleted file mode 100644 index eb19597..0000000 --- a/docmanager_backend/questionnaires/migrations/0002_alter_questionnaire_sqd0_answer_and_more.py +++ /dev/null @@ -1,148 +0,0 @@ -# Generated by Django 5.1.3 on 2024-11-28 07:43 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("questionnaires", "0001_initial"), - ] - - operations = [ - migrations.AlterField( - model_name="questionnaire", - name="sqd0_answer", - field=models.CharField( - choices=[ - ("1", "Strongly Disagree"), - ("2", "Disagree"), - ("3", "Neither Agree nor Disagree"), - ("4", "Agree"), - ("5", "Strongly Agree"), - ("6", "N/A"), - ], - max_length=16, - ), - ), - migrations.AlterField( - model_name="questionnaire", - name="sqd1_answer", - field=models.CharField( - choices=[ - ("1", "Strongly Disagree"), - ("2", "Disagree"), - ("3", "Neither Agree nor Disagree"), - ("4", "Agree"), - ("5", "Strongly Agree"), - ("6", "N/A"), - ], - max_length=16, - ), - ), - migrations.AlterField( - model_name="questionnaire", - name="sqd2_answer", - field=models.CharField( - choices=[ - ("1", "Strongly Disagree"), - ("2", "Disagree"), - ("3", "Neither Agree nor Disagree"), - ("4", "Agree"), - ("5", "Strongly Agree"), - ("6", "N/A"), - ], - max_length=16, - ), - ), - migrations.AlterField( - model_name="questionnaire", - name="sqd3_answer", - field=models.CharField( - choices=[ - ("1", "Strongly Disagree"), - ("2", "Disagree"), - ("3", "Neither Agree nor Disagree"), - ("4", "Agree"), - ("5", "Strongly Agree"), - ("6", "N/A"), - ], - max_length=16, - ), - ), - migrations.AlterField( - model_name="questionnaire", - name="sqd4_answer", - field=models.CharField( - choices=[ - ("1", "Strongly Disagree"), - ("2", "Disagree"), - ("3", "Neither Agree nor Disagree"), - ("4", "Agree"), - ("5", "Strongly Agree"), - ("6", "N/A"), - ], - max_length=16, - ), - ), - migrations.AlterField( - model_name="questionnaire", - name="sqd5_answer", - field=models.CharField( - choices=[ - ("1", "Strongly Disagree"), - ("2", "Disagree"), - ("3", "Neither Agree nor Disagree"), - ("4", "Agree"), - ("5", "Strongly Agree"), - ("6", "N/A"), - ], - max_length=16, - ), - ), - migrations.AlterField( - model_name="questionnaire", - name="sqd6_answer", - field=models.CharField( - choices=[ - ("1", "Strongly Disagree"), - ("2", "Disagree"), - ("3", "Neither Agree nor Disagree"), - ("4", "Agree"), - ("5", "Strongly Agree"), - ("6", "N/A"), - ], - max_length=16, - ), - ), - migrations.AlterField( - model_name="questionnaire", - name="sqd7_answer", - field=models.CharField( - choices=[ - ("1", "Strongly Disagree"), - ("2", "Disagree"), - ("3", "Neither Agree nor Disagree"), - ("4", "Agree"), - ("5", "Strongly Agree"), - ("6", "N/A"), - ], - max_length=16, - ), - ), - migrations.AlterField( - model_name="questionnaire", - name="sqd8_answer", - field=models.CharField( - choices=[ - ("1", "Strongly Disagree"), - ("2", "Disagree"), - ("3", "Neither Agree nor Disagree"), - ("4", "Agree"), - ("5", "Strongly Agree"), - ("6", "N/A"), - ], - max_length=16, - ), - ), - ] diff --git a/docmanager_backend/questionnaires/models.py b/docmanager_backend/questionnaires/models.py index 564e728..00b94cc 100644 --- a/docmanager_backend/questionnaires/models.py +++ b/docmanager_backend/questionnaires/models.py @@ -74,7 +74,7 @@ class Questionnaire(models.Model): # SQD Questions SQD_CHOICES = ( - ("1", "Strongly Disagree"), + ("1", "Strongly disagree"), ("2", "Disagree"), ("3", "Neither Agree nor Disagree"), ("4", "Agree"),