haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-11 11:52:08 +00:00
Code Issues Releases Wiki Activity

fix file visited count & add file modified count (#3102)

Browse Source
This commit is contained in:
王健辉 2019-03-13 12:06:11 +08:00 committed by Daniel Pan
parent 53e19a7a1e
commit b66adb9c91
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
seahub/api2/endpoints/admin/statistics.py
View File

@ -85,6 +85,7 @@ class FileOperationsView(APIView):
ops_added_dict = get_init_data(start_time, end_time) ops_added_dict = get_init_data(start_time, end_time)
ops_visited_dict = get_init_data(start_time, end_time) ops_visited_dict = get_init_data(start_time, end_time)
ops_deleted_dict = get_init_data(start_time, end_time) ops_deleted_dict = get_init_data(start_time, end_time)
ops_modified_dict = get_init_data(start_time, end_time)
for e in data: for e in data:
if e[1] == 'Added': if e[1] == 'Added':
@ -93,13 +94,16 @@ class FileOperationsView(APIView):
ops_visited_dict[e[0]] = e[2] ops_visited_dict[e[0]] = e[2]
elif e[1] == 'Deleted': elif e[1] == 'Deleted':
ops_deleted_dict[e[0]] = e[2] ops_deleted_dict[e[0]] = e[2]
elif e[1] == 'Modified':
ops_modified_dict[e[0]] = e[2]
res_data = [] res_data = []
for k, v in ops_added_dict.items(): for k, v in ops_added_dict.items():
res_data.append({'datetime': datetime_to_isoformat_timestr(k), res_data.append({'datetime': datetime_to_isoformat_timestr(k),
'added': v, 'added': v,
'visited': ops_visited_dict[k], 'visited': ops_visited_dict[k],
'deleted': ops_deleted_dict[k]}) 'deleted': ops_deleted_dict[k],
'modified': ops_modified_dict[k]})
return Response(sorted(res_data, key=lambda x: x['datetime'])) return Response(sorted(res_data, key=lambda x: x['datetime']))

10
seahub/templates/sysadmin/sys_statistic_file.html
View File

@ -140,7 +140,8 @@ function renderChart(data, group_by) {
var labels = [], var labels = [],
added = [], added = [],
deleted = [], deleted = [],
visited = []; visited = [],
modified = [];
var item; var item;
var datetime_ms, datetime_str; var datetime_ms, datetime_str;
@ -161,6 +162,7 @@ function renderChart(data, group_by) {
added.push(item.added); added.push(item.added);
deleted.push(item.deleted); deleted.push(item.deleted);
visited.push(item.visited); visited.push(item.visited);
modified.push(item.modified);
} }
var config = { var config = {
@ -180,6 +182,12 @@ function renderChart(data, group_by) {
borderColor: '#57cd6b', borderColor: '#57cd6b',
backgroundColor: '#57cd6b' backgroundColor: '#57cd6b'
}, },
{
label: "{% trans "Modified" context "files modified" %}",
data: modified,
borderColor: '#72c3fc',
backgroundColor: '#72c3fc'
},
{ {
label: "{% trans "Deleted" context "files deleted" %}", label: "{% trans "Deleted" context "files deleted" %}",
data: deleted, data: deleted,