x/tuskar-ui
Code Issues Proposed changes

Update all usage.csv templates to use 2 decimal places

Browse Source 
Change-Id: I54694beb39fdee39d59e9032e72201a520a9fcd1
This commit is contained in:
Brian Waldon 2012-10-31 12:39:02 -07:00
parent 70ac5bd4a7
commit 0c12faa7dd
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openstack_dashboard/dashboards/admin/overview/templates/overview/usage.csv
View File

@ -1,9 +1,9 @@
Usage Report For Period:,{{ usage.start|date:"b. d Y" }},/,{{ usage.end|date:"b. d Y" }}
Active Instances:,{{ usage.summary.instances }}
CPU-HRs Used:,{{ usage.summary.vcpu_hours }}
CPU-HRs Used:,{{ usage.summary.vcpu_hours|floatformat:2 }}
Total Active RAM (MB):,{{ usage.summary.memory_mb }}
Total Disk Size:,{{ usage.summary.local_gb }}
Total Disk Usage:,{{ usage.summary.disk_gb_hours }}
Total Disk Usage:,{{ usage.summary.disk_gb_hours|floatformat:2 }}
Tenant,VCPUs,RamMB,DiskGB,Usage(Hours)
{% for u in usage.usage_list %}{{ u.tenant_id|addslashes }},{{ u.vcpus|addslashes }},{{ u.memory_mb|addslashes }},{{u.local_gb|addslashes }},{{ u.vcpu_hours|floatformat:2}}

Can't render this file because it contains an unexpected character in line 1 and column 46.

6
openstack_dashboard/dashboards/project/overview/templates/overview/usage.csv
View File

@ -1,11 +1,11 @@
Usage Report For Period:,{{ usage.start|date:"b. d Y" }},{{ usage.end|date:"b. d Y" }}
Tenant ID:,{{ usage.tenant_id }}
Total Active VCPUs:,{{ usage.summary.instances }}
CPU-HRs Used:,{{ usage.summary.vcpu_hours }}
CPU-HRs Used:,{{ usage.summary.vcpu_hours|floatformat:2 }}
Total Active Ram (MB):,{{ usage.summary.memory_mb }}
Total Disk Size:,{{ usage.summary.local_gb }}
Total Disk Usage:,{{ usage.summary.disk_gb_hours }}
Total Disk Usage:,{{ usage.summary.disk_gb_hours|floatformat:2 }}
Name,VCPUs,RamMB,DiskGB,Usage(Hours),Uptime(Seconds),State
{% for s in usage.get_instances %}{{ s.name|addslashes }},{{ s.vcpus|addslashes }},{{ s.memory_mb|addslashes }},{{ s.local_gb|addslashes }},{{ s.hours }},{{ s.uptime }},{{ s.state|capfirst|addslashes }}
{% for s in usage.get_instances %}{{ s.name|addslashes }},{{ s.vcpus|addslashes }},{{ s.memory_mb|addslashes }},{{s.local_gb|addslashes }},{{ s.hours|floatformat:2 }},{{ s.uptime }},{{ s.state|capfirst|addslashes }}
{% endfor %}

Can't render this file because it contains an unexpected character in line 1 and column 46.