New changes

This commit is contained in:
2020-07-16 09:51:00 +02:00
parent 85892918df
commit 5635ec8428
5 changed files with 110 additions and 10 deletions

View File

@@ -41,7 +41,6 @@ def returnvalueapi(suburl,field="Name"):
#print(suburl+twopart+"->"+r)
jsonobj = json.loads(r)
if isinstance(jsonobj, list):
print("LIST")
jsonobj = jsonobj[0]
return jsonobj[field]
except:
@@ -131,14 +130,40 @@ def pAdminComputer(): #Admin see one group
computername = returnvalueapi('/get/computers?ComputerID='+str(computerid),"Name")
groups = returnTable("/get/groups?ComputerID="+str(computerid),['ID_G','Name'])
for key in range(len(groups)): #Cookgs of every group
print(groups[key])
groups[key].append(returnTable("/get/cookgrp?GroupID="+groups[key][0],['CookName']))
return render_template('/admincomputer.tmpl', title="Computer "+computername,computerid=computerid,computername=computername,groups=groups)
allgroups = returnTable("/get/groups",['ID_G','Name']) #All groups, for adding one
return render_template('/admincomputer.tmpl', title="Computer "+computername,computerid=computerid,computername=computername,groups=groups,allgroups=allgroups)
return redirect('/admin')
@app.route("/admin/computer/addgroup",methods=['GET'])
def pAdminComputerAddGroup():
computerid=request.args.get('computeridadd')
groupid=request.args.get('groupidadd')
if computerid is not None and groupid is not None:
r = returnvalueapi("/add/grpcomputer?ComputerID="+computerid+"&GroupID="+str(groupid),field="RESULT")
if r == "OK":
return redirect('/admin/computer?ID_C='+computerid)
else:
return "ERROR"
else:
return redirect('/admin')
@app.route("/admin/computer/delgroup",methods=['GET'])
def pAdminComputerDelGroup():
computerid=request.args.get('computeriddel')
groupname=request.args.get('groupnamedel')
if computerid is not None and groupname is not None:
r = returnvalueapi("/del/grpcomputer?ComputerID="+computerid+"&GroupName="+str(groupname),field="RESULT")
if r == "OK":
return redirect('/admin/computer?ID_C='+computerid)
else:
return "ERROR"
else:
return redirect('/admin')
@app.route("/admin/groups",methods=['GET'])
@app.route("/admin/groups/",methods=['GET'])
def pAdminGroups(): #Admin Index groups