update

app/admin.py

@@ -9,20 +9,19 @@ from app.models import (
     NewsEvent,
     Attendance,
     Result,
+    Library,
 )
 
 
+# BaseUserAdmin to handle common behavior for BaseUser-based models
 class BaseUserAdmin(admin.ModelAdmin):
     exclude = ["user"]
 
     def save_model(self, request, obj, form, change):
-        # Save the BaseUser instance
         super().save_model(request, obj, form, change)
-
-        # Sync the groups with the related User object
         if obj.user:
-            obj.user.groups.set(obj.group.all())  # Sync groups
-            obj.user.save()  # Save the User object to persist changes
+            obj.user.groups.set(obj.group.all())
+            obj.user.save()
 
 
 @admin.register(Teacher)
@@ -38,13 +37,22 @@ class StudentAdmin(BaseUserAdmin):
         "id",
         "first_name",
         "last_name",
+        "father_name",
+        "mother_name",
         "email",
         "phone",
         "course",
         "academic_year",
         "active_status",
     )
-    search_fields = ("first_name", "last_name", "email", "phone")
+    search_fields = (
+        "first_name",
+        "last_name",
+        "father_name",
+        "mother_name",
+        "email",
+        "phone",
+    )
     list_filter = ("active_status", "gender", "course", "academic_year")
 
 
@@ -72,8 +80,8 @@ class CourseAdmin(admin.ModelAdmin):
 
 @admin.register(AcademicYear)
 class AcademicYearAdmin(admin.ModelAdmin):
-    list_display = ("id", "batch")
-    search_fields = ("batch",)
+    list_display = ("id", "year")
+    search_fields = ("year",)
 
 
 @admin.register(Subject)
@@ -109,3 +117,8 @@ class ResultAdmin(admin.ModelAdmin):
     def save_model(self, request, obj, form, change):
         obj.total_marks = obj.get_total()
         super().save_model(request, obj, form, change)
+
+
+@admin.register(Library)
+class LibraryAdmin(admin.ModelAdmin):
+    list_display = ("book_name", "author", "publication_year")

app/migrations/0001_initial.py

@@ -1,7 +1,9 @@
-# Generated by Django 5.1.4 on 2025-01-06 17:31
+# Generated by Django 5.1.4 on 2025-01-07 17:39
 
 import django.core.validators
 import django.db.models.deletion
+from decimal import Decimal
+from django.conf import settings
 from django.db import migrations, models
 
 
@@ -11,6 +13,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('auth', '0012_alter_user_first_name_max_length'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
@@ -18,17 +21,44 @@ class Migration(migrations.Migration):
             name='AcademicYear',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('batch', models.CharField(max_length=255, unique=True)),
+                ('year', models.CharField(max_length=255, unique=True)),
             ],
+            options={
+                'verbose_name': 'Academic Year',
+                'verbose_name_plural': 'Academic Years',
+            },
         ),
         migrations.CreateModel(
             name='Course',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('name', models.CharField(max_length=100)),
+                ('level', models.CharField(choices=[('Basic', 'Basic'), ('Primary', 'Primary'), ('Secondary', 'Secondary'), ('Vocational Traning', 'Vocational Traning'), ('Higher Secondary', 'Higher Secondary'), ('Graduation', 'Graduation'), ('Post Graduation', 'Post Graduation')], max_length=45)),
                 ('course_type', models.CharField(choices=[('semester', 'Semester-based'), ('yearly', 'Yearly-based')], max_length=10)),
                 ('duration', models.PositiveIntegerField()),
             ],
+            options={
+                'verbose_name': 'Course',
+                'verbose_name_plural': 'Courses',
+            },
+        ),
+        migrations.CreateModel(
+            name='Library',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('category', models.CharField(max_length=255)),
+                ('book_name', models.CharField(max_length=255)),
+                ('description', models.CharField(max_length=255)),
+                ('author', models.CharField(max_length=255)),
+                ('publication_year', models.PositiveIntegerField()),
+                ('quantity', models.PositiveIntegerField()),
+                ('available', models.CharField(choices=[('Y', 'Yes'), ('N', 'NO')], max_length=1)),
+                ('date_added', models.DateField(auto_now_add=True)),
+            ],
+            options={
+                'verbose_name': 'Library',
+                'verbose_name_plural': 'Library',
+            },
         ),
         migrations.CreateModel(
             name='NewsEvent',
@@ -39,44 +69,71 @@ class Migration(migrations.Migration):
                 ('type', models.CharField(choices=[('news', 'News'), ('event', 'Event')], max_length=5)),
                 ('created_at', models.DateTimeField(auto_now_add=True)),
             ],
