fermi/estus
fermi/estus
1
Fork 0
mirror of https://github.com/Steffo99/estus.git synced 2024-11-21 15:14:19 +00:00
Code Activity

Completed #30. Probably needs testing.

Browse source
This commit is contained in:
Steffo 2017-09-21 09:29:49 +02:00
parent 7070625540
commit 3e730c830a
23 changed files with 49 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
templates/403.htm
View file

@ -4,7 +4,7 @@
<script>
window.onload = function() {
setTimeout(function() {
window.location.href = "/login";
window.location.href = "{{ url_for("page_login") }}";
}, 4000)
}
</script>

10
templates/dispositivo/details.htm
View file

@ -4,10 +4,10 @@
<div class="page-header">
<h1>
{{ disp }}
<a href="/disp_show/{{ disp.did }}" class="btn btn-primary">
<a href="{{ url_for("page_disp_show", did=disp.did) }}" class="btn btn-primary">
<span class="glyphicon glyphicon-pencil"></span> Modifica
</a>
<a href="/disp_del/{{ disp.did }}" class="btn btn-danger">
<a href="{{ url_for("page_disp_del", did=disp.did) }}" class="btn btn-danger">
<span class="glyphicon glyphicon-remove"></span> Elimina
</a>
</h1>
@ -109,7 +109,7 @@
Indirizzo IP
</h4>
<div class="list-group-item-text">
<code>{{ disp.ip }}</code>
{{ disp.ip }}
</div>
</li>
{% endif %}
@ -119,7 +119,7 @@
Hostname
</h4>
<div class="list-group-item-text">
<code>{{ disp.hostname }}</code>
{{ disp.hostname }}
</div>
</li>
{% endif %}
@ -128,7 +128,7 @@
Network
</h4>
<div class="list-group-item-text">
<a href="/net_details/{{ disp.rete.nid }}">{{ disp.rete.nome }} - {{ disp.rete.network_ip }}/{{ disp.rete.subnet }}</a>
<a href="{{ url_for("page_net_details", nid=disp.rete.nid) }}">{{ disp.rete.nome }} - {{ disp.rete.network_ip }}/{{ disp.rete.subnet }}</a>
</div>
</li>
</ul>

10
templates/dispositivo/list.htm
View file

@ -4,7 +4,7 @@
<div class="page-header">
<h1>
Dispositivi
<a class="btn btn-success" href="/disp_add"><span class="glyphicon glyphicon-plus"></span> Aggiungi</a>
<a class="btn btn-success" href="{{ url_for("page_disp_add") }}"><span class="glyphicon glyphicon-plus"></span> Aggiungi</a>
</h1>
</div>
<table class="table table-hover">
@ -28,10 +28,10 @@
<td>{{ d[0].dispositivo.modello }}</td>
<td>{% if d[0].dispositivo.seriale %}{{ d[0].dispositivo.seriale }}{% endif %}</td>
<td>
<a href="/disp_details/{{ d[0].did }}" title="Dettagli"><span class="glyphicon glyphicon-zoom-in"></span></a>
<a href="/disp_show/{{ d[0].did }}" title="Modifica"><span class="glyphicon glyphicon-pencil"></span></a>
<a href="/disp_clone/{{ d[0].did }}" title="Clona"><span class="glyphicon glyphicon-duplicate"></span></a>
<a href="/disp_del/{{ d[0].did }}" title="Elimina"><span class="glyphicon glyphicon-remove"></span></a>
<a href="{{ url_for("page_disp_details", did=d[0].did) }}" title="Dettagli"><span class="glyphicon glyphicon-zoom-in"></span></a>
<a href="{{ url_for("page_disp_show", did=d[0].did) }}" title="Modifica"><span class="glyphicon glyphicon-pencil"></span></a>
<a href="{{ url_for("page_disp_clone", did=d[0].did) }}" title="Clona"><span class="glyphicon glyphicon-duplicate"></span></a>
<a href="{{ url_for("page_disp_del", did=d[0].did) }}" title="Elimina"><span class="glyphicon glyphicon-remove"></span></a>
</td>
</tr>
{% endfor %}

