From 6b9e1bb9e9abc8dc59adb65ce9e800c34bbd1d13 Mon Sep 17 00:00:00 2001 From: Mohamed Nouffer Date: Mon, 25 Jul 2022 13:53:12 +0530 Subject: [PATCH] update for new fields --- rog/migrations/0017_auto_20220725_1605.py | 23 +++++++ rog/models.py | 82 ++++++++++++----------- 2 files changed, 67 insertions(+), 38 deletions(-) create mode 100644 rog/migrations/0017_auto_20220725_1605.py diff --git a/rog/migrations/0017_auto_20220725_1605.py b/rog/migrations/0017_auto_20220725_1605.py new file mode 100644 index 0000000..a20debc --- /dev/null +++ b/rog/migrations/0017_auto_20220725_1605.py @@ -0,0 +1,23 @@ +# Generated by Django 3.2.9 on 2022-07-25 07:05 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('rog', '0016_shapefilelocations'), + ] + + operations = [ + migrations.AddField( + model_name='location', + name='cp', + field=models.IntegerField(blank=True, null=True, verbose_name='Check Point'), + ), + migrations.AddField( + model_name='location', + name='subcategory', + field=models.CharField(blank=True, max_length=2048, null=True, verbose_name='Sub Category'), + ), + ] diff --git a/rog/models.py b/rog/models.py index 91e5b5b..bf46483 100644 --- a/rog/models.py +++ b/rog/models.py @@ -184,8 +184,10 @@ class SystemSettings(models.Model): class Location(models.Model): location_id=models.IntegerField(_('Location id'), blank=True, null=True) + cp=models.IntegerField(_('Check Point'), blank=True, null=True) location_name=models.CharField(_('Location Name'), max_length=2048, default="--- 場所をお願いします --") category=models.CharField(_('Category'), max_length=2048, blank=True, null=True) + subcategory=models.CharField(_('Sub Category'), max_length=2048, blank=True, null=True) zip=models.CharField(_('Zip code'), max_length=12, blank=True, null=True) address = models.CharField(_('Address'), max_length=2048, blank=True, null=True) prefecture = models.CharField(_('Prefecture'), max_length=2048, blank=True, null=True) @@ -535,8 +537,9 @@ def publish_data(sender, instance, created, **kwargs): os.remove(file) try: + print("before reading the file") shp = glob.glob(r'{}/**/*.shp'.format(file_path), recursive=True)[0] - print(shp) + print("this is the read file",shp) gdf = gpd.read_file(shp) crs_name = str(gdf.crs.srs) print(crs_name, 'crs - name') @@ -550,7 +553,7 @@ def publish_data(sender, instance, created, **kwargs): os.remove(shp) except Exception as e: - print('##################',e) + print('######## shape file##########',e) try: csv_f = glob.glob(r'{}/**/*.csv'.format(file_path), recursive=True)[0] @@ -586,7 +589,7 @@ def publish_data(sender, instance, created, **kwargs): except Exception as e: - print('##################',e) + print('######## csv file ##########',e) def insertShapeLayerLocation(name, fields): @@ -602,41 +605,44 @@ def updateLocation(mdl, fields): with transaction.atomic(): mdl.objects.filter(location_id = int(fields[0])).update( - location_name = fields[1] if len(fields[1]) > 1 else '', - category = fields[2] if len(fields[2]) > 1 else '', - zip = fields[3] if len(fields[3]) > 1 else '', - address = fields[4] if len(fields[4]) > 1 else '', - prefecture = fields[5] if len(fields[5]) > 1 else '', - area = fields[6] if len(fields[6]) > 1 else '', - city = fields[7] if len(fields[7]) > 1 else '', - latitude = fields[8] if len(fields[8]) > 1 else '', - longitude = fields[9] if len(fields[9]) > 1 else '', - photos = fields[10] if len(fields[10]) > 1 else '', - videos = fields[11] if len(fields[11]) > 1 else '', - webcontents = fields[12] if len(fields[12]) > 1 else '', - status = fields[13] if len(fields[13]) > 1 else '', - portal = fields[14] if len(fields[14]) > 1 else '', - group = fields[15] if len(fields[15]) > 1 else '', - phone = fields[16] if len(fields[16]) > 1 else '', - fax = fields[17] if len(fields[17]) > 1 else '', - email = fields[18] if len(fields[18]) > 1 else '', - facility = fields[19] if len(fields[19]) > 1 else '', - remark = fields[20] if len(fields[20]) > 1 else '', - tags = fields[21] if len(fields[21]) > 1 else '', - hidden_location = fields[22] if len(fields[22]) > 1 else False, - auto_checkin = fields[23] if len(fields[23]) > 1 else False, - checkin_radius = fields[24] if len(fields[24]) > 1 else 15, - checkin_point = fields[25] if len(fields[25]) > 1 else 10, - buy_point = fields[26] if len(fields[26]) > 1 else 0, - evaluation_value = fields[27] if len(fields[27]) > 1 else '', - shop_closed = fields[28] if len(fields[28]) > 1 else False, - shop_shutdown = fields[29] if len(fields[29]) > 1 else False, - opening_hours_mon = fields[30] if len(fields[30]) > 1 else '', - opening_hours_tue = fields[31] if len(fields[31]) > 1 else '', - opening_hours_wed = fields[32] if len(fields[32]) > 1 else '', - opening_hours_thu = fields[33] if len(fields[33]) > 1 else '', - opening_hours_fri = fields[34] if len(fields[34]) > 1 else '', - opening_hours_sat = fields[35] if len(fields[35]) > 1 else '' + cp = fields[1] if len(fields[1]) > 1 else 0, + location_name = fields[2] if len(fields[2]) > 1 else '', + category = fields[3] if len(fields[3]) > 1 else '', + subcategory = fields[4] if len(fields[4]) > 1 else '', + zip = fields[5] if len(fields[5]) > 1 else '', + address = fields[6] if len(fields[6]) > 1 else '', + prefecture = fields[7] if len(fields[7]) > 1 else '', + area = fields[8] if len(fields[8]) > 1 else '', + city = fields[9] if len(fields[9]) > 1 else '', + latitude = fields[10] if len(fields[10]) > 1 else '', + longitude = fields[11] if len(fields[11]) > 1 else '', + photos = fields[12] if len(fields[12]) > 1 else '', + videos = fields[13] if len(fields[13]) > 1 else '', + webcontents = fields[14] if len(fields[14]) > 1 else '', + status = fields[15] if len(fields[15]) > 1 else '', + portal = fields[16] if len(fields[16]) > 1 else '', + group = fields[17] if len(fields[17]) > 1 else '', + phone = fields[18] if len(fields[18]) > 1 else '', + fax = fields[19] if len(fields[19]) > 1 else '', + email = fields[20] if len(fields[20]) > 1 else '', + facility = fields[21] if len(fields[21]) > 1 else '', + remark = fields[22] if len(fields[22]) > 1 else '', + tags = fields[23] if len(fields[23]) > 1 else '', + hidden_location = fields[24] if len(fields[24]) > 1 else False, + auto_checkin = fields[25] if len(fields[25]) > 1 else False, + checkin_radius = fields[26] if len(fields[26]) > 1 else 15, + checkin_point = fields[27] if len(fields[27]) > 1 else 10, + buy_point = fields[28] if len(fields[28]) > 1 else 0, + evaluation_value = fields[29] if len(fields[29]) > 1 else '', + shop_closed = fields[30] if len(fields[30]) > 1 else False, + shop_shutdown = fields[31] if len(fields[31]) > 1 else False, + opening_hours_mon = fields[32] if len(fields[32]) > 1 else '', + opening_hours_tue = fields[33] if len(fields[33]) > 1 else '', + opening_hours_wed = fields[34] if len(fields[34]) > 1 else '', + opening_hours_thu = fields[35] if len(fields[35]) > 1 else '', + opening_hours_fri = fields[36] if len(fields[36]) > 1 else '', + opening_hours_sat = fields[37] if len(fields[37]) > 1 else '', + opening_hours_sun = fields[38] if len(fields[38]) > 1 else '' ) def updateLineTable(mdl, fields):