Merge branch 'n-level' of https://github.com/fresearchgroup/Collabora…

…tion-System into n-level

.gitignore

@@ -30,3 +30,4 @@ src/
 .DS_Store/
 node_modules/
 static/js/dist/
+media/badge_images

BasicArticle/serializers.py

@@ -4,4 +4,4 @@
 class ArticleSerializer(serializers.HyperlinkedModelSerializer):
 	class Meta:
 		model = Articles
-		fields = ('id','title', 'body')
+		fields = ('id','title', 'body', 'image', 'tags')

CollaborationSystem/settings.py

@@ -31,6 +31,13 @@
 
 ALLOWED_HOSTS = config('ALLOWED_HOSTS', cast=Csv())
 
+BADGE_LEVEL_CHOICES = (
+    ("1", "Grey"),
+    ("2", "Red"),
+    ("3", "Yellow"),
+    ("4", "Blue"),
+    ("5", "Green"),
+)
 
 # Application definition
 
@@ -284,7 +291,7 @@
     ),
 
     'DEFAULT_RENDERER_CLASSES': (
-        'rest_framework.renderers.JSONRenderer',
+        'rest_framework.renderers.BrowsableAPIRenderer',
     )
 }
 

CollaborationSystem/urls.py

@@ -85,6 +85,7 @@
     url(r'^article-revision/(?P<pk>\d*)/$', articleview.SimpleModelHistoryCompareView.as_view(template_name='revision_article.html'), name='article_revision' ),
 
     url(r'^mydashboard/$', user_views.user_dashboard, name='user_dashboard'),
+    url(r'^mydashboard/badges$', user_views.badges_progress_dashboard, name='badges_progress_dashboard'),
     url(r'^community-group-create/(?P<pk>\d+)/$', communityview.CreateSubCommunityView.as_view(), name='community_group'),
 
     url(r'^group-view/(?P<pk>\d+)/$', group_views.group_view, name='group_view'),

Community/api/permissions.py

@@ -0,0 +1,7 @@
+from rest_framework import permissions
+from Community.models import CommunityMembership, Community
+
+class IsCommunityMember(permissions.BasePermission):
+
+	def has_permission(self, request, view):
+		return CommunityMembership.objects.filter(user=request.user, community=Community.objects.get(pk=view.kwargs['pk']))

Community/api/urls.py

@@ -1,8 +1,9 @@
 from django.conf.urls import url
-from .views import CommunityListsApi, CommunityArticlesApi, CommunityMediaApi
+from .views import CommunityListsApi, CommunityArticlesApi, CommunityMediaApi, CreateCommunityResource
 
 urlpatterns = [
 	url(r'^list/$', CommunityListsApi.as_view(), name='community-list-api'),
     url(r'^(?P<pk>\d*)/articles/$', CommunityArticlesApi.as_view(), name='community-articles-api'),
 	url(r'^(?P<pk>\d*)/media/(?P<type>[\w\-]+)/$', CommunityMediaApi.as_view(), name='community-media-api'),
+	url(r'^(?P<pk>\d*)/create/(?P<resource_type>[\w\-]+)/$', CreateCommunityResource.as_view(), name='community-resource-create')
 	]

Community/api/views.py

@@ -1,7 +1,12 @@
 from Community.models import Community, CommunityArticles, CommunityMedia
 from .serializers import CommunitySerializer, CommunityArticlesSerializer, CommunityMediaSerializer
 from rest_framework import generics
-
+from BasicArticle.serializers import ArticleSerializer
+from BasicArticle.models import Articles
+from Media.api.serializers import MediaCreateSerializer
+from Media.models import Media
+from rest_framework.permissions import IsAdminUser
+from .permissions import IsCommunityMember
 class CommunityListsApi(generics.ListAPIView):
 	queryset = Community.objects.all()
 	serializer_class = CommunitySerializer
@@ -17,4 +22,22 @@ class CommunityMediaApi(generics.ListAPIView):
 	serializer_class = CommunityMediaSerializer
 
 	def get_queryset(self):
-		return CommunityMedia.objects.filter(media__state__name='publish', media__mediatype=self.kwargs['type'], community = self.kwargs['pk'])
+		return CommunityMedia.objects.filter(media__state__name='publish', media__mediatype=self.kwargs['type'], community = self.kwargs['pk'])
+
+
+class CreateCommunityResource(generics.CreateAPIView):
+	permission_classes = (IsAdminUser, IsCommunityMember,)
+
+	def get_serializer_class(self):
+		if self.kwargs['resource_type'] == 'article':
+			return ArticleSerializer
+		elif self.kwargs['resource_type'] == 'media':
+			return MediaCreateSerializer
+
+	def get_queryset(self):
+		if self.kwargs['resource_type'] == 'article':
+			return Article.objects.all()
+		elif self.kwargs['resource_type'] == 'media':
+			return Media.objects.all()
+
+

