diff --git a/db/api/serializers.py b/db/api/serializers.py index c661a7f..cf035f8 100644 --- a/db/api/serializers.py +++ b/db/api/serializers.py @@ -199,7 +199,7 @@ class TransmitterEntrySerializer(serializers.ModelSerializer): 'uuid', 'description', 'status', 'type', 'uplink_low', 'uplink_high', 'uplink_drift', 'downlink_low', 'downlink_high', 'downlink_drift', 'downlink_mode', 'uplink_mode', 'invert', 'baud', 'satellite', 'citation', 'service', 'iaru_coordination', - 'iaru_coordination_url', 'itu_coordination', 'created_by' + 'iaru_coordination_url', 'itu_notification', 'created_by' ) @@ -231,7 +231,7 @@ class TransmitterEntrySerializer(serializers.ModelSerializer): 'service': 'Amateur', 'iaru_coordination': '', 'iaru_coordination_url': '', - 'itu_coordination': '' + 'itu_notification': '' }, response_only=True, # signal that example only applies to responses ), @@ -253,7 +253,7 @@ class TransmitterSerializer(serializers.ModelSerializer): 'uuid', 'description', 'alive', 'type', 'uplink_low', 'uplink_high', 'uplink_drift', 'downlink_low', 'downlink_high', 'downlink_drift', 'mode', 'mode_id', 'uplink_mode', 'invert', 'baud', 'sat_id', 'norad_cat_id', 'status', 'updated', 'citation', 'service', - 'iaru_coordination', 'iaru_coordination_url', 'itu_coordination' + 'iaru_coordination', 'iaru_coordination_url', 'itu_notification' ) # Keeping alive field for compatibility issues diff --git a/db/base/forms.py b/db/base/forms.py index 8734cde..629ddf3 100644 --- a/db/base/forms.py +++ b/db/base/forms.py @@ -27,7 +27,7 @@ class TransmitterCreateForm(BSModalModelForm): # pylint: disable=too-many-ances 'description', 'type', 'status', 'uplink_low', 'uplink_high', 'uplink_drift', 'uplink_mode', 'downlink_low', 'downlink_high', 'downlink_drift', 'downlink_mode', 'invert', 'baud', 'citation', 'service', 'iaru_coordination', 'iaru_coordination_url', - 'itu_coordination' + 'itu_notification' ] labels = { 'downlink_low': _('Downlink freq.'), @@ -35,7 +35,7 @@ class TransmitterCreateForm(BSModalModelForm): # pylint: disable=too-many-ances 'invert': _('Inverted Transponder?'), 'iaru_coordination': _('IARU Coordination'), 'iaru_coordination_url': _('IARU Coordination URL'), - 'itu_coordination': _('ITU Coordinations URLs'), + 'itu_notification': _('ITU Notifications URLs'), } widgets = { 'description': TextInput(), @@ -50,7 +50,7 @@ class TransmitterUpdateForm(BSModalModelForm): # pylint: disable=too-many-ances 'description', 'type', 'status', 'uplink_low', 'uplink_high', 'uplink_drift', 'uplink_mode', 'downlink_low', 'downlink_high', 'downlink_drift', 'downlink_mode', 'invert', 'baud', 'citation', 'service', 'iaru_coordination', 'iaru_coordination_url', - 'itu_coordination' + 'itu_notification' ] labels = { 'downlink_low': _('Downlink freq.'), @@ -58,7 +58,7 @@ class TransmitterUpdateForm(BSModalModelForm): # pylint: disable=too-many-ances 'invert': _('Inverted Transponder?'), 'iaru_coordination': _('IARU Coordination'), 'iaru_coordination_url': _('IARU Coordination URL'), - 'itu_coordination': _('ITU Coordination URLs'), + 'itu_notification': _('ITU Notifications URLs'), } widgets = { 'description': TextInput(), diff --git a/db/base/migrations/0051_add_itu_coordination_field.py b/db/base/migrations/0051_add_itu_coordination_field.py index a985228..f7710d3 100644 --- a/db/base/migrations/0051_add_itu_coordination_field.py +++ b/db/base/migrations/0051_add_itu_coordination_field.py @@ -14,6 +14,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='transmitterentry', name='itu_coordination', - field=models.JSONField(default=db.base.models.get_default_itu_coordination_field), + field=models.JSONField(default=db.base.models.get_default_itu_notification_field), ), ] diff --git a/db/base/migrations/0054_rename_itu_coordination_field.py b/db/base/migrations/0054_rename_itu_coordination_field.py new file mode 100644 index 0000000..897b26a --- /dev/null +++ b/db/base/migrations/0054_rename_itu_coordination_field.py @@ -0,0 +1,18 @@ +# Generated by Django 4.0.4 on 2022-05-24 07:55 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('base', '0053_remove_old_coordination_fields'), + ] + + operations = [ + migrations.RenameField( + model_name='transmitterentry', + old_name='itu_coordination', + new_name='itu_notification', + ), + ] diff --git a/db/base/models.py b/db/base/models.py index 3a5f2b3..8ed8ab1 100644 --- a/db/base/models.py +++ b/db/base/models.py @@ -102,8 +102,8 @@ def generate_sat_id(): ) -def get_default_itu_coordination_field(): - """Generate default value for itu_coordination field of TransmitterEntry model""" +def get_default_itu_notification_field(): + """Generate default value for itu_notification field of TransmitterEntry model""" return {'urls': []} @@ -502,7 +502,7 @@ class TransmitterEntry(models.Model): help_text='URL for more details on this frequency coordination', validators=[URLValidator(schemes=['http', 'https'], regex=URL_REGEX)] ) - itu_coordination = models.JSONField(default=get_default_itu_coordination_field) + itu_notification = models.JSONField(default=get_default_itu_notification_field) reviewer = models.ForeignKey( get_user_model(), related_name='reviewed_transmitters', diff --git a/db/settings.py b/db/settings.py index 7b46637..9cf7d15 100644 --- a/db/settings.py +++ b/db/settings.py @@ -417,7 +417,7 @@ CSP_SCRIPT_SRC = config( 'https://*.google-analytics.com,' 'https://kit-free.fontawesome.com,' 'https://kit.fontawesome.com,' - "'sha256-hNUUO5rlLTL2RGoi1tx0HAeOoB/Zc30JmlfQDwIq358='," # transmitter_modal.js + "'sha256-yCeVaKZLAqmSVRds/nIjWRwzlJK+K3lQOWM1wc5VP/M='," # transmitter_modal.js ) CSP_IMG_SRC = config( 'CSP_IMG_SRC', diff --git a/db/static/js/transmitter_modal.js b/db/static/js/transmitter_modal.js index c1afa2e..13e705f 100644 --- a/db/static/js/transmitter_modal.js +++ b/db/static/js/transmitter_modal.js @@ -69,17 +69,17 @@ function transmitter_suggestion_type(selection) { } $(function () { - // Initialize ITU Coordination URLs textarea and hide the JSON one - $('textarea[name=\'itu_coordination\']').prop('readonly', true); + // Initialize ITU Notifications URLs textarea and hide the JSON one + $('textarea[name=\'itu_notification\']').prop('readonly', true); $('#itu-coordination-input-group').hide(); - var itu_urls = $.parseJSON($('textarea[name=\'itu_coordination\']').val())['urls']; - $('textarea[name=\'itu_coordination_per_line\']').val(itu_urls.join('\n')); - // Add event for changing JSON textarea when ITU Coordination URLs changes - $('textarea[name=\'itu_coordination_per_line\']').on('change click', function(){ - var itu_coordination_json = $.parseJSON($('textarea[name=\'itu_coordination\']').val()); - var new_itu_urls = $('textarea[name=\'itu_coordination_per_line\']').val().split('\n'); - itu_coordination_json['urls'] = new_itu_urls; - $('textarea[name=\'itu_coordination\']').val(JSON.stringify(itu_coordination_json)); + var itu_urls = $.parseJSON($('textarea[name=\'itu_notification\']').val())['urls']; + $('textarea[name=\'itu_notification_per_line\']').val(itu_urls.join('\n')); + // Add event for changing JSON textarea when ITU Notifications URLs changes + $('textarea[name=\'itu_notification_per_line\']').on('change click', function(){ + var itu_notification_json = $.parseJSON($('textarea[name=\'itu_notification\']').val()); + var new_itu_urls = $('textarea[name=\'itu_notification_per_line\']').val().split('\n'); + itu_notification_json['urls'] = new_itu_urls; + $('textarea[name=\'itu_notification\']').val(JSON.stringify(itu_notification_json)); }); // Initialize frequency drift fields and their events $('input[name=\'uplink_drift\']').prop('readonly', true); diff --git a/db/templates/base/modals/transmitter_create.html b/db/templates/base/modals/transmitter_create.html index f83e79c..590039d 100644 --- a/db/templates/base/modals/transmitter_create.html +++ b/db/templates/base/modals/transmitter_create.html @@ -18,11 +18,11 @@ {% for field in form %} - {% if 'itu_coordination' in field.id_for_label %} + {% if 'itu_notification' in field.id_for_label %}
+ title="ITU Notifications URLs, add one per line"> -
{% endif %} @@ -42,7 +42,7 @@ {% if field.help_text %} data-toggle="tooltip" data-placement="bottom" title="{{ field.help_text }}" {% endif %} - {% if 'itu_coordination' in field.id_for_label %} + {% if 'itu_notification' in field.id_for_label %} id="itu-coordination-input-group" {% endif %} > diff --git a/db/templates/base/modals/transmitter_update.html b/db/templates/base/modals/transmitter_update.html index 8050071..5af6ac8 100644 --- a/db/templates/base/modals/transmitter_update.html +++ b/db/templates/base/modals/transmitter_update.html @@ -18,11 +18,11 @@ {% for field in form %} - {% if 'itu_coordination' in field.id_for_label %} + {% if 'itu_notification' in field.id_for_label %}
+ title="ITU Notifications URLs, add one per line"> -
{% endif %} @@ -42,7 +42,7 @@ {% if field.help_text %} data-toggle="tooltip" data-placement="bottom" title="{{ field.help_text }}" {% endif %} - {% if 'itu_coordination' in field.id_for_label %} + {% if 'itu_notification' in field.id_for_label %} id="itu-coordination-input-group" {% endif %} > diff --git a/db/templates/includes/cards/transmitter_card.html b/db/templates/includes/cards/transmitter_card.html index b6d4741..8b3bf67 100644 --- a/db/templates/includes/cards/transmitter_card.html +++ b/db/templates/includes/cards/transmitter_card.html @@ -126,10 +126,10 @@
{{ transmitter.iaru_coordination }}
{% endif %} {% endif %} - {% if transmitter.itu_coordination.urls %} -
ITU Coordination
-
ITU Coordinated - {%for itu_url in transmitter.itu_coordination.urls %} + {% if transmitter.itu_notification.urls %} +
ITU Notifications
+
ITU Notified + {%for itu_url in transmitter.itu_notification.urls %} [Link {{ forloop.counter }}] {% endfor %}