Skip to content
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.

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

GAD-3 notification errors resloved. #1610

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
b07ea3f
fix 1. order of files in inbox and outbox 2. order of files is mantai…
theoden42 Feb 19, 2024
402c8c4
fix login required on viewing file
theoden42 Feb 19, 2024
5c6ab07
fix create_file method so that subject and description are also accepted
theoden42 Feb 19, 2024
a4e01b3
add rest api for create file and view file
theoden42 Mar 3, 2024
3760068
add rest api for create, view and delete file
aish0749 Mar 3, 2024
a06d437
add rest api for inbox, outbox, history view
aish0749 Mar 3, 2024
2ab199e
add rest api for draft view, forward file
aish0749 Mar 4, 2024
daab40e
Minor changes
nidhibarapatre Mar 4, 2024
92faf40
Implementation of FTS and completion of the redirect functionality
nidhibarapatre Mar 4, 2024
e824b66
Merge remote-tracking branch 'upstream/gad-4'
theoden42 Mar 5, 2024
79ef20d
prevent student access of the filetracking module
theoden42 Mar 5, 2024
c3f14b7
add dropdown filtering based on reciever username and update notallow…
theoden42 Mar 5, 2024
3f43b27
Change in model of supervisor
nidhibarapatre Mar 6, 2024
a97f482
add option to unarchive files
theoden42 Mar 7, 2024
b0109b8
fix template for filetrackingnotallowed page
theoden42 Mar 7, 2024
586775a
fix attachments view in the history of the file
theoden42 Mar 7, 2024
b3c8f54
make the fields in draft view editable
theoden42 Mar 7, 2024
d50d0e6
Complition of redirect functionality and pagination
nidhibarapatre Mar 8, 2024
bf8f36c
Fixation of a error
nidhibarapatre Mar 8, 2024
0dfdd3f
update the views
aish0749 Mar 10, 2024
2018781
Merge pull request #1 from aish0749/main
theoden42 Mar 10, 2024
e6afdd7
Completion of module
nidhibarapatre Mar 11, 2024
59d8868
Merge remote-tracking branch 'upstream2/gad-5' into gad-3
nidhibarapatre Mar 18, 2024
acf82f8
merge updated changes in dashboard into the filetracking module.
theoden42 Mar 19, 2024
7f33e90
fix file sending and forwarding template to include designation autom…
theoden42 Mar 19, 2024
2f8813c
fix forward file view to include designations automatically
theoden42 Mar 19, 2024
9ea22d7
Integrated dashborad
nidhibarapatre Mar 20, 2024
7a16993
creating new branch
nidhibarapatre Mar 20, 2024
feebe01
Merge remote-tracking branch 'upstream3/gad-3' into new-gad3
nidhibarapatre Mar 20, 2024
a54deb1
disallowing migrations
nidhibarapatre Mar 20, 2024
61a875a
removing migration files
nidhibarapatre Mar 21, 2024
56918b4
resolved errors
nidhibarapatre Mar 26, 2024
725edc9
Merge remote-tracking branch 'upstream3/gad-3' into gad_-3
nidhibarapatre Mar 26, 2024
808b4cf
support file uploading and other minor fixes
arminpatel Apr 2, 2024
c0e4d4c
Merge remote-tracking branch 'upstream3/gad-3' into gad-3-complaint
nidhibarapatre Apr 2, 2024
21f4411
change docker and req
arminpatel Apr 2, 2024
4032140
Merge branch 'main' of https://github.com/theoden42/Fusion into gad-3…
arminpatel Apr 2, 2024
2a8dd80
resolved error
nidhibarapatre Apr 2, 2024
fb22dbb
Merge remote-tracking branch 'upstream3/gad-3' into gad--3-complaint
nidhibarapatre Apr 2, 2024
2677ecf
fts implementation in api and bug fixes
arminpatel Apr 14, 2024
a8c631f
Merge branch 'gad-3' of https://github.com/FusionIIIT/Fusion into gad…
arminpatel Apr 14, 2024
e41c09d
change requirements.txt
arminpatel Apr 14, 2024
a0ddb2d
add user_type enum
arminpatel Apr 14, 2024
eb8dbc5
Merge pull request #1454 from arminpatel/gad-3-test
Priyansh61 Apr 15, 2024
7555628
minor changes
nidhibarapatre Apr 19, 2024
30429b7
Merge remote-tracking branch 'upstream3/gad-3' into gad3--complaint
nidhibarapatre Apr 19, 2024
5fe2030
Merge branch 'latest_staging' of https://github.com/FusionIIIT/Fusion…
nidhibarapatre May 5, 2024
0061868
Minor ui changes
nidhibarapatre May 5, 2024
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
# Generated by Django 3.1.5 on 2024-04-16 23:25

