From 59568f34a8f13bf4d059e39f0b9bfd429327ebf7 Mon Sep 17 00:00:00 2001 From: Manuel Hoffmann Date: Thu, 31 Jul 2014 14:32:53 +0200 Subject: [PATCH] Added legacy predicate in order to distinguish between rich featured minutes and, well, legacy stuff. Closes #62 --- app/models/minutes/item.rb | 3 ++- app/models/minutes/minute.rb | 8 +++++++- app/models/minutes/plenum_minute.rb | 3 ++- app/views/minutes/minutes/show.html.haml | 6 ++++-- app/views/minutes/plenum_minutes/show.html.haml | 3 ++- 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/app/models/minutes/item.rb b/app/models/minutes/item.rb index 5f31c7c..2370d55 100644 --- a/app/models/minutes/item.rb +++ b/app/models/minutes/item.rb @@ -47,7 +47,8 @@ def move_down # and as second item 'approvement of previous minutes' # This methods enriches the stored items def full_order - offset = minute.type == nil ? 3 : 2 + #offset = minute.type == nil ? 3 : 2 + offset = minute.legacy? ? 1 : 3 order + offset end diff --git a/app/models/minutes/minute.rb b/app/models/minutes/minute.rb index 635f7e5..ccc95ee 100644 --- a/app/models/minutes/minute.rb +++ b/app/models/minutes/minute.rb @@ -53,10 +53,16 @@ class Minutes::Minute < ActiveRecord::Base # and as second item 'approvement of previous minutes' # This methods enriches the stored items by those two. def item_titles - ['Festlegung der Tagesordnung', 'Genehmigung von Protokollen'] + items.pluck(:title) + legacy? ? items.pluck(:title) : ['Festlegung der Tagesordnung', 'Genehmigung von Protokollen'] + items.pluck(:title) end validates_presence_of :chairperson_id validates_presence_of :keeper_of_the_minutes_id validates_presence_of :date + + # All minutes from a meeting before 06.06.2014 are considered legacy. + # These minutes have no default prefixes and this is schade. + def legacy? + date < Date.new(2014, 06, 06) + end end diff --git a/app/models/minutes/plenum_minute.rb b/app/models/minutes/plenum_minute.rb index 06acfa2..14f6626 100644 --- a/app/models/minutes/plenum_minute.rb +++ b/app/models/minutes/plenum_minute.rb @@ -24,6 +24,7 @@ class Minutes::PlenumMinute < Minutes::Minute def item_titles - ['Genehmigung von Protokollen'] + items.pluck(:title) + prefix = legacy? ? [] : ['Genehmigung von Protokollen'] + prefix + items.pluck(:title) end end diff --git a/app/views/minutes/minutes/show.html.haml b/app/views/minutes/minutes/show.html.haml index 20e9a6d..5303164 100644 --- a/app/views/minutes/minutes/show.html.haml +++ b/app/views/minutes/minutes/show.html.haml @@ -8,8 +8,10 @@ = render partial: 'meta' = render partial: 'toplist' -= render partial: 'minutes/items/agenda_item' -= render partial: 'approvements' +- unless @minutes_minute.legacy? + = render partial: 'minutes/items/agenda_item' + = render partial: 'approvements' + = render partial: "minutes/items/item", collection: @minutes_minute.items, as: :item diff --git a/app/views/minutes/plenum_minutes/show.html.haml b/app/views/minutes/plenum_minutes/show.html.haml index 51a0bd0..82c45ab 100644 --- a/app/views/minutes/plenum_minutes/show.html.haml +++ b/app/views/minutes/plenum_minutes/show.html.haml @@ -8,7 +8,8 @@ = render partial: 'meta' = render partial: 'toplist' -= render partial: 'minutes/items/agenda_item' +- unless @minutes_minute.legacy? + = render partial: 'minutes/items/agenda_item' = render partial: "minutes/items/item", collection: @minutes_minute.items, as: :item