Skip to content

Commit e87da90

Browse files
authored
Merge pull request #14 from stark-akshay3000/infield
fixed student details table
2 parents d09daed + 084dea2 commit e87da90

File tree

6 files changed

+36
-10
lines changed

6 files changed

+36
-10
lines changed
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Generated by Django 3.1.5 on 2024-02-20 18:25
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('hostel_management', '0011_auto_20240219_0207'),
10+
]
11+
12+
operations = [
13+
migrations.AddField(
14+
model_name='studentdetails',
15+
name='hall_id',
16+
field=models.CharField(blank=True, max_length=20, null=True),
17+
),
18+
]

FusionIIIT/applications/hostel_management/models.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,7 @@ class StudentDetails(models.Model):
294294
batch = models.CharField(max_length=100,blank=True,null=True)
295295
room_num= models.CharField(max_length=20,blank=True,null=True)
296296
hall_no= models.CharField(max_length=20,blank=True,null=True)
297+
hall_id=models.CharField(max_length=20,blank=True,null=True)
297298
specialization = models.CharField(max_length=100,blank=True,null=True)
298299
parent_contact = models.CharField(max_length=20, blank=True, null=True)
299300
address = models.CharField(max_length=255, blank=True, null=True)

FusionIIIT/applications/hostel_management/views.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -626,6 +626,7 @@ def all_leave_data(request):
626626

627627
@login_required
628628
def create_hostel_leave(request):
629+
print(request.user.username)
629630
if request.method == 'GET':
630631
return render(request, 'hostelmanagement/create_leave.html')
631632
elif request.method == 'POST':
@@ -652,7 +653,8 @@ def create_hostel_leave(request):
652653

653654
@login_required
654655
def hostel_complaint_list(request):
655-
user_id = request.user.id
656+
user_id = request.user.id
657+
656658
try:
657659
staff = request.user.extrainfo.id # Assuming the user's profile is stored in extrainfo
658660
except AttributeError:
@@ -677,13 +679,16 @@ def get_students(request):
677679
if HallCaretaker.objects.filter(staff_id=staff).exists():
678680
hall_id = HallCaretaker.objects.get(staff_id=staff).hall_id
679681
print(hall_id)
680-
student_details = StudentDetails.objects.filter(hall_no=hall_id)
682+
hall_no = Hall.objects.get(id=hall_id)
683+
print(hall_no)
684+
student_details = StudentDetails.objects.filter(hall_id=hall_no)
685+
681686

682687
return render(request, 'hostelmanagement/student_details.html', {'students': student_details})
683688

684689
elif HallWarden.objects.filter(faculty_id=staff).exists():
685690
hall_id = HallWarden.objects.get(faculty_id=staff).hall_id
686-
student_details = StudentDetails.objects.filter(hall_no=hall_id)
691+
student_details = StudentDetails.objects.filter(hall_id=hall_no)
687692

688693
return render(request, 'hostelmanagement/student_details.html', {'students': student_details})
689694
else:
@@ -694,8 +699,9 @@ def get_students(request):
694699
class PostComplaint(APIView):
695700
authentication_classes = [SessionAuthentication] # Assuming you are using session authentication
696701
permission_classes = [IsAuthenticated] # Allow only authenticated users to access the view
697-
702+
698703
def dispatch(self, request, *args, **kwargs):
704+
print(request.user.username)
699705
if not request.user.is_authenticated:
700706
return redirect('/hostelmanagement') # Redirect to the login page if user is not authenticated
701707
return super().dispatch(request, *args, **kwargs)

FusionIIIT/templates/hostelmanagement/create_leave.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ <h2 class="ui header" align="center">Leave Form</h2>
44
{% csrf_token %}
55
<div class="field">
66
<label for="student_name">Student Name:</label>
7-
<input type="text" id="student_name" name="student_name" required><br><br>
7+
<input type="text" id="student_name" name="student_name" value="{{ request.user.first_name }} {{ request.user.last_name }}" required readonly><br><br>
88
</div>
99
<div class="field">
1010
<label for="roll_num">Roll Number:</label>
11-
<input type="text" id="roll_num" name="roll_num" required><br><br>
11+
<input type="text" id="roll_num" name="roll_num" value="{{ request.user.username}}" required readonly><br><br>
1212
</div>
1313
<div class="field">
1414
<label for="reason">Reason:</label>

FusionIIIT/templates/hostelmanagement/post_complaint_form.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ <h2 class="heading-complaint-form" align="center">Complaint Form</h2>
66
<label for="hall_name">Hall Name:</label>
77
<input class="ui required form" type="text" id="hall_name" name="hall_name" required><br>
88

9+
910
<label for="student_name">Student Name:</label>
10-
<input class="ui required form" type="text" id="student_name" name="student_name" required><br>
11+
<input type="text" id="student_name" value="{{ request.user.first_name }} {{ request.user.last_name }}" required readonly><br><br>
1112

1213
<label for="roll_number">Roll Number:</label>
13-
<input class="ui required form" type="text" id="roll_number" name="roll_number" value="{{ roll_number }}" required><br>
14-
14+
<input type="text" id="roll_number" name="roll_number" value="{{ request.user.username }}" required readonly><br><br>
15+
1516
<label for="description">Description:</label>
1617
<textarea id="description" class="required field" name="description" rows="4" required></textarea><br>
1718

FusionIIIT/templates/hostelmanagement/student_details.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ <h1>Student Details</h1>
3131
<td>{{ student.programme }}</td>
3232
<td>{{ student.batch }}</td>
3333
<td>{{ student.room_num }}</td>
34-
<td>{{ student.hall_no }}</td>
34+
<td>{{ student.hall_id }}</td>
3535
<td>{{ student.specialization }}</td>
3636
<td>{{ student.parent_contact }}</td>
3737
<td>{{ student.address }}</td>

0 commit comments

Comments
 (0)