diff --git a/app/stats.rb b/app/stats.rb index e99dba2c..47a858a4 100644 --- a/app/stats.rb +++ b/app/stats.rb @@ -76,12 +76,12 @@ get '/stats/?' do ) @stats[:poverty_threshold] = 11_945 - @stats[:poverty_threshold_percent] = (@stats[:monthly_revenue].to_f / (@stats[:poverty_threshold] + @stats[:expenses])) * 100 + @stats[:poverty_threshold_percent] = (@stats[:monthly_revenue].to_f / ((@stats[:poverty_threshold]/12) + @stats[:expenses])) * 100 # http://en.wikipedia.org/wiki/Poverty_threshold @stats[:average_developer_salary] = 93_280.00 # google "average developer salary" - @stats[:percent_until_developer_salary] = (@stats[:monthly_revenue].to_f / (@stats[:average_developer_salary] + @stats[:expenses])) * 100 + @stats[:percent_until_developer_salary] = (@stats[:monthly_revenue].to_f / ((@stats[:average_developer_salary]/12) + @stats[:expenses])) * 100 erb :'stats' end \ No newline at end of file diff --git a/views/stats.erb b/views/stats.erb index 4311b52c..0c53406d 100644 --- a/views/stats.erb +++ b/views/stats.erb @@ -106,13 +106,13 @@
Neocities earnings rise above US poverty threshold:
-<%= format '%.2f', @stats[:poverty_threshold_percent] %>% of goal ($<%= format('%.2f', @stats[:monthly_revenue]) %> / $<%= format('%.2f', @stats[:poverty_threshold]) %> + $<%= @stats[:expenses] %>)
+<%= format '%.2f', @stats[:poverty_threshold_percent] %>% of goal ($<%= format('%.2f', @stats[:monthly_revenue]) %> / ($<%= format('%.2f', @stats[:poverty_threshold]) %> / 12 months + $<%= @stats[:expenses] %>)) * 100
Neocities earns average US developer salary:
-<%= format '%.2f', @stats[:percent_until_developer_salary] %>% of goal ($<%= format('%.2f', @stats[:monthly_revenue]) %> / $<%= format('%.2f', @stats[:average_developer_salary]) %> + $<%= @stats[:expenses] %>)
+<%= format '%.2f', @stats[:percent_until_developer_salary] %>% of goal ($<%= format('%.2f', @stats[:monthly_revenue]) %> / ($<%= format('%.2f', @stats[:average_developer_salary]) %> / 12 months + $<%= @stats[:expenses] %>)) * 100