+            options={
+                'verbose_name': 'News/Event',
+                'verbose_name_plural': 'News/Events',
+            },
         ),
         migrations.CreateModel(
             name='Staff',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('active_status', models.BooleanField(default=True)),
                 ('first_name', models.CharField(max_length=255)),
+                ('middle_name', models.CharField(blank=True, max_length=255, null=True)),
                 ('last_name', models.CharField(max_length=255)),
                 ('email', models.EmailField(max_length=255, unique=True)),
-                ('phone', models.CharField(max_length=15, validators=[django.core.validators.RegexValidator('^\\+?1?\\d{9,15}$')])),
+                ('phone', models.CharField(max_length=10, validators=[django.core.validators.RegexValidator('^\\+?1?\\d{9,15}$')])),
                 ('username', models.CharField(blank=True, max_length=255, null=True, unique=True)),
                 ('password', models.CharField(max_length=255)),
-                ('active_status', models.BooleanField(default=True)),
-                ('position', models.CharField(choices=[('clerk', 'Clerk'), ('assistant', 'Assistant'), ('guard', 'Guard')], max_length=255)),
+                ('gender', models.CharField(choices=[('M', 'Male'), ('F', 'Female')], max_length=1)),
+                ('position', models.CharField(choices=[('Lab Assistant', 'Lab Assistant'), ('Librarian', 'Librarian'), ('Accountant', 'Accountant'), ('Guard', 'Guard'), ('Driver', 'Driver'), ('Helper', 'Helper'), ('Cleaner', 'Cleaner')], max_length=255)),
                 ('address', models.CharField(max_length=255)),
-                ('group', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='auth.group')),
+                ('marital_status', models.CharField(choices=[('married', 'Married'), ('widowed', 'Widowed'), ('separated', 'Separated'), ('divorced', 'Divorced'), ('single', 'Single')], max_length=10)),
+                ('date_of_joining', models.DateField()),
+                ('group', models.ManyToManyField(blank=True, to='auth.group')),
+                ('user', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
             options={
-                'abstract': False,
+                'verbose_name': 'Staff',
+                'verbose_name_plural': 'Staff',
             },
         ),
         migrations.CreateModel(
             name='Student',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('active_status', models.BooleanField(default=True)),
                 ('first_name', models.CharField(max_length=255)),
+                ('middle_name', models.CharField(blank=True, max_length=255, null=True)),
                 ('last_name', models.CharField(max_length=255)),
                 ('email', models.EmailField(max_length=255, unique=True)),
-                ('phone', models.CharField(max_length=15, validators=[django.core.validators.RegexValidator('^\\+?1?\\d{9,15}$')])),
+                ('phone', models.CharField(max_length=10, validators=[django.core.validators.RegexValidator('^\\+?1?\\d{9,15}$')])),
                 ('username', models.CharField(blank=True, max_length=255, null=True, unique=True)),
                 ('password', models.CharField(max_length=255)),
-                ('active_status', models.BooleanField(default=True)),
+                ('address', models.CharField(max_length=255)),
+                ('date_of_birth', models.DateField()),
                 ('gender', models.CharField(choices=[('M', 'Male'), ('F', 'Female')], max_length=1)),
+                ('father_name', models.CharField(max_length=100)),
+                ('father_phone_no', models.CharField(max_length=10, validators=[django.core.validators.RegexValidator('^\\+?1?\\d{9,15}$')])),
+                ('father_email', models.EmailField(blank=True, max_length=254, null=True)),
+                ('father_occupation', models.CharField(choices=[('Agriculture', 'Agriculture'), ('Banker', 'Banker'), ('Business', 'Business'), ('Doctor', 'Doctor'), ('Farmer', 'Farmer'), ('Fisherman', 'Fisherman'), ('Public Service', 'Public Service'), ('Private Service', 'Private Service'), ('Shopkeeper', 'Shopkeeper'), ('Driver', 'Driver'), ('Worker', 'Worker'), ('N/A', 'N/A')], default='N/A', max_length=45)),
+                ('mother_name', models.CharField(max_length=100)),
+                ('mother_phone_no', models.CharField(blank=True, max_length=10, null=True, validators=[django.core.validators.RegexValidator('^\\+?1?\\d{9,15}$')])),
+                ('mother_email', models.EmailField(blank=True, max_length=254, null=True)),
+                ('mother_occupation', models.CharField(choices=[('Agriculture', 'Agriculture'), ('Banker', 'Banker'), ('Business', 'Business'), ('Doctor', 'Doctor'), ('Farmer', 'Farmer'), ('Fisherman', 'Fisherman'), ('Public Service', 'Public Service'), ('Private Service', 'Private Service'), ('Shopkeeper', 'Shopkeeper'), ('Driver', 'Driver'), ('HouseWife', 'HouseWife'), ('Worker', 'Worker'), ('N/A', 'N/A')], default='N/A', max_length=45)),
+                ('guardian_name', models.CharField(max_length=100)),
+                ('guardian_phone_no', models.CharField(max_length=10, validators=[django.core.validators.RegexValidator('^\\+?1?\\d{9,15}$')])),
+                ('guardian_email', models.EmailField(blank=True, max_length=254, null=True)),
+                ('relationship_with_student', models.CharField(choices=[('Father', 'Father'), ('Mother', 'Mother'), ('Brother', 'Brother'), ('Sister', 'Sister'), ('Uncle', 'Uncle'), ('Aunt', 'Aunt'), ('Grandfather', 'Grandfather')], max_length=45)),
                 ('academic_year', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='app.academicyear')),
                 ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='app.course')),
