diff options
Diffstat (limited to 'expo')
| -rw-r--r-- | expo/admin.py | 24 | ||||
| -rw-r--r-- | expo/models.py | 34 | ||||
| -rw-r--r-- | expo/views_caves.py | 16 | ||||
| -rw-r--r-- | expo/views_logbooks.py | 24 | ||||
| -rw-r--r-- | expo/views_other.py | 23 |
5 files changed, 84 insertions, 37 deletions
diff --git a/expo/admin.py b/expo/admin.py index 7e773f6..4416dda 100644 --- a/expo/admin.py +++ b/expo/admin.py @@ -5,18 +5,24 @@ import django.forms as forms from expo.forms import LogbookEntryForm
#from troggle.reversion.admin import VersionAdmin #django-reversion version control
+#overriding admin save so we have the new since parsing field
+class TroggleModelAdmin(admin.ModelAdmin):
+ def save_model(self, request, obj, form, change):
+ obj.new_since_parsing=True
+ obj.save()
+
class RoleInline(admin.TabularInline):
model = PersonRole
extra = 4
-class SurvexBlockAdmin(admin.ModelAdmin):
+class SurvexBlockAdmin(TroggleModelAdmin):
inlines = (RoleInline,)
class ScannedImageInline(admin.TabularInline):
model = ScannedImage
extra = 4
-class SurveyAdmin(admin.ModelAdmin):
+class SurveyAdmin(TroggleModelAdmin):
inlines = (ScannedImageInline,)
class QMInline(admin.TabularInline):
@@ -34,7 +40,7 @@ class PersonTripInline(admin.TabularInline): extra = 1
#class LogbookEntryAdmin(VersionAdmin):
-class LogbookEntryAdmin(admin.ModelAdmin):
+class LogbookEntryAdmin(TroggleModelAdmin):
prepopulated_fields = {'slug':("title",)}
search_fields = ('title','expedition__year')
inlines = (PersonTripInline, PhotoInline)
@@ -47,20 +53,17 @@ class PersonExpeditionInline(admin.TabularInline): -class PersonAdmin(admin.ModelAdmin):
+class PersonAdmin(TroggleModelAdmin):
search_fields = ('first_name','last_name')
inlines = (PersonExpeditionInline,)
-class QMAdmin(admin.ModelAdmin):
+class QMAdmin(TroggleModelAdmin):
search_fields = ('found_by__cave__kataster_number','number')
- def save_model(self, request, obj, form, change):
- obj.new_since_parsing=True
- obj.save()
-class PersonExpeditionAdmin(admin.ModelAdmin):
+class PersonExpeditionAdmin(TroggleModelAdmin):
search_fields = ('person__first_name','expedition__year')
-class CaveAdmin(admin.ModelAdmin):
+class CaveAdmin(TroggleModelAdmin):
search_fields = ('official_name','kataster_number','unofficial_number')
#inlines = (QMInline,)
extra = 4
@@ -68,6 +71,7 @@ class CaveAdmin(admin.ModelAdmin): admin.site.register(Photo)
+admin.site.register(Subcave)
admin.site.register(Cave, CaveAdmin)
admin.site.register(Area)
admin.site.register(OtherCaveName)
diff --git a/expo/models.py b/expo/models.py index 2db8039..639e8b5 100644 --- a/expo/models.py +++ b/expo/models.py @@ -235,10 +235,10 @@ class LogbookEntry(TroggleModel): return "%s: (%s)" % (self.date, self.title)
def get_next_by_id(self):
- Logbook.objects.get(id=self.id+1)
+ LogbookEntry.objects.get(id=self.id+1)
def get_previous_by_id(self):
- Logbook.objects.get(id=self.id-1)
+ LogbookEntry.objects.get(id=self.id-1)
class PersonTrip(TroggleModel):
person_expedition = models.ForeignKey(PersonExpedition,null=True)
@@ -448,13 +448,29 @@ class Entrance(TroggleModel): if f[0] == self.findability:
return f[1]
-class CaveArea(TroggleModel):
+class Subcave(TroggleModel):
description = models.TextField()
- name = models.CharField(max_length=200, unique = True)
- cave = models.ForeignKey('Cave')
- parentArea = models.ForeignKey('CaveArea')
- survexFile = models.CharField(max_length=200)
-
+ name = models.CharField(max_length=200, )
+ cave = models.ForeignKey('Cave', blank=True, null=True, help_text="Only the top-level subcave should be linked to a cave")
+ parent= models.ForeignKey('Subcave', blank=True, null=True,)
+ adjoining = models.ManyToManyField('Subcave',blank=True, null=True,)
+ survex_file = models.CharField(max_length=200, blank=True, null=True,)
+
+ def __unicode__(self):
+ return self.name
+
+ def get_absolute_url(self):
+ urlString=self.name
+ if self.parent:
+ parent=self.parent
+ while parent.parent:
+ urlString=parent.name+'/'+urlString
+ parent=parent.parent
+ urlString=unicode(parent.cave.kataster_number)+urlString
+ else:
+ urlString=unicode(self.cave.kataster_number)+urlString
+
+ return settings.URL_ROOT + urlString
class QM(TroggleModel):
#based on qm.csv in trunk/expoweb/smkridge/204 which has the fields:
@@ -473,7 +489,7 @@ class QM(TroggleModel): location_description = models.TextField(blank=True)
#should be a foreignkey to surveystation
nearest_station_description = models.CharField(max_length=400,null=True,blank=True)
- nearest_station = models.OneToOneField(SurveyStation,null=True,blank=True)
+ nearest_station = models.CharField(max_length=200,blank=True,null=True)
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)
diff --git a/expo/views_caves.py b/expo/views_caves.py index 8c1b50b..02994b6 100644 --- a/expo/views_caves.py +++ b/expo/views_caves.py @@ -7,6 +7,7 @@ from django.core.urlresolvers import reverse from troggle.alwaysUseRequestContext import render_response # see views_logbooks for explanation on this.
from django.http import HttpResponseRedirect
from django.conf import settings
+import re
def getCave(cave_id):
"""Returns a cave object when given a cave name or number. It is used by views including cavehref, ent, and qm."""
@@ -51,10 +52,17 @@ def survexblock(request, survexpath): ftext = survexblock.text
return render_response(request,'survexblock.html', {'survexblock':survexblock, 'ftext':ftext, })
-def caveArea(request, name):
- cavearea = models.CaveArea.objects.get(name = name)
- cave = cavearea.cave
- return render_response(request,'cavearea.html', {'cavearea': cavearea, 'cave': cave,})
+def subcave(request, cave_id, subcave):
+ print subcave
+ subcaveSeq=re.findall('([a-zA-Z]*)(?:/)',subcave)
+ print subcaveSeq
+ cave=models.Cave.objects.filter(kataster_number = cave_id)[0]
+ subcave=models.Subcave.objects.get(name=subcaveSeq[0], cave=cave)
+ if len(subcaveSeq)>1:
+ for singleSubcave in subcaveSeq[1:]:
+ subcave=subcave.subcave_set.get(name=singleSubcave)
+ print subcave
+ return render_response(request,'subcave.html', {'subcave': subcave,})
def caveSearch(request):
query_string = ''
diff --git a/expo/views_logbooks.py b/expo/views_logbooks.py index 894be2a..cfebd35 100644 --- a/expo/views_logbooks.py +++ b/expo/views_logbooks.py @@ -5,6 +5,8 @@ from django.db import models from troggle.parsers.logbooks import LoadLogbookForExpedition
from troggle.parsers.people import GetPersonExpeditionNameLookup
from troggle.expo.forms import PersonForm
+from django.core.urlresolvers import reverse
+from django.http import HttpResponseRedirect
# Django uses Context, not RequestContext when you call render_to_response. We always want to use RequestContext, so that django adds the context from settings.TEMPLATE_CONTEXT_PROCESSORS. This way we automatically get necessary settings variables passed to each template. So we use a custom method, render_response instead of render_to_response. Hopefully future Django releases will make this unnecessary.
from troggle.alwaysUseRequestContext import render_response
@@ -52,8 +54,16 @@ def expedition(request, expeditionname): def get_absolute_url(self):
return ('expedition', (expedition.year))
-def person(request, first_name='', last_name=''):
+def person(request, first_name='', last_name='', ):
person = Person.objects.get(first_name = first_name, last_name = last_name)
+
+ #This is for removing the reference to the user's profile, in case they set it to the wrong person
+ if request.method == 'GET':
+ if request.GET.get('clear_profile')=='True':
+ person.user=None
+ person.save()
+ return HttpResponseRedirect(reverse('profiles_select_profile'))
+
return render_response(request,'person.html', {'person': person, })
def get_absolute_url(self):
@@ -74,11 +84,11 @@ def newQMlink(logbookentry): if logbookentry.cave:
for log in logbookentry.cave.logbookentry_set.all():
try:
- biggestQMnumberInLog = logbookentry.QMs_found.order_by('-number')[0].number
- except IndexError:
+ biggestQMnumberInLog = logbookentry.QMs_found.order_by('-number')[0].number
+ except IndexError:
biggestQMnumberInLog = 0
- if biggestQMnumberInLog > biggestQMnumber:
- biggestQMnumber = biggestQMnumberInLog
+ if biggestQMnumberInLog > biggestQMnumber:
+ biggestQMnumber = biggestQMnumberInLog
else:
return None
@@ -97,8 +107,8 @@ def logbookSearch(request, extra): found_entries = None
if ('q' in request.GET) and request.GET['q'].strip():
query_string = request.GET['q']
- entry_query = search.get_query(query_string, ['text','title',])
- found_entries = LogbookEntry.objects.filter(entry_query)
+ entry_query = search.get_query(query_string, ['text','title',])
+ found_entries = LogbookEntry.objects.filter(entry_query)
return render_response(request,'logbooksearch.html',
{ 'query_string': query_string, 'found_entries': found_entries, })
diff --git a/expo/views_other.py b/expo/views_other.py index f83c6e2..728119a 100644 --- a/expo/views_other.py +++ b/expo/views_other.py @@ -1,10 +1,9 @@ -from troggle.expo.models import Cave, Expedition, Person, LogbookEntry, PersonExpedition
+from troggle.expo.models import Cave, Expedition, Person, LogbookEntry, PersonExpedition, PersonTrip, Photo
import troggle.settings as settings
from django import forms
from django.db.models import Q
-from troggle.parsers.people import LoadPersonsExpos
+import databaseReset
import re
-from troggle.parsers.survex import LoadAllSurvexBlocks
import randSent
from django.http import HttpResponse
@@ -27,7 +26,7 @@ def frontpage(request): if "reloadexpos" in request.GET:
message = LoadPersonsExpos()
message = "Reloaded personexpos"
- if "reloadsurvex" in request.GET:
+ if "reloadsurvex" in request.POST:
message = LoadAllSurvexBlocks()
message = "Reloaded survexblocks"
@@ -39,7 +38,17 @@ def frontpage(request): def calendar(request,year):
week=['S','S','M','T','W','T','F']
if year:
- expedition=Expedition.objects.get(year=year)
- PersonExpeditions=expedition.personexpedition_set.all()
-
+ expedition=Expedition.objects.get(year=year)
+ PersonExpeditions=expedition.personexpedition_set.all()
+
return render_response(request,'calendar.html', locals())
+
+def controlPanel(request):
+ message = "no test message" #reverse('personn', kwargs={"name":"hkjhjh"})
+ if request.method=='POST':
+ for item in request.POST:
+ if request.user.is_superuser and item!='item':
+ print "running"+ " databaseReset."+item+"()"
+ exec "databaseReset."+item+"()"
+
+ return render_response(request,'controlPanel.html', )
\ No newline at end of file |