expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-01-20 01:42:30 +00:00
Code Issues 18 Projects 3 Activity

get rid of photo

Browse Source
This commit is contained in:
expo 2009-08-29 18:08:55 +01:00
parent 69dd36bdb5
commit 65cebce198
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
parsers/people.py
View File

@ -11,14 +11,14 @@ def saveMugShot(mugShotPath, mugShotFilename, person):
else: else:
mugShotFilename=mugShotFilename # just in case one doesn't mugShotFilename=mugShotFilename # just in case one doesn't
dummyObj=models.Photo(file=mugShotFilename) dummyObj=models.DPhoto(file=mugShotFilename)
#Put a copy of the file in the right place. mugShotObj.file.path is determined by the django filesystemstorage specified in models.py #Put a copy of the file in the right place. mugShotObj.file.path is determined by the django filesystemstorage specified in models.py
if not os.path.exists(dummyObj.file.path): if not os.path.exists(dummyObj.file.path):
shutil.copy(mugShotPath, dummyObj.file.path) shutil.copy(mugShotPath, dummyObj.file.path)
mugShotObj, created = save_carefully( mugShotObj, created = save_carefully(
models.Photo, models.DPhoto,
lookupAttribs={'is_mugshot':True, 'file':mugShotFilename}, lookupAttribs={'is_mugshot':True, 'file':mugShotFilename},
nonLookupAttribs={'caption':"Mugshot for "+person.first_name+" "+person.last_name} nonLookupAttribs={'caption':"Mugshot for "+person.first_name+" "+person.last_name}
) )

8
parsers/surveys.py
View File

@ -25,11 +25,11 @@ def get_or_create_placeholder(year):
return placeholder_logbook_entry return placeholder_logbook_entry
def readSurveysFromCSV(): def readSurveysFromCSV():
try: try: # could probably combine these two
surveytab = open(os.path.join(settings.SURVEYS, "Surveys.csv")) surveytab = open(os.path.join(settings.SURVEY_SCANS, "Surveys.csv"))
except IOError: except IOError:
import cStringIO, urllib import cStringIO, urllib
surveytab = cStringIO.StringIO(urllib.urlopen(settings.SURVEYS + "download/Surveys.csv").read()) surveytab = cStringIO.StringIO(urllib.urlopen(settings.SURVEY_SCANS + "/Surveys.csv").read())
dialect=csv.Sniffer().sniff(surveytab.read()) dialect=csv.Sniffer().sniff(surveytab.read())
surveytab.seek(0,0) surveytab.seek(0,0)
surveyreader = csv.reader(surveytab,dialect=dialect) surveyreader = csv.reader(surveytab,dialect=dialect)
@ -87,7 +87,7 @@ def listdir(*directories):
# add survey scans # add survey scans
def parseSurveyScans(year, logfile=None): def parseSurveyScans(year, logfile=None):
# yearFileList = listdir(year.year) # yearFileList = listdir(year.year)
yearPath=os.path.join(settings.SURVEY_SCANS, year.year) yearPath=os.path.join(settings.SURVEY_SCANS, "years", year.year)
yearFileList=os.listdir(yearPath) yearFileList=os.listdir(yearPath)
print yearFileList print yearFileList
for surveyFolder in yearFileList: for surveyFolder in yearFileList:

4
templates/tasks.html
View File

@ -9,8 +9,8 @@
<h3>Add new data</h3> <h3>Add new data</h3>
<li><a href="{% url admin_core_photo_add %}">Upload a photo</a></li> <li><a href="">Upload a photo</a></li>
<li><a href="{% url admin_core_logbookentry_add %}">Record a new trip</a></li> <li><a href="">Record a new trip</a></li>
<h3>Your unfinished business</h3> <h3>Your unfinished business</h3>
{% for survey in surveys_unfinished %} {% for survey in surveys_unfinished %}

4
urls.py
View File

@ -70,6 +70,10 @@ urlpatterns = patterns('',
(r'^admin/doc/?', include('django.contrib.admindocs.urls')), (r'^admin/doc/?', include('django.contrib.admindocs.urls')),
url(r'^admin/(.*)', admin.site.root, name="admin"), url(r'^admin/(.*)', admin.site.root, name="admin"),
# don't know why this needs troggle/ in here. nice to get it out
url(r'^troggle/media-admin/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ADMIN_DIR, 'show_indexes':True}),
(r'^accounts/', include('registration.urls')), (r'^accounts/', include('registration.urls')),
(r'^profiles/', include('profiles.urls')), (r'^profiles/', include('profiles.urls')),