summaryrefslogtreecommitdiffstats
path: root/core/views_other.py
diff options
context:
space:
mode:
Diffstat (limited to 'core/views_other.py')
-rw-r--r--core/views_other.py25
1 files changed, 10 insertions, 15 deletions
diff --git a/core/views_other.py b/core/views_other.py
index 47a071a..4da8e70 100644
--- a/core/views_other.py
+++ b/core/views_other.py
@@ -1,17 +1,20 @@
-from troggle.core.models import Cave, Expedition, Person, LogbookEntry, PersonExpedition, PersonTrip, QM
-#from troggle.core.forms import UploadFileForm, DPhoto
-from django.conf import settings
+import re
+
from django import forms
-from django.template import loader, Context
+from django.conf import settings
+from django.core.urlresolvers import reverse
from django.db.models import Q
+from django.http import HttpResponse, HttpResponseRedirect
from django.shortcuts import render
+from django.template import Context, loader
+
import databaseReset
-import re
-from django.http import HttpResponse, HttpResponseRedirect
-from django.core.urlresolvers import reverse
from troggle.core.models import *
+from troggle.core.models import (QM, Cave, Expedition, LogbookEntry, Person,
+ PersonExpedition, PersonTrip)
from troggle.helper import login_required_if_public
+
def showrequest(request):
return HttpResponse(request.GET)
@@ -71,18 +74,10 @@ def controlPanel(request):
return render(request,'controlPanel.html', {'caves':Cave.objects.all(),'expeditions':Expedition.objects.all(),'jobs_completed':jobs_completed})
-def downloadCavetab(request):
- from export import tocavetab
- response = HttpResponse(content_type='text/csv')
- response['Content-Disposition'] = 'attachment; filename=CAVETAB2.CSV'
- tocavetab.writeCaveTab(response)
- return response
-
def downloadSurveys(request):
from export import tosurveys
response = HttpResponse(content_type='text/csv')
response['Content-Disposition'] = 'attachment; filename=Surveys.csv'
- tosurveys.writeCaveTab(response)
return response
def downloadLogbook(request,year=None,extension=None,queryset=None):