From 8655427df6d787f788fdf1b303493e389a01f099 Mon Sep 17 00:00:00 2001 From: bashmak Date: Mon, 4 Sep 2017 16:21:28 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=B6=D0=B0=D1=82=D0=B8=D0=B5=20=D0=BC?= =?UTF-8?q?=D0=B8=D0=B3=D1=80=D0=B0=D1=86=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0001_squashed_0022_auto_20170816_1109.py | 334 ++++++++++++++++++ .../0001_squashed_0007_auto_20170816_1109.py | 92 +++++ devapp/migrations/0002_device_user_group.py | 22 ++ 3 files changed, 448 insertions(+) create mode 100644 abonapp/migrations/0001_squashed_0022_auto_20170816_1109.py create mode 100644 devapp/migrations/0001_squashed_0007_auto_20170816_1109.py create mode 100644 devapp/migrations/0002_device_user_group.py diff --git a/abonapp/migrations/0001_squashed_0022_auto_20170816_1109.py b/abonapp/migrations/0001_squashed_0022_auto_20170816_1109.py new file mode 100644 index 0000000..9e94ff7 --- /dev/null +++ b/abonapp/migrations/0001_squashed_0022_auto_20170816_1109.py @@ -0,0 +1,334 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2017-09-04 16:15 +from __future__ import unicode_literals + +from django.conf import settings +import django.core.validators +from django.db import migrations, models +import django.db.models.deletion +import mydefs +import re + + +class Migration(migrations.Migration): + + replaces = [('abonapp', '0001_initial'), ('abonapp', '0002_auto_20161206_2135'), ('abonapp', '0003_abongroup_profiles'), ('abonapp', '0004_auto_20161220_0102'), ('abonapp', '0005_auto_20161226_0054'), ('abonapp', '0006_auto_20170128_1626'), ('abonapp', '0007_auto_20170131_1650'), ('abonapp', '0008_auto_20170209_0002'), ('abonapp', '0009_abontariff_death_line'), ('abonapp', '0010_auto_20170220_1630'), ('abonapp', '0011_auto_20170222_2224'), ('abonapp', '0012_auto_20170227_1718'), ('abonapp', '0013_abongroup_tariffs'), ('abonapp', '0014_auto_20170330_1452'), ('abonapp', '0015_passportinfo'), ('abonapp', '0016_auto_20170415_1311'), ('abonapp', '0017_auto_20170416_1029'), ('abonapp', '0018_auto_20170418_1236'), ('abonapp', '0019_abon_ip_address'), ('abonapp', '0020_auto_20170517_1655'), ('abonapp', '0021_auto_20170705_1403'), ('abonapp', '0022_auto_20170816_1109')] + + initial = True + + dependencies = [ + ('devapp', '0001_squashed_0007_auto_20170816_1109'), + ('tariff_app', '0002_tariff_descr'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('accounts_app', '0001_initial'), + ('tariff_app', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='Abon', + fields=[ + ('userprofile_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to=settings.AUTH_USER_MODEL)), + ('ballance', models.FloatField(default=0.0, validators=[django.core.validators.DecimalValidator])), + ('address', models.CharField(max_length=256)), + ], + options={ + 'db_table': 'abonent', + }, + bases=('accounts_app.userprofile',), + ), + migrations.CreateModel( + name='AbonGroup', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('title', models.CharField(max_length=127, unique=True)), + ], + options={ + 'db_table': 'abonent_groups', + }, + ), + migrations.CreateModel( + name='AbonLog', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('amount', models.FloatField(default=0.0)), + ('comment', models.CharField(max_length=128)), + ('date', models.DateTimeField(auto_now_add=True)), + ('abon', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='abonapp.Abon')), + ('author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to=settings.AUTH_USER_MODEL)), + ], + options={ + 'db_table': 'abonent_log', + }, + ), + migrations.CreateModel( + name='AbonTariff', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('tariff_priority', models.PositiveSmallIntegerField(default=0)), + ('time_start', models.DateTimeField(blank=True, default=None, null=True)), + ('abon', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='abonapp.Abon')), + ('tariff', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='linkto_tariff', to='tariff_app.Tariff')), + ], + options={ + 'ordering': ('tariff_priority',), + 'db_table': 'abonent_tariff', + }, + ), + migrations.CreateModel( + name='InvoiceForPayment', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('status', models.BooleanField(default=False)), + ('amount', models.FloatField(default=0.0)), + ('comment', models.CharField(max_length=128)), + ('date_create', models.DateTimeField(auto_now_add=True)), + ('date_pay', models.DateTimeField(blank=True, null=True)), + ('abon', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='abonapp.Abon')), + ('author', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)), + ], + options={ + 'ordering': ('date_create',), + 'db_table': 'abonent_inv_pay', + }, + ), + migrations.AddField( + model_name='abon', + name='current_tariffs', + field=models.ManyToManyField(through='abonapp.AbonTariff', to='tariff_app.Tariff'), + ), + migrations.AddField( + model_name='abon', + name='group', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='abonapp.AbonGroup'), + ), + migrations.AlterUniqueTogether( + name='abontariff', + unique_together=set([('abon', 'tariff', 'tariff_priority')]), + ), + migrations.AddField( + model_name='abongroup', + name='profiles', + field=models.ManyToManyField(blank=True, related_name='abon_groups', to=settings.AUTH_USER_MODEL), + ), + migrations.AlterModelOptions( + name='abon', + options={'permissions': (('can_buy_tariff', 'Покупка тарифа абоненту'),)}, + ), + migrations.AlterModelOptions( + name='abongroup', + options={'permissions': (('can_add_ballance', 'Пополнение счёта'),)}, + ), + migrations.AlterModelOptions( + name='abontariff', + options={'ordering': ('tariff_priority',), 'permissions': (('can_complete_service', 'Досрочное завершение услуги абонента'), ('can_activate_service', 'Активация услуги абонента'))}, + ), + migrations.CreateModel( + name='AbonStreet', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=64)), + ('group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='abonapp.AbonGroup')), + ], + ), + migrations.RemoveField( + model_name='abon', + name='address', + ), + migrations.AddField( + model_name='abon', + name='description', + field=models.TextField(blank=True, null=True), + ), + migrations.AddField( + model_name='abon', + name='house', + field=models.CharField(blank=True, max_length=12, null=True), + ), + migrations.AddField( + model_name='abon', + name='street', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='abonapp.AbonStreet'), + ), + migrations.CreateModel( + name='AllPayLog', + fields=[ + ('pay_id', models.CharField(max_length=64, primary_key=True, serialize=False)), + ('date_action', models.DateTimeField(auto_now_add=True)), + ('summ', models.FloatField(default=0.0)), + ('pay_system_name', models.CharField(max_length=16)), + ], + options={ + 'db_table': 'all_pay_log', + 'ordering': ('date_action',), + }, + ), + migrations.CreateModel( + name='AllTimePayLog', + fields=[ + ('pay_id', models.CharField(max_length=36, primary_key=True, serialize=False, unique=True)), + ('date_add', models.DateTimeField(auto_now_add=True)), + ('summ', models.FloatField(default=0.0)), + ], + options={ + 'db_table': 'all_time_pay_log', + 'ordering': ('date_add',), + }, + ), + migrations.CreateModel( + name='AbonRawPassword', + fields=[ + ('account', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='abonapp.Abon')), + ('passw_text', models.CharField(max_length=64)), + ], + options={ + 'db_table': 'abon_raw_password', + }, + ), + migrations.AlterModelTable( + name='abonstreet', + table='abon_street', + ), + migrations.AddField( + model_name='abontariff', + name='deadline', + field=models.DateTimeField(blank=True, default=None, null=True), + ), + migrations.CreateModel( + name='ExtraFieldsModel', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('field_type', models.CharField(choices=[('int', 'Цифровое поле'), ('str', 'Текстовое поле'), ('dbl', 'Дробное с плавающей точкой'), ('ipa', 'IP Адрес')], default='str', max_length=3)), + ('data', models.CharField(blank=True, max_length=64, null=True)), + ('title', models.CharField(default='no title', max_length=16)), + ], + options={ + 'db_table': 'abon_extra_fields', + }, + ), + migrations.AlterModelOptions( + name='abon', + options={'permissions': (('can_buy_tariff', 'Покупка тарифа абоненту'), ('can_view_passport', 'Can view passport'))}, + ), + migrations.AlterModelOptions( + name='abontariff', + options={'ordering': ('tariff_priority',), 'permissions': (('can_complete_service', 'Снятие со счёта средств'), ('can_activate_service', 'Активация услуги абонента'))}, + ), + migrations.AlterField( + model_name='abon', + name='ballance', + field=models.FloatField(default=0.0), + ), + migrations.AlterModelOptions( + name='abon', + options={'permissions': (('can_buy_tariff', 'Покупка тарифа абоненту'), ('can_view_passport', 'Может просматривать паспортные данные'))}, + ), + migrations.AddField( + model_name='abon', + name='extra_fields', + field=models.ManyToManyField(blank=True, to='abonapp.ExtraFieldsModel'), + ), + migrations.AddField( + model_name='abongroup', + name='tariffs', + field=models.ManyToManyField(blank=True, related_name='tariff_groups', to='tariff_app.Tariff'), + ), + migrations.AddField( + model_name='abon', + name='opt82', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='abonapp.Opt82'), + ), + migrations.CreateModel( + name='PassportInfo', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('series', models.CharField(max_length=4, validators=[django.core.validators.RegexValidator(re.compile('^-?\\d+\\Z', 32), code='invalid', message='Enter a valid integer.')])), + ('number', models.CharField(max_length=6, validators=[django.core.validators.RegexValidator(re.compile('^-?\\d+\\Z', 32), code='invalid', message='Enter a valid integer.')])), + ('distributor', models.CharField(max_length=64)), + ('date_of_acceptance', models.DateField()), + ('abon', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='abonapp.Abon')), + ], + ), + migrations.AlterField( + model_name='abon', + name='opt82', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='abonapp.Opt82'), + ), + migrations.CreateModel( + name='AbonDevice', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('abon', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='abonapp.Abon')), + ('device', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='devapp.Device')), + ], + options={ + 'db_table': 'abon_device', + }, + ), + migrations.AlterUniqueTogether( + name='abondevice', + unique_together=set([('abon', 'device')]), + ), + migrations.AlterField( + model_name='abondevice', + name='abon', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='abonapp.Abon'), + ), + migrations.AlterField( + model_name='abondevice', + name='device', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='devapp.Device'), + ), + migrations.AddField( + model_name='abon', + name='ip_address', + field=mydefs.MyGenericIPAddressField(blank=True, max_length=8, null=True, protocol='ipv4'), + ), + migrations.RemoveField( + model_name='abon', + name='opt82', + ), + migrations.AddField( + model_name='abon', + name='dev_port', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='devapp.Port'), + ), + migrations.AddField( + model_name='abon', + name='device', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='devapp.Device'), + ), + migrations.AddField( + model_name='abon', + name='is_dynamic_ip', + field=models.BooleanField(default=False), + ), + migrations.DeleteModel( + name='AbonDevice', + ), + migrations.AlterModelOptions( + name='abontariff', + options={'permissions': (('can_complete_service', 'Снятие со счёта средств'),)}, + ), + migrations.RemoveField( + model_name='abon', + name='current_tariffs', + ), + migrations.AddField( + model_name='abon', + name='current_tariff', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='abonapp.AbonTariff'), + ), + migrations.AlterUniqueTogether( + name='abontariff', + unique_together=set([]), + ), + migrations.RemoveField( + model_name='abontariff', + name='abon', + ), + migrations.RemoveField( + model_name='abontariff', + name='tariff_priority', + ), + ] diff --git a/devapp/migrations/0001_squashed_0007_auto_20170816_1109.py b/devapp/migrations/0001_squashed_0007_auto_20170816_1109.py new file mode 100644 index 0000000..11827a5 --- /dev/null +++ b/devapp/migrations/0001_squashed_0007_auto_20170816_1109.py @@ -0,0 +1,92 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2017-09-04 16:14 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion +import djing.fields +import mydefs + + +class Migration(migrations.Migration): + + replaces = [('devapp', '0001_initial'), ('devapp', '0002_auto_20160909_1018'), ('devapp', '0003_device_map_dot'), ('devapp', '0004_device_user_group'), ('devapp', '0005_auto_20170502_2232'), ('devapp', '0006_auto_20170705_1403'), ('devapp', '0007_auto_20170816_1109')] + + initial = True + + dependencies = [ + ('mapapp', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='Device', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('ip_address', mydefs.MyGenericIPAddressField(max_length=8, protocol='ipv4')), + ('comment', models.CharField(max_length=256)), + ('devtype', models.CharField(choices=[('Dl', "Свич D'Link")], default='Dl', max_length=2)), + ('man_passw', models.CharField(blank=True, max_length=16, null=True)), + ], + ), + migrations.CreateModel( + name='Port', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('num', models.PositiveSmallIntegerField(default=0)), + ('speed', models.CharField(choices=[('h', '100Mbps'), ('k', '1Gbps'), ('d', '10Gbps')], default='h', max_length=1)), + ('device', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='devapp.Device')), + ], + ), + migrations.AlterUniqueTogether( + name='port', + unique_together=set([('device', 'num')]), + ), + migrations.AlterModelTable( + name='device', + table='dev', + ), + migrations.AlterModelTable( + name='port', + table='dev_port', + ), + migrations.AddField( + model_name='device', + name='map_dot', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='mapapp.Dot'), + ), + migrations.AlterField( + model_name='device', + name='devtype', + field=models.CharField(choices=[('Dl', 'DLink switch'), ('Pn', 'PON OLT')], default='Dl', max_length=2), + ), + migrations.RemoveField( + model_name='port', + name='speed', + ), + migrations.AddField( + model_name='device', + name='mac_addr', + field=djing.fields.MACAddressField(blank=True, integer=True, null=True, unique=True), + ), + migrations.AddField( + model_name='device', + name='parent_dev', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='devapp.Device'), + ), + migrations.AddField( + model_name='port', + name='descr', + field=models.CharField(blank=True, max_length=60, null=True), + ), + migrations.AlterField( + model_name='device', + name='devtype', + field=models.CharField(choices=[('Dl', 'DLink switch'), ('Pn', 'PON OLT'), ('On', 'PON ONU')], default='Dl', max_length=2), + ), + migrations.AlterField( + model_name='device', + name='devtype', + field=models.CharField(choices=[('Dl', 'DLink switch'), ('Pn', 'PON OLT'), ('On', 'PON ONU'), ('Ex', 'Eltex switch')], default='Dl', max_length=2), + ), + ] diff --git a/devapp/migrations/0002_device_user_group.py b/devapp/migrations/0002_device_user_group.py new file mode 100644 index 0000000..7fbbecb --- /dev/null +++ b/devapp/migrations/0002_device_user_group.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2017-09-04 16:16 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('abonapp', '0001_squashed_0022_auto_20170816_1109'), + ('devapp', '0001_squashed_0007_auto_20170816_1109'), + ] + + operations = [ + migrations.AddField( + model_name='device', + name='user_group', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='abonapp.AbonGroup'), + ), + ]