from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

initial = True

dependencies = [
('programme_curriculum', '0001_initial'),
('academic_information', '0001_initial'),
('globals', '__first__'),
]

operations = [
migrations.AddField(
model_name='student',
name='batch_id',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.batch'),
),
migrations.AddField(
model_name='spi',
name='student_id',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student'),
),
migrations.AddField(
model_name='grades',
name='curriculum_id',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.curriculum'),
),
migrations.AddField(
model_name='grades',
name='student_id',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student'),
),
migrations.AddField(
model_name='curriculum_instructor',
name='curriculum_id',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.curriculum'),
),
migrations.AddField(
model_name='curriculum_instructor',
name='instructor_id',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo'),
),
migrations.AddField(
model_name='curriculum',
name='course_id',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.course'),
),
migrations.AlterUniqueTogether(
name='spi',
unique_together={('student_id', 'sem')},
),
migrations.AlterUniqueTogether(
name='curriculum_instructor',
unique_together={('curriculum_id', 'instructor_id')},
),
migrations.AlterUniqueTogether(
name='curriculum',
unique_together={('course_code', 'batch', 'programme')},
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,233 @@
# Generated by Django 3.1.5 on 2024-04-16 23:25

from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

initial = True

dependencies = [
('programme_curriculum', '0001_initial'),
('academic_procedures', '0001_initial'),
('academic_information', '0002_auto_20240416_2325'),
('globals', '__first__'),
]

operations = [
migrations.AddField(
model_name='studentregistrationchecks',
name='semester_id',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.semester'),
),
migrations.AddField(
model_name='studentregistrationchecks',
name='student_id',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student'),
),
migrations.AddField(
model_name='studentregistrationcheck',
name='student',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student'),
),
migrations.AddField(
model_name='semestermarks',
name='curr_id',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.course'),
),
migrations.AddField(
model_name='semestermarks',
name='student_id',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student'),
),
migrations.AddField(
model_name='register',
name='curr_id',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.curriculum'),
),
migrations.AddField(
model_name='register',
name='student_id',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student'),
),
migrations.AddField(
model_name='phdprogressexamination',
name='student',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student'),
),
migrations.AddField(
model_name='mtechgraduateseminarreport',
name='student',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student'),
),
migrations.AddField(
model_name='messdue',
name='student',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student'),
),
migrations.AddField(
model_name='marksubmissioncheck',
name='curr_id',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.course'),
),
migrations.AddField(
model_name='initialregistrations',
name='course_id',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.course'),
),
migrations.AddField(
model_name='initialregistrations',
name='course_slot_id',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='programme_curriculum.courseslot'),
),
migrations.AddField(
model_name='initialregistrations',
name='semester_id',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.semester'),
),
migrations.AddField(
model_name='initialregistrations',
name='student_id',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student'),
),
migrations.AddField(
model_name='initialregistration',
name='course_id',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.course'),
),
migrations.AddField(
model_name='initialregistration',
name='course_slot_id',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='programme_curriculum.courseslot'),
),
migrations.AddField(
model_name='initialregistration',
name='semester_id',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.semester'),
),
migrations.AddField(
model_name='initialregistration',
name='student_id',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='academic_information.student'),
),
migrations.AddField(
model_name='finalregistrations',
name='curr_id',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.curriculum'),
),
migrations.AddField(
model_name='finalregistrations',
name='student_id',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student'),
),
migrations.AddField(
model_name='finalregistration',
name='course_id',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.course'),
),
migrations.AddField(
model_name='finalregistration',
name='course_slot_id',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='programme_curriculum.courseslot'),
),
migrations.AddField(
model_name='finalregistration',
name='semester_id',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.semester'),
),
migrations.AddField(
model_name='finalregistration',
name='student_id',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student'),
),
migrations.AddField(
model_name='feepayments',
name='semester_id',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.semester'),
),
migrations.AddField(
model_name='feepayments',
name='student_id',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student'),
),
migrations.AddField(
model_name='feepayment',
name='student_id',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student'),
),
migrations.AddField(
model_name='dues',
name='student_id',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student'),
),
migrations.AddField(
model_name='coursesmtech',
name='c_id',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.course'),
),
migrations.AddField(
model_name='courserequested',
name='course_id',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.course'),
),
migrations.AddField(
model_name='courserequested',
name='student_id',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student'),
),
migrations.AddField(
model_name='course_registration',
name='course_id',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.course'),
),
migrations.AddField(
model_name='course_registration',
name='course_slot_id',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='programme_curriculum.courseslot'),
),
migrations.AddField(
model_name='course_registration',
name='semester_id',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.semester'),
),
migrations.AddField(
model_name='course_registration',
name='student_id',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student'),
),
migrations.AddField(
model_name='branchchange',
name='branches',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.departmentinfo'),
),
migrations.AddField(
model_name='branchchange',
name='user',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student'),
),
migrations.AddField(
model_name='bonafide',
name='student_id',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student'),
),
migrations.AddField(
model_name='assistantshipclaim',
name='student',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student'),
),
migrations.AddField(
model_name='assistantshipclaim',
name='ta_supervisor',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='TA_SUPERVISOR', to='globals.faculty'),
),
migrations.AddField(
model_name='assistantshipclaim',
name='thesis_supervisor',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='THESIS_SUPERVISOR', to='globals.faculty'),
),
migrations.AlterUniqueTogether(
name='register',
unique_together={('curr_id', 'student_id')},
),
]
15 changes: 14 additions & 1 deletion FusionIIIT/applications/complaint_system/api/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,25 @@ class CaretakerSerializers(serializers.ModelSerializer):
class Meta:
model = Caretaker
fields=('__all__')
depth=2

