Cập nhật dữ liệu hành chính đúng chuẩn

project/app/admin.py

@@ -6,7 +6,7 @@
 from rest_framework import routers
 
 from app.settings import TIME_ZONE
-from app.models import TinTuc, TinhNguyenVien, CuuHo, HoDan, Tinh, Huyen, Xa,\
+from app.models import TinTuc, TinhNguyenVien, CuuHo, HoDan, NewTinh, NewHuyen, NewXa,\
     TrangThaiHoDan, CUUHO_STATUS, TINHNGUYEN_STATUS
 from app.views import CuuHoViewSet, HoDanViewSet,\
     TinhNguyenVienViewSet, TinhViewSet, HuyenViewSet, XaViewSet, TrangThaiHoDanSet
@@ -101,24 +101,24 @@ def __init__(self, *args, **kwargs):
                                                    attrs={'style': 'min-width:250px', 'data-minimum-input-length': 0}
                                                ), required=False)
 
-        self.fields["tinh"] = ModelChoiceField(queryset=Tinh.objects.order_by("name"),
+        self.fields["tinh"] = ModelChoiceField(queryset=NewTinh.objects.order_by("name"),
                                                widget=ModelSelect2Widget(
-                                                   model=Tinh,
+                                                   model=NewTinh,
                                                    search_fields=['name__unaccent__icontains'],
                                                    attrs={'style': 'min-width:250px', 'data-minimum-input-length': 0}
                                                ), required=False)
 
-        self.fields["huyen"] = ModelChoiceField(queryset=Huyen.objects.order_by("name"),
+        self.fields["huyen"] = ModelChoiceField(queryset=NewHuyen.objects.order_by("name"),
                                                 widget=ModelSelect2Widget(
-                                                    model=Huyen,
+                                                    model=NewHuyen,
                                                     search_fields=['name__unaccent__icontains'],
                                                     dependent_fields={'tinh': 'tinh'},
                                                     attrs={'style': 'min-width:250px', 'data-minimum-input-length': 0}
                                                 ), required=False)
 
-        self.fields["xa"] = ModelChoiceField(queryset=Xa.objects.order_by("name"),
+        self.fields["xa"] = ModelChoiceField(queryset=NewXa.objects.order_by("name"),
                                              widget=ModelSelect2Widget(
-                                                 model=Xa,
+                                                 model=NewXa,
                                                  search_fields=['name__unaccent__icontains'],
                                                  dependent_fields={'huyen': 'huyen'},
                                                  attrs={'style': 'min-width:250px', 'data-minimum-input-length': 0}
@@ -206,24 +206,24 @@ class Meta:
 
     def __init__(self, *args, **kwargs):
         super(HoDanForm, self).__init__(*args, **kwargs)
-        self.fields["tinh"] = ModelChoiceField(queryset=Tinh.objects.order_by("name"),
+        self.fields["tinh"] = ModelChoiceField(queryset=NewTinh.objects.order_by("name"),
                                                widget=ModelSelect2Widget(
-                                                   model=Tinh,
+                                                   model=NewTinh,
                                                    search_fields=['name__unaccent__icontains'],
                                                    attrs={'style': 'min-width:250px', 'data-minimum-input-length': 0}
                                                ), required=False)
 
-        self.fields["huyen"] = ModelChoiceField(queryset=Huyen.objects.order_by("name"),
+        self.fields["huyen"] = ModelChoiceField(queryset=NewHuyen.objects.order_by("name"),
                                                 widget=ModelSelect2Widget(
-                                                    model=Huyen,
+                                                    model=NewHuyen,
                                                     search_fields=['name__unaccent__icontains'],
                                                     dependent_fields={'tinh': 'tinh'},
                                                     attrs={'style': 'min-width:250px', 'data-minimum-input-length': 0}
                                                 ), required=False)
 
-        self.fields["xa"] = ModelChoiceField(queryset=Xa.objects.order_by("name"),
+        self.fields["xa"] = ModelChoiceField(queryset=NewXa.objects.order_by("name"),
                                              widget=ModelSelect2Widget(
-                                                 model=Xa,
+                                                 model=NewXa,
                                                  search_fields=['name__unaccent__icontains'],
                                                  dependent_fields={'huyen': 'huyen'},
                                                  attrs={'style': 'min-width:250px', 'data-minimum-input-length': 0}
@@ -453,9 +453,9 @@ def __init__(self, model, admin_site):
 admin.site.register(CuuHo, CuuHoAdmin)
 admin.site.register(TinhNguyenVien, TinhNguyenVienAdmin)
 
-admin.site.register(Tinh, TinhAdmin)
-admin.site.register(Huyen, HuyenAdmin)
-admin.site.register(Xa, XaAdmin)
+admin.site.register(NewTinh, TinhAdmin)
+admin.site.register(NewHuyen, HuyenAdmin)
+admin.site.register(NewXa, XaAdmin)
 admin.site.register(TrangThaiHoDan, TrangThaiHoDanAdmin)
 # admin.site.register(Thon, ThonAdmin)
 

project/app/index.py

@@ -2,7 +2,7 @@
 import pytz
 from app.settings import TIME_ZONE
 from app.admin import TinhAdmin
-from app.models import Tinh, HoDan, CuuHo, TinhNguyenVien
+from app.models import NewTinh, HoDan, CuuHo, TinhNguyenVien
 from django.db.models import Count
 from django.shortcuts import render
 from django.urls import reverse
@@ -17,23 +17,23 @@ def index(request):
     # issue 155
     compare_time = datetime.datetime(2020, 10, 26, 17, 0, 0, tzinfo=datetime.timezone.utc).astimezone(tz=pytz.timezone(TIME_ZONE))
 
-    ho_dan_new_group_by_tinh = Tinh.objects.prefetch_related('hodan_reversed')\
+    ho_dan_new_group_by_tinh = NewTinh.objects.prefetch_related('hodan_reversed')\
         .filter(hodan_reversed__created_time__gt=compare_time)\
         .annotate(total_hodan=Count("hodan_reversed"))\
         .order_by('-total_hodan')[0:5]
 
-    ho_dan_can_cuu_group_by_tinh = Tinh.objects.prefetch_related('hodan_reversed')\
+    ho_dan_can_cuu_group_by_tinh = NewTinh.objects.prefetch_related('hodan_reversed')\
         .exclude(hodan_reversed__status_id=7)\
         .annotate(total_hodan=Count("hodan_reversed"))\
         .filter(id__in=[tinh.id for tinh in ho_dan_new_group_by_tinh])
 
-    ho_dan_da_cuu_group_by_tinh = Tinh.objects.prefetch_related('hodan_reversed')\
+    ho_dan_da_cuu_group_by_tinh = NewTinh.objects.prefetch_related('hodan_reversed')\
         .filter(hodan_reversed__status_id=7)\
         .annotate(total_hodan=Count("hodan_reversed"))\
         .filter(id__in=[tinh.id for tinh in ho_dan_new_group_by_tinh])
     ho_dan_da_cuu_dict = dict((tinh.id, tinh.total_hodan) for tinh in ho_dan_da_cuu_group_by_tinh)
 
-    cuu_ho_by_tinh = Tinh.objects.prefetch_related('cuuho_reversed')\
+    cuu_ho_by_tinh = NewTinh.objects.prefetch_related('cuuho_reversed')\
         .annotate(total_cuuho=Count("cuuho_reversed"))\
         .filter(id__in=[tinh.id for tinh in ho_dan_new_group_by_tinh])
     cuu_ho_dict = dict((tinh.id, tinh.total_cuuho) for tinh in cuu_ho_by_tinh)

project/app/migrations/0071_newtinh.py

@@ -0,0 +1,29 @@
+# Generated by Django 3.1.2 on 2020-10-27 09:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('app', '0070_merge_20201027_0115'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='NewTinh',
+            fields=[
+                ('name', models.TextField(blank=True, default='', verbose_name='Tỉnh')),
+                ('prefix', models.TextField(blank=True, default='', null=True)),
+                ('suffix', models.TextField(blank=True, default='', null=True)),
+                ('long', models.TextField(blank=True, default='', null=True)),
+                ('lat', models.TextField(blank=True, default='', null=True)),
+                ('level', models.IntegerField(blank=True, null=True)),
+                ('id', models.AutoField(primary_key=True, serialize=False)),
+            ],
+            options={
+                'verbose_name': '3. Thống kê Tỉnh (new)',
+                'verbose_name_plural': '3. Thống kê Tỉnh (new)',
+            },
+        ),
+    ]

project/app/migrations/0072_auto_20201027_1848.py

@@ -0,0 +1,70 @@
+# Generated by Django 3.1.2 on 2020-10-27 11:48
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('app', '0071_newtinh'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='NewHuyen',
+            fields=[
+                ('name', models.TextField(blank=True, default='', verbose_name='Huyện')),
+                ('prefix', models.TextField(blank=True, default='', null=True)),
+                ('suffix', models.TextField(blank=True, default='', null=True)),
+                ('longitude', models.FloatField(blank=True, null=True)),
+                ('latitude', models.FloatField(blank=True, null=True)),
+                ('level', models.IntegerField(blank=True, null=True)),
+                ('id', models.AutoField(primary_key=True, serialize=False)),
+            ],
+            options={
+                'verbose_name': '4. Thống kê Huyện',
+                'verbose_name_plural': '4. Thống kê Huyện',
+            },
+        ),
+        migrations.RemoveField(
+            model_name='newtinh',
+            name='lat',
+        ),
+        migrations.RemoveField(
+            model_name='newtinh',
+            name='long',
+        ),
+        migrations.AddField(
+            model_name='newtinh',
+            name='latitude',
+            field=models.FloatField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='newtinh',
+            name='longitude',
+            field=models.FloatField(blank=True, null=True),
+        ),
+        migrations.CreateModel(
+            name='NewXa',
+            fields=[
+                ('name', models.TextField(blank=True, default='', verbose_name='Xã')),
+                ('prefix', models.TextField(blank=True, default='', null=True)),
+                ('suffix', models.TextField(blank=True, default='', null=True)),
+                ('longitude', models.FloatField(blank=True, null=True)),
+                ('latitude', models.FloatField(blank=True, null=True)),
+                ('level', models.IntegerField(blank=True, null=True)),
+                ('id', models.AutoField(primary_key=True, serialize=False)),
+                ('huyen', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='app.newhuyen')),
+            ],
+            options={
+                'verbose_name': '5. Thống kê Xã',
+                'verbose_name_plural': '5. Thống kê Xã',
+            },
+        ),
+        migrations.AddField(
+            model_name='newhuyen',
+            name='tinh',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='app.newtinh'),
+        ),
+    ]

project/app/migrations/0073_import_location_data.py

@@ -0,0 +1,65 @@
+# Generated by Django 3.1.2 on 2020-10-24 16:37
+
+from django.db import migrations
+import csv
+from app.models import NewTinh, NewHuyen, NewXa
+
+def import_tinh_data(apps, schema_editor):
+     with open('project/app/data/tinh.csv') as f:
+        reader = csv.reader(f)
+        next(reader, None)
+        for row in reader:
+            _, _ = NewTinh.objects.get_or_create(
+                name = row[0],
+                prefix = row[1],
+                suffix = row[2],
+                longitude = row[3],
+                latitude = row[4],
+                level = row[5],
+                id = row[6],
+                )
+
+def import_huyen_data(apps, schema_editor):
+     with open('project/app/data/huyen.csv') as f:
+        reader = csv.reader(f)
+        next(reader, None)
+        for row in reader:
+            _, _ = NewHuyen.objects.get_or_create(
+                name = row[0],
+                prefix = row[1],
+                suffix = row[2],
+                longitude = row[3],
+                latitude = row[4],
+                level = row[5],
+                id = row[6],
+                tinh_id = row[7],
+                )
+
+def import_xa_data(apps, schema_editor):
+     with open('project/app/data/xa.csv') as f:
+        reader = csv.reader(f)
+        next(reader, None)
+        for row in reader:
+            _, _ = NewXa.objects.get_or_create(
+                name = row[0],
+                prefix = row[1],
+                suffix = row[2],
+                longitude = row[3],
+                latitude = row[4],
+                level = row[5],
+                id = row[6],
+                huyen_id = row[7],
+                )
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('app', '0072_auto_20201027_1848'),
+    ]
+
+    operations = [
+        migrations.RunPython(import_tinh_data),
+        migrations.RunPython(import_huyen_data),
+        migrations.RunPython(import_xa_data),
+    ]

project/app/migrations/0074_auto_20201027_1934.py

@@ -0,0 +1,90 @@
+# Generated by Django 3.1.2 on 2020-10-27 12:34
+
+from django.db import migrations, models
+import django.db.models.deletion
+import smart_selects.db_fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('app', '0073_import_location_data'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='cuuho',
+            name='huyen',
+            field=smart_selects.db_fields.ChainedForeignKey(auto_choose=True, blank=True, chained_field='tinh', chained_model_field='tinh', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='cuuho_reversed', to='app.newhuyen'),
+        ),
+        migrations.AlterField(
+            model_name='cuuho',
+            name='tinh',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='cuuho_reversed', to='app.newtinh'),
+        ),
+        migrations.AlterField(
+            model_name='cuuho',
+            name='xa',
+            field=smart_selects.db_fields.ChainedForeignKey(auto_choose=True, blank=True, chained_field='huyen', chained_model_field='huyen', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='cuuho_reversed', to='app.newxa'),
+        ),
+        migrations.AlterField(
+            model_name='historicalhodan',
+            name='huyen',
+            field=smart_selects.db_fields.ChainedForeignKey(auto_choose=True, blank=True, chained_field='tinh', chained_model_field='tinh', db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='app.newhuyen'),
+        ),
+        migrations.AlterField(
+            model_name='historicalhodan',
+            name='tinh',
+            field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='app.newtinh'),
+        ),
+        migrations.AlterField(
+            model_name='historicalhodan',
+            name='xa',
+            field=smart_selects.db_fields.ChainedForeignKey(auto_choose=True, blank=True, chained_field='huyen', chained_model_field='huyen', db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='app.newxa'),
+        ),
+        migrations.AlterField(
+            model_name='hodan',
+            name='huyen',
+            field=smart_selects.db_fields.ChainedForeignKey(auto_choose=True, blank=True, chained_field='tinh', chained_model_field='tinh', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='hodan_reversed', to='app.newhuyen'),
+        ),
+        migrations.AlterField(
+            model_name='hodan',
+            name='tinh',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='hodan_reversed', to='app.newtinh'),
+        ),
+        migrations.AlterField(
+            model_name='hodan',
+            name='xa',
+            field=smart_selects.db_fields.ChainedForeignKey(auto_choose=True, blank=True, chained_field='huyen', chained_model_field='huyen', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='hodan_reversed', to='app.newxa'),
+        ),
+        migrations.AlterField(
+            model_name='nguonluc',
+            name='huyen',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='app.newhuyen'),
+        ),
+        migrations.AlterField(
+            model_name='nguonluc',
+            name='tinh',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='app.newtinh'),
+        ),
+        migrations.AlterField(
+            model_name='nguonluc',
+            name='xa',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='app.newxa'),
+        ),
+        migrations.AlterField(
+            model_name='tinhnguyenvien',
+            name='huyen',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='app.newhuyen'),
+        ),
+        migrations.AlterField(
+            model_name='tinhnguyenvien',
+            name='tinh',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='app.newtinh'),
+        ),
+        migrations.AlterField(
+            model_name='tinhnguyenvien',
+            name='xa',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='app.newxa'),
+        ),
+    ]