Skip to content

Add smsc to modem model #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
seanshahkarami wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add smsc to modem model #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 21 additions & 8 deletions manifests/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,23 @@ class NodeAdmin(nested_admin.NestedModelAdmin):
"notes",
"tags",
"registered_at",
"commissioned_at"
"commissioned_at",
)
},
),
(
"Location",
{
"fields": (
"site_id",
"location",
"address",
"gps_lat",
"gps_lon",
"gps_alt",
)
},
),
("Location", {"fields": ("site_id","location", "address", "gps_lat", "gps_lon","gps_alt")}),
)

inlines = [ModemInline, ComputeInline, NodeSensorInline, ResourceInline]
Expand Down Expand Up @@ -158,12 +170,12 @@ def autopopulate_from_beekeeper_and_data(self, request, queryset):
continue

if (
node.registered_at is None
or (r.registration_event > node.registered_at)
or (
node.registered_at is None
or (r.registration_event > node.registered_at)
or (
r.registration_event >= node.registered_at
and r.node_id != node.name
)
)
):
node.registered_at = r.registration_event
node.name = r.node_id
Expand Down Expand Up @@ -247,9 +259,9 @@ class CSVUploadForm(forms.Form):

@admin.register(Modem)
class ModemAdmin(admin.ModelAdmin):
list_display = ["imei", "imsi", "iccid", "node", "sim_type", "model"]
list_display = ["imei", "imsi", "iccid", "smsc", "node", "sim_type", "model"]
list_filter = ["sim_type", "model", "carrier"]
search_fields = ["imei", "imsi", "iccid", "node__vsn", "sim_type"]
search_fields = ["imei", "imsi", "iccid", "smsc", "node__vsn", "sim_type"]
autocomplete_fields = ["node"]

change_list_template = "manifests/modem_change_list.html"
Expand Down Expand Up @@ -473,6 +485,7 @@ def is_camera(self, obj):

admin.site.register(Site)


@admin.register(NodeBuild)
class NodeBuildAdmin(admin.ModelAdmin):
list_display = [
Expand Down
7 changes: 7 additions & 0 deletions manifests/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,13 @@ class Modem(models.Model):
max_length=64,
validators=[RegexValidator("^[0-9]{,20}$")],
)
smsc = models.CharField(
"SMSC",
max_length=64,
blank=True,
default="",
validators=[RegexValidator("^[0-9]{10,12}$")],
)
model = models.CharField(
"Model", max_length=64, choices=ModemModels, default="mtcm2"
)
Expand Down