add location data

src/apps/core/management/commands/setup.py

@@ -11,4 +11,5 @@ def handle(self: Self, **options) -> None:
             call_command("loaddata", "users.json")
 
         call_command("loaddata", "bestilling.json")
+        call_command("loaddata", "location.json")
         call_command("loaddata", "groups.json")

src/genlab_bestilling/admin.py

@@ -73,8 +73,8 @@ class OrganizationAdmin(ModelAdmin):
 
 @admin.register(Location)
 class LocationAdmin(ModelAdmin):
-    list_display = ["name", "type", "river_id", "station_id"]
-    search_fields = ["name", "river_id", "station_id"]
+    list_display = ["name", "type", "river_id", "code"]
+    search_fields = ["name", "river_id", "code"]
     list_filter = [("type", RelatedDropdownFilter)]
     list_filter_submit = True
 

src/genlab_bestilling/migrations/0005_rename_station_id_location_code_location_fylke.py

@@ -0,0 +1,22 @@
+# Generated by Django 5.1.1 on 2024-10-08 08:38
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("genlab_bestilling", "0004_remove_sample_date_sample_year"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="location",
+            old_name="station_id",
+            new_name="code",
+        ),
+        migrations.AddField(
+            model_name="location",
+            name="fylke",
+            field=models.CharField(blank=True, null=True),
+        ),
+    ]

src/genlab_bestilling/models.py

@@ -81,11 +81,12 @@ class Location(models.Model):
         "LocationType", null=True, blank=True, on_delete=models.CASCADE
     )
     river_id = models.CharField(max_length=250, null=True, blank=True)
-    station_id = models.CharField(max_length=20, null=True, blank=True)
+    code = models.CharField(max_length=20, null=True, blank=True)
+    fylke = models.CharField(null=True, blank=True)
 
     def __str__(self):
         if self.river_id:
-            return f"{self.river_id} {self.station_id} {self.name}"
+            return f"{self.river_id} {self.name}"
 
         return self.name