diff options
author | Philip Sargent <philip.sargent@klebos.com> | 2020-05-28 02:20:50 +0100 |
---|---|---|
committer | Philip Sargent <philip.sargent@klebos.com> | 2020-05-28 02:20:50 +0100 |
commit | df3917a6771d2e2df3d35fde1b99a6f1d06f9589 (patch) | |
tree | a838010e222f6a6d023c5a3f86db71efa75aa400 /core | |
parent | d2192ffd21c16ebd1ca5b39ecd489241201ecd20 (diff) | |
download | troggle-df3917a6771d2e2df3d35fde1b99a6f1d06f9589.tar.gz troggle-df3917a6771d2e2df3d35fde1b99a6f1d06f9589.tar.bz2 troggle-df3917a6771d2e2df3d35fde1b99a6f1d06f9589.zip |
Expunge cavetab
Diffstat (limited to 'core')
-rw-r--r-- | core/views_other.py | 25 |
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): |