-                ('group', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='auth.group')),
+                ('group', models.ManyToManyField(blank=True, to='auth.group')),
+                ('user', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
             options={
-                'abstract': False,
+                'verbose_name': 'Student',
+                'verbose_name_plural': 'Students',
             },
         ),
         migrations.CreateModel(
@@ -87,24 +144,69 @@ class Migration(migrations.Migration):
                 ('semester_or_year_number', models.PositiveIntegerField()),
                 ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='app.course')),
             ],
+            options={
+                'verbose_name': 'Subject',
+                'verbose_name_plural': 'Subjects',
+            },
+        ),
+        migrations.CreateModel(
+            name='Result',
+            fields=[
+                ('id', models.AutoField(primary_key=True, serialize=False)),
+                ('practical_marks', models.DecimalField(decimal_places=2, default=Decimal('0.00'), max_digits=5)),
+                ('exam_marks', models.DecimalField(decimal_places=2, default=Decimal('0.00'), max_digits=5)),
+                ('total_marks', models.DecimalField(decimal_places=2, default=Decimal('0.00'), editable=False, max_digits=5)),
+                ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='app.student')),
+                ('subject', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='app.subject')),
+            ],
+            options={
+                'verbose_name': 'Result',
+                'verbose_name_plural': 'Results',
+            },
+        ),
+        migrations.CreateModel(
+            name='Attendance',
+            fields=[
+                ('id', models.AutoField(primary_key=True, serialize=False)),
+                ('date', models.DateField()),
+                ('status', models.CharField(choices=[('present', 'Present'), ('absent', 'Absent')], max_length=10)),
+                ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='app.student')),
+                ('subject', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='app.subject')),
+            ],
+            options={
+                'verbose_name': 'Attendance',
+                'verbose_name_plural': 'Attendance Records',
+            },
         ),
         migrations.CreateModel(
             name='Teacher',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('active_status', models.BooleanField(default=True)),
                 ('first_name', models.CharField(max_length=255)),
+                ('middle_name', models.CharField(blank=True, max_length=255, null=True)),
                 ('last_name', models.CharField(max_length=255)),
                 ('email', models.EmailField(max_length=255, unique=True)),
-                ('phone', models.CharField(max_length=15, validators=[django.core.validators.RegexValidator('^\\+?1?\\d{9,15}$')])),
+                ('phone', models.CharField(max_length=10, validators=[django.core.validators.RegexValidator('^\\+?1?\\d{9,15}$')])),
                 ('username', models.CharField(blank=True, max_length=255, null=True, unique=True)),
                 ('password', models.CharField(max_length=255)),
-                ('active_status', models.BooleanField(default=True)),
                 ('address', models.CharField(max_length=255)),
                 ('gender', models.CharField(choices=[('M', 'Male'), ('F', 'Female')], max_length=1)),
-                ('group', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='auth.group')),
+                ('qualification', models.CharField(choices=[('BA', 'BA'), ('BBS', 'BBS'), ('BE', 'BE'), ('BEd', 'BEd'), ('BSc', 'BSc'), ('MA', 'MA'), ('MSc', 'MSc'), ('MBS', 'MBS'), ('ME', 'ME'), ('PhD', 'PhD'), ('Others', 'Others')], max_length=45)),
+                ('specialization', models.CharField(max_length=255)),
+                ('marital_status', models.CharField(choices=[('married', 'Married'), ('widowed', 'Widowed'), ('separated', 'Separated'), ('divorced', 'Divorced'), ('single', 'Single')], max_length=10)),
+                ('date_of_joining', models.DateField()),
+                ('group', models.ManyToManyField(blank=True, to='auth.group')),
+                ('user', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
             options={
-                'abstract': False,
+                'verbose_name': 'Teacher',
+                'verbose_name_plural': 'Teachers',
             },
         ),
