diff --git a/troggle/expo/models.py b/troggle/expo/models.py index a75e8ed93..e5eb87c29 100644 --- a/troggle/expo/models.py +++ b/troggle/expo/models.py @@ -1,4 +1,5 @@ import urllib +import string from django.forms import ModelForm from django.db import models from django.contrib import admin @@ -319,8 +320,9 @@ class ScannedImage(models.Model): #object_id = models.PositiveIntegerField() #location = generic.GenericForeignKey('content_type', 'object_id') + #This is an ugly hack to deal with the #s in our survey scan paths. The correct thing is to write a custom file storage backend which calls urlencode on the name for making file.url but not file.path. def correctURL(self): - return urllib.quote(self.file.url) + return string.replace(self.file.url,r'#',r'%23') def __str__(self): return get_scan_path(self,'') diff --git a/troggle/parsers/surveys.py b/troggle/parsers/surveys.py index ea661a628..22b1767d1 100644 --- a/troggle/parsers/surveys.py +++ b/troggle/parsers/surveys.py @@ -1,9 +1,9 @@ import sys import os import types -#sys.path.append('C:\\Expo\\expoweb') -#from troggle import * -#os.environ['DJANGO_SETTINGS_MODULE']='troggle.settings' +sys.path.append('C:\\Expo\\expoweb') +from troggle import * +os.environ['DJANGO_SETTINGS_MODULE']='troggle.settings' import troggle.settings as settings import troggle.expo.models as models @@ -74,7 +74,7 @@ def parseSurveyScans(year): survey=models.Survey.objects.filter(wallet_number=surveyNumber, expedition_year=year)[0] scanObj = models.ScannedImage( - file=os.path.join(yearPath, surveyFolder, scan), + file=os.path.join(year.year, surveyFolder, scan), contents=scanType, number_in_wallet=scanNumber, survey=survey diff --git a/troggle/templates/survey.html b/troggle/templates/survey.html index 00d296ecf..5d9a447de 100644 --- a/troggle/templates/survey.html +++ b/troggle/templates/survey.html @@ -3,9 +3,9 @@ Untitled Document - + + + + - - - +
-

Survey Stages for {{ current_survey }}

-
- + {% for survey in surveys %} + + {% endfor %} - -
- - - - + + +
+ + + +
-
-
-
- scanned notes thumbnails, date scanned, by who, etc -

- There are {{ notes|length }} notes. - {% for noteItem in notes %} -
- Item number: {{ noteItem.number_in_wallet }} - {{ noteItem.file.correctURL }} - - {% endfor %} -

-
- survex file editor, keeping file in original structure -
- who entered by -
-
- centreline -
-
- scanned sketch thumbnails, date scanned, by who - {% for noteItems in notes %} - {{ noteItem }} - {% endfor %} -
-
- link to tunnel xml file. potentially instance of tunnel applet... -
-
- link to main sketch file -
- -
-
- + + +
+
+
+ There are {{ notes|length }} notes files for {{ current_survey }}. + {% for noteItem in notes %} +
+

+ {{ noteItem.file.correctURL }} +

+ File at: + + {{ noteItem.file.name }} +
+ Scanned by: {{ noteItem.scanned_by }}
+ On: {{ noteItem.scanned_on }}
+

+
+ {% endfor %} +
+ + + Add a new scanned notes page. + (to be improved) + +
+
+ +
survex file editor, keeping file in original structure
+ who entered by
+
centreline
+
+ There are {{ planSketches|length }} plan sketch files for {{ current_survey }}. + + {% for sketchItem in planSketches %} +
+

+ {{ sketchItem.file.correctURL }} +

+ File at: + + {{ sketchItem.file.name }} +
+ Scanned by: {{ sketchItem.scanned_by }}
+ On: {{ sketchItem.scanned_on }}
+

+
+ {% endfor %} +
+ + + Add a new scanned notes page. + (to be improved) + +
+
+
link to tunnel xml file. potentially instance of tunnel applet...
+
link to main sketch file
+ +
+
+