diff --git a/server.py b/server.py index c3aa93e..fab16c0 100644 --- a/server.py +++ b/server.py @@ -84,14 +84,17 @@ class Dispositivo(db.Model): inv_ced = db.Column(db.String(8)) inv_ente = db.Column(db.String(8)) fornitore = db.Column(db.String(64)) + nid = db.Column(db.Integer, db.ForeignKey('network.nid')) + rete = db.relationship("Network", backref='dispositivo') - def __init__(self, tipo, marca, modello, inv_ced, inv_ente, fornitore): + def __init__(self, tipo, marca, modello, inv_ced, inv_ente, fornitore, nid): self.tipo = tipo self.marca = marca self.modello = modello self.inv_ced = inv_ced self.inv_ente = inv_ente self.fornitore = fornitore + self.nid = nid def __repr__(self): return "".format(self.inv_ced) @@ -109,6 +112,19 @@ class Accesso(db.Model): return "".format(self.iid, self.did) +class Network(db.Model): + nid = db.Column(db.Integer, primary_key=True) + nome = db.Column(db.String(80)) + ip = db.Column(db.String(20)) + + def __init__(self, nome, ip): + self.nome=nome + self.ip=ip + + def __repr__(self): + return "".format(self.nid, self.nome) + + class FakeAccesso: def __init__(self, dispositivo): self.did = dispositivo.did @@ -356,13 +372,14 @@ def page_disp_add(): 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"] + reti = Network.query.all() impiegati = Impiegato.query.all() css = url_for("static", filename="style.css") - return render_template("dispositivo/add.htm", css=css, impiegati=impiegati, opzioni=opzioni, type="dev", + return render_template("dispositivo/add.htm", css=css, impiegati=impiegati, opzioni=opzioni, reti=reti, 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']) + request.form['inv_ced'], request.form['inv_ente'], request.form['fornitore'], request.form['rete']) db.session.add(nuovodisp) db.session.commit() # Trova tutti gli utenti, edizione sporco hack in html @@ -427,6 +444,40 @@ def page_details_imp(iid): css = url_for("static", filename="style.css") return render_template("impiegato/details.htm", css=css, imp=impiegato, type="imp",user=session["username"]) + +@app.route('/net_add', methods=['GET', 'POST']) +def page_net_add(): + if 'username' not in session: + return redirect(url_for('page_login')) + if request.method == 'GET': + css = url_for("static", filename="style.css") + return render_template("net/add.htm", css=css, type="net", user=session["username"]) + else: + nuovonet = Network(request.form['nomerete'], request.form['ip']) + db.session.add(nuovonet) + db.session.commit() + return redirect(url_for('page_net_list')) + + +@app.route('/net_del/') +def page_ned_del(nid): + if 'username' not in session: + return redirect(url_for('page_login')) + rete = Network.query.get(nid) + db.session.delete(rete) + db.session.commit() + return redirect(url_for('page_net_list')) + + +@app.route('/net_list') +def page_net_list(): + if 'username' not in session: + return redirect(url_for('page_login')) + reti = Network.query.all() + css = url_for("static", filename="style.css") + return render_template("net/list.htm", css=css, reti=reti, type="net", user=session["username"]) + + if __name__ == "__main__": #db.create_all() #p = b"admin" diff --git a/templates/dispositivo/add.htm b/templates/dispositivo/add.htm index 2d634b2..17fd258 100644 --- a/templates/dispositivo/add.htm +++ b/templates/dispositivo/add.htm @@ -78,6 +78,16 @@ +
+ +
+ +
+
diff --git a/templates/dispositivo/list.htm b/templates/dispositivo/list.htm index 3d994a7..29ebca9 100644 --- a/templates/dispositivo/list.htm +++ b/templates/dispositivo/list.htm @@ -26,6 +26,7 @@ {{ d[0].dispositivo.marca }} {{ d[0].dispositivo.modello }} {{ d[0].dispositivo.fornitore }} + {{ d[0].dispositivo.rete.nome }} diff --git a/templates/nav.htm b/templates/nav.htm index 6047921..a1d9e13 100644 --- a/templates/nav.htm +++ b/templates/nav.htm @@ -13,6 +13,7 @@
  • Servizi
  • Impiegati
  • Dispositivi
    • +
  • Reti

      • diff --git a/templates/net/add.htm b/templates/net/add.htm new file mode 100644 index 0000000..6f31fe4 --- /dev/null +++ b/templates/net/add.htm @@ -0,0 +1,11 @@ +{% extends "base.htm" %} +{% block content %} +

      + Aggiunta nuova rete +

      +
      + + + +
      +{% endblock %} diff --git a/templates/net/details.htm b/templates/net/details.htm new file mode 100644 index 0000000..cfe40e2 --- /dev/null +++ b/templates/net/details.htm @@ -0,0 +1,33 @@ +{% extends "base.htm" %} +{% block title %}Dettagli Impiegato{% endblock %} +{% block content %} +

      + Ispeziona Rete +

      +
        +
      • +

        + Nome Rete +

        +
        + {{ imp.nomeimpiegato }} +
        +
        • +
      • +

        + IP +

        +
        + {{ imp.username }} +
        +
        • +
      • +

        + Dispositivi +

        +
        + +
        +
        • +
      +{% endblock %} \ No newline at end of file diff --git a/templates/net/list.htm b/templates/net/list.htm new file mode 100644 index 0000000..694f6b9 --- /dev/null +++ b/templates/net/list.htm @@ -0,0 +1,25 @@ +{% extends "base.htm" %} +{% block content %} +

      + Reti esistenti +

      + + + + + + + + + + + {% for rete in reti %} + + + + + + {% endfor %} +
      Nome ReteIPIspezionaElimina
      {{ rete.nome }}{{ rete.ip }}
      + Aggiungi +{% endblock %}