fix: review changes
This commit is contained in:
parent
8cb356bf30
commit
bae2d5d485
@ -217,13 +217,9 @@ class Analytics(object):
|
|||||||
"company": self.filters.company,
|
"company": self.filters.company,
|
||||||
"project": ["!=", ""],
|
"project": ["!=", ""],
|
||||||
self.date_field: ('between', [self.filters.from_date, self.filters.to_date])
|
self.date_field: ('between', [self.filters.from_date, self.filters.to_date])
|
||||||
}, debug =True
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
self.entity_names = {}
|
|
||||||
for d in self.entries:
|
|
||||||
self.entity_names.setdefault(d.entity, d.entity_name)
|
|
||||||
|
|
||||||
def get_rows(self):
|
def get_rows(self):
|
||||||
self.data = []
|
self.data = []
|
||||||
self.get_periodic_data()
|
self.get_periodic_data()
|
||||||
@ -231,7 +227,7 @@ class Analytics(object):
|
|||||||
for entity, period_data in iteritems(self.entity_periodic_data):
|
for entity, period_data in iteritems(self.entity_periodic_data):
|
||||||
row = {
|
row = {
|
||||||
"entity": entity,
|
"entity": entity,
|
||||||
"entity_name": self.entity_names.get(entity)
|
"entity_name": self.entity_names.get(entity) if hasattr(self, 'entity_names') else None
|
||||||
}
|
}
|
||||||
total = 0
|
total = 0
|
||||||
for end_date in self.periodic_daterange:
|
for end_date in self.periodic_daterange:
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user