+        migrations.AddField(
+            model_name='subject',
+            name='teacher',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='app.teacher'),
+        ),
     ]

app/migrations/0002_staff_user_student_user_teacher_user.py

@@ -1,31 +0,0 @@
-# Generated by Django 5.1.4 on 2025-01-07 04:39
-
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('app', '0001_initial'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='staff',
-            name='user',
-            field=models.OneToOneField(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AddField(
-            model_name='student',
-            name='user',
-            field=models.OneToOneField(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AddField(
-            model_name='teacher',
-            name='user',
-            field=models.OneToOneField(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-    ]

app/migrations/0003_alter_staff_user_alter_student_user_and_more.py

@@ -1,31 +0,0 @@
-# Generated by Django 5.1.4 on 2025-01-07 04:57
-
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('app', '0002_staff_user_student_user_teacher_user'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='staff',
-            name='user',
-            field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AlterField(
-            model_name='student',
-            name='user',
-            field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AlterField(
-            model_name='teacher',
-            name='user',
-            field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-    ]

app/migrations/0004_remove_staff_user_remove_student_user_and_more.py

@@ -1,25 +0,0 @@
-# Generated by Django 5.1.4 on 2025-01-07 04:59
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('app', '0003_alter_staff_user_alter_student_user_and_more'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='staff',
-            name='user',
-        ),
-        migrations.RemoveField(
-            model_name='student',
-            name='user',
-        ),
-        migrations.RemoveField(
-            model_name='teacher',
-            name='user',
-        ),
-    ]

app/migrations/0005_staff_user_student_user_teacher_user.py

@@ -1,31 +0,0 @@
-# Generated by Django 5.1.4 on 2025-01-07 05:01
-
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('app', '0004_remove_staff_user_remove_student_user_and_more'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='staff',
-            name='user',
-            field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AddField(
-            model_name='student',
-            name='user',
-            field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AddField(
-            model_name='teacher',
-            name='user',
-            field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-    ]

app/migrations/0006_remove_staff_user_remove_student_user_and_more.py

@@ -1,25 +0,0 @@
-# Generated by Django 5.1.4 on 2025-01-07 05:10
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('app', '0005_staff_user_student_user_teacher_user'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='staff',
-            name='user',
-        ),
-        migrations.RemoveField(
-            model_name='student',
-            name='user',
-        ),
-        migrations.RemoveField(
-            model_name='teacher',
-            name='user',
-        ),
-    ]

app/migrations/0007_staff_user_student_user_teacher_user.py

@@ -1,31 +0,0 @@
-# Generated by Django 5.1.4 on 2025-01-07 05:11
-
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('app', '0006_remove_staff_user_remove_student_user_and_more'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='staff',
-            name='user',
-            field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AddField(
-            model_name='student',
-            name='user',
-            field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AddField(
-            model_name='teacher',
-            name='user',
-            field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-    ]

app/migrations/0008_alter_staff_phone_alter_student_phone_and_more.py

@@ -1,29 +0,0 @@
-# Generated by Django 5.1.4 on 2025-01-07 06:43
-
-import django.core.validators
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('app', '0007_staff_user_student_user_teacher_user'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='staff',
-            name='phone',
-            field=models.CharField(max_length=10, validators=[django.core.validators.RegexValidator('^\\+?1?\\d{9,15}$')]),
-        ),
-        migrations.AlterField(
-            model_name='student',
-            name='phone',
-            field=models.CharField(max_length=10, validators=[django.core.validators.RegexValidator('^\\+?1?\\d{9,15}$')]),
-        ),
-        migrations.AlterField(
-            model_name='teacher',
-            name='phone',
-            field=models.CharField(max_length=10, validators=[django.core.validators.RegexValidator('^\\+?1?\\d{9,15}$')]),
-        ),
-    ]

app/migrations/0009_attendance.py

@@ -1,24 +0,0 @@
-# Generated by Django 5.1.4 on 2025-01-07 06:45
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('app', '0008_alter_staff_phone_alter_student_phone_and_more'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Attendance',
-            fields=[
-                ('id', models.AutoField(primary_key=True, serialize=False)),
-                ('date', models.DateField()),
-                ('status', models.CharField(choices=[('present', 'Present'), ('absent', 'Absent')], max_length=10)),
-                ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='app.student')),
-                ('subject', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='app.subject')),
-            ],
-        ),
-    ]

app/migrations/0010_result.py

@@ -1,25 +0,0 @@
-# Generated by Django 5.1.4 on 2025-01-07 09:41
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('app', '0009_attendance'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Result',
-            fields=[
-                ('id', models.AutoField(primary_key=True, serialize=False)),
-                ('practical_marks', models.IntegerField()),
-                ('exam_marks', models.IntegerField()),
-                ('total_marks', models.IntegerField(editable=False)),
-                ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='app.student')),
-                ('subject', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='app.subject')),
-            ],
-        ),
-    ]

