Merge branch 'dev' into 320_Picture_Upload

hpi-swt2 · Feb 4, 2017 · 690db32 · 690db32
2 parents d8673c6 + fa73d5e
commit 690db32
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/app/assets/stylesheets/events.css b/app/assets/stylesheets/events.css
@@ -48,9 +48,6 @@
     margin: 15px 0;
     padding-bottom: 15px;
 }
-.event-preview.event-past {
-    opacity: 0.7;
-}
 .front-section:nth-child(even) .event-preview {
     border-bottom: 1px solid rgba(255, 255, 255, 0.3);
 }
@@ -108,4 +105,4 @@
     width: 100%;
     height: 150px;
     margin-bottom: 15px;
-}
+}
diff --git a/app/views/events/_event.html.erb b/app/views/events/_event.html.erb
@@ -1,4 +1,4 @@
-<div class="event-preview media <%= 'event-past' if event.is_past %> clearfix">
+<div class="event-preview media clearfix">
   <%= image_tag event.image_url(:list_view), class: "img-rounded img-responsive img-float-corner-tr center-block" if event.image_url%>
   <div class="media-left">
     <%= render "events/event_date_large", event: event %>

diff --git a/db/sample_data.rb b/db/sample_data.rb
@@ -10,12 +10,15 @@ def add_sample_data
 
   events[:programmierkurs] = event_programmierkurs
   events[:mintcamp] = event_mintcamp
-  events[:bechersaeuberungsevent] = event_bechersaeuberungsevent
   events[:gongakrobatik] = event_gongakrobatik
   events[:batterie_akustik] = event_batterie_akustik
   events[:bachlorpodium] = event_bachlorpodium
   events[:past_deadline_event] = event_gongakrobatik
 
+  # past events are not valid by definition, however we
+  # would like to pretend to have some old ones
+  event_bechersaeuberungsevent.save!(validate: false)
+
   users = Hash.new
   users[:pupil] = user_pupil
   users[:teacher] = user_teacher

diff --git a/db/sample_data/events.rb b/db/sample_data/events.rb
@@ -40,18 +40,19 @@ def event_mintcamp
 end
 
 def event_bechersaeuberungsevent
-  date_range_singleday = DateRange.create!(
-      start_date: Date.new(2017, 04, 04),
-      end_date: Date.new(2017, 04, 05)
+  date_range_singleday = DateRange.new(
+      start_date: Date.yesterday,
+      end_date: Date.yesterday
   )
+  date_range_singleday.save!(validate: false)
   Event.new(
       name: 'Bechersäuberungsevent',
       description: 'Es dreht sich den ganzen Tag um das Säubern von Bechern. Wie säubert man einen Becher am effizientesten oder am schnellsten? Wie immer bieten wir eine Reihe an Expertenvorträgen an. Dieses Mal erfahrt ihr unter anderem wie ihr Edding-Markierungen selbst nach einer Spülmaschinen-Reinigung noch entfernen könnt oder wie man die richtige Größe für Becher-Stapel herausfindet und anwendet.',
       max_participants: 25,
       organizer: 'FSR',
       knowledge_level: 'Anfänger',
       date_ranges: [date_range_singleday],
-      application_deadline: Date.tomorrow,
+      application_deadline: Date.yesterday.prev_day(2),
       published: true,
       hidden: false,
       custom_application_fields: ['Lieblings-Becherart', 'Kannst du eine eigene Spülmaschine mitbringen?']