def to_representation(self, instance):
response = super().to_representation(instance)
# get caretaker complaints and filter by status = 0
complaints = StudentComplain.objects.filter(location = instance.area, status = 0)
response['complaints'] = StudentComplainSerializers(complaints, many=True).data
return response

class SupervisorSerializers(serializers.ModelSerializer):
class Meta:
model=Supervisor
fields=('__all__')

def to_representation(self, instance):
response = super().to_representation(instance)
response['name'] = instance.sup_id.user.first_name + ' ' + instance.sup_id.user.last_name
return response

class ExtraInfoSerializers(serializers.ModelSerializer):
class Meta:
model=ExtraInfo
Expand All @@ -34,4 +47,4 @@ class Meta:
class UserSerializers(serializers.ModelSerializer):
class Meta:
model=User
fields=('__all__')
fields=('__all__')
1 change: 1 addition & 0 deletions FusionIIIT/applications/complaint_system/api/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@
url(r'^removesupervisor/(?P<s_id>[0-9]+)',views.edit_supervisor_api,name='supervisor-delete-api'),
url(r'^updatesupervisor/(?P<s_id>[0-9]+)',views.edit_supervisor_api,name='supervisor-put-api'),

url(r'^forward', views.forward_complaint_api, name='forward-complaint-api'),
]
Loading
Loading