From 3bd04f9101b4ac7a0e69d3c660720c24e2384d29 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sun, 25 Aug 2013 16:37:59 +0200
Subject: [PATCH] Gremien, Memberships Update

---
 app/models/gremium.rb                               | 10 +++++++++-
 app/models/membership.rb                            |  1 +
 app/views/fetprofiles/_form.html.erb                |  4 ++--
 app/views/fetprofiles/show.html.erb                 |  5 +++--
 app/views/gremien/_form.html.erb                    |  4 +++-
 app/views/gremien/show.html.erb                     |  4 ++--
 app/views/memberships/_form.html.erb                |  2 +-
 app/views/memberships/_membership.html.erb          |  6 ++++++
 db/migrate/20130825141030_add_columns_to_gremien.rb |  6 ++++++
 9 files changed, 33 insertions(+), 9 deletions(-)
 create mode 100644 app/views/memberships/_membership.html.erb
 create mode 100644 db/migrate/20130825141030_add_columns_to_gremien.rb

diff --git a/app/models/gremium.rb b/app/models/gremium.rb
index 2b0d20b..fbebb9b 100644
--- a/app/models/gremium.rb
+++ b/app/models/gremium.rb
@@ -11,6 +11,14 @@
 #
 
 class Gremium < ActiveRecord::Base
-  attr_accessible :desc, :name, :typ
+  TYPEN={1=>"offiziell"}
+  GESCHLECHT={0=>"s&aumlchlich", 1 => "m&aumlnnlich", 2 => "weiblich"}
+  ART2FALL={0=>"des", 1=>"des",2=>"der"}
+  attr_accessible :desc, :name, :typ, :geschlecht,:thema_id
   has_many :memberships
+  belongs_to :thema
+  def fall2
+  Gremium::ART2FALL[self.geschlecht.to_i].to_s+" "+ self.name.to_s+ ((self.geschlecht.to_i==1||self.geschlecht.to_i==0)? "s":"") 
+  end
+  
 end
diff --git a/app/models/membership.rb b/app/models/membership.rb
index ad17ee4..dab0a78 100644
--- a/app/models/membership.rb
+++ b/app/models/membership.rb
@@ -13,6 +13,7 @@
 #
 
 class Membership < ActiveRecord::Base
+  TYPEN={1=>"Mitglied",2=> "Ersatzmitglied",3=>"VerantwortlicheR"}
   attr_accessible :fetprofile_id, :gremium_id, :start, :stop, :typ
   belongs_to :fetprofile
   belongs_to :gremium
diff --git a/app/views/fetprofiles/_form.html.erb b/app/views/fetprofiles/_form.html.erb
index 034eb5e..3df54ea 100644
--- a/app/views/fetprofiles/_form.html.erb
+++ b/app/views/fetprofiles/_form.html.erb
@@ -22,10 +22,10 @@
   <div class="row-fluid">
 	   <div class="span1"></div>
 	
-   <div class="span3"><%= membership.input :start, :as=>:date %></div>
+  <div class="span3"><%= membership.input :start, :as=>:date %></div>
   <div class="span3"><%= membership.input :stop %></div>
   <div class="span3"><%= membership. input :gremium %></div>
-  <div class="span2"><%= membership.input :typ ,:as=>:radio, :collection=>{"mitglied"=>1, "ersatzmitglied"=>2} %></div>
+  <div class="span2"><%= membership.input :typ ,:as=>:radio, :collection=>Membership::TYPEN.invert %></div>
 
   </div>  <% end %>
   <% end %>
diff --git a/app/views/fetprofiles/show.html.erb b/app/views/fetprofiles/show.html.erb
index b4e17fc..8fbfbf9 100644
--- a/app/views/fetprofiles/show.html.erb
+++ b/app/views/fetprofiles/show.html.erb
@@ -24,8 +24,9 @@
 	  <div class="span12">
 <ul>
 	<% @fetprofile.memberships.each do |m| %>
-		<li><%= m.start.to_s %> bis <%= m.stop.to_s %> in <%= m.gremium.try(:name).to_s %>
-		<%= link_to 'edit', edit_fetprofile_membership_path(@fetprofile,m) %>
+		<li>
+<%= render m %>
+<% link_to 'edit', edit_fetprofile_membership_path(@fetprofile,m) %>
 		</li>
 	<% end %>
 </ul>
diff --git a/app/views/gremien/_form.html.erb b/app/views/gremien/_form.html.erb
index 5387d3b..ca48368 100644
--- a/app/views/gremien/_form.html.erb
+++ b/app/views/gremien/_form.html.erb
@@ -2,7 +2,9 @@
   <%= f.inputs do %>
     <%= f.input :name %>
     <%= f.input :desc %>
-    <%= f.input :typ %>
+    <%= f.input :typ, :as => :select, :collection => Gremium::TYPEN.invert %>
+    <%= f.input :geschlecht, :as => :select, :collection => Gremium::GESCHLECHT.invert %>
+    <%= f.input :thema, :as=> :select, :collection => Thema.all %>
   <% end %>
 
   <%= f.actions do %>
diff --git a/app/views/gremien/show.html.erb b/app/views/gremien/show.html.erb
index 4e8d5e7..11a5ad3 100644
--- a/app/views/gremien/show.html.erb
+++ b/app/views/gremien/show.html.erb
@@ -12,9 +12,9 @@
 
 <p>
   <b>Typ:</b>
-  <%= @gremium.typ %>
+  <%= Gremium::TYPEN[@gremium.typ.to_i].to_s %>
 </p>
 
 
 <%= link_to 'Edit', edit_gremium_path(@gremium) %> |
-<%= link_to 'Back', gremien_path %>
+<%=  link_to 'Back', gremien_path %>
diff --git a/app/views/memberships/_form.html.erb b/app/views/memberships/_form.html.erb
index 057e82e..252f116 100644
--- a/app/views/memberships/_form.html.erb
+++ b/app/views/memberships/_form.html.erb
@@ -3,7 +3,7 @@
     <%= f.input :gremium, :as=>:radio %>
     <%= f.input :start %>
     <%= f.input :stop %>
-    <%= f.input :typ ,:as=>:radio, :collection=>{"mitglied"=>1, "ersatzmitglied"=>2} %>
+    <%= f.input :typ ,:as=>:radio,:collection=>Membership::TYPEN.invert %>
   <% end %>
 
   <%= f.actions do %>
diff --git a/app/views/memberships/_membership.html.erb b/app/views/memberships/_membership.html.erb
new file mode 100644
index 0000000..858f8d3
--- /dev/null
+++ b/app/views/memberships/_membership.html.erb
@@ -0,0 +1,6 @@
+
+<%= "seit" if membership.stop.nil? %>
+<%=membership.start.to_s %> 
+<%= " bis "+membership.stop.to_s unless membership.stop.nil? %> 
+<%= Membership::TYPEN[membership.typ.to_i] %>  
+<%= membership.gremium.fall2 %>
diff --git a/db/migrate/20130825141030_add_columns_to_gremien.rb b/db/migrate/20130825141030_add_columns_to_gremien.rb
new file mode 100644
index 0000000..d10c212
--- /dev/null
+++ b/db/migrate/20130825141030_add_columns_to_gremien.rb
@@ -0,0 +1,6 @@
+class AddColumnsToGremien < ActiveRecord::Migration
+  def change
+    add_column :gremien, :geschlecht, :string
+    add_column :gremien, :thema_id, :integer
+  end
+end