xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

dwg upload and django admin extra search

Browse Source
This commit is contained in:
Philip Sargent
2021-05-05 00:35:10 +01:00
parent 44b6770b6a
commit d374779c47
13 changed files with 333 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
core/admin.py
View File

@@ -7,7 +7,8 @@ from django.core import serializers
from troggle.core.views.other import exportlogbook
from troggle.core.models.troggle import Person, PersonExpedition, Expedition, DataIssue
from troggle.core.models.caves import Cave, Area, Entrance, CaveAndEntrance, LogbookEntry, PersonTrip, QM
from troggle.core.models.survex import SurvexBlock, SurvexPersonRole, SurvexStation, Wallet, SingleScan
from troggle.core.models.survex import SurvexBlock, SurvexFile, SurvexPersonRole, SurvexStation, SurvexDirectory
from troggle.core.models.survex import Wallet, SingleScan, DrawingFile
'''This code significantly adds to the capabilities of the Django Management control panel for Troggle data.
In particular, it enables JSON export of any data with 'export_as_json'
@@ -36,9 +37,9 @@ class SurvexBlockAdmin(TroggleModelAdmin):
inlines = (RoleInline,)
class SurveyAdmin(TroggleModelAdmin):
#inlines = (ScannedImageInline,)
search_fields = ('expedition__year','wallet_number')
# class SurveyAdmin(TroggleModelAdmin):
# #inlines = (ScannedImageInline,)
# search_fields = ('expedition__year','wallet_number')
class QMsFoundInline(admin.TabularInline):
@@ -105,20 +106,38 @@ class CaveAdmin(TroggleModelAdmin):
class EntranceAdmin(TroggleModelAdmin):
search_fields = ('caveandentrance__cave__kataster_number',)
class SurvexStationAdmin(TroggleModelAdmin):
search_fields = ('name',)
class SurvexFileAdmin(TroggleModelAdmin):
search_fields = ('path',)
class SurvexDirectoryAdmin(TroggleModelAdmin):
search_fields = ('path', 'survexdirectory',)
class DrawingFileAdmin(TroggleModelAdmin):
search_fields = ('dwgname',)
class WalletAdmin(TroggleModelAdmin):
search_fields = ('fpath',)
admin.site.register(Cave, CaveAdmin)
admin.site.register(Area)
admin.site.register(CaveAndEntrance)
admin.site.register(Entrance, EntranceAdmin)
admin.site.register(SurvexBlock, SurvexBlockAdmin)
admin.site.register(DrawingFile, DrawingFileAdmin)
admin.site.register(Expedition)
admin.site.register(Person,PersonAdmin)
admin.site.register(SurvexPersonRole)
admin.site.register(SurvexDirectory, SurvexDirectoryAdmin)
admin.site.register(SurvexFile, SurvexFileAdmin)
admin.site.register(SurvexStation, SurvexStationAdmin)
admin.site.register(PersonExpedition,PersonExpeditionAdmin)
admin.site.register(LogbookEntry, LogbookEntryAdmin)
admin.site.register(QM, QMAdmin)
admin.site.register(SurvexStation)
admin.site.register(Wallet)
admin.site.register(Wallet, WalletAdmin)
admin.site.register(SingleScan)
admin.site.register(DataIssue)