From b7c577d3b9220d93631e9505edec85b34d8ba5f2 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sun, 16 Feb 2014 15:34:33 +0100
Subject: [PATCH] calender eintrag im compact view

---
 app/models/calentry.rb                  | 5 +++--
 app/views/neuigkeiten/_compact.html.erb | 7 +++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/models/calentry.rb b/app/models/calentry.rb
index ae1aae9..1689d1d 100644
--- a/app/models/calentry.rb
+++ b/app/models/calentry.rb
@@ -21,7 +21,8 @@ class Calentry < ActiveRecord::Base
   validates :typ, :presence => true
   before_save :get_public
   belongs_to :object, polymorphic: true # Objekt zu dem der Calentry gehört (derzeit ein Newsartikel)
-  
+  scope :upcoming, ->{ where("start >= ?", Time.now).order(:start)}
+  scope :recent,-> {  where("start <= ?", Time.now).order(:start).reverse_order}
   validate do |entry|
     if entry.ende.nil? 
       errors.add(:ende, "Es muss ein Endzeitpunkt vorhanden sein")
@@ -61,5 +62,5 @@ def text
    I18n.l(self.start) +" bis "+ I18n.l(self.ende) 
 end
   scope :public, -> { where(:public => :true) } 
-  scope :upcoming, -> { where("start >= ?" , Time.now).where("start <= ?", 28.days.from_now) }
+ # scope :upcoming, -> { where("start >= ?" , Time.now).where("start <= ?", 28.days.from_now) }
 end
diff --git a/app/views/neuigkeiten/_compact.html.erb b/app/views/neuigkeiten/_compact.html.erb
index a6e8a3c..6a26ef0 100644
--- a/app/views/neuigkeiten/_compact.html.erb
+++ b/app/views/neuigkeiten/_compact.html.erb
@@ -17,8 +17,11 @@
 <% if neuigkeit.has_calentries? %>
     <div class="pull-right" href="#">
 <%= image_tag("/iconnavy/time.png")  %>
-
-     <%=  neuigkeit.calentries.first.text %>
+      <% unless neuigkeit.calentries.upcoming.empty? %>
+    <%=  neuigkeit.calentries.upcoming.first.text %>
+<% else unless neuigkeit.calentries.recent.empty? %>
+   <%=  neuigkeit.calentries.recent.first.text %>
+<% end %><% end %>
   </div>
     <% end %>