Media/api/serializers.py

@@ -0,0 +1,8 @@
+from rest_framework import serializers
+from Media.models import Media
+
+
+class MediaCreateSerializer(serializers.ModelSerializer):
+	class Meta:
+		model = Media
+		fields = ('mediatype', 'title', 'mediafile', 'medialink')

Reputation/admin.py

@@ -1,9 +1,10 @@
 from django.contrib import admin
-from .models import ResourceScore, CommunityReputaion, FlagReason, ArticleFlagLogs, MediaFlagLogs
+from .models import ResourceScore, CommunityReputaion, FlagReason, ArticleFlagLogs, MediaFlagLogs, BadgeScore
 # Register your models here.
 
 admin.site.register(ResourceScore)
 admin.site.register(CommunityReputaion)
 admin.site.register(FlagReason)
 admin.site.register(ArticleFlagLogs)
 admin.site.register(MediaFlagLogs)
+admin.site.register(BadgeScore)

Reputation/api/serializers.py

@@ -1,7 +1,7 @@
 from rest_framework import serializers
 from Reputation.models import CommunityReputaion, FlagReason
 from Reputation.models import ArticleScoreLog, ArticleUserScoreLogs, MediaScoreLog, MediaUserScoreLogs
-from badges.models import BadgeToUser
+from badges.models import BadgeToUser, Badge
 
 class CommunityReputaionSerializer(serializers.ModelSerializer):
     class Meta:
@@ -61,8 +61,14 @@ class Meta:
         model = FlagReason
         fields = ['id', 'reason']
 
+class BadgeSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Badge
+        fields = ['id', 'user', 'level', 'icon', 'title', 'description']
+
 class BadgeToUserSerializer(serializers.ModelSerializer):
+    badge = BadgeSerializer(read_only=True)
+
     class Meta:
         model = BadgeToUser
-        fields = ['user', 'badge', 'community']
-
+        fields = ['user', 'badge', 'community']

Reputation/api/urls.py

@@ -1,11 +1,13 @@
 from django.conf.urls import url
 from .views import ReputationStats, ReputationStatsDetails, FlagReasons, ResourceReports, ReputationScore
+from .views import BadgesProgress
 
 urlpatterns = [
 
     url(r'^reputation_stats/$', ReputationStats.as_view()),
     url(r'^reputation_stats/(?P<pk>[0-9]+)/$', ReputationStatsDetails.as_view()),
     url(r'^flag_reasons/$', FlagReasons.as_view()),
     url(r'^resource_reports/$', ResourceReports.as_view()),
-    url(r'^score/$', ReputationScore.as_view())
+    url(r'^score/$', ReputationScore.as_view()),
+    url(r'^badges/$', BadgesProgress.as_view()),
 ]

Reputation/api/views.py

@@ -16,8 +16,8 @@
 from django.http import Http404
 from django.db.models import F
 import json
-from badges.models import BadgeToUser
-from .serializers import BadgeToUserSerializer
+from badges.models import BadgeToUser, Badge
+from .serializers import BadgeToUserSerializer, BadgeSerializer
 
 class ReputationStats(generics.ListCreateAPIView):
     permission_classes = (IsAuthenticated,)
@@ -228,6 +228,7 @@ def get(self, request):
 
         return Response(response)
 
+# for getting badges earned by user
 class ReputationScore(APIView):
     permission_classes = (IsAuthenticated,)
 
@@ -246,4 +247,33 @@ def get(self, request):
 
             reputation_score.append(res)
 
-        return Response(reputation_score)
+        return Response(reputation_score)
+
+# for getting progress of all badges of a user
+class BadgesProgress(APIView):
+    permission_classes = (IsAuthenticated,)
+
+    def get(self, request):
+        badges_progress = []
+
+        badges = Badge.objects.all()
+
+        community_membership = CommunityMembership.objects.filter(user=request.user).order_by('community__name')
+
+        for comm in community_membership:
+            community_data = CommunityMembershipSerializer(comm).data
+            community_data['badges'] = []
+
+            community = comm.community
+
+            for badge in badges:
+                badge_serialized = BadgeSerializer(badge).data
+                badge_serialized['progress'] = badge.meta_badge.get_progress_percentage(user=request.user, community=community)
+                community_data['badges'].append(badge_serialized)
+
+            badges_progress.append(community_data)
+
+
+        return Response(badges_progress)
+
+