From 9a9cee57684b5d60cead1ffb35b341c4efe9d44c Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Wed, 29 Apr 2015 16:07:54 +0200
Subject: [PATCH] view neuigekit meeting

---
 app/models/meeting.rb                   | 5 +++++
 app/views/neuigkeiten/_compact.html.erb | 8 +++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/models/meeting.rb b/app/models/meeting.rb
index 425ad71..164df14 100644
--- a/app/models/meeting.rb
+++ b/app/models/meeting.rb
@@ -46,6 +46,11 @@ class Meeting < ActiveRecord::Base
     n.save    
     self.neuigkeit= n
     end
+  end
+  def update_announcement
+      n=self.neuigkeit
+      n.title=self.text
+      n.save
     
   end
   def fix_calentry
diff --git a/app/views/neuigkeiten/_compact.html.erb b/app/views/neuigkeiten/_compact.html.erb
index e5fcac7..be5b2a5 100644
--- a/app/views/neuigkeiten/_compact.html.erb
+++ b/app/views/neuigkeiten/_compact.html.erb
@@ -7,7 +7,7 @@
   <div class="media-body">
     <div>
       <small><%= ff_icon(neuigkeit.rubrik.icon) unless neuigkeit.rubrik.icon.nil? or neuigkeit.rubrik.icon.empty? %>&nbsp;<span><%= neuigkeit.rubrik.name %></span></small> 
-      <% unless neuigkeit.has_calentries? %> <small class="pull-right"><% unless neuigkeit.try(:datum).try(:to_date).nil? %> 
+      <% unless neuigkeit.has_calentries? || neuigkeit.has_meeting? %> <small class="pull-right"><% unless neuigkeit.try(:datum).try(:to_date).nil? %> 
 	<%= I18n.t("neuigkeit.am") %>
 	<span  datetime="<%= neuigkeit.try(:datum).to_formatted_s(:iso8601) unless neuigkeit.try(:datum).nil? %>"> <%= I18n.l(neuigkeit.try(:datum).try(:to_date))%> </span>  
 	<% end %> </small> <% else %>  <% end %>
@@ -22,6 +22,12 @@
     <%= fa_icon("calendar 2x")  %>
     <%= neuigkeit.relevant_calentry.text %>
   </div>
+  <% elsif neuigkeit.has_meeting? %>
+  <div class="pull-right" href="#">
+    <%= fa_icon("calendar 2x")  %>
+    <%= neuigkeit.meeting.calentry.text %>
+  </div>
+
   <% end %>
 
 </div>