diff --git a/src/view/admin/package.rb b/src/view/admin/package.rb index 4a7af10..04aa8f6 100644 --- a/src/view/admin/package.rb +++ b/src/view/admin/package.rb @@ -95,6 +95,7 @@ class Parts < HtmlGrid::List SORT_HEADER = false input_text :multi, :count, :commercial_form, :measure def add(model) + $stdout.puts "admin: Parts: add #{model.inspect}" link = HtmlGrid::Link.new(:plus, model, @session, self) link.set_attribute('title', @lookandfeel.lookup(:create_part)) link.css_class = 'create square' @@ -367,6 +368,7 @@ class RootPackageComposite < View::Admin::PackageComposite [0,2] => 'subheading', } def init + $stdout.puts "admin: RootPackageComposite: init #{model.inspect}" unless @model.is_a?(Persistence::CreateItem) components.update( [0,2] => :parts, @@ -379,10 +381,12 @@ class RootPackageComposite < View::Admin::PackageComposite super end def parts(model) + $stdout.puts "admin: parts: model #{model.inspect}" key = (parts = model.parts and parts.size > 1) ? :parts : :package_and_substances @lookandfeel.lookup(key) end def parts_form(model) + $stdout.puts "admin: parts_form: model #{model.inspect}" Parts.new(model.parts, @session, self) end def hidden_fields(context) diff --git a/src/view/drugs/package.rb b/src/view/drugs/package.rb index f1950a8..edef952 100644 --- a/src/view/drugs/package.rb +++ b/src/view/drugs/package.rb @@ -21,6 +21,7 @@ class CompositionList < HtmlGrid::DivList OFFSET_STEP = [1,0] OMIT_HEADER = true def composition(model) + $stdout.puts "Package: composition #{model.inspect}" div = HtmlGrid::Div.new(model, @session, self) div.css_class = 'galenic-form' size = part_size(model) @@ -28,6 +29,7 @@ class CompositionList < HtmlGrid::DivList size = "#{label}) #{size}" end div.value = size + $stdout.puts "Package: div.value #{div.value.inspect}" [ div, View::Admin::ActiveAgents.new(model.active_agents, @session, self)] end end @@ -101,6 +103,7 @@ class PackageInnerComposite < HtmlGrid::Composite :expiration_date => HtmlGrid::DateValue, } def init + $stdout.puts "PackageInnerComposite narcotic? #{@model.narcotic?} #{@model.inspect}" if(@model.narcotic?) components.update( [2,12] => :narcotic_label, @@ -223,6 +226,7 @@ class PackageInnerComposite < HtmlGrid::Composite text end def most_precise_dose(model, session=@session) + $stdout.puts "most_precise_dose: #{model.inspect}" HtmlGrid::Value.new(:most_precise_dose, model, session, self) end def name(model, session=@session) @@ -278,7 +282,10 @@ class PackageComposite < HtmlGrid::Composite } DEFAULT_CLASS = HtmlGrid::Value def init + $stdout.puts "PackageComposite: seq #{@model.sequence.inspect}" + $stdout.flush if seq = @model.sequence and div = seq.division and !div.empty? + $stdout.puts "seq for #{@model.sequence.name_base} div #{div.inspect} empty? #{div.empty?}" components.store [0,4], 'division' components.store [0,5], :division components.store [0,6], 'th_part' @@ -301,6 +308,7 @@ class PackageComposite < HtmlGrid::Composite super end def compositions(model, session=@session) + $stdout.puts "compositions: #{model.compositions.inspect}" View::Admin::Compositions.new(model.compositions, @session, self) end def division(model, session) @@ -308,15 +316,20 @@ class PackageComposite < HtmlGrid::Composite if sequence = model.sequence division = sequence.division end + $stdout.puts "division: #{division.inspect}" View::Drugs::DivisionComposite.new(division, session, self) end def package_name(model, session) + $stdout.puts "package_name: #{model.name}" [model.name, model.size].compact.join(' - ') end def parts(model, session=@session) + $stdout.puts "PackageComposite: parts #{model.parts.inspect}" + $stdout.flush View::Drugs::Parts.new(model.parts, @session, self) end def source(model, session=@session) + $stdout.puts "source: #{model.inspect}" val = HtmlGrid::Value.new(:source, model, @session, self) val.value = package_source(model) if model val @@ -331,6 +344,9 @@ class Package < PrivateTemplate base = @model.name_base size = comparable_size(@model) fullname = sprintf("%s, %s", base, size) + $stdout.puts "Package: base #{base.inspect} size #{size.inspect} fullname #{fullname}" + $stdout.puts "Package: @model.indication #{@model.indication.inspect}" + $stdout.flush res = super << context.meta('name' => 'title', 'content' => fullname) if ind = @model.indication res << context.meta('name' => 'description', diff --git a/src/view/drugs/resultlist.rb b/src/view/drugs/resultlist.rb index ccb7dbc..8673140 100644 --- a/src/view/drugs/resultlist.rb +++ b/src/view/drugs/resultlist.rb @@ -352,6 +352,7 @@ class ResultList < HtmlGrid::List link end def galenic_form(model, session=@session) + $stdout.puts "galenic_form #{model.inspect}" lang = @session.language model.galenic_forms.collect { |gf| gf.send lang }.compact.join(' / ') end