Fix css. Remove debug output

src/view/admin/activeagent.rb

@@ -92,17 +92,14 @@ class RootActiveAgentComposite < View::Admin::ActiveAgentComposite
 	}
   def initialize(model, session, is_active_agent = true)
     @is_active_agent = is_active_agent
-    $stdout.puts "RootActiveAgentComposite.init @is_active_agent #{@is_active_agent}"
     super(model, session)
   end
   def active_agents(model, session=@session)
     agents = model.sequence.active_agents.find_all{|x| x.is_active_agent == @is_active_agent}
-    $stdout.puts "RootActiveAgentComposite active_agents @is_active_agent #{@is_active_agent} #{model.sequence.active_agents.size} agents #{agents.size}"
     RootSequenceAgents.new(agents, @session, self)
   end
   def source(model, session=@session)
     val = HtmlGrid::Value.new(:source, model, @session, self)
-    val.css_class = 'RootActiveAgentComposite-source'
     val.value = sequence_source(model.sequence) if model
     val
   end
@@ -111,7 +108,6 @@ class ActiveAgent < View::Drugs::PrivateTemplate
 	CONTENT = View::Admin::ActiveAgentComposite
 	SNAPBACK_EVENT = :result
   def initialize(agents, session, is_active_agent = true)
-    $stdout.puts "RootActiveAgentComposite.init is_active_agent #{is_active_agent}"
     super(agents, session, is_active_agent)
   end
 end

src/view/admin/sequence.rb

@@ -42,26 +42,22 @@ class ActiveAgents < HtmlGrid::List
   LEGACY_INTERFACE = false
   LABELS = false
   CSS_HEAD_MAP = {
-    [1,0] => 'right ActiveAgents-Head',
+    [1,0] => 'right',
   }
   CSS_MAP = {
-    [0,0] => 'list ActiveAgents',
-    [1,0] => 'list right ActiveAgents',
+    [0,0] => 'list',
+    [1,0] => 'list right',
   }
   def initialize(model, session, container = nil, is_active_agent = true)
     @is_active_agent = is_active_agent
-    $stdout.puts "View::Admin::ActiveAgents #{__LINE__}: initialize is_active_agent #{is_active_agent} model #{model.class} session #{session.class} container is #{container.class}"
     is_active_agent ? components.store([0,0], :substance) : components.store([0,0], :auxilliary)
-    $stdout.puts "View::Admin::ActiveAgents #{__LINE__}: components #{components}"
     super(model, session, container)
   end
   def th_substance
     value = @is_active_agent ?  @session.lookandfeel.lookup(:th_substances) : @session.lookandfeel.lookup(:th_auxilliary)
-    $stdout.puts "View::Admin::ActiveAgents #{__LINE__}: th_substance #{@is_active_agent} value #{value}"
     value
   end
   def compose_footer(offset)
-    $stdout.puts "View::Admin::ActiveAgents #{__LINE__}: compose_footer @is_active_agent #{@is_active_agent} offset #{offset}"
     return nil if @is_active_agent
     _compose_footer offset
   end
@@ -72,16 +68,15 @@ def _compose_footer(offset)
     input = galenic_form(comp)
     label = HtmlGrid::SimpleLabel.new(:galenic_form, input, @session, self)
     @grid.add [label, nil, input], *offset
-    @grid.add_style 'list ActiveAgents', *offset
-    @grid.add_style 'list right ActiveAgents', offset[0] + 1, offset[1]
+    @grid.add_style 'list', *offset
+    @grid.add_style 'list right', offset[0] + 1, offset[1]
     offset[1] += 1
     offset
   end
   def dose(model)
     model.dose.to_s if model
   end
   def galenic_form(model)
-    $stdout.puts "View::Admin::ActiveAgents #{__LINE__}: galenic_form #{@is_active_agent}"
     return nil if @is_active_agent
     element = HtmlGrid::Value.new(:galenic_form, model, @session, self)
     element.label = true
