Skip to content

Commit 84f0105

Browse files
committed
fix periods
1 parent 0224bb2 commit 84f0105

File tree

4 files changed

+31
-4
lines changed

4 files changed

+31
-4
lines changed

home/admin.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -906,7 +906,7 @@ def email(self, obj):
906906
def name(self, obj):
907907
return obj.email.name if obj.email else ""
908908

909-
actions = ["export_as_csv", "correct_bills", "fix_issue"]
909+
actions = ["export_as_csv", "correct_bills", "fix_issue", "fix_period"]
910910

911911
def export_as_csv(self, request, queryset):
912912
"""
@@ -938,6 +938,14 @@ def fix_issue(self, request, queryset):
938938
obj.caterer = caterer
939939
obj.save()
940940

941+
def fix_period(self, request, queryset):
942+
for obj in queryset:
943+
if obj.period is None:
944+
obj.period = Period.objects.get(
945+
Sno=3, semester=Semester.objects.get(name="Spring 2025")
946+
)
947+
obj.save()
948+
941949
export_as_csv.short_description = "Export Allocation details to CSV"
942950

943951

@@ -1102,7 +1110,7 @@ class about_Admin(ImportExportModelAdmin, admin.ModelAdmin):
11021110
model = AllocationForm
11031111
search_fields = ("start_time", "end_time", "heading", "period__Sno")
11041112
list_filter = ("start_time", "end_time", "heading", "period__Sno")
1105-
list_display = ("__str__", "start_time", "end_time", "active")
1113+
list_display = ("__str__", "start_time", "end_time", "active", "period")
11061114
fieldsets = (
11071115
(
11081116
None,
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Generated by Django 5.0.8 on 2025-02-25 08:54
2+
3+
import django.db.models.deletion
4+
from django.db import migrations, models
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('home', '0005_alter_studentbills_email'),
11+
]
12+
13+
operations = [
14+
migrations.AlterField(
15+
model_name='allocationform',
16+
name='period',
17+
field=models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, to='home.period'),
18+
),
19+
]

home/models/students.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ class AllocationForm(models.Model):
249249
_("heading"), max_length=100, default="", null=True, blank=True
250250
)
251251
description = models.TextField(_("description"), default="", null=True, blank=True)
252-
period = models.ForeignKey(Period, on_delete=models.SET_NULL, null=True, blank=True)
252+
period = models.ForeignKey(Period, on_delete=models.CASCADE, null=False, blank=True)
253253
active = models.BooleanField(_("active"), default=False, null=True, blank=True)
254254
start_time = models.DateTimeField(
255255
_("Start Time"), default=now, null=True, blank=True

home/signals.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ def update_long_bill(sender, instance: LongRebate, **kwargs):
158158

159159

160160
@receiver(post_save, sender=Allocation)
161-
def update_rebate_bill(sender, instance, created, **kwargs):
161+
def update_rebate_bill(sender, instance: Allocation, created, **kwargs):
162162
try:
163163
if created:
164164
sno = instance.period.Sno

0 commit comments

Comments
 (0)