Merge branch 'master' of https://github.coventry.ac.uk/elgezirn/Equal…

…-Distribution-maintenance-system into Miracle

.vscode/settings.json

@@ -1,2 +1,6 @@
 {
+<<<<<<< HEAD
+=======
+    "python.pythonPath": "C:\\Users\\antre\\.virtualenvs\\Equal-Distribution-maintenance-system-0ZHuoetA\\Scripts\\python.exe"
+>>>>>>> 3e64449142817115e09393567b9c787f9ffd8d52
 }

EDMS/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "python.pythonPath": "/Users/nourelgeziry/.local/share/virtualenvs/Equal_Distribution_maintainance-M-bcKwQz/bin/python"
+}

EDMS/EDMS/__init__.py

@@ -0,0 +1,3 @@
+# This will make sure the app is always imported when
+
+__all__ = ('celery_app',)

EDMS/EDMS/settings.py

@@ -37,6 +37,8 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+
+
     'shoppingCart',
 
 ]
@@ -83,6 +85,9 @@ DATABASES = {
 }
 
 
+
+
+
 # Password validation
 # https://docs.djangoproject.com/en/3.1/ref/settings/#auth-password-validators
 
@@ -128,4 +133,5 @@ STATICFILES_DIRS = [
 
 ]
 
-MEDIA_ROOT =    BASE_DIR / 'static/images'
+MEDIA_ROOT =    BASE_DIR / 'static/images'
+

EDMS/shoppingCart/admin.py

@@ -7,4 +7,7 @@ admin.site.register(Product)
 admin.site.register(Order)
 admin.site.register(OrderItem)
 admin.site.register(Store)
-admin.site.register(StoreOrder)
+admin.site.register(StoreOrder)
+admin.site.register(DisabledID)
+admin.site.register(delivery)
+#comment or something 

EDMS/shoppingCart/forms.py

@@ -4,4 +4,4 @@ from .models import Store, Order
 class OrderForm(ModelForm):
 	class Meta:
 		model = Order
-		fields = '__all__'
+		fields = '__all__'

EDMS/shoppingCart/migrations/0004_auto_20201016_1152.py

@@ -0,0 +1,25 @@
+# Generated by Django 3.1.2 on 2020-10-16 11:52
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('shoppingCart', '0003_auto_20201012_1250'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='orderitem',
+            name='date_created',
+            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='orderitem',
+            name='expired',
+            field=models.BooleanField(default=False),
+        ),
+    ]

EDMS/shoppingCart/migrations/0004_id.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.1.2 on 2020-10-18 04:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('shoppingCart', '0003_auto_20201012_1250'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ID',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('ID_Cus', models.CharField(max_length=200, null=True)),
+            ],
+        ),
+    ]

EDMS/shoppingCart/migrations/0005_deliveries.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.1.2 on 2020-10-18 05:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('shoppingCart', '0004_id'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='deliveries',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('TimeSlot1', models.BooleanField(default=False)),
+                ('TimeSlot2', models.BooleanField(default=False)),
+                ('TimeSlot3', models.BooleanField(default=False)),
+                ('TimeSlot4', models.BooleanField(default=False)),
+            ],
+        ),
+    ]

EDMS/shoppingCart/migrations/0005_test.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.1.2 on 2020-10-16 14:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('shoppingCart', '0004_auto_20201016_1152'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Test',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=4)),
+            ],
+        ),
+    ]

EDMS/shoppingCart/migrations/0006_auto_20201018_0602.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.1.2 on 2020-10-18 05:02
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('shoppingCart', '0005_deliveries'),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name='deliveries',
+            new_name='DeliveriesSlots',
+        ),
+    ]

EDMS/shoppingCart/migrations/0006_auto_20201018_1229.py

@@ -0,0 +1,26 @@
+# Generated by Django 3.1.2 on 2020-10-18 12:29
+
+import datetime
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('shoppingCart', '0005_test'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='order',
+            name='date_created',
+            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='order',
+            name='expiry_date',
+            field=models.DateTimeField(default=datetime.datetime(2020, 10, 18, 12, 30, 18, 872950)),
+        ),
+    ]