2
templates/dispositivo/show.htm
View file

@ -67,7 +67,7 @@
<div class="alert alert-info">
Sapevi che puoi fare doppio click sui campi con <b>[...]</b> per attivare il completamento automatico?
</div>
<form class="form-horizontal" action="/disp_{{ action }}{% if dispositivo %}/{{ dispositivo.did }}{% endif %}" method="post">
<form class="form-horizontal" action="{% if dispositivo %}{{ url_for("page_disp_show", did=dispositivo.did) }}{% else %}{{ url_for("page_disp_add") }}{% endif %}" method="post">
<div class="form-group">
<label class="col-xs-2" for="form-tipo">Tipo dispositivo</label>
<div class="col-xs-10">

2
templates/ente/list.htm
View file

@ -22,7 +22,7 @@
<tr>
<td>{{ ente.nomeente }}</td>
<td>{{ ente.nomebreveente }}</td>
<td><a href="/serv_list/{{ ente.eid }}"><span class="glyphicon glyphicon-list-alt"></span></a> <a href="/ente_show/{{ ente.eid }}"><span class="glyphicon glyphicon-pencil"></span></a> <a href="/ente_del/{{ ente.eid }}"><span class="glyphicon glyphicon-remove"></span></a></td>
<td><a href="{{ url_for("page_serv_list_plus", eid=ente.eid) }}"><span class="glyphicon glyphicon-list-alt"></span></a> <a href="{{ url_for("page_ente_show", eid=ente.eid) }}"><span class="glyphicon glyphicon-pencil"></span></a> <a href="{{ url_for("page_ente_del", eid=ente.eid) }}"><span class="glyphicon glyphicon-remove"></span></a></td>
</tr>
{% endfor %}
</tbody>

2
templates/ente/show.htm
View file

@ -10,7 +10,7 @@
{% endif %}
</h1>
</div>
<form class="form-inline" {% if ente %}action="/ente_show/{{ ente.eid }}"{% endif %} method="post">
<form class="form-inline" method="post">
<input class="form-control" type="text" placeholder="Nome ente" name="nomeente" {% if ente %}value="{{ ente.nomeente }}"{% endif %}>
<input class="form-control" type="text" placeholder="Nome breve" name="nomebreveente" {% if ente %}value="{{ ente.nomebreveente }}"{% endif %}>
<input class="btn btn-primary" type="submit">

4
templates/impiegato/details.htm
View file

@ -4,10 +4,10 @@
<div class="page-header">
<h1>
{{ impiegato }}
<a href="/imp_show/{{ impiegato.iid }}" class="btn btn-primary">
<a href="{{ url_for("page_imp_show", iid=impiegato.iid) }}" class="btn btn-primary">
<span class="glyphicon glyphicon-pencil"></span> Modifica
</a>
<a href="/imp_del/{{ impiegato.nid }}" class="btn btn-danger">
<a href="{{ url_for("page_imp_del", iid=impiegato.iid) }}" class="btn btn-danger">
<span class="glyphicon glyphicon-remove"></span> Elimina
</a>
</h1>

4
templates/impiegato/list.htm
View file

@ -4,7 +4,7 @@
<div class="page-header">
<h1>
Impiegati
<a class="btn btn-success" href="/imp_add">
<a class="btn btn-success" href="{{ url_for("page_imp_add") }}">
<span class="glyphicon glyphicon-plus"></span> Aggiungi
</a>
</h1>
@ -27,7 +27,7 @@
<td>{{ imp.nomeimpiegato }}</td>
<td>{% if imp.username %}<code>{{ imp.username }}</code>{% endif %}</td>
<td>{% if imp.passwd %}<code>{{ imp.passwd }}</code>{% endif %}</td>
<td><a href="/imp_details/{{ imp.iid }}" title="Dettagli"><span class="glyphicon glyphicon-zoom-in"></span></a> <a href="/imp_show/{{ imp.iid }}"><span class="glyphicon glyphicon-pencil"></span></a> <a href="/imp_del/{{ imp.iid }}"><span class="glyphicon glyphicon-remove"></span></a></td>
<td><a href="{{ url_for("page_imp_details", iid=imp.iid) }}" title="Dettagli"><span class="glyphicon glyphicon-zoom-in"></span></a> <a href="{{ url_for("page_imp_show", iid=imp.iid) }}"><span class="glyphicon glyphicon-pencil"></span></a> <a href="{{ url_for("page_imp_del", iid=imp.iid) }}"><span class="glyphicon glyphicon-remove"></span></a></td>
</tr>
{% endfor %}
</table>

