From 88b24251e89b533a928aab5691193a39a16dcb4c Mon Sep 17 00:00:00 2001 From: yomguy Date: Mon, 25 Jun 2012 13:49:34 +0200 Subject: [PATCH] use psutil for pids, cleanup --- example/__init__.py | 0 example/manage.py | 11 -- example/settings.py | 104 ---------------- example/urls.py | 16 --- setup.py | 9 +- telecaster/migrations/0001_initial.py | 112 ++++++++++------- ...tion__chg_field_department_description_.py | 117 ------------------ .../migrations/0003_auto__add_record.py | 82 ------------ ...or__chg_field_station_session__chg_fiel.py | 94 -------------- ...or__chg_field_station_session__chg_fiel.py | 94 -------------- ...nce__chg_field_station_professor__chg_f.py | 100 --------------- ..._auto__chg_field_station_datetime_start.py | 76 ------------ ..._auto__chg_field_station_datetime_start.py | 76 ------------ ..._auto__add_field_station_professor_free.py | 79 ------------ .../0010_auto__chg_field_station_comment.py | 80 ------------ telecaster/models.py | 102 ++++----------- .../{htdocs => static}/css/telecaster.css | 0 .../{htdocs => static}/images/accept.png | Bin .../images/arrow_refresh.png | Bin telecaster/{htdocs => static}/images/bin.png | Bin .../{htdocs => static}/images/cancel.png | Bin .../images/control_pause_blue.png | Bin .../images/control_play_blue.png | Bin .../images/control_stop.png | Bin .../images/control_stop_blue.png | Bin .../apps/preferences-desktop-rotate.png | Bin .../16x16/apps/preferences-desktop-rotate.png | Bin .../22x22/apps/preferences-desktop-rotate.png | Bin .../32x32/apps/preferences-desktop-rotate.png | Bin .../48x48/apps/preferences-desktop-rotate.png | Bin .../64x64/apps/preferences-desktop-rotate.png | Bin .../8x8/apps/preferences-desktop-rotate.png | Bin .../{htdocs => static}/images/drive_add.png | Bin .../{htdocs => static}/images/drive_burn.png | Bin .../images/drive_delete.png | Bin .../{htdocs => static}/images/drive_error.png | Bin .../{htdocs => static}/images/folder_go.png | Bin .../{htdocs => static}/images/folder_link.png | Bin .../{htdocs => static}/images/ipod_cast.png | Bin .../images/logo_telecaster_wh.png | Bin .../images/rotate_desktop.desktop | 0 telecaster/{htdocs => static}/images/stop.png | Bin telecaster/{htdocs => static}/images/tick.png | Bin .../{htdocs => static}/images/transmit.png | Bin .../images/transmit_add.png | Bin .../images/transmit_blue.png | Bin .../images/transmit_delete.png | Bin .../images/transmit_edit.png | Bin .../images/transmit_error.png | Bin .../{htdocs => static}/images/transmit_go.png | Bin telecaster/{htdocs => static}/images/tux.png | Bin .../{htdocs => static}/js/application.js | 0 .../{htdocs => static}/js/jquery-1.6.min.js | 0 .../video-js/LGPLv3-LICENSE.txt | 0 .../{htdocs => static}/video-js/README.md | 0 .../{htdocs => static}/video-js/demo.html | 0 .../{htdocs => static}/video-js/video-js.css | 0 .../video-js/video-js.min.css | 0 .../{htdocs => static}/video-js/video-js.png | Bin .../{htdocs => static}/video-js/video-js.swf | Bin .../{htdocs => static}/video-js/video.js | 0 .../{htdocs => static}/video-js/video.min.js | 0 telecaster/templates/telecaster/index.html | 12 +- telecaster/tools/status.py | 10 +- telecaster/tools/tools.py | 33 ++--- telecaster/urls.py | 14 +-- telecaster/views.py | 2 +- 67 files changed, 130 insertions(+), 1093 deletions(-) delete mode 100644 example/__init__.py delete mode 100755 example/manage.py delete mode 100644 example/settings.py delete mode 100644 example/urls.py delete mode 100644 telecaster/migrations/0002_auto__chg_field_session_description__chg_field_department_description_.py delete mode 100644 telecaster/migrations/0003_auto__add_record.py delete mode 100644 telecaster/migrations/0004_auto__chg_field_station_professor__chg_field_station_session__chg_fiel.py delete mode 100644 telecaster/migrations/0005_auto__chg_field_station_professor__chg_field_station_session__chg_fiel.py delete mode 100644 telecaster/migrations/0006_auto__chg_field_station_conference__chg_field_station_professor__chg_f.py delete mode 100644 telecaster/migrations/0007_auto__chg_field_station_datetime_start.py delete mode 100644 telecaster/migrations/0008_auto__chg_field_station_datetime_start.py delete mode 100644 telecaster/migrations/0009_auto__add_field_station_professor_free.py delete mode 100644 telecaster/migrations/0010_auto__chg_field_station_comment.py rename telecaster/{htdocs => static}/css/telecaster.css (100%) rename telecaster/{htdocs => static}/images/accept.png (100%) rename telecaster/{htdocs => static}/images/arrow_refresh.png (100%) rename telecaster/{htdocs => static}/images/bin.png (100%) rename telecaster/{htdocs => static}/images/cancel.png (100%) rename telecaster/{htdocs => static}/images/control_pause_blue.png (100%) rename telecaster/{htdocs => static}/images/control_play_blue.png (100%) rename telecaster/{htdocs => static}/images/control_stop.png (100%) rename telecaster/{htdocs => static}/images/control_stop_blue.png (100%) rename telecaster/{htdocs => static}/images/desktop/128x128/apps/preferences-desktop-rotate.png (100%) rename telecaster/{htdocs => static}/images/desktop/16x16/apps/preferences-desktop-rotate.png (100%) rename telecaster/{htdocs => static}/images/desktop/22x22/apps/preferences-desktop-rotate.png (100%) rename telecaster/{htdocs => static}/images/desktop/32x32/apps/preferences-desktop-rotate.png (100%) rename telecaster/{htdocs => static}/images/desktop/48x48/apps/preferences-desktop-rotate.png (100%) rename telecaster/{htdocs => static}/images/desktop/64x64/apps/preferences-desktop-rotate.png (100%) rename telecaster/{htdocs => static}/images/desktop/8x8/apps/preferences-desktop-rotate.png (100%) rename telecaster/{htdocs => static}/images/drive_add.png (100%) rename telecaster/{htdocs => static}/images/drive_burn.png (100%) rename telecaster/{htdocs => static}/images/drive_delete.png (100%) rename telecaster/{htdocs => static}/images/drive_error.png (100%) rename telecaster/{htdocs => static}/images/folder_go.png (100%) rename telecaster/{htdocs => static}/images/folder_link.png (100%) rename telecaster/{htdocs => static}/images/ipod_cast.png (100%) rename telecaster/{htdocs => static}/images/logo_telecaster_wh.png (100%) rename telecaster/{htdocs => static}/images/rotate_desktop.desktop (100%) rename telecaster/{htdocs => static}/images/stop.png (100%) rename telecaster/{htdocs => static}/images/tick.png (100%) rename telecaster/{htdocs => static}/images/transmit.png (100%) rename telecaster/{htdocs => static}/images/transmit_add.png (100%) rename telecaster/{htdocs => static}/images/transmit_blue.png (100%) rename telecaster/{htdocs => static}/images/transmit_delete.png (100%) rename telecaster/{htdocs => static}/images/transmit_edit.png (100%) rename telecaster/{htdocs => static}/images/transmit_error.png (100%) rename telecaster/{htdocs => static}/images/transmit_go.png (100%) rename telecaster/{htdocs => static}/images/tux.png (100%) rename telecaster/{htdocs => static}/js/application.js (100%) rename telecaster/{htdocs => static}/js/jquery-1.6.min.js (100%) rename telecaster/{htdocs => static}/video-js/LGPLv3-LICENSE.txt (100%) rename telecaster/{htdocs => static}/video-js/README.md (100%) rename telecaster/{htdocs => static}/video-js/demo.html (100%) rename telecaster/{htdocs => static}/video-js/video-js.css (100%) rename telecaster/{htdocs => static}/video-js/video-js.min.css (100%) rename telecaster/{htdocs => static}/video-js/video-js.png (100%) rename telecaster/{htdocs => static}/video-js/video-js.swf (100%) rename telecaster/{htdocs => static}/video-js/video.js (100%) rename telecaster/{htdocs => static}/video-js/video.min.js (100%) diff --git a/example/__init__.py b/example/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/example/manage.py b/example/manage.py deleted file mode 100755 index bcdd55e..0000000 --- a/example/manage.py +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/python -from django.core.management import execute_manager -try: - import settings # Assumed to be in the same directory. -except ImportError: - import sys - sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__) - sys.exit(1) - -if __name__ == "__main__": - execute_manager(settings) diff --git a/example/settings.py b/example/settings.py deleted file mode 100644 index 4c25f3f..0000000 --- a/example/settings.py +++ /dev/null @@ -1,104 +0,0 @@ -# -*- coding: utf-8 -*- -# Django settings for sandbox project. - -DEBUG = True -TEMPLATE_DEBUG = DEBUG - -ADMINS = ( - # ('Guillaume Pellerin', 'yomguy@parisson.com'), -) - -MANAGERS = ADMINS - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. - 'NAME': 'telecaster.db', # Or path to database file if using sqlite3. - 'USER': '', # Not used with sqlite3. - 'PASSWORD': '', # Not used with sqlite3. - 'HOST': '', # Set to empty string for localhost. Not used with sqlite3. - 'PORT': '', # Set to empty string for default. Not used with sqlite3. - } -} - -# Local time zone for this installation. Choices can be found here: -# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name -# although not all choices may be available on all operating systems. -# On Unix systems, a value of None will cause Django to use the same -# timezone as the operating system. -# If running in a Windows environment this must be set to the same as your -# system time zone. -TIME_ZONE = 'Europe/Paris' - -# Language code for this installation. All choices can be found here: -# http://www.i18nguy.com/unicode/language-identifiers.html -LANGUAGE_CODE = 'fr-fr' - -SITE_ID = 1 - -# If you set this to False, Django will make some optimizations so as not -# to load the internationalization machinery. -USE_I18N = True - -# If you set this to False, Django will not format dates, numbers and -# calendars according to the current locale -USE_L10N = True - -# Absolute path to the directory that holds media. -# Example: "/home/media/media.lawrence.com/" -MEDIA_ROOT = '' - -# URL that handles the media served from MEDIA_ROOT. Make sure to use a -# trailing slash if there is a path component (optional in other cases). -# Examples: "http://media.lawrence.com", "http://example.com/media/" -MEDIA_URL = '' - -# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a -# trailing slash. -# Examples: "http://foo.com/media/", "/media/". -ADMIN_MEDIA_PREFIX = '/media/' - -# Make this unique, and don't share it with anybody. -SECRET_KEY = 'sm1z$uhx*t#dlxwm7g7vh5x@^&f=u1o##u26ocmlu9au$9%a4f' - -# List of callables that know how to import templates from various sources. -TEMPLATE_LOADERS = ( - 'django.template.loaders.filesystem.Loader', - 'django.template.loaders.app_directories.Loader', -# 'django.template.loaders.eggs.Loader', -) - -MIDDLEWARE_CLASSES = ( - 'django.middleware.common.CommonMiddleware', - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.messages.middleware.MessageMiddleware', -) - -ROOT_URLCONF = 'example.urls' - -TEMPLATE_DIRS = ( - # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". - # Always use forward slashes, even on Windows. - # Don't forget to use absolute paths, not relative paths. -) - -INSTALLED_APPS = ( - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.sites', - 'django.contrib.messages', - # Uncomment the next line to enable the admin: - 'django.contrib.admin', - # Uncomment the next line to enable admin documentation: - 'django.contrib.admindocs', - 'telecaster', - 'jsonrpc', - 'south', -) - -TELECASTER_CONF = '/etc/telecaster/telecaster.xml' -TELECASTER_DISPLAY_VIDEO = False - diff --git a/example/urls.py b/example/urls.py deleted file mode 100644 index 1f22205..0000000 --- a/example/urls.py +++ /dev/null @@ -1,16 +0,0 @@ -from django.conf.urls.defaults import * - -# Uncomment the next two lines to enable the admin: -from django.contrib import admin -admin.autodiscover() - -urlpatterns = patterns('', - # Example: - (r'^telecaster/', include('telecaster.urls')), - - # Uncomment the admin/doc line below to enable admin documentation: - # (r'^admin/doc/', include('django.contrib.admindocs.urls')), - - # Uncomment the next line to enable the admin: - (r'^telecaster/admin/', include(admin.site.urls)), -) diff --git a/setup.py b/setup.py index 444184e..97b2993 100644 --- a/setup.py +++ b/setup.py @@ -12,12 +12,15 @@ setup( long_description = open('README.rst').read(), author = "Guillaume Pellerin", author_email = "yomguy@parisson.com", - version = telecaster.__version__, + version = '0.6', install_requires = [ - 'django>=1.3.1', + 'django>=1.4.0', 'django-json-rpc', - 'deefuzzer', 'south', + 'deefuzzer', + 'telemeta', + 'teleforma', + 'psutil' ], platforms=['OS Independent'], license='CeCILL v2', diff --git a/telecaster/migrations/0001_initial.py b/telecaster/migrations/0001_initial.py index 57a4908..ced0e94 100644 --- a/telecaster/migrations/0001_initial.py +++ b/telecaster/migrations/0001_initial.py @@ -1,76 +1,84 @@ -# encoding: utf-8 +# -*- coding: utf-8 -*- import datetime from south.db import db from south.v2 import SchemaMigration from django.db import models + class Migration(SchemaMigration): - + def forwards(self, orm): - # Adding model 'Organization' db.create_table('telecaster_organization', ( - ('description', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)), ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), ('name', self.gf('django.db.models.fields.CharField')(max_length=255)), + ('description', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)), )) db.send_create_signal('telecaster', ['Organization']) # Adding model 'Department' db.create_table('telecaster_department', ( - ('description', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)), ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), ('name', self.gf('django.db.models.fields.CharField')(max_length=255)), + ('description', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)), )) db.send_create_signal('telecaster', ['Department']) # Adding model 'Conference' db.create_table('telecaster_conference', ( - ('department', self.gf('django.db.models.fields.related.ForeignKey')(related_name='conferences', to=orm['telecaster.Department'])), - ('description', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)), ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), ('title', self.gf('django.db.models.fields.CharField')(max_length=255)), + ('description', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)), + ('department', self.gf('django.db.models.fields.related.ForeignKey')(related_name='conferences', to=orm['telecaster.Department'])), )) db.send_create_signal('telecaster', ['Conference']) # Adding model 'Session' db.create_table('telecaster_session', ( - ('description', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)), - ('number', self.gf('django.db.models.fields.IntegerField')()), ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), ('name', self.gf('django.db.models.fields.CharField')(max_length=255)), + ('description', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)), + ('number', self.gf('django.db.models.fields.IntegerField')()), )) db.send_create_signal('telecaster', ['Session']) # Adding model 'Professor' db.create_table('telecaster_professor', ( - ('name', self.gf('django.db.models.fields.CharField')(max_length=255)), - ('institution', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)), - ('telephone', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)), ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('address', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)), - ('email', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)), + ('name', self.gf('django.db.models.fields.CharField')(max_length=255)), + ('institution', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)), + ('address', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)), + ('telephone', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)), + ('email', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)), )) db.send_create_signal('telecaster', ['Professor']) # Adding model 'Station' db.create_table('telecaster_station', ( - ('conference', self.gf('django.db.models.fields.related.ForeignKey')(related_name='stations', to=orm['telecaster.Conference'])), - ('comment', self.gf('django.db.models.fields.TextField')(null=True)), - ('started', self.gf('django.db.models.fields.BooleanField')(default=False, blank=True)), - ('professor', self.gf('django.db.models.fields.related.ForeignKey')(related_name='stations', to=orm['telecaster.Professor'])), - ('session', self.gf('django.db.models.fields.related.ForeignKey')(related_name='stations', to=orm['telecaster.Session'])), - ('datetime_start', self.gf('django.db.models.fields.DateTimeField')(null=True)), - ('department', self.gf('django.db.models.fields.related.ForeignKey')(related_name='stations', to=orm['telecaster.Department'])), - ('organization', self.gf('django.db.models.fields.related.ForeignKey')(related_name='stations', to=orm['telecaster.Organization'])), ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('datetime_stop', self.gf('django.db.models.fields.DateTimeField')(null=True)), + ('public_id', self.gf('django.db.models.fields.CharField')(max_length=255)), + ('organization', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='station', null=True, to=orm['telecaster.Organization'])), + ('department', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='station', null=True, to=orm['telecaster.Department'])), + ('conference', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='station', null=True, to=orm['telecaster.Conference'])), + ('session', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='station', null=True, to=orm['telecaster.Session'])), + ('professor', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='station', null=True, to=orm['telecaster.Professor'])), + ('comment', self.gf('telecaster.models.ShortTextField')(blank=True)), + ('started', self.gf('django.db.models.fields.BooleanField')(default=False)), + ('datetime_start', self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True)), + ('datetime_stop', self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True)), )) db.send_create_signal('telecaster', ['Station']) - - + + # Adding model 'Record' + db.create_table('telecaster_record', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('station', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='records', null=True, on_delete=models.SET_NULL, to=orm['telecaster.Station'])), + ('datetime', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)), + ('file', self.gf('django.db.models.fields.files.FileField')(max_length=100)), + )) + db.send_create_signal('telecaster', ['Record']) + def backwards(self, orm): - # Deleting model 'Organization' db.delete_table('telecaster_organization') @@ -88,57 +96,67 @@ class Migration(SchemaMigration): # Deleting model 'Station' db.delete_table('telecaster_station') - - + + # Deleting model 'Record' + db.delete_table('telecaster_record') + models = { 'telecaster.conference': { 'Meta': {'object_name': 'Conference'}, 'department': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'conferences'", 'to': "orm['telecaster.Department']"}), - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), + 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) }, 'telecaster.department': { 'Meta': {'object_name': 'Department'}, - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), + 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}) }, 'telecaster.organization': { 'Meta': {'object_name': 'Organization'}, - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), + 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}) }, 'telecaster.professor': { 'Meta': {'object_name': 'Professor'}, - 'address': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'email': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), + 'address': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'email': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'institution': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), + 'institution': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'telephone': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}) + 'telephone': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}) + }, + 'telecaster.record': { + 'Meta': {'object_name': 'Record'}, + 'datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'station': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'records'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['telecaster.Station']"}) }, 'telecaster.session': { 'Meta': {'object_name': 'Session'}, - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), + 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), 'number': ('django.db.models.fields.IntegerField', [], {}) }, 'telecaster.station': { 'Meta': {'object_name': 'Station'}, - 'comment': ('django.db.models.fields.TextField', [], {'null': 'True'}), - 'conference': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'to': "orm['telecaster.Conference']"}), - 'datetime_start': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), - 'datetime_stop': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), - 'department': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'to': "orm['telecaster.Department']"}), + 'comment': ('telecaster.models.ShortTextField', [], {'blank': 'True'}), + 'conference': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'station'", 'null': 'True', 'to': "orm['telecaster.Conference']"}), + 'datetime_start': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'datetime_stop': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'department': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'station'", 'null': 'True', 'to': "orm['telecaster.Department']"}), 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'organization': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'to': "orm['telecaster.Organization']"}), - 'professor': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'to': "orm['telecaster.Professor']"}), - 'session': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'to': "orm['telecaster.Session']"}), - 'started': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}) + 'organization': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'station'", 'null': 'True', 'to': "orm['telecaster.Organization']"}), + 'professor': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'station'", 'null': 'True', 'to': "orm['telecaster.Professor']"}), + 'public_id': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'session': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'station'", 'null': 'True', 'to': "orm['telecaster.Session']"}), + 'started': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) } } - - complete_apps = ['telecaster'] + + complete_apps = ['telecaster'] \ No newline at end of file diff --git a/telecaster/migrations/0002_auto__chg_field_session_description__chg_field_department_description_.py b/telecaster/migrations/0002_auto__chg_field_session_description__chg_field_department_description_.py deleted file mode 100644 index 9452a9d..0000000 --- a/telecaster/migrations/0002_auto__chg_field_session_description__chg_field_department_description_.py +++ /dev/null @@ -1,117 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Changing field 'Session.description' - db.alter_column('telecaster_session', 'description', self.gf('django.db.models.fields.CharField')(default='', max_length=255)) - - # Changing field 'Department.description' - db.alter_column('telecaster_department', 'description', self.gf('django.db.models.fields.CharField')(default='', max_length=255)) - - # Changing field 'Organization.description' - db.alter_column('telecaster_organization', 'description', self.gf('django.db.models.fields.CharField')(default='', max_length=255)) - - # Changing field 'Professor.institution' - db.alter_column('telecaster_professor', 'institution', self.gf('django.db.models.fields.CharField')(default='', max_length=255)) - - # Changing field 'Professor.telephone' - db.alter_column('telecaster_professor', 'telephone', self.gf('django.db.models.fields.CharField')(default='', max_length=255)) - - # Changing field 'Professor.address' - db.alter_column('telecaster_professor', 'address', self.gf('django.db.models.fields.CharField')(default='', max_length=255)) - - # Changing field 'Professor.email' - db.alter_column('telecaster_professor', 'email', self.gf('django.db.models.fields.CharField')(default='', max_length=255)) - - # Changing field 'Station.comment' - db.alter_column('telecaster_station', 'comment', self.gf('django.db.models.fields.TextField')(default='')) - - # Changing field 'Conference.description' - db.alter_column('telecaster_conference', 'description', self.gf('django.db.models.fields.CharField')(default='', max_length=255)) - def backwards(self, orm): - - # Changing field 'Session.description' - db.alter_column('telecaster_session', 'description', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)) - - # Changing field 'Department.description' - db.alter_column('telecaster_department', 'description', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)) - - # Changing field 'Organization.description' - db.alter_column('telecaster_organization', 'description', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)) - - # Changing field 'Professor.institution' - db.alter_column('telecaster_professor', 'institution', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)) - - # Changing field 'Professor.telephone' - db.alter_column('telecaster_professor', 'telephone', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)) - - # Changing field 'Professor.address' - db.alter_column('telecaster_professor', 'address', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)) - - # Changing field 'Professor.email' - db.alter_column('telecaster_professor', 'email', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)) - - # Changing field 'Station.comment' - db.alter_column('telecaster_station', 'comment', self.gf('django.db.models.fields.TextField')(null=True)) - - # Changing field 'Conference.description' - db.alter_column('telecaster_conference', 'description', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)) - models = { - 'telecaster.conference': { - 'Meta': {'object_name': 'Conference'}, - 'department': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'conferences'", 'to': "orm['telecaster.Department']"}), - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'telecaster.department': { - 'Meta': {'object_name': 'Department'}, - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'telecaster.organization': { - 'Meta': {'object_name': 'Organization'}, - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'telecaster.professor': { - 'Meta': {'object_name': 'Professor'}, - 'address': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'email': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'institution': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'telephone': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}) - }, - 'telecaster.session': { - 'Meta': {'object_name': 'Session'}, - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'number': ('django.db.models.fields.IntegerField', [], {}) - }, - 'telecaster.station': { - 'Meta': {'object_name': 'Station'}, - 'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'conference': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'to': "orm['telecaster.Conference']"}), - 'datetime_start': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'datetime_stop': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'department': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'to': "orm['telecaster.Department']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'organization': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'to': "orm['telecaster.Organization']"}), - 'professor': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'to': "orm['telecaster.Professor']"}), - 'session': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'to': "orm['telecaster.Session']"}), - 'started': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) - } - } - - complete_apps = ['telecaster'] \ No newline at end of file diff --git a/telecaster/migrations/0003_auto__add_record.py b/telecaster/migrations/0003_auto__add_record.py deleted file mode 100644 index 2c44d7a..0000000 --- a/telecaster/migrations/0003_auto__add_record.py +++ /dev/null @@ -1,82 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding model 'Record' - db.create_table('telecaster_record', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('station', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='records', null=True, to=orm['telecaster.Station'])), - ('datetime', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)), - ('file', self.gf('django.db.models.fields.files.FileField')(max_length=100)), - )) - db.send_create_signal('telecaster', ['Record']) - - def backwards(self, orm): - # Deleting model 'Record' - db.delete_table('telecaster_record') - - models = { - 'telecaster.conference': { - 'Meta': {'object_name': 'Conference'}, - 'department': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'conferences'", 'to': "orm['telecaster.Department']"}), - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'telecaster.department': { - 'Meta': {'object_name': 'Department'}, - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'telecaster.organization': { - 'Meta': {'object_name': 'Organization'}, - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'telecaster.professor': { - 'Meta': {'object_name': 'Professor'}, - 'address': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'email': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'institution': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'telephone': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}) - }, - 'telecaster.record': { - 'Meta': {'object_name': 'Record'}, - 'datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'station': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'records'", 'null': 'True', 'to': "orm['telecaster.Station']"}) - }, - 'telecaster.session': { - 'Meta': {'object_name': 'Session'}, - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'number': ('django.db.models.fields.IntegerField', [], {}) - }, - 'telecaster.station': { - 'Meta': {'object_name': 'Station'}, - 'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'conference': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'to': "orm['telecaster.Conference']"}), - 'datetime_start': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'datetime_stop': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'department': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'to': "orm['telecaster.Department']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'organization': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'to': "orm['telecaster.Organization']"}), - 'professor': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'to': "orm['telecaster.Professor']"}), - 'session': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'to': "orm['telecaster.Session']"}), - 'started': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) - } - } - - complete_apps = ['telecaster'] \ No newline at end of file diff --git a/telecaster/migrations/0004_auto__chg_field_station_professor__chg_field_station_session__chg_fiel.py b/telecaster/migrations/0004_auto__chg_field_station_professor__chg_field_station_session__chg_fiel.py deleted file mode 100644 index 6b008fc..0000000 --- a/telecaster/migrations/0004_auto__chg_field_station_professor__chg_field_station_session__chg_fiel.py +++ /dev/null @@ -1,94 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Changing field 'Station.professor' - db.alter_column('telecaster_station', 'professor_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['telecaster.Professor'])) - - # Changing field 'Station.session' - db.alter_column('telecaster_station', 'session_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['telecaster.Session'])) - - # Changing field 'Station.department' - db.alter_column('telecaster_station', 'department_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['telecaster.Department'])) - - # Changing field 'Station.organization' - db.alter_column('telecaster_station', 'organization_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['telecaster.Organization'])) - def backwards(self, orm): - - # Changing field 'Station.professor' - db.alter_column('telecaster_station', 'professor_id', self.gf('django.db.models.fields.related.ForeignKey')(default='o', to=orm['telecaster.Professor'])) - - # Changing field 'Station.session' - db.alter_column('telecaster_station', 'session_id', self.gf('django.db.models.fields.related.ForeignKey')(default='o', to=orm['telecaster.Session'])) - - # Changing field 'Station.department' - db.alter_column('telecaster_station', 'department_id', self.gf('django.db.models.fields.related.ForeignKey')(default='o', to=orm['telecaster.Department'])) - - # Changing field 'Station.organization' - db.alter_column('telecaster_station', 'organization_id', self.gf('django.db.models.fields.related.ForeignKey')(default='o', to=orm['telecaster.Organization'])) - models = { - 'telecaster.conference': { - 'Meta': {'object_name': 'Conference'}, - 'department': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'conferences'", 'to': "orm['telecaster.Department']"}), - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'telecaster.department': { - 'Meta': {'object_name': 'Department'}, - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'telecaster.organization': { - 'Meta': {'object_name': 'Organization'}, - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'telecaster.professor': { - 'Meta': {'object_name': 'Professor'}, - 'address': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'email': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'institution': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'telephone': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}) - }, - 'telecaster.record': { - 'Meta': {'object_name': 'Record'}, - 'datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'station': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'records'", 'null': 'True', 'to': "orm['telecaster.Station']"}) - }, - 'telecaster.session': { - 'Meta': {'object_name': 'Session'}, - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'number': ('django.db.models.fields.IntegerField', [], {}) - }, - 'telecaster.station': { - 'Meta': {'object_name': 'Station'}, - 'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'conference': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'to': "orm['telecaster.Conference']"}), - 'datetime_start': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'datetime_stop': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'department': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'stations'", 'null': 'True', 'to': "orm['telecaster.Department']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'organization': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'stations'", 'null': 'True', 'to': "orm['telecaster.Organization']"}), - 'professor': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'stations'", 'null': 'True', 'to': "orm['telecaster.Professor']"}), - 'session': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'stations'", 'null': 'True', 'to': "orm['telecaster.Session']"}), - 'started': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) - } - } - - complete_apps = ['telecaster'] \ No newline at end of file diff --git a/telecaster/migrations/0005_auto__chg_field_station_professor__chg_field_station_session__chg_fiel.py b/telecaster/migrations/0005_auto__chg_field_station_professor__chg_field_station_session__chg_fiel.py deleted file mode 100644 index 0358918..0000000 --- a/telecaster/migrations/0005_auto__chg_field_station_professor__chg_field_station_session__chg_fiel.py +++ /dev/null @@ -1,94 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Changing field 'Station.professor' - db.alter_column('telecaster_station', 'professor_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['telecaster.Professor'])) - - # Changing field 'Station.session' - db.alter_column('telecaster_station', 'session_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['telecaster.Session'])) - - # Changing field 'Station.department' - db.alter_column('telecaster_station', 'department_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['telecaster.Department'])) - - # Changing field 'Station.organization' - db.alter_column('telecaster_station', 'organization_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['telecaster.Organization'])) - def backwards(self, orm): - - # Changing field 'Station.professor' - db.alter_column('telecaster_station', 'professor_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['telecaster.Professor'])) - - # Changing field 'Station.session' - db.alter_column('telecaster_station', 'session_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['telecaster.Session'])) - - # Changing field 'Station.department' - db.alter_column('telecaster_station', 'department_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['telecaster.Department'])) - - # Changing field 'Station.organization' - db.alter_column('telecaster_station', 'organization_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['telecaster.Organization'])) - models = { - 'telecaster.conference': { - 'Meta': {'object_name': 'Conference'}, - 'department': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'conferences'", 'to': "orm['telecaster.Department']"}), - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'telecaster.department': { - 'Meta': {'object_name': 'Department'}, - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'telecaster.organization': { - 'Meta': {'object_name': 'Organization'}, - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'telecaster.professor': { - 'Meta': {'object_name': 'Professor'}, - 'address': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'email': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'institution': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'telephone': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}) - }, - 'telecaster.record': { - 'Meta': {'object_name': 'Record'}, - 'datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'station': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'records'", 'null': 'True', 'to': "orm['telecaster.Station']"}) - }, - 'telecaster.session': { - 'Meta': {'object_name': 'Session'}, - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'number': ('django.db.models.fields.IntegerField', [], {}) - }, - 'telecaster.station': { - 'Meta': {'object_name': 'Station'}, - 'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'conference': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'to': "orm['telecaster.Conference']"}), - 'datetime_start': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'datetime_stop': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'department': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'to': "orm['telecaster.Department']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'organization': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'to': "orm['telecaster.Organization']"}), - 'professor': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'to': "orm['telecaster.Professor']"}), - 'session': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'to': "orm['telecaster.Session']"}), - 'started': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) - } - } - - complete_apps = ['telecaster'] \ No newline at end of file diff --git a/telecaster/migrations/0006_auto__chg_field_station_conference__chg_field_station_professor__chg_f.py b/telecaster/migrations/0006_auto__chg_field_station_conference__chg_field_station_professor__chg_f.py deleted file mode 100644 index 6b9e094..0000000 --- a/telecaster/migrations/0006_auto__chg_field_station_conference__chg_field_station_professor__chg_f.py +++ /dev/null @@ -1,100 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Changing field 'Station.conference' - db.alter_column('telecaster_station', 'conference_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['telecaster.Conference'])) - - # Changing field 'Station.professor' - db.alter_column('telecaster_station', 'professor_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['telecaster.Professor'])) - - # Changing field 'Station.session' - db.alter_column('telecaster_station', 'session_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['telecaster.Session'])) - - # Changing field 'Station.department' - db.alter_column('telecaster_station', 'department_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['telecaster.Department'])) - - # Changing field 'Station.organization' - db.alter_column('telecaster_station', 'organization_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['telecaster.Organization'])) - def backwards(self, orm): - - # Changing field 'Station.conference' - db.alter_column('telecaster_station', 'conference_id', self.gf('django.db.models.fields.related.ForeignKey')(default='o', to=orm['telecaster.Conference'])) - - # Changing field 'Station.professor' - db.alter_column('telecaster_station', 'professor_id', self.gf('django.db.models.fields.related.ForeignKey')(default='o', to=orm['telecaster.Professor'])) - - # Changing field 'Station.session' - db.alter_column('telecaster_station', 'session_id', self.gf('django.db.models.fields.related.ForeignKey')(default='o', to=orm['telecaster.Session'])) - - # Changing field 'Station.department' - db.alter_column('telecaster_station', 'department_id', self.gf('django.db.models.fields.related.ForeignKey')(default='o', to=orm['telecaster.Department'])) - - # Changing field 'Station.organization' - db.alter_column('telecaster_station', 'organization_id', self.gf('django.db.models.fields.related.ForeignKey')(default='o', to=orm['telecaster.Organization'])) - models = { - 'telecaster.conference': { - 'Meta': {'object_name': 'Conference'}, - 'department': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'conferences'", 'to': "orm['telecaster.Department']"}), - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'telecaster.department': { - 'Meta': {'object_name': 'Department'}, - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'telecaster.organization': { - 'Meta': {'object_name': 'Organization'}, - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'telecaster.professor': { - 'Meta': {'object_name': 'Professor'}, - 'address': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'email': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'institution': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'telephone': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}) - }, - 'telecaster.record': { - 'Meta': {'object_name': 'Record'}, - 'datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'station': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'records'", 'null': 'True', 'to': "orm['telecaster.Station']"}) - }, - 'telecaster.session': { - 'Meta': {'object_name': 'Session'}, - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'number': ('django.db.models.fields.IntegerField', [], {}) - }, - 'telecaster.station': { - 'Meta': {'object_name': 'Station'}, - 'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'conference': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'null': 'True', 'to': "orm['telecaster.Conference']"}), - 'datetime_start': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'datetime_stop': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'department': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'null': 'True', 'to': "orm['telecaster.Department']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'organization': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'null': 'True', 'to': "orm['telecaster.Organization']"}), - 'professor': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'null': 'True', 'to': "orm['telecaster.Professor']"}), - 'session': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'null': 'True', 'to': "orm['telecaster.Session']"}), - 'started': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) - } - } - - complete_apps = ['telecaster'] \ No newline at end of file diff --git a/telecaster/migrations/0007_auto__chg_field_station_datetime_start.py b/telecaster/migrations/0007_auto__chg_field_station_datetime_start.py deleted file mode 100644 index 914586e..0000000 --- a/telecaster/migrations/0007_auto__chg_field_station_datetime_start.py +++ /dev/null @@ -1,76 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Changing field 'Station.datetime_start' - db.alter_column('telecaster_station', 'datetime_start', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, null=True)) - def backwards(self, orm): - - # Changing field 'Station.datetime_start' - db.alter_column('telecaster_station', 'datetime_start', self.gf('django.db.models.fields.DateTimeField')(null=True)) - models = { - 'telecaster.conference': { - 'Meta': {'object_name': 'Conference'}, - 'department': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'conferences'", 'to': "orm['telecaster.Department']"}), - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'telecaster.department': { - 'Meta': {'object_name': 'Department'}, - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'telecaster.organization': { - 'Meta': {'object_name': 'Organization'}, - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'telecaster.professor': { - 'Meta': {'object_name': 'Professor'}, - 'address': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'email': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'institution': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'telephone': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}) - }, - 'telecaster.record': { - 'Meta': {'object_name': 'Record'}, - 'datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'station': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'records'", 'null': 'True', 'to': "orm['telecaster.Station']"}) - }, - 'telecaster.session': { - 'Meta': {'object_name': 'Session'}, - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'number': ('django.db.models.fields.IntegerField', [], {}) - }, - 'telecaster.station': { - 'Meta': {'object_name': 'Station'}, - 'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'conference': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'null': 'True', 'to': "orm['telecaster.Conference']"}), - 'datetime_start': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}), - 'datetime_stop': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'department': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'null': 'True', 'to': "orm['telecaster.Department']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'organization': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'null': 'True', 'to': "orm['telecaster.Organization']"}), - 'professor': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'null': 'True', 'to': "orm['telecaster.Professor']"}), - 'session': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'null': 'True', 'to': "orm['telecaster.Session']"}), - 'started': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) - } - } - - complete_apps = ['telecaster'] \ No newline at end of file diff --git a/telecaster/migrations/0008_auto__chg_field_station_datetime_start.py b/telecaster/migrations/0008_auto__chg_field_station_datetime_start.py deleted file mode 100644 index b6a3389..0000000 --- a/telecaster/migrations/0008_auto__chg_field_station_datetime_start.py +++ /dev/null @@ -1,76 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Changing field 'Station.datetime_start' - db.alter_column('telecaster_station', 'datetime_start', self.gf('django.db.models.fields.DateTimeField')(null=True)) - def backwards(self, orm): - - # Changing field 'Station.datetime_start' - db.alter_column('telecaster_station', 'datetime_start', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, null=True)) - models = { - 'telecaster.conference': { - 'Meta': {'object_name': 'Conference'}, - 'department': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'conferences'", 'to': "orm['telecaster.Department']"}), - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'telecaster.department': { - 'Meta': {'object_name': 'Department'}, - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'telecaster.organization': { - 'Meta': {'object_name': 'Organization'}, - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'telecaster.professor': { - 'Meta': {'object_name': 'Professor'}, - 'address': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'email': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'institution': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'telephone': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}) - }, - 'telecaster.record': { - 'Meta': {'object_name': 'Record'}, - 'datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'station': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'records'", 'null': 'True', 'to': "orm['telecaster.Station']"}) - }, - 'telecaster.session': { - 'Meta': {'object_name': 'Session'}, - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'number': ('django.db.models.fields.IntegerField', [], {}) - }, - 'telecaster.station': { - 'Meta': {'object_name': 'Station'}, - 'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'conference': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'null': 'True', 'to': "orm['telecaster.Conference']"}), - 'datetime_start': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'datetime_stop': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'department': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'null': 'True', 'to': "orm['telecaster.Department']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'organization': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'null': 'True', 'to': "orm['telecaster.Organization']"}), - 'professor': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'null': 'True', 'to': "orm['telecaster.Professor']"}), - 'session': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'null': 'True', 'to': "orm['telecaster.Session']"}), - 'started': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) - } - } - - complete_apps = ['telecaster'] \ No newline at end of file diff --git a/telecaster/migrations/0009_auto__add_field_station_professor_free.py b/telecaster/migrations/0009_auto__add_field_station_professor_free.py deleted file mode 100644 index 6f153e5..0000000 --- a/telecaster/migrations/0009_auto__add_field_station_professor_free.py +++ /dev/null @@ -1,79 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding field 'Station.professor_free' - db.add_column('telecaster_station', 'professor_free', - self.gf('django.db.models.fields.CharField')(default='', max_length=255, blank=True), - keep_default=False) - - def backwards(self, orm): - # Deleting field 'Station.professor_free' - db.delete_column('telecaster_station', 'professor_free') - - models = { - 'telecaster.conference': { - 'Meta': {'object_name': 'Conference'}, - 'department': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'conferences'", 'to': "orm['telecaster.Department']"}), - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'telecaster.department': { - 'Meta': {'object_name': 'Department'}, - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'telecaster.organization': { - 'Meta': {'object_name': 'Organization'}, - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'telecaster.professor': { - 'Meta': {'object_name': 'Professor'}, - 'address': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'email': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'institution': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'telephone': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}) - }, - 'telecaster.record': { - 'Meta': {'object_name': 'Record'}, - 'datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'station': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'records'", 'null': 'True', 'to': "orm['telecaster.Station']"}) - }, - 'telecaster.session': { - 'Meta': {'object_name': 'Session'}, - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'number': ('django.db.models.fields.IntegerField', [], {}) - }, - 'telecaster.station': { - 'Meta': {'object_name': 'Station'}, - 'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'conference': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'null': 'True', 'to': "orm['telecaster.Conference']"}), - 'datetime_start': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'datetime_stop': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'department': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'null': 'True', 'to': "orm['telecaster.Department']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'organization': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'null': 'True', 'to': "orm['telecaster.Organization']"}), - 'professor': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'stations'", 'null': 'True', 'to': "orm['telecaster.Professor']"}), - 'professor_free': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'session': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'null': 'True', 'to': "orm['telecaster.Session']"}), - 'started': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) - } - } - - complete_apps = ['telecaster'] \ No newline at end of file diff --git a/telecaster/migrations/0010_auto__chg_field_station_comment.py b/telecaster/migrations/0010_auto__chg_field_station_comment.py deleted file mode 100644 index b9a7bb3..0000000 --- a/telecaster/migrations/0010_auto__chg_field_station_comment.py +++ /dev/null @@ -1,80 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Changing field 'Station.comment' - db.alter_column('telecaster_station', 'comment', self.gf('telecaster.models.ShortTextField')()) - - - def backwards(self, orm): - - # Changing field 'Station.comment' - db.alter_column('telecaster_station', 'comment', self.gf('django.db.models.fields.TextField')()) - - - models = { - 'telecaster.conference': { - 'Meta': {'object_name': 'Conference'}, - 'department': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'conferences'", 'to': "orm['telecaster.Department']"}), - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'telecaster.department': { - 'Meta': {'object_name': 'Department'}, - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'telecaster.organization': { - 'Meta': {'object_name': 'Organization'}, - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}) - }, - 'telecaster.professor': { - 'Meta': {'object_name': 'Professor'}, - 'address': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'email': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'institution': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'telephone': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}) - }, - 'telecaster.record': { - 'Meta': {'object_name': 'Record'}, - 'datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'station': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'records'", 'null': 'True', 'to': "orm['telecaster.Station']"}) - }, - 'telecaster.session': { - 'Meta': {'object_name': 'Session'}, - 'description': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'number': ('django.db.models.fields.IntegerField', [], {}) - }, - 'telecaster.station': { - 'Meta': {'object_name': 'Station'}, - 'comment': ('telecaster.models.ShortTextField', [], {'blank': 'True'}), - 'conference': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'null': 'True', 'to': "orm['telecaster.Conference']"}), - 'datetime_start': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'datetime_stop': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'department': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'null': 'True', 'to': "orm['telecaster.Department']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'organization': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stations'", 'null': 'True', 'to': "orm['telecaster.Organization']"}), - 'professor': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'stations'", 'null': 'True', 'to': "orm['telecaster.Professor']"}), - 'professor_free': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'session': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'stations'", 'null': 'True', 'to': "orm['telecaster.Session']"}), - 'started': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) - } - } - - complete_apps = ['telecaster'] diff --git a/telecaster/models.py b/telecaster/models.py index 012d39e..80f77b6 100644 --- a/telecaster/models.py +++ b/telecaster/models.py @@ -53,71 +53,9 @@ from django.utils.translation import ugettext_lazy as _ from south.modelsinspector import add_introspection_rules -app_label = 'telecaster' - - -class Organization(Model): - - name = CharField(_('name'), max_length=255) - description = CharField(_('description'), max_length=255, blank=True) - - def __str__(self): - return self.name - - class Meta: - db_table = app_label + '_' + 'organization' - -class Department(Model): - - name = CharField(_('name'), max_length=255) - description = CharField(_('description'), max_length=255, blank=True) - - def __str__(self): - return self.name - - class Meta: - db_table = app_label + '_' + 'department' - - -class Conference(Model): - - title = CharField(_('title'), max_length=255) - description = CharField(_('description'), max_length=255, blank=True) - department = ForeignKey('Department', related_name='conferences', verbose_name='department') - - def __str__(self): - return self.title - - class Meta: - db_table = app_label + '_' + 'conference' - - -class Session(Model): - - name = CharField(_('name'), max_length=255) - description = CharField(_('description'), max_length=255, blank=True) - number = IntegerField(_('number')) - - def __str__(self): - return self.name - - class Meta: - db_table = app_label + '_' + 'session' - - -class Professor(Model): +from teleforma.models import * - name = CharField(_('name'), max_length=255) - institution = CharField(_('institution'), max_length=255, blank=True) - address = CharField(_('address'), max_length=255, blank=True) - telephone = CharField(_('telephone'), max_length=255, blank=True) - email = CharField(_('email'), max_length=255, blank=True) - - def __str__(self): - return self.name - - class Meta: - db_table = app_label + '_' + 'professor' +app_label = 'telecaster' class ShortTextField(models.TextField): @@ -128,16 +66,28 @@ class ShortTextField(models.TextField): ) return super(ShortTextField, self).formfield(**kwargs) + add_introspection_rules([], ["^telecaster\.models\.ShortTextField"]) + class Station(Model): - public_id = CharField(_('public_id'), max_length=255, required=True) - organization = CharField(_('organization'), max_length=255, blank=True) - department = CharField(_('department'), max_length=255, blank=True) - conference = CharField(_('conference'), max_length=255, blank=True) - session = CharField(_('session'), max_length=255, blank=True) - professor = CharField(_('professor'), max_length=255, blank=True) + public_id = CharField(_('public_id'), max_length=255) + organization = ForeignKey('Organization', related_name='station', + verbose_name=_('organization'), + blank=True, null=True) + department = ForeignKey('Department', related_name='station', + verbose_name=_('department'), + blank=True, null=True) + conference = ForeignKey('Conference', related_name='station', + verbose_name=_('conference'), + blank=True, null=True) + session = ForeignKey('Session', related_name='station', + verbose_name=_('session'), + blank=True, null=True) + professor = ForeignKey('Professor', related_name='station', + verbose_name=_('professor'), + blank=True, null=True) comment = ShortTextField(_('comments'), blank=True) started = BooleanField(_('started')) datetime_start = DateTimeField(_('time_start'), blank=True, null=True) @@ -147,13 +97,13 @@ class Station(Model): class Meta: db_table = app_label + '_' + 'station' - def __str__(self): + def __unicode__(self): return ' - '.join(self.description) + ' - ' + str(self.datetime_start) + ' > ' + str(self.datetime_stop) def to_dict(self): dict = [{'id':'public_id','value': self.public_id, 'class':'', 'label':'public_id'}, {'id':'organization','value': self.organization, 'class':'', 'label':'Organization'}, - {'id': 'department', 'value': self.department , 'class':'', 'label':'Departement'}, + {'id': 'department', 'value': self.department , 'class':'', 'label':'Department'}, {'id' : 'conference', 'value': self.conference, 'class':'' , 'label': 'Conference'}, {'id': 'professor', 'value': self.professor, 'class':'' , 'label': 'Professor'}, {'id': 'session', 'value': self.session, 'class':'' , 'label': 'Session'}, @@ -164,11 +114,11 @@ class Station(Model): @property def description(self): - description = [self.organization, self.conference.department, self.conference] + description = [self.organization.name, self.conference.department.name, self.conference.title] if self.session: - description.append(self.session) + description.append(self.session.name) if self.professor: - description.append(self.professor) + description.append(self.professor.name) description.append(self.comment) return description @@ -337,3 +287,5 @@ class Record(Model): datetime = DateTimeField(_('record_date'), auto_now=True) file = FileField(_('file'), upload_to='items/%Y/%m/%d') + + diff --git a/telecaster/htdocs/css/telecaster.css b/telecaster/static/css/telecaster.css similarity index 100% rename from telecaster/htdocs/css/telecaster.css rename to telecaster/static/css/telecaster.css diff --git a/telecaster/htdocs/images/accept.png b/telecaster/static/images/accept.png similarity index 100% rename from telecaster/htdocs/images/accept.png rename to telecaster/static/images/accept.png diff --git a/telecaster/htdocs/images/arrow_refresh.png b/telecaster/static/images/arrow_refresh.png similarity index 100% rename from telecaster/htdocs/images/arrow_refresh.png rename to telecaster/static/images/arrow_refresh.png diff --git a/telecaster/htdocs/images/bin.png b/telecaster/static/images/bin.png similarity index 100% rename from telecaster/htdocs/images/bin.png rename to telecaster/static/images/bin.png diff --git a/telecaster/htdocs/images/cancel.png b/telecaster/static/images/cancel.png similarity index 100% rename from telecaster/htdocs/images/cancel.png rename to telecaster/static/images/cancel.png diff --git a/telecaster/htdocs/images/control_pause_blue.png b/telecaster/static/images/control_pause_blue.png similarity index 100% rename from telecaster/htdocs/images/control_pause_blue.png rename to telecaster/static/images/control_pause_blue.png diff --git a/telecaster/htdocs/images/control_play_blue.png b/telecaster/static/images/control_play_blue.png similarity index 100% rename from telecaster/htdocs/images/control_play_blue.png rename to telecaster/static/images/control_play_blue.png diff --git a/telecaster/htdocs/images/control_stop.png b/telecaster/static/images/control_stop.png similarity index 100% rename from telecaster/htdocs/images/control_stop.png rename to telecaster/static/images/control_stop.png diff --git a/telecaster/htdocs/images/control_stop_blue.png b/telecaster/static/images/control_stop_blue.png similarity index 100% rename from telecaster/htdocs/images/control_stop_blue.png rename to telecaster/static/images/control_stop_blue.png diff --git a/telecaster/htdocs/images/desktop/128x128/apps/preferences-desktop-rotate.png b/telecaster/static/images/desktop/128x128/apps/preferences-desktop-rotate.png similarity index 100% rename from telecaster/htdocs/images/desktop/128x128/apps/preferences-desktop-rotate.png rename to telecaster/static/images/desktop/128x128/apps/preferences-desktop-rotate.png diff --git a/telecaster/htdocs/images/desktop/16x16/apps/preferences-desktop-rotate.png b/telecaster/static/images/desktop/16x16/apps/preferences-desktop-rotate.png similarity index 100% rename from telecaster/htdocs/images/desktop/16x16/apps/preferences-desktop-rotate.png rename to telecaster/static/images/desktop/16x16/apps/preferences-desktop-rotate.png diff --git a/telecaster/htdocs/images/desktop/22x22/apps/preferences-desktop-rotate.png b/telecaster/static/images/desktop/22x22/apps/preferences-desktop-rotate.png similarity index 100% rename from telecaster/htdocs/images/desktop/22x22/apps/preferences-desktop-rotate.png rename to telecaster/static/images/desktop/22x22/apps/preferences-desktop-rotate.png diff --git a/telecaster/htdocs/images/desktop/32x32/apps/preferences-desktop-rotate.png b/telecaster/static/images/desktop/32x32/apps/preferences-desktop-rotate.png similarity index 100% rename from telecaster/htdocs/images/desktop/32x32/apps/preferences-desktop-rotate.png rename to telecaster/static/images/desktop/32x32/apps/preferences-desktop-rotate.png diff --git a/telecaster/htdocs/images/desktop/48x48/apps/preferences-desktop-rotate.png b/telecaster/static/images/desktop/48x48/apps/preferences-desktop-rotate.png similarity index 100% rename from telecaster/htdocs/images/desktop/48x48/apps/preferences-desktop-rotate.png rename to telecaster/static/images/desktop/48x48/apps/preferences-desktop-rotate.png diff --git a/telecaster/htdocs/images/desktop/64x64/apps/preferences-desktop-rotate.png b/telecaster/static/images/desktop/64x64/apps/preferences-desktop-rotate.png similarity index 100% rename from telecaster/htdocs/images/desktop/64x64/apps/preferences-desktop-rotate.png rename to telecaster/static/images/desktop/64x64/apps/preferences-desktop-rotate.png diff --git a/telecaster/htdocs/images/desktop/8x8/apps/preferences-desktop-rotate.png b/telecaster/static/images/desktop/8x8/apps/preferences-desktop-rotate.png similarity index 100% rename from telecaster/htdocs/images/desktop/8x8/apps/preferences-desktop-rotate.png rename to telecaster/static/images/desktop/8x8/apps/preferences-desktop-rotate.png diff --git a/telecaster/htdocs/images/drive_add.png b/telecaster/static/images/drive_add.png similarity index 100% rename from telecaster/htdocs/images/drive_add.png rename to telecaster/static/images/drive_add.png diff --git a/telecaster/htdocs/images/drive_burn.png b/telecaster/static/images/drive_burn.png similarity index 100% rename from telecaster/htdocs/images/drive_burn.png rename to telecaster/static/images/drive_burn.png diff --git a/telecaster/htdocs/images/drive_delete.png b/telecaster/static/images/drive_delete.png similarity index 100% rename from telecaster/htdocs/images/drive_delete.png rename to telecaster/static/images/drive_delete.png diff --git a/telecaster/htdocs/images/drive_error.png b/telecaster/static/images/drive_error.png similarity index 100% rename from telecaster/htdocs/images/drive_error.png rename to telecaster/static/images/drive_error.png diff --git a/telecaster/htdocs/images/folder_go.png b/telecaster/static/images/folder_go.png similarity index 100% rename from telecaster/htdocs/images/folder_go.png rename to telecaster/static/images/folder_go.png diff --git a/telecaster/htdocs/images/folder_link.png b/telecaster/static/images/folder_link.png similarity index 100% rename from telecaster/htdocs/images/folder_link.png rename to telecaster/static/images/folder_link.png diff --git a/telecaster/htdocs/images/ipod_cast.png b/telecaster/static/images/ipod_cast.png similarity index 100% rename from telecaster/htdocs/images/ipod_cast.png rename to telecaster/static/images/ipod_cast.png diff --git a/telecaster/htdocs/images/logo_telecaster_wh.png b/telecaster/static/images/logo_telecaster_wh.png similarity index 100% rename from telecaster/htdocs/images/logo_telecaster_wh.png rename to telecaster/static/images/logo_telecaster_wh.png diff --git a/telecaster/htdocs/images/rotate_desktop.desktop b/telecaster/static/images/rotate_desktop.desktop similarity index 100% rename from telecaster/htdocs/images/rotate_desktop.desktop rename to telecaster/static/images/rotate_desktop.desktop diff --git a/telecaster/htdocs/images/stop.png b/telecaster/static/images/stop.png similarity index 100% rename from telecaster/htdocs/images/stop.png rename to telecaster/static/images/stop.png diff --git a/telecaster/htdocs/images/tick.png b/telecaster/static/images/tick.png similarity index 100% rename from telecaster/htdocs/images/tick.png rename to telecaster/static/images/tick.png diff --git a/telecaster/htdocs/images/transmit.png b/telecaster/static/images/transmit.png similarity index 100% rename from telecaster/htdocs/images/transmit.png rename to telecaster/static/images/transmit.png diff --git a/telecaster/htdocs/images/transmit_add.png b/telecaster/static/images/transmit_add.png similarity index 100% rename from telecaster/htdocs/images/transmit_add.png rename to telecaster/static/images/transmit_add.png diff --git a/telecaster/htdocs/images/transmit_blue.png b/telecaster/static/images/transmit_blue.png similarity index 100% rename from telecaster/htdocs/images/transmit_blue.png rename to telecaster/static/images/transmit_blue.png diff --git a/telecaster/htdocs/images/transmit_delete.png b/telecaster/static/images/transmit_delete.png similarity index 100% rename from telecaster/htdocs/images/transmit_delete.png rename to telecaster/static/images/transmit_delete.png diff --git a/telecaster/htdocs/images/transmit_edit.png b/telecaster/static/images/transmit_edit.png similarity index 100% rename from telecaster/htdocs/images/transmit_edit.png rename to telecaster/static/images/transmit_edit.png diff --git a/telecaster/htdocs/images/transmit_error.png b/telecaster/static/images/transmit_error.png similarity index 100% rename from telecaster/htdocs/images/transmit_error.png rename to telecaster/static/images/transmit_error.png diff --git a/telecaster/htdocs/images/transmit_go.png b/telecaster/static/images/transmit_go.png similarity index 100% rename from telecaster/htdocs/images/transmit_go.png rename to telecaster/static/images/transmit_go.png diff --git a/telecaster/htdocs/images/tux.png b/telecaster/static/images/tux.png similarity index 100% rename from telecaster/htdocs/images/tux.png rename to telecaster/static/images/tux.png diff --git a/telecaster/htdocs/js/application.js b/telecaster/static/js/application.js similarity index 100% rename from telecaster/htdocs/js/application.js rename to telecaster/static/js/application.js diff --git a/telecaster/htdocs/js/jquery-1.6.min.js b/telecaster/static/js/jquery-1.6.min.js similarity index 100% rename from telecaster/htdocs/js/jquery-1.6.min.js rename to telecaster/static/js/jquery-1.6.min.js diff --git a/telecaster/htdocs/video-js/LGPLv3-LICENSE.txt b/telecaster/static/video-js/LGPLv3-LICENSE.txt similarity index 100% rename from telecaster/htdocs/video-js/LGPLv3-LICENSE.txt rename to telecaster/static/video-js/LGPLv3-LICENSE.txt diff --git a/telecaster/htdocs/video-js/README.md b/telecaster/static/video-js/README.md similarity index 100% rename from telecaster/htdocs/video-js/README.md rename to telecaster/static/video-js/README.md diff --git a/telecaster/htdocs/video-js/demo.html b/telecaster/static/video-js/demo.html similarity index 100% rename from telecaster/htdocs/video-js/demo.html rename to telecaster/static/video-js/demo.html diff --git a/telecaster/htdocs/video-js/video-js.css b/telecaster/static/video-js/video-js.css similarity index 100% rename from telecaster/htdocs/video-js/video-js.css rename to telecaster/static/video-js/video-js.css diff --git a/telecaster/htdocs/video-js/video-js.min.css b/telecaster/static/video-js/video-js.min.css similarity index 100% rename from telecaster/htdocs/video-js/video-js.min.css rename to telecaster/static/video-js/video-js.min.css diff --git a/telecaster/htdocs/video-js/video-js.png b/telecaster/static/video-js/video-js.png similarity index 100% rename from telecaster/htdocs/video-js/video-js.png rename to telecaster/static/video-js/video-js.png diff --git a/telecaster/htdocs/video-js/video-js.swf b/telecaster/static/video-js/video-js.swf similarity index 100% rename from telecaster/htdocs/video-js/video-js.swf rename to telecaster/static/video-js/video-js.swf diff --git a/telecaster/htdocs/video-js/video.js b/telecaster/static/video-js/video.js similarity index 100% rename from telecaster/htdocs/video-js/video.js rename to telecaster/static/video-js/video.js diff --git a/telecaster/htdocs/video-js/video.min.js b/telecaster/static/video-js/video.min.js similarity index 100% rename from telecaster/htdocs/video-js/video.min.js rename to telecaster/static/video-js/video.min.js diff --git a/telecaster/templates/telecaster/index.html b/telecaster/templates/telecaster/index.html index 6980f93..8f66999 100644 --- a/telecaster/templates/telecaster/index.html +++ b/telecaster/templates/telecaster/index.html @@ -12,18 +12,18 @@ {% block javascript %} - + {% endblock javascript %}