Skip to content
Permalink
Browse files
Added Andreas's feature
  • Loading branch information
Nour Elgeziry authored and Nour Elgeziry committed Oct 21, 2020
2 parents 07428d4 + 0e99d36 commit b78fd4e277ce69fb71ec15d28581b82f2cc252d8
Show file tree
Hide file tree
Showing 57 changed files with 902 additions and 92 deletions.
@@ -1,3 +1,3 @@
{
"python.pythonPath": "/Users/nourelgeziry/.local/share/virtualenvs/Equal_Distribution_maintainance-M-bcKwQz/bin/python"
"python.pythonPath": "C:\\Users\\antre\\.virtualenvs\\Equal-Distribution-maintenance-system-0ZHuoetA\\Scripts\\python.exe"
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN +12 KB (110%) EDMS/db.sqlite3
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -6,4 +6,6 @@ admin.site.register(Customer)
admin.site.register(Product)
admin.site.register(Order)
admin.site.register(OrderItem)
admin.site.register(Test)
admin.site.register(DisabledID)
admin.site.register(delivery)
#comment or something
@@ -0,0 +1,8 @@
from django.forms import ModelForm
from .models import *


class idform(ModelForm):
class Meta:
model = DisabledID
fields = '__all__'
@@ -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)),
],
),
]
@@ -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)),
],
),
]
@@ -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',
),
]
@@ -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),
),
]
@@ -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),
),
]
@@ -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),
),
]
@@ -0,0 +1,23 @@
# Generated by Django 3.1.2 on 2020-10-20 02:51

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('shoppingCart', '0009_auto_20201018_0612'),
]

operations = [
migrations.CreateModel(
name='DeliverySlots',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('TimeSlot1', models.BooleanField(blank=True, default=False, null=True)),
],
),
migrations.DeleteModel(
name='DeliveriesSlots',
),
]
@@ -0,0 +1,23 @@
# Generated by Django 3.1.2 on 2020-10-20 02:55

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('shoppingCart', '0010_auto_20201020_0351'),
]

operations = [
migrations.CreateModel(
name='delivery',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('timeslot1', models.BooleanField(blank=True, default=False, null=True)),
],
),
migrations.DeleteModel(
name='DeliverySlots',
),
]
@@ -0,0 +1,28 @@
# Generated by Django 3.1.2 on 2020-10-20 02:56

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('shoppingCart', '0011_auto_20201020_0355'),
]

operations = [
migrations.AddField(
model_name='delivery',
name='timeslot2',
field=models.BooleanField(blank=True, default=False, null=True),
),
migrations.AddField(
model_name='delivery',
name='timeslot3',
field=models.BooleanField(blank=True, default=False, null=True),
),
migrations.AddField(
model_name='delivery',
name='timeslot4',
field=models.BooleanField(blank=True, default=False, null=True),
),
]
@@ -0,0 +1,17 @@
# Generated by Django 3.1.2 on 2020-10-20 03:00

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('shoppingCart', '0012_auto_20201020_0356'),
]

operations = [
migrations.RenameModel(
old_name='delivery',
new_name='DeliveriesSlot',
),
]
@@ -0,0 +1,17 @@
# Generated by Django 3.1.2 on 2020-10-20 03:29

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('shoppingCart', '0013_auto_20201020_0400'),
]

operations = [
migrations.RenameModel(
old_name='DeliveriesSlot',
new_name='delivery',
),
]
@@ -0,0 +1,33 @@
# Generated by Django 3.1.2 on 2020-10-20 04:04

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('shoppingCart', '0014_auto_20201020_0429'),
]

operations = [
migrations.AlterField(
model_name='delivery',
name='timeslot1',
field=models.CharField(max_length=200, null=True),
),
migrations.AlterField(
model_name='delivery',
name='timeslot2',
field=models.CharField(max_length=200, null=True),
),
migrations.AlterField(
model_name='delivery',
name='timeslot3',
field=models.CharField(max_length=200, null=True),
),
migrations.AlterField(
model_name='delivery',
name='timeslot4',
field=models.CharField(max_length=200, null=True),
),
]
@@ -0,0 +1,18 @@
# Generated by Django 3.1.2 on 2020-10-20 04:05

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('shoppingCart', '0015_auto_20201020_0504'),
]

operations = [
migrations.RenameField(
model_name='id',
old_name='ID_Cus',
new_name='ID_Dis',
),
]
@@ -0,0 +1,17 @@
# Generated by Django 3.1.2 on 2020-10-20 12:42

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('shoppingCart', '0016_auto_20201020_0505'),
]

operations = [
migrations.RenameModel(
old_name='ID',
new_name='DisabledID',
),
]

0 comments on commit b78fd4e

Please sign in to comment.