diff --git a/src/util/resultsort.rb b/src/util/resultsort.rb index 67e60a9c6..1f2b16b8f 100644 --- a/src/util/resultsort.rb +++ b/src/util/resultsort.rb @@ -51,16 +51,6 @@ def sort_result(packages, session) package.comparable_size, ] } - if false # only for debug purposes - id = 0 - packages.each{ - |package| - id += 1 - classify_package(package, session) - gal_name = package.galenic_forms.collect { |gf| galform_str(gf, session) } - puts "id #{sprintf('%3d', id)}: #{package.barcode} expired? #{package.expired?.inspect[0..2]} out_of_trade #{package.out_of_trade.inspect[0..2]} priorize #{@priorize_desitin.to_s[0..3]} #{@priority} (#{package.generic_type.inspect[0..2]}/#{package.sl_generic_type.inspect[0..2]}) '#{package.name_base.to_s}' gal_name #{gal_name} name #{@name_to_use.inspect}" - } - end packages rescue StandardError => e puts e.class diff --git a/src/view/additional_information.rb b/src/view/additional_information.rb index 78f0c7079..11d0de958 100644 --- a/src/view/additional_information.rb +++ b/src/view/additional_information.rb @@ -262,7 +262,9 @@ def ikscat(model, session=@session) catstr = @lookandfeel.lookup(:lppv) text_elements.push(catstr) end - if(gt = model.sl_generic_type) + # keep it sync with src/view/ajax/swissmedic_cat.rb! + # possible values are [nil, :generic, :original, :phytotherapy, :anthroposophy, :vaccine] + if (gt = model.sl_generic_type) and [:generic, :original].index(gt) text_elements.push(@lookandfeel.lookup("sl_#{gt}_short")) end txt.value = text_elements.join(' / ') diff --git a/src/view/ajax/swissmedic_cat.rb b/src/view/ajax/swissmedic_cat.rb index 42b9f5cdb..149f66334 100644 --- a/src/view/ajax/swissmedic_cat.rb +++ b/src/view/ajax/swissmedic_cat.rb @@ -43,7 +43,9 @@ def reorganize_components end y += 1 end - if(gt = @model.sl_generic_type) + # keep it sync with src/view/additional_information.rb:! + # possible values are [nil, :generic, :original, :phytotherapy, :anthroposophy, :vaccine] + if(gt = @model.sl_generic_type and [:generic, :original].index(gt)) @components.store([0,y], "sl_#{gt}_short") @components.store([1,y], "sl_#{gt}") y += 1