fix station dates

diff --git a/telecaster/migrations/0007_auto__chg_field_station_datetime_start.py b/telecaster/migrations/0007_auto__chg_field_station_datetime_start.py
new file mode 100644 (file)
index 0000000..914586e
--- /dev/null
+++ b/telecaster/migrations/0007_auto__chg_field_station_datetime_start.py
@@ -0,0 +1,76 @@
+# -*- 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/models.py b/telecaster/models.py
index 9412c7a39558f93b450445716c516c2e7c4db622..85bd5b8847f3327886f9b96bd24d245a7404025b 100644 (file)
--- a/telecaster/models.py
+++ b/telecaster/models.py
@@ -132,7 +132,7 @@ class Station(Model):
                                    null=True, on_delete=models.SET_NULL)
     comment           = TextField(_('comment'), blank=True)
     started           = BooleanField(_('started'))
-    datetime_start    = DateTimeField(_('time_start'), blank=True, null=True)
+    datetime_start    = DateTimeField(_('time_start'), auto_now_add=True, blank=True, null=True)
     datetime_stop     = DateTimeField(_('time_stop'), blank=True, null=True)
 
     class Meta:

diff --git a/telecaster/views.py b/telecaster/views.py
index 6aa4d2870214315b26278dffad106e1758c9bdcb..db0d37a7204ebaab6eebe4192a1aff4156f7a8e3 100644 (file)
--- a/telecaster/views.py
+++ b/telecaster/views.py
@@ -65,6 +65,7 @@ class WebView(object):
                 station = stations[0]
             if request.method == 'POST':
                 station.stop()
+                station.datetime_stop = datetime.datetime.now()
 #                time.sleep(2)
                 station.save()
                 self.logger.write_info('stop')