Revert "[RSPC] Final Staging"

.gitignore

@@ -5,7 +5,7 @@ __pycache__/
 
 # IDEs #
 .vscode
-# .idea
+.idea
 
 # Distribution / packaging
 .Python
@@ -73,3 +73,4 @@ node_modules/
 FusionIIIT/static/
 package-lock.json
 
+

FusionIIIT/applications/hostel_management/models.py

@@ -236,5 +236,4 @@ class WorkerReport(models.Model):
     remark = models.CharField(max_length=100)
 
     def str(self):
-        return str(self.worker_name)+'->' + str(self.month) + '-' + str(self.absent)  
-
+        return str(self.worker_name)+'->' + str(self.month) + '-' + str(self.absent)   

FusionIIIT/applications/research_procedures/admin.py

@@ -1,21 +1,30 @@
 from django.contrib import admin
-from applications.research_procedures.models import *
+from applications.research_procedures.models import Patent, ResearchGroup,ResearchProject,ConsultancyProject,TechTransfer
 from django.utils.html import format_html
 
 # Adding a custom admin view for patent
+class PatentAdmin(admin.ModelAdmin):
 
-class ResearchGroupAdmin(admin.ModelAdmin):
-    list_display = ["name","description"]
+    list_filter = ('status',) 
+    search_fields = ['title', 'application_id']
 
-# Register your models here.
+    def _status(self, obj):
+        color = "orange"
+        if obj.status == "Approved":
+            color = "green"
+        elif obj.status == "Disapproved":
+            color = "red"
+        return format_html('<span style="color: %s"><b>%s</b></span>' % (color, obj.status))
 
-admin.site.register(projects)
-admin.site.register(staff_allocations)
-admin.site.register(financial_outlay)
-admin.site.register(category)
-# admin.site.register(requests)
-# admin.site.register(rspc_inventory)
-# admin.site.register(project_staff_info)
+    list_display = ["faculty_id","title","_status"]
 
 
+class ResearchGroupAdmin(admin.ModelAdmin):
+    list_display = ["name","description"]
+
+# Register your models here.
+admin.site.register(Patent,PatentAdmin)
+admin.site.register(ResearchProject)
+admin.site.register(ConsultancyProject)
+admin.site.register(TechTransfer)
 # admin.site.register(ResearchGroup,ResearchGroupAdmin)

FusionIIIT/applications/research_procedures/api/serializers.py

@@ -1,51 +1,8 @@
 from rest_framework.serializers import ModelSerializer
-from rest_framework import serializers
-
-from applications.research_procedures.models import *
+from applications.research_procedures.models import Patent
 
 # Create a Serializer for Model Patent
-class ProjectSerializer(ModelSerializer):
-    class Meta:
-        # model = projects
-        fields = '__all__'
-
-class Project_serializer(serializers.ModelSerializer):
-    class Meta:
-        model = projects
-        fields = '__all__'
-
-    def create(self, validated_data):
-        return projects.objects.create(**validated_data)
-
-class financial_outlay_serializer(serializers.ModelSerializer):
-    class Meta:
-        model = financial_outlay
-        fields = '__all__'
-
-    def create(self, validated_data):
-        return financial_outlay.objects.create(**validated_data)
-
-class category_serializer(serializers.ModelSerializer):
+class PatentSerializer(ModelSerializer):
     class Meta:
-        model = category
-        fields = '__all__'
-
-    def create(self, validated_data):
-        return category.objects.create(**validated_data)
-
-class staff_allocations_serializer(serializers.ModelSerializer):
-    class Meta:
-        model = staff_allocations
-        fields = '__all__'
-
-    def create(self, validated_data):
-        return staff_allocations.objects.create(**validated_data)
-
-class requests_serializer(serializers.ModelSerializer):
-    class Meta:
-        model = requests
-        fields = '__all__'
-
-    def create(self, validated_data):
-        return requests.objects.create(**validated_data)
-
+        model = Patent
+        fields = '__all__'