summaryrefslogtreecommitdiffstats
path: root/expo/models.py
Commit message (Collapse)AuthorAgeFilesLines
* [svn] Updates to allow subcave tree with nice admin.substantialnoninfringinguser2009-05-211-26/+31
|
* [svn]substantialnoninfringinguser2009-05-191-1/+1
|
* [svn] Add: new generic object list template object_list.html, and ↵substantialnoninfringinguser2009-05-151-3/+9
| | | | convenience filter named "link" for making links from objects, and make expeditions list page using those two. Also, fixed survey parsing in databaseReset.py
* [svn] Fixed broken buttons on controlpanel, added CAVETAB2.CSV export and ↵substantialnoninfringinguser2009-05-141-1/+2
| | | | | | download buttons and made them work too. Changed ordering on PersonExpeditions so that it is based on their expedition. That way, even if we don't have date info on when a user was on expo exactly, pages like personindex work correctly.
* [svn] Made the subcaves work! Now we just have to figure out how to parse ↵substantialnoninfringinguser2009-05-131-11/+11
| | | | | | them... Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8343 by cucc @ 5/11/2009 6:36 AM
* [svn]substantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8341 by cucc @ 5/11/2009 3:21 AM
* [svn] Dynamic thumbnail generation for photos and survey scans using ↵substantialnoninfringinguser2009-05-131-4/+23
| | | | | | imagekit, further improving registration system, other misc. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8336 by cucc @ 5/10/2009 11:05 PM
* [svn] Fixes to deal with reorganization of expo surveys repository. Now that ↵substantialnoninfringinguser2009-05-131-1/+1
| | | | | | | survey scans and Surveys.csv are in different directories, we have two settings variables, settings.SURVEYS for the root of the survey repo, and settings.SURVEY_SCANS for the surveyscans directory. Fixed tab / indent muck in surveys parser. Commented out some "file abstraction" stuff for the time being. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8335 by cucc @ 5/10/2009 7:26 AM
* [svn] Weeks of local changes.substantialnoninfringinguser2009-05-131-9/+25
| | | | | | | | | | | - Import is now non-destructive - Parsers write output to a log file (path be specified in settings) - databaseReset.py content been divided into separate functions which can be called for varying levels of deletion and importing - control panel (view, template, urlpattern) added for deleting and importing - Logins and signup fixed - CaveArea model updated, view, hierarchical url patterns, and beginning of template added - New site style Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8324 by cucc @ 5/3/2009 5:56 AM
* [svn] Added wikilink hints to logbook admin page. Also added some inlines in ↵substantialnoninfringinguser2009-05-131-8/+20
| | | | | | | admin Change get_absolute_url methods to use reverse() to decouple from urlconf. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8314 by aaron @ 3/30/2009 7:24 AM
* [svn] Mistake in get_absolute_url for LogbookEntrysubstantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8309 by aaron @ 3/16/2009 8:22 PM
* [svn] Logbook entries are now at /YYYY-MM-DD/slug .substantialnoninfringinguser2009-05-131-1/+3
| | | | | Try editing a logbook entry title in the admin now. The django built in auto slug field is fun and javascripty. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8308 by aaron @ 3/16/2009 7:27 PM
* [svn] Added QM wiki markup. The format is [[cave:204 QM:2005-04A]] with the ↵substantialnoninfringinguser2009-05-131-3/+3
| | | | | | | grade (A) being optional. The links color red if the QM does not exist, and in that case clicking on them goes to an admin add page with fields prepopulated. Various other little things, e.g. filled in the footer with links. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8305 by aaron @ 3/16/2009 8:53 AM
* [svn] Although I find the notability thing strange and a little offensive, I ↵substantialnoninfringinguser2009-05-131-22/+15
| | | | | | | didn't mean to break it. Fixed now. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8279 by aaron @ 3/14/2009 5:36 PM
* [svn] Reverted the reverts from 8267. Fixed the next / previous trip in ↵substantialnoninfringinguser2009-05-131-0/+12
| | | | | | | | personexpedition on the LogbookEntry template -- I had misunderstood what this was supposed to do last time I messed with it. This involved adding the methods PersonTrip.get_persons_next_trip and persons_previous_trip. Couldn't find any other broken things. Kept the productive changes in 8267: extending the logbook parsing back to 1993, changing index page, changes to view_surveys.py Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8274 by aaron @ 3/14/2009 8:38 AM
* [svn] fix my typosubstantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8271 by aaron @ 3/13/2009 5:35 PM
* [svn] Got QM pages working.substantialnoninfringinguser2009-05-131-2/+13
| | | | | Started scripts for exporting to old expo format. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8270 by aaron @ 3/12/2009 2:47 PM
* [svn] revert some of the changes (href element) so that the links worksubstantialnoninfringinguser2009-05-131-9/+18
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8267 by julian @ 3/11/2009 10:44 AM
* [svn] Further attempts to make troggle work on windows using surveys stored ↵substantialnoninfringinguser2009-05-131-1/+1
| | | | | | | | | | | on an external server settings.PHOTOS changed to setting.PHOTO_ROOT Made databaseReset.py get info from external server if appropriate (hope this did not break linus disk based scripts) Still needs more work, to get everything working Auto create photos directory if it does not already exist Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8262 by julian @ 3/2/2009 1:30 AM
* [svn] Added new abstract base class TroggleModel. Any fields or methods that ↵substantialnoninfringinguser2009-05-131-21/+25
| | | | | | | need to be added to multiple models should be added here. Added edit links to caves, people, logbook entries, and people. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8260 by aaron @ 2/26/2009 5:28 AM
* [svn] Fixing what I broke.substantialnoninfringinguser2009-05-131-1/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8256 by aaron @ 2/23/2009 1:05 PM
* [svn]substantialnoninfringinguser2009-05-131-13/+18
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8255 by aaron @ 2/23/2009 4:16 AM
* [svn] Enable profile setup forms.substantialnoninfringinguser2009-05-131-20/+20
| | | | | | | Profiles are Person model instances, and are linked to django's built in User model by a one to one foreign key. We are using the django-registration and django-profiles pluggables. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8247 by aaron @ 2/18/2009 9:35 PM
* [svn] Photo file handling and mugshots parsing sorted.substantialnoninfringinguser2009-05-131-2/+3
| | | | | Made URL settings more relative, less redundant. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8246 by aaron @ 2/18/2009 6:45 AM
* [svn]substantialnoninfringinguser2009-05-131-7/+25
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8245 by aaron @ 2/17/2009 1:09 AM
* [svn] My crusade to make our project more Djangoic.substantialnoninfringinguser2009-05-131-18/+42
| | | | | | | | | Got rid of the url tags in template, replaced them with get_absolute_url method calls where possible. Adding get_absolute_url in models enables direct link to the public model views in admin. The use of get_absolute_url, which is the correct Django way of doing things, eliminates any need for the redundant "href" fields we were using. Those fields now need to be deleted from the models and from the parsers. Made the context processor to pass settings to all templates actually work, although this was a little uglier than expected. I had to put in a new render_response to replace render_to_response. This is because Django uses Context, not RequestContext by default. I wish they would change this, it's annoying. Anyway, I deleted all the manual settings passing in the views. I also eliminated a couple of unnecessary methods and stuff like that. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8244 by aaron @ 2/16/2009 8:31 AM
* [svn] yorkshire work with tunnel integrationsubstantialnoninfringinguser2009-05-131-60/+62
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8232 by julian @ 1/29/2009 11:40 PM
* [svn] Add user registration and user profiles.substantialnoninfringinguser2009-05-131-1/+3
| | | | | | | | | Used modified versions of django-registration and django-profiles , both on bitbucket. The Person model is now set up as the profile for auth.User s. I set up a requestcontext so that settings is automatically passed to every template, no need to repeat ourselves in views. However, this needs to be refined: I will soon change it to only pass a subset of settings. E.G. we do not need to be passing the DB login and password! Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8231 by aaron @ 1/29/2009 11:02 PM
* [svn] cave maps to all logbook entry trips done theresubstantialnoninfringinguser2009-05-131-13/+22
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8228 by julian @ 1/24/2009 11:59 PM
* [svn] I initial work at adding caveareas. (Descirprion of parts of caves)substantialnoninfringinguser2009-05-131-0/+8
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8226 by julian @ 1/24/2009 6:49 PM
* [svn] made index of peoplesubstantialnoninfringinguser2009-05-131-0/+14
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8224 by julian @ 1/24/2009 6:26 PM
* [svn] merge the trip table to have surveys by datesubstantialnoninfringinguser2009-05-131-0/+28
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8221 by julian @ 1/24/2009 2:01 PM
* [svn] Fixed up calendar with estimated dates from logbook.substantialnoninfringinguser2009-05-131-8/+26
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8202 by aaron @ 1/19/2009 8:28 AM
* [svn] survey block objectsubstantialnoninfringinguser2009-05-131-0/+5
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8199 by julian @ 1/19/2009 12:22 AM
* [svn] MOre work on abstracting the file locations on scanned survey notessubstantialnoninfringinguser2009-05-131-0/+1
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8190 by julian @ 1/18/2009 9:04 PM
* [svn] new person expeditionsubstantialnoninfringinguser2009-05-131-7/+4
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8189 by julian @ 1/18/2009 7:50 PM
* [svn] Julian playing with the logbooks and expoyearssubstantialnoninfringinguser2009-05-131-9/+32
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8180 by julian @ 1/18/2009 3:59 PM
* [svn]substantialnoninfringinguser2009-05-131-6/+23
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8175 by aaron @ 1/18/2009 4:42 AM
* [svn] Beginnings of expo calendarsubstantialnoninfringinguser2009-05-131-0/+9
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8174 by aaron @ 1/18/2009 1:15 AM
* [svn] More work on survey images parser and virtual survey binder. Renamed ↵substantialnoninfringinguser2009-05-131-5/+13
| | | | | | expedition_year field of Survey model to expedition because this makes more sense. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8163 by aaron @ 1/16/2009 7:50 PM
* [svn] same mistakesubstantialnoninfringinguser2009-05-131-3/+0
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8158 by aaron @ 1/16/2009 2:21 AM
* [svn]substantialnoninfringinguser2009-05-131-5/+2
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8157 by aaron @ 1/16/2009 2:19 AM
* [svn] Added some actual funtionality to virtual survey binder.substantialnoninfringinguser2009-05-131-1/+3
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8155 by aaron @ 1/15/2009 11:21 PM
* [svn] Add beginnings of virtual survey binder: new Survey and ScannedImage ↵substantialnoninfringinguser2009-05-131-1/+55
| | | | | | models, survey parser. Still has lots of problems, but I need some help with the file upload aspect so am committing now. Biggest problem is trying to call save() on the images from the API. It needs arguments that I don't understand. Also, the # in our survey paths was causing trouble. I worked around this with a correctURL method which urlencodes the actual URL, but admin still tries to use a URL with a # in it. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8152 by aaron @ 1/15/2009 6:22 AM
* [svn] Added new photo model.substantialnoninfringinguser2009-05-131-1/+1
| | | | | | | Logbook parser now looks for mugshots when adding people. If it finds an image, it adds a new photo model instance linked to that person. If it finds an html page, it adds the body text of that page as the person's "blurb" and then adds the mugshot. My interface web design isn't working, sorry. Need a blank slate on that one. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8150 by aaron @ 1/4/2009 2:06 PM
* [svn] Fix plurals because they're starting to get on my nerves!substantialnoninfringinguser2009-05-131-1/+5
| | | | Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8095 by aaron @ 12/31/2008 5:07 PM
* [svn] QM parser now parses Hauchhoehle QMs.pysubstantialnoninfringinguser2009-05-131-6/+24
| | | | | | | | | Photo model added. Logbook parser now puts mugshots in as photo models, and descriptions from the old folk html pages in as "blurbs" on the person model. Experimented with eye candy and a random logbook quote generator. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8094 by aaron @ 12/31/2008 2:59 AM
* [svn] Added QM model and parser. Had to merge models_cave.py and ↵substantialnoninfringinguser2009-05-131-2/+275
| | | | | | | models_logbooks.py into models.py. This is because logbook entries now have an optional foreign key to caves, and QMs have a required foreign key to a logbook entry of the trip that created them. So, the two files became circularly dependent. Also, the urls for the person model now allow lookups using their actual first and last name in the url instead of the primary key. We should do similar things for all models, maybe even using the url as a search which results in a page with multiple model instance results if the input is ambiguous (e.g. they only enter a first name). Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8093 by aaron @ 12/13/2008 11:17 PM
* [svn] Initial troggle checkinsubstantialnoninfringinguser2009-05-131-0/+3
This is a development site using Django 1.0 Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8034 by julian @ 10/26/2008 9:04 PM
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-10 19:21:10 +0000