determinations_comparison 1.0.2 → 2.0.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    determinations_comparison (1.0.1)
+    determinations_comparison (2.0.0)
       htmlentities
       uuidtools
 

data/lib/determinations_comparison.rb

@@ -7,6 +7,7 @@ require 'uuidtools'
 require 'htmlentities/encoder'
 require 'html_table_of_property_differences'
 require 'html_table_of_peak_picking_log'
+require 'jquery_tabs'
 require 'exe_comparedeterminations'
 
 LIB_FOLDER = File.dirname(__FILE__)
@@ -51,76 +52,99 @@ module DeterminationsComparison
       baseline_filepath = File.join  folderpath_output, "#{@uuid}_baseline.json"
       undertest_filepath = File.join folderpath_output, "#{@uuid}_undertest.json"
 
-      @plotter = Exe_CompareDeterminations.new @filepath_baseline_origin, @filepath_undertest_origin, @filepath_comparedeterminations
-
       # these are necessary for cpplogreader
       @sample_index = hashCompoundBaseLine['Sample_Index']
       @analyte_name = hashCompoundBaseLine['Analyte']
 
-
-      str = ""
-      arr = Array.new
-
       begin
-        coder = HTMLEntities.new
-        retcodePNG,rundetailsPNG = @plotter.generate_png png_filepath
+
+        #coder = HTMLEntities.new
 
         FileUtils.copy_file @filepath_baseline_origin, baseline_filepath
         FileUtils.copy_file @filepath_undertest_origin, undertest_filepath
 
-        str += "<p>baseline file: <a href=#{File.basename(baseline_filepath)}>#{File.basename(@filepath_baseline_origin)}</a></p>"
-        str += "<p>undertest file: <a href=#{File.basename(undertest_filepath)}>#{File.basename(@filepath_undertest_origin)}</a></p>"
+        # html for file links
+          strFiles = "<p>baseline file: <a href=#{File.basename(baseline_filepath)}>#{File.basename(@filepath_baseline_origin)}</a></p>"
+          strFiles += "<p>undertest file: <a href=#{File.basename(undertest_filepath)}>#{File.basename(@filepath_undertest_origin)}</a></p>"
 
-        if retcodePNG
-          str += "<p><p><p><img src='#{File.basename(png_filepath)}' alt='chromatogram' height='500' width='800' align='top'></p>"
-        end
+        # html for plot
+          strPlot = nil
+          @plotter = Exe_CompareDeterminations.new @filepath_baseline_origin, @filepath_undertest_origin, @filepath_comparedeterminations
+          retcodePNG,rundetailsPNG = @plotter.generate_png png_filepath
+          if retcodePNG
+            strPlot = "<img src='#{File.basename(png_filepath)}' alt='chromatogram' height='500' width='800' align='top'>"
+          end
 
-        @hashDiffs.each_pair do |k,v|
+        # html for peak picking logs
+          hashChromHTML = Hash.new
 
-          chrom_type = k
+          @hashDiffs.each_pair do |k,v|
 
-          v.each_pair do |k,v|
-            if k == 'peak'
-              v.each_pair do |k,v|
-                arr << property_diff_to_hash(chrom_type,k,v)
-              end
-            else
-              unless k == 'peak_picked'
-                arr << property_diff_to_hash(chrom_type,k,v)
+            chrom_type = k
+
+            ht = HTML_Table_of_Peak_Picking_Log.new(@folderpath_with_log,@sample_index,@analyte_name,k)
+            str_pp = ht.render
+            unless str_pp.nil?
+
+              peak_picked = "unknown"
+              arrPP = v.select { |h| h['peak_picked'] }
+              unless arrPP.empty?
+                peak_picked = "#{arrPP.first[0]} #{arrPP.first[1]}"
               end
+
+              strChrom = "<p><b>#{chrom_type}</b> - #{peak_picked}</p>"
+              strChrom += str_pp
             end
 
-          end
+            hashChromHTML[k] = strChrom
 
-          peak_picked = "unknown"
-          arrPP = v.select { |h| h['peak_picked'] }
-          unless arrPP.empty?
-            peak_picked = "#{arrPP.first[0]} #{arrPP.first[1]}"
           end
 
-          str += "<p><p>"
-          str += "<p><b>#{k}</b> - #{peak_picked}</p>"
+        # html for property differences
+          arr = Array.new
+
+          @hashDiffs.each_pair do |k,v|
+
+            chrom_type = k
+
+            v.each_pair do |k,v|
+              if k == 'peak'
+                v.each_pair do |k,v|
+                  arr << property_diff_to_hash(chrom_type,k,v)
+                end
+              else
+                unless k == 'peak_picked'
+                  arr << property_diff_to_hash(chrom_type,k,v)
+                end
+              end
+
+            end
 
-          ht = HTML_Table_of_Peak_Picking_Log.new(@folderpath_with_log,@sample_index,@analyte_name,k)
-          str_pp = ht.render
-          unless str_pp.nil?
-            str += "<p><p>"
-            str += str_pp
-            str += "</p>"
           end
 
-        end
+        strProps = nil
 
         ht = HTML_Table_of_Property_Differences.new(arr)
         str_p = ht.render
         unless str_p.nil?
