diff --git a/databaseReset.py b/databaseReset.py index 77a7b8a..748d0e3 100644 --- a/databaseReset.py +++ b/databaseReset.py @@ -65,10 +65,6 @@ def export_cavetab(): tocavetab.writeCaveTab(outfile) outfile.close() -def export_qms(): #finish this. need cave chooser - from export import toqms - outfile=file(os.path.join(settings.EXPOWEB, "noinfo", "CAVETAB2.CSV"),'w') - outfile.close() diff --git a/expo/views_other.py b/expo/views_other.py index 1b3b64f..8f3af0d 100644 --- a/expo/views_other.py +++ b/expo/views_other.py @@ -8,6 +8,7 @@ import randSent from django.http import HttpResponse, HttpResponseRedirect from django.core.urlresolvers import reverse from troggle.alwaysUseRequestContext import render_response # see views_logbooks for explanation on this. +from expo.models import * def showrequest(request): return HttpResponse(request.GET) @@ -69,12 +70,32 @@ def controlPanel(request): else: return HttpResponseRedirect(reverse('auth_login')) - return render_response(request,'controlPanel.html', ) + return render_response(request,'controlPanel.html', {'caves':Cave.objects.all()} ) def downloadCavetab(request): from export import tocavetab response = HttpResponse(mimetype='text/csv') - response['Content-Disposition'] = 'attachment; filename=CAVEETAB2.CSV' + response['Content-Disposition'] = 'attachment; filename=CAVETAB2.CSV' tocavetab.writeCaveTab(response) return response - \ No newline at end of file + +def downloadSurveys(request): + from export import tosurveys + response = HttpResponse(mimetype='text/csv') + response['Content-Disposition'] = 'attachment; filename=Surveys.csv' + tosurveys.writeCaveTab(response) + return response + +def downloadQMs(request): + if request.method=='GET': + try: + cave=Cave.objects.get(kataster_number=request.GET['cave_id']) + except Cave.DoesNotExist: + cave=Cave.objects.get(name=cave_id) + + from export import toqms + + response = HttpResponse(mimetype='text/csv') + response['Content-Disposition'] = 'attachment; filename=qm.csv' + toqms.writeQmTable(response,cave) + return response \ No newline at end of file diff --git a/media/css/main3.css b/media/css/main3.css index d875da9..384d9b3 100644 --- a/media/css/main3.css +++ b/media/css/main3.css @@ -230,6 +230,12 @@ a.redtext:link { border-bottom-width: thin; border-left-width: thin; } + +.menuBarItem : hover { + background: "rgb(125, 125, 125)"; +} + + .behind { display: none; } diff --git a/parsers/QMs.py b/parsers/QMs.py index 3eddfa5..732e913 100644 --- a/parsers/QMs.py +++ b/parsers/QMs.py @@ -1,11 +1,11 @@ # -*- coding: UTF-8 -*- import csv -import settings +from django.conf import settings from expo.models import QM, LogbookEntry, Cave from datetime import * from troggle.save_carefully import save_carefully -import re +import re, os def deleteQMs(): QM.objects.all().delete() @@ -23,15 +23,14 @@ def parseCaveQMs(cave,inputFile): try: hauchHl=Cave.objects.get(official_name="Hauchhöhle") except Cave.DoesNotExist: - print "Steinbruckenhoehle is not in the database. Please run parsers.cavetab first." + print "Hauchhoele is not in the database. Please run parsers.cavetab first." return elif cave =='kh': try: kh=Cave.objects.get(official_name="Kaninchenhöhle") except Cave.DoesNotExist: - print "Steinbruckenhoehle is not in the database. Please run parsers.cavetab first." - for file in inputFile: - parse_KH_QMs(kh, inputFile=file) + print "KH is not in the database. Please run parsers.cavetab first." + parse_KH_QMs(kh, inputFile=inputFile) return qmPath = settings.EXPOWEB+inputFile @@ -108,13 +107,10 @@ def parse_KH_QMs(kh, inputFile): 'nearest_station':res['nearest_station'], 'location_description':res['description'] } - - if - + save_carefully(QM,lookupArgs,nonLookupArgs) -parseCaveQMs(cave='kh', inputFile=r"smkridge/161/qmtodo.htm") parseCaveQMs(cave='stein',inputFile=r"smkridge/204/qm.csv") parseCaveQMs(cave='hauch',inputFile=r"smkridge/234/qm.csv") - +parseCaveQMs(cave='kh', inputFile="smkridge/161/qmtodo.htm") \ No newline at end of file diff --git a/templates/base.html b/templates/base.html index 5615a8e..de1f73c 100644 --- a/templates/base.html +++ b/templates/base.html @@ -7,13 +7,13 @@ - {% block head %}{% endblock %} - +