app/migrations/0011_alter_result_total_marks.py

@@ -1,18 +0,0 @@
-# Generated by Django 5.1.4 on 2025-01-07 09:46
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('app', '0010_result'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='result',
-            name='total_marks',
-            field=models.IntegerField(),
-        ),
-    ]

app/migrations/0012_remove_result_total_marks.py

@@ -1,17 +0,0 @@
-# Generated by Django 5.1.4 on 2025-01-07 09:54
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('app', '0011_alter_result_total_marks'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='result',
-            name='total_marks',
-        ),
-    ]

app/migrations/0013_result_total_marks.py

@@ -1,18 +0,0 @@
-# Generated by Django 5.1.4 on 2025-01-07 09:56
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('app', '0012_remove_result_total_marks'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='result',
-            name='total_marks',
-            field=models.IntegerField(default=0),
-        ),
-    ]

app/migrations/0014_alter_result_exam_marks_alter_result_practical_marks_and_more.py

@@ -1,29 +0,0 @@
-# Generated by Django 5.1.4 on 2025-01-07 10:00
-
-from decimal import Decimal
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('app', '0013_result_total_marks'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='result',
-            name='exam_marks',
-            field=models.DecimalField(decimal_places=2, default=Decimal('0.00'), max_digits=5),
-        ),
-        migrations.AlterField(
-            model_name='result',
-            name='practical_marks',
-            field=models.DecimalField(decimal_places=2, default=Decimal('0.00'), max_digits=5),
-        ),
-        migrations.AlterField(
-            model_name='result',
-            name='total_marks',
-            field=models.DecimalField(decimal_places=2, default=Decimal('0.00'), editable=False, max_digits=5),
-        ),
-    ]

app/migrations/0015_alter_staff_group_alter_student_group_and_more.py

@@ -1,30 +0,0 @@
-# Generated by Django 5.1.4 on 2025-01-07 10:14
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('app', '0014_alter_result_exam_marks_alter_result_practical_marks_and_more'),
-        ('auth', '0012_alter_user_first_name_max_length'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='staff',
-            name='group',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='auth.group'),
-        ),
-        migrations.AlterField(
-            model_name='student',
-            name='group',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='auth.group'),
-        ),
-        migrations.AlterField(
-            model_name='teacher',
-            name='group',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='auth.group'),
-        ),
-    ]

app/migrations/0016_remove_staff_group_remove_student_group_and_more.py

