Merge pull request #11 from HumanDynamics/fixing_urls

Adding urls and views that were removed by mistake

src/openbadge/urls.py

@@ -1,24 +1,14 @@
-from django.conf.urls import include, url, patterns
-from django.conf import settings
-from django.conf.urls.static import static
+from django.conf.urls import include, url
 from . import views
 from django.views.generic.base import TemplateView
 
-from django.conf import settings
-from django.conf.urls.static import static
-
 urlpatterns = [
+    # APP URLs. DO NOT TOUCH THESE
     url(r'^get_group/(?P<group_key>\w+)/$', views.get_group, name='get_group'),
     url(r'^get_finished_meetings/(?P<group_key>\w+)/$', views.get_finished_meetings, name='get_finished_meetings'),
     url(r'^log_data/$', views.log_data, name='log_data'),
 
+    # Reports
     url(r'^internal_report/$', views.internal_report, name='internal_report'),
     url(r'^weekly_group_report/(?P<group_key>\w+)/(?P<week_num>[0-9]+)$', views.weekly_group_report, name='weekly_group_report'),
-]
-
-## debug stuff to serve static media
-if settings.DEBUG:
-    urlpatterns += patterns('',
-        (r'^media/(?P<path>.*)$', 'django.views.static.serve', 
-            {'document_root': settings.MEDIA_ROOT}),
-   )
+]

src/openbadge/views.py

@@ -19,11 +19,11 @@
 import analysis
 from django.conf import settings
 
-from createGraph import individualGraph, aggregateGraph
 from newGraph import groupStatGraph
-
 from django.contrib.auth.decorators import user_passes_test
 
+TIME_FORMAT = "%Y-%m-%d %H:%M:%S"
+
 def json_response(**kwargs):
     return HttpResponse(simplejson.dumps(kwargs))
 
@@ -51,6 +51,7 @@ def wrapper(request, *args, **kwargs):
         return wrapper
     return decorator
 
+## APP views ###########################################################################################################
 
 @app_view
 @api_view(['POST'])
@@ -109,6 +110,38 @@ def log_data(request):
 
     return json_response(success=True)
 
+@app_view
+@api_view(['GET'])
+def get_group(request, group_key):
+
+    if not group_key:
+        return json_response(success=False)
+
+    try:
+        group = StudyGroup.objects.prefetch_related("members", "visualization_ranges").get(key=group_key)
+    except StudyGroup.DoesNotExist:
+        return json_response(success=False)
+
+    return json_response(success=True, group=group.to_dict())
+
+
+@app_view
+@api_view(['GET'])
+def get_finished_meetings(request, group_key):
+
+    if not group_key:
+        raise Http404()
+
+    try:
+        group = StudyGroup.objects.prefetch_related("meetings").get(key=group_key)
+    except StudyGroup.DoesNotExist:
+        raise Http404()
+
+    finished_meetings = [meeting.uuid for meeting in group.meetings.filter(is_complete=True).all()]
+
+    return json_response(success=True, finished_meetings=finished_meetings)
+
+## Report views ########################################################################################################
 
 #@user_passes_test(lambda u: u.is_superuser)
 def weekly_group_report(request, group_key, week_num):

src/project/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import include, url, patterns
+from django.conf.urls import include, url
 from django.contrib import admin
 from django.conf import settings
 from django.conf.urls.static import static
@@ -7,6 +7,7 @@
 urlpatterns = [
     url(r'^grappelli/', include('grappelli.urls')),
     url(r'^admin/', include(admin.site.urls)),
+
     url(r'', include('openbadge.urls',namespace='openbadge')),
 
 ]