diff options
Diffstat (limited to 'program')
| -rw-r--r-- | program/__init__.py | 0 | ||||
| -rw-r--r-- | program/admin.py | 82 | ||||
| -rw-r--r-- | program/fixtures/broadcastformats.yaml | 35 | ||||
| -rw-r--r-- | program/fixtures/hosts.yaml | 4 | ||||
| -rw-r--r-- | program/fixtures/musicfocus.yaml | 60 | ||||
| -rw-r--r-- | program/fixtures/rrules.yaml | 29 | ||||
| -rw-r--r-- | program/fixtures/showinformation.yaml | 48 | ||||
| -rw-r--r-- | program/fixtures/shows.yaml | 10 | ||||
| -rw-r--r-- | program/fixtures/showtopics.yaml | 30 | ||||
| -rw-r--r-- | program/management/__init__.py | 2 | ||||
| -rw-r--r-- | program/management/commands/__init__.py | 2 | ||||
| -rw-r--r-- | program/management/commands/importhosts.py | 34 | ||||
| -rw-r--r-- | program/management/commands/importnotes.py | 62 | ||||
| -rw-r--r-- | program/management/commands/importprogramslots.py | 96 | ||||
| -rw-r--r-- | program/management/commands/importshows.py | 67 | ||||
| -rw-r--r-- | program/models.py | 297 | ||||
| -rw-r--r-- | program/search_indexes.py | 23 | ||||
| -rw-r--r-- | program/tests.py | 0 | ||||
| -rw-r--r-- | program/urls.py | 20 | ||||
| -rw-r--r-- | program/views.py | 113 |
20 files changed, 0 insertions, 1014 deletions
diff --git a/program/__init__.py b/program/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/program/__init__.py +++ /dev/null diff --git a/program/admin.py b/program/admin.py deleted file mode 100644 index 6c64dd3..0000000 --- a/program/admin.py +++ /dev/null @@ -1,82 +0,0 @@ -from django.contrib import admin - -from datetime import datetime - -from models import BroadcastFormat, MusicFocus, ShowInformation, ShowTopic, Host, Note, ProgramSlot, Show, TimeSlot - -class BroadcastFormatAdmin(admin.ModelAdmin): - list_display = ('format',) - prepopulated_fields = {'slug': ('format',)} - -class MusicFocusAdmin(admin.ModelAdmin): - list_display = ('focus', 'abbrev') - prepopulated_fields = {'slug': ('focus',)} - -class ShowInformationAdmin(admin.ModelAdmin): - list_display = ('information', 'abbrev') - prepopulated_fields = {'slug': ('information',)} - -class ShowTopicAdmin(admin.ModelAdmin): - list_display = ('topic', 'abbrev') - prepopulated_fields = {'slug': ('topic',)} - -class NoteAdmin(admin.ModelAdmin): - date_hierarchy = 'start' - list_display = ('title', 'show', 'start', 'status') - list_filter = ('status',) - ordering = ('timeslot',) - - def queryset(self, request): - qs = super(NoteAdmin, self).queryset(request) - - if request.user.is_superuser: - return qs - else: - return qs.filter(owner=request.user) - - def formfield_for_foreignkey(self, db_field, request, **kwargs): - if db_field.name == 'timeslot': - if request.user.is_superuser: - kwargs['queryset'] = TimeSlot.objects.filter(start__gt=datetime.now) - else: - shows = request.user.shows.all() - kwargs['queryset'] = TimeSlot.objects.filter(show__in=shows, start__gt=datetime.now) - - return super(NoteAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs) - - def save_model(self, request, obj, form, change): - obj.owner = request.user - obj.save() - -class TimeSlotInline(admin.TabularInline): - model = TimeSlot - -class ProgramSlotAdmin(admin.ModelAdmin): - date_hierarchy = 'dstart' - inlines = (TimeSlotInline,) - list_display = ('show', 'byweekday', 'rrule', 'tstart', 'tend', 'dstart', 'until', 'timeslot_count') - list_filter = ('byweekday', 'rrule', 'is_repetition') - ordering = ('byweekday', 'dstart') - search_fields = ('show__name',) - -class ProgramSlotInline(admin.TabularInline): - model = ProgramSlot - -class ShowAdmin(admin.ModelAdmin): - filter_horizontal = ('hosts', 'owners', 'musicfocus', 'showinformation', 'showtopic') - inlines = (ProgramSlotInline,) - list_display = ('name', 'short_description', 'broadcastformat', 'has_active_programslots') - list_filter = ('broadcastformat', 'showinformation', 'showtopic', 'musicfocus',) - ordering = ('slug',) - prepopulated_fields = {'slug': ('name',)} - search_fields = ('name', 'short_description', 'description') - -admin.site.register(BroadcastFormat, BroadcastFormatAdmin) -admin.site.register(MusicFocus, MusicFocusAdmin) -admin.site.register(ShowInformation, ShowInformationAdmin) -admin.site.register(ShowTopic, ShowTopicAdmin) -admin.site.register(Note, NoteAdmin) -admin.site.register(ProgramSlot, ProgramSlotAdmin) -admin.site.register(Show, ShowAdmin) - -admin.site.register(Host)
\ No newline at end of file diff --git a/program/fixtures/broadcastformats.yaml b/program/fixtures/broadcastformats.yaml deleted file mode 100644 index 84fa335..0000000 --- a/program/fixtures/broadcastformats.yaml +++ /dev/null @@ -1,35 +0,0 @@ -- model: program.broadcastformat - pk: 1 - fields: - format: Talk - slug: talk -- model: program.broadcastformat - pk: 2 - fields: - format: Musiksendung - slug: musiksendung -- model: program.broadcastformat - pk: 3 - fields: - format: Unmoderiertes Musikprogramm - slug: unmoderiertes-musikprogramm -- model: program.broadcastformat - pk: 4 - fields: - format: Feature/Magazin - slug: feature-magazin -- model: program.broadcastformat - pk: 5 - fields: - format: Experimentell - slug: experimentell -- model: program.broadcastformat - pk: 6 - fields: - format: Hörspiel/Literatur - slug: horspiel-literatur -- model: program.broadcastformat - pk: 7 - fields: - format: Vortrag/Diskussion - slug: vortrag-diskussion
\ No newline at end of file diff --git a/program/fixtures/hosts.yaml b/program/fixtures/hosts.yaml deleted file mode 100644 index 4cccf3a..0000000 --- a/program/fixtures/hosts.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- model: program.host - pk: 1 - fields: - name: Musikredaktion diff --git a/program/fixtures/musicfocus.yaml b/program/fixtures/musicfocus.yaml deleted file mode 100644 index 90de149..0000000 --- a/program/fixtures/musicfocus.yaml +++ /dev/null @@ -1,60 +0,0 @@ -- model: program.musicfocus - pk: 1 - fields: - focus: Jazz - abbrev: J - slug: jazz -- model: program.musicfocus - pk: 2 - fields: - focus: Volksmusik/Folk - abbrev: V - slug: volksmusik-folk -- model: program.musicfocus - pk: 3 - fields: - focus: Experimentelle Musik - abbrev: Ex - slug: expermentelle-musik -- model: program.musicfocus - pk: 4 - fields: - focus: Rock/Indie - abbrev: R - slug: rock-indie -- model: program.musicfocus - pk: 5 - fields: - focus: Metal/Hardrock - abbrev: M - slug: metal-hardrock -- model: program.musicfocus - pk: 6 - fields: - focus: Electronic - abbrev: E - slug: electronic -- model: program.musicfocus - pk: 7 - fields: - focus: Klassik - abbrev: K - slug: klassik -- model: program.musicfocus - pk: 8 - fields: - focus: Oldies - abbrev: O - slug: oldies -- model: program.musicfocus - pk: 9 - fields: - focus: Reggae/Ska - abbrev: Re - slug: reggae-ska -- model: program.musicfocus - pk: 10 - fields: - focus: Hiphop - abbrev: H - slug: hiphop
\ No newline at end of file diff --git a/program/fixtures/rrules.yaml b/program/fixtures/rrules.yaml deleted file mode 100644 index 4095e07..0000000 --- a/program/fixtures/rrules.yaml +++ /dev/null @@ -1,29 +0,0 @@ -- model: program.rrule - pk: 1 - fields: - name: einmalig - freq: 0 - count: 1 -- model: program.rrule - pk: 2 - fields: - name: täglich - freq: 3 -- model: program.rrule - pk: 3 - fields: - name: wöchentlich - freq: 2 - interval: 1 -- model: program.rrule - pk: 4 - fields: - name: zweiwöchentlich - freq: 2 - interval: 2 -- model: program.rrule - pk: 5 - fields: - name: vierwöchentlich - freq: 2 - interval: 4
\ No newline at end of file diff --git a/program/fixtures/showinformation.yaml b/program/fixtures/showinformation.yaml deleted file mode 100644 index cbde529..0000000 --- a/program/fixtures/showinformation.yaml +++ /dev/null @@ -1,48 +0,0 @@ -- model: program.showinformation - pk: 1 - fields: - information: Interkulturell - abbrev: I - slug: interkulturell -- model: program.showinformation - pk: 2 - fields: - information: Lokalbezug - abbrev: L - slug: lokalbezug -- model: program.showinformation - pk: 3 - fields: - information: Minderheiten - abbrev: Mi - slug: minderheiten -- model: program.showinformation - pk: 4 - fields: - information: Wiederholung - abbrev: W - slug: wiederholung -- model: program.showinformation - pk: 5 - fields: - information: Mehr-/Fremdsprachig - abbrev: M - slug: mehr-fremdsprachig -- model: program.showinformation - pk: 6 - fields: - information: Frauenschwerpunkt - abbrev: F - slug: frauenschwerpunkt -- model: program.showinformation - pk: 7 - fields: - information: Österreichische Musik - abbrev: Ö - slug: osterreichische-musik -- model: program.showinformation - pk: 8 - fields: - information: Sendungsübernahme - abbrev: U - slug: sendungsubernahme
\ No newline at end of file diff --git a/program/fixtures/shows.yaml b/program/fixtures/shows.yaml deleted file mode 100644 index f520b26..0000000 --- a/program/fixtures/shows.yaml +++ /dev/null @@ -1,10 +0,0 @@ -- model: program.show - pk: 1 - fields: - hosts: [1] - broadcastformat: 3 - name: Musikprogramm - slug: musikprogramm - description: Unmoderiertes Musikprogramm - short_description: Unmoderiertes Musikprogramm - email: musikredaktion@helsinki.at diff --git a/program/fixtures/showtopics.yaml b/program/fixtures/showtopics.yaml deleted file mode 100644 index 8f12508..0000000 --- a/program/fixtures/showtopics.yaml +++ /dev/null @@ -1,30 +0,0 @@ -- model: program.showtopic - pk: 1 - fields: - topic: Politik/Gesellschaft - abbrev: P - slug: politik-gesellschaft -- model: program.showtopic - pk: 2 - fields: - topic: Natur/Klima/Tiere - abbrev: N - slug: natur-klima-tiere -- model: program.showtopic - pk: 3 - fields: - topic: Kultur/Kunst - abbrev: K - slug: kultur-kunst -- model: program.showtopic - pk: 4 - fields: - topic: Soziales - abbrev: S - slug: soziales -- model: program.showtopic - pk: 5 - fields: - topic: Wissenschaft/Philosophie - abbrev: W - slug: wissenschaft-philosophie
\ No newline at end of file diff --git a/program/management/__init__.py b/program/management/__init__.py deleted file mode 100644 index 3aa4ca5..0000000 --- a/program/management/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -__author__ = 'ers' -
\ No newline at end of file diff --git a/program/management/commands/__init__.py b/program/management/commands/__init__.py deleted file mode 100644 index 3aa4ca5..0000000 --- a/program/management/commands/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -__author__ = 'ers' -
\ No newline at end of file diff --git a/program/management/commands/importhosts.py b/program/management/commands/importhosts.py deleted file mode 100644 index 39a8afd..0000000 --- a/program/management/commands/importhosts.py +++ /dev/null @@ -1,34 +0,0 @@ -from django.core.management.base import NoArgsCommand - -import MySQLdb - -from helsinki.program.models import Host - -USER = 'helsinki' -PASSWD = 'helsinki' -DB = 'helsinki' - -class Command(NoArgsCommand): - help = 'Import hosts from current program' - - def handle_noargs(self, **options): - connection = MySQLdb.connect(user=USER, passwd=PASSWD, db=DB) - cursor = connection.cursor() - - cursor.execute("""SELECT DISTINCT macher -FROM sendungen -WHERE letzter_termin > current_date AND macher != '' AND titel NOT LIKE 'Musikprogramm'""") - - counter = 0 - - for row in cursor.fetchall(): - for macher in row[0].split(','): - host = Host(name=macher.strip()) - host.save() - - counter += 1 - - cursor.close() - connection.close() - - print '%i hosts imported' % counter diff --git a/program/management/commands/importnotes.py b/program/management/commands/importnotes.py deleted file mode 100644 index 19ddfed..0000000 --- a/program/management/commands/importnotes.py +++ /dev/null @@ -1,62 +0,0 @@ -from django.contrib.auth.models import User -from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned -from django.core.management.base import NoArgsCommand -from django.utils.html import clean_html, strip_tags - -import MySQLdb - -from helsinki.program.models import Note, Show, TimeSlot - -USER = 'helsinki' -PASSWD = 'helsinki' -DB = 'helsinki' - -OWNER = User.objects.get(pk=1) - -class Command(NoArgsCommand): - help = 'Import notes from current program' - - def handle_noargs(self, **options): - connection = MySQLdb.connect(user=USER, passwd=PASSWD, db=DB) - cursor = connection.cursor() - - cursor.execute("""SELECT n.titel, n.datum, s.titel, n.notiz -FROM notizen AS n JOIN sendungen AS s ON n.sendung_id=s.id -WHERE n.sendung_id in (SELECT id FROM sendungen WHERE letzter_termin > current_date) AND n.titel != ''""") - - counter = 0 - for ntitel, datum, stitel, notiz in cursor.fetchall(): - ntitel = strip_tags(ntitel) - stitel = strip_tags(stitel) - notiz = clean_html(notiz) - - if stitel.endswith('(Wiederholung)'): - stitel = stitel[:-15] - - if datum: - year, month, day = datum.year, datum.month, datum.day - try: - show = Show.objects.get(name=stitel) - - try: - timeslot = TimeSlot.objects.get(programslot__show=show, start__year=year, start__month=month, start__day=day) - except ObjectDoesNotExist: - print 'no timeslot found for sendung "%s" and datum "%s"' % (stitel, datum) - except MultipleObjectsReturned: - print 'multiple timeslots found for sendung "%s" and datum "%s"' % (stitel, datum) - else: - note = Note(timeslot=timeslot, owner=OWNER, title=ntitel, content=notiz) - - try: - note.save() - except: - print 'could not save note "%s" for show "%s" and datum "%s"' % (ntitel, stitel, datum) - else: - counter += 1 - except ObjectDoesNotExist: - print 'show with name "%s" not found' % stitel - - cursor.close() - connection.close() - - print '%i notes imported' % counter diff --git a/program/management/commands/importprogramslots.py b/program/management/commands/importprogramslots.py deleted file mode 100644 index 52aa73a..0000000 --- a/program/management/commands/importprogramslots.py +++ /dev/null @@ -1,96 +0,0 @@ -from django.core.exceptions import ObjectDoesNotExist -from django.core.management.base import NoArgsCommand -from django.utils.html import strip_tags - -from datetime import time -import MySQLdb - -from helsinki.program.models import Show, ProgramSlot, RRule - -USER = 'helsinki' -PASSWD = 'helsinki' -DB = 'helsinki' - -RRULES = { - 0: RRule.objects.get(pk=1), - 7: RRule.objects.get(pk=3), - 14: RRule.objects.get(pk=4), - 28: RRule.objects.get(pk=5) -} - -class Command(NoArgsCommand): - help = 'Import programslots from the current program' - - def handle_noargs(self, **options): - connection = MySQLdb.connect(user=USER, passwd=PASSWD, db=DB) - cursor = connection.cursor() - - cursor.execute("""SELECT titel, beginn, ende, erster_termin, letzter_termin, rhytmus, termin -FROM sendungen -WHERE letzter_termin > current_date AND titel NOT LIKE 'Musikprogramm' AND titel NOT LIKE '%%(Wiederholung)'""") - - counter = 0 - - for titel, beginn, ende, erster_termin, letzter_termin, rhytmus, termin in cursor.fetchall(): - titel = strip_tags(titel) - - hours, seconds = divmod(beginn.seconds, 3600) - minutes, seconds = divmod(seconds, 60) - tstart = time(hour=hours, minute=minutes, second=seconds) - - hours, seconds = divmod(ende.seconds, 3600) - minutes, seconds = divmod(seconds, 60) - tend = time(hour=hours, minute=minutes, second=seconds) - - try: - rrule = RRULES[rhytmus] - try: - show = Show.objects.get(name=titel) - except ObjectDoesNotExist: - print 'show with name "%s" not found' % titel - else: - programslot = ProgramSlot(rrule=rrule, byweekday=termin, show=show, dstart=erster_termin, tstart=tstart, - tend=tend, until=letzter_termin) - try: - programslot.save() - counter += 1 - except: - pass - except KeyError: - print 'rhythmus "%i" is not supported for sendung "%s"' % (rhytmus, titel) - - cursor.execute("""SELECT titel, beginn, ende, erster_termin, letzter_termin, rhytmus, termin -FROM sendungen -WHERE letzter_termin > current_date AND titel LIKE '%%(Wiederholung)'""") - - for titel, beginn, ende, erster_termin, letzter_termin, rhytmus, termin in cursor.fetchall(): - titel = strip_tags(titel[:-15]) - - hours, seconds = divmod(beginn.seconds, 3600) - minutes, seconds = divmod(seconds, 60) - tstart = time(hour=hours, minute=minutes, second=seconds) - - hours, seconds = divmod(ende.seconds, 3600) - minutes, seconds = divmod(seconds, 60) - tend = time(hour=hours, minute=minutes, second=seconds) - - try: - rrule = RRULES[rhytmus] - try: - show = Show.objects.get(name=titel) - except ObjectDoesNotExist: - print 'show with name "%s" not found' % titel - else: - programslot = ProgramSlot(rrule=rrule, byweekday=termin, show=show, dstart=erster_termin, tstart=tstart, tend=tend, until=letzter_termin, is_repetition=True) - try: - programslot.save() - counter += 1 - except: - pass - except KeyError: - print 'rhythmus "%i" is not supported for sendung "%s"' % (rhytmus, titel) - - cursor.close() - connection.close() - - print '%i programslots imported' % counter diff --git a/program/management/commands/importshows.py b/program/management/commands/importshows.py deleted file mode 100644 index b013dab..0000000 --- a/program/management/commands/importshows.py +++ /dev/null @@ -1,67 +0,0 @@ -from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned -from django.core.management.base import NoArgsCommand -from django.template.defaultfilters import slugify -from django.utils.html import clean_html, strip_tags - -import MySQLdb - -from helsinki.program.models import BroadcastFormat, Host, Show - -USER = 'helsinki' -PASSWD = 'helsinki' -DB = 'helsinki' - -TALK = BroadcastFormat.objects.get(pk=1) - -class Command(NoArgsCommand): - help = 'Import shows from the current program' - - def handle_noargs(self, **options): - connection = MySQLdb.connect(user=USER, passwd=PASSWD, db=DB) - cursor = connection.cursor() - - cursor.execute("""SELECT titel, beschreibung, web, macher -FROM sendungen -WHERE letzter_termin > current_date AND titel NOT LIKE 'Musikprogramm' AND titel NOT LIKE '%%(Wiederholung)' -ORDER BY titel, beginn, ende""") - - counter = 0 - - for titel, beschreibung, web, macher in cursor.fetchall(): - titel = strip_tags(titel) - beschreibung = clean_html(beschreibung) - - slug = slugify(titel) - - hosts = [] - - for macher in macher.split(','): - macher = macher.strip() - try: - host = Host.objects.get(name=macher) - except MultipleObjectsReturned: - print 'multiple hosts with name "%s" found' % macher - except ObjectDoesNotExist: - print 'host with name "%s" not found' % macher - else: - hosts.append(host) - - try: - show = Show.objects.get(name=titel) - print 'sendung "%s" already imported as show "%s"' % (titel, show) - except ObjectDoesNotExist: - show = Show(broadcastformat=TALK, name=titel, slug=slug, short_description='FIXME', description=beschreibung) - try: - show.save() - counter += 1 - except: - print 'sendung "%s" could not be imported' % titel - else: - for h in hosts: - show.hosts.add(h) - show.save() - - cursor.close() - connection.close() - - print '%i shows imported' % counter diff --git a/program/models.py b/program/models.py deleted file mode 100644 index 5f0f835..0000000 --- a/program/models.py +++ /dev/null @@ -1,297 +0,0 @@ -from django.contrib.auth.models import User -from django.core.exceptions import ObjectDoesNotExist -from django.db import models -from django.utils.translation import ugettext_lazy as _ - -from datetime import date, datetime -from dateutil.relativedelta import relativedelta -from dateutil.rrule import rrule - -class BroadcastFormat(models.Model): - format = models.CharField(_("Format"), max_length=32) - slug = models.SlugField(_("Slug"), max_length=32, unique=True) - - class Meta: - ordering = ('format',) - verbose_name = _("Broadcast format") - verbose_name_plural = _("Broadcast formats") - - def __unicode__(self): - return u'%s' % self.format - -class ShowInformation(models.Model): - information = models.CharField(_("Information"), max_length=32) - abbrev = models.CharField(_("Abbreviation"), max_length=4, unique=True) - slug = models.SlugField(_("Slug"), max_length=32, unique=True) - - class Meta: - ordering = ('information',) - verbose_name = _("Show information") - verbose_name_plural = _("Show information") - - def __unicode__(self): - return u'%s' % self.information - -class ShowTopic(models.Model): - topic = models.CharField(_("Show topic"), max_length=32) - abbrev = models.CharField(_("Abbreviation"), max_length=4, unique=True) - slug = models.SlugField(_("Slug"), max_length=32, unique=True) - - class Meta: - ordering = ('topic',) - verbose_name = _("Show topic") - verbose_name_plural = _("Show topics") - - def __unicode__(self): - return u'%s' % self.topic - -class MusicFocus(models.Model): - focus = models.CharField(_("Focus"), max_length=32) - abbrev = models.CharField(_("Abbreviation"), max_length=4, unique=True) - slug = models.SlugField(_("Slug"), max_length=32, unique=True) - - class Meta: - ordering = ('focus',) - verbose_name = _("Music focus") - verbose_name_plural = _("Music focus") - - def __unicode__(self): - return u'%s' % self.focus - -class Host(models.Model): - name = models.CharField(_("Name"), max_length=128) - email = models.EmailField(_("E-Mail"), blank=True) - website = models.URLField(_("Website"), blank=True) - - class Meta: - ordering = ('name',) - verbose_name = _("Host") - verbose_name_plural = _("Hosts") - - def __unicode__(self): - return u'%s' % self.name - - @models.permalink - def get_absolute_url(self): - return ('host-detail', [str(self.id)]) - -class Show(models.Model): - predecessor = models.ForeignKey('self', blank=True, null=True, related_name='successors', verbose_name=_("Predecessor")) - hosts = models.ManyToManyField(Host, blank=True, null=True, related_name='shows', verbose_name=_("Hosts")) - owners = models.ManyToManyField(User, blank=True, null=True, related_name='shows', verbose_name=_("Owners")) - broadcastformat = models.ForeignKey(BroadcastFormat, related_name='shows', verbose_name=_("Broadcast format")) - showinformation = models.ManyToManyField(ShowInformation, blank=True, null=True, related_name='shows', verbose_name=_("Show information")) - showtopic = models.ManyToManyField(ShowTopic, blank=True, null=True, related_name='shows', verbose_name=_("Show topic")) - musicfocus = models.ManyToManyField(MusicFocus, blank=True, null=True, related_name='shows', verbose_name=_("Music focus")) - name = models.CharField(_("Name"), max_length=256) - slug = models.CharField(_("Slug"), max_length=255, unique=True) - image = models.ImageField(_("Image"), blank=True, null=True, upload_to='show_images') - short_description = models.CharField(_("Short description"), max_length=64) - description = models.TextField(_("Description")) - email = models.EmailField(_("E-Mail"), blank=True, null=True) - website = models.URLField(_("Website"), blank=True, null=True) - cba_series_id = models.IntegerField(_("CBA series ID"), blank=True, null=True) - created = models.DateTimeField(auto_now_add=True, editable=False) - last_updated = models.DateTimeField(auto_now=True, editable=False) - - class Meta: - ordering = ('slug',) - verbose_name = _("Show") - verbose_name_plural = _("Shows") - - def __unicode__(self): - return u'%s' % self.name - - @models.permalink - def get_absolute_url(self): - return ('show-detail', [self.slug]) - - def has_active_programslots(self): - return self.programslots.filter(until__gt=date.today()).count() > 0 - has_active_programslots.boolean = True - has_active_programslots.short_description = _("Has active program slots") - -class RRule(models.Model): - FREQ_CHOICES = ( - (1, _("Monthly")), - (2, _("Weekly")), - (3, _("Daily")), - ) - BYSETPOS_CHOICES = ( - (1, _("First")), - (2, _("Second")), - (3, _("Third")), - (4, _("Fourth")), - (5, _("Fifth")), - (-1, _("Last")), - ) - name = models.CharField(_("Name"), max_length=32, unique=True) - freq = models.IntegerField(_("Frequency"), choices=FREQ_CHOICES) - interval = models.IntegerField(_("Interval"), default=1) - bysetpos = models.IntegerField(_("Set position"), blank=True, choices=BYSETPOS_CHOICES, null=True) - count = models.IntegerField(_("Count"), blank=True, null=True) - - class Meta: - ordering = ('-freq', 'interval', 'bysetpos') - verbose_name = _("Recurrence rule") - verbose_name_plural = _("Recurrence rules") - - def __unicode__(self): - return u'%s' % self.name - -class ProgramSlot(models.Model): - BYWEEKDAY_CHOICES = ( - (0, _("Monday")), - (1, _("Tuesday")), - (2, _("Wednesday")), - (3, _("Thursday")), - (4, _("Friday")), - (5, _("Saturday")), - (6, _("Sunday")), - ) - rrule = models.ForeignKey(RRule, related_name='programslots', verbose_name=_("Recurrence rule")) - byweekday = models.IntegerField(_("Weekday"), choices=BYWEEKDAY_CHOICES) - show = models.ForeignKey(Show, related_name='programslots', verbose_name=_("Show")) - dstart = models.DateField(_("First date")) - tstart = models.TimeField(_("Start time")) - tend = models.TimeField(_("End time")) - until = models.DateField(_("Last date")) - is_repetition = models.BooleanField(_("Is repetition"), default=False) - created = models.DateTimeField(auto_now_add=True, editable=False) - last_updated = models.DateTimeField(auto_now=True, editable=False) - - class Meta: - ordering = ('dstart', 'tstart') - unique_together = ('rrule', 'byweekday', 'dstart', 'tstart') - verbose_name = _("Program slot") - verbose_name_plural = _("Program slots") - - def __unicode__(self): - weekday = self.BYWEEKDAY_CHOICES[self.byweekday][1] - tend = self.tend.strftime('%H:%M') - dstart = self.dstart.strftime('%d. %b %Y') - tstart = self.tstart.strftime('%H:%M') - - if self.rrule.freq == 0: - return u'%s, %s - %s' % (dstart, tstart, tend) - if self.rrule.freq == 3: - return u'%s, %s - %s' % (self.rrule, tstart, tend) - else: - return u'%s, %s, %s - %s' % (weekday, self.rrule, tstart, tend) - - def save(self, *args, **kwargs): - if not self.pk: - super(ProgramSlot, self).save(*args, **kwargs) - - if self.rrule.freq == 0: - byweekday_start = None - byweekday_end = None - elif self.rrule.freq == 3: - byweekday_start = (0, 1, 2, 3, 4, 5, 6) - byweekday_end = (0, 1, 2, 3, 4, 5, 6) - else: - byweekday_start = self.byweekday - - if self.tend < self.tstart: - byweekday_end = self.byweekday + 1 if self.byweekday < 6 else 0 - else: - byweekday_end = self.byweekday - - starts = list(rrule(freq=self.rrule.freq, - dtstart=datetime.combine(self.dstart, self.tstart), - interval=self.rrule.interval, - until=self.until+relativedelta(days=+1), - bysetpos=self.rrule.bysetpos, - byweekday=byweekday_start)) - ends = list(rrule(freq=self.rrule.freq, - dtstart=datetime.combine(self.dstart, self.tend), - interval=self.rrule.interval, - until=self.until+relativedelta(days=+1), - bysetpos=self.rrule.bysetpos, - byweekday=byweekday_end)) - - for k in range(len(starts)): - timeslot = TimeSlot(programslot=self, start=starts[k], end=ends[k]) - timeslot.save() - - def timeslot_count(self): - return self.timeslots.count() - timeslot_count.description = _("Time slot count") - -class TimeSlotManager(models.Manager): - def get_or_create_current(self): - try: - return TimeSlot.objects.get(start__lte=datetime.now(), end__gt=datetime.now()) - except ObjectDoesNotExist: - once = RRule.objects.get(pk=1) - today = date.today().weekday() - default = Show.objects.get(pk=1) - - previous = TimeSlot.objects.filter(end__lte=datetime.now()).order_by('-start')[0] - next = TimeSlot.objects.filter(start__gte=datetime.now())[0] - - dstart, tstart = previous.end.date(), previous.end.time() - until, tend = next.start.date(), next.start.time() - - new_programslot = ProgramSlot(rrule=once, byweekday=today, show=default, dstart=dstart, tstart=tstart, tend=tend, until=until) - new_programslot.save() - - return new_programslot.timeslots.all()[0] - -class TimeSlot(models.Model): - programslot = models.ForeignKey(ProgramSlot, related_name='timeslots', verbose_name=_("Program slot")) - start = models.DateTimeField(_("Start time"), unique=True) - end = models.DateTimeField(_("End time")) - show = models.ForeignKey(Show, editable=False) - - objects = TimeSlotManager() - - class Meta: - ordering = ('start', 'end') - verbose_name = _("Time slot") - verbose_name_plural = _("Time slots") - - def __unicode__(self): - start = self.start.strftime('%d. %b %Y %H:%M') - end = self.end.strftime('%H:%M') - - return u'%s: %s - %s' % (self.show, start, end) - - def save(self, *args, **kwargs): - self.show = self.programslot.show - super(TimeSlot, self).save(*args, **kwargs) - - @models.permalink - def get_absolute_url(self): - return ('timeslot-detail', [self.id]) - -class Note(models.Model): - STATUS_CHOICES = ( - (0, _("Cancellation")), - (1, _("Recommendation")), - (2, _("Repetition")), - ) - timeslot = models.OneToOneField(TimeSlot, verbose_name=_("Time slot")) - owner = models.ForeignKey(User, related_name='notes', verbose_name=_("Owner")) - title = models.CharField(_("Title"), max_length=128) - content = models.TextField(_("Content")) - status = models.IntegerField(_("Status"), choices=STATUS_CHOICES, default=1) - cba_entry_id = models.IntegerField(_("CBA entry ID"), blank=True, null=True) - start = models.DateTimeField(editable=False) - show = models.ForeignKey(Show, editable=False) - created = models.DateTimeField(auto_now_add=True, editable=False) - last_updated = models.DateTimeField(auto_now=True, editable=False) - - class Meta: - ordering = ('timeslot',) - verbose_name = _("Note") - verbose_name_plural = _("Notes") - - def __unicode__(self): - return u'%s - %s' % (self.title, self.timeslot) - - def save(self, *args, **kwargs): - self.start = self.timeslot.start - self.show = self.timeslot.programslot.show - - super(Note, self).save(*args, **kwargs) diff --git a/program/search_indexes.py b/program/search_indexes.py deleted file mode 100644 index 8c21e14..0000000 --- a/program/search_indexes.py +++ /dev/null @@ -1,23 +0,0 @@ -from haystack.indexes import CharField, DateTimeField, SearchIndex -from haystack import site - -from datetime import datetime - -from program.models import Note, Show - -class NoteIndex(SearchIndex): - text = CharField(document=True, use_template=True) - last_updated = DateTimeField(model_attr='last_updated') - - def get_queryset(self): - return Note.objects.filter(last_updated__lte=datetime.now()) - -class ShowIndex(SearchIndex): - text = CharField(document=True, use_template=True) - last_updated = DateTimeField(model_attr='last_updated') - - def get_queryset(self): - return Show.objects.filter(last_updated__lte=datetime.now()) - -site.register(Note, NoteIndex) -site.register(Show, ShowIndex)
\ No newline at end of file diff --git a/program/tests.py b/program/tests.py deleted file mode 100644 index e69de29..0000000 --- a/program/tests.py +++ /dev/null diff --git a/program/urls.py b/program/urls.py deleted file mode 100644 index bf798ec..0000000 --- a/program/urls.py +++ /dev/null @@ -1,20 +0,0 @@ -from django.conf.urls.defaults import * - -from django.views.generic.list_detail import object_detail, object_list - -from models import Host, Show, TimeSlot -from views import current_show, day_schedule, recommendations, show_list, today_schedule, week_schedule - -urlpatterns = patterns('', - ('^$', today_schedule), - ('^(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/$', day_schedule), - ('^(?P<year>\d{4})/(?P<week>\d{1,2})/$', week_schedule), - ('^current_box/$', current_show), - ('^hosts/$', object_list, dict(template_object_name='host', queryset=Host.objects.all())), - url('^host/(?P<object_id>\d+)/$', object_detail, dict(template_object_name='host', queryset=Host.objects.all()), name='host-detail'), - ('^recommendations/$', recommendations), - ('^recommendations_box/$', recommendations, dict(template_name='program/recommendations_box.html')), - ('^shows/$', show_list), - url('^show/(?P<slug>[\w-]+)/$', object_detail, dict(template_object_name='show', queryset=Show.objects.all()), name='show-detail'), - url('^(?P<object_id>\d+)/$', object_detail, dict(template_object_name='timeslot', queryset=TimeSlot.objects.all()), name='timeslot-detail'), -) diff --git a/program/views.py b/program/views.py deleted file mode 100644 index b5f02b6..0000000 --- a/program/views.py +++ /dev/null @@ -1,113 +0,0 @@ -from django.views.generic import list_detail -from django.views.generic import simple -from django.shortcuts import get_object_or_404 - -from models import BroadcastFormat, MusicFocus, Note, Show, ShowInformation, ShowTopic, TimeSlot - -from datetime import date, datetime, time, timedelta - -def show_list(request): - broadcastformats = BroadcastFormat.objects.all() - musicfoci = MusicFocus.objects.all() - showinformation = ShowInformation.objects.all() - showtopics = ShowTopic.objects.all() - - extra_context = dict(broadcastformats=broadcastformats, musicfoci=musicfoci, showinformation=showinformation, showtopics=showtopics) - - if 'broadcastformat' in request.GET: - broadcastformat = get_object_or_404(BroadcastFormat, slug=request.GET['broadcastformat']) - - queryset = Show.objects.filter(broadcastformat=broadcastformat) - elif 'musicfocus' in request.GET: - musicfocus = get_object_or_404(MusicFocus, slug=request.GET['musicfocus']) - - queryset = Show.objects.filter(musicfocus=musicfocus) - elif 'showinformation' in request.GET: - showinformation = get_object_or_404(ShowInformation, slug=request.GET['showinformation']) - - queryset = Show.objects.filter(showinformation=showinformation) - elif 'showtopic' in request.GET: - showtopic = get_object_or_404(ShowTopic, slug=request.GET['showtopic']) - - queryset = Show.objects.filter(showtopic=showtopic) - else: - queryset = Show.objects.all() - - - return list_detail.object_list(request, queryset=queryset, extra_context=extra_context, template_object_name='show') - -def recommendations(request, template_name='program/recommendations.html'): - now = datetime.now() - in_one_week = now + timedelta(weeks=1) - - queryset = Note.objects.filter(status=1, timeslot__start__range=(now, in_one_week))[:10] - - return list_detail.object_list(request, queryset=queryset, template_name=template_name, template_object_name='recommendation') - -def today_schedule(request): - now = datetime.now() - today = datetime.combine(date.today(), time(6, 0)) - tomorrow = today + timedelta(days=1) - - broadcastformats = BroadcastFormat.objects.all() - recommendations = Note.objects.filter(status=1, timeslot__start__range=(now, tomorrow)) - - extra_context = dict(day=today, broadcastformats=broadcastformats, recommendations=recommendations) - - if 'broadcastformat' in request.GET: - broadcastformat = get_object_or_404(BroadcastFormat, slug=request.GET['broadcastformat']) - - extra_context['timeslots'] = TimeSlot.objects.filter(start__range=(today, tomorrow), show__broadcastformat=broadcastformat) - else: - extra_context['timeslots'] = TimeSlot.objects.filter(start__range=(today, tomorrow)) - - return simple.direct_to_template(request, extra_context=extra_context, template='program/day_schedule.html') - -def day_schedule(request, year, month, day): - this_day = datetime.strptime('%s__%s__%s__06__00' % (year, month, day), '%Y__%m__%d__%H__%M') - that_day = this_day+timedelta(days=1) - - broadcastformats = BroadcastFormat.objects.all() - recommendations = Note.objects.filter(status=1, timeslot__start__range=(this_day, that_day)) - - extra_context = dict(day=this_day, broadcastformats=broadcastformats, recommendations=recommendations) - - if 'broadcastformat' in request.GET: - broadcastformat = get_object_or_404(BroadcastFormat, slug=request.GET['broadcastformat']) - - extra_context['timeslots'] = TimeSlot.objects.filter(start__range=(this_day, that_day), show__broadcastformat=broadcastformat) - else: - extra_context['timeslots'] = TimeSlot.objects.filter(start__range=(this_day, that_day)) - - return simple.direct_to_template(request, extra_context=extra_context, template='program/day_schedule.html') - -def current_show(request): - current = TimeSlot.objects.get_or_create_current() - next = current.get_next_by_start() - after_next = next.get_next_by_start() - - extra_context = dict(current=current, next=next, after_next=after_next) - - return simple.direct_to_template(request, template='program/current_box.html', extra_context=extra_context) - -def week_schedule(request, year, week): - monday = datetime.strptime('%s__%s__1__06__00' % (year, week), '%Y__%W__%w__%H__%M') - tuesday = monday+timedelta(days=1) - wednesday = monday+timedelta(days=2) - thursday = monday+timedelta(days=3) - friday = monday+timedelta(days=4) - saturday = monday+timedelta(days=5) - sunday = monday+timedelta(days=6) - next_monday = monday+timedelta(days=7) - - extra_context = dict(monday=monday, tuesday=tuesday, wednesday=wednesday, thursday=thursday, friday=friday, saturday=saturday, sunday=sunday) - - extra_context['monday_timeslots'] = TimeSlot.objects.filter(start__range=(monday, tuesday)) - extra_context['tuesday_timeslots'] = TimeSlot.objects.filter(start__range=(tuesday, wednesday)) - extra_context['wednesday_timeslots'] = TimeSlot.objects.filter(start__range=(wednesday, thursday)) - extra_context['thursday_timeslots'] = TimeSlot.objects.filter(start__range=(thursday, friday)) - extra_context['friday_timeslots'] = TimeSlot.objects.filter(start__range=(friday, saturday)) - extra_context['saturday_timeslots'] = TimeSlot.objects.filter(start__range=(saturday, sunday)) - extra_context['sunday_timeslots'] = TimeSlot.objects.filter(start__range=(sunday, next_monday)) - - return simple.direct_to_template(request, template='program/week_schedule.html', extra_context=extra_context) |