2
templates/impiegato/show.htm
View file

@ -10,7 +10,7 @@
{% endif %}
</h1>
</div>
<form class="form-inline" {% if imp %}action="/imp_show/{{ imp.iid }}"{% endif %} method="post">
<form class="form-inline" method="post">
<select class="form-control" name="sid">
{% for servizio in servizi %}
<option value="{{ servizio.sid }}"

2
templates/login.htm
View file

@ -4,7 +4,7 @@
<h1>
Login
</h1>
<form class="form-inline" action="/login" method="post">
<form class="form-inline" method="post">
<input class="form-control" type="text" placeholder="Username" name="username">
<input class="form-control" type="password" placeholder="Password" name="password">
<div class="checkbox">

22
templates/nav.htm
View file

@ -5,28 +5,28 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span></button>
{% if user %}
<a class="navbar-brand" href="/dashboard"><img alt="Inventario" src="{{ url_for('static', filename='UTdClogo.png') }}"></a>
<a class="navbar-brand" href="{{ url_for("page_dashboard") }}"><img alt="Inventario" src="{{ url_for('static', filename='UTdClogo.png') }}"></a>
{% else %}
<a class="navbar-brand" href="/login"><img alt="Inventario" src="{{ url_for('static', filename='UTdClogo.png') }}"></a>
<a class="navbar-brand" href="{{ url_for("page_login") }}"><img alt="Inventario" src="{{ url_for('static', filename='UTdClogo.png') }}"></a>
{% endif %}
</div>
<div id="navcollapse" class="collapse navbar-collapse">
<ul class="nav navbar-nav">
{% if user %}
<li class="{% if pagetype is equalto "ente" %}active{% endif %}"><a href="/ente_list">Enti</a></li>
<li class="{% if pagetype is equalto "serv" %}active{% endif %}"><a href="/serv_list">Servizi</a></li>
<li class="{% if pagetype is equalto "imp" %}active{% endif %}"><a href="/imp_list">Impiegati</a></li>
<li class="{% if pagetype is equalto "net" %}active{% endif %}"><a href="/net_list">Reti</a></li>
<li class="{% if pagetype is equalto "order" %}active{% endif %}"><a href="/order_list">Ordini</a></li>
<li class="{% if pagetype is equalto "disp" %}active{% endif %}"><a href="/disp_list">Dispositivi</a></li>
<li class="{% if pagetype is equalto "ente" %}active{% endif %}"><a href="{{ url_for("page_ente_list") }}">Enti</a></li>
<li class="{% if pagetype is equalto "serv" %}active{% endif %}"><a href="{{ url_for("page_serv_list") }}">Servizi</a></li>
<li class="{% if pagetype is equalto "imp" %}active{% endif %}"><a href="{{ url_for("page_imp_list") }}">Impiegati</a></li>
<li class="{% if pagetype is equalto "net" %}active{% endif %}"><a href="{{ url_for("page_net_list") }}">Reti</a></li>
<li class="{% if pagetype is equalto "order" %}active{% endif %}"><a href="{{ url_for("page_order_list") }}">Ordini</a></li>
<li class="{% if pagetype is equalto "disp" %}active{% endif %}"><a href="{{ url_for("page_disp_list") }}">Dispositivi</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li class="{% if pagetype is equalto "user" %}active{% endif %}"><a href="/user_list">Utenti</a></li>
<li class="{% if pagetype is equalto "query" %}active{% endif %}"><a href="/query">Query</a></li>
<li class="{% if pagetype is equalto "user" %}active{% endif %}"><a href="{{ url_for("page_user_list") }}">Utenti</a></li>
<li class="{% if pagetype is equalto "query" %}active{% endif %}"><a href="{{ url_for("page_query") }}">Query</a></li>
<li class="navbar-text">
Sei connesso come <b>{{user}}</b>
</li>
<a href="/logout" class="btn btn-danger navbar-btn btn-right">Logout</a>
<a href="{{ url_for("page_logout") }}" class="btn btn-danger navbar-btn btn-right">Logout</a>
{% endif %}
</ul>
</div>

