summaryrefslogtreecommitdiffstats
path: root/core/models/logbooks.py
diff options
context:
space:
mode:
authorPhilip Sargent <philip.sargent@gmail.com>2023-01-29 22:11:00 +0000
committerPhilip Sargent <philip.sargent@gmail.com>2023-01-29 22:11:00 +0000
commit7d98980121531c8db21256e85590007f621c331c (patch)
treec2f732ac7da6ee2f26bb2b02b06810806e5245db /core/models/logbooks.py
parent89d0e1723ec57c5472eb1073fc1af5bb587bb7dc (diff)
downloadtroggle-7d98980121531c8db21256e85590007f621c331c.tar.gz
troggle-7d98980121531c8db21256e85590007f621c331c.tar.bz2
troggle-7d98980121531c8db21256e85590007f621c331c.zip
Fixing dates on expedition table
Diffstat (limited to 'core/models/logbooks.py')
-rw-r--r--core/models/logbooks.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/core/models/logbooks.py b/core/models/logbooks.py
index 9903db5..521eb49 100644
--- a/core/models/logbooks.py
+++ b/core/models/logbooks.py
@@ -21,7 +21,6 @@ from django.template import Context, loader
from django.urls import reverse
import settings
-#from troggle.core.models.qm import CaveSlug
from troggle.core.models.survex import SurvexStation
from troggle.core.models.troggle import (DataIssue, Expedition, Person,
PersonExpedition, TroggleModel)
@@ -33,6 +32,11 @@ todo='''
- Rename PersonTrip as PersonLogEntry or similar
'''
+class CaveSlug(models.Model):
+ cave = models.ForeignKey('Cave',on_delete=models.CASCADE)
+ slug = models.SlugField(max_length=50, unique = True)
+ primary = models.BooleanField(default=False)
+
class LogbookEntry(TroggleModel):
"""Single parsed entry from Logbook
"""
@@ -112,11 +116,6 @@ class PersonTrip(TroggleModel):
def __str__(self):
return f'{self.personexpedition} ({self.logbook_entry.date})'
-
-class CaveSlug(models.Model):
- cave = models.ForeignKey('Cave',on_delete=models.CASCADE)
- slug = models.SlugField(max_length=50, unique = True)
- primary = models.BooleanField(default=False)
class QM(TroggleModel):
"""This is based on qm.csv in trunk/expoweb/1623/204 which has the fields: