2 files changed, 28 insertions, 12 deletions
diff --git a/expo/models.py b/expo/models.py
index e58489c..4bbf421 100644
--- a/expo/models.py
+++ b/expo/models.py
@@ -303,8 +303,8 @@ class Photo(models.Model):
 
 scansFileStorage = FileSystemStorage(location=settings.SURVEYS, base_url=settings.SURVEYS_URL)
 def get_scan_path(instance, filename):
-    year=instance.survey.expedition_year.year
-    number="%02d" % instance.survey.wallet_number + instance.survey.wallet_letter #using %02d string formatting because convention was 2009#01
+    year=instance.survey.expedition.year
+    number="%02d" % instance.survey.wallet_number + str(instance.survey.wallet_letter) #using %02d string formatting because convention was 2009#01
     return os.path.join('./',year,year+r'#'+number,instance.contents+str(instance.number_in_wallet)+r'.jpg')
 
 class ScannedImage(models.Model): 
@@ -328,7 +328,7 @@ class ScannedImage(models.Model):
         return get_scan_path(self,'')
 
 class Survey(models.Model):
-    expedition_year = models.ForeignKey('Expedition')
+    expedition = models.ForeignKey('Expedition')
     wallet_number = models.IntegerField(blank=True,null=True)
     wallet_letter = models.CharField(max_length=1,blank=True,null=True)
     comments = models.TextField(blank=True,null=True)
@@ -344,5 +344,13 @@ class Survey(models.Model):
     integrated_into_main_sketch_by = models.ForeignKey('Person' ,related_name='integrated_into_main_sketch_by', blank=True,null=True)
     rendered_image = models.ImageField(upload_to='renderedSurveys',blank=True,null=True)
     def __str__(self):
-        return self.expedition_year.year+"#"+"%02d" % self.wallet_number
-	    
-\ No newline at end of file
+        return self.expedition.year+"#"+"%02d" % self.wallet_number
+
+    def notes(self):
+	    return self.scannedimage_set.filter(contents='notes')
+
+    def plans(self):
+	    return self.scannedimage_set.filter(contents='plan')
+
+    def elevations(self):
+	    return self.scannedimage_set.filter(contents='elevation')
+\ No newline at end of file
diff --git a/expo/views_caves.py b/expo/views_caves.py
index 8d0a4f4..045dbcf 100644
--- a/expo/views_caves.py
+++ b/expo/views_caves.py
@@ -1,5 +1,5 @@
 from django.shortcuts import render_to_response
-from troggle.expo.models import Cave, CaveAndEntrance, Survey
+from troggle.expo.models import Cave, CaveAndEntrance, Survey, Expedition
 import troggle.settings as settings
 from troggle.expo.forms import CaveForm
 import search
@@ -35,14 +35,22 @@ def caveSearch(request):
 
 def surveyindex(request):
     surveys=Survey.objects.all()
-    return render_to_response('survey.html',{'settings':settings,'surveys':surveys})
+    expeditions=Expedition.objects.all()
+    dictToPass=locals()
+    dictToPass.update({'settings':settings})
+    return render_to_response('survey.html',dictToPass)
 
-def survey(request,survey_id):
+def survey(request,year,wallet_number):
     surveys=Survey.objects.all()
-    current_survey=Survey.objects.get(pk=survey_id)
-    notes=current_survey.scannedimage_set.filter(contents='notes')
-    planSketches=current_survey.scannedimage_set.filter(contents='plan')
-    elevationSketches=current_survey.scannedimage_set.filter(contents='elevation')
+    expeditions=Expedition.objects.all()
+    current_expedition=Expedition.objects.filter(year=year)[0]
+    
+    if wallet_number!='':
+	    current_survey=Survey.objects.filter(expedition=current_expedition,wallet_number=wallet_number)[0]
+	    notes=current_survey.scannedimage_set.filter(contents='notes')
+	    planSketches=current_survey.scannedimage_set.filter(contents='plan')
+	    elevationSketches=current_survey.scannedimage_set.filter(contents='elevation')
+	    
     dictToPass=locals()
     dictToPass.update({'settings':settings})