SciPost Code Repository

Skip to content
Snippets Groups Projects
Commit 824fb681 authored by Geert Kapteijns's avatar Geert Kapteijns
Browse files

Add date range in thesis search form.

parent 7406deae
No related branches found
No related tags found
No related merge requests found
...@@ -2,7 +2,6 @@ function hide_all_alerts() { ...@@ -2,7 +2,6 @@ function hide_all_alerts() {
$(".alert").fadeOut(300); $(".alert").fadeOut(300);
} }
$(function(){ $(function(){
// Remove all alerts in screen automatically after 10sec. // Remove all alerts in screen automatically after 10sec.
setTimeout(function() {hide_all_alerts()}, 10000); setTimeout(function() {hide_all_alerts()}, 10000);
......
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
<title>SciPost{% block pagetitle %}{% endblock pagetitle %}</title> <title>SciPost{% block pagetitle %}{% endblock pagetitle %}</title>
<script src="https://code.jquery.com/jquery-2.2.0.min.js"></script> <script src="https://code.jquery.com/jquery-2.2.0.min.js"></script>
<link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/themes/smoothness/jquery-ui.css">
<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
{% block headsup %} {% block headsup %}
{% endblock headsup %} {% endblock headsup %}
......
...@@ -108,3 +108,5 @@ class ThesisLinkSearchForm(forms.Form): ...@@ -108,3 +108,5 @@ class ThesisLinkSearchForm(forms.Form):
title_keyword = forms.CharField(max_length=100, label="Title", required=False) title_keyword = forms.CharField(max_length=100, label="Title", required=False)
abstract_keyword = forms.CharField(max_length=1000, required=False, label="Abstract") abstract_keyword = forms.CharField(max_length=1000, required=False, label="Abstract")
supervisor = forms.CharField(max_length=100, required=False, label="Supervisor") supervisor = forms.CharField(max_length=100, required=False, label="Supervisor")
from_date = forms.DateField(widget=forms.DateInput(attrs={'type': 'date'}), required=False)
to_date = forms.DateField(widget=forms.DateInput(attrs={'type': 'date'}), required=False)
import datetime
from django.db import models from django.db import models
from django.utils import timezone
class ThesisLinkManager(models.Manager): class ThesisLinkManager(models.Manager):
def search_results(self, form): def search_results(self, form):
from_date = form.cleaned_data['from_date'] if form.cleaned_data['from_date'] else datetime.date(1600, 1, 1)
to_date = form.cleaned_data['to_date'] if form.cleaned_data['to_date'] else timezone.now()
return self.vetted().filter( return self.vetted().filter(
title__icontains=form.cleaned_data['title_keyword'], title__icontains=form.cleaned_data['title_keyword'],
author__icontains=form.cleaned_data['author'], author__icontains=form.cleaned_data['author'],
abstract__icontains=form.cleaned_data['abstract_keyword'], abstract__icontains=form.cleaned_data['abstract_keyword'],
supervisor__icontains=form.cleaned_data['supervisor'], supervisor__icontains=form.cleaned_data['supervisor'],
defense_date__range=(from_date, to_date)
).order_by('-defense_date') ).order_by('-defense_date')
def latest(self, n): def latest(self, n):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment