Browse Source

feat: only show editable duplicate sets for user and org

pull/2027/head
natdeanlewissoftwire 1 year ago
parent
commit
84a1ac4ea6
  1. 19
      app/models/organisation.rb
  2. 18
      app/models/user.rb

19
app/models/organisation.rb

@ -133,14 +133,23 @@ class Organisation < ApplicationRecord
:active
end
def duplicate_lettings_logs_sets
lettings_logs.duplicate_sets.map { |array_str| array_str ? array_str.map(&:to_i) : [] }
def editable_duplicate_lettings_logs_sets
all_sets = lettings_logs.duplicate_sets.map { |array_str| array_str ? array_str.map(&:to_i) : [] }
editable_sets = []
all_sets.each do |set|
editable_sets << set if LettingsLog.find(set.first).collection_period_open_for_editing?
end
editable_sets
end
def duplicate_sales_logs_sets
sales_logs.duplicate_sets.map { |array_str| array_str ? array_str.map(&:to_i) : [] }
def editable_duplicate_sales_logs_sets
all_sets = sales_logs.duplicate_sets.map { |array_str| array_str ? array_str.map(&:to_i) : [] }
editable_sets = []
all_sets.each do |set|
editable_sets << set if SalesLog.find(set.first).collection_period_open_for_editing?
end
editable_sets
end
def recently_absorbed_organisations_grouped_by_merge_date
return unless absorbed_organisations.present? && absorbed_organisations.merged_during_open_collection_period.present?

18
app/models/user.rb

@ -203,12 +203,22 @@ class User < ApplicationRecord
super && active?
end
def duplicate_lettings_logs_sets
lettings_logs.duplicate_sets(id).map { |array_str| array_str ? array_str.map(&:to_i) : [] }
def editable_duplicate_lettings_logs_sets
all_sets = lettings_logs.duplicate_sets(id).map { |array_str| array_str ? array_str.map(&:to_i) : [] }
editable_sets = []
all_sets.each do |set|
editable_sets << set if LettingsLog.find(set.first).collection_period_open_for_editing?
end
editable_sets
end
def duplicate_sales_logs_sets
sales_logs.duplicate_sets(id).map { |array_str| array_str ? array_str.map(&:to_i) : [] }
def editable_duplicate_sales_logs_sets
all_sets = sales_logs.duplicate_sets(id).map { |array_str| array_str ? array_str.map(&:to_i) : [] }
editable_sets = []
all_sets.each do |set|
editable_sets << set if SalesLog.find(set.first).collection_period_open_for_editing?
end
editable_sets
end
protected

Loading…
Cancel
Save