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

fix reports

Browse Source
This commit is contained in:
Jay Lee
2020-03-09 07:57:23 -04:00
parent 8659df3c4c
commit 24282e4289
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gam.py
View File

@@ -1125,7 +1125,7 @@ def showReport():
while i < len(sys.argv): while i < len(sys.argv):
myarg = sys.argv[i].lower() myarg = sys.argv[i].lower()
if myarg == 'date': if myarg == 'date':
tryDate = getYYYYMMDD(sys.argv[i+1]) tryDate = utils.get_yyyymmdd(sys.argv[i+1])
i += 2 i += 2
elif myarg in ['orgunit', 'org', 'ou']: elif myarg in ['orgunit', 'org', 'ou']:
_, orgUnitId = getOrgUnitId(sys.argv[i+1]) _, orgUnitId = getOrgUnitId(sys.argv[i+1])
@@ -1137,10 +1137,10 @@ def showReport():
fullDataRequired = fdr.replace(',', ' ').split() fullDataRequired = fdr.replace(',', ' ').split()
i += 2 i += 2
elif myarg == 'start': elif myarg == 'start':
startTime = getTimeOrDeltaFromNow(sys.argv[i+1]) startTime = utils.get_time_or_delta_from_now(sys.argv[i+1])
i += 2 i += 2
elif myarg == 'end': elif myarg == 'end':
endTime = getTimeOrDeltaFromNow(sys.argv[i+1]) endTime = utils.get_time_or_delta_from_now(sys.argv[i+1])
i += 2 i += 2
elif myarg == 'event': elif myarg == 'event':
eventName = sys.argv[i+1] eventName = sys.argv[i+1]
@@ -3392,7 +3392,7 @@ def addDriveFileACL(users):
emailMessage = sys.argv[i+1] emailMessage = sys.argv[i+1]
i += 2 i += 2
elif myarg == 'expires': elif myarg == 'expires':
body['expirationTime'] = getTimeOrDeltaFromNow(sys.argv[i+1]) body['expirationTime'] = utils.get_time_or_delta_from_now(sys.argv[i+1])
i += 2 i += 2
elif myarg == 'asadmin': elif myarg == 'asadmin':
useDomainAdminAccess = True useDomainAdminAccess = True
@@ -3797,10 +3797,10 @@ def getDriveFileAttribute(i, body, parameters, myarg, update=False):
body['labels'][DRIVEFILE_LABEL_CHOICES_MAP[myarg]] = True body['labels'][DRIVEFILE_LABEL_CHOICES_MAP[myarg]] = True
i += 1 i += 1
elif myarg in ['lastviewedbyme', 'lastviewedbyuser', 'lastviewedbymedate', 'lastviewedbymetime']: elif myarg in ['lastviewedbyme', 'lastviewedbyuser', 'lastviewedbymedate', 'lastviewedbymetime']:
body['lastViewedByMeDate'] = getTimeOrDeltaFromNow(sys.argv[i+1]) body['lastViewedByMeDate'] = utils.get_time_or_delta_from_now(sys.argv[i+1])
i += 2 i += 2
elif myarg in ['modifieddate', 'modifiedtime']: elif myarg in ['modifieddate', 'modifiedtime']:
body['modifiedDate'] = getTimeOrDeltaFromNow(sys.argv[i+1]) body['modifiedDate'] = utils.get_time_or_delta_from_now(sys.argv[i+1])
i += 2 i += 2
elif myarg == 'description': elif myarg == 'description':
body['description'] = sys.argv[i+1] body['description'] = sys.argv[i+1]
@@ -4315,7 +4315,7 @@ def sendOrDropEmail(users, method='send'):
kwargs['deleted'] = True kwargs['deleted'] = True
i += 1 i += 1
elif myarg == 'date': elif myarg == 'date':
msgHeaders['Date'] = getTimeOrDeltaFromNow(sys.argv[i+1]) msgHeaders['Date'] = utils.get_time_or_delta_from_now(sys.argv[i+1])
if method in ['insert', 'import']: if method in ['insert', 'import']:
kwargs['internalDateSource'] = 'dateHeader' kwargs['internalDateSource'] = 'dateHeader'
i += 2 i += 2
@@ -5828,10 +5828,10 @@ def doVacation(users):
body['restrictToDomain'] = True body['restrictToDomain'] = True
i += 1 i += 1
elif myarg == 'startdate': elif myarg == 'startdate':
body['startTime'] = getYYYYMMDD(sys.argv[i+1], returnTimeStamp=True) body['startTime'] = utils.get_yyyymmdd(sys.argv[i+1], returnTimeStamp=True)
i += 2 i += 2
elif myarg == 'enddate': elif myarg == 'enddate':
body['endTime'] = getYYYYMMDD(sys.argv[i+1], returnTimeStamp=True) body['endTime'] = utils.get_yyyymmdd(sys.argv[i+1], returnTimeStamp=True)
i += 2 i += 2
else: else:
controlflow.invalid_argument_exit(sys.argv[i], "gam <users> vacation") controlflow.invalid_argument_exit(sys.argv[i], "gam <users> vacation")