Merge pull request #1562 from Anurag607/latest_staging_new

SA3: Updated Gymkhana files in application and templates

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)
+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)
 
 
 # Register your models here.
@@ -27,3 +27,4 @@ class ClubMemberAdmin(admin.ModelAdmin):
 admin.site.register(Voting_voters)
 admin.site.register(Registration_form)
 admin.site.register(Form_available)
+admin.site.register(Inventory)

FusionIIIT/applications/gymkhana/api/serializers.py

@@ -2,14 +2,21 @@
 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
+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
 
+class Voting_choicesSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Voting_choices
+        fields = ['poll_event', 'title', 'description', 'votes']
+
+
 class Club_infoSerializer(serializers.ModelSerializer):
 
     class Meta:
-        model=Club_info
-        fields=['club_name']
+        model = Club_info
+        fields = ['club_name', 'category', 'co_ordinator', 'co_coordinator', 'faculty_incharge', 'club_file', 'activity_calender', 'description', 'alloted_budget', 'spent_budget', 'avail_budget', 'status', 'head_changed_on', 'created_on']
+
 
 
 class EmptySerializer(serializers.Serializer):
@@ -18,36 +25,38 @@ class EmptySerializer(serializers.Serializer):
 class Club_memberSerializer(serializers.ModelSerializer):
     class Meta:
         model = Club_member
-        fields = ['member','club']
+        fields = ['member','club','description', 'status','remarks','id']
 
 
 class Core_teamSerializer(serializers.ModelSerializer):
 
     class Meta:
         model=Core_team
-        fields=('_all_')
+        fields=('all')
 
 class Club_DetailsSerializer(serializers.ModelSerializer):
     class Meta:
         model=Club_info
-        fields=['club_name',"co_ordinator","co_coordinator","activity_calender"]
+        fields=['club_name',"co_ordinator","co_coordinator","activity_calender","category",'faculty_incharge']
 
 class Session_infoSerializer(serializers.ModelSerializer):
     class Meta:
         model = Session_info
-        fields= ['venue','date','start_time','details']
+        fields = [ 'venue', 'date', 'start_time', 'end_time', 'details','status','session_poster','id', 'club']
+
+
 
 class event_infoserializer(serializers.ModelSerializer):
 
     class Meta:
         model=Event_info
-        fields=['club','event_name','incharge','date']
+        fields=['club','event_name','incharge','date','venue','start_time','id','details']
 
 class club_budgetserializer(serializers.ModelSerializer):
 
     class Meta:
         model=Club_budget
-        fields=['club','budget_for','budget_amt','budget_file']
+        fields=['club','budget_for','budget_amt','budget_file','status','id','description']
 
 class Club_reportSerializers(serializers.ModelSerializer):
     class Meta:
@@ -65,6 +74,7 @@ class Meta:
         fields=['roll','user_name','branch','cpi','programme']
 
 class Voting_pollSerializer(serializers.ModelSerializer):
+
     class Meta:
         model=Voting_polls
-        fields=['title','pub_date','exp_date','created_by','groups']
+        fields=['title','pub_date','exp_date','created_by','groups','id','description']