|
@@ -731,8 +731,22 @@ class Mvp:
|
|
|
d = 0
|
|
d = 0
|
|
|
e = 0
|
|
e = 0
|
|
|
f = 0
|
|
f = 0
|
|
|
|
|
+ result_1 = []
|
|
|
for rt in result:
|
|
for rt in result:
|
|
|
crowds = rt.crowd
|
|
crowds = rt.crowd
|
|
|
|
|
+ if rt.uuid in [
|
|
|
|
|
+ 'ae9db26b-3606-497c-83c5-56341d487a91',
|
|
|
|
|
+ '9fb33b6c-bd7a-4114-b225-3ee380943517',
|
|
|
|
|
+ '84636488-1307-47fe-a238-4f9cf279a908',
|
|
|
|
|
+ '4a5b6654-eb99-46ed-8dcf-777648d6baca',
|
|
|
|
|
+ 'ba181da0-c91a-4430-84c6-9612a693f659',
|
|
|
|
|
+ '32eae583-474c-4dca-8b36-d74314f45cee',
|
|
|
|
|
+ 'b07f6ff2-ccd5-44ee-9b7c-b2e1f40d777f',
|
|
|
|
|
+ '149a0e40-5639-4771-8a27-60821e14a1d5',
|
|
|
|
|
+ '4795b731-3e75-4f08-90bc-8ee4a0c366c6',
|
|
|
|
|
+ '4795b731-3e75-4f08-90bc-8ee4a0c366c6',
|
|
|
|
|
+ '47cbd398-1c39-4dc0-8d97-98fe19457516']:
|
|
|
|
|
+ result_1.append([rt.uuid, rt.city, rt.age, rt.crowd])
|
|
|
if 'A' in crowds:
|
|
if 'A' in crowds:
|
|
|
a += 1
|
|
a += 1
|
|
|
if 'B' in crowds:
|
|
if 'B' in crowds:
|
|
@@ -745,7 +759,8 @@ class Mvp:
|
|
|
e += 1
|
|
e += 1
|
|
|
if 'F' in crowds:
|
|
if 'F' in crowds:
|
|
|
f += 1
|
|
f += 1
|
|
|
- return {'A': a, 'B': b, 'C': b, 'D': d, 'E': e, 'F': f}
|
|
|
|
|
|
|
+ return result_1
|
|
|
|
|
+ # return {'A': a, 'B': b, 'C': b, 'D': d, 'E': e, 'F': f}
|
|
|
|
|
|
|
|
def get_crowd_people(self):
|
|
def get_crowd_people(self):
|
|
|
result = {}
|
|
result = {}
|
