Merge pull request #36 from biojs/visualization_list

Visualization list

Author: Megh-Thakkar

main/management/commands/updatecomponents.py

@@ -52,7 +52,7 @@ def update_visualizations(component, commit_hash, test=False):
         css = []
     css_dependencies = buildCSS + css
     for dependency in js_dependencies:
-        if dependency.startswith('https://'):
+        if dependency.startswith('http') :
             dependency, created = JSDependency.objects.get_or_create(component=component, js_url=dependency)
         elif dependency.startswith('/'):
             dependency_string = dependency
@@ -77,7 +77,7 @@ def update_visualizations(component, commit_hash, test=False):
             except:
                 req_dependency = JSDependency.objects.create(component=component, sniper_data_value=dependency_string, js_url=dependency)
     for dependency in css_dependencies:
-        if dependency.startswith('https://'):
+        if dependency.startswith('http'):
             dependency, created = CSSDependency.objects.get_or_create(component=component, css_url=dependency)
         elif dependency.startswith('/'):
             dependency_string = dependency

main/views.py

@@ -86,11 +86,9 @@ def generate_random_snippets(request):
     try:
         count = request.GET.get('q')
         if int(count) > Component.objects.filter(sniperdata__isnull=False).count():
-            return HttpResponse('Input number "q" must not exceed %s.'%str(Component.objects.filter(sniperdata__isnull=False).count()))
+            return JsonResponse({'error':'Input number q must not exceed %s.'%str(Component.objects.filter(sniperdata__isnull=False).count())})
         components = Component.objects.filter(sniperdata__isnull=False)
         required_components = np.random.choice(components, int(count), replace=False)
-        req_str = '\n'.join([component.name for component in required_components])
-        print req_str
-        return HttpResponse(req_str, content_type="text/plain")
+        return JsonResponse({'components':BaseComponentSerializer(required_components, many=True).data})
     except:
-        return HttpResponse('Input number as query "q" in the URL.')
+        return JsonResponse({'error':'Input number as query q in the URL.'})