Merge pull request #137 from cmu-delphi/OKRS24-214-Update-SourceSubdivision-model

Okrs24 214 update source subdivision model

Author: BrainIsDead

src/datasources/admin.py

@@ -17,9 +17,6 @@ class SourceSubdivisionAdmin(ImportExportModelAdmin):
     resource_classes: list[type[SourceSubdivisionResource]] = [SourceSubdivisionResource]
 
 
-data_source_search_fields_type = tuple[Literal['name'], Literal['source_subdivision__db_source'], Literal['source_subdivision__name'], Literal['description']]
-
-
 @admin.register(DataSource)
 class DataSourceAdmin(ImportExportModelAdmin):
     """

src/datasources/migrations/0005_sourcesubdivision_external_name.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.0.3 on 2024-06-05 10:09
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('datasources', '0004_alter_datasource_options_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='sourcesubdivision',
+            name='external_name',
+            field=models.CharField(help_text='External Name', max_length=128, null=True),
+        ),
+    ]

src/datasources/models.py

@@ -17,6 +17,11 @@ class SourceSubdivision(TimeStampedModel):
         max_length=128,
         unique=True
     )
+    external_name: models.CharField = models.CharField(
+        help_text=_('External Name'),
+        max_length=128,
+        null=True,
+    )
     description: models.TextField = models.TextField(
         help_text=_('Source description'),
         max_length=1000,

src/datasources/resources.py

@@ -12,6 +12,7 @@
 class SourceSubdivisionResource(resources.ModelResource):
     name = Field(attribute='name', column_name='Source Subdivision')
     display_name = Field(attribute='display_name', column_name='Source Subdivision')
+    external_name = Field(attribute='external_name', column_name='External Name')
     description = Field(attribute='description', column_name='Description')
     db_source = Field(attribute='db_source', column_name='DB Source')
     data_source = Field(

src/templates/signals/signals.html

@@ -316,7 +316,7 @@ <h2 class="accordion-header">
                                             {% endif %}
                                         </td>
                                         <td class="clickable-table-cell" onClick="location.href='{% url 'signal' pk=signal.id %}';">
-                                            {{ signal.source.data_source }}
+                                            {{ signal.source.external_name }}
                                         </td>
                                         <td class="clickable-table-cell" onClick="location.href='{% url 'signal' pk=signal.id %}';">
                                             {{ signal.description}}