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

src/webui/service/templates/device/detail.html

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
   {% extends 'base.html' %}

   

   {% 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="col-sm-3">
@@ -44,6 +44,7 @@ 
       <div class="row mb-3">

            <div class="col-sm-4">

                <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>Status: </b> {{ dose.Name(device.device_operational_status).replace('DEVICEOPERATIONALSTATUS_', '') }}<br>

                <b>Drivers: </b>

src/webui/service/templates/device/home.html

+6 −4
Original line number Diff line number Diff line
@@ -42,7 +42,8 @@ 
    <table class="table table-striped table-hover">

        <thead>

          <tr>

            <th scope="col">#</th>

            <th scope="col">UUID</th>

            <th scope="col">Name</th>

            <th scope="col">Type</th>

            <th scope="col">Endpoints</th>

            <th scope="col">Drivers</th>
@@ -56,9 +57,10 @@ 
                {% for device in devices %}

                <tr>

                    <td>

                        <!-- <a href="{{ url_for('device.detail', device_uuid=device.device_id.device_uuid.uuid) }}"> -->

                        {{ device.device_id.device_uuid.uuid }}

                        <!-- </a> -->

                    </td>

                    <td>

                        {{ device.name }}

                    </td>

                    <td>

                        {{ device.device_type }}

src/webui/service/templates/link/detail.html

+4 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
   {% extends 'base.html' %}

   

   {% 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="col-sm-3">

               <button type="button" class="btn btn-success" onclick="window.location.href='{{ url_for('link.home') }}'">
@@ -30,6 +30,9 @@ 
       <div class="row mb-3">

            <div class="col-sm-4">

                <b>UUID: </b>{{ link.link_id.link_uuid.uuid }}<br><br>

            </div>

            <div class="col-sm-4">

               <b>Name: </b>{{ link.name }}<br><br>

           </div>

            <div class="col-sm-8">

                    <table class="table table-striped table-hover">

src/webui/service/templates/link/home.html

+8 −6
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
               </a> -->

           </div>

           <div class="col">

               {{ links | length }} links found</i>

               {{ links | length }} links found in context <i>{{ session['context_uuid'] }}</i>

           </div>

           <!-- <div class="col">

               <form>
@@ -42,7 +42,8 @@ 
       <table class="table table-striped table-hover">

           <thead>

             <tr>

               <th scope="col">#</th>

               <th scope="col">UUID</th>

               <th scope="col">Name</th>

               <th scope="col">Endpoints</th>

               <th scope="col"></th>

             </tr>
@@ -52,9 +53,10 @@ 
                   {% for link in links %}

                   <tr>

                       <td>

                           <!-- <a href="#"> -->

                            {{ link.link_id.link_uuid.uuid }}

                           <!-- </a> -->

                       </td>

                       <td>

                            {{ link.name }}

                        </td>



                       <td>