Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/luftdaten-at/datahub
Browse files Browse the repository at this point in the history
  • Loading branch information
Nik Sauer committed Jan 8, 2025
2 parents 239eae1 + c41d9d0 commit 8c233cd
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 17 deletions.
8 changes: 8 additions & 0 deletions app/devices/views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,14 @@ def get_context_data(self, **kwargs):
4: 'bg-dark', # CRITICAL
}

context['level_map'] = {
0: 'debug',
1: 'info',
2: 'warning',
3: 'error',
4: 'critical',
}

sensors = defaultdict(list)
# add available sensors
for measurement in Measurement.objects.filter(device=device, time_measured=device.last_update).all():
Expand Down
15 changes: 10 additions & 5 deletions app/templates/campaigns/detail.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,12 @@ <h3 class="mb-0">{% trans "Rooms" %}</h3>
</td>
<td class="text-end">
<div class="btn-group" role="group" aria-label="{% trans 'Actions' %}">
<a href="{% url 'room-detail' room.pk %}" class="btn btn-primary btn-sm">{% trans "Details" %}</a>
<a href="" class="btn btn-secondary btn-sm">{% trans "Edit" %}</a>
<a href="{% url 'room-delete' room.pk %}" class="btn btn-danger btn-sm">{% trans "Delete" %}</a>
<a href="{% url 'room-detail' room.pk %}" class="btn btn-primary btn-sm">
<i class="bi bi-eye"></i> <span class="d-none d-sm-inline">{% trans "Details" %}</span></a>
<a href="" class="btn btn-secondary btn-sm"><i class="bi bi-pencil-square">
</i> <span class="d-none d-sm-inline">{% trans "Edit" %}</span></a>
<a href="{% url 'room-delete' room.pk %}" class="btn btn-danger btn-sm"><i class="bi bi-trash">
</i> <span class="d-none d-sm-inline">{% trans "Delete" %}</span></a>
</div>
</td>
</tr>
Expand Down Expand Up @@ -86,8 +89,10 @@ <h3 class="mb-0">{% trans "Participants" %}</h3>
<td>{{ user.email }}</td>
<td class="text-end">
<div class="btn-group" role="group" aria-label="{% trans 'Actions' %}">
<a href="{% url 'participants-detail' campaign.pk user.pk %}" class="btn btn-primary btn-sm">{% trans "Details" %}</a>
<a href="" class="btn btn-danger btn-sm">{% trans "Remove" %}</a>
<a href="{% url 'participants-detail' campaign.pk user.pk %}" class="btn btn-primary btn-sm">
<i class="bi bi-eye"></i> <span class="d-none d-sm-inline">{% trans "Details" %}</span></a>
<a href="" class="btn btn-danger btn-sm"><i class="bi bi-x-octagon">
</i> <span class="d-none d-sm-inline">{% trans "Remove" %}</span></a>
</div>
</td>
</tr>
Expand Down
9 changes: 6 additions & 3 deletions app/templates/campaigns/my.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,12 @@ <h5 class="mb-1">
</div>
<div>
<div class="btn-group" role="group" aria-label="{% trans 'Actions' %}">
<a href="{% url 'campaigns-detail' campaign.pk %}" class="btn btn-primary btn-sm">{% trans "Details" %}</a>
<a href="{% url 'campaigns-update' campaign.pk %}" class="btn btn-secondary btn-sm">{% trans "Edit" %}</a>
<a href="{% url 'campaigns-delete' campaign.pk %}" class="btn btn-danger btn-sm">{% trans "Delete" %}</a>
<a href="{% url 'campaigns-detail' campaign.pk %}" class="btn btn-primary btn-sm">
<i class="bi bi-eye"></i> <span class="d-none d-sm-inline">{% trans "Details" %}</span></a>
<a href="{% url 'campaigns-update' campaign.pk %}" class="btn btn-secondary btn-sm"><i class="bi bi-pencil-square">
</i> <span class="d-none d-sm-inline">{% trans "Edit" %}</span></a>
<a href="{% url 'campaigns-delete' campaign.pk %}" class="btn btn-danger btn-sm"><i class="bi bi-trash">
</i> <span class="d-none d-sm-inline">{% trans "Delete" %}</span></a>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/campaigns/my_organizations.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ <h5 class="mb-1"><a href="{% url 'organizations-detail' organization.pk %}">{{ o
<i class="bi bi-eye"></i> <span class="d-none d-sm-inline">{% trans "Details" %}</span></a>
<a href="" class="btn btn-secondary btn-sm"><i class="bi bi-pencil-square">
</i> <span class="d-none d-sm-inline">{% trans "Edit" %}</span></a>
<a href="" class="btn btn-danger btn-sm"><i class="bi bi-pencil-square">
<a href="" class="btn btn-danger btn-sm"><i class="bi bi-trash">
</i> <span class="d-none d-sm-inline">{% trans "Delete" %}</span></a>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/templates/campaigns/organization_detail.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ <h3 class="mb-0">{% trans "Users" %}</h3>
<tr>
<th>{% trans "Username" %}</th>
<th>{% trans "Email" %}</th>
<th>{% trans "Actions" %}</th>
<th></th>
</tr>
</thead>
<tbody>
{% for user in organization.users.all %}
<tr>
<td>{{ user.username }}</td>
<td>{{ user.email }}</td>
<td>
<td class="text-end">
<a href="{% url 'remove-user-from-organization' organization.pk user.pk %}" class="btn btn-danger btn-sm" title="{% trans 'Remove User' %}">
<i class="bi bi-trash"></i> {% trans "Remove" %}
</a>
Expand Down
20 changes: 17 additions & 3 deletions app/templates/devices/detail.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,28 @@ <h3 class="mt-4 mb-4">{% trans "Log" %}</h3>
<ul class="list-group mb-3">
{% for log in device_logs %}
<li class="list-group-item">
<div class="d-flex w-100 justify-content-between">
<div class="d-flex w-100 justify-content-start">
<small class="text-muted">{{ log.timestamp|naturaltime }}</small>
<!-- Display log level with badge using the mapping -->
{% with badge_class=level_badge_map|get:log.level %}
{% if badge_class %}
<span class="badge {{ badge_class }}">{{ log.get_level_display }}</span>
<span class="badge {{ badge_class }} ms-2">
{% if log.level == 0 %}
<i class="bi bi-info-circle"></i> {{ level_map|get:log.level|capfirst }}
{% elif log.level == 1 %}
<i class="bi bi-info-circle"></i> {{ level_map|get:log.level|capfirst }}
{% elif log.level == 2 %}
<i class="bi bi-exclamation-triangle"></i> {{ level_map|get:log.level|capfirst }}
{% elif log.level == 3 %}
<i class="bi bi-exclamation-octagon"></i> {{ level_map|get:log.level|capfirst }}
{% elif log.level == 4 %}
<i class="bi bi-x-octagon"></i> {{ level_map|get:log.level|capfirst }}
{% else %}
{{ level_map|get:log.level|default:_("unknown") }}
{% endif %}
</span>
{% else %}
<span class="badge bg-light text-dark">{{ log.get_level_display }}</span>
<span class="badge bg-light text-dark">{{ level_map|get:log.level|capfirst }}</span>
{% endif %}
{% endwith %}
</div>
Expand Down
9 changes: 6 additions & 3 deletions app/templates/workshops/my.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,12 @@ <h5 class="mb-1"><a href="{% url 'workshop-detail' workshop.pk %}">{{ workshop.t
</div>
<div>
<div class="btn-group" role="group" aria-label="{% trans 'Actions' %}">
<a href="{% url 'workshop-detail' workshop.pk %}" class="btn btn-primary btn-sm">{% trans "Details" %}</a>
<a href="{% url 'workshop-update' workshop.pk %}" class="btn btn-secondary btn-sm">{% trans "Edit" %}</a>
<a href="{% url 'workshop-delete' workshop.pk %}" class="btn btn-danger btn-sm">{% trans "Delete" %}</a>
<a href="{% url 'workshop-detail' workshop.pk %}" class="btn btn-primary btn-sm">
<i class="bi bi-eye"></i> <span class="d-none d-sm-inline">{% trans "Details" %}</span></a>
<a href="{% url 'workshop-update' workshop.pk %}" class="btn btn-secondary btn-sm"><i class="bi bi-pencil-square">
</i> <span class="d-none d-sm-inline">{% trans "Edit" %}</span></a>
<a href="{% url 'workshop-delete' workshop.pk %}" class="btn btn-danger btn-sm"><i class="bi bi-trash">
</i> <span class="d-none d-sm-inline">{% trans "Delete" %}</span></a>
</div>
</div>
</div>
Expand Down

0 comments on commit 8c233cd

Please sign in to comment.