|
|
@@ -67,13 +67,14 @@ def print_all():
|
|
|
"""Print wages per resource"""
|
|
|
factory_dict = all_factories()
|
|
|
|
|
|
- print("total")
|
|
|
+ print("total Wage %")
|
|
|
+ print("———————————————————————————— ————— ———")
|
|
|
sorted_factories = sorted(factory_dict.values(), key=lambda k: k['wage'], reverse=True)
|
|
|
top_wage = sorted_factories[0]['wage']
|
|
|
for factory in sorted_factories:
|
|
|
- print('{:28} {:>11,} {:>3}'.format(
|
|
|
+ print('{:28} {:>4,}kk {:>3}'.format(
|
|
|
factory['name'],
|
|
|
- int(factory['wage']),
|
|
|
+ round(int(factory['wage'])/1000000),
|
|
|
int(100 / top_wage * factory['wage']),
|
|
|
).replace(',', '.'))
|
|
|
|
|
|
@@ -87,7 +88,7 @@ def print_factory_list():
|
|
|
factory_id,
|
|
|
factory_id,
|
|
|
factory['name'],
|
|
|
- REGIONS[factory['region_id']]['name'],
|
|
|
+ REGIONS[str(factory['region_id'])]['name'],
|
|
|
))
|
|
|
|
|
|
|
