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

Merge commit

Browse source
This commit is contained in:
Lorenzo 2017-09-11 17:11:38 +02:00
commit 2e9fccd83f
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
server.py
View file

@ -372,13 +372,14 @@ def page_disp_add():
if 'username' not in session: if 'username' not in session:
return redirect(url_for('page_login')) return redirect(url_for('page_login'))
if request.method == 'GET': if request.method == 'GET':
serial = request.args.get("scanned_barcode")
opzioni = ["Centralino", "Dispositivo generico di rete", "Marcatempo", "PC", "Portatile", "POS", "Router", opzioni = ["Centralino", "Dispositivo generico di rete", "Marcatempo", "PC", "Portatile", "POS", "Router",
"Server", "Stampante di rete", "Switch", "Telefono IP", "Monitor", "Scanner", "Stampante locale"] "Server", "Stampante di rete", "Switch", "Telefono IP", "Monitor", "Scanner", "Stampante locale"]
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, type="dev",
user=session["username"]) 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'])

4
templates/dispositivo/add.htm
View file

@ -44,8 +44,8 @@
<div class="form-group"> <div class="form-group">
<label class="col-xs-2" for="form-utente">Utenti</label> <label class="col-xs-2" for="form-utente">Utenti</label>
<div class="col-xs-10" id="users-column"> <div class="col-xs-10" id="users-column">
<div id="add-user" class="btn btn-success" onclick="adduser()">+</div> <div id="add-user" class="btn btn-success" onclick="adduser()"><span class="glyphicon glyphicon-plus"></span></div>
<div id="remove-user" class="btn btn-danger disabled" onclick="removeuser()">-</div> <div id="remove-user" class="btn btn-danger disabled" onclick="removeuser()"><span class="glyphicon glyphicon-minus"></span></div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">