Add ITU coordination field

Signed-off-by: Alfredos-Panagiotis Damkalis <fredy@fredy.gr>

db/api/serializers.py

@@ -231,6 +231,7 @@ class TransmitterEntrySerializer(serializers.ModelSerializer):
                 'service': 'Amateur',
                 'iaru_coordination': '',
                 'iaru_coordination_url': '',
+                'itu_coordination': '',
                 'coordination': '',
                 'coordination_url': ''
             },
@@ -254,7 +255,8 @@ 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', 'coordination', 'coordination_url'
+            'iaru_coordination', 'iaru_coordination_url', 'itu_coordination', 'coordination',
+            'coordination_url'
         )
 
     # Keeping alive field for compatibility issues

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',
-            'coordination', 'coordination_url'
+            'itu_coordination', 'coordination', 'coordination_url'
         ]
         labels = {
             'downlink_low': _('Downlink freq.'),
@@ -35,6 +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'),
         }
         widgets = {
             'description': TextInput(),
@@ -49,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',
-            'coordination', 'coordination_url'
+            'itu_coordination', 'coordination', 'coordination_url'
         ]
         labels = {
             'downlink_low': _('Downlink freq.'),
@@ -57,6 +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'),
         }
         widgets = {
             'description': TextInput(),

db/base/migrations/0051_add_itu_coordination_field.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.0.4 on 2022-05-22 16:50
+
+import db.base.models
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base', '0050_add_iaru_coordination_fields'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='transmitterentry',
+            name='itu_coordination',
+            field=models.JSONField(default=db.base.models.get_default_itu_coordination_field),
+        ),
+    ]

db/base/models.py

@@ -106,6 +106,11 @@ def generate_sat_id():
     )
 
 