@@ -1,41 +0,0 @@
-# Generated by Django 5.1.4 on 2025-01-07 10:18
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('app', '0015_alter_staff_group_alter_student_group_and_more'),
-        ('auth', '0012_alter_user_first_name_max_length'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='staff',
-            name='group',
-        ),
-        migrations.RemoveField(
-            model_name='student',
-            name='group',
-        ),
-        migrations.RemoveField(
-            model_name='teacher',
-            name='group',
-        ),
-        migrations.AddField(
-            model_name='staff',
-            name='group',
-            field=models.ManyToManyField(blank=True, null=True, to='auth.group'),
-        ),
-        migrations.AddField(
-            model_name='student',
-            name='group',
-            field=models.ManyToManyField(blank=True, null=True, to='auth.group'),
-        ),
-        migrations.AddField(
-            model_name='teacher',
-            name='group',
-            field=models.ManyToManyField(blank=True, null=True, to='auth.group'),
-        ),
-    ]

app/migrations/0017_alter_staff_group_alter_student_group_and_more.py

@@ -1,29 +0,0 @@
-# Generated by Django 5.1.4 on 2025-01-07 10:19
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('app', '0016_remove_staff_group_remove_student_group_and_more'),
-        ('auth', '0012_alter_user_first_name_max_length'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='staff',
-            name='group',
-            field=models.ManyToManyField(blank=True, to='auth.group'),
-        ),
-        migrations.AlterField(
-            model_name='student',
-            name='group',
-            field=models.ManyToManyField(blank=True, to='auth.group'),
-        ),
-        migrations.AlterField(
-            model_name='teacher',
-            name='group',
-            field=models.ManyToManyField(blank=True, to='auth.group'),
-        ),
-    ]

app/models.py

@@ -4,11 +4,14 @@ from django.core.validators import RegexValidator
 from django.contrib.auth.hashers import make_password
 import random
 from decimal import Decimal
+from datetime import time, timedelta, datetime
 
 
 # Abstract BaseUser Model
 class BaseUser(models.Model):
+    active_status = models.BooleanField(default=True)
     first_name = models.CharField(max_length=255)
+    middle_name = models.CharField(max_length=255, blank=True, null=True)
     last_name = models.CharField(max_length=255)
     email = models.EmailField(max_length=255, unique=True)
     phone = models.CharField(
@@ -16,7 +19,7 @@ class BaseUser(models.Model):
     )
     username = models.CharField(max_length=255, unique=True, blank=True, null=True)
     password = models.CharField(max_length=255)
-    active_status = models.BooleanField(default=True)
+    address = models.CharField(max_length=255)
     group = models.ManyToManyField(Group, blank=True)
     user = models.OneToOneField(User, on_delete=models.CASCADE, null=True, blank=True)
 
@@ -32,13 +35,14 @@ class BaseUser(models.Model):
         if self._state.adding or not self.password.startswith("pbkdf2_"):
             self.password = make_password(self.password)
 
