From da318954ec3a1aa90e334419d52791de48f5170c Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Mon, 11 Sep 2017 11:43:50 +0200 Subject: [PATCH] Apply PEP8 modifications --- server.py | 45 ++++++++++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/server.py b/server.py index 3c1093f..0dacdba 100644 --- a/server.py +++ b/server.py @@ -8,6 +8,7 @@ app.secret_key = "pepsecret" app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///data.db' db = SQLAlchemy(app) + # Utente login inventario class User(db.Model): uid = db.Column(db.Integer, primary_key=True) @@ -21,6 +22,7 @@ class User(db.Model): def __repr__(self): return "".format(self.username, self.passwd) + # Ente (Unione Terre di Castelli, Comune di Vignola...) class Ente(db.Model): eid = db.Column(db.Integer, primary_key=True) @@ -113,6 +115,7 @@ def login(username, password): # Se non esiste l'Utente return False + # Sito @app.route('/') def page_home(): @@ -122,6 +125,7 @@ def page_home(): session.pop('username') return "Logout eseguito con successo." + @app.route('/login', methods=['GET', 'POST']) def page_login(): if request.method == 'GET': @@ -135,6 +139,7 @@ def page_login(): else: abort(403) + @app.route('/dashboard') def page_dashboard(): enti = Ente.query.all() @@ -145,7 +150,9 @@ def page_dashboard(): for ente in enti: conteggioutenti[ente.nomeente] = Impiegato.query.join(Servizio).join(Ente).filter_by(eid=ente.eid).count() css = url_for("static", filename="style.css") - return render_template("dashboard.html.j2", css=css, type="main", user=session["username"], conteggioutenti=conteggioutenti, conteggioservizi=conteggioservizi) + return render_template("dashboard.html.j2", css=css, type="main", user=session["username"], + conteggioutenti=conteggioutenti, conteggioservizi=conteggioservizi) + @app.route('/ente_add', methods=['GET', 'POST']) def page_ente_add(): @@ -160,6 +167,7 @@ def page_ente_add(): db.session.commit() return redirect(url_for('page_ente_list')) + @app.route('/ente_del/') def page_ente_del(eid): if 'username' not in session: @@ -175,6 +183,7 @@ def page_ente_del(eid): db.session.commit() return redirect(url_for('page_ente_list')) + @app.route('/ente_list') def page_ente_list(): if 'username' not in session: @@ -183,6 +192,7 @@ def page_ente_list(): css = url_for("static", filename="style.css") return render_template("ente/list.html.j2", css=css, enti=enti, type="ente", user=session["username"]) + @app.route('/ente_show/', methods=['GET', 'POST']) def page_ente_show(eid): if 'username' not in session: @@ -198,6 +208,7 @@ def page_ente_show(eid): db.session.commit() return redirect(url_for('page_ente_list')) + @app.route('/serv_add', methods=['GET', 'POST']) def page_serv_add(): if 'username' not in session: @@ -212,6 +223,7 @@ def page_serv_add(): db.session.commit() return redirect(url_for('page_serv_list')) + @app.route('/serv_del/') def page_serv_del(sid): if 'username' not in session: @@ -224,6 +236,7 @@ def page_serv_del(sid): db.session.commit() return redirect(url_for('page_serv_list')) + @app.route('/serv_list') def page_serv_list(): if 'username' not in session: @@ -232,13 +245,6 @@ def page_serv_list(): css = url_for("static", filename="style.css") return render_template("servizio/list.html.j2", css=css, serv=serv, type="serv", user=session["username"]) -@app.route('/serv_list/') -def page_serv_list_plus(eid): - if 'username' not in session: - return redirect(url_for('page_login')) - serv = Servizio.query.join(Ente).filter_by(eid=eid).all() - css = url_for("static", filename="style.css") - return render_template("servizio/list.html.j2", css=css, user=session["username"]) @app.route('/serv_show/', methods=['GET', 'POST']) def page_serv_show(sid): @@ -256,6 +262,7 @@ def page_serv_show(sid): db.session.commit() return redirect(url_for('page_serv_list')) + @app.route('/imp_add', methods=['GET', 'POST']) def page_imp_add(): if 'username' not in session: @@ -265,11 +272,13 @@ def page_imp_add(): css = url_for("static", filename="style.css") return render_template("impiegato/add.html.j2", css=css, servizi=servizi, type="imp", user=session["username"]) else: - nuovoimp = Impiegato(request.form['sid'], request.form['nomeimpiegato'], request.form['username'], request.form['passwd'],) + nuovoimp = Impiegato(request.form['sid'], request.form['nomeimpiegato'], request.form['username'], + request.form['passwd'],) db.session.add(nuovoimp) db.session.commit() return redirect(url_for('page_imp_list')) + @app.route('/imp_del/') def page_imp_del(iid): if 'username' not in session: @@ -279,6 +288,7 @@ def page_imp_del(iid): db.session.commit() return redirect(url_for('page_imp_list')) + @app.route('/imp_list') def page_imp_list(): if 'username' not in session: @@ -287,6 +297,7 @@ def page_imp_list(): css = url_for("static", filename="style.css") return render_template("impiegato/list.html.j2", css=css, impiegati=impiegati, type="imp", user=session["username"]) + @app.route('/imp_list/') def page_imp_list_plus(sid): if 'username' not in session: @@ -295,6 +306,7 @@ def page_imp_list_plus(sid): css = url_for("static", filename="style.css") return render_template("impiegato/list.html.j2", css=css, impiegati=impiegati, user=session["username"]) + @app.route('/imp_show/', methods=['GET', 'POST']) def page_imp_show(iid): if 'username' not in session: @@ -313,17 +325,21 @@ def page_imp_show(iid): db.session.commit() return redirect(url_for('page_imp_list')) + @app.route('/disp_add', methods=['GET', 'POST']) def page_disp_add(): if 'username' not in session: return redirect(url_for('page_login')) if request.method == 'GET': - opzioni=["Centralino", "Dispositivo generico di rete", "Marcatempo", "PC", "Portatile", "POS", "Router", "Server", "Stampante di rete", "Switch", "Telefono IP", "Monitor", "Scanner", "Stampante locale"] + opzioni = ["Centralino", "Dispositivo generico di rete", "Marcatempo", "PC", "Portatile", "POS", "Router", + "Server", "Stampante di rete", "Switch", "Telefono IP", "Monitor", "Scanner", "Stampante locale"] impiegati = Impiegato.query.all() css = url_for("static", filename="style.css") - return render_template("dispositivo/add.html.j2", css=css, impiegati=impiegati,opzioni=opzioni, type="dev", user=session["username"]) + return render_template("dispositivo/add.html.j2", css=css, impiegati=impiegati, opzioni=opzioni, type="dev", + user=session["username"]) else: - nuovodisp = Dispositivo(request.form['tipo'], request.form['marca'], request.form['modello'], request.form['inv_ced'], request.form['inv_ente'], request.form['fornitore']) + nuovodisp = Dispositivo(request.form['tipo'], request.form['marca'], request.form['modello'], + request.form['inv_ced'], request.form['inv_ente'], request.form['fornitore']) db.session.add(nuovodisp) db.session.commit() # Trova tutti gli utenti, edizione sporco hack in html @@ -339,9 +355,10 @@ def page_disp_add(): nuovologin = Accesso(int(user), nuovodisp.did) db.session.add(nuovologin) db.session.commit() - #TODO: se un dispositivo non ha utenti si incasina parecchio + # TODO: se un dispositivo non ha utenti si incasina parecchio return redirect(url_for('page_disp_list')) + @app.route('/disp_del/') def page_disp_del(did): if 'username' not in session: @@ -351,6 +368,7 @@ def page_disp_del(did): db.session.commit() return redirect(url_for('page_disp_list')) + @app.route('/disp_list') def page_disp_list(): if 'username' not in session: @@ -363,6 +381,7 @@ def page_disp_list(): css = url_for("static", filename="style.css") return render_template("dispositivo/list.html.j2", css=css, accessi=accessi, type="disp", user=session["username"]) + @app.route('/disp_details') def page_details_host(): raise NotImplementedError()