Preliminary Distill connection
Still needs authentication, query handling, and database matching for
app id to app name.
diff --git a/app_mgr/distillviews.py b/app_mgr/distillviews.py
new file mode 100644
index 0000000..080b0f2
--- /dev/null
+++ b/app_mgr/distillviews.py
@@ -0,0 +1,48 @@
+from django.shortcuts import render, redirect, render_to_response
+from django.http import HttpResponseRedirect, HttpResponse
+from django.contrib.sites.shortcuts import get_current_site
+from django.core.urlresolvers import reverse
+from django.template import RequestContext
+from django.conf import settings
+
+
+from django.db import IntegrityError
+from django.db.models import Q
+
+from django.views.generic.base import RedirectView
+
+from axes.decorators import watch_login
+
+from rest_framework import generics
+from rest_framework.authentication import TokenAuthentication
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.response import Response
+#from rest_framework.authtoken import views as token_views
+
+from guardian.shortcuts import assign_perm, get_objects_for_user
+
+from app_mgr.permissions import ViewControlObjectPermissions
+from app_mgr.permissions import ApplicationObjectPermissions
+from app_mgr.models import UserProfile, Organization, Application, AppVersion
+from app_mgr.serializers import UserProfileSerializer, OrganizationSerializer, ApplicationSerializer
+
+import datetime
+import requests
+
+distillURL = "msbx.draper.com:8091"
+
+def app_results_byname(request, appName, searchType):
+ completeurl = distillURL+'/search/'+appName+'/'+searchType
+ print (completeurl)
+ results = requests.get(completeurl)
+
+ return HttpResponse(results)
+
+def app_results(request, appId, searchType):
+ print ("hello")
+ print (appId)
+ print (searchType)
+ return render(request, 'user_profile.html',
+ {'user': request.user,
+ }
+ )
\ No newline at end of file
diff --git a/app_mgr/urls.py b/app_mgr/urls.py
index 9c5392a..ec10388 100644
--- a/app_mgr/urls.py
+++ b/app_mgr/urls.py
@@ -16,6 +16,7 @@
from django.contrib import admin
from app_mgr import views
+from app_mgr import distillviews
urlpatterns = [
# USER AUTHENTICATION
@@ -37,6 +38,11 @@
url(r'^org/(?P<pk>[\d]+)/$', views.OrganizationInstanceView.as_view(), name='org-instance'),
url(r'^app/(?P<pk>[\d]+)/$', views.ApplicationInstanceView.as_view(), name='app-instance'),
- #url(r'^appresults/(?P<pk>[\d]+)/$', views.UserProfileInstanceView.as_view(), name='user-instance'),
+ url(r'^appresults/(?P<appId>[0-9]{1,2})/(?P<searchType>\w+)/$', distillviews.app_results, name='app-results'),
+ url(r'^appresults/(?P<appName>\w+)/(?P<searchType>\w+)/$', distillviews.app_results_byname, name='app-results'),
+
+ # url(r'^appresults/(?P<pk>[\d]+)/fields/$', views.get_app_result_fields, name='data-fields'),
+ # url(r'^appresults/(?P<pk>[\d]+)/data/$', views.get_app_results, name='data'),
+
]
diff --git a/app_mgr/views.py b/app_mgr/views.py
index 7100e8c..52ff36e 100644
--- a/app_mgr/views.py
+++ b/app_mgr/views.py
@@ -141,6 +141,7 @@
queryset = Application.objects.all()
serializer_class = ApplicationSerializer
+
# REDIRECTS
#class UserRedirectView(RedirectView):
#
@@ -307,3 +308,35 @@
{'user': request.user,
}
)
+
+# def get_app_results_fields(request, check):
+# user = request.user
+# return render(request, 'user_profile.html',
+# {'user': request.user,
+# }
+# )
+
+# def get_app_results(request, check):
+# user = request.user
+# return render(request, 'user_profile.html',
+# {'user': request.user,
+# }
+# )
+
+def app_results(request, appId, searchType):
+ print ("hello")
+ print (appId)
+ print (searchType)
+ return render(request, 'user_profile.html',
+ {'user': request.user,
+ }
+ )
+
+def app_results_byname(request, appName, searchType):
+ print ("hello")
+ print (appName)
+ print (searchType)
+ return render(request, 'user_profile.html',
+ {'user': request.user,
+ }
+ )
\ No newline at end of file