EDMS/shoppingCart/migrations/0007_auto_20201018_0607.py

@@ -0,0 +1,33 @@
+# Generated by Django 3.1.2 on 2020-10-18 05:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('shoppingCart', '0006_auto_20201018_0602'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='deliveriesslots',
+            name='TimeSlot1',
+            field=models.BooleanField(max_length=200, null=True),
+        ),
+        migrations.AlterField(
+            model_name='deliveriesslots',
+            name='TimeSlot2',
+            field=models.BooleanField(max_length=200, null=True),
+        ),
+        migrations.AlterField(
+            model_name='deliveriesslots',
+            name='TimeSlot3',
+            field=models.BooleanField(max_length=200, null=True),
+        ),
+        migrations.AlterField(
+            model_name='deliveriesslots',
+            name='TimeSlot4',
+            field=models.BooleanField(max_length=200, null=True),
+        ),
+    ]

EDMS/shoppingCart/migrations/0007_auto_20201018_1316.py

@@ -0,0 +1,28 @@
+# Generated by Django 3.1.2 on 2020-10-18 13:16
+
+import datetime
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('shoppingCart', '0006_auto_20201018_1229'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='orderitem',
+            name='expired',
+        ),
+        migrations.AddField(
+            model_name='order',
+            name='expired',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='order',
+            name='expiry_date',
+            field=models.DateTimeField(default=datetime.datetime(2020, 10, 18, 13, 17, 6, 8469)),
+        ),
+    ]

EDMS/shoppingCart/migrations/0008_auto_20201018_0609.py

@@ -0,0 +1,33 @@
+# Generated by Django 3.1.2 on 2020-10-18 05:09
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('shoppingCart', '0007_auto_20201018_0607'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='deliveriesslots',
+            name='TimeSlot1',
+            field=models.BooleanField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='deliveriesslots',
+            name='TimeSlot2',
+            field=models.BooleanField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='deliveriesslots',
+            name='TimeSlot3',
+            field=models.BooleanField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='deliveriesslots',
+            name='TimeSlot4',
+            field=models.BooleanField(null=True),
+        ),
+    ]

EDMS/shoppingCart/migrations/0008_auto_20201018_1342.py

@@ -0,0 +1,29 @@
+# Generated by Django 3.1.2 on 2020-10-18 13:42
+
+import datetime
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('shoppingCart', '0007_auto_20201018_1316'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='orderitem',
+            name='expired',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='order',
+            name='date_created',
+            field=models.DateTimeField(verbose_name=datetime.datetime(2020, 10, 18, 13, 42, 9, 885618)),
+        ),
+        migrations.AlterField(
+            model_name='order',
+            name='expiry_date',
+            field=models.DateTimeField(default=datetime.datetime(2020, 10, 18, 13, 43, 9, 885636)),
+        ),
+    ]

EDMS/shoppingCart/migrations/0009_auto_20201018_0612.py

@@ -0,0 +1,33 @@
+# Generated by Django 3.1.2 on 2020-10-18 05:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('shoppingCart', '0008_auto_20201018_0609'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='deliveriesslots',
+            name='TimeSlot1',
+            field=models.CharField(max_length=200, null=True),
+        ),
+        migrations.AlterField(
+            model_name='deliveriesslots',
+            name='TimeSlot2',
+            field=models.CharField(max_length=200, null=True),
+        ),
+        migrations.AlterField(
+            model_name='deliveriesslots',
+            name='TimeSlot3',
+            field=models.CharField(max_length=200, null=True),
+        ),
+        migrations.AlterField(
+            model_name='deliveriesslots',
+            name='TimeSlot4',
+            field=models.CharField(max_length=200, null=True),
+        ),
+    ]

EDMS/shoppingCart/migrations/0009_auto_20201018_1354.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.1.2 on 2020-10-18 13:54
+
+import datetime
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('shoppingCart', '0008_auto_20201018_1342'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='order',
+            name='date_created',
+        ),
+        migrations.AlterField(
+            model_name='order',
+            name='expiry_date',
+            field=models.DateTimeField(default=datetime.datetime(2020, 10, 18, 13, 55, 33, 184566)),
+        ),
+    ]