Re-activate Gender field + chart

app/controllers/statistics_controller.rb

@@ -74,6 +74,7 @@ def statistics_inactive_users
   def statistics_demographics
     @members = current_organization.members
     @age_counts = age_counts
+    @gender_counts = gender_counts
   end
 
   def statistics_last_login
@@ -168,4 +169,16 @@ def age_counts
       counts[age_label] += 1
     end
   end
+
+  def gender_counts
+    @members.each_with_object(Hash.new(0)) do |member, counts|
+      gender = member.user_gender
+      gender_label = if gender.present?
+        t("simple_form.options.user.gender.#{gender}")
+      else
+        t("statistics.statistics_demographics.unknown")
+      end
+      counts[gender_label] += 1
+    end
+  end
 end

app/helpers/users_helper.rb

@@ -1,4 +1,8 @@
 module UsersHelper
+  def genders_collection
+    User::GENDERS.map(&:to_sym)
+  end
+
   def phone_to(phone)
     link_to phone, "tel://#{phone}"
   end

app/models/user.rb

@@ -3,7 +3,6 @@ class User < ActiveRecord::Base
 
   devise *[
     :database_authenticatable,
-    # :registerable,
     :recoverable,
     :rememberable,
     :confirmable,
@@ -12,7 +11,12 @@ class User < ActiveRecord::Base
     :timeoutable
   ]
 
-  GENDERS = %w[male female]
+  GENDERS = %w(
+    female
+    male
+    other
+    prefer_not_to_answer
+  )
 
   attr_accessor :empty_email
 
@@ -38,6 +42,7 @@ class User < ActiveRecord::Base
   # emails like 'without email'
   validates_format_of :email,
                       with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i
+  validates :gender, inclusion: { in: GENDERS, allow_blank: true }
 
   def as_member_of(organization)
     organization && members.find_by(organization: organization)

app/views/statistics/statistics_demographics.html.erb

@@ -3,22 +3,15 @@
 </h1>
 <div class="panel panel-default">
   <div class="panel-body">
-    <div id="pie"></div>
+    <div id="pie-ages"></div>
+    <div id="pie-gender"></div>
   </div>
 </div>
 
 <script type="text/javascript">
-
   $(function () {
-    // Demograficos
-    // Por edades
     var ages = <%= raw @age_counts.to_a.to_json %>;
-    $('#pie').highcharts({
-      chart: {
-        plotBackgroundColor: null,
-        plotBorderWidth: null,
-        plotShadow: false
-      },
+    $('#pie-ages').highcharts({
       title: {
         text: "<%= t '.by_ages' %>"
       },
@@ -43,5 +36,32 @@
         data: ages
       }]
     });
+
+    var genders = <%= raw @gender_counts.to_a.to_json %>;
+    $('#pie-gender').highcharts({
+      title: {
+        text: "<%= t '.by_gender' %>"
+      },
+      tooltip: {
+        pointFormat: '{series.name}: <b>{point.y}</b>'
+      },
+      plotOptions: {
+        pie: {
+          allowPointSelect: true,
+          cursor: 'pointer',
+          dataLabels: {
+            enabled: true,
+            color: '#000000',
+            connectorColor: '#000000',
+            format: '<b>{point.name}</b>: {point.percentage:.1f} %'
+          }
+        }
+      },
+      series: [{
+        type: 'pie',
+        name: '<%= t '.num_people' %>',
+        data: genders
+      }]
+    });
   });
 </script>

app/views/users/_form.html.erb

@@ -14,6 +14,7 @@
 
     <%= f.input :phone %>
     <%= f.input :alt_phone %>
+    <%= f.input :gender, collection: genders_collection %>
     <%= f.input :date_of_birth,
                 start_year: Date.today.year - 90,
                 end_year: Date.today.year - 12,

config/locales/ca.yml

@@ -435,6 +435,8 @@ ca:
         gender:
           female: Dona
           male: Home
+          other: Altre
+          prefer_not_to_answer: Prefereixo no contestar
     required:
       mark: "*"
       text: required

config/locales/en.yml

@@ -435,6 +435,8 @@ en:
         gender:
           female: Female
           male: Male
+          other: Other
+          prefer_not_to_answer: I prefer not to answer
     required:
       mark: "*"
       text: required

config/locales/es.yml

@@ -435,6 +435,8 @@ es:
         gender:
           female: Mujer
           male: Hombre
+          other: Otro
+          prefer_not_to_answer: Prefiero no contestar
     required:
       mark: "*"
       text: necesario

config/locales/eu.yml

@@ -441,6 +441,8 @@ eu:
         gender:
           female: Emakumea
           male: Gizona
+          other:
+          prefer_not_to_answer:
     required:
       mark: "*"
       text: Beharrezkoa

config/locales/gl.yml

@@ -435,6 +435,8 @@ gl:
         gender:
           female: Muller
           male: Home
+          other:
+          prefer_not_to_answer:
     required:
       mark: "*"
       text: esixido

config/locales/pt-BR.yml

@@ -435,6 +435,8 @@ pt-BR:
         gender:
           female: Mulher
           male: Homem
+          other:
+          prefer_not_to_answer:
     required:
       mark: "*"
       text: Necessário

spec/models/user_spec.rb

@@ -17,6 +17,8 @@
 
   it { is_expected.to validate_presence_of :username }
 
+  it { is_expected.to validate_inclusion_of(:gender).in_array(User::GENDERS) }
+
   describe "#setup_and_save_user" do
     it "sets a fake email before attempting to save user" do
       user = Fabricate.build(:user, email: "")