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

Prefix buildingId with id: when output, saves time when value is used in gam csv (#657)

Browse Source
This commit is contained in:
Ross Scroggs
2017-12-20 10:59:08 -08:00
committed by Jay Lee
parent c6d0f3da92
commit e3d3927cfd
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gam.py
View File

@@ -8052,6 +8052,8 @@ def doGetBuildingInfo():
buildingId = _getBuildingByNameOrId(cd, sys.argv[3]) buildingId = _getBuildingByNameOrId(cd, sys.argv[3])
building = callGAPI(cd.resources().buildings(), u'get', building = callGAPI(cd.resources().buildings(), u'get',
customer=GC_Values[GC_CUSTOMER_ID], buildingId=buildingId) customer=GC_Values[GC_CUSTOMER_ID], buildingId=buildingId)
if u'buildingId' in building:
building[u'buildingId'] = u'id:{0}'.format(building[u'buildingId'])
if u'floorNames' in building: if u'floorNames' in building:
building[u'floorNames'] = u','.join(building[u'floorNames']) building[u'floorNames'] = u','.join(building[u'floorNames'])
if u'buildingName' in building: if u'buildingName' in building:
@@ -9224,6 +9226,7 @@ def doGetResourceCalendarInfo():
resource[u'features'] = u', '.join([a_feature[u'feature'][u'name'] for a_feature in resource.pop(u'featureInstances')]) resource[u'features'] = u', '.join([a_feature[u'feature'][u'name'] for a_feature in resource.pop(u'featureInstances')])
if u'buildingId' in resource: if u'buildingId' in resource:
resource[u'buildingName'] = _getBuildingNameById(cd, resource[u'buildingId']) resource[u'buildingName'] = _getBuildingNameById(cd, resource[u'buildingId'])
resource[u'buildingId'] = u'id:{0}'.format(resource[u'buildingId'])
print_json(None, resource) print_json(None, resource)
def _filterTimeRanges(activeTimeRanges, startDate, endDate): def _filterTimeRanges(activeTimeRanges, startDate, endDate):
@@ -11322,6 +11325,7 @@ RESCAL_ALLFIELDS = [u'id', u'name', u'email', u'description', u'type', u'buildin
RESCAL_ARGUMENT_TO_PROPERTY_MAP = { RESCAL_ARGUMENT_TO_PROPERTY_MAP = {
u'description': [u'resourceDescription'], u'description': [u'resourceDescription'],
u'building': [u'buildingId',],
u'buildingid': [u'buildingId',], u'buildingid': [u'buildingId',],
u'capacity': [u'capacity',], u'capacity': [u'capacity',],
u'category': [u'resourceCategory',], u'category': [u'resourceCategory',],
@@ -11423,6 +11427,8 @@ def doPrintBuildings():
building.pop(u'etags', None) building.pop(u'etags', None)
building.pop(u'etag', None) building.pop(u'etag', None)
building.pop(u'kind', None) building.pop(u'kind', None)
if u'buildingId' in building:
building[u'buildingId'] = u'id:{0}'.format(building[u'buildingId'])
if u'floorNames' in building: if u'floorNames' in building:
building[u'floorNames'] = u','.join(building[u'floorNames']) building[u'floorNames'] = u','.join(building[u'floorNames'])
building = flatten_json(building) building = flatten_json(building)
@@ -11462,14 +11468,20 @@ def doPrintResourceCalendars():
if not fieldsList: if not fieldsList:
for field in RESCAL_DFLTFIELDS: for field in RESCAL_DFLTFIELDS:
addFieldToCSVfile(field, RESCAL_ARGUMENT_TO_PROPERTY_MAP, fieldsList, fieldsTitles, titles) addFieldToCSVfile(field, RESCAL_ARGUMENT_TO_PROPERTY_MAP, fieldsList, fieldsTitles, titles)
fields = u'nextPageToken,items({0})'.format(u','.join(set(fieldsList)))
if u'buildingId' in fieldsList:
addFieldToCSVfile(u'buildingName', {u'buildingName': [u'buildingName',]}, fieldsList, fieldsTitles, titles)
sys.stderr.write(u"Retrieving All Resource Calendars for your account (may take some time on a large domain)\n") sys.stderr.write(u"Retrieving All Resource Calendars for your account (may take some time on a large domain)\n")
page_message = u'Got %%total_items%% resources: %%first_item%% - %%last_item%%\n' page_message = u'Got %%total_items%% resources: %%first_item%% - %%last_item%%\n'
resources = callGAPIpages(cd.resources().calendars(), u'list', u'items', resources = callGAPIpages(cd.resources().calendars(), u'list', u'items',
page_message=page_message, message_attribute=u'resourceId', page_message=page_message, message_attribute=u'resourceId',
customer=GC_Values[GC_CUSTOMER_ID], fields=u'nextPageToken,items({0})'.format(u','.join(set(fieldsList)))) customer=GC_Values[GC_CUSTOMER_ID], fields=fields)
for resource in resources: for resource in resources:
if u'featureInstances' in resource: if u'featureInstances' in resource:
resource[u'featureInstances'] = u','.join([a_feature[u'feature'][u'name'] for a_feature in resource.pop(u'featureInstances')]) resource[u'featureInstances'] = u','.join([a_feature[u'feature'][u'name'] for a_feature in resource.pop(u'featureInstances')])
if u'buildingId' in resource:
resource[u'buildingName'] = _getBuildingNameById(cd, resource[u'buildingId'])
resource[u'buildingId'] = u'id:{0}'.format(resource[u'buildingId'])
resUnit = {} resUnit = {}
for field in fieldsList: for field in fieldsList:
resUnit[fieldsTitles[field]] = resource.get(field, u'') resUnit[fieldsTitles[field]] = resource.get(field, u'')