From cec14a882b6088763fb3f0a6168e24e635064da4 Mon Sep 17 00:00:00 2001 From: Mohamed Nouffer Date: Mon, 28 Feb 2022 17:51:56 +0530 Subject: [PATCH] update --- rog/mapping.py | 23 ++- rog/migrations/0001_initial.py | 193 +++++++++++++++++- .../0002_alter_location_location_id.py | 18 ++ rog/migrations/0002_rename_shops_shop.py | 17 -- rog/migrations/0003_eventroute.py | 24 --- rog/migrations/0004_shoproute.py | 24 --- ...r_systemsettings_travellist_travelpoint.py | 162 --------------- rog/migrations/0006_auto_20220222_2308.py | 31 --- rog/migrations/0007_auto_20220222_2320.py | 48 ----- .../0008_alter_location_category.py | 18 -- .../0009_alter_location_last_updated_user.py | 21 -- rog/models.py | 89 +++++--- 12 files changed, 296 insertions(+), 372 deletions(-) create mode 100644 rog/migrations/0002_alter_location_location_id.py delete mode 100644 rog/migrations/0002_rename_shops_shop.py delete mode 100644 rog/migrations/0003_eventroute.py delete mode 100644 rog/migrations/0004_shoproute.py delete mode 100644 rog/migrations/0005_favorite_joinedevent_layer_location_roguser_systemsettings_travellist_travelpoint.py delete mode 100644 rog/migrations/0006_auto_20220222_2308.py delete mode 100644 rog/migrations/0007_auto_20220222_2320.py delete mode 100644 rog/migrations/0008_alter_location_category.py delete mode 100644 rog/migrations/0009_alter_location_last_updated_user.py diff --git a/rog/mapping.py b/rog/mapping.py index ad5b58c..0c6aaf0 100644 --- a/rog/mapping.py +++ b/rog/mapping.py @@ -1,7 +1,26 @@ from django.contrib.gis.utils import LayerMapping location_mapping = { - 'location_name': 'Name', - 'category': 'descriptio', + 'location_id' : 'location_id', + 'location_name' : 'location_name', + 'category': 'category', + 'zip':'zip', + 'address':'address', + 'prefecture':'prefecture', + 'area':'area', + 'city':'city', + 'photos':'photos', + 'videos':'videos', + 'webcontents':'webcontents', + 'status':'status', + 'zportalip':'portal', + 'group':'group', + 'phone':'phone', + 'fax':'fax', + 'email':'email', + 'facility':'facility', + 'remark':'remark', + 'tags':'tags', + 'parammeters':'parammeters', 'geom': 'MULTIPOLYGON', } \ No newline at end of file diff --git a/rog/migrations/0001_initial.py b/rog/migrations/0001_initial.py index 45566d4..278d1e6 100644 --- a/rog/migrations/0001_initial.py +++ b/rog/migrations/0001_initial.py @@ -1,7 +1,9 @@ -# Generated by Django 3.2.9 on 2022-02-04 06:00 +# Generated by Django 3.2.9 on 2022-02-28 05:04 +from django.conf import settings import django.contrib.gis.db.models.fields from django.db import migrations, models +import django.db.models.deletion class Migration(migrations.Migration): @@ -9,9 +11,41 @@ class Migration(migrations.Migration): initial = True dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ + migrations.CreateModel( + name='Location', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('location_id', models.IntegerField(blank=True, null=True, verbose_name='Location Name')), + ('location_name', models.CharField(max_length=255, verbose_name='Location Name')), + ('category', models.CharField(blank=True, max_length=255, null=True, verbose_name='Category')), + ('zip', models.CharField(blank=True, max_length=12, null=True, verbose_name='Zip code')), + ('address', models.CharField(blank=True, max_length=512, null=True, verbose_name='Address')), + ('prefecture', models.CharField(blank=True, max_length=255, null=True, verbose_name='Prefecture')), + ('area', models.CharField(blank=True, max_length=255, null=True, verbose_name='Area')), + ('city', models.CharField(blank=True, max_length=255, null=True, verbose_name='City')), + ('photos', models.JSONField(blank=True, null=True, verbose_name='Phptos')), + ('videos', models.JSONField(blank=True, null=True, verbose_name='Videos')), + ('webcontents', models.JSONField(blank=True, null=True, verbose_name='Web Content')), + ('status', models.CharField(blank=True, max_length=255, null=True, verbose_name='Status')), + ('portal', models.CharField(blank=True, max_length=255, null=True, verbose_name='Status')), + ('group', models.CharField(blank=True, max_length=255, null=True, verbose_name='Status')), + ('phone', models.CharField(blank=True, max_length=255, null=True, verbose_name='Status')), + ('fax', models.CharField(blank=True, max_length=255, null=True, verbose_name='Status')), + ('email', models.EmailField(blank=True, max_length=255, null=True, verbose_name='Email')), + ('facility', models.CharField(blank=True, max_length=255, null=True, verbose_name='Status')), + ('remark', models.CharField(blank=True, max_length=255, null=True, verbose_name='Status')), + ('tags', models.CharField(blank=True, max_length=512, null=True, verbose_name='Tags')), + ('parammeters', models.CharField(blank=True, max_length=512, null=True, verbose_name='Parameters')), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('last_updated_at', models.DateTimeField(auto_now=True)), + ('geom', django.contrib.gis.db.models.fields.MultiPointField(srid=4326)), + ('last_updated_user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='location_updated_user', to=settings.AUTH_USER_MODEL)), + ], + ), migrations.CreateModel( name='RogEvent', fields=[ @@ -23,11 +57,166 @@ class Migration(migrations.Migration): ], ), migrations.CreateModel( - name='Shops', + name='ShapeLayers', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=255, verbose_name='Shape Layer')), + ('file', models.FileField(blank=True, upload_to='%y%m%d')), + ('uploaded_date', models.DateField(auto_now_add=True)), + ('layerof', models.IntegerField(choices=[(1, 'locations')], default=1)), + ('table_name', models.CharField(blank=True, max_length=255, verbose_name='Table name')), + ], + ), + migrations.CreateModel( + name='Shop', fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('name', models.CharField(max_length=255, verbose_name='Shop name')), ('geom', django.contrib.gis.db.models.fields.MultiPointField(srid=4326)), ], ), + migrations.CreateModel( + name='TravelList', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('travel_id', models.IntegerField(verbose_name='Travel Id')), + ('start_date', models.DateTimeField(blank=True, null=True, verbose_name='Start date')), + ('finish_date', models.DateTimeField(blank=True, null=True, verbose_name='End date')), + ('category', models.CharField(choices=[('PRIVATE', 'Private'), ('GROUP', 'Group'), ('AGENT', 'Agent'), ('ROGAINING', 'Rogaining')], max_length=256)), + ('title', models.CharField(max_length=255, verbose_name='Title')), + ('transportation', models.CharField(blank=True, max_length=255, null=True, verbose_name='Transpotation')), + ('moving_distance', models.IntegerField(blank=True, null=True)), + ('duration', models.DurationField(blank=True, null=True, verbose_name='Duration')), + ('eta', models.DateTimeField(blank=True, null=True)), + ('parammeters', models.CharField(blank=True, max_length=512, null=True, verbose_name='Parameters')), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('last_updated_at', models.DateTimeField(auto_now=True)), + ('last_updated_user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='travel_list_updated_user', to=settings.AUTH_USER_MODEL)), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to=settings.AUTH_USER_MODEL)), + ], + ), + migrations.CreateModel( + name='TravelPoint', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('distance', models.FloatField(blank=True, null=True)), + ('transportation', models.CharField(blank=True, max_length=255, null=True, verbose_name='Transpotation')), + ('eta', models.DateTimeField(blank=True, null=True)), + ('order_number', models.IntegerField(blank=True, null=True)), + ('parammeters', models.CharField(blank=True, max_length=512, null=True, verbose_name='Parameters')), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('last_updated_at', models.DateTimeField(auto_now=True)), + ('last_updated_user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='travelpoint_updated_user', to=settings.AUTH_USER_MODEL)), + ('location', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='rog.location')), + ('travel_list', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='rog.travellist')), + ], + ), + migrations.CreateModel( + name='SystemSettings', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('setting_name', models.CharField(max_length=255, verbose_name='Settings Name')), + ('version', models.CharField(blank=True, max_length=10, null=True, verbose_name='Version')), + ('effective_date', models.DateTimeField()), + ('end_date', models.DateTimeField()), + ('parammeters', models.CharField(max_length=512, verbose_name='Parameters')), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('last_updated_at', models.DateTimeField(auto_now=True)), + ('last_updated_user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='system_setting_updated_user', to=settings.AUTH_USER_MODEL)), + ], + ), + migrations.CreateModel( + name='ShopRoute', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=255, verbose_name='Name')), + ('geom', django.contrib.gis.db.models.fields.MultiLineStringField(srid=4326)), + ('shop', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='rog.shop')), + ], + ), + migrations.CreateModel( + name='RogUser', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('email', models.EmailField(max_length=254, verbose_name='Email')), + ('phone', models.CharField(max_length=55, verbose_name='Phone Number')), + ('first_name', models.CharField(max_length=255, verbose_name='First Name')), + ('middle_name', models.CharField(blank=True, max_length=255, null=True, verbose_name='Middle Name')), + ('last_name', models.CharField(max_length=255, verbose_name='last_name')), + ('nickname', models.CharField(blank=True, max_length=255, null=True, verbose_name='Nickname')), + ('country', models.CharField(default='Japan', max_length=255, verbose_name='Country')), + ('language', models.CharField(default='Japanese', max_length=255, verbose_name='Language')), + ('prefecture', models.CharField(blank=True, max_length=255, null=True, verbose_name='Prefecture')), + ('sex', models.CharField(blank=True, default='unknown', max_length=255, null=True, verbose_name='Sex')), + ('birthyear', models.IntegerField(blank=True, null=True, verbose_name='Birth year')), + ('family_structure', models.IntegerField(blank=True, null=True, verbose_name='Family Structure')), + ('level', models.IntegerField(blank=True, default=0, null=True, verbose_name='Level')), + ('parammeters', models.CharField(max_length=512, verbose_name='Parameters')), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('last_updated_at', models.DateTimeField(auto_now=True)), + ('introducer', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='introduced_uesr', to=settings.AUTH_USER_MODEL)), + ('last_updated_user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='roguser_updated_user', to=settings.AUTH_USER_MODEL)), + ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + ), + migrations.CreateModel( + name='JoinedEvent', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('tagname', models.CharField(blank=True, max_length=255, null=True, verbose_name='Tag Name')), + ('status', models.CharField(choices=[('REGISTERED', 'Registered'), ('ACCEPTED', 'accepted'), ('PAID', 'paid'), ('JOINED', 'joined'), ('CANCELED', 'Canceled')], max_length=256)), + ('registrationid', models.CharField(max_length=56, verbose_name='Registration Id')), + ('payment_code', models.CharField(max_length=255, verbose_name='Payment Code')), + ('paid', models.IntegerField(default=0, verbose_name='Paid Amount')), + ('remark', models.CharField(blank=True, max_length=255, null=True, verbose_name='Remark')), + ('parammeters', models.CharField(max_length=512, verbose_name='Parameters')), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('last_updated_at', models.DateTimeField(auto_now=True)), + ('last_updated_user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='joined_event_updated_user', to=settings.AUTH_USER_MODEL)), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to=settings.AUTH_USER_MODEL)), + ], + ), + migrations.CreateModel( + name='Favorite', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('good', models.IntegerField(default=0, verbose_name='Good')), + ('favorite', models.IntegerField(default=0, verbose_name='Favorite')), + ('evaluation', models.IntegerField(default=0, verbose_name='Evaluation')), + ('number_visit', models.IntegerField(default=0, verbose_name='Good')), + ('last_visited', models.DateTimeField(blank=True, null=True, verbose_name='Last Visited')), + ('parammeters', models.CharField(blank=True, max_length=512, null=True, verbose_name='Parameters')), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('last_updated_at', models.DateTimeField(auto_now=True)), + ('last_updated_user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='favorite_updated_user', to=settings.AUTH_USER_MODEL)), + ('location', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='rog.location')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to=settings.AUTH_USER_MODEL)), + ], + ), + migrations.CreateModel( + name='EventRoute', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=255, verbose_name='Name')), + ('geom', django.contrib.gis.db.models.fields.MultiLineStringField(srid=4326)), + ('event', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='rog.rogevent')), + ], + ), + migrations.CreateModel( + name='Event', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('tagname', models.CharField(blank=True, max_length=512, null=True, verbose_name='Parameters')), + ('status', models.CharField(choices=[('PREPARING', 'Preparing'), ('PROMOTION', 'Promotion'), ('EVENT', 'Event'), ('END', 'End')], max_length=256)), + ('price', models.IntegerField(default=0, verbose_name='Paid Amount')), + ('promotion_date', models.DateTimeField(blank=True, null=True, verbose_name='Promotion date')), + ('event_start', models.DateTimeField(blank=True, null=True, verbose_name='Promotion date')), + ('event_end', models.DateTimeField(blank=True, null=True, verbose_name='Promotion date')), + ('remark', models.CharField(blank=True, max_length=256, null=True)), + ('parammeters', models.CharField(blank=True, max_length=512, null=True, verbose_name='Parameters')), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('last_updated_at', models.DateTimeField(auto_now=True)), + ('last_updated_user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='event_updated_user', to=settings.AUTH_USER_MODEL)), + ], + ), ] diff --git a/rog/migrations/0002_alter_location_location_id.py b/rog/migrations/0002_alter_location_location_id.py new file mode 100644 index 0000000..472bdd6 --- /dev/null +++ b/rog/migrations/0002_alter_location_location_id.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.9 on 2022-02-28 12:18 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('rog', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='location', + name='location_id', + field=models.IntegerField(blank=True, null=True, verbose_name='Location id'), + ), + ] diff --git a/rog/migrations/0002_rename_shops_shop.py b/rog/migrations/0002_rename_shops_shop.py deleted file mode 100644 index ca59452..0000000 --- a/rog/migrations/0002_rename_shops_shop.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 3.2.9 on 2022-02-04 11:39 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('rog', '0001_initial'), - ] - - operations = [ - migrations.RenameModel( - old_name='Shops', - new_name='Shop', - ), - ] diff --git a/rog/migrations/0003_eventroute.py b/rog/migrations/0003_eventroute.py deleted file mode 100644 index c207be5..0000000 --- a/rog/migrations/0003_eventroute.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 3.2.9 on 2022-02-04 17:17 - -import django.contrib.gis.db.models.fields -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('rog', '0002_rename_shops_shop'), - ] - - operations = [ - migrations.CreateModel( - name='EventRoute', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=255, verbose_name='Name')), - ('geom', django.contrib.gis.db.models.fields.MultiLineStringField(srid=4326)), - ('event', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='rog.rogevent')), - ], - ), - ] diff --git a/rog/migrations/0004_shoproute.py b/rog/migrations/0004_shoproute.py deleted file mode 100644 index 5171d1c..0000000 --- a/rog/migrations/0004_shoproute.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 3.2.9 on 2022-02-04 17:23 - -import django.contrib.gis.db.models.fields -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('rog', '0003_eventroute'), - ] - - operations = [ - migrations.CreateModel( - name='ShopRoute', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=255, verbose_name='Name')), - ('geom', django.contrib.gis.db.models.fields.MultiLineStringField(srid=4326)), - ('shop', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='rog.shop')), - ], - ), - ] diff --git a/rog/migrations/0005_favorite_joinedevent_layer_location_roguser_systemsettings_travellist_travelpoint.py b/rog/migrations/0005_favorite_joinedevent_layer_location_roguser_systemsettings_travellist_travelpoint.py deleted file mode 100644 index 880d504..0000000 --- a/rog/migrations/0005_favorite_joinedevent_layer_location_roguser_systemsettings_travellist_travelpoint.py +++ /dev/null @@ -1,162 +0,0 @@ -# Generated by Django 3.2.9 on 2022-02-22 12:54 - -from django.conf import settings -import django.contrib.gis.db.models.fields -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('rog', '0004_shoproute'), - ] - - operations = [ - migrations.CreateModel( - name='Layer', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=155, verbose_name='Layer Name')), - ('description', models.CharField(blank=True, max_length=512, verbose_name='Layer description')), - ('file', models.FileField(blank=True, upload_to='%y%m%d')), - ('uploaded_date', models.DateTimeField(auto_now_add=True)), - ], - options={ - 'verbose_name_plural': 'Layers', - }, - ), - migrations.CreateModel( - name='Location', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('location_id', models.IntegerField(verbose_name='Location Name')), - ('location_name', models.CharField(max_length=255, verbose_name='Location Name')), - ('category', models.CharField(max_length=255, verbose_name='Category')), - ('zip', models.CharField(max_length=12, verbose_name='Zip code')), - ('address', models.CharField(max_length=512, verbose_name='Address')), - ('prefecture', models.CharField(max_length=255, verbose_name='Prefecture')), - ('area', models.CharField(max_length=255, verbose_name='Area')), - ('city', models.CharField(max_length=255, verbose_name='City')), - ('photos', models.JSONField(blank=True, null=True, verbose_name='Phptos')), - ('videos', models.JSONField(blank=True, null=True, verbose_name='Videos')), - ('web_content', models.JSONField(blank=True, null=True, verbose_name='Web Content')), - ('tags', models.CharField(blank=True, max_length=512, null=True, verbose_name='Tags')), - ('parammeters', models.CharField(max_length=512, verbose_name='Parameters')), - ('created_at', models.DateTimeField(auto_now_add=True)), - ('last_updated_at', models.DateTimeField(auto_now=True)), - ('geom', django.contrib.gis.db.models.fields.MultiPointField(srid=4326)), - ('file', models.FileField(blank=True, upload_to='%y%m%d')), - ('last_updated_user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='location_updated_user', to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='TravelPoint', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('travel_id', models.IntegerField(verbose_name='Travel Id')), - ('distance', models.FloatField()), - ('transportation', models.CharField(max_length=255, verbose_name='Transpotation')), - ('eta', models.DateTimeField()), - ('order_number', models.IntegerField()), - ('parammeters', models.CharField(max_length=512, verbose_name='Parameters')), - ('created_at', models.DateTimeField(auto_now_add=True)), - ('last_updated_at', models.DateTimeField(auto_now=True)), - ('last_updated_user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='travelpoint_updated_user', to=settings.AUTH_USER_MODEL)), - ('location', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='rog.location')), - ], - ), - migrations.CreateModel( - name='TravelList', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('travel_id', models.IntegerField(verbose_name='Travel Id')), - ('start_date', models.DateTimeField()), - ('finish_date', models.DateTimeField()), - ('category', models.CharField(max_length=255, verbose_name='Category')), - ('title', models.CharField(max_length=255, verbose_name='Title')), - ('transportation', models.CharField(max_length=255, verbose_name='Transpotation')), - ('moving_distance', models.IntegerField()), - ('duration', models.DurationField(verbose_name='Duration')), - ('eta', models.DateTimeField()), - ('parammeters', models.CharField(max_length=512, verbose_name='Parameters')), - ('created_at', models.DateTimeField(auto_now_add=True)), - ('last_updated_at', models.DateTimeField(auto_now=True)), - ('last_updated_user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='travel_list_updated_user', to=settings.AUTH_USER_MODEL)), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='SystemSettings', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('setting_name', models.CharField(max_length=255, verbose_name='Settings Name')), - ('version', models.CharField(blank=True, max_length=10, null=True, verbose_name='Version')), - ('effective_date', models.DateTimeField()), - ('end_date', models.DateTimeField()), - ('parammeters', models.CharField(max_length=512, verbose_name='Parameters')), - ('created_at', models.DateTimeField(auto_now_add=True)), - ('last_updated_at', models.DateTimeField(auto_now=True)), - ('last_updated_user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='system_setting_updated_user', to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='RogUser', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('email', models.EmailField(max_length=254, verbose_name='Email')), - ('phone', models.CharField(max_length=55, verbose_name='Phone Number')), - ('first_name', models.CharField(max_length=255, verbose_name='First Name')), - ('middle_name', models.CharField(blank=True, max_length=255, null=True, verbose_name='Middle Name')), - ('last_name', models.CharField(max_length=255, verbose_name='last_name')), - ('nickname', models.CharField(blank=True, max_length=255, null=True, verbose_name='Nickname')), - ('country', models.CharField(default='Japan', max_length=255, verbose_name='Country')), - ('language', models.CharField(default='Japanese', max_length=255, verbose_name='Language')), - ('prefecture', models.CharField(blank=True, max_length=255, null=True, verbose_name='Prefecture')), - ('sex', models.CharField(blank=True, default='unknown', max_length=255, null=True, verbose_name='Sex')), - ('birth_year', models.IntegerField(blank=True, null=True, verbose_name='Birth year')), - ('family_structure', models.IntegerField(blank=True, null=True, verbose_name='Family Structure')), - ('introducer', models.IntegerField(blank=True, default=0, null=True, verbose_name='Introducerr')), - ('level', models.IntegerField(blank=True, default=0, null=True, verbose_name='Level')), - ('parammeters', models.CharField(max_length=512, verbose_name='Parameters')), - ('created_at', models.DateTimeField(auto_now_add=True)), - ('last_updated_at', models.DateTimeField(auto_now=True)), - ('last_updated_user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='roguser_updated_user', to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='JoinedEvent', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('tag_name', models.CharField(blank=True, max_length=255, null=True, verbose_name='Tag Name')), - ('status', models.CharField(choices=[('REGISTERED', 'Registered'), ('ACCEPTED', 'accepted'), ('PAID', 'paid'), ('JOINED', 'joined'), ('CANCELED', 'Canceled')], max_length=256)), - ('registration_id', models.CharField(max_length=56, verbose_name='Registration Id')), - ('payment_code', models.CharField(max_length=255, verbose_name='Payment Code')), - ('paied_amount', models.IntegerField(default=0, verbose_name='Paid Amount')), - ('remark', models.CharField(blank=True, max_length=255, null=True, verbose_name='Remark')), - ('parammeters', models.CharField(max_length=512, verbose_name='Parameters')), - ('created_at', models.DateTimeField(auto_now_add=True)), - ('last_updated_at', models.DateTimeField(auto_now=True)), - ('last_updated_user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='joined_event_updated_user', to=settings.AUTH_USER_MODEL)), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='Favorite', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('good', models.IntegerField(default=0, verbose_name='Good')), - ('favorite', models.IntegerField(default=0, verbose_name='Favorite')), - ('evaluation', models.IntegerField(default=0, verbose_name='Evaluation')), - ('number_visit', models.IntegerField(default=0, verbose_name='Good')), - ('last_visited', models.DateTimeField(verbose_name='Last Visited')), - ('parammeters', models.CharField(max_length=512, verbose_name='Parameters')), - ('created_at', models.DateTimeField(auto_now_add=True)), - ('last_updated_at', models.DateTimeField(auto_now=True)), - ('last_updated_user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='favorite_updated_user', to=settings.AUTH_USER_MODEL)), - ('location', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='rog.location')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to=settings.AUTH_USER_MODEL)), - ], - ), - ] diff --git a/rog/migrations/0006_auto_20220222_2308.py b/rog/migrations/0006_auto_20220222_2308.py deleted file mode 100644 index 76175f5..0000000 --- a/rog/migrations/0006_auto_20220222_2308.py +++ /dev/null @@ -1,31 +0,0 @@ -# Generated by Django 3.2.9 on 2022-02-22 14:08 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rog', '0005_favorite_joinedevent_layer_location_roguser_systemsettings_travellist_travelpoint'), - ] - - operations = [ - migrations.CreateModel( - name='ShapeLayers', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=255, verbose_name='Shape Layer')), - ('file', models.FileField(blank=True, upload_to='%y%m%d')), - ('uploaded_date', models.DateField(auto_now_add=True)), - ('layerof', models.IntegerField(choices=[(1, 'locations')], default=1)), - ('table_name', models.CharField(blank=True, max_length=255, verbose_name='Table name')), - ], - ), - migrations.DeleteModel( - name='Layer', - ), - migrations.RemoveField( - model_name='location', - name='file', - ), - ] diff --git a/rog/migrations/0007_auto_20220222_2320.py b/rog/migrations/0007_auto_20220222_2320.py deleted file mode 100644 index 91bcf1d..0000000 --- a/rog/migrations/0007_auto_20220222_2320.py +++ /dev/null @@ -1,48 +0,0 @@ -# Generated by Django 3.2.9 on 2022-02-22 14:20 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rog', '0006_auto_20220222_2308'), - ] - - operations = [ - migrations.AlterField( - model_name='location', - name='address', - field=models.CharField(blank=True, max_length=512, null=True, verbose_name='Address'), - ), - migrations.AlterField( - model_name='location', - name='area', - field=models.CharField(blank=True, max_length=255, null=True, verbose_name='Area'), - ), - migrations.AlterField( - model_name='location', - name='city', - field=models.CharField(blank=True, max_length=255, null=True, verbose_name='City'), - ), - migrations.AlterField( - model_name='location', - name='location_id', - field=models.IntegerField(blank=True, null=True, verbose_name='Location Name'), - ), - migrations.AlterField( - model_name='location', - name='parammeters', - field=models.CharField(blank=True, max_length=512, null=True, verbose_name='Parameters'), - ), - migrations.AlterField( - model_name='location', - name='prefecture', - field=models.CharField(blank=True, max_length=255, null=True, verbose_name='Prefecture'), - ), - migrations.AlterField( - model_name='location', - name='zip', - field=models.CharField(blank=True, max_length=12, null=True, verbose_name='Zip code'), - ), - ] diff --git a/rog/migrations/0008_alter_location_category.py b/rog/migrations/0008_alter_location_category.py deleted file mode 100644 index 1f2b491..0000000 --- a/rog/migrations/0008_alter_location_category.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.2.9 on 2022-02-22 14:22 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rog', '0007_auto_20220222_2320'), - ] - - operations = [ - migrations.AlterField( - model_name='location', - name='category', - field=models.CharField(blank=True, max_length=255, null=True, verbose_name='Category'), - ), - ] diff --git a/rog/migrations/0009_alter_location_last_updated_user.py b/rog/migrations/0009_alter_location_last_updated_user.py deleted file mode 100644 index 867cb02..0000000 --- a/rog/migrations/0009_alter_location_last_updated_user.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 3.2.9 on 2022-02-22 14:36 - -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), - ('rog', '0008_alter_location_category'), - ] - - operations = [ - migrations.AlterField( - model_name='location', - name='last_updated_user', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='location_updated_user', to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/rog/models.py b/rog/models.py index 9a565bc..bdebd7c 100644 --- a/rog/models.py +++ b/rog/models.py @@ -22,6 +22,7 @@ db = Db(dbname=env("POSTGRES_DBNAME"), user=env("POSTGRES_USER"), password=env(" class RogUser(models.Model): + user=models.OneToOneField(User, on_delete=models.CASCADE) email=models.EmailField(_('Email')) phone=models.CharField(_('Phone Number'), max_length=55) first_name=models.CharField(_('First Name'), max_length=255) @@ -32,9 +33,9 @@ class RogUser(models.Model): language=models.CharField(_('Language'), max_length=255, default='Japanese') prefecture=models.CharField(_('Prefecture'), max_length=255, blank=True, null=True) sex=models.CharField(_('Sex'), max_length=255, default='unknown', blank=True, null=True) - birth_year=models.IntegerField(_('Birth year'), blank=True, null=True) + birthyear=models.IntegerField(_('Birth year'), blank=True, null=True) family_structure =models.IntegerField(_('Family Structure'), blank=True, null=True) - introducer = models.IntegerField(_('Introducerr'), blank=True, null=True, default=0) + introducer = models.ForeignKey(User, related_name='introduced_uesr', on_delete=models.DO_NOTHING) level= models.IntegerField(_('Level'), blank=True, null=True, default=0) parammeters=models.CharField(_('Parameters'), max_length=512) created_at=models.DateTimeField(auto_now_add=True) @@ -53,7 +54,7 @@ class SystemSettings(models.Model): last_updated_at=models.DateTimeField(auto_now=True) class Location(models.Model): - location_id=models.IntegerField(_('Location Name'), blank=True, null=True) + location_id=models.IntegerField(_('Location id'), blank=True, null=True) location_name=models.CharField(_('Location Name'), max_length=255) category=models.CharField(_('Category'), max_length=255, blank=True, null=True) zip=models.CharField(_('Zip code'), max_length=12, blank=True, null=True) @@ -63,7 +64,15 @@ class Location(models.Model): city= models.CharField(_('City'), max_length=255, blank=True, null=True) photos=models.JSONField(_('Phptos'), blank=True, null=True) videos=models.JSONField(_('Videos'), blank=True, null=True) - web_content=models.JSONField(_('Web Content'), blank=True, null=True) + webcontents=models.JSONField(_('Web Content'), blank=True, null=True) + status=models.CharField(_('Status'),max_length=255, blank=True, null=True) + portal=models.CharField(_('Status'), max_length=255,blank=True, null=True) + group=models.CharField(_('Status'), max_length=255,blank=True, null=True) + phone=models.CharField(_('Status'), max_length=255,blank=True, null=True) + fax=models.CharField(_('Status'), max_length=255, blank=True, null=True) + email=models.EmailField(_('Email'), max_length=255,blank=True, null=True) + facility=models.CharField(_('Status'), max_length=255, blank=True, null=True) + remark=models.CharField(_('Status'), max_length=255, blank=True, null=True) tags=models.CharField(_('Tags'), max_length=512, blank=True, null=True) parammeters=models.CharField(_('Parameters'), max_length=512, blank=True, null=True) created_at=models.DateTimeField(auto_now_add=True) @@ -75,6 +84,29 @@ class Location(models.Model): return self.location_name +EVENT_STATUS = ( + ("PREPARING", _("Preparing")), + ("PROMOTION", _("Promotion")), + ("EVENT", _("Event")), + ("END", _("End")) +) + + + +class Event(models.Model): + tagname=models.CharField(_('Parameters'), max_length=512, blank=True, null=True) + status=models.CharField(max_length=256, choices=EVENT_STATUS) + price=models.IntegerField(_('Paid Amount'), default=0) + promotion_date=models.DateTimeField(_('Promotion date'), blank=True, null=True) + event_start=models.DateTimeField(_('Promotion date'), blank=True, null=True) + event_end=models.DateTimeField(_('Promotion date'), blank=True, null=True) + remark=models.CharField(max_length=256, blank=True, null=True) + parammeters=models.CharField(_('Parameters'), max_length=512, blank=True, null=True) + created_at=models.DateTimeField(auto_now_add=True) + last_updated_user=models.ForeignKey(User, related_name="event_updated_user", on_delete=models.DO_NOTHING,blank=True, null=True) + last_updated_at=models.DateTimeField(auto_now=True) + + ROG_STATUS = ( ("REGISTERED", _("Registered")), ("ACCEPTED", _("accepted")), @@ -85,11 +117,11 @@ ROG_STATUS = ( class JoinedEvent(models.Model): user=models.ForeignKey(User, on_delete=models.DO_NOTHING) - tag_name=models.CharField(_('Tag Name'), max_length=255, blank=True, null=True) + tagname=models.CharField(_('Tag Name'), max_length=255, blank=True, null=True) status=models.CharField(max_length=256, choices=ROG_STATUS) - registration_id=models.CharField(_('Registration Id'), max_length=56) + registrationid=models.CharField(_('Registration Id'), max_length=56) payment_code=models.CharField(_('Payment Code'), max_length=255) - paied_amount=models.IntegerField(_('Paid Amount'), default=0) + paid=models.IntegerField(_('Paid Amount'), default=0) remark=models.CharField(_('Remark'), max_length=255, blank=True, null=True) parammeters=models.CharField(_('Parameters'), max_length=512) created_at=models.DateTimeField(auto_now_add=True) @@ -97,6 +129,7 @@ class JoinedEvent(models.Model): last_updated_at=models.DateTimeField(auto_now=True) + class Favorite(models.Model): user=models.ForeignKey(User, on_delete=models.DO_NOTHING) location=models.ForeignKey(Location, on_delete=models.CASCADE) @@ -104,38 +137,48 @@ class Favorite(models.Model): favorite=models.IntegerField(_('Favorite'), default=0) evaluation=models.IntegerField(_('Evaluation'), default=0) number_visit=models.IntegerField(_('Good'), default=0) - last_visited=models.DateTimeField(_('Last Visited')) - parammeters=models.CharField(_('Parameters'), max_length=512) + last_visited=models.DateTimeField(_('Last Visited'), blank=True, null=True) + parammeters=models.CharField(_('Parameters'), max_length=512, blank=True, null=True) created_at=models.DateTimeField(auto_now_add=True) last_updated_user=models.ForeignKey(User, related_name="favorite_updated_user", on_delete=models.DO_NOTHING) last_updated_at=models.DateTimeField(auto_now=True) + +TRAVEL_CATEGORY = ( + ("PRIVATE", _("Private")), + ("GROUP", _("Group")), + ("AGENT", _("Agent")), + ("ROGAINING", _("Rogaining")) +) + + + class TravelList(models.Model): travel_id= models.IntegerField(_('Travel Id')) user=models.ForeignKey(User, on_delete=models.DO_NOTHING) - start_date=models.DateTimeField() - finish_date=models.DateTimeField() - category=models.CharField(_('Category'), max_length=255) + start_date=models.DateTimeField(_('Start date') ,blank=True, null=True) + finish_date=models.DateTimeField(_('End date') ,blank=True, null=True) + category=models.CharField(max_length=256, choices=TRAVEL_CATEGORY) title=models.CharField(_('Title'), max_length=255) - transportation=models.CharField(_('Transpotation'), max_length=255) - moving_distance=models.IntegerField() - duration=models.DurationField(_('Duration')) - eta=models.DateTimeField() - parammeters=models.CharField(_('Parameters'), max_length=512) + transportation=models.CharField(_('Transpotation'), max_length=255 ,blank=True, null=True) + moving_distance=models.IntegerField(blank=True, null=True) + duration=models.DurationField(_('Duration') ,blank=True, null=True) + eta=models.DateTimeField(blank=True, null=True) + parammeters=models.CharField(_('Parameters'), max_length=512 ,blank=True, null=True) created_at=models.DateTimeField(auto_now_add=True) last_updated_user=models.ForeignKey(User, related_name="travel_list_updated_user", on_delete=models.DO_NOTHING) last_updated_at=models.DateTimeField(auto_now=True) class TravelPoint(models.Model): - travel_id= models.IntegerField(_('Travel Id')) + travel_list= models.ForeignKey(TravelList, on_delete=models.DO_NOTHING) location=models.ForeignKey(Location, on_delete=models.CASCADE) - distance=models.FloatField() - transportation=models.CharField(_('Transpotation'), max_length=255) - eta=models.DateTimeField() - order_number=models.IntegerField() - parammeters=models.CharField(_('Parameters'), max_length=512) + distance=models.FloatField(blank=True, null=True) + transportation=models.CharField(_('Transpotation'), max_length=255 ,blank=True, null=True) + eta=models.DateTimeField(blank=True, null=True) + order_number=models.IntegerField(blank=True, null=True) + parammeters=models.CharField(_('Parameters'), max_length=512 ,blank=True, null=True) created_at=models.DateTimeField(auto_now_add=True) last_updated_user=models.ForeignKey(User, related_name="travelpoint_updated_user", on_delete=models.DO_NOTHING) last_updated_at=models.DateTimeField(auto_now=True)