diff --git a/.gitignore b/.gitignore index 42658b3..1d5eb97 100644 --- a/.gitignore +++ b/.gitignore @@ -32,4 +32,5 @@ tiles # Docker # docker-* -maplibre-gl-js-5.10.0.zip \ No newline at end of file +maplibre-gl-js-5.10.0.zip +cert.pem \ No newline at end of file diff --git a/dbapp/mainapp/templates/mainapp/objitem_detail.html b/dbapp/mainapp/templates/mainapp/objitem_detail.html index 1ace95a..27859af 100644 --- a/dbapp/mainapp/templates/mainapp/objitem_detail.html +++ b/dbapp/mainapp/templates/mainapp/objitem_detail.html @@ -182,6 +182,98 @@ {% endif %} + +
+
+

Транспондер

+
+ + {% if object.transponder %} +
+
+
+ +
{{ object.transponder.name|default:"-" }}
+
+
+
+
+ +
{{ object.transponder.sat_id.name|default:"-" }}
+
+
+
+
+ +
{{ object.transponder.downlink|default:"-" }}
+
+
+
+
+ +
{{ object.transponder.uplink|default:"-" }}
+
+
+
+
+
+
+ +
{{ object.transponder.frequency_range|default:"-" }}
+
+
+
+
+ +
{{ object.transponder.transfer|default:"-" }}
+
+
+
+
+ +
{{ object.transponder.polarization.name|default:"-" }}
+
+
+
+
+ +
{{ object.transponder.snr|default:"-" }}
+
+
+
+
+
+
+ +
{{ object.transponder.zone_name|default:"-" }}
+
+
+
+
+
+
+ +
+ {% if object.transponder.created_at %}{{ object.transponder.created_at|date:"d.m.Y H:i" }}{% else %}-{% endif %} +
+
+
+
+
+ +
+ {% if object.transponder.created_by %}{{ object.transponder.created_by }}{% else %}-{% endif %} +
+
+
+
+ {% else %} +
+

Нет данных о транспондере

+
+ {% endif %} +
+
diff --git a/dbapp/mainapp/templates/mainapp/objitem_form.html b/dbapp/mainapp/templates/mainapp/objitem_form.html index 08ec1ff..0d6f609 100644 --- a/dbapp/mainapp/templates/mainapp/objitem_form.html +++ b/dbapp/mainapp/templates/mainapp/objitem_form.html @@ -248,6 +248,98 @@
+ +
+
+

Транспондер

+
+ + {% if object.transponder %} +
+
+
+ +
{{ object.transponder.name|default:"-" }}
+
+
+
+
+ +
{{ object.transponder.sat_id.name|default:"-" }}
+
+
+
+
+ +
{{ object.transponder.downlink|default:"-" }}
+
+
+
+
+ +
{{ object.transponder.uplink|default:"-" }}
+
+
+
+
+
+
+ +
{{ object.transponder.frequency_range|default:"-" }}
+
+
+
+
+ +
{{ object.transponder.transfer|default:"-" }}
+
+
+
+
+ +
{{ object.transponder.polarization.name|default:"-" }}
+
+
+
+
+ +
{{ object.transponder.snr|default:"-" }}
+
+
+
+
+
+
+ +
{{ object.transponder.zone_name|default:"-" }}
+
+
+
+
+
+
+ +
+ {% if object.transponder.created_at %}{{ object.transponder.created_at|date:"d.m.Y H:i" }}{% else %}-{% endif %} +
+
+
+
+
+ +
+ {% if object.transponder.created_by %}{{ object.transponder.created_by }}{% else %}-{% endif %} +
+
+
+
+ {% else %} +
+

Нет данных о транспондере

+
+ {% endif %} +
+
diff --git a/dbapp/mainapp/templates/mainapp/objitem_list.html b/dbapp/mainapp/templates/mainapp/objitem_list.html index 6b5a639..bf11ad5 100644 --- a/dbapp/mainapp/templates/mainapp/objitem_list.html +++ b/dbapp/mainapp/templates/mainapp/objitem_list.html @@ -1265,11 +1265,39 @@ Перенос: ${data.transfer || '-'} ${data.transfer ? 'МГц' : ''} + + ОСШ: + ${data.snr || '-'} ${data.snr ? 'дБ' : ''} +
+ +
+
+
+ Метаданные +
+
+
+
+

+ Дата создания:
+ ${data.created_at || '-'} +

+
+
+

+ Создан пользователем:
+ ${data.created_by || '-'} +

+
+
+
+
+
`; diff --git a/dbapp/mainapp/templates/mainapp/source_map.html b/dbapp/mainapp/templates/mainapp/source_map.html index 6fca671..cae0c0a 100644 --- a/dbapp/mainapp/templates/mainapp/source_map.html +++ b/dbapp/mainapp/templates/mainapp/source_map.html @@ -58,7 +58,7 @@