Skip to content

Refactor seat calculation logic to use curriculum assignment for filled and available seats in BatchConfiguration model #1847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vikrantwiz02 merged 1 commit into from
Nov 16, 2025
Merged

Refactor seat calculation logic to use curriculum assignment for filled and available seats in BatchConfiguration model #1847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 21 additions & 28 deletions FusionIIIT/applications/programme_curriculum/api/views_student_management.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,32 +216,17 @@ def get_academic_year_from_batch_year(batch_year):

def calculate_batch_filled_seats(batch):
"""
Centralized function to calculate filled seats for a batch using priority-based algorithm.
Calculate filled seats for a batch using curriculum-based counting only.
"""
try:
from applications.academic_information.models import Student
direct_count = Student.objects.filter(batch_id=batch).count()
if direct_count > 0:
return direct_count
if batch.curriculum:
curriculum_count = Student.objects.filter(
batch_id=batch
).count()
return curriculum_count
else:
discipline_name = batch.discipline.name if batch.discipline else ''
discipline_acronym = batch.discipline.acronym if batch.discipline else ''
discipline_count = Student.objects.filter(
batch=batch.year,
id__department__name__in=[discipline_acronym, discipline_name.split()[0] if discipline_name else '']
).count() if discipline_name else 0
if discipline_count > 0:
return discipline_count
else:
if batch.name and batch.year:
programme_count = Student.objects.filter(
programme__icontains=batch.name.split()[0] if batch.name else '',
batch=batch.year,
id__department__name__in=[discipline_acronym] if discipline_acronym else []
).count()
return programme_count
else:
return 0
return 0

except Exception as e:
return 0
Expand Down Expand Up @@ -1344,7 +1329,10 @@ def update_student_status(request):
branch_field = student.branch or ''
branch_upper = branch_field.upper()

if 'COMPUTER SCIENCE' in branch_upper or 'CSE' in branch_upper:
if 'MECHATRONICS' in branch_upper or student.specialization == 'Mechatronics':
dept_name = 'MT'
discipline_name = 'Mechatronics'
elif 'COMPUTER SCIENCE' in branch_upper or 'CSE' in branch_upper:
dept_name = 'CSE'
discipline_name = 'Computer Science and Engineering'
elif 'ELECTRONICS' in branch_upper or 'ECE' in branch_upper:
Expand Down Expand Up @@ -1438,7 +1426,10 @@ def update_student_status(request):
branch_field = student.branch or ''
branch_upper = branch_field.upper()

if 'COMPUTER SCIENCE' in branch_upper or 'CSE' in branch_upper:
if 'MECHATRONICS' in branch_upper or (student.specialization and student.specialization == 'Mechatronics'):
dept_name = 'MT'
discipline_name = 'Mechatronics'
elif 'COMPUTER SCIENCE' in branch_upper or 'CSE' in branch_upper:
dept_name = 'CSE'
discipline_name = 'Computer Science and Engineering'
elif 'ELECTRONICS' in branch_upper or 'ECE' in branch_upper:
Expand Down Expand Up @@ -2973,7 +2964,8 @@ def get_or_create_discipline(discipline_name):
'electronics and communication engineering': 'Electronics and Communication Engineering',
'mechanical engineering': 'Mechanical Engineering',
'smart manufacturing': 'Smart Manufacturing',
'design': 'Design'
'design': 'Design',
'mechatronics': 'Mechatronics'
}

database_discipline_name = None
Expand Down Expand Up @@ -3003,7 +2995,8 @@ def get_discipline_acronym(discipline_name):
'Electronics and Communication Engineering': 'ECE',
'Mechanical Engineering': 'ME',
'Smart Manufacturing': 'SM',
'Design': 'DES'
'Design': 'DES',
'Mechatronics': 'MT'
}

for full_name, acronym in discipline_mappings.items():
Expand Down Expand Up @@ -4203,11 +4196,11 @@ def admin_batches_unified(request):

'totalSeats': total_seats,
'total_seats': total_seats,
'filledSeats': actual_filled // 2,
'filledSeats': actual_filled,
'filled_seats': actual_filled,
'availableSeats': available_seats,
'available_seats': available_seats,
'student_count': actual_filled // 2,
'student_count': actual_filled,

'running_batch': batch.running_batch,
'status': 'READY' if (batch.curriculum or len(get_available_curriculums_for_batch(batch)) > 0) else 'NEEDS_CURRICULUM',
Expand Down
31 changes: 8 additions & 23 deletions FusionIIIT/applications/programme_curriculum/models_student_management.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,30 +60,15 @@ def __str__(self):
return f"{self.programme} - {self.discipline} ({self.year})"

def calculate_seats(self):
"""Calculate filled and available seats based on unique student count"""
"""Calculate filled and available seats based on curriculum assignment"""
try:
from django.db.models import Q

discipline_q = Q()
discipline_q |= Q(branch__icontains=self.discipline)

if self.discipline == 'Computer Science and Engineering':
discipline_q |= Q(branch__icontains='Computer Science') | Q(branch__icontains='CSE')
elif self.discipline == 'Electronics and Communication Engineering':
discipline_q |= Q(branch__icontains='Electronics') | Q(branch__icontains='ECE')
elif self.discipline == 'Mechanical Engineering':
discipline_q |= Q(branch__icontains='Mechanical') | Q(branch__icontains='ME')
elif self.discipline == 'Smart Manufacturing':
discipline_q |= Q(branch__icontains='Smart Manufacturing') | Q(branch__icontains='SM')
elif self.discipline == 'Design':
discipline_q |= Q(branch__icontains='Design') | Q(branch__icontains='Des')

unique_students = StudentBatchUpload.objects.filter(
discipline_q,
year=self.year
).values_list('roll_number', flat=True).distinct()

student_count = len(unique_students)
from applications.programme_curriculum.models import Batch
batch = Batch.objects.filter(
name=self.programme,
discipline__name=self.discipline,
year=self.year,
running_batch=True
).first()

if self.filled_seats != student_count:
self.filled_seats = student_count
Expand Down