deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-03 12:21:35 +00:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

rint start_time and end_time as dates in gam reports; handle bad data from Google (#397)

Browse Source
This commit is contained in:
Ross Scroggs
2017-01-24 11:51:43 -08:00
committed by Jay Lee
parent b54eb97f6b
commit c76368509e
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gam.py
View File

@@ -925,6 +925,8 @@ def showReport():
titles = [u'email', u'date'] titles = [u'email', u'date']
csvRows = [] csvRows = []
for user_report in usage: for user_report in usage:
if u'entity' not in user_report:
continue
row = {u'email': user_report[u'entity'][u'userEmail'], u'date': try_date} row = {u'email': user_report[u'entity'][u'userEmail'], u'date': try_date}
try: try:
for report_item in user_report[u'parameters']: for report_item in user_report[u'parameters']:
@@ -998,6 +1000,12 @@ def showReport():
del activity[u'events'] del activity[u'events']
activity_row = flatten_json(activity) activity_row = flatten_json(activity)
for event in events: for event in events:
for item in event.get(u'parameters', []):
if item[u'name'] in [u'start_time', u'end_time']:
val = item.get(u'intValue')
if val is not None:
item[u'dateTimeValue'] = datetime.datetime.fromtimestamp(int(val)-62135683200).isoformat()
item.pop(u'intValue')
row = flatten_json(event) row = flatten_json(event)
row.update(activity_row) row.update(activity_row)
for item in row: for item in row: