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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -157,4 +157,5 @@ cython_debug/
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
#.idea/
.idea/
staticfiles/
12 changes: 12 additions & 0 deletions api/abdulaziz/room/serializers.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
from rest_framework import serializers
from apps.structure.models import Room

class RoomSerializer(serializers.ModelSerializer):
class Meta:
model = Room
fields = ['title', 'updated_at', 'created_at']
extra_kwargs = {
'created_at': {'read_only': True},
'updated_at': {'read_only': True},
}

6 changes: 6 additions & 0 deletions api/abdulaziz/room/urls.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from django.urls import path
from .views import RoomListView

urlpatterns= [
path('room_list/', RoomListView.as_view(), name='room_list')
]
9 changes: 9 additions & 0 deletions api/abdulaziz/room/views.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
from rest_framework import generics
from .serializers import RoomSerializer
from apps.structure.models import Room


class RoomListView(generics.ListAPIView):
queryset = Room.objects.all()
serializer_class = RoomSerializer

13 changes: 13 additions & 0 deletions api/abdulxay/attendance/serializers.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
from rest_framework import serializers
from apps.structure.models import Attendance

class AttendanceSerializers(serializers.ModelSerializer):

class Meta:
model = Attendance
fields = ['lesson', 'student', 'status', 'created_at', 'updated_at']
extra_kwargs = {
'created_at': {'read_only': True},
'updated_at': {'read_only': True},
}

6 changes: 6 additions & 0 deletions api/abdulxay/attendance/urls.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from django.urls import path
from .views import AttendanceListView

urlpatterns = [
path('attendance_list/', AttendanceListView.as_view(), name='attendance_list')
]
7 changes: 7 additions & 0 deletions api/abdulxay/attendance/views.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
from rest_framework import generics
from .serializers import AttendanceSerializers
from apps.structure.models import Attendance

class AttendanceListView(generics.ListAPIView):
queryset = Attendance.objects.all()
serializer_class = AttendanceSerializers
12 changes: 12 additions & 0 deletions api/abdulxay/payment/serializers.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
from rest_framework import serializers
from apps.structure.models import Payment

class PaymentSerializers(serializers.ModelSerializer):

class Meta:
model = Payment
fields = ['student', 'price', 'date', 'deadline', 'comment', 'created_at', 'updated_at']
extra_kwargs = {
'created_at': {'read_only': True},
'updated_at': {'read_only': True},
}
6 changes: 6 additions & 0 deletions api/abdulxay/payment/urls.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from django.urls import path
from .views import PaymentListView

urlpatterns = [
path('payment_list/', PaymentListView.as_view(), name='payment_list')
]
8 changes: 8 additions & 0 deletions api/abdulxay/payment/views.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
from rest_framework import generics
from .serializers import PaymentSerializers
from apps.structure.models import Payment


class PaymentListView(generics.ListAPIView):
queryset = Payment.objects.all()
serializer_class = PaymentSerializers
13 changes: 13 additions & 0 deletions api/abdulxay/task/serializers.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
from rest_framework import serializers
from apps.structure.models import Task

class TaskSerializers(serializers.ModelSerializer):

class Meta:
model = Task
fields = ['title', 'grade', 'deadline', 'created_at', 'updated_at', 'teacher', 'group', 'file']

extra_kwargs = {
'created_at': {'read_only': True},
'updated_at': {'read_only': True},
}
6 changes: 6 additions & 0 deletions api/abdulxay/task/urls.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from django.urls import path
from .views import TaskListView

urlpatterns = [
path('task_list/', TaskListView.as_view(), name='task_list')
]
7 changes: 7 additions & 0 deletions api/abdulxay/task/views.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
from rest_framework import generics
from .serializers import TaskSerializers
from apps.structure.models import Task

class TaskListView(generics.ListAPIView):
queryset = Task.objects.all()
serializer_class = TaskSerializers
12 changes: 12 additions & 0 deletions api/abdulxay/task_submittion/serializers.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
from rest_framework import serializers
from apps.structure.models import TaskSubmittion

class TaskSubmittionSerializers(serializers.ModelSerializer):

class Meta:
model = TaskSubmittion
fields = ['student', 'task', 'file', 'created_at', 'updated_at']
extra_kwargs = {
'created_at': {'read_only': True},
'updated_at': {'read_only': True},
}
6 changes: 6 additions & 0 deletions api/abdulxay/task_submittion/urls.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from django.urls import path
from .views import TaskSubmittionListView

urlpatterns = [
path('tasksubmittion_list/', TaskSubmittionListView.as_view(), name='tasksubmittion_list')
]
7 changes: 7 additions & 0 deletions api/abdulxay/task_submittion/views.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
from rest_framework import generics
from .serializers import TaskSubmittionSerializers
from apps.structure.models import TaskSubmittion

class TaskSubmittionListView(generics.ListAPIView):
queryset = TaskSubmittion.objects.all()
serializer_class = TaskSubmittionSerializers
9 changes: 9 additions & 0 deletions apps/structure/api_urls.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
from django.urls import path, include

urlpatterns = [
path('', include('api.abdulaziz.room.urls')),
path('', include('api.abdulxay.payment.urls')),
path('', include('api.abdulxay.task_submittion.urls')),
path('', include('api.abdulxay.task.urls')),
path('', include('api.abdulxay.attendance.urls')),
]
Empty file removed apps/structure/urls.py
Empty file.
4 changes: 0 additions & 4 deletions apps/users/apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,4 @@

class UsersConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
<<<<<<< HEAD
name = 'users'
=======
name = 'apps.users'
>>>>>>> cb4e5e2d655c474d3c5b46e6200c4d1a1b7bd285
6 changes: 3 additions & 3 deletions core/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@

urlpatterns = [
path('admin/', admin.site.urls),
path('api/v1' , include('apps.users.api.urls')),
path('api/v1' , include('apps.common.api.urls')),
path('api/v1' , include('apps.structure.api.urls')),
path('api/v1/' , include('apps.users.api.urls')),
path('api/v1/' , include('apps.common.api.urls')),
path('api/v1/' , include('apps.structure.api_urls')),
]

if settings.DEBUG:
Expand Down