[svn] Added cavedescription and new subcave.

Changed parsers/survex to read *title into subcave

2 files changed, 17 insertions, 1 deletions

diff --git a/core/admin.py b/core/admin.py
index e304966..1b6b550 100644
--- a/core/admin.py
+++ b/core/admin.py
@@ -95,6 +95,8 @@ admin.site.register(Area)
 admin.site.register(OtherCaveName)

 admin.site.register(CaveAndEntrance)

 admin.site.register(SurveyStation)

+admin.site.register(NewSubCave)

+admin.site.register(CaveDescription)

 admin.site.register(Entrance)

 admin.site.register(SurvexBlock, SurvexBlockAdmin)

 admin.site.register(Expedition)

diff --git a/core/models.py b/core/models.py
index 0c7e00d..0889f16 100644
--- a/core/models.py
+++ b/core/models.py
@@ -479,13 +479,27 @@ class Subcave(TroggleModel):
 #            urlString='cave/'+unicode(cave.kataster_number)+'/'+urlString

 #        else:

 #            urlString='cave/'+unicode(self.cave.kataster_number)+'/'+urlString

-            

+

             

 #        return urlparse.urljoin(settings.URL_ROOT, urlString)

 try:

     mptt.register(Subcave, order_insertion_by=['title'])

 except mptt.AlreadyRegistered:

     print "mptt already registered"

+    

+class CaveDescription(TroggleModel):

+    name = models.CharField(max_length=50)

+    description = models.TextField(blank=True,null=True)

+    linked_subcaves = models.ManyToManyField("Subcave")

+    linked_entrances = models.ManyToManyField("Entrance")

+    linked_qms = models.ManyToManyField("QM")

+    def __unicode__(self):

+        return unicode(self.name)

+

+class NewSubCave(TroggleModel):

+    name = models.CharField(max_length=200)

+    def __unicode__(self):

+        return unicode(self.name)

 

 class QM(TroggleModel):

     #based on qm.csv in trunk/expoweb/smkridge/204 which has the fields: