migrate conflic fix

ofu_app/apps/events/migrations/0001_initial.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# Generated by Django 1.11.2 on 2017-10-02 20:56
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -7,6 +8,8 @@ import django.utils.timezone
 
 class Migration(migrations.Migration):
 
+    initial = True
+
     dependencies = [
     ]
 
@@ -14,7 +17,7 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Event',
             fields=[
-                ('id', models.AutoField(serialize=False, primary_key=True)),
+                ('id', models.AutoField(primary_key=True, serialize=False)),
                 ('title', models.CharField(max_length=60)),
                 ('category', models.CharField(max_length=60)),
                 ('link', models.CharField(max_length=60)),

ofu_app/apps/food/migrations/0001_initial.py

@@ -1,10 +1,9 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2017-09-29 15:05
+# Generated by Django 1.11.2 on 2017-10-02 20:56
 from __future__ import unicode_literals
 
 from django.db import migrations, models
 import django.utils.timezone
-import uuid
 
 
 class Migration(migrations.Migration):
@@ -18,33 +17,40 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='HappyHour',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('id', models.AutoField(primary_key=True, serialize=False)),
-                ('uuid', models.UUIDField(default=uuid.UUID('69752d6c-688a-4fa4-ade8-8dba8f6f45e7'), unique=True)),
+                ('date', models.DateField(default=django.utils.timezone.now)),
-                ('date', models.DateField(default=django.utils.timezone.now, unique=True)),
+                ('starttime', models.DateField(default=django.utils.timezone.now)),
-                ('location', models.CharField(max_length=60, unique=True)),
+                ('endtime', models.DateField(default=django.utils.timezone.now)),
-                ('description', models.CharField(max_length=60, unique=True)),
+                ('location', models.CharField(max_length=60)),
+                ('description', models.CharField(max_length=60)),
             ],
         ),
         migrations.CreateModel(
             name='Menu',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('id', models.AutoField(primary_key=True, serialize=False)),
-                ('uuid', models.UUIDField(default=uuid.UUID('9cee3b25-b9ef-4202-bb6d-2ae40d67d8ce'), unique=True)),
+                ('date', models.DateField(default=django.utils.timezone.now)),
-                ('date', models.DateField(default=django.utils.timezone.now, unique=True)),
+                ('location', models.CharField(max_length=60)),
-                ('location', models.CharField(max_length=60, unique=True)),
             ],
         ),
         migrations.CreateModel(
             name='SingleFood',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('id', models.AutoField(primary_key=True, serialize=False)),
-                ('uuid', models.UUIDField(default=uuid.UUID('6086ff0b-2216-439b-a7f7-e6360aa12df7'), unique=True)),
                 ('name', models.CharField(max_length=60, unique=True)),
             ],
         ),
         migrations.AddField(
             model_name='menu',
             name='menu',
-            field=models.ManyToManyField(to='apps.food.SingleFood'),
+            field=models.ManyToManyField(to='food.SingleFood'),
+        ),
+        migrations.AlterUniqueTogether(
+            name='happyhour',
+            unique_together=set([('date', 'location')]),
+        ),
+        migrations.AlterUniqueTogether(
+            name='menu',
+            unique_together=set([('date', 'location')]),
         ),
     ]

ofu_app/apps/food/migrations/0002_auto_20170929_1611.py

@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('food', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='happyhour',
-            name='uuid',
-        ),
-        migrations.RemoveField(
-            model_name='menu',
-            name='uuid',
-        ),
-        migrations.RemoveField(
-            model_name='singlefood',
-            name='uuid',
-        ),
-        migrations.AlterField(
-            model_name='happyhour',
-            name='id',
-            field=models.AutoField(serialize=False, primary_key=True),
-        ),
-        migrations.AlterField(
-            model_name='menu',
-            name='id',
-            field=models.AutoField(serialize=False, primary_key=True),
-        ),
-        migrations.AlterField(
-            model_name='singlefood',
-            name='id',
-            field=models.AutoField(serialize=False, primary_key=True),
-        ),
-    ]

