update
This commit is contained in:
1 parent
5de80ca0b4
commit
708246f41b
10 files changed
+7
-7
No files matched your search
Whitespace-only changes.
@@ -0,0 +1,67 @@
|
||||
from django.contrib import admin
|
||||
from app.models import Teacher, Student, Staff, Course, AcademicYear, Subject, NewsEvent
|
||||
|
||||
|
||||
@admin.register(Teacher)
|
||||
class TeacherAdmin(admin.ModelAdmin):
|
||||
list_display = ("id", "first_name", "last_name", "email", "phone", "active_status")
|
||||
search_fields = ("first_name", "last_name", "email", "phone")
|
||||
list_filter = ("active_status", "gender", "group")
|
||||
|
||||
|
||||
@admin.register(Student)
|
||||
class StudentAdmin(admin.ModelAdmin):
|
||||
list_display = (
|
||||
"id",
|
||||
"first_name",
|
||||
"last_name",
|
||||
"email",
|
||||
"phone",
|
||||
"course",
|
||||
"academic_year",
|
||||
"active_status",
|
||||
)
|
||||
search_fields = ("first_name", "last_name", "email", "phone")
|
||||
list_filter = ("active_status", "gender", "course", "academic_year")
|
||||
|
||||
|
||||
@admin.register(Staff)
|
||||
class StaffAdmin(admin.ModelAdmin):
|
||||
list_display = (
|
||||
"id",
|
||||
"first_name",
|
||||
"last_name",
|
||||
"email",
|
||||
"phone",
|
||||
"position",
|
||||
"active_status",
|
||||
)
|
||||
search_fields = ("first_name", "last_name", "email", "phone")
|
||||
list_filter = ("active_status", "position", "group")
|
||||
|
||||
|
||||
@admin.register(Course)
|
||||
class CourseAdmin(admin.ModelAdmin):
|
||||
list_display = ("id", "name", "course_type", "duration")
|
||||
search_fields = ("name",)
|
||||
list_filter = ("course_type",)
|
||||
|
||||
|
||||
@admin.register(AcademicYear)
|
||||
class AcademicYearAdmin(admin.ModelAdmin):
|
||||
list_display = ("id", "batch")
|
||||
search_fields = ("batch",)
|
||||
|
||||
|
||||
@admin.register(Subject)
|
||||
class SubjectAdmin(admin.ModelAdmin):
|
||||
list_display = ("id", "name", "course", "semester_or_year_number")
|
||||
search_fields = ("name", "course__name")
|
||||
list_filter = ("course", "semester_or_year_number")
|
||||
|
||||
|
||||
@admin.register(NewsEvent)
|
||||
class NewsEventAdmin(admin.ModelAdmin):
|
||||
list_display = ("id", "title", "type", "created_at")
|
||||
search_fields = ("title", "summary")
|
||||
list_filter = ("type", "created_at")
|
||||
@@ -0,0 +1,6 @@
|
||||
from django.apps import AppConfig
|
||||
|
||||
|
||||
class MainConfig(AppConfig):
|
||||
default_auto_field = "django.db.models.BigAutoField"
|
||||
name = "app"
|
||||
@@ -0,0 +1,110 @@
|
||||
# Generated by Django 5.1.4 on 2025-01-06 16:53
|
||||
|
||||
import django.core.validators
|
||||
import django.db.models.deletion
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
initial = True
|
||||
|
||||
dependencies = [
|
||||
('auth', '0012_alter_user_first_name_max_length'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
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)),
|
||||
],
|
||||
),
|
||||
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)),
|
||||
('course_type', models.CharField(choices=[('semester', 'Semester-based'), ('yearly', 'Yearly-based')], max_length=10)),
|
||||
('duration', models.PositiveIntegerField()),
|
||||
],
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='NewsEvent',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('title', models.CharField(max_length=255)),
|
||||
('summary', models.TextField()),
|
||||
('type', models.CharField(choices=[('news', 'News'), ('event', 'Event')], max_length=5)),
|
||||
('created_at', models.DateTimeField(auto_now_add=True)),
|
||||
],
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='Staff',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('first_name', models.CharField(max_length=255)),
|
||||
('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}$')])),
|
||||
('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)),
|
||||
('address', models.CharField(max_length=255)),
|
||||
('group', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='auth.group')),
|
||||
],
|
||||
options={
|
||||
'abstract': False,
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='Student',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('first_name', models.CharField(max_length=255)),
|
||||
('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}$')])),
|
||||
('username', models.CharField(blank=True, max_length=255, null=True, unique=True)),
|
||||
('password', models.CharField(max_length=255)),
|
||||
('active_status', models.BooleanField(default=True)),
|
||||
('gender', models.CharField(choices=[('M', 'Male'), ('F', 'Female')], max_length=1)),
|
||||
('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')),
|
||||
],
|
||||
options={
|
||||
'abstract': False,
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='Subject',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('name', models.CharField(max_length=255)),
|
||||
('semester_or_year_number', models.PositiveIntegerField()),
|
||||
('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='app.course')),
|
||||
],
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='Teacher',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('first_name', models.CharField(max_length=255)),
|
||||
('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}$')])),
|
||||
('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')),
|
||||
],
|
||||
options={
|
||||
'abstract': False,
|
||||
},
|
||||
),
|
||||
]
|
||||
Whitespace-only changes.
@@ -0,0 +1,92 @@
|
||||
from django.db import models
|
||||
from django.contrib.auth.models import Group
|
||||
from django.core.validators import RegexValidator
|
||||
from django.contrib.auth.hashers import make_password
|
||||
import random
|
||||
|
||||
|
||||
class BaseUser(models.Model):
|
||||
first_name = models.CharField(max_length=255)
|
||||
last_name = models.CharField(max_length=255)
|
||||
email = models.EmailField(max_length=255, unique=True)
|
||||
phone = models.CharField(
|
||||
max_length=15, validators=[RegexValidator(r"^\+?1?\d{9,15}$")]
|
||||
)
|
||||
username = models.CharField(max_length=255, unique=True, blank=True, null=True)
|
||||
password = models.CharField(max_length=255)
|
||||
active_status = models.BooleanField(default=True)
|
||||
group = models.ForeignKey(Group, on_delete=models.SET_NULL, null=True, blank=True)
|
||||
|
||||
class Meta:
|
||||
abstract = True
|
||||
|
||||
def save(self, *args, **kwargs):
|
||||
if not self.username:
|
||||
self.username = f"{self.first_name.lower()}_{random.randint(1000, 9999)}"
|
||||
if self._state.adding or not self.password.startswith("pbkdf2_"):
|
||||
self.password = make_password(self.password)
|
||||
super().save(*args, **kwargs)
|
||||
|
||||
def __str__(self):
|
||||
return f"{self.first_name} {self.last_name}"
|
||||
|
||||
|
||||
class Teacher(BaseUser):
|
||||
address = models.CharField(max_length=255)
|
||||
gender = models.CharField(max_length=1, choices=[("M", "Male"), ("F", "Female")])
|
||||
|
||||
|
||||
class Student(BaseUser):
|
||||
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)
|
||||
|
||||
|
||||
class Staff(BaseUser):
|
||||
position = models.CharField(
|
||||
max_length=255,
|
||||
choices=[("clerk", "Clerk"), ("assistant", "Assistant"), ("guard", "Guard")],
|
||||
)
|
||||
address = models.CharField(max_length=255)
|
||||
|
||||
|
||||
class Course(models.Model):
|
||||
name = models.CharField(max_length=100)
|
||||
course_type = models.CharField(
|
||||
max_length=10,
|
||||
choices=[("semester", "Semester-based"), ("yearly", "Yearly-based")],
|
||||
)
|
||||
duration = models.PositiveIntegerField()
|
||||
|
||||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
|
||||
class AcademicYear(models.Model):
|
||||
batch = models.CharField(max_length=255, unique=True)
|
||||
|
||||
def __str__(self):
|
||||
return f"Batch {self.batch}"
|
||||
|
||||
|
||||
class Subject(models.Model):
|
||||
name = models.CharField(max_length=255)
|
||||
course = models.ForeignKey(
|
||||
"Course", on_delete=models.CASCADE, related_name="subjects"
|
||||
)
|
||||
semester_or_year_number = models.PositiveIntegerField()
|
||||
|
||||
def __str__(self):
|
||||
return f"{self.name} (Sem/Year {self.semester_or_year_number})"
|
||||
|
||||
|
||||
class NewsEvent(models.Model):
|
||||
title = models.CharField(max_length=255)
|
||||
summary = models.TextField()
|
||||
type = models.CharField(
|
||||
max_length=5, choices=[("news", "News"), ("event", "Event")]
|
||||
)
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
|
||||
def __str__(self):
|
||||
return f"{self.title} ({self.get_type_display()})"
|
||||
@@ -0,0 +1,3 @@
|
||||
from django.test import TestCase
|
||||
|
||||
# Create your tests here.
|
||||
@@ -0,0 +1,3 @@
|
||||
from django.shortcuts import render
|
||||
|
||||
# Create your views here.
|
||||
Reference in new issue
Block a user