forked from expo/troggle
[svn] Beginnings of expo calendar
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8174 by aaron @ 1/18/2009 1:15 AM
This commit is contained in:
@@ -6,6 +6,7 @@ from django.contrib import admin
|
||||
from django.core.files.storage import FileSystemStorage
|
||||
import os
|
||||
import troggle.settings as settings
|
||||
import datetime
|
||||
from models_survex import *
|
||||
|
||||
class Expedition(models.Model):
|
||||
@@ -17,6 +18,14 @@ class Expedition(models.Model):
|
||||
def __unicode__(self):
|
||||
return self.year
|
||||
|
||||
def ListDays(self):
|
||||
dates=[]
|
||||
date=self.start_date
|
||||
while date <= self.end_date:
|
||||
dates.append(date)
|
||||
date+=datetime.timedelta(days=1)
|
||||
return dates
|
||||
|
||||
def GetPersonExpedition(self, name):
|
||||
person_expeditions = PersonExpedition.objects.filter(expedition=self)
|
||||
res = None
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
from django.shortcuts import render_to_response
|
||||
from troggle.expo.models import Cave, Expedition, Person, LogbookEntry
|
||||
from troggle.expo.models import Cave, Expedition, Person, LogbookEntry, PersonExpedition
|
||||
import troggle.settings as settings
|
||||
from django import forms
|
||||
from django.db.models import Q
|
||||
@@ -16,4 +16,15 @@ def stats(request):
|
||||
|
||||
def frontPage(request):
|
||||
|
||||
return render_to_response('index.html', {'randSent':randSent.randomLogbookSentence(),'settings':settings})
|
||||
return render_to_response('index.html', {'randSent':randSent.randomLogbookSentence(),'settings':settings})
|
||||
|
||||
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()
|
||||
|
||||
dictToPass=locals()
|
||||
dictToPass.update({'settings':settings})
|
||||
return render_to_response('calendar.html', dictToPass)
|
||||
|
||||
Reference in New Issue
Block a user