diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/TESTS/tests.py | 16 | ||||
| -rw-r--r-- | core/admin.py | 12 | ||||
| -rw-r--r-- | core/models.py | 6 | ||||
| -rw-r--r-- | core/models_survex.py | 10 |
4 files changed, 25 insertions, 19 deletions
diff --git a/core/TESTS/tests.py b/core/TESTS/tests.py index 9ec0c57..8cd1f03 100644 --- a/core/TESTS/tests.py +++ b/core/TESTS/tests.py @@ -95,6 +95,21 @@ class PageTests(TestCase): self.assertEqual(response.status_code, 200) h1 = re.search(r'<h1 id="site-name">Troggle administration</h1>', content) + def test_page_admindocs(self): + # Issue a GET request. + response = self.client.get('/admin/login/models/') + content = response.content.decode() + self.assertEqual(response.status_code, 200) + h1 = re.search(r'<h1>Model documentation</h1>', content) + + # database not loaded yet? Or logon-problem? + # def test_page_admindocs_exped(self): + # # Issue a GET request. + # response = self.client.get('/admin/doc/models/core.expedition/') + # content = response.content.decode() + # self.assertEqual(response.status_code, 200) + # h1 = re.search(r'<td>logbookentry_set.all</td>', content) + def test_page_folk(self): # This page is separately generated, so it has the full data content response = self.client.get('/folk/') @@ -122,6 +137,7 @@ class PageTests(TestCase): response = self.client.get('/survey_scans/') self.assertEqual(response.status_code, 200) + # database not loaded yet: #response = self.client.get('/survey_scans/1991surveybook/page0002.png') #response = self.client.get('/survey_scans/1991surveybook/') #content = response.content.decode() diff --git a/core/admin.py b/core/admin.py index 26377b5..3cb8d86 100644 --- a/core/admin.py +++ b/core/admin.py @@ -30,11 +30,6 @@ class SurvexBlockAdmin(TroggleModelAdmin): inlines = (RoleInline,) -# class OtherCaveInline(admin.TabularInline): - # model = OtherCaveName - # extra = 1 - - class SurveyAdmin(TroggleModelAdmin): #inlines = (ScannedImageInline,) search_fields = ('expedition__year','wallet_number') @@ -98,7 +93,6 @@ class PersonExpeditionAdmin(TroggleModelAdmin): class CaveAdmin(TroggleModelAdmin): search_fields = ('official_name','kataster_number','unofficial_number') - #inlines = (OtherCaveInline,) extra = 4 @@ -109,8 +103,6 @@ class EntranceAdmin(TroggleModelAdmin): admin.site.register(Cave, CaveAdmin) admin.site.register(Area) admin.site.register(CaveAndEntrance) -#admin.site.register(NewSubCave) -#admin.site.register(CaveDescription) admin.site.register(Entrance, EntranceAdmin) admin.site.register(SurvexBlock, SurvexBlockAdmin) admin.site.register(Expedition) @@ -138,5 +130,5 @@ def export_as_xml(modeladmin, request, queryset): return response -#admin.site.add_action(export_as_xml) -#admin.site.add_action(export_as_json) +admin.site.add_action(export_as_xml) +admin.site.add_action(export_as_json) diff --git a/core/models.py b/core/models.py index c8eb965..cd6f1e2 100644 --- a/core/models.py +++ b/core/models.py @@ -23,6 +23,12 @@ from django.template import Context, loader import troggle.core.models_survex +"""This file declares TroggleModel which inherits from django.db.models.Model +All TroggleModel subclasses inherit persistence in the django relational database. This is known as +the django Object Relkational Mapping (ORM). +There are more subclasses define in models_caves.py models_survex.py etc. +""" + def get_process_memory(): usage=resource.getrusage(resource.RUSAGE_SELF) return usage[2]/1024.0 diff --git a/core/models_survex.py b/core/models_survex.py index 1330f75..569bbb0 100644 --- a/core/models_survex.py +++ b/core/models_survex.py @@ -21,7 +21,6 @@ class SurvexDirectory(models.Model): # return "[SurvexDirectory:"+str(self.path) + "-" + str(self.primarysurvexfile.path) + "-" + str(self.cave)+"]" - class SurvexFile(models.Model): path = models.CharField(max_length=200) survexdirectory = models.ForeignKey("SurvexDirectory", blank=True, null=True,on_delete=models.SET_NULL) @@ -140,13 +139,6 @@ class SurvexBlock(models.Model): def DayIndex(self): return list(self.expeditionday.survexblock_set.all()).index(self) - -# Fossil. No code uses this. -# class SurvexTitle(models.Model): - # survexblock = models.ForeignKey('SurvexBlock',null=True, on_delete=models.SET_NULL) - # title = models.CharField(max_length=200) # needed by svxcavesingle.html template - # cave = models.ForeignKey('Cave', blank=True, null=True,on_delete=models.SET_NULL) - # # member of a SurvexBlock # @@ -211,7 +203,7 @@ class TunnelFile(models.Model): tunnelcontains = models.ManyToManyField("TunnelFile") # case when its a frame type filesize = models.IntegerField(default=0) npaths = models.IntegerField(default=0) - survexfiles = models.ManyToManyField("SurvexFile") # direct link to SVX files + survexfiles = models.ManyToManyField("SurvexFile") # direct link to SVX files - not populated yet class Meta: ordering = ('tunnelpath',)
\ No newline at end of file |