download logbook in standard HTML works

core/admin.py

@@ -4,7 +4,7 @@ from django.forms import ModelForm
 from django.http import HttpResponse
 from django.core import serializers
 
-from troggle.core.views.other import downloadlogbook
+from troggle.core.views.other import exportlogbook
 from troggle.core.models.troggle import Person, PersonExpedition, Expedition, DataIssue
 from troggle.core.models.caves import Cave, Area, Entrance, CaveAndEntrance, LogbookEntry, PersonTrip, QM
 from troggle.core.models.survex import SurvexBlock, SurvexPersonRole, SurvexStation, Wallet, SingleScan

core/views/other.py

@@ -1,4 +1,5 @@
 import re, os
+from pathlib import Path
 
 from django import forms
 from django.conf import settings
@@ -140,46 +141,60 @@ def controlpanel(request):
 
 
 
-def downloadlogbook(request,year=None,extension=None,queryset=None):
+def exportlogbook(request,year=None,extension=None):
     '''Constructs, from the database, a complete HTML (or TXT) formatted logbook - but TEXT ONLY
     for the current year. Formats available are HTML2005 or 2008text
     
     There are no images stored in the database, so this is only a tool for a first pass, to be followed by
     extensive hand-editing.
+    
+    NEED TO ADD IN THE MATERIAL WHIHC IS NOT IN ANY LBE ! e.g. front matter.
+    
+    This is the recipient of the POST action os the export form in the control panel
     '''
+    def lbeKey(lbe):
+        """This function goes into a lexicogrpahic sort function
+        """ 
+        return str(lbe.date)
 
-    if year:
-        current_expedition=Expedition.objects.get(year=year)
-        logbook_entries=LogbookEntry.objects.filter(expedition=current_expedition)
-        filename='logbook'+year
-    elif queryset:
-        logbook_entries=queryset
-        filename='logbook'
+    if not request.method=='POST':
+        return render(request,'controlPanel.html', {'expeditions':Expedition.objects.all(),'jobs_completed':""})
     else:
-        response = HttpResponse(content_type='text/plain')
-        return response(r"Error: Logbook downloader doesn't know what year you want")
+        print(f'Logbook export {request.POST}')
 
-    if 'year' in request.GET:
-        year=request.GET['year']
-    if 'extension' in request.GET:
-        extension=request.GET['extension']
+        if request.POST.get("year", '2016'):
+            year =  request.POST['year'] 
+        if request.POST.get("extension", 'html'):
+            extension =  request.POST['extension'] # e.g. html
+
+        current_expedition=Expedition.objects.get(year=year)
+        logbook_entries=LogbookEntry.objects.filter(expedition=current_expedition).order_by('date') # need to be sorted by date!
+        
+        #print(f'Logbook has {len(logbook_entries)} entries in it.')
 
         if extension =='txt':
             response = HttpResponse(content_type='text/plain')
             style='2008'
-    elif extension == 'html':
-        response = HttpResponse(content_type='text/html')
-        style='2005'
         else :
+            extension == 'html'
             response = HttpResponse(content_type='text/html')
             style='2005'
            
+        filename='newlogbook.' + extension
         template='logbook'+style+'style.'+extension
-    response['Content-Disposition'] = 'attachment; filename='+filename+'.'+extension 
+        response['Content-Disposition'] = 'attachment; filename='+filename
         t=loader.get_template(template)
-    c={'logbook_entries':logbook_entries}
-    response.write(t.render(c))
-    return response
+        logbookfile = (t.render({'logbook_entries':logbook_entries}))
+
+        dir = Path(settings.EXPOWEB) / "years" / year
+        filepath = Path(dir, filename)
+        with(open(filepath, 'w')) as lb:
+            lb.writelines(logbookfile)
+
+        #print(f'Logbook exported to {filepath}')
+        completed = f'Logbook exported to <a href="/years/{filename}">{filename}</a>'
+
+        return render(request,'controlPanel.html', {'expeditions':Expedition.objects.all(),'jobs_completed':[completed]})
 
     
 def ajax_test(request):

parsers/caves.py

@@ -19,7 +19,7 @@ django.db.transaction.TransactionManagementError:
 An error occurred in the current transaction. You can't execute queries until the end of the 'atomic' block.
 '''
 
-todo='''- Update does not work when a cave id is in the pending list but a proper cave description file exists
+todo='''- db Update does not work when a cave id is in the pending list but a proper cave description file exists
    and is being imported. It should work. But currently Django aborts and he file is not read in.
    
  - Cannot use Edit This Page for pendingcaves.txt_edit as Edit This Page is expecting an html file.
@@ -139,13 +139,13 @@ def readcaves():
     '''
     # For those caves which do not have cave_data/1623-xxx.html XML files even though they exist and have surveys
     # should put this in a simple list which can be edited using 'Edit this file'
-    pending = []
+    pending = set()
     fpending = Path(settings.CAVEDESCRIPTIONS, "pendingcaves.txt")
     if fpending.is_file():
         with open(fpending, "r") as fo:
             cids = fo.readlines()
         for cid in cids:
-            pending.append(cid.rstrip('\n'))
+            pending.add(cid.rstrip('\n'))
 
     with transaction.atomic():
         print(" - Deleting Caves and Entrances")

templates/controlPanel.html

@@ -95,7 +95,7 @@
 </tr>
 <tr>
     <td>
-        <form name="export" method="get" action={% url "downloadlogbook" %}>
+        <form name="export" method="POST" action={% url "exportlogbook" %}>
 {% csrf_token %}              
             <p>Download a logbook file which is dynamically generated by Troggle.</p>
             

urls.py

@@ -11,7 +11,7 @@ from django.urls import reverse, resolve
 from troggle.core.views import caves, statistics, survex
 from troggle.core.views.surveys import scansingle, singlewallet, allwallets, dwgdata, dwgfilesingle, dwgfileupload
 from troggle.core.views.other import troggle404, frontpage, todos, controlpanel, frontpage, scanupload
-from troggle.core.views.other import downloadlogbook
+from troggle.core.views.other import exportlogbook
 from troggle.core.views.caves import ent, cavepage
 from troggle.core.views.logbooks import get_logbook_entries, logbookentry, logbookSearch
 from troggle.core.views.logbooks import personindex, person, get_people
@@ -98,8 +98,8 @@ trogglepatterns = [
 #   Logbook entries
     re_path(r'^logbookentry/(?P<date>.*)/(?P<slug>.*)/?$', logbookentry,name="logbookentry"),
     re_path(r'^logbooksearch/(.*)/?$', logbookSearch), # name 'search' not defined in views/logbooks.py
-    re_path(r'^logbook(?P<year>\d\d\d\d)\.(?P<extension>.*)/?$', downloadlogbook), # e.g. /logbook2019.html # working but old CSS in template 
-    re_path(r'^logbook/?$', downloadlogbook, name="downloadlogbook"),
+    re_path(r'^logbook(?P<year>\d\d\d\d)\.(?P<extension>.*)/?$', exportlogbook, name='exportlogbook'), # e.g. /logbook2019.html # working but old CSS in     
+    re_path(r'^logbook$', exportlogbook, name='exportlogbook'), 
    
 #   Internal. editfile.html template uses these internally
     re_path(r'^getPeople/(?P<expeditionslug>.*)', get_people, name = "get_people"),