--- a/OSSEval/analysis/views.py
+++ b/OSSEval/analysis/views.py
@@ -1,13 +1,32 @@
-from django.http import HttpResponse
-from django.shortcuts import render
+from django.shortcuts import render, get_object_or_404
from django.views.generic import ListView
-from analysis.models import Analysis, Instance
+from analysis.models import Analysis
-def AnalysisInstances(request, analysis_id):
- instances = Instance.objects.get(analysis_id=analysis_id)
- return HttpResponse(instances)
+# def AnalysisInstances(request, analysis_id):
+# '''
+# instances = Instance.objects.get(analysis_id=analysis_id)
+# return HttpResponse(instances)
+# '''
+# pass
+
class AnalysisList(ListView):
queryset = Analysis.objects.order_by('-created')
context_object_name = 'analises_list'
+def detail(request, analysis_id):
+ analysis = get_object_or_404(Analysis, pk=analysis_id)
+
+ entity = analysis.methodology_version.methodology.entity
+
+ exec("from " + entity.actual_entity_app + ".views import search_html_form, instance_list_html")
+ search_html_ui = search_html_form(request, analysis_id)
+ analysis_detail = instance_list_html(request, analysis_id)
+
+# exec("from " + entity.actual_entity_app + ".models import " + entity.actual_entity_class)
+# actual_entity_class = locals()[entity.actual_entity_class]
+# search_html_ui = actual_entity_class.search_html_ui(request)
+#
+# analysis_detail = actual_entity_class.instance_list_html(request, analysis_id)
+
+ return render(request, 'analysis/analysis_detail.html', {'analysis': analysis, 'analysis_detail': analysis_detail, 'search_html_ui': search_html_ui})