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

Conform to PEP8

Browse source
This commit is contained in:
Steffo 2017-09-12 08:26:58 +02:00 committed by Lorenzo
parent 6f92e8e37c
commit cbd38217bb
2 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
server.py
View file

@ -1,7 +1,6 @@
from flask import Flask, session, url_for, redirect, request, render_template, abort from flask import Flask, session, url_for, redirect, request, render_template, abort
from flask_sqlalchemy import SQLAlchemy from flask_sqlalchemy import SQLAlchemy
import bcrypt import bcrypt
import os
app = Flask(__name__) app = Flask(__name__)
app.secret_key = "pepsecret" app.secret_key = "pepsecret"
@ -120,8 +119,8 @@ class Network(db.Model):
ip = db.Column(db.String(20)) ip = db.Column(db.String(20))
def __init__(self, nome, ip): def __init__(self, nome, ip):
self.nome=nome self.nome = nome
self.ip=ip self.ip = ip
def __repr__(self): def __repr__(self):
return "<Rete {},{}>".format(self.nid, self.nome) return "<Rete {},{}>".format(self.nid, self.nome)
@ -137,6 +136,7 @@ class FakeAccesso:
if key == 0: if key == 0:
return self.dispositivo return self.dispositivo
# Funzioni del sito # Funzioni del sito
def login(username, password): def login(username, password):
user = User.query.filter_by(username=username).first() user = User.query.filter_by(username=username).first()
@ -175,6 +175,7 @@ def page_login():
def page_dashboard(): def page_dashboard():
enti = Ente.query.all() enti = Ente.query.all()
conteggioservizi = dict() conteggioservizi = dict()
goldfish = url_for("static", filename="goldfish.png")
for ente in enti: for ente in enti:
conteggioservizi[ente.nomeente] = Servizio.query.join(Ente).filter_by(eid=ente.eid).count() conteggioservizi[ente.nomeente] = Servizio.query.join(Ente).filter_by(eid=ente.eid).count()
conteggioutenti = dict() conteggioutenti = dict()
@ -182,7 +183,7 @@ def page_dashboard():
conteggioutenti[ente.nomeente] = Impiegato.query.join(Servizio).join(Ente).filter_by(eid=ente.eid).count() conteggioutenti[ente.nomeente] = Impiegato.query.join(Servizio).join(Ente).filter_by(eid=ente.eid).count()
css = url_for("static", filename="style.css") css = url_for("static", filename="style.css")
return render_template("dashboard.htm", css=css, type="main", user=session["username"], return render_template("dashboard.htm", css=css, type="main", user=session["username"],
conteggioutenti=conteggioutenti, conteggioservizi=conteggioservizi) conteggioutenti=conteggioutenti, conteggioservizi=conteggioservizi, goldfish=goldfish)
@app.route('/ente_add', methods=['GET', 'POST']) @app.route('/ente_add', methods=['GET', 'POST'])
@ -378,11 +379,12 @@ def page_disp_add():
reti = Network.query.all() reti = Network.query.all()
impiegati = Impiegato.query.all() impiegati = Impiegato.query.all()
css = url_for("static", filename="style.css") css = url_for("static", filename="style.css")
return render_template("dispositivo/add.htm", css=css, impiegati=impiegati, opzioni=opzioni, reti=reti, type="dev", return render_template("dispositivo/add.htm", css=css, impiegati=impiegati, opzioni=opzioni, reti=reti,
user=session["username"], serial=serial) type="dev", user=session["username"], serial=serial)
else: else:
nuovodisp = Dispositivo(request.form['tipo'], request.form['marca'], request.form['modello'], nuovodisp = Dispositivo(request.form['tipo'], request.form['marca'], request.form['modello'],
request.form['inv_ced'], request.form['inv_ente'], request.form['fornitore'], request.form['rete'], request.form['seriale']) request.form['inv_ced'], request.form['inv_ente'], request.form['fornitore'],
request.form['rete'], request.form['seriale'])
db.session.add(nuovodisp) db.session.add(nuovodisp)
db.session.commit() db.session.commit()
# Trova tutti gli utenti, edizione sporco hack in html # Trova tutti gli utenti, edizione sporco hack in html
@ -436,7 +438,8 @@ def page_details_host(did):
disp = Dispositivo.query.filter_by(did=did).first_or_404() disp = Dispositivo.query.filter_by(did=did).first_or_404()
accessi = Accesso.query.filter_by(did=did).all() accessi = Accesso.query.filter_by(did=did).all()
css = url_for("static", filename="style.css") css = url_for("static", filename="style.css")
return render_template("dispositivo/details.htm", css=css, disp=disp, accessi=accessi, type="disp", user=session["username"]) return render_template("dispositivo/details.htm", css=css, disp=disp, accessi=accessi, type="disp",
user=session["username"])
@app.route('/imp_details/<int:iid>') @app.route('/imp_details/<int:iid>')
@ -485,17 +488,18 @@ def page_net_list():
def page_details_net(nid): def page_details_net(nid):
if 'username' not in session: if 'username' not in session:
return redirect(url_for('page_login')) return redirect(url_for('page_login'))
dispositivi=Dispositivo.query.join(Network).filter_by(nid=nid).all() dispositivi = Dispositivo.query.join(Network).filter_by(nid=nid).all()
rete = Network.query.filter_by(nid=nid).first() rete = Network.query.filter_by(nid=nid).first()
css = url_for("static", filename="style.css") css = url_for("static", filename="style.css")
return render_template("net/details.htm", css=css, net=rete, dispositivi=dispositivi, type="net", user=session["username"]) return render_template("net/details.htm", css=css, net=rete, dispositivi=dispositivi, type="net",
user=session["username"])
if __name__ == "__main__": if __name__ == "__main__":
#db.create_all() # db.create_all()
#p = b"admin" # p = b"admin"
#cenere = bcrypt.hashpw(p, bcrypt.gensalt()) # cenere = bcrypt.hashpw(p, bcrypt.gensalt())
#nuovouser = User('admin', cenere) # nuovouser = User('admin', cenere)
#db.session.add(nuovouser) # db.session.add(nuovouser)
#db.session.commit() # db.session.commit()
app.run(debug=True) app.run(debug=True)

7
templates/dashboard.htm
View file

@ -2,7 +2,7 @@
{% block title %}Dashboard - Estus{% endblock %} {% block title %}Dashboard - Estus{% endblock %}
{% block content %} {% block content %}
<div class="row"> <div class="row">
<div class="col-sm-4"> <div class="col-sm-6">
<h2> <h2>
Servizi per ente Servizi per ente
</h2> </h2>
@ -15,7 +15,7 @@
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>
<div class="col-sm-4"> <div class="col-sm-6">
<h2> <h2>
Utenti per ente Utenti per ente
</h2> </h2>
@ -28,8 +28,5 @@
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>
<div class="col-sm-4">
Destra
</div>
</div> </div>
{% endblock %} {% endblock %}