Merge pull request kartoza#635 from dimasciput/import_site

River, Site, SiteVisit importer

Author: dimasciput

bims/admin.py

@@ -451,6 +451,13 @@ class RiverCatchmentAdmin(admin.ModelAdmin):
     )
 
 
+class FbisUUIDAdmin(admin.ModelAdmin):
+    list_display = ('uuid', 'content_type', 'content_object')
+    list_filter = ('content_type',)
+    ordering = ('content_type', 'uuid')
+    search_fields = ('uuid', )
+
+
 # Re-register GeoNode's Profile page
 admin.site.unregister(Profile)
 admin.site.register(Profile, CustomUserAdmin)
@@ -486,7 +493,7 @@ class RiverCatchmentAdmin(admin.ModelAdmin):
 admin.site.register(ReferenceLink, ReferenceLinkAdmin)
 admin.site.register(VernacularName, VernacularNameAdmin)
 admin.site.register(RiverCatchment, RiverCatchmentAdmin)
-admin.site.register(FbisUUID)
+admin.site.register(FbisUUID, FbisUUIDAdmin)
 
 # Hide upload files from geonode in admin
 admin.site.unregister(Upload)

bims/management/commands/import_fbis_database.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.15 on 2019-01-08 04:32
+from __future__ import unicode_literals
+
+import django.contrib.postgres.fields.jsonb
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bims', '0093_auto_20190107_0256'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='locationsite',
+            name='other_data',
+            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True, verbose_name=b'Other json data'),
+        ),
+    ]

bims/migrations/0094_locationsite_other_data.py

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.15 on 2019-01-08 07:25
+from __future__ import unicode_literals
+
+import django.contrib.postgres.fields.jsonb
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bims', '0094_locationsite_other_data'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='locationsite',
+            name='other_data',
+        ),
+        migrations.AddField(
+            model_name='locationsite',
+            name='additional_data',
+            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True, verbose_name=b'Additional json data'),
+        ),
+        migrations.AddField(
+            model_name='locationsite',
+            name='land_owner_detail',
+            field=models.TextField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='locationsite',
+            name='map_reference',
+            field=models.CharField(blank=True, max_length=200, null=True),
+        ),
+    ]

bims/migrations/0095_auto_20190108_0725.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.15 on 2019-01-08 07:27
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sass', '0001_initial'),
+        ('bims', '0095_auto_20190108_0725'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='locationsite',
+            name='river',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='sass.River'),
+        ),
+    ]

bims/migrations/0096_locationsite_river.py

@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.15 on 2019-01-09 03:49
+from __future__ import unicode_literals
+
+import django.contrib.postgres.fields.jsonb
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bims', '0096_locationsite_river'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='profile',
+            name='data',
+            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=b'', null=True),
+        ),
+        migrations.AlterField(
+            model_name='profile',
+            name='fbis_username',
+            field=models.CharField(blank=True, default=b'', max_length=150, null=True),
+        ),
+        migrations.AlterField(
+            model_name='profile',
+            name='other',
+            field=models.CharField(blank=True, default=b'', max_length=100, null=True),
+        ),
+        migrations.AlterField(
+            model_name='profile',
+            name='qualifications',
+            field=models.CharField(blank=True, default=b'', max_length=250, null=True),
+        ),
+    ]

bims/migrations/0097_auto_20190109_0349.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.15 on 2019-01-09 05:18
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bims', '0097_auto_20190109_0349'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='fbisuuid',
+            name='uuid',
+            field=models.CharField(max_length=50),
+        ),
+    ]

bims/migrations/0098_auto_20190109_0518.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.15 on 2019-01-09 05:26
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bims', '0098_auto_20190109_0518'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='locationsite',
+            name='name',
+            field=models.CharField(max_length=200),
+        ),
+    ]

bims/migrations/0099_auto_20190109_0526.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.15 on 2019-01-09 06:45
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bims', '0099_auto_20190109_0526'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='locationsite',
+            name='name',
+            field=models.CharField(max_length=300),
+        ),
+    ]

bims/migrations/0100_auto_20190109_0645.py

@@ -15,7 +15,7 @@ class FbisUUID(models.Model):
     uuid = models.CharField(
         null=False,
         blank=False,
-        unique=True,
+        unique=False,
         max_length=50
     )
     content_type = models.ForeignKey(ContentType)

bims/models/fbis_uuid.py

@@ -10,6 +10,7 @@
 from django.core.exceptions import ValidationError
 from django.contrib.gis.db import models
 from django.dispatch import receiver
+from django.contrib.postgres.fields import JSONField
 from bims.models.boundary import Boundary
 from bims.models.location_type import LocationType
 from bims.utils.cluster import update_cluster_by_site
@@ -28,7 +29,7 @@ class LocationSite(DocumentLinksMixin):
                             '{geocontext_collection_key}'
 
     name = models.CharField(
-        max_length=100,
+        max_length=300,
         blank=False,
     )
     site_description = models.CharField(
@@ -62,6 +63,20 @@ class LocationSite(DocumentLinksMixin):
         null=True,
         blank=True,
     )
+    map_reference = models.CharField(
+        null=True,
+        blank=True,
+        max_length=200
+    )
+    land_owner_detail = models.TextField(
+        null=True,
+        blank=True,
+    )
+    river = models.ForeignKey(
+        'sass.River',
+        null=True,
+        blank=True,
+    )
 
     location_context_document = models.TextField(
         verbose_name='Document for location context as JSON.',
@@ -71,6 +86,12 @@ class LocationSite(DocumentLinksMixin):
         blank=True
     )
 
+    additional_data = JSONField(
+        verbose_name='Additional json data',
+        null=True,
+        blank=True
+    )
+
     boundary = models.ForeignKey(
         Boundary,
         help_text='This is lowest boundary where location is placed.',
@@ -174,7 +195,7 @@ class Meta:
         """Meta class for project."""
         app_label = 'bims'
 
-    def __str__(self):
+    def __unicode__(self):
         return u'%s' % self.name
 
     def save(self, *args, **kwargs):
@@ -203,7 +224,6 @@ def location_site_post_save_handler(sender, instance, **kwargs):
     """
     Update cluster when location site saved
     """
-    return
     if not issubclass(sender, LocationSite):
         return
     update_cluster_by_site(instance)

bims/models/location_site.py

@@ -14,20 +14,25 @@ class Profile(models.Model):
     qualifications = models.CharField(
         max_length=250,
         blank=True,
-        default=''
+        default='',
+        null=True,
     )
     other = models.CharField(
         max_length=100,
         blank=True,
-        default=''
+        default='',
+        null=True,
     )
     fbis_username = models.CharField(
         max_length=150,
         blank=True,
-        default=''
+        default='',
+        null=True,
     )
     data = JSONField(
-        default=''
+        default='',
+        null=True,
+        blank=True,
     )
     hide_bims_info = models.BooleanField(
         default=False