Commit fa71e882 authored by Vladislav Rykov's avatar Vladislav Rykov
Browse files

dashboard tested

parent 2b5a9a5f
......@@ -133,13 +133,10 @@ def get_device_table_names(cur):
def get_count_all():
count = 0
tns = get_device_table_names()
print(tns)
if tns[0] and len(tns[1]) > 0:
for tn in tns[1]:
sp = tn[0].split('_')
print(sp)
r = get_count(sp[1])
print(r)
if r[0]:
count += r[1][0]
......
......@@ -83,3 +83,20 @@ def get_range(cur, rng):
"""
cur.execute(query, (rng[0],rng[1]))
return (True, cur.fetchall())
@with_psql
def get_range_name(cur, name, rng):
name += '%'
query = """
SELECT * FROM
users
WHERE name LIKE %s
ORDER BY
name ASC
LIMIT %s OFFSET %s
"""
cur.execute(query, (name, rng[0],rng[1]))
return (True, cur.fetchall())
......@@ -43,6 +43,7 @@
<div class="form-group">
<button type="submit" class="btn btn-default">Filter</button>
</div>
<a href="dashboard-clean-search"><span class="glyphicon glyphicon-remove"></span></a>
</form>
</div>
<br>
......
......@@ -354,7 +354,6 @@ def dashboard():
user_cnt = ud.get_count()
apps_cnt = ad.get_count()
devs_cnt = dd.get_count_all()
print(devs_cnt)
cur_pg = 1
if request.args.get('p'):
......@@ -362,18 +361,29 @@ def dashboard():
if cur_pg < 1:
cur_pg = 1
users = ud.get_range([MAX_PG_ENTRIES_USERS, (cur_pg-1)*MAX_PG_ENTRIES_USERS])
users = None
if request.method == 'GET':
users = ud.get_range([MAX_PG_ENTRIES_USERS, (cur_pg-1)*MAX_PG_ENTRIES_USERS])
if request.method == 'POST':
session['users_filter'] = request.form['username']
if 'users_filter' in session:
users = ud.get_range_name(session['users_filter'], [MAX_PG_ENTRIES_USERS, (cur_pg-1)*MAX_PG_ENTRIES_USERS])
print(users)
rd = misc.paging(cur_pg, len(users[1]), MAX_PG_ENTRIES_USERS, MAX_PG)
else:
users = ud.get_range([MAX_PG_ENTRIES_USERS, (cur_pg-1)*MAX_PG_ENTRIES_USERS])
rd = misc.paging(cur_pg, user_cnt[1][0], MAX_PG_ENTRIES_USERS, MAX_PG)
return render_template('admin/dashboard.html', users_cnt=user_cnt[1][0], apps_cnt=apps_cnt[1][0], dev_cnt=devs_cnt, users=users[1], pp=rd[0], pr=rd[1], np=rd[2], cp=cur_pg, usn=(cur_pg-1)*MAX_PG_ENTRIES_USERS+1)
else:
pass
else:
return redirect(url_for('index'))
@app.route('/dashboard-clean-search')
def dashboard_clean_search():
if 'users_filter' in session:
session.pop('users_filter', None)
return redirect(url_for('dashboard'))
def pend_delete_all_ack():
pend.delete_all_ack()
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment