Skip to content
Snippets Groups Projects
Commit 53d4143d authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

WebUI component:

- improved name reporting of devices and links
parent 0ee137fb
No related branches found
No related tags found
2 merge requests!54Release 2.0.0,!34Context Scalability extensions using CockroachDB + Removal of Stateful database inside Device + other
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% block content %} {% block content %}
<h1>Device {{ device.device_id.device_uuid.uuid }}</h1> <h1>Device {{ device.name }} ({{ device.device_id.device_uuid.uuid }})</h1>
<div class="row mb-3"> <div class="row mb-3">
<div class="col-sm-3"> <div class="col-sm-3">
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
<div class="row mb-3"> <div class="row mb-3">
<div class="col-sm-4"> <div class="col-sm-4">
<b>UUID: </b>{{ device.device_id.device_uuid.uuid }}<br><br> <b>UUID: </b>{{ device.device_id.device_uuid.uuid }}<br><br>
<b>Name: </b>{{ device.name }}<br><br>
<b>Type: </b>{{ device.device_type }}<br><br> <b>Type: </b>{{ device.device_type }}<br><br>
<b>Status: </b> {{ dose.Name(device.device_operational_status).replace('DEVICEOPERATIONALSTATUS_', '') }}<br> <b>Status: </b> {{ dose.Name(device.device_operational_status).replace('DEVICEOPERATIONALSTATUS_', '') }}<br>
<b>Drivers: </b> <b>Drivers: </b>
......
...@@ -42,7 +42,8 @@ ...@@ -42,7 +42,8 @@
<table class="table table-striped table-hover"> <table class="table table-striped table-hover">
<thead> <thead>
<tr> <tr>
<th scope="col">#</th> <th scope="col">UUID</th>
<th scope="col">Name</th>
<th scope="col">Type</th> <th scope="col">Type</th>
<th scope="col">Endpoints</th> <th scope="col">Endpoints</th>
<th scope="col">Drivers</th> <th scope="col">Drivers</th>
...@@ -56,9 +57,10 @@ ...@@ -56,9 +57,10 @@
{% for device in devices %} {% for device in devices %}
<tr> <tr>
<td> <td>
<!-- <a href="{{ url_for('device.detail', device_uuid=device.device_id.device_uuid.uuid) }}"> --> {{ device.device_id.device_uuid.uuid }}
{{ device.device_id.device_uuid.uuid }} </td>
<!-- </a> --> <td>
{{ device.name }}
</td> </td>
<td> <td>
{{ device.device_type }} {{ device.device_type }}
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% block content %} {% block content %}
<h1>Link {{ link.link_id.link_uuid.uuid }}</h1> <h1>Link {{ link.name }} ({{ link.link_id.link_uuid.uuid }})</h1>
<div class="row mb-3"> <div class="row mb-3">
<div class="col-sm-3"> <div class="col-sm-3">
<button type="button" class="btn btn-success" onclick="window.location.href='{{ url_for('link.home') }}'"> <button type="button" class="btn btn-success" onclick="window.location.href='{{ url_for('link.home') }}'">
...@@ -31,6 +31,9 @@ ...@@ -31,6 +31,9 @@
<div class="col-sm-4"> <div class="col-sm-4">
<b>UUID: </b>{{ link.link_id.link_uuid.uuid }}<br><br> <b>UUID: </b>{{ link.link_id.link_uuid.uuid }}<br><br>
</div> </div>
<div class="col-sm-4">
<b>Name: </b>{{ link.name }}<br><br>
</div>
<div class="col-sm-8"> <div class="col-sm-8">
<table class="table table-striped table-hover"> <table class="table table-striped table-hover">
<thead> <thead>
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</a> --> </a> -->
</div> </div>
<div class="col"> <div class="col">
{{ links | length }} links found</i> {{ links | length }} links found in context <i>{{ session['context_uuid'] }}</i>
</div> </div>
<!-- <div class="col"> <!-- <div class="col">
<form> <form>
...@@ -42,7 +42,8 @@ ...@@ -42,7 +42,8 @@
<table class="table table-striped table-hover"> <table class="table table-striped table-hover">
<thead> <thead>
<tr> <tr>
<th scope="col">#</th> <th scope="col">UUID</th>
<th scope="col">Name</th>
<th scope="col">Endpoints</th> <th scope="col">Endpoints</th>
<th scope="col"></th> <th scope="col"></th>
</tr> </tr>
...@@ -52,11 +53,12 @@ ...@@ -52,11 +53,12 @@
{% for link in links %} {% for link in links %}
<tr> <tr>
<td> <td>
<!-- <a href="#"> --> {{ link.link_id.link_uuid.uuid }}
{{ link.link_id.link_uuid.uuid }}
<!-- </a> -->
</td> </td>
<td>
{{ link.name }}
</td>
<td> <td>
<ul> <ul>
{% for end_point in link.link_endpoint_ids %} {% for end_point in link.link_endpoint_ids %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment