summaryrefslogtreecommitdiffstats
path: root/core/models
diff options
context:
space:
mode:
Diffstat (limited to 'core/models')
-rw-r--r--core/models/survex.py3
-rw-r--r--core/models/troggle.py16
2 files changed, 9 insertions, 10 deletions
diff --git a/core/models/survex.py b/core/models/survex.py
index e23cd74..1903755 100644
--- a/core/models/survex.py
+++ b/core/models/survex.py
@@ -120,7 +120,6 @@ class SurvexBlock(models.Model):
cave = models.ForeignKey('Cave', blank=True, null=True,on_delete=models.SET_NULL)
date = models.DateField(blank=True, null=True)
- #expeditionday = models.ForeignKey("ExpeditionDay", null=True,on_delete=models.SET_NULL)
expedition = models.ForeignKey('Expedition', blank=True, null=True,on_delete=models.SET_NULL)
survexfile = models.ForeignKey("SurvexFile", blank=True, null=True,on_delete=models.SET_NULL)
@@ -162,7 +161,7 @@ class SurvexPersonRole(models.Model):
personname = models.CharField(max_length=100)
person = models.ForeignKey('Person', blank=True, null=True,on_delete=models.SET_NULL)
personexpedition = models.ForeignKey('PersonExpedition', blank=True, null=True,on_delete=models.SET_NULL)
- expeditionday = models.ForeignKey("ExpeditionDay", null=True,on_delete=models.SET_NULL)
+ # expeditionday = models.ForeignKey("ExpeditionDay", null=True,on_delete=models.SET_NULL)
def __str__(self):
return str(self.personname) + " - " + str(self.survexblock)
diff --git a/core/models/troggle.py b/core/models/troggle.py
index 3be7b5c..c5efa6e 100644
--- a/core/models/troggle.py
+++ b/core/models/troggle.py
@@ -84,14 +84,14 @@ class Expedition(TroggleModel):
return urljoin(settings.URL_ROOT, reverse('expedition', args=[self.year]))
-class ExpeditionDay(TroggleModel):
- """Exists only on Expedition now. Removed links from logbookentry, personlogentry, survex stuff etc.
- """
- expedition = models.ForeignKey("Expedition",on_delete=models.CASCADE)
- date = models.DateField()
-
- class Meta:
- ordering = ('date',)
+# class ExpeditionDay(TroggleModel):
+ # """Exists only on Expedition now. Removed links from logbookentry, personlogentry, survex stuff etc.
+ # """
+ # expedition = models.ForeignKey("Expedition",on_delete=models.CASCADE)
+ # date = models.DateField()
+
+ # class Meta:
+ # ordering = ('date',)
class Person(TroggleModel):