6
templates/net/details.htm
View file

@ -4,10 +4,10 @@
<div class="page-header">
<h1>
{{ net }}
<a href="/net_show/{{ net.nid }}" class="btn btn-primary">
<a href="{{ url_for("page_net_show", nid=net.nid) }}" class="btn btn-primary">
<span class="glyphicon glyphicon-pencil"></span> Modifica
</a>
<a href="/net_del/{{ net.nid }}" class="btn btn-danger">
<a href="{{ url_for("page_net_del", nid=net.nid) }}" class="btn btn-danger">
<span class="glyphicon glyphicon-remove"></span> Elimina
</a>
</h1>
@ -43,7 +43,7 @@
</h4>
<div class="list-group-item-text">
{% for dispositivo in dispositivi %}
<a href="/disp_details/{{ dispositivo.did }}">{{ dispositivo }}</a><br>
<a href="{{ url_for("page_disp_show", did=dispositivo.did) }}">{{ dispositivo }} {% if dispositivo.ip %}- {{ dispositivo.ip }}{% endif %}</a><br>
{% endfor %}
</div>
</li>

4
templates/net/list.htm
View file

@ -4,7 +4,7 @@
<div class="page-header">
<h1>
Reti
<a class="btn btn-success" href="/net_add"><span class="glyphicon glyphicon-plus"></span> Aggiungi</a>
<a class="btn btn-success" href=" {{ url_for("page_net_add") }}"><span class="glyphicon glyphicon-plus"></span> Aggiungi</a>
</h1>
</div>
{% for rete in reti if rete.network_ip == "0.0.0.0" %}
@ -28,7 +28,7 @@
<tr>
<td>{{ rete.nome }}</td>
<td>{{ rete.network_ip }}/{{ rete.subnet }}</td>
<td><a href="/net_details/{{ rete.nid }}"><span class="glyphicon glyphicon-zoom-in"></span></a> <a href="/net_show/{{ rete.nid }}"><span class="glyphicon glyphicon-pencil"></span></a> {% if reti|length > 1 %}<a href="/net_del/{{ rete.nid }}"><span class="glyphicon glyphicon-remove"></span></a>{% endif %}</td>
<td><a href="{{ url_for("page_net_details", nid=rete.nid) }}"><span class="glyphicon glyphicon-zoom-in"></span></a> <a href="{{ url_for("page_net_show", nid=rete.nid) }}"><span class="glyphicon glyphicon-pencil"></span></a> {% if reti|length > 1 %}<a href="{{ url_for("page_net_del", nid=rete.nid) }}"><span class="glyphicon glyphicon-remove"></span></a>{% endif %}</td>
</tr>
{% endfor %}
</table>

2
templates/net/show.htm
View file

@ -10,7 +10,7 @@
{% endif %}
</h1>
</div>
<form class="form-inline" {% if net %}action="/net_show/{{ net.nid }}"{% endif %} method="post">
<form class="form-inline" method="post">
<input class="form-control" type="text" placeholder="Nome rete" name="nome" {% if net %}value="{{ net.nome }}"{% endif %}>
<input class="form-control" type="text" placeholder="Network IP" name="network_ip" {% if net %}value="{{ net.network_ip }}"{% endif %}>
<input class="form-control" type="text" placeholder="Subnet mask (/XX)" pattern="/?[0-9]{2}" name="subnet" {% if net %}value="{{ net.subnet }}"{% endif %}>

