Dev gymkhana merge into dashboard : SA-3 GYMKHANA MODULE

FusionIIIT/Fusion/settings/development.py

@@ -12,7 +12,7 @@
         'NAME': 'fusionlab',
         'HOST': os.environ.get("DB_HOST", default='localhost'),
         'USER': 'fusion_admin',
-        'PASSWORD': 'hello123',
+        'PASSWORD': 'hello123'
     }
 }
 

FusionIIIT/applications/gymkhana/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from .models import (Club_budget,Club_info,Club_member,Club_report,Core_team,Fest_budget,Other_report,Session_info,Voting_choices,Voting_polls,Voting_voters,Event_info,Registration_form,Form_available,Inventory)
+from .models import (Club_budget,Club_info,Club_member,Club_report,Fest_budget,Fest,Other_report,Session_info,Event_info,Registration_form,Form_available,Inventory,Budget,Budget_Comments,Event_Comments)
 
 
 # Register your models here.
@@ -15,16 +15,20 @@ class ClubMemberAdmin(admin.ModelAdmin):
 
 admin.site.register(Club_info, ClubInfoAdmin)
 admin.site.register(Club_member, ClubMemberAdmin)
-admin.site.register(Core_team)
+# admin.site.register(Core_team)
 admin.site.register(Club_budget)
 admin.site.register(Session_info)
 admin.site.register(Event_info)
 admin.site.register(Club_report)
 admin.site.register(Fest_budget)
 admin.site.register(Other_report)
-admin.site.register(Voting_polls)
-admin.site.register(Voting_choices)
-admin.site.register(Voting_voters)
+# admin.site.register(Voting_polls)
+# admin.site.register(Voting_choices)
+# admin.site.register(Voting_voters)
 admin.site.register(Registration_form)
 admin.site.register(Form_available)
 admin.site.register(Inventory)
+admin.site.register(Budget)
+admin.site.register(Budget_Comments)
+admin.site.register(Event_Comments)
+admin.site.register(Fest)

FusionIIIT/applications/gymkhana/api/serializers.py

@@ -2,13 +2,13 @@
 from django.contrib.auth import get_user_model
 from rest_framework.authtoken.models import Token
 from rest_framework import serializers
-from applications.gymkhana.models import Club_info,Session_info,Event_info, Voting_choices
-from applications.gymkhana.models import Club_member,Core_team,Club_budget,Club_report,Fest_budget,Registration_form,Voting_polls
+from applications.gymkhana.models import Club_info,Session_info,Event_info
+from applications.gymkhana.models import Club_member,Club_budget,Club_report,Fest_budget,Fest,Registration_form,Budget,Budget_Comments,Event_Comments,Achievements,ClubPosition, EventInput, EventReport
 
-class Voting_choicesSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = Voting_choices
-        fields = ['poll_event', 'title', 'description', 'votes']
+# class Voting_choicesSerializer(serializers.ModelSerializer):
+#     class Meta:
+#         model = Voting_choices
+#         fields = ['poll_event', 'title', 'description', 'votes']
 
 
 class Club_infoSerializer(serializers.ModelSerializer):
@@ -28,16 +28,16 @@ class Meta:
         fields = ['member','club','description', 'status','remarks','id']
 
 
-class Core_teamSerializer(serializers.ModelSerializer):
+# class Core_teamSerializer(serializers.ModelSerializer):
 
-    class Meta:
-        model=Core_team
-        fields=('all')
+#     class Meta:
+#         model=Core_team
+#         fields=('all')
 
 class Club_DetailsSerializer(serializers.ModelSerializer):
     class Meta:
         model=Club_info
-        fields=['club_name',"co_ordinator","co_coordinator","activity_calender","category",'faculty_incharge',"club_file", "status"]
+        fields=['club_name',"co_ordinator","co_coordinator","activity_calender","category",'faculty_incharge',"club_file", "status" ,"description"]
 
 class Session_infoSerializer(serializers.ModelSerializer):
     class Meta:
@@ -50,13 +50,13 @@ class event_infoserializer(serializers.ModelSerializer):
 
     class Meta:
         model=Event_info
-        fields=['club','event_name','incharge','date','venue','start_time','id','details','status']
+        fields=['club','event_name','incharge','start_date','end_date','venue','start_time','id','details','status','end_time','details']
 
 class club_budgetserializer(serializers.ModelSerializer):
 
     class Meta:
         model=Club_budget
-        fields=['club','budget_for','budget_amt','budget_file','status','id','description']
+        fields=['club','budget_for','budget_amt','budget_file','status','id','description','remarks']
 
 class Club_reportSerializers(serializers.ModelSerializer):
     class Meta:
@@ -73,8 +73,48 @@ class Meta:
         model=Registration_form
         fields=['roll','user_name','branch','cpi','programme']
 
-class Voting_pollSerializer(serializers.ModelSerializer):
+# class Voting_pollSerializer(serializers.ModelSerializer):
+
+#     class Meta:
+#         model=Voting_polls
+#         fields=['title','pub_date','exp_date','created_by','groups','id','description']
+class BudgetSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Budget
+        fields = ['id', 'club', 'budget_for', 'budget_requested', 'budget_allocated', 'budget_file', 'description', 'status', 'remarks', 'budget_comment']
+class AchievementsSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Achievements
+        fields = ['id', 'club_name', 'title', 'achievement']
+class Budget_CommentsSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Budget_Comments
+        fields = ['budget_id', 'commentator_designation', 'comment', 'comment_date', 'comment_time']
+class Event_CommentsSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Event_Comments
+        fields = ['event_id', 'commentator_designation', 'comment', 'comment_date', 'comment_time']
+class ClubPositionSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = ClubPosition
+        fields = ['id', 'name', 'position', 'club']
+
+class FestSerializer(serializers.ModelSerializer):
+    class Meta:
+        model=Fest
+        fields= ['id', 'name', 'category', 'description', 'date', 'link']
+
+class EventInputSerializer(serializers.ModelSerializer):
+    # Use event name for dropdown-like functionality
+    event = serializers.SlugRelatedField(
+        queryset=Event_info.objects.all(), 
+        slug_field='id')
+
+    class Meta:
+        model = EventInput
+        fields = ['id', 'event', 'description','images']
 
+class EventReportSerializer(serializers.ModelSerializer):
     class Meta:
-        model=Voting_polls
-        fields=['title','pub_date','exp_date','created_by','groups','id','description']
+        model = EventReport
+        fields = '__all__'