-        # Create or update the linked User object
+        # Sync with Django User model
         if not self.user:
             self.user = User.objects.create(
                 username=self.username,
                 email=self.email,
                 first_name=self.first_name,
                 last_name=self.last_name,
+                address=self.address,
                 is_staff=True,
                 is_active=self.active_status,
                 password=self.password,
@@ -48,17 +52,13 @@ class BaseUser(models.Model):
             self.user.email = self.email
             self.user.first_name = self.first_name
             self.user.last_name = self.last_name
+            self.user.address = self.address
             self.user.is_active = self.active_status
             self.user.is_staff = True
             self.user.password = self.password
 
-        # Save the BaseUser instance
         super().save(*args, **kwargs)
-
-        # Update the user's groups
         self.user.groups.set(self.group.all())
-
-        # Save the user object
         self.user.save()
 
     def __str__(self):
@@ -69,27 +69,157 @@ class BaseUser(models.Model):
 class Teacher(BaseUser):
     address = models.CharField(max_length=255)
     gender = models.CharField(max_length=1, choices=[("M", "Male"), ("F", "Female")])
+    qualification_choice = (
+        ("BA", "BA"),
+        ("BBS", "BBS"),
+        ("BE", "BE"),
+        ("BEd", "BEd"),
+        ("BSc", "BSc"),
+        ("MA", "MA"),
+        ("MSc", "MSc"),
+        ("MBS", "MBS"),
+        ("ME", "ME"),
+        ("PhD", "PhD"),
+        ("Others", "Others"),
+    )
+    qualification = models.CharField(choices=qualification_choice, max_length=45)
+    specialization = models.CharField(max_length=255)
+    marital_status_choice = (
+        ("married", "Married"),
+        ("widowed", "Widowed"),
+        ("separated", "Separated"),
+        ("divorced", "Divorced"),
+        ("single", "Single"),
+    )
+    marital_status = models.CharField(choices=marital_status_choice, max_length=10)
+    date_of_joining = models.DateField()
+
+    class Meta:
+        verbose_name = "Teacher"
+        verbose_name_plural = "Teachers"
 
 
 # Student model
 class Student(BaseUser):
+    date_of_birth = models.DateField(blank=False)
     gender = models.CharField(max_length=1, choices=[("M", "Male"), ("F", "Female")])
     course = models.ForeignKey("Course", on_delete=models.CASCADE)
     academic_year = models.ForeignKey("AcademicYear", on_delete=models.CASCADE)
+    father_name = models.CharField(max_length=100)
+    father_phone_no = models.CharField(
+        max_length=10, validators=[RegexValidator(r"^\+?1?\d{9,15}$")]
+    )
+    father_email = models.EmailField(blank=True, null=True)
+    father_occupation_choice = (
+        ("Agriculture", "Agriculture"),
+        ("Banker", "Banker"),
+        ("Business", "Business"),
+        ("Doctor", "Doctor"),
+        ("Farmer", "Farmer"),
+        ("Fisherman", "Fisherman"),
+        ("Public Service", "Public Service"),
+        ("Private Service", "Private Service"),
+        ("Shopkeeper", "Shopkeeper"),
+        ("Driver", "Driver"),
+        ("Worker", "Worker"),
+        ("N/A", "N/A"),
+    )
+    father_occupation = models.CharField(
+        choices=father_occupation_choice, max_length=45, default="N/A"
+    )
+    mother_name = models.CharField(max_length=100)
+    mother_phone_no = models.CharField(
+        max_length=10,
+        validators=[RegexValidator(r"^\+?1?\d{9,15}$")],
+        blank=True,
+        null=True,
+    )
+    mother_email = models.EmailField(blank=True, null=True)
+    mother_occupation_choice = (
+        ("Agriculture", "Agriculture"),
+        ("Banker", "Banker"),
+        ("Business", "Business"),
+        ("Doctor", "Doctor"),
+        ("Farmer", "Farmer"),
+        ("Fisherman", "Fisherman"),
+        ("Public Service", "Public Service"),
+        ("Private Service", "Private Service"),
+        ("Shopkeeper", "Shopkeeper"),
+        ("Driver", "Driver"),
+        ("HouseWife", "HouseWife"),
+        ("Worker", "Worker"),
+        ("N/A", "N/A"),
+    )
+    mother_occupation = models.CharField(
+        choices=mother_occupation_choice, max_length=45, default="N/A"
+    )
+    guardian_name = models.CharField(max_length=100)
+    guardian_phone_no = models.CharField(
+        max_length=10, validators=[RegexValidator(r"^\+?1?\d{9,15}$")]
+    )
+    guardian_email = models.EmailField(blank=True, null=True)
+    relationship_choice = (
+        ("Father", "Father"),
+        ("Mother", "Mother"),
+        ("Brother", "Brother"),
+        ("Sister", "Sister"),
+        ("Uncle", "Uncle"),
+        ("Aunt", "Aunt"),
+        ("Grandfather", "Grandfather"),
+    )
+    relationship_with_student = models.CharField(
+        choices=relationship_choice, max_length=45
+    )
+
+    class Meta:
+        verbose_name = "Student"
+        verbose_name_plural = "Students"
 
 
 # Staff model
 class Staff(BaseUser):
+    gender = models.CharField(max_length=1, choices=[("M", "Male"), ("F", "Female")])
     position = models.CharField(
         max_length=255,
-        choices=[("clerk", "Clerk"), ("assistant", "Assistant"), ("guard", "Guard")],
+        choices=[
+            ("Lab Assistant", "Lab Assistant"),
+            ("Librarian", "Librarian"),
+            ("Accountant", "Accountant"),
+            ("Guard", "Guard"),
+            ("Driver", "Driver"),
+            ("Helper", "Helper"),
+            ("Cleaner", "Cleaner"),
+        ],
     )
     address = models.CharField(max_length=255)
+    marital_status_choice = (
+        ("married", "Married"),
+        ("widowed", "Widowed"),
+        ("separated", "Separated"),
+        ("divorced", "Divorced"),
+        ("single", "Single"),
+    )
+    marital_status = models.CharField(choices=marital_status_choice, max_length=10)
+    date_of_joining = models.DateField()
+
+    class Meta:
+        verbose_name = "Staff"
+        verbose_name_plural = "Staff"
 
 
 # Course model
 class Course(models.Model):
     name = models.CharField(max_length=100)
+    level_choice = (
+        ("Basic", "Basic"),
+        ("Primary", "Primary"),
+        ("Secondary", "Secondary"),
+        ("Vocational Traning", "Vocational Traning"),
+        ("Higher Secondary", "Higher Secondary"),
+        ("Graduation", "Graduation"),
+        ("Post Graduation", "Post Graduation"),
+    )
+    level = models.CharField(choices=level_choice, max_length=45)
     course_type = models.CharField(
         max_length=10,
         choices=[("semester", "Semester-based"), ("yearly", "Yearly-based")],
@@ -99,14 +229,22 @@ class Course(models.Model):
     def __str__(self):
         return self.name
 
+    class Meta:
+        verbose_name = "Course"
+        verbose_name_plural = "Courses"
+
 
 # AcademicYear model
 class AcademicYear(models.Model):
-    batch = models.CharField(max_length=255, unique=True)
+    year = models.CharField(max_length=255, unique=True)
 
     def __str__(self):
         return self.batch
 
+    class Meta:
+        verbose_name = "Academic Year"
+        verbose_name_plural = "Academic Years"
+
 
 # Subject model
 class Subject(models.Model):
@@ -115,10 +253,21 @@ class Subject(models.Model):
         "Course", on_delete=models.CASCADE, related_name="subjects"
     )
     semester_or_year_number = models.PositiveIntegerField()
+    teacher = models.ForeignKey(
+        "Teacher",
+        on_delete=models.CASCADE,
+        related_name="subjects",
+        null=True,
+        blank=True,
+    )
 
     def __str__(self):
         return f"{self.name} (Sem/Year {self.semester_or_year_number})"
 
+    class Meta:
+        verbose_name = "Subject"
+        verbose_name_plural = "Subjects"
+
 
 # NewsEvent model
 class NewsEvent(models.Model):
@@ -132,6 +281,10 @@ class NewsEvent(models.Model):
     def __str__(self):
         return f"{self.title} ({self.get_type_display()})"
 
+    class Meta:
+        verbose_name = "News/Event"
+        verbose_name_plural = "News/Events"
+
 
 # Attendance model
 class Attendance(models.Model):
@@ -143,6 +296,10 @@ class Attendance(models.Model):
         max_length=10, choices=[("present", "Present"), ("absent", "Absent")]
     )
 
