andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

Profile +geschlecht

Browse Source
This commit is contained in:
Andreas Stephanides
2014-06-04 18:59:18 +05:30
parent 3aacb1642f
commit e34aefd603
5 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/fetprofile.rb
View File

@@ -15,7 +15,7 @@
# #
class Fetprofile < ActiveRecord::Base 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 :memberships, dependent: :delete_all
has_many :gremien, :through=> :membership has_many :gremien, :through=> :membership
mount_uploader :picture, PictureUploader mount_uploader :picture, PictureUploader
@@ -24,6 +24,7 @@ validates :desc, :presence=>true
validates :nachname, length:{minimum: 3},:presence=>true validates :nachname, length:{minimum: 3},:presence=>true
validates :vorname, length:{minimum: 3},:presence=>true validates :vorname, length:{minimum: 3},:presence=>true
validate :validate_birthday validate :validate_birthday
GESCHLECHT={0=>"gendered", 1=>"maennlich", 2=>"weiblich"}
has_many :users has_many :users
scope :search, ->(query) {where("nachname like ? or vorname like ? or short like ?", "%#{query}%", "%#{query}%", "%#{query}%")} scope :search, ->(query) {where("nachname like ? or vorname like ? or short like ?", "%#{query}%", "%#{query}%", "%#{query}%")}

1
app/models/membership.rb
View File

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

2
app/views/fetprofiles/_form.html.erb
View File

@@ -15,7 +15,7 @@
</div> </div>
</div> </div>
<div class="row-fluid"> <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"> <div class="span4">
<%= image_tag(@fetprofile.picture.thumb.url) unless @fetprofile.picture.nil? %> <%= image_tag(@fetprofile.picture.thumb.url) unless @fetprofile.picture.nil? %>
<%= f.file_field :picture %> <%= f.file_field :picture %>

2
app/views/memberships/_membership.html.erb
View File

@@ -2,5 +2,5 @@
<%= membership.stop.nil? ? "seit " : "von " %> <%= membership.stop.nil? ? "seit " : "von " %>
<%=membership.start.to_s %> <%=membership.start.to_s %>
<%= " bis "+membership.stop.to_s unless membership.stop.nil? %> <%= " 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 %> <%= membership.gremium.fall2 %>

5
db/migrate/20140603140147_add_sex_to_fetprofile.rb Normal file
View File

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