Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
f7b8ad1
Add new migration files
kumkum020704 Oct 16, 2024
cb7b74c
created api folder
Beastharsh970 Oct 17, 2024
b85b3d6
Added files in the scholarships/api directory
kumkum020704 Oct 17, 2024
d378779
previous winners api
Beastharsh970 Oct 20, 2024
c2f9721
Api Created for previous winners
Beastharsh970 Oct 20, 2024
1f45474
api made of previous winner and catalog
Beastharsh970 Oct 20, 2024
437d089
Merge pull request #2 from Beastharsh970/ac-5
kumkum020704 Oct 21, 2024
a93c937
Merge branch 'ac-5' of https://github.com/kumkum020704/Fusion into ac-5
kumkum020704 Oct 21, 2024
e9ad1e6
API's made for MCM & all three medals
PriyanshuXcoder Nov 10, 2024
11057f6
Merge pull request #3 from PriyanshuXcoder/ac-5
kumkum020704 Nov 10, 2024
4d59343
making APIs to check status
harshit-G51102 Nov 10, 2024
c91bee3
Merge remote-tracking branch 'upstream/ac-5' into ac-5
harshit-G51102 Nov 10, 2024
361b95c
Merge pull request #4 from harshit-G51102/ac-5
kumkum020704 Nov 12, 2024
6560a26
Merge remote-tracking branch 'origin/ac-5' into ac-5
kumkum020704 Nov 12, 2024
2c80be2
Your descriptive commit message
Beastharsh970 Nov 15, 2024
49ca36e
api for editing the catalog by convenor or assistant
Beastharsh970 Nov 15, 2024
2b4037b
Merge pull request #5 from Beastharsh970/ac-5
kumkum020704 Nov 15, 2024
419c328
Made API for showing the mcm entries to spacs convenor and assistant
PriyanshuXcoder Nov 15, 2024
8ccf060
Merge pull request #6 from PriyanshuXcoder/ac-5
kumkum020704 Nov 15, 2024
e412b1f
created apis for showing data of director silver and gold on clicking…
Beastharsh970 Nov 15, 2024
56303ff
api to view all applied application for director's gold to spacs conv…
Beastharsh970 Nov 15, 2024
11e6611
api created for invite application
Beastharsh970 Nov 15, 2024
dc372ee
Merge pull request #7 from Beastharsh970/ac-5
kumkum020704 Nov 16, 2024
875edb1
some other apis
Beastharsh970 Nov 16, 2024
a3c102f
Merge remote-tracking branch 'upstream/ac-5' into ac-5
Beastharsh970 Nov 16, 2024
5e42deb
Added API for Director_gold,Director Silver,MCM listing and MCM,direc…
PriyanshuXcoder Nov 16, 2024
0d4edbd
API for Director silver status update
PriyanshuXcoder Nov 16, 2024
fb2765a
Merge pull request #8 from PriyanshuXcoder/ac-5
kumkum020704 Nov 16, 2024
16911ad
Changed in views of Award and Scholarship
PriyanshuXcoder Nov 18, 2024
9f4593c
Merge pull request #9 from PriyanshuXcoder/ac-5
kumkum020704 Nov 18, 2024
950ca4a
Update scholarships URLs and add migration files
kumkum020704 Nov 18, 2024
8e81da6
Merge branch 'ac-5' of https://github.com/kumkum020704/Fusion into ac-5
kumkum020704 Nov 18, 2024
2cf35d7
fixing some bugs
harshit-G51102 Nov 19, 2024
ad6dc7c
Merge branch 'ac-5' of https://github.com/kumkum020704/Fusion into ac-5
harshit-G51102 Nov 19, 2024
86d1191
api created to get value from release table according to the name of …
Beastharsh970 Nov 19, 2024
5dbbbd8
mcm submission backend complete
harshit-G51102 Nov 19, 2024
8857076
mcm api complete
harshit-G51102 Nov 19, 2024
06cc172
Merge pull request #11 from harshit-G51102/ac-5
kumkum020704 Nov 19, 2024
b2fa27d
Merge pull request #10 from Beastharsh970/ac-5
kumkum020704 Nov 19, 2024
728720d
Merge remote-tracking branch 'upstream/ac-5' into ac-5
harshit-G51102 Nov 19, 2024
f37b9cc
Merge pull request #12 from harshit-G51102/ac-5
kumkum020704 Nov 19, 2024
2e4dc41
py
kumkum020704 Nov 20, 2024
a09645b
some bugs of convenor api's are solved
Beastharsh970 Nov 20, 2024
7abee8c
Merge remote-tracking branch 'upstream/ac-5' into ac-5
Beastharsh970 Nov 20, 2024
6f35b90
Merge pull request #13 from Beastharsh970/ac-5
kumkum020704 Nov 20, 2024
e359322
Merge branch 'ac-5' of https://github.com/kumkum020704/Fusion into ac-5
kumkum020704 Nov 20, 2024
412639b
migration files
kumkum020704 Jan 14, 2025
8eafe60
delete duplicate migrations
kumkum020704 Jan 14, 2025
7f069c5
Correct Migration files
AkashPaloju Feb 16, 2025
6e218c4
Remove unwanted changes
AkashPaloju Feb 17, 2025
d548e47
files api in backend (#14)
PriyanshuXcoder Feb 18, 2025
b9fdb6c
Merge remote-tracking branch 'upstream/ac-5' into ac-5
AkashPaloju Feb 18, 2025
f086415
make backend changes for convocation models and mcm
AkashPaloju Mar 14, 2025
84c7889
Add dm-proficiency apis
AkashPaloju Mar 14, 2025
a79c102
modify mcmstatus update view
AkashPaloju Mar 18, 2025
de42b4c
removed unnecessary lines
AkashPaloju Mar 20, 2025
ee2cafb
Delete migration files
AkashPaloju Mar 20, 2025
f164281
Merge remote-tracking branch 'upstream/dashboard_client' into ac-5
AkashPaloju Mar 20, 2025
945019a
Delete a migration file
AkashPaloju Mar 20, 2025
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

This file was deleted.

85 changes: 85 additions & 0 deletions FusionIIIT/applications/scholarships/api/serializers.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
from rest_framework import serializers
from applications.academic_information.models import Student
from applications.globals.models import ExtraInfo
from applications.scholarships.models import Award_and_scholarship,Previous_winner,Mcm,Director_silver,Director_gold,Notional_prize,Proficiency_dm,Release

class McmStatusUpdateSerializer(serializers.ModelSerializer):
class Meta:
model = Mcm
fields = ['status']

def validate_status(self, value):
valid_statuses = ['ACCEPTED', 'REJECTED', 'UNDER_REVIEW']
if value not in valid_statuses:
raise serializers.ValidationError(f"Status must be one of {valid_statuses}.")
return value

class DirectorSilverDecisionSerializer(serializers.ModelSerializer):
class Meta:
model = Director_silver
fields = ['id', 'status']

def validate_status(self, value):
if value not in ['ACCEPTED', 'REJECTED']:
raise serializers.ValidationError("Status must be either 'ACCEPTED' or 'REJECTED'.")
return value

class DMProficiencyDecisionSerializer(serializers.ModelSerializer):
class Meta:
model = Proficiency_dm
fields = ['id', 'status']

def validate_status(self, value):
if value not in ['ACCEPTED', 'REJECTED']:
raise serializers.ValidationError("Status must be either 'ACCEPTED' or 'REJECTED'.")
return value

class ReleaseSerializer(serializers.ModelSerializer):
class Meta:
model = Release
fields = '__all__'

# This serializer is used for editing the catalog by convenor and assistant
class AwardAndScholarshipSerializer(serializers.ModelSerializer):
class Meta:
model = Award_and_scholarship
fields = '_all_'

# this serializer is used for showing data on catalog form
class AwardAndScholarshipSerializer(serializers.ModelSerializer):
class Meta:
model = Award_and_scholarship
fields = ['id', 'award_name', 'catalog']
extra_kwargs = {
'catalog': {'required': True, 'allow_null': False} # Make catalog optional
}

class PreviousWinnerSerializer(serializers.ModelSerializer):
class Meta:
model = Previous_winner
fields = ['student', 'programme', 'year', 'award_id']

class McmSerializer(serializers.ModelSerializer):
class Meta:
model = Mcm
fields = '__all__'

class DirectorSilverSerializer(serializers.ModelSerializer):
class Meta:
model = Director_silver
fields = '__all__'

class DirectorGoldSerializer(serializers.ModelSerializer):
class Meta:
model = Director_gold
fields = '__all__'

class NotionalPrizeSerializer(serializers.ModelSerializer):
class Meta:
model = Notional_prize
fields = '__all__'

class ProficiencyDmSerializer(serializers.ModelSerializer):
class Meta:
model = Proficiency_dm
fields = '__all__'
24 changes: 24 additions & 0 deletions FusionIIIT/applications/scholarships/api/urls.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
from django.conf.urls import url

from . import views
from applications.scholarships.api.views import GetWinnersView
from applications.scholarships.api.views import create_award,McmUpdateView, McmRetrieveView, DirectorSilverRetrieveView,DirectorSilverUpdateView,DirectorGoldRetrieveView,DirectorGoldUpdateView,ProficiencyDmRetrieveView,ProficiencyDmUpdateView,AwardAndScholarshipCreateView,DirectorSilverMarksheetView,DirectorGoldMarksheetView
from applications.scholarships.api.views import ScholarshipDetailView,StudentDetailView,DirectorSilverDetailView,DirectorGoldDetailView,DirectorGoldListView,ReleaseCreateView,McmStatusUpdateView,DirectorSilverDecisionView,DirectorGoldAcceptRejectView,DirectorSilverListView,GetReleaseByAwardView,McmDocumentsRetrieveView
app_name = 'spacs'

urlpatterns = [

# url(r'^$', views.spacs, name='spacs'),
# url(r'^student_view/$', views.student_view, name='student_view'),
# url(r'^convener_view/$', views.convener_view, name='convener_view'),
# url(r'^staff_view/$', views.staff_view, name='staff_view'),
# url(r'^stats/$', views.stats, name='stats'),
# url(r'^convenerCatalogue/$', views.convenerCatalogue, name='convenerCatalogue'),
# url(r'^getWinners/$', views.getWinners, name='getWinners'),
# url(r'^get_MCM_Flag/$', views.get_MCM_Flag, name='get_MCM_Flag'),
# url(r'^getConvocationFlag/$', views.getConvocationFlag, name='getConvocationFlag'),
# url(r'^getContent/$', views.getContent, name='getContent'),
# url(r'^updateEndDate/$', views.updateEndDate, name='updateEndDate'),
url('get-winners/', GetWinnersView.as_view(), name='get-winners')

]
Loading