6
templates/ordine/details.htm
View file

@ -4,10 +4,10 @@
<div class="page-header">
<h1>
{{ ordine }}
<a href="/ordine_show/{{ ordine.oid }}" class="btn btn-primary">
<a href="{{ url_for("page_order_show", oid=ordine.oid) }}" class="btn btn-primary">
<span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Modifica
</a>
<a href="/ordine_del/{{ ordine.oid }}" class="btn btn-danger">
<a href="{{ url_for("page_order_del", oid=ordine.oid) }}" class="btn btn-danger">
<span class="glyphicon glyphicon-remove"></span> Elimina
</a>
</h1>
@ -66,7 +66,7 @@
Dispositivi associati
</h4>
<div class="list-group-item-text">
{% for dispositivo in dispositivi %} <a href="/disp_details/{{ dispositivo.did }}">{{ dispositivo }}</a> <br>{% endfor %}
{% for dispositivo in dispositivi %} <a href="{{ url_for("page_disp_show", did=dispositivo.did) }}">{{ dispositivo }}</a> <br>{% endfor %}
</div>
</li>
{% endif %}

4
templates/ordine/list.htm
View file

@ -4,7 +4,7 @@
<div class="page-header">
<h1>
Ordini
<a class="btn btn-success" href="/order_add"><span class="glyphicon glyphicon-plus"></span> Aggiungi</a>
<a class="btn btn-success" href="{{ url_for("page_order_add") }}"><span class="glyphicon glyphicon-plus"></span> Aggiungi</a>
</h1>
</div>
<table class="table table-hover">
@ -35,7 +35,7 @@
{{ order.garanzia }}
{% endif %}
</td>
<td><a href="/order_details/{{ order.oid }}" title="Dettagli"><span class="glyphicon glyphicon-zoom-in"></span></a> <a href="/order_show/{{ order.oid }}"><span class="glyphicon glyphicon-pencil"></span></a> <a href="/order_del/{{ order.oid }}"><span class="glyphicon glyphicon-remove"></span></a></td>
<td><a href="{{ url_for("page_order_details", oid=order.oid) }}" title="Dettagli"><span class="glyphicon glyphicon-zoom-in"></span></a> <a href="{{ url_for("page_order_show", oid=order.oid) }}"><span class="glyphicon glyphicon-pencil"></span></a> <a href="{{ url_for("page_order_del", oid=order.oid) }}"><span class="glyphicon glyphicon-remove"></span></a></td>
</tr>
{% endfor %}
</tbody>

2
templates/ordine/show.htm
View file

@ -13,7 +13,7 @@
<div class="alert alert-warning">
Il campo data non è ancora <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1366188">correttamente supportato da Firefox</a>, Internet Explorer 11 e probabilmente altri browser. Se il calendario non viene fuori, inserite le date nel formato AAAA-MM-GG.
</div>
<form class="form-horizontal" {% if order %}action="/order_show/{{ order.oid }}"{% endif %} method="post">
<form class="form-horizontal" method="post">
<div class="form-group">
<label class="col-xs-2" for="form-tipo">Data di acquisto</label>
<div class="col-xs-10">

2
templates/query.htm
View file

@ -6,7 +6,7 @@
Query manuale
</h1>
</div>
<form action="/query" method="post">
<form method="post">
<div class="form-group">
<div class="input-group">
<span class="input-group-addon">SELECT</span>

2
templates/servizio/list.htm
View file

