diff --git a/OACPL/urls.py b/OACPL/urls.py index 666252b..bdb6df4 100644 --- a/OACPL/urls.py +++ b/OACPL/urls.py @@ -10,6 +10,7 @@ from django.views.static import serve import main.views import case_law.views import charter_members.views +import expert_witnesses.views import newsletters.views @@ -25,7 +26,9 @@ urlpatterns = [ url(r'^admin/logout', main.views.logout, name='logout'), url(r'^admin/', admin.site.urls, name='admin'), url(r'^attorney/(?P\d+)', charter_members.views.index, name='attorney'), - url(r'^caselaw/', case_law.views.browser, name='browser'), + url(r'^caselaw/', case_law.views.browser, name='caselaw'), + url(r'^experts/', expert_witnesses.views.browser, name='experts'), + url(r'^experts/(\d+)', expert_witnesses.views.viewer, name='expert'), url(r'^media/secure/(?P.*)$', protected_serve, {'document_root': os.path.join(settings.MEDIA_ROOT, 'secure')}, name='secure media'), url(r'^media/(?P.*)$', serve, {'document_root': settings.MEDIA_ROOT}, name='media'), url(r'^newsletter/subscribe', newsletters.views.subscribe, name='subscribe'), diff --git a/case_law/templates/browser.html b/case_law/templates/browser.html index 0828f7e..fe2af62 100644 --- a/case_law/templates/browser.html +++ b/case_law/templates/browser.html @@ -34,11 +34,11 @@
  • - Case Law + Case Law
    • {% for item in urls %}
  • - {{ item }} @@ -56,7 +56,7 @@ {% if headingCount > 1 and caseCount > 1 and not filter %} {% for heading in headings %}
    - +

    {{ heading }}

    @@ -105,7 +105,7 @@ return $(e).val() }); - window.location.href = '{% url 'browser' %}?filter=' + selected.toArray().join('/'); + window.location.href = '{% url 'caselaw' %}?filter=' + selected.toArray().join('/'); }) {% endblock %} diff --git a/expert_witnesses/templates/expertBrowser.html b/expert_witnesses/templates/expertBrowser.html new file mode 100644 index 0000000..6961924 --- /dev/null +++ b/expert_witnesses/templates/expertBrowser.html @@ -0,0 +1,23 @@ +{% extends 'base.html' %} + +{% block body %} +
    +
    +
    +
    + {% for filter in filters %} +
    {{ filter.field }}
    + {% endfor %} +
    +
    + {% for expert in experts %} + {{ expert.name }} - {{ expert.institute }} + {% for e in expert.expertise.all|dictsort:'field' %} + {{ e.field }} + {% endfor %} + {% endfor %} +
    +
    +
    +
    +{% endblock %} diff --git a/expert_witnesses/templates/expertViewer.html b/expert_witnesses/templates/expertViewer.html new file mode 100644 index 0000000..be287e6 --- /dev/null +++ b/expert_witnesses/templates/expertViewer.html @@ -0,0 +1,5 @@ +{% extends 'base.html' %} + +{% block body %} + test +{% endblock %} diff --git a/expert_witnesses/views.py b/expert_witnesses/views.py index 91ea44a..4e8af52 100644 --- a/expert_witnesses/views.py +++ b/expert_witnesses/views.py @@ -1,3 +1,18 @@ from django.shortcuts import render -# Create your views here. +from .models import AreaOfExpertise, Expert + + +def browser(request): + filters = AreaOfExpertise.objects.all().order_by('field') + filter = filters.filter(field=request.POST.get('filter')).values_list('field') + experts = Expert.objects.all() + if filter: + experts = experts.filter(expertise__in=filter) + + return render(request, 'expertBrowser.html', {'experts': experts, 'filters': filters}) + + +def viewer(request, id): + expert = Expert.objects.get(id=id) + return render(request, 'expertViewer.html', {'expert': expert}) diff --git a/templates/base.html b/templates/base.html index 582ffa6..aca7a77 100644 --- a/templates/base.html +++ b/templates/base.html @@ -50,10 +50,17 @@     FORUM
  • - CASE LAW + CASE LAW
    • -
  • - EXPERTS +
  • + +
    + Abuse + DNA + Forensics +
    • {% if request.user.is_staff %}