-          str += "<p><p>"
-          str += str_p
-          str += "</p>"
+          strProps = str_p
         end
 
+        strFull = strFiles
+        strFull += strPlot unless strPlot.nil?
+
+        hashGroups = Hash.new
+        hashGroups['Properties'] = strProps
+        hashChromHTML.each_pair do |k,v|
+          hashGroups["Pick Log - #{k.to_s}"] = v
+        end
+
+        jt = Jquery_Tabs.new hashGroups
+        strFull += jt.render
+
+
         File.open(html_filepath, "w") do |f|
-          f.write(str)
+          f.write(strFull)
         end
 
         retcode = true
@@ -146,6 +170,7 @@ module DeterminationsComparison
 
     private
 
+
     def categorize(hashPropertyThresholds)
 
       hashCategory = Hash.new

data/lib/determinations_comparison/version.rb

@@ -1,3 +1,3 @@
 module DeterminationsComparison
-  VERSION = "1.0.2"
+  VERSION = "2.0.0"
 end

data/lib/jquery_accordian.rb

@@ -0,0 +1,60 @@
+require 'erb'
+require 'uuidtools'
+require 'string'
+
+class Jquery_Accordian
+  include ERB::Util
+
+  def initialize(hashGroups)
+    @hashGroups = hashGroups
+    @template = get_template
+    @div = UUIDTools::UUID.random_create
+
+  end
+
+  def render
+    unless @template.nil?
+      ERB.new(@template).result(binding)
+    end
+  end
+
+  def save(file)
+    File.open(file, "w+") do |f|
+      f.write(render)
+    end
+  end
+
+  private
+
+  def get_template()
+    %{
+      <html lang='en'>
+      <head>
+        <meta charset='utf-8'>
+        <link rel='stylesheet' href='http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css'>
+        <script src='http://code.jquery.com/jquery-1.9.1.js'></script>
+        <script src='http://code.jquery.com/ui/1.10.3/jquery-ui.js'></script>
+      </head>
+      <body>
+       
+      <div id='accordion'>
+        <% @hashGroups.each do |k,v| %>
+        <h3> <%= k.to_s %> </h3>
+        <div>
+          <p> <%= v %> </p>
+        </div>
+        <% end %>
+      </div>
+       
+      <script>
+      $( '#accordion' ).accordion();
+      </script>
+       
+      </body>
+      </html>
+  }
+
+  end
+
+end
+

data/lib/jquery_tabs.rb

@@ -0,0 +1,65 @@
+require 'erb'
+require 'uuidtools'
+require 'string'
+
+class Jquery_Tabs
+  include ERB::Util
+
+  def initialize(hashGroups)
+    @hashGroups = hashGroups
+    @template = get_template
+    @div = UUIDTools::UUID.random_create
+
+  end
+
+  def render
+    unless @template.nil?
+      ERB.new(@template).result(binding)
+    end
+  end
+
+  def save(file)
+    File.open(file, "w+") do |f|
+      f.write(render)
+    end
+  end
+
+  private
+
+  def get_template()
+    %{
+      <html lang='en'>
+      <head>
+        <meta charset="utf-8">
+        <title>compute test results</title>
+        <link rel="stylesheet" href="http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css">
+        <script src="http://code.jquery.com/jquery-1.9.1.js"></script>
+        <script src="http://code.jquery.com/ui/1.10.3/jquery-ui.js"></script>
+      </head>
+      <body>
+       
+      <div id="tabs">
+        <ul>
+          <% @hashGroups.each do |k,v| %>
+          <li><a href="#<%= k.gsub(' ','') %>"><span> <%= k %> </span></a></li>
+          <% end %>
+        </ul>
+        <% @hashGroups.each do |k,v| %>
+        <div id="<%= k.gsub(' ','') %>">
+        <%= v %>
+        </div>
+        <% end %>
+      </div>
+       
+      <script>
+      $( "#tabs" ).tabs();
+      </script>
+       
+      </body>
+      </html>
+  }
+
+  end
+
+end
+

data/spec/determinations_comparison_spec.rb

@@ -21,6 +21,10 @@ describe 'determinations_comparison' do
     File.join('spec','support','data','test_batch_for_cpplogreader')
   end
 
+  before :each do
+    FileUtils.rm(Dir.glob('bin/*'))
+    FileUtils.rm(Dir.glob('bin2/*'))
+  end
   
   it 'should show differences as hash' do
     comparison = DeterminationsComparison::Comparison.new( baseline_file, undertest_file, {:folderpath_output=>folderpath_output})
@@ -66,10 +70,4 @@ describe 'determinations_comparison' do
     expect(Dir.glob('bin2/*').size).to_not eq(0)
   end
 
-  after :each do
-    FileUtils.rm(Dir.glob('bin/*'))
-    FileUtils.rm(Dir.glob('bin2/*'))
-  end
-
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: determinations_comparison
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-07 00:00:00.000000000 Z
+date: 2013-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,6 +129,8 @@ files:
 - lib/html_table.rb
 - lib/html_table_of_peak_picking_log.rb
 - lib/html_table_of_property_differences.rb
+- lib/jquery_accordian.rb
+- lib/jquery_tabs.rb
 - lib/string.rb
 - lib/utilities.rb
 - spec/determinations_comparison_spec.rb