migrations

9 files changed, 115 insertions, 129 deletions

diff --git a/sbhs/migrations/0001_initial.py b/sbhs/migrations/0001_initial.py
index 4233f76..b0b91de 100644
--- a/sbhs/migrations/0001_initial.py
+++ b/sbhs/migrations/0001_initial.py
@@ -1,10 +1,13 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11 on 2018-08-07 07:43
+# Generated by Django 1.11 on 2018-09-06 12:36
 from __future__ import unicode_literals
 
+import datetime
 from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
+from django.utils.timezone import utc
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -23,12 +26,9 @@ class Migration(migrations.Migration):
                 ('mid', models.IntegerField(unique=True)),
                 ('online', models.BooleanField(default=False)),
             ],
-        ),
-        migrations.CreateModel(
-            name='Booking',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-            ],
+            options={
+                'ordering': ['mid'],
+            },
         ),
         migrations.CreateModel(
             name='Experiment',
@@ -36,7 +36,6 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('log', models.CharField(max_length=255)),
                 ('checksum', models.CharField(blank=True, max_length=255, null=True)),
-                ('booking', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='sbhs.Booking')),
             ],
         ),
         migrations.CreateModel(
@@ -48,7 +47,7 @@ class Migration(migrations.Migration):
                 ('department', models.CharField(max_length=64)),
                 ('position', models.CharField(max_length=64)),
                 ('is_moderator', models.BooleanField(default=False)),
-                ('is_email_verified', models.BooleanField()),
+                ('is_email_verified', models.BooleanField(default=False)),
                 ('activation_key', models.CharField(blank=True, max_length=255, null=True)),
                 ('key_expiry_time', models.DateTimeField(blank=True, null=True)),
                 ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
@@ -58,18 +57,14 @@ class Migration(migrations.Migration):
             name='Slot',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('start_time', models.DateTimeField(verbose_name='Start time of a slot')),
-                ('duration', models.IntegerField(default=55)),
+                ('start_time', models.DateTimeField(default=django.utils.timezone.now, verbose_name='Start time of a slot')),
+                ('end_time', models.DateTimeField(default=datetime.datetime(2018, 9, 6, 13, 31, 48, 183137, tzinfo=utc), verbose_name='End time of a slot')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
         ),
         migrations.AddField(
-            model_name='booking',
+            model_name='experiment',
             name='slot',
             field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='sbhs.Slot'),
         ),
-        migrations.AddField(
-            model_name='booking',
-            name='user',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
     ]