ofu_app/apps/food/migrations/0003_auto_20170929_1614.py

@@ -1,45 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.utils.timezone
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('food', '0002_auto_20170929_1611'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='happyhour',
-            name='date',
-            field=models.DateField(default=django.utils.timezone.now),
-        ),
-        migrations.AlterField(
-            model_name='happyhour',
-            name='description',
-            field=models.CharField(max_length=60),
-        ),
-        migrations.AlterField(
-            model_name='happyhour',
-            name='location',
-            field=models.CharField(max_length=60),
-        ),
-        migrations.AlterField(
-            model_name='menu',
-            name='date',
-            field=models.DateField(default=django.utils.timezone.now),
-        ),
-        migrations.AlterField(
-            model_name='menu',
-            name='location',
-            field=models.CharField(max_length=60),
-        ),
-        migrations.AlterField(
-            model_name='singlefood',
-            name='name',
-            field=models.CharField(max_length=60),
-        ),
-    ]

ofu_app/apps/food/migrations/0004_auto_20170929_1907.py

@@ -1,39 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import datetime
-from django.utils.timezone import utc
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('food', '0003_auto_20170929_1614'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='happyhour',
-            name='endtime',
-            field=models.DateField(default=datetime.datetime(2017, 9, 29, 19, 7, 24, 668322, tzinfo=utc)),
-        ),
-        migrations.AddField(
-            model_name='happyhour',
-            name='starttime',
-            field=models.DateField(default=datetime.datetime(2017, 9, 29, 19, 7, 24, 668291, tzinfo=utc)),
-        ),
-        migrations.AlterField(
-            model_name='singlefood',
-            name='name',
-            field=models.CharField(unique=True, max_length=60),
-        ),
-        migrations.AlterUniqueTogether(
-            name='happyhour',
-            unique_together=set([('date', 'location')]),
-        ),
-        migrations.AlterUniqueTogether(
-            name='menu',
-            unique_together=set([('date', 'location')]),
-        ),
-    ]

ofu_app/apps/food/migrations/0005_auto_20170929_1909.py

@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.utils.timezone
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('food', '0004_auto_20170929_1907'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='happyhour',
-            name='endtime',
-            field=models.DateField(default=django.utils.timezone.now),
-        ),
-        migrations.AlterField(
-            model_name='happyhour',
-            name='starttime',
-            field=models.DateField(default=django.utils.timezone.now),
-        ),
-    ]

ofu_app/apps/food/models.py

@@ -13,19 +13,19 @@ class Menu(models.Model):
     location = models.CharField(max_length=MAX_LENGTH)
     menu = models.ManyToManyField("SingleFood")
 
-    def __str__(self):
-        return str(self.date.strftime("%d.%m.%Y"))
-
     class Meta:
         unique_together = ('date', 'location')
 
+    # def __str__(self):
+    #    return self.date.strftime("%d.%m.%Y")
+
 
 class SingleFood(models.Model):
     id = models.AutoField(primary_key=True)
     name = models.CharField(unique=True, max_length=MAX_LENGTH)
 
-    def __str__(self):
+    # def __str__(self):
-        return str(self.name)
+    #    return self.name
 
 
 class HappyHour(models.Model):
@@ -36,8 +36,8 @@ class HappyHour(models.Model):
     location = models.CharField(max_length=MAX_LENGTH)
     description = models.CharField(max_length=MAX_LENGTH)
 
-    def __str__(self):
-        return "Date: %s, Location: %s" % (self.date.strftime("%Y.%m.%d"), self.location)
-
     class Meta:
         unique_together = ('date', 'location')
+
+    # def __str__(self):
+    #    return "Date: %s, Location: %s" % (self.date.strftime("%Y.%m.%d"), self.location)