diff options
Diffstat (limited to 'core/models')
| -rw-r--r-- | core/models/caves.py | 1 | ||||
| -rw-r--r-- | core/models/logbooks.py | 10 |
2 files changed, 5 insertions, 6 deletions
diff --git a/core/models/caves.py b/core/models/caves.py index bc2974e..af215a7 100644 --- a/core/models/caves.py +++ b/core/models/caves.py @@ -21,6 +21,7 @@ from django.template import Context, loader from django.urls import reverse import settings +from troggle.core.models.logbooks import QM from troggle.core.models.survex import SurvexStation from troggle.core.models.troggle import (DataIssue, Expedition, Person, TroggleModel) diff --git a/core/models/logbooks.py b/core/models/logbooks.py index da8d970..468b100 100644 --- a/core/models/logbooks.py +++ b/core/models/logbooks.py @@ -21,11 +21,9 @@ from django.template import Context, loader from django.urls import reverse import settings -from troggle.core.models.caves import (Area, Cave, CaveAndEntrance, - Entrance) from troggle.core.models.survex import SurvexStation from troggle.core.models.troggle import (DataIssue, Expedition, Person, - TroggleModel) + PersonExpedition, TroggleModel) '''The model declarations LogBookEntry, PersonTrip, QM ''' @@ -111,7 +109,7 @@ class QM(TroggleModel): """This is based on qm.csv in trunk/expoweb/1623/204 which has the fields: "Number","Grade","Area","Description","Page reference","Nearest station","Completion description","Comment" """ - cave = models.ForeignKey(Cave, related_name='QMs',blank=True, null=True,on_delete=models.SET_NULL ) + cave = models.ForeignKey('Cave', related_name='QMs',blank=True, null=True,on_delete=models.SET_NULL ) block = models.ForeignKey('SurvexBlock', null=True,on_delete=models.SET_NULL) # only for QMs from survex files blockname=models.TextField(blank=True,null=True) # NB truncated copy of survexblock name with last char added expoyear = models.CharField(max_length=4,blank=True, null=True) # could change to datetime if logbooks similarly chnaged @@ -130,7 +128,7 @@ class QM(TroggleModel): location_description = models.TextField(blank=True) nearest_station_description = models.CharField(max_length=400,blank=True, null=True) nearest_station_name = models.CharField(max_length=200,blank=True, null=True) - nearest_station = models.ForeignKey(SurvexStation,blank=True, null=True,on_delete=models.SET_NULL) + nearest_station = models.ForeignKey('SurvexStation',blank=True, null=True,on_delete=models.SET_NULL) area = models.CharField(max_length=100,blank=True, null=True) completion_description = models.TextField(blank=True,null=True) comment=models.TextField(blank=True,null=True) @@ -178,4 +176,4 @@ class QM(TroggleModel): def get_previous_by_id(self): return QM.objects.get(id=self.id-1) - +
\ No newline at end of file |