+    class Meta:
+        verbose_name = "Attendance"
+        verbose_name_plural = "Attendance Records"
+
 
 # Result model
 class Result(models.Model):
@@ -159,10 +316,6 @@ class Result(models.Model):
         max_digits=5, decimal_places=2, default=Decimal("0.00"), editable=False
     )
 
-    def clean(self):
-        self.total_marks = self.get_total()
-        super().clean()
-
     def get_total(self):
         return Decimal(str(self.practical_marks or 0)) + Decimal(
             str(self.exam_marks or 0)
@@ -174,3 +327,25 @@ class Result(models.Model):
 
     def __str__(self):
         return f"{self.student} - {self.subject} - Total: {self.total_marks}"
+
+    class Meta:
+        verbose_name = "Result"
+        verbose_name_plural = "Results"
+
+
+class Library(models.Model):
+    category = models.CharField(max_length=255)
+    book_name = models.CharField(max_length=255)
+    description = models.CharField(max_length=255)
+    author = models.CharField(max_length=255)
+    publication_year = models.PositiveIntegerField()
+    quantity = models.PositiveIntegerField()
+    available = models.CharField(max_length=1, choices=[("Y", "Yes"), ("N", "NO")])
+    date_added = models.DateField(auto_now_add=True)
+
+    def __str__(self):
+        return self.book_name
+
+    class Meta:
+        verbose_name = "Library"
+        verbose_name_plural = "Library"

app/views.py

@@ -2,8 +2,11 @@ from django.shortcuts import render, get_object_or_404
 from django.contrib.admin import site
 from app.models import Student, NewsEvent, Subject
 
+from django.contrib.auth.decorators import login_required
+
 
 # Dashboard for admin
+@login_required(login_url="login")
 def dashboard(request):
     context = {
         **site.each_context(request),