Changeset 82832

Timestamp:

08/20/11 18:30:43 (4 years ago)

Author:

derek@…

Message:

• Use month name and year as hash table key rather than first day of the month

• When iterating over the past 12 months count away from current month rather than towards it.

File:

• branches/gsoc11-statistics/stats-server/app/controllers/ports_controller.rb (modified) (4 diffs)

branches/gsoc11-statistics/stats-server/app/controllers/ports_controller.rb

@@ -18 +18 @@
   def populate_monthly_versions(chart_name, chart)
     chart.string "Month"
-    
+      
     # Add version columns
     column_order = []
@@ -82 +82 @@
     now = Time.now
     now_d = now.to_date
-    month_range = (0..11)
-        
-    for i in month_range
+    
+    # Iterate over months from 11 months ago to 0 months ago (current month)
+    11.downto(0) do |i|
       month = now.months_ago(i).to_date
       
@@ -104 +104 @@
     end
     
-    key = month.at_beginning_of_month.to_s
+    # Key is the abbreviated month name and the year (eg: Aug 2011)
+    key = month.to_time.strftime("%b %Y")
     monthly_installs[key] = entries.size
   end
@@ -114 +115 @@
       version_entries = entries.where("version = ?", version)
       
-      key = month.at_beginning_of_month.to_s
+      # Key is the abbreviated month name and the year (eg: Aug 2011)
+      key = month.to_time.strftime("%b %Y")
       
       if monthly_versions[key].nil?