Add station_id in DemodData model
Signed-off-by: Alfredos-Panagiotis Damkalis <fredy@fredy.gr>spacecruft
parent
443668b90c
commit
afda478ccc
|
@ -283,7 +283,7 @@ class TelemetrySerializer(serializers.ModelSerializer):
|
||||||
model = DemodData
|
model = DemodData
|
||||||
fields = (
|
fields = (
|
||||||
'norad_cat_id', 'transmitter', 'app_source', 'schema', 'decoded', 'frame', 'observer',
|
'norad_cat_id', 'transmitter', 'app_source', 'schema', 'decoded', 'frame', 'observer',
|
||||||
'timestamp', 'version', 'observation_id'
|
'timestamp', 'version', 'observation_id', 'station_id'
|
||||||
)
|
)
|
||||||
|
|
||||||
@extend_schema_field(OpenApiTypes.INT64)
|
@extend_schema_field(OpenApiTypes.INT64)
|
||||||
|
@ -330,7 +330,7 @@ class SidsSerializer(serializers.ModelSerializer):
|
||||||
model = DemodData
|
model = DemodData
|
||||||
fields = (
|
fields = (
|
||||||
'satellite', 'payload_frame', 'station', 'lat', 'lng', 'timestamp', 'app_source',
|
'satellite', 'payload_frame', 'station', 'lat', 'lng', 'timestamp', 'app_source',
|
||||||
'observer', 'version', 'observation_id'
|
'observer', 'version', 'observation_id', 'station_id'
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -245,6 +245,9 @@ class TelemetryViewSet( # pylint: disable=R0901
|
||||||
if request.data.get('observation_id'):
|
if request.data.get('observation_id'):
|
||||||
observation_id = request.data.get('observation_id')
|
observation_id = request.data.get('observation_id')
|
||||||
data['observation_id'] = observation_id
|
data['observation_id'] = observation_id
|
||||||
|
if request.data.get('station_id'):
|
||||||
|
station_id = request.data.get('station_id')
|
||||||
|
data['station_id'] = station_id
|
||||||
|
|
||||||
# Convert coordinates to omit N-S and W-E designators
|
# Convert coordinates to omit N-S and W-E designators
|
||||||
lat = request.data.get('latitude')
|
lat = request.data.get('latitude')
|
||||||
|
|
|
@ -281,8 +281,10 @@ class TelemetryAdmin(admin.ModelAdmin):
|
||||||
@admin.register(DemodData)
|
@admin.register(DemodData)
|
||||||
class DemodDataAdmin(admin.ModelAdmin):
|
class DemodDataAdmin(admin.ModelAdmin):
|
||||||
"""Defines DemodData view in django admin UI"""
|
"""Defines DemodData view in django admin UI"""
|
||||||
list_display = ('id', 'satellite', 'app_source', 'observer', 'observation_id')
|
list_display = ('id', 'satellite', 'app_source', 'observer', 'observation_id', 'station_id')
|
||||||
search_fields = ('transmitter__uuid', 'satellite__norad_cat_id', 'observer', 'observation_id')
|
search_fields = (
|
||||||
|
'transmitter__uuid', 'satellite__norad_cat_id', 'observer', 'observation_id', 'station_id'
|
||||||
|
)
|
||||||
list_filter = (
|
list_filter = (
|
||||||
'satellite',
|
'satellite',
|
||||||
'app_source',
|
'app_source',
|
||||||
|
|
|
@ -0,0 +1,18 @@
|
||||||
|
# Generated by Django 3.1.5 on 2021-02-04 09:57
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('base', '0033_add_observations_id_in_demoddata_model'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='demoddata',
|
||||||
|
name='station_id',
|
||||||
|
field=models.IntegerField(blank=True, null=True),
|
||||||
|
),
|
||||||
|
]
|
|
@ -571,6 +571,7 @@ class DemodData(models.Model):
|
||||||
choices=list(zip(DATA_SOURCES, DATA_SOURCES)), max_length=7, default='sids'
|
choices=list(zip(DATA_SOURCES, DATA_SOURCES)), max_length=7, default='sids'
|
||||||
)
|
)
|
||||||
observation_id = models.IntegerField(blank=True, null=True)
|
observation_id = models.IntegerField(blank=True, null=True)
|
||||||
|
station_id = models.IntegerField(blank=True, null=True)
|
||||||
data_id = models.PositiveIntegerField(blank=True, null=True)
|
data_id = models.PositiveIntegerField(blank=True, null=True)
|
||||||
payload_frame = models.FileField(upload_to=_name_payload_frame, blank=True, null=True)
|
payload_frame = models.FileField(upload_to=_name_payload_frame, blank=True, null=True)
|
||||||
payload_decoded = models.TextField(blank=True)
|
payload_decoded = models.TextField(blank=True)
|
||||||
|
|
Loading…
Reference in New Issue