@@ -91,7 +86,6 @@ def galenic_form(model)
     element
   end
   def auxilliary(model)
-    $stdout.puts "View::Admin::ActiveAgents #{__LINE__}: auxilliary #{model.substance}"
     if model && sub = model.substance
       sub.send(@session.language)
     end
@@ -103,7 +97,6 @@ def substance(model)
   end
   def more_info(model)
     if model && info = model.more_info
-      $stdout.puts "View::Admin::ActiveAgents #{__LINE__}: more_info #{model.inspect} is #{info}"
       info
     end
   end
@@ -210,15 +203,13 @@ class CompositionList < HtmlGrid::DivList
   OFFSET_STEP = [1,0]
   OMIT_HEADER = true
   def initialize(model, session, container = nil)
-    $stdout.puts "View::Admin::CompositionList #{__LINE__}: excipiens initialize model #{model.class} session #{session.class} container is #{container.class}"
     super(model, session, container)
   end
   def excipiens(model)
     excipiens = model.excipiens
-    $stdout.puts "View::Admin::CompositionList #{__LINE__}: sequence excipiens #{excipiens}"
     if excipiens
       span = HtmlGrid::Span.new(excipiens, @session, self)
-      span.css_class = 'italic excipiens'
+      span.css_class = 'italic'
       span.value = 'dummy'
       [span, excipiens]
     else

src/view/drugs/package.rb

@@ -25,26 +25,21 @@ class CompositionList < HtmlGrid::DivList
   OFFSET_STEP = [1,0] # default is    OFFSET_STEP = [0,1]
   OMIT_HEADER = true
   def initialize(model, session, container = nil)
-    $stdout.puts "Drugs::CompositionList #{__LINE__}: with #{model.class} caller #{caller[0..10].join("\n")}"
-    $stdout.puts "Drugs::CompositionList #{__LINE__}: components #{components}"
     super(model, session)
   end
   def excipiens(model)
-    $stdout.puts "Drugs::CompositionList #{__LINE__}: composition #{model.class}: oid #{model.oid}"
     if (comp = model.composition)
       div = HtmlGrid::Div.new(model, @session, self)
-      div.css_class = 'list CompositionList excipiens'
+      div.css_class = 'list'
       div.value = comp.excipiens.to_s
-      $stdout.puts  "Drugs::CompositionList #{__LINE__}: comp.excipiens #{comp.excipiens} value #{div.value}"
       [ div ]
     end
   end
   def composition(model)
     div = HtmlGrid::Div.new(model, @session, self)
-    div.css_class = 'galenic-form CompositionList composition'
+    div.css_class = 'galenic-form'
     all_agents = model.active_agents
     agents = all_agents.find_all{|x| x.is_active_agent}
-    $stdout.puts "Drugs::CompositionList #{__LINE__}: composition #{model.class}: Have #{all_agents.size}  => #{all_agents.collect{ |x| [x.oid, x.is_active_agent]}}} agents. Displaying #{agents.size} => #{agents.collect{ |x| x.oid}}"
     size = part_size(model)
     if (comp = model.composition) && (label = comp.label)
       size = "#{label}) #{size}"
@@ -54,10 +49,9 @@ def composition(model)
   end
   def auxilliary(model)
     div = HtmlGrid::Div.new(model, @session, self)
-    div.css_class = 'galenic-form CompositionList auxilliary'
+    div.css_class = 'galenic-form'
     all_agents = model.active_agents
     agents = all_agents.find_all{|x| x.is_active_agent == false}
-    $stdout.puts "Drugs::CompositionList #{__LINE__}: auxilliary: Have #{all_agents.size}  => #{all_agents.collect{ |x| [x.oid, x.is_active_agent]}}} agents. Displaying #{agents.size} => #{agents.collect{ |x| x.oid}}"
     [ div, View::Admin::ActiveAgents.new(agents, @session, self, false)]
   end
 end