diff --git a/sbhs/migrations/0002_auto_20180807_1416.py b/sbhs/migrations/0002_auto_20180807_1416.py
deleted file mode 100644
index a6a0c95..0000000
--- a/sbhs/migrations/0002_auto_20180807_1416.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11 on 2018-08-07 08:46
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('sbhs', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='profile',
-            name='is_email_verified',
-            field=models.BooleanField(default=False),
-        ),
-    ]
diff --git a/sbhs/migrations/0002_auto_20180906_1808.py b/sbhs/migrations/0002_auto_20180906_1808.py
new file mode 100644
index 0000000..bc6726a
--- /dev/null
+++ b/sbhs/migrations/0002_auto_20180906_1808.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-09-06 12:38
+from __future__ import unicode_literals
+
+import datetime
+from django.db import migrations, models
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sbhs', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='slot',
+            name='end_time',
+            field=models.DateTimeField(default=datetime.datetime(2018, 9, 6, 13, 33, 24, 388022, tzinfo=utc), verbose_name='End time of a slot'),
+        ),
+    ]
diff --git a/sbhs/migrations/0003_auto_20180810_1743.py b/sbhs/migrations/0003_auto_20180810_1743.py
deleted file mode 100644
index 6bc2610..0000000
--- a/sbhs/migrations/0003_auto_20180810_1743.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11 on 2018-08-10 12:13
-from __future__ import unicode_literals
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('sbhs', '0002_auto_20180807_1416'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='booking',
-            name='slot',
-        ),
-        migrations.RemoveField(
-            model_name='booking',
-            name='user',
-        ),
-        migrations.RemoveField(
-            model_name='experiment',
-            name='booking',
-        ),
-        migrations.AddField(
-            model_name='experiment',
-            name='slot',
-            field=models.ForeignKey(default='', on_delete=django.db.models.deletion.CASCADE, to='sbhs.Slot'),
-        ),
-        migrations.AddField(
-            model_name='slot',
-            name='user',
-            field=models.OneToOneField(default='', on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.DeleteModel(
-            name='Booking',
-        ),
-    ]
diff --git a/sbhs/migrations/0003_auto_20180906_1811.py b/sbhs/migrations/0003_auto_20180906_1811.py
new file mode 100644
index 0000000..a5b146e
--- /dev/null
+++ b/sbhs/migrations/0003_auto_20180906_1811.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-09-06 12:41
+from __future__ import unicode_literals
+
+import datetime
+from django.db import migrations, models
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sbhs', '0002_auto_20180906_1808'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='slot',
+            name='end_time',
+            field=models.DateTimeField(default=datetime.datetime(2018, 9, 6, 13, 36, 43, 319338, tzinfo=utc), verbose_name='End time of a slot'),
+        ),
+        migrations.AlterField(
+            model_name='slot',
+            name='start_time',
+            field=models.DateTimeField(default=datetime.datetime(2018, 9, 6, 12, 41, 43, 319308, tzinfo=utc), verbose_name='Start time of a slot'),
+        ),
+    ]
diff --git a/sbhs/migrations/0004_auto_20180810_1744.py b/sbhs/migrations/0004_auto_20180810_1744.py
deleted file mode 100644
index eb729c2..0000000
--- a/sbhs/migrations/0004_auto_20180810_1744.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11 on 2018-08-10 12:14
-from __future__ import unicode_literals
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('sbhs', '0003_auto_20180810_1743'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='experiment',
-            name='slot',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='sbhs.Slot'),
-        ),
-        migrations.AlterField(
-            model_name='slot',
-            name='user',
-            field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-    ]
diff --git a/sbhs/migrations/0004_auto_20180919_1457.py b/sbhs/migrations/0004_auto_20180919_1457.py
new file mode 100644
index 0000000..3ca9ce8
--- /dev/null
+++ b/sbhs/migrations/0004_auto_20180919_1457.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-09-19 09:27
+from __future__ import unicode_literals
+
+import datetime
+from django.db import migrations, models
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sbhs', '0003_auto_20180906_1811'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='slot',
+            name='end_time',
+            field=models.DateTimeField(default=datetime.datetime(2018, 9, 19, 10, 22, 15, 707069, tzinfo=utc), verbose_name='End time of a slot'),
+        ),
+        migrations.AlterField(
+            model_name='slot',
+            name='start_time',
+            field=models.DateTimeField(default=datetime.datetime(2018, 9, 19, 9, 27, 15, 707039, tzinfo=utc), verbose_name='Start time of a slot'),
+        ),
+    ]
diff --git a/sbhs/migrations/0005_auto_20180813_1853.py b/sbhs/migrations/0005_auto_20180813_1853.py
deleted file mode 100644
index 790a00f..0000000
--- a/sbhs/migrations/0005_auto_20180813_1853.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11 on 2018-08-13 13:23
-from __future__ import unicode_literals
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('sbhs', '0004_auto_20180810_1744'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='slot',
-            name='user',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-    ]
diff --git a/sbhs/migrations/0005_auto_20180919_1539.py b/sbhs/migrations/0005_auto_20180919_1539.py
new file mode 100644
index 0000000..49ee08c
--- /dev/null
+++ b/sbhs/migrations/0005_auto_20180919_1539.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-09-19 10:09
+from __future__ import unicode_literals
+
+import datetime
+from django.db import migrations, models
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sbhs', '0004_auto_20180919_1457'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='slot',
+            name='end_time',
+            field=models.DateTimeField(default=datetime.datetime(2018, 9, 19, 11, 4, 39, 103689, tzinfo=utc), verbose_name='End time of a slot'),
+        ),
+        migrations.AlterField(
+            model_name='slot',
+            name='start_time',
+            field=models.DateTimeField(default=datetime.datetime(2018, 9, 19, 10, 10, 39, 103655, tzinfo=utc), verbose_name='Start time of a slot'),
+        ),
+    ]