Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 34 additions & 0 deletions .idea/Monitoring-Platform.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions .idea/dataSources.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions NewsApp/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,3 +119,15 @@ class BlogCommentLike(models.Model):
)
created = models.DateTimeField(auto_now_add=True)
updated = models.DateTimeField(auto_now=True)


class Teachers(models.Model):
name = models.CharField(max_length=100)
surname = models.CharField(max_length=100)
image = models.ImageField(upload_to='teachers')
description = models.TextField()
created = models.DateTimeField(auto_now_add=True)
updated = models.DateTimeField(auto_now=True)

def __str__(self):
return self.name
8 changes: 7 additions & 1 deletion NewsApp/serializers.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
# serializers.py
from rest_framework import serializers
from .models import Blog
from .models import Blog, Teachers


class BlogSerializer(serializers.ModelSerializer):
class Meta:
model = Blog
fields = '__all__'


class TeacherSerializer(serializers.ModelSerializer):
class Meta:
model = Teachers
fields = '__all__'
13 changes: 11 additions & 2 deletions NewsApp/views.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
from requests import Response
from rest_framework import viewsets
from .serializers import BlogSerializer
from .models import Blog
from .serializers import BlogSerializer, TeacherSerializer
from .models import Blog, Teachers
from drf_yasg.utils import swagger_auto_schema
from rest_framework.views import APIView


class BlogViewSet(viewsets.ReadOnlyModelViewSet):
Expand All @@ -21,6 +22,14 @@ def get(self, request):
return Response(serializer.errors)


class TeacherInfoView(APIView):
@swagger_auto_schema(request_body=TeacherSerializer)
def get(self, request):
# blog objects send all
blogs = Teachers.objects.all()
serializer = TeacherSerializer(blogs, many=True)
return Response(serializer.data)


from django.shortcuts import render

Expand Down
24 changes: 24 additions & 0 deletions QuizApp/migrations/0003_teacher.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Generated by Django 4.2 on 2023-07-15 20:18

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('QuizApp', '0002_remove_themequiz_quiz_quiz_theme'),
]

operations = [
migrations.CreateModel(
name='Teacher',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=100)),
('surname', models.CharField(max_length=100)),
('info', models.CharField(max_length=2000)),
('photo', models.ImageField(upload_to='teachers')),
('level', models.CharField(max_length=100)),
],
),
]
2 changes: 1 addition & 1 deletion QuizApp/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

class QuizSerializer(serializers.ModelSerializer):
class Meta:
model = ThemeQuiz
model = Quiz
fields = ('theme',)

class QuizFindSerializer(serializers.ModelSerializer):
Expand Down
5 changes: 3 additions & 2 deletions QuizApp/views.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from django.shortcuts import render

# Create your views here.

from rest_framework.views import APIView
from .models import ThemeQuiz, Quiz
from rest_framework.views import APIView
from rest_framework.response import Response
Expand Down Expand Up @@ -33,6 +33,7 @@ class ThemeFindView(APIView):
@swagger_auto_schema(request_body=QuizSerializer)
def post(self, request):
theme = request.data.get('theme')
obj = Quiz.objects.filter(theme__theme=theme)
the = ThemeQuiz.objects.get(id=theme)
obj = Quiz.objects.filter(theme__theme=the)
serializer = QuizFindSerializer(obj, many=True)
return Response(serializer.data)