Profile +geschlecht

app/models/fetprofile.rb

@@ -15,15 +15,16 @@
 #
 
 class Fetprofile < ActiveRecord::Base
-  attr_accessible :active, :desc, :fetmailalias, :nachname, :picture, :short, :vorname, :memberships_attributes, :remove_picture, :picture_cache, :plz, :street, :city, :instant,:skype, :telnr, :hdynr, :birth_day,:birth_month, :birth_year
+  attr_accessible :active, :desc, :fetmailalias, :nachname, :picture, :short, :vorname, :memberships_attributes, :remove_picture, :picture_cache, :plz, :street, :city, :instant,:skype, :telnr, :hdynr, :birth_day,:birth_month, :birth_year,:geschlecht
   has_many :memberships, dependent: :delete_all
   has_many :gremien, :through=> :membership
   mount_uploader :picture, PictureUploader
   has_paper_trail
-validates :desc, :presence=>true
+  validates :desc, :presence=>true
   validates :nachname, length:{minimum: 3},:presence=>true
   validates :vorname, length:{minimum: 3},:presence=>true
   validate :validate_birthday
+  GESCHLECHT={0=>"gendered", 1=>"maennlich", 2=>"weiblich"}
   has_many :users
   scope :search, ->(query) {where("nachname like ? or vorname like ? or short like ?", "%#{query}%", "%#{query}%", "%#{query}%")}
 

app/models/membership.rb

@@ -14,6 +14,7 @@
 
 class Membership < ActiveRecord::Base
   TYPEN={-2=>"VorsitzendeR", -1=>"stv VorsitzendeR", 0=>"2. stv VorsitzendeR", 1=>"Mitglied",2=> "Ersatzmitglied",3=>"VerantwortlicheR"}
+  TYPEN_g={0=>TYPEN, 1=>{ -2=>"Vorsitzender", -1=>"stv Vorsitzender", 0=>"2. stv Vorsitzender", 1=>"Mitglied",2=> "Ersatzmitglied",3=>"Verantwortlicher"},2=>{-2=>"Vorsitzende", -1=>"stv Vorsitzende", 0=>"2. stv Vorsitzende", 1=>"Mitglied",2=> "Ersatzmitglied",3=>"Verantwortliche"}}
   attr_accessible :fetprofile_id, :gremium_id, :start, :stop, :typ
   belongs_to :fetprofile
   belongs_to :gremium

app/views/fetprofiles/_form.html.erb

@@ -15,7 +15,7 @@
       </div>
     </div> 
     <div class="row-fluid">
-      <div class="span4"> <%= f.input :active %></div> 
+      <div class="span4"> <%= f.input :active %> <%= f.input :geschlecht,:as=>:select, :collection=>Fetprofile::GESCHLECHT.invert %></div> 
       <div class="span4">
 	<%= image_tag(@fetprofile.picture.thumb.url) unless @fetprofile.picture.nil? %>
 	<%= f.file_field :picture %>

app/views/memberships/_membership.html.erb

@@ -2,5 +2,5 @@
 <%= membership.stop.nil? ? "seit " : "von " %>
 <%=membership.start.to_s %> 
 <%= " bis "+membership.stop.to_s unless membership.stop.nil? %> 
-<%= Membership::TYPEN[membership.typ.to_i] %>  
+<%= Membership::TYPEN_g[membership.fetprofile.geschlecht.to_i][membership.typ.to_i] %>  
 <%= membership.gremium.fall2 %>

db/migrate/20140603140147_add_sex_to_fetprofile.rb

@@ -0,0 +1,5 @@
+class AddSexToFetprofile < ActiveRecord::Migration
+  def change
+    add_column :fetprofiles, :geschlecht, :integer
+  end
+end