From d37328302563cc95b829349841a68a37df9c5712 Mon Sep 17 00:00:00 2001 From: Mohamed Nouffer Date: Thu, 7 Apr 2022 14:53:11 +0530 Subject: [PATCH] update --- rog/choices.py | 2 +- rog/mapping.py | 40 +++--- rog/migrations/0003_auto_20220407_1420.py | 129 ++++++++++++++++++ .../0004_alter_location_webcontents.py | 18 +++ rog/migrations/0005_auto_20220407_1427.py | 108 +++++++++++++++ rog/models.py | 31 ++++- 6 files changed, 306 insertions(+), 22 deletions(-) create mode 100644 rog/migrations/0003_auto_20220407_1420.py create mode 100644 rog/migrations/0004_alter_location_webcontents.py create mode 100644 rog/migrations/0005_auto_20220407_1427.py diff --git a/rog/choices.py b/rog/choices.py index 175f7b7..06f362d 100644 --- a/rog/choices.py +++ b/rog/choices.py @@ -1,7 +1,7 @@ from django.utils.translation import gettext_lazy as _ LAYER_CHOICES = ( - (1, _("locations")), + (1, _("location")), (2, _("Location_line")), (3, _("Location_polygon")), ) \ No newline at end of file diff --git a/rog/mapping.py b/rog/mapping.py index 911342b..fb7e7cf 100644 --- a/rog/mapping.py +++ b/rog/mapping.py @@ -2,26 +2,26 @@ from django.contrib.gis.utils import LayerMapping location_mapping = { 'location_id' : 'loc_id', - 'location_name' : 'loc_name', - 'category': 'category', - 'zip':'zip', - 'address':'address', - 'prefecture':'prefecture', - 'area':'area', - 'city':'city', - 'photos':'photos', - 'videos':'videos', - 'webcontents':'webcontent', - 'status':'status', - 'portal':'portal', - 'group':'group', - 'phone':'phone', - 'fax':'fax', - 'email':'email', - 'facility':'facility', - 'remark':'remark', - 'parammeters':'params', - 'tags':'tags', + # 'location_name' : 'loc_name', + # 'category': 'category', + # 'zip':'zip', + # 'address':'address', + # 'prefecture':'prefecture', + # 'area':'area', + # 'city':'city', + # 'photos':'photos', + # 'videos':'videos', + # 'webcontents':'webcontent', + # 'status':'status', + # 'portal':'portal', + # 'group':'group', + # 'phone':'phone', + # 'fax':'fax', + # 'email':'email', + # 'facility':'facility', + # 'remark':'remark', + # 'parammeters':'params', + # 'tags':'tags', 'geom': 'POINT', } diff --git a/rog/migrations/0003_auto_20220407_1420.py b/rog/migrations/0003_auto_20220407_1420.py new file mode 100644 index 0000000..7842bdb --- /dev/null +++ b/rog/migrations/0003_auto_20220407_1420.py @@ -0,0 +1,129 @@ +# Generated by Django 3.2.9 on 2022-04-07 05:20 + +import django.contrib.gis.db.models.fields +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('rog', '0002_alter_shapelayers_file'), + ] + + operations = [ + migrations.CreateModel( + name='JpnSubPerf', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(blank=True, null=True, srid=4326)), + ('adm0_en', models.CharField(blank=True, max_length=254, null=True)), + ('adm0_ja', models.CharField(blank=True, max_length=254, null=True)), + ('adm0_pcode', models.CharField(blank=True, max_length=254, null=True)), + ('adm1_en', models.CharField(blank=True, max_length=254, null=True)), + ('adm1_ja', models.CharField(blank=True, max_length=254, null=True)), + ('adm1_pcode', models.CharField(blank=True, max_length=254, null=True)), + ('adm2_ja', models.CharField(blank=True, max_length=254, null=True)), + ('adm2_en', models.CharField(blank=True, max_length=254, null=True)), + ('adm2_pcode', models.CharField(blank=True, max_length=254, null=True)), + ], + options={ + 'db_table': 'jpn_sub_perf', + 'managed': False, + }, + ), + migrations.AlterField( + model_name='location', + name='address', + field=models.CharField(blank=True, max_length=1024, null=True, verbose_name='Address'), + ), + migrations.AlterField( + model_name='location', + name='area', + field=models.CharField(blank=True, max_length=1024, null=True, verbose_name='Area'), + ), + migrations.AlterField( + model_name='location', + name='category', + field=models.CharField(blank=True, max_length=1024, null=True, verbose_name='Category'), + ), + migrations.AlterField( + model_name='location', + name='city', + field=models.CharField(blank=True, max_length=1024, null=True, verbose_name='City'), + ), + migrations.AlterField( + model_name='location', + name='email', + field=models.EmailField(blank=True, max_length=1024, null=True, verbose_name='Email'), + ), + migrations.AlterField( + model_name='location', + name='facility', + field=models.CharField(blank=True, max_length=1024, null=True, verbose_name='Facility'), + ), + migrations.AlterField( + model_name='location', + name='fax', + field=models.CharField(blank=True, max_length=1024, null=True, verbose_name='Fax'), + ), + migrations.AlterField( + model_name='location', + name='group', + field=models.CharField(blank=True, max_length=1024, null=True, verbose_name='Group'), + ), + migrations.AlterField( + model_name='location', + name='location_name', + field=models.CharField(max_length=1024, verbose_name='Location Name'), + ), + migrations.AlterField( + model_name='location', + name='parammeters', + field=models.CharField(blank=True, max_length=1024, null=True, verbose_name='Parameters'), + ), + migrations.AlterField( + model_name='location', + name='phone', + field=models.CharField(blank=True, max_length=1024, null=True, verbose_name='Phone'), + ), + migrations.AlterField( + model_name='location', + name='photos', + field=models.CharField(blank=True, max_length=1024, null=True, verbose_name='Phptos'), + ), + migrations.AlterField( + model_name='location', + name='portal', + field=models.CharField(blank=True, max_length=1024, null=True, verbose_name='Portal'), + ), + migrations.AlterField( + model_name='location', + name='prefecture', + field=models.CharField(blank=True, max_length=1024, null=True, verbose_name='Prefecture'), + ), + migrations.AlterField( + model_name='location', + name='remark', + field=models.CharField(blank=True, max_length=1024, null=True, verbose_name='Remarks'), + ), + migrations.AlterField( + model_name='location', + name='status', + field=models.CharField(blank=True, max_length=1024, null=True, verbose_name='Status'), + ), + migrations.AlterField( + model_name='location', + name='tags', + field=models.CharField(blank=True, max_length=1024, null=True, verbose_name='Tags'), + ), + migrations.AlterField( + model_name='location', + name='videos', + field=models.CharField(blank=True, max_length=1024, null=True, verbose_name='Videos'), + ), + migrations.AlterField( + model_name='location', + name='webcontents', + field=models.CharField(blank=True, max_length=1024, null=True, verbose_name='Web Content'), + ), + ] diff --git a/rog/migrations/0004_alter_location_webcontents.py b/rog/migrations/0004_alter_location_webcontents.py new file mode 100644 index 0000000..af5de6e --- /dev/null +++ b/rog/migrations/0004_alter_location_webcontents.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.9 on 2022-04-07 05:25 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('rog', '0003_auto_20220407_1420'), + ] + + operations = [ + migrations.AlterField( + model_name='location', + name='webcontents', + field=models.TextField(blank=True, null=True, verbose_name='Web Content'), + ), + ] diff --git a/rog/migrations/0005_auto_20220407_1427.py b/rog/migrations/0005_auto_20220407_1427.py new file mode 100644 index 0000000..adde763 --- /dev/null +++ b/rog/migrations/0005_auto_20220407_1427.py @@ -0,0 +1,108 @@ +# Generated by Django 3.2.9 on 2022-04-07 05:27 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('rog', '0004_alter_location_webcontents'), + ] + + 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='category', + field=models.CharField(blank=True, max_length=255, null=True, verbose_name='Category'), + ), + 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='email', + field=models.EmailField(blank=True, max_length=255, null=True, verbose_name='Email'), + ), + migrations.AlterField( + model_name='location', + name='facility', + field=models.CharField(blank=True, max_length=255, null=True, verbose_name='Facility'), + ), + migrations.AlterField( + model_name='location', + name='fax', + field=models.CharField(blank=True, max_length=255, null=True, verbose_name='Fax'), + ), + migrations.AlterField( + model_name='location', + name='group', + field=models.CharField(blank=True, max_length=255, null=True, verbose_name='Group'), + ), + migrations.AlterField( + model_name='location', + name='location_name', + field=models.CharField(max_length=255, 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='phone', + field=models.CharField(blank=True, max_length=255, null=True, verbose_name='Phone'), + ), + migrations.AlterField( + model_name='location', + name='photos', + field=models.CharField(blank=True, max_length=255, null=True, verbose_name='Phptos'), + ), + migrations.AlterField( + model_name='location', + name='portal', + field=models.CharField(blank=True, max_length=255, null=True, verbose_name='Portal'), + ), + 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='remark', + field=models.CharField(blank=True, max_length=255, null=True, verbose_name='Remarks'), + ), + migrations.AlterField( + model_name='location', + name='status', + field=models.CharField(blank=True, max_length=255, null=True, verbose_name='Status'), + ), + migrations.AlterField( + model_name='location', + name='tags', + field=models.CharField(blank=True, max_length=512, null=True, verbose_name='Tags'), + ), + migrations.AlterField( + model_name='location', + name='videos', + field=models.CharField(blank=True, max_length=255, null=True, verbose_name='Videos'), + ), + migrations.AlterField( + model_name='location', + name='webcontents', + field=models.CharField(blank=True, max_length=255, null=True, verbose_name='Web Content'), + ), + ] diff --git a/rog/models.py b/rog/models.py index ee2fdb9..9e3a088 100644 --- a/rog/models.py +++ b/rog/models.py @@ -142,7 +142,7 @@ class Location(models.Model): geom=models.MultiPointField(srid=4326) def __str__(self): - return self.location_name + return str(self.location_id) class Location_line(models.Model): @@ -419,6 +419,8 @@ def publish_date(sender, instance, created, **kwargs): print("@@@@@@@@@@@@") print(fields[0]) print("@@@@@@@@@@@@") + if instance.layerof == 1: + updateLocation(mdl, fields) if instance.layerof == 2: updateLineTable(mdl, fields) if instance.layerof == 3: @@ -427,6 +429,33 @@ def publish_date(sender, instance, created, **kwargs): except Exception as e: print('##################',e) + +def updateLocation(mdl, fields): + print(f"Updating {fields[0]} - {fields[1]}") + print(mdl.objects.filter(location_id = int(fields[0]))) + print("-------") + mdl.objects.filter(location_id = int(fields[0])).update( + location_name = fields[1] if len(fields) > 1 else '', + category = fields[2] if len(fields) > 1 else '', + zip = fields[3] if len(fields) > 1 else '', + address = fields[4] if len(fields) > 1 else '', + prefecture = fields[5] if len(fields) > 1 else '', + area = fields[6] if len(fields) > 1 else '', + city = fields[7] if len(fields) > 1 else '', + photos = fields[8] if len(fields) > 1 else '', + videos = fields[9] if len(fields) > 1 else '', + webcontents = fields[10] if len(fields) > 1 else '', + status = fields[11] if len(fields) > 1 else '', + portal = fields[12] if len(fields) > 1 else '', + group = fields[13] if len(fields) > 1 else '', + phone = fields[14] if len(fields) > 1 else '', + fax = fields[15] if len(fields) > 1 else '', + email = fields[16] if len(fields) > 1 else '', + facility = fields[17] if len(fields) > 1 else '', + remark = fields[18] if len(fields) > 1 else '', + parammeters = fields[19] if len(fields) > 1 else '', + tags = fields[20] if len(fields) > 1 else '' + ) def updateLineTable(mdl, fields): print(f"Updating {fields[0]} - {fields[1]}")