@ -21,7 +21,7 @@
<td>{{ servizio.ente.nomeente }}</td>
<td>{{ servizio.nomeservizio }}</td>
<td>{{ servizio.locazione }}</td>
<td><a href="/imp_list/{{ servizio.sid }}"><span class="glyphicon glyphicon-list-alt"></span></a> <a href="/serv_show/{{ servizio.sid }}"><span class="glyphicon glyphicon-pencil"></span></a> <a href="/serv_del/{{ servizio.sid }}"><span class="glyphicon glyphicon-remove"></span></a></td>
<td><a href="{{ url_for("page_imp_list_plus", sid=servizio.sid) }}"><span class="glyphicon glyphicon-list-alt"></span></a> <a href="{{ url_for("page_serv_show", sid=servizio.sid) }}"><span class="glyphicon glyphicon-pencil"></span></a> <a href="{{ url_for("page_serv_del", sid=servizio.sid) }}"><span class="glyphicon glyphicon-remove"></span></a></td>
</tr>
{% endfor %}
</table>

14
templates/servizio/show.htm
View file

@ -13,7 +13,7 @@
<div class="alert alert-info">
Sapevi che puoi fare doppio click sui campi con <b>[...]</b> per attivare il completamento automatico?
</div>
<form class="form-horizontal" {% if serv %}action="/serv_show/{{serv.sid}}"{% endif %} method="post">
<form class="form-horizontal" method="post">
<div class="form-group">
<label class="col-xs-2" for="form-tipo">Ente</label>
<div class="col-xs-10">
@ -42,16 +42,4 @@
</div>
<input class="btn btn-primary" type="submit">
</form>
{#
<form class="form-inline" {% if serv %}action="/serv_show/{{serv.sid}}"{% endif %} method="post">
<select class="form-control" name="eid">
{% for ente in enti %}
<option value="{{ente.eid}}" {% if serv and serv.eid == ente.eid %}selected="selected"{% endif %}>{{ente.nomeente}}</option>
{% endfor %}
</select>
<input class="form-control" type="text" placeholder="Nome servizio" name="nomeservizio" {% if serv %}value="{{serv.nomeservizio}}"{% endif %}>
<input class="form-control" type="text" placeholder="locazione" name="locazione" {% if serv %}value="{{serv.locazione}}"{% endif %}>
<input class="btn btn-primary" type="submit">
</form>
#}
{% endblock %}

2
templates/smecds.htm
View file

@ -13,7 +13,7 @@
<div class="panel-body">
Questo sito è stato scritto da <a href="mailto:ste.pigozzi@gmail.com">Stefano Pigozzi</a> e da <a href="mailto:lorenzo.balugani@gmail.com">Lorenzo Balugani</a> durante lo stage di 4° e di 5° nel 2017.<br>
Questo sito utilizza <a href="https://www.python.org/">Python 3.6</a>, <a href="http://flask.pocoo.org/">Flask</a> e <a href="https://www.sqlalchemy.org/">SQLAlchemy</a>.<br>
Il <a href="https://github.com/Steffo99/estus/tree/master">codice sorgente</a> è disponibile suGitHub, rilasciato sotto MIT License.<br>
Il <a href="https://github.com/Steffo99/estus/tree/master">codice sorgente</a> è disponibile su GitHub, rilasciato sotto MIT License.<br>
</div>
</div>
</div>

2
templates/user/add.htm
View file

@ -9,7 +9,7 @@
<div class="alert alert-warning">
<b>Attenzione!</b> Tutti gli utenti che verranno aggiunti qui avranno accesso in lettura e scrittura su tutto l'inventario!
</div>
<form class="form-inline" action="/user_add" method="post">
<form class="form-inline" method="post">
<input class="form-control" type="text" placeholder="Nome utente" name="username">
<input class="form-control" type="password" placeholder="Password" name="passwd">
<input class="btn btn-primary" type="submit">

2
templates/user/list.htm
View file

@ -4,7 +4,7 @@
<div class="page-header">
<h1>
Utenti dell'inventario
<a class="btn btn-success" href="/user_add"><span class="glyphicon glyphicon-plus"></span> Aggiungi</a>
<a class="btn btn-success" href="{{ url_for("page_user_add") }}"><span class="glyphicon glyphicon-plus"></span> Aggiungi</a>
</h1>
</div>
<div class="alert alert-info">