[svn] - Make control panel downloads (qm.csv for each cave, CAVETAB2.CSV) work.

- Fix problems in QM parsing script

1 files changed, 24 insertions, 3 deletions

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