Skip to content

Commit e09eff4

Browse files
Merge pull request #4 from Abhishek723/add_school_board_category
add school board category in school
2 parents 4c20f98 + 4012a3f commit e09eff4

File tree

7 files changed

+21
-59
lines changed

7 files changed

+21
-59
lines changed

api/admin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class StudentAdmin(admin.ModelAdmin):
1414
class SchoolAdmin(admin.ModelAdmin):
1515
fieldsets = (
1616
('List Of Schools', {
17-
'fields': ['schools_list']
17+
'fields': ('schools_list', 'category')
1818
}),
1919
)
2020

api/migrations/0001_initial.py

Lines changed: 0 additions & 34 deletions
This file was deleted.

api/migrations/0002_auto_20200912_1655.py

Lines changed: 0 additions & 19 deletions
This file was deleted.

api/migrations/__init__.py

Whitespace-only changes.

api/models.py

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,23 @@
11
from django.db import models
22

3+
CATEGORY = [
4+
('OTHER', 'Other'),
5+
('CBSE', 'Central board of secondary education'),
6+
('ICSE', 'Indian certificate secondary education'),
7+
('STATE_BOARD', 'State board'),
8+
]
9+
10+
311
class School(models.Model):
412
schools_list = models.CharField(max_length=150)
13+
category = models.CharField(
14+
max_length=50,
15+
choices=CATEGORY
16+
)
517

618
def __str__(self):
719
return self.schools_list
8-
20+
921

1022
class Student(models.Model):
1123
student_name = models.CharField(max_length=150)
@@ -14,7 +26,6 @@ class Student(models.Model):
1426
student_registration_no = models.IntegerField(default=0)
1527
student_subject = models.TextField()
1628
student_school_name = models.ForeignKey(School, on_delete=models.DO_NOTHING, default="")
17-
1829

1930
def __str__(self):
2031
return self.student_name

api/serializers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ class Meta:
2121
class SchoolSerializer(serializers.HyperlinkedModelSerializer):
2222
class Meta:
2323
model = School
24-
fields = ['schools_list']
24+
fields = ('schools_list', 'category')

api/views.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,25 @@
55
from rest_framework import permissions
66
from .serializers import UserSerializer, GroupSerializer
77

8+
89
class UserViewSet(viewsets.ModelViewSet):
910
""" API endpoint that allows users to be view or edited"""
1011
queryset = User.objects.all()
1112
serializer_class = UserSerializer
1213
permission_classes = [permissions.IsAuthenticated]
1314

15+
1416
class GroupViewSet(viewsets.ModelViewSet):
1517
queryset = Group.objects.all()
1618
serializer_class = GroupSerializer
1719
permission_class = [permissions.IsAuthenticated]
18-
20+
21+
1922
class StudentViewSet(viewsets.ModelViewSet):
20-
queryset= Student.objects.all().order_by('Student_roll_no')
23+
queryset = Student.objects.all().order_by('Student_roll_no')
2124
serializer_class = StudentSerializer
2225

26+
2327
class SchoolViewSet(viewsets.ModelViewSet):
2428
queryset = School.objects.all()
2529
serializer_class = SchoolSerializer

0 commit comments

Comments
 (0)