Commit 14bb7163 authored by Pablo Armingol's avatar Pablo Armingol
Browse files

Pre Merge 

-Code cleanup
parent 045c52a3

src/webui/service/service/forms.py

+152 −182

File changed.

Preview size limit exceeded, changes collapsed.

src/webui/service/service/routes.py

+122 −141

File changed.

Preview size limit exceeded, changes collapsed.

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

+1 −8
Original line number Diff line number Diff line
@@ -26,15 +26,8 @@ 
            Back to service list

        </button>

    </div>

    <!--

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

        <a id="update" class="btn btn-secondary" href="#">

            <i class="bi bi-pencil-square"></i>

            Update

        </a>

    </div>-->

    

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

        <!-- <button type="button" class="btn btn-danger"><i class="bi bi-x-square"></i>Delete service</button> -->

        <button type="button" class="btn btn-danger" data-bs-toggle="modal" data-bs-target="#deleteModal">

            <i class="bi bi-x-square"></i>

            Delete service

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

+1 −13
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
{% block content %}

    <h1>Services</h1>



    <div class="row">                                                                                         <!-- Button for adding a New Service -->       

    <div class="row">

        <div class="col">

            <a href="{{ url_for('service.add_configure') }}" class="btn btn-primary" style="margin-bottom: 10px;"> 

                <i class="bi bi-plus"></i>
@@ -27,8 +27,6 @@ 
            </a>

        </div> 



        <!-- Only display XR service addition button if there are XR constellations. Otherwise it might confuse

             user, as other service types do not have GUI to add service yet. -->

        {% if "DEVICEDRIVER_XR" in active_drivers %}

            <div class="col">

                <a href="{{ url_for('service.add_xr') }}" class="btn btn-primary" style="margin-bottom: 10px;">
@@ -41,14 +39,6 @@ 
        <div class="col">

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

        </div>

        <!-- <div class="col">                                                                                  Search engine for a service in the table of services

            <form>

                <div class="input-group">

                    <input type="text" aria-label="Search" placeholder="Search..." class="form-control"/>

                    <button type="submit" class="btn btn-primary">Search</button>

                  </div>

            </form>

        </div> -->

    </div>

    

    <table class="table table-striped table-hover">
@@ -67,9 +57,7 @@ 
                {% for service in services %}

                <tr>

                    <td>

                        <!-- <a href="{{ url_for('service.detail', service_uuid=service.service_id.service_uuid.uuid) }}"> -->

                            {{ service.service_id.service_uuid.uuid }}

                        <!-- </a> -->

                    </td>

                    <td>

                        {{ service.name }}