+def get_default_itu_coordination_field():
+    """Generate default value for itu_coordination field of TransmitterEntry model"""
+    return {'urls': []}
+
+
 class SatelliteIdentifier(models.Model):
     """Model for Satellite Identifier."""
     sat_id = models.CharField(
@@ -501,6 +506,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)
     coordination = models.CharField(
         choices=list(zip(COORDINATION_STATUS, COORDINATION_STATUS)),
         max_length=20,

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-wMIRCqWVu9YgOwizZzrYvTWAiAn0Y8PQTRdiHy2BNRk=',"  # transmitter_modal.js
+    "'sha256-hNUUO5rlLTL2RGoi1tx0HAeOoB/Zc30JmlfQDwIq358=',"  # transmitter_modal.js
 )
 CSP_IMG_SRC = config(
     'CSP_IMG_SRC',

db/static/js/transmitter_modal.js

@@ -4,7 +4,9 @@
 // NOTE: Since this script is loaded dynamically after page load, we have
 // to be cautious of CSP requirements. Any changes to this script will need
 // to have the hash recalculated and changed in settings.py under
-// CSP_SCRIPT_SRC
+// CSP_SCRIPT_SRC. For hash recalculation use the command:
+//
+// cat transmitter_modal.js | openssl sha256 -binary | openssl base64
 
 function ppb_to_freq(freq, drift) {
     var freq_obs = freq + ((freq * drift) / Math.pow(10,9));
@@ -67,6 +69,19 @@ function transmitter_suggestion_type(selection) {
 }
 
 $(function () {
+    // Initialize ITU Coordination URLs textarea and hide the JSON one
+    $('textarea[name=\'itu_coordination\']').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));
+    });
+    // Initialize frequency drift fields and their events
     $('input[name=\'uplink_drift\']').prop('readonly', true);
     var uplink_ppb = $('input[name=\'uplink_drift\']').val();
     if (uplink_ppb != 0) {
@@ -89,7 +104,7 @@ $(function () {
         var freq = parseInt($('input[name=\'downlink_low\']:visible').val());
         $('input[name=\'downlink_drift\']').val(freq_to_ppb(freq_obs,freq));
     });
-
+    // Initialize fields for transmitter type.
     transmitter_suggestion_type($('#id_type option:selected').text());
 
     $('#id_type').on('change click', function () {
@@ -99,4 +114,4 @@ $(function () {
 });
 
 // Enable tooltips
-$('[data-toggle="tooltip"]').tooltip();
+$('[data-toggle="tooltip"]').tooltip();

db/templates/base/modals/transmitter_create.html

@@ -13,42 +13,53 @@
     <div class="modal-body">
         <div class="{% if form.non_field_errors %}invalid{% endif %} mb-2">
             {% for error in form.non_field_errors %}
-            {{ error }}
+                {{ error }}
             {% endfor %}
         </div>
 
         {% for field in form %}
-        {% if 'drift' in field.id_for_label %}
-        <div class="input-group my-1"
-        {% if field.help_text %}
-        data-toggle="tooltip" data-placement="bottom" title="Drifted frequency, when different from the published frequency"
-        {% endif %}
-        >
-            <label class="input-group-prepend input-group-text" for="{{ field.id_for_label }}_hz">{{ field.label }} freq.</label>
-            <input type="number" name="{{ field.name }}_hz" min="-9223372036854775808" max="9223372036854775807" 
-                placeholder="Drifted Frequency" class="form-control" id="{{ field.id_for_label }}_hz">
-            <label class="input-group-text input-group-append">Hz</label>
-        </div>
-        {% endif %}
-        <div class="input-group my-1"
-        {% if field.help_text %}
-        data-toggle="tooltip" data-placement="bottom" title="{{ field.help_text }}"
-        {% endif %}
-        >
-            <label class="input-group-prepend input-group-text" for="{{ field.id_for_label }}">{{ field.label }}</label>
-            {% render_field field class="form-control" placeholder=field.label %}
-
-            {% if 'drift' in field.id_for_label %}
-            <label class="input-group-text input-group-append">PPB</label>
-            {% elif 'low' in field.id_for_label or 'high' in field.id_for_label %}
-            <label class="input-group-text input-group-append">Hz</label>
+            {% if 'itu_coordination' in field.id_for_label %}
+                <div class="input-group my-1" data-toggle="tooltip" data-placement="bottom"
+                     title="ITU Coordination URLs each per line">
+                    <label class="input-group-prepend input-group-text" for="{{ field.id_for_label }}_per_line">{{ field.label }}</label>
+                    <textarea name="{{ field.name }}_per_line" placeholder="ITU Coordination URLs each per line" rows="3" wrap="off"
+                              class="form-control" id="{{ field.id_for_label }}_per_line"></textarea>
+                </div>
             {% endif %}
-            <div class="{% if field.errors %} invalid{% endif %}">
-                {% for error in field.errors %}
-                <p class="help-block">{{ error }}</p>
-                {% endfor %}
+            {% if 'drift' in field.id_for_label %}
+                <div class="input-group my-1"
+                     {% if field.help_text %}
+                         data-toggle="tooltip" data-placement="bottom" title="Drifted frequency, when different from the published frequency"
+                     {% endif %}
+                >
+                    <label class="input-group-prepend input-group-text" for="{{ field.id_for_label }}_hz">{{ field.label }} freq.</label>
+                    <input type="number" name="{{ field.name }}_hz" min="-9223372036854775808" max="9223372036854775807" 
+                           placeholder="Drifted Frequency" class="form-control" id="{{ field.id_for_label }}_hz">
+                    <label class="input-group-text input-group-append">Hz</label>
+                </div>
+            {% endif %}
+            <div class="input-group my-1"
+                 {% if field.help_text %}
+                     data-toggle="tooltip" data-placement="bottom" title="{{ field.help_text }}"
+                 {% endif %}
+                 {% if 'itu_coordination' in field.id_for_label %}
+                     id="itu-coordination-input-group"
+                 {% endif %}
+            >
+                <label class="input-group-prepend input-group-text" for="{{ field.id_for_label }}">{{ field.label }}</label>
+                {% render_field field class="form-control" placeholder=field.label %}
+
+                {% if 'drift' in field.id_for_label %}
+                    <label class="input-group-text input-group-append">PPB</label>
+                {% elif 'low' in field.id_for_label or 'high' in field.id_for_label %}
+                    <label class="input-group-text input-group-append">Hz</label>
+                {% endif %}
+                <div class="{% if field.errors %} invalid{% endif %}">
+                    {% for error in field.errors %}
+                        <p class="help-block">{{ error }}</p>
+                    {% endfor %}
+                </div>
             </div>
-        </div>
         {% endfor %}
     </div>
 

db/templates/base/modals/transmitter_update.html

@@ -13,42 +13,53 @@
     <div class="modal-body">
         <div class="{% if form.non_field_errors %}invalid{% endif %} mb-2">
             {% for error in form.non_field_errors %}
-            {{ error }}
+                {{ error }}
             {% endfor %}
         </div>
 
         {% for field in form %}
-        {% if 'drift' in field.id_for_label %}
-        <div class="input-group my-1"
-        {% if field.help_text %}
-        data-toggle="tooltip" data-placement="bottom" title="Drifted frequency, when different from the published frequency"
-        {% endif %}
-        >
-            <label class="input-group-prepend input-group-text" for="{{ field.id_for_label }}_hz">{{ field.label }} freq.</label>
-            <input type="number" name="{{ field.name }}_hz" min="-9223372036854775808" max="9223372036854775807" 
-                placeholder="Drifted Frequency" class="form-control" id="{{ field.id_for_label }}_hz">
-            <label class="input-group-text input-group-append">Hz</label>
-        </div>
-        {% endif %}
-        <div class="input-group my-1"
-        {% if field.help_text %}
-        data-toggle="tooltip" data-placement="bottom" title="{{ field.help_text }}"
-        {% endif %}
-        >
-            <label class="input-group-prepend input-group-text" for="{{ field.id_for_label }}">{{ field.label }}</label>
-            {% render_field field class="form-control" placeholder=field.label %}
-
-            {% if 'drift' in field.id_for_label %}
-            <label class="input-group-text input-group-append">PPB</label>
-            {% elif 'low' in field.id_for_label or 'high' in field.id_for_label %}
-            <label class="input-group-text input-group-append">Hz</label>
+            {% if 'itu_coordination' in field.id_for_label %}
+                <div class="input-group my-1" data-toggle="tooltip" data-placement="bottom"
+                     title="ITU Coordination URLs each per line">
+                    <label class="input-group-prepend input-group-text" for="{{ field.id_for_label }}_per_line">{{ field.label }}</label>
+                    <textarea name="{{ field.name }}_per_line" placeholder="ITU Coordination URLs each per line" rows="3" wrap="off"
+                              class="form-control" id="{{ field.id_for_label }}_per_line"></textarea>
+                </div>
             {% endif %}
-            <div class="{% if field.errors %} invalid{% endif %}">
-                {% for error in field.errors %}
-                <p class="help-block">{{ error }}</p>
-                {% endfor %}
+            {% if 'drift' in field.id_for_label %}
+                <div class="input-group my-1"
+                     {% if field.help_text %}
+                         data-toggle="tooltip" data-placement="bottom" title="Drifted frequency, when different from the published frequency"
+                     {% endif %}
+                >
+                    <label class="input-group-prepend input-group-text" for="{{ field.id_for_label }}_hz">{{ field.label }} freq.</label>
+                    <input type="number" name="{{ field.name }}_hz" min="-9223372036854775808" max="9223372036854775807" 
+                           placeholder="Drifted Frequency" class="form-control" id="{{ field.id_for_label }}_hz">
+                    <label class="input-group-text input-group-append">Hz</label>
+                </div>
+            {% endif %}
+            <div class="input-group my-1"
+                 {% if field.help_text %}
+                     data-toggle="tooltip" data-placement="bottom" title="{{ field.help_text }}"
+                 {% endif %}
+                 {% if 'itu_coordination' in field.id_for_label %}
+                     id="itu-coordination-input-group"
+                 {% endif %}
+            >
+                <label class="input-group-prepend input-group-text" for="{{ field.id_for_label }}">{{ field.label }}</label>
+                {% render_field field class="form-control" placeholder=field.label %}
+
+                {% if 'drift' in field.id_for_label %}
+                    <label class="input-group-text input-group-append">PPB</label>
+                {% elif 'low' in field.id_for_label or 'high' in field.id_for_label %}
+                    <label class="input-group-text input-group-append">Hz</label>
+                {% endif %}
+                <div class="{% if field.errors %} invalid{% endif %}">
+                    {% for error in field.errors %}
+                        <p class="help-block">{{ error }}</p>
+                    {% endfor %}
+                </div>
             </div>
-        </div>
         {% endfor %}
     </div>
 

db/templates/includes/cards/transmitter_card.html

@@ -126,6 +126,14 @@
       <dd class="col-sm-6">{{ transmitter.iaru_coordination }}</dd>
       {% endif %}
       {% endif %}
+      {% if transmitter.itu_coordination.urls %}
+      <dt class="col-sm-6">ITU Coordination</dt>
+      <dd class="col-sm-6"> ITU Coordinated
+          {%for itu_url in transmitter.itu_coordination.urls %}
+          [<a href="{{ itu_url }}" target="_blank">Link {{ forloop.counter }}</a>]
+          {% endfor %}
+      </dd>
+      {% endif %}
       {% if transmitter.coordination != '' %}
       <dt class="col-sm-6">Frequency Coordination</dt>
       {% endif %}