labimotion 1.3.0.rc2 → 1.3.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee43dfba01f84786e6b1dc59d125c6c8cd3a7594e6f3d9e5179268995b8366dd
-  data.tar.gz: e15bf2f064a847b950f3320a2707de508f3c8169a966519280b71f8426a20f3e
+  metadata.gz: ef750ee91a207edde617086a1dadc141b83613584810eba9435836fe59b2f745
+  data.tar.gz: b68dfa74b8701fbd73598d8a2b67109680a70c31b92e780acef89aa968923108
 SHA512:
-  metadata.gz: da54fef539dfc89675a40f1e1de1ab3a58a77f0e23a494912852ab78a29546af83ceeb1ef9e3b1a8f1d77d78adcc55e77a8d986b28f43810966264bdab89c230
-  data.tar.gz: db9c675738091bd749bdea7ece8eb3e555b6063694691d81a58832b19be3f92618d61a69228ad8a820c11a4b14d7ff8b77ef817378740e0f2af108aa43867316
+  metadata.gz: 8fe68edfe62dc71133d5340b6242d43a3d4a6dab50ccb77531bb32898f84635d8794b16ac1185672b453dc9a8965782f7c1545ab4f556ab0d744087d7559ff24
+  data.tar.gz: 0ed4f34cf80aef0200681e45103ae22bf4b9fe6e02ca6772ee146aee989a40939143b3370b16b787c678c4329990491dabe331394bca851f473a573405c42a11

data/lib/labimotion/collection/import.rb

@@ -89,7 +89,7 @@ module Labimotion
         sk_id = sk_obj["identifier"]
         ek_obj = data.fetch(Labimotion::Prop::L_ELEMENT_KLASS).fetch(sk_obj["element_klass_id"])
         element_klass = Labimotion::ElementKlass.find_by(name: ek_obj['name']) if ek_obj.present?
-        next if element_klass.nil? || ek_obj.nil? || ek_obj['is_generic'] == true
+        next if element_klass.nil? || ek_obj.nil? # || ek_obj['is_generic'] == true
 
         element_uuid = fields.fetch('element_id')
         element_type = fields.fetch('element_type')
@@ -99,7 +99,7 @@ module Labimotion
 
         if segment_klass.nil?
           skr = Labimotion::SegmentKlassesRevision.find_by(uuid: fields.fetch('klass_uuid'))
-          segment_klass = skr.segment_klass if segment_klass.nil? && skr.present?
+          segment_klass = Labimotion::SegmentKlass.find_by(id: skr.segment_klass_id) if skr.present?
         end
 
         next if segment_klass.nil? || element.nil?
@@ -133,7 +133,7 @@ module Labimotion
       data.fetch('Labimotion::Element', {}).each do |uuid, fields|
         klass_id = fields["element_klass_id"]
         ek_obj = data.fetch('Labimotion::ElementKlass', {})[klass_id]
-        ek_id = ek_obj["identifier"]
+        ek_id = ek_obj["identifier"] if ek_obj.present?
         element_klass = Labimotion::ElementKlass.find_by(identifier: ek_id) if ek_id.present?
         element_klass = Labimotion::ElementKlass.find_by(uuid: fields.fetch('klass_uuid')) if element_klass.nil?
 

data/lib/labimotion/version.rb

@@ -3,5 +3,5 @@
 ## Labimotion Version
 module Labimotion
   IS_RAILS5 = false
-  VERSION = '1.3.0.rc2'
+  VERSION = '1.3.0.rc3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: labimotion
 version: !ruby/object:Gem::Version
-  version: 1.3.0.rc2
+  version: 1.3.0.rc3
 platform: ruby
 authors:
 - Chia-Lin Lin
@@ -66,10 +66,7 @@ files:
 - lib/labimotion/helpers/segment_helpers.rb
 - lib/labimotion/libs/converter.rb
 - lib/labimotion/libs/export_dataset.rb
-- lib/labimotion/libs/export_element copy.rb
 - lib/labimotion/libs/export_element.rb
-- lib/labimotion/libs/export_element2.rb
-- lib/labimotion/libs/export_element_bak1.rb
 - lib/labimotion/libs/nmr_mapper.rb
 - lib/labimotion/libs/properties_handler.rb
 - lib/labimotion/libs/sample_association.rb
@@ -106,7 +103,7 @@ files:
 - lib/labimotion/utils/serializer.rb
 - lib/labimotion/utils/utils.rb
 - lib/labimotion/version.rb
-homepage: https://gitlab.kit.edu/kit/labimotion/labimotion
+homepage: https://github.com/LabIMotion/labimotion
 licenses:
 - AGPL-3.0
 metadata: {}

data/lib/labimotion/libs/export_element copy.rb

@@ -1,204 +0,0 @@
-# frozen_string_literal: true
-require 'export_table'
-require 'labimotion/version'
-require 'sablon'
-
-module Labimotion
-  class ExportElement
-    def initialize(current_user, element, export_format)
-      @current_user = current_user
-      @element = element
-      @properties = element.properties
-      @options = element.properties_release[Labimotion::Prop::SEL_OPTIONS]
-      @export_format = export_format
-    rescue StandardError => e
-      Labimotion.log_exception(e)
-      byebug
-    end
-
-    def build_layers
-      objs = []
-      @properties[Labimotion::Prop::LAYERS]&.keys&.sort_by { |key| @properties[Labimotion::Prop::LAYERS][key]['position'] }&.each do |key|
-        layer = @properties[Labimotion::Prop::LAYERS][key] || {}
-
-        ## Build fields html
-        # field_objs = build_fields_html(layer) if layer[Labimotion::Prop::FIELDS]&.length&.positive?
-        # field_html = Sablon.content(:html, field_objs) if field_objs.present?
-        field_objs = build_fields(layer)
-
-        layer_info = {
-          label: layer['label'],
-          layer: layer['layer'],
-          cols: layer['cols'],
-          timeRecord: layer['timeRecord'],
-          fields: field_objs
-        }
-        objs.push(layer_info)
-      end
-      objs
-    rescue StandardError => e
-      Labimotion.log_exception(e)
-      byebug
-    end
-
-    def build_field(layer, field)
-      field_obj = {}
-      field_obj[:label] = field['label']
-      field_obj[:field] = field['field']
-      field_obj[:type] = field['type']
-
-      field_obj.merge!(field.slice('value', 'value_system'))
-
-      case field['type']
-      when Labimotion::FieldType::DRAG_ELEMENT
-        field_obj[:value] = (field['value'] && field['value']['el_label']) || ''
-        field_obj[:obj] = field['value']  ### change to object
-      when Labimotion::FieldType::DRAG_SAMPLE
-        val = field.fetch('value', {})
-        instance = Sample.find_by(id: val['el_id'])
-        field_obj[:value] = val['el_label']
-        field_obj[:has_structure] = true
-        obj_os = Entities::SampleReportEntity.new(
-          instance,
-          current_user: @current_user,
-          detail_levels: ElementDetailLevelCalculator.new(user: @current_user, element: instance).detail_levels,
-        ).serializable_hash
-        field_obj[:structure] = Reporter::Docx::DiagramSample.new(obj: obj_os, format: 'png').generate
-      when Labimotion::FieldType::DRAG_MOLECULE
-        val = field.fetch('value', {})
-        obj = Molecule.find_by(id: val['el_id'])
-        field_obj[:value] = val['el_label']
-        # field_obj[:has_structure] = true
-        # field_obj[:structure] = Reporter::Docx::DiagramSample.new(obj: obj, format: 'png').generate
-      when Labimotion::FieldType::SELECT
-        field_obj[:value] = @options.fetch(field['option_layers'], nil)&.fetch('options', nil)&.find { |ss| ss['key'] == field['value'] }&.fetch('label', nil) || field['value']
-      when Labimotion::FieldType::UPLOAD
-        files = field.fetch('value', nil)&.fetch('files', [])
-        val = files&.map { |file| "#{file['filename']} #{file['label']}" }&.join('\n')
-        field_obj[:value] = val
-      when Labimotion::FieldType::TABLE
-        field_obj[:value] = 'this is a table'  ## to be handled
-      when Labimotion::FieldType::INPUT_GROUP
-        field_obj[:value] = 'this is a input group'  ## to be handled
-      end
-      field_obj
-    rescue StandardError => e
-      Labimotion.log_exception(e)
-      byebug
-    end
-
-    def build_fields(layer)
-      fields = layer[Labimotion::Prop::FIELDS] || []
-      field_objs = []
-      fields.each do |field|
-        field_obj = build_field(layer, field)
-        field_objs.push(field_obj)
-      end
-      field_objs
-    rescue StandardError => e
-      Labimotion.log_exception(e)
-      byebug
-    end
-
-    def to_docx
-      # location = Rails.root.join('lib', 'template', 'Labimotion.docx')
-      location = Rails.root.join('lib', 'template', 'Labimotion_lines.docx')
-      File.exist?(location)
-      template = Sablon.template(location)
-      layers = build_layers
-      context = {
-        name: @element.name,
-        short_label: @element.short_label,
-        date: Time.now.strftime('%d/%m/%Y'),
-        author: @current_user.name,
-        layers: layers
-      }
-      output = "Labimotion1.docx"
-      template.render_to_file File.expand_path(output), context
-      File.read(output)
-    rescue StandardError => e
-      Labimotion.log_exception(e)
-      byebug
-    end
-
-
-    def build_field_html(layer, field, cols)
-      case field['type']
-      when Labimotion::FieldType::DRAG_SAMPLE, Labimotion::FieldType::DRAG_ELEMENT, Labimotion::FieldType::DRAG_MOLECULE
-        val = (field['value'] && field['value']['el_label']) || ''
-      when Labimotion::FieldType::UPLOAD
-        val = (field['value'] && field['value']['files'] && field['value']['files'].first && field['value']['files'].first['filename'] ) || ''
-      else
-        val = field['value']
-      end
-      htd = field['hasOwnRow'] == true ? "<td colspan=#{cols}>" : '<td>'
-      "#{htd}<b>#{field['label']}: </b><br />#{val}</td>"
-    rescue StandardError => e
-      Labimotion.log_exception(e)
-      byebug
-    end
-
-    def build_fields_html(layer)
-      fields = layer[Labimotion::Prop::FIELDS] || []
-      field_objs = []
-      cols = layer['cols'] || 0
-      field_objs.push('<table style="width: 4000dxa"><tr>')
-      fields.each do |field|
-        if cols&.zero? || field['hasOwnRow'] == true
-          field_objs.push('</tr><tr>')
-          cols = layer['cols']
-        end
-        field_obj = build_field_html(layer, field, layer['cols'])
-        field_objs.push(field_obj)
-        cols -= 1
-        cols = 0 if field['hasOwnRow'] == true
-      end
-      field_objs.push('</tr></table>')
-      field_objs&.join("")&.gsub('<tr></tr>', '')
-    rescue StandardError => e
-      Labimotion.log_exception(e)
-      byebug
-    end
-
-
-    def build_layers_html
-      layer_html = []
-      first_line = true
-      @properties[Labimotion::Prop::LAYERS]&.keys&.each do |key|
-        layer_html.push('</tr></table>') if first_line == false
-        layer = @properties[Labimotion::Prop::LAYERS][key] || {}
-        fields = layer[Labimotion::Prop::FIELDS] || []
-        layer_html.push("<h2><b>Layer:#{layer['label']}</b></h2>")
-        layer_html.push('<table><tr>')
-        cols = layer['cols']
-        fields.each do |field|
-          if (cols === 0)
-            layer_html.push('</tr><tr>')
-          end
-
-          val = field['value'].is_a?(Hash) ? field['value']['el_label'] : field['value']
-          layer_html.push("<td>#{field['label']}: <br />#{val}</td>")
-          cols -= 1
-        end
-        first_line = false
-      end
-      layer_html.push('</tr></table>')
-      byebug
-      layer_html.join('')
-    rescue StandardError => e
-      Labimotion.log_exception(e)
-      byebug
-    end
-
-    def html_labimotion
-      layers_html = build_layers_html
-      html_body = <<-HTML.strip
-      #{layers_html}
-      HTML
-      html_body
-    rescue StandardError => e
-      Labimotion.log_exception(e)
-      byebug
-    end
-  end
-end

data/lib/labimotion/libs/export_element2.rb

@@ -1,160 +0,0 @@
-# frozen_string_literal: true
-require 'export_table'
-require 'labimotion/version'
-require 'sablon'
-
-module Labimotion
-  class ExportElement
-    def initialize(current_user, element, export_format)
-      @current_user = current_user
-      @element = element
-      @properties = element.properties
-      @export_format = export_format
-    rescue StandardError => e
-      Labimotion.log_exception(e)
-      byebug
-    end
-
-    def build_field(layer, field)
-      field_obj = {}
-      field_obj[:label] = field['label']
-      field_obj[:field] = field['field']
-      field_obj[:type] = field['type']
-
-      case field['type']
-      when Labimotion::FieldType::DRAG_SAMPLE, Labimotion::FieldType::DRAG_ELEMENT, Labimotion::FieldType::DRAG_MOLECULE
-        field_obj[:value] = field['value']['el_label']
-      else
-        field_obj[:value] = field['value']
-      end
-      field_obj
-    rescue StandardError => e
-      Labimotion.log_exception(e)
-      byebug
-    end
-
-    def build_fields(layer, fields)
-      field_objs = []
-      fields.each do |field|
-        field_obj = build_field(layer, field)
-        field_objs.push(field_obj)
-      end
-      field_objs
-    rescue StandardError => e
-      Labimotion.log_exception(e)
-      byebug
-    end
-
-    def build_layers
-      objs = []
-      @properties[Labimotion::Prop::LAYERS]&.keys&.each do |key|
-        layer = @properties[Labimotion::Prop::LAYERS][key] || {}
-        field_objs = build_fields_html(layer)
-        field_html = Sablon.content(:html, field_objs)
-        layer_info = {
-          label: layer['label'],
-          layer: layer['layer'],
-          cols: layer['cols'],
-          timeRecord: layer['timeRecord'],
-          fields: field_html
-        }
-        objs.push(layer_info)
-      end
-      objs
-    rescue StandardError => e
-      Labimotion.log_exception(e)
-      byebug
-    end
-
-
-    def build_field_html(layer, field)
-      case field['type']
-      when Labimotion::FieldType::DRAG_SAMPLE, Labimotion::FieldType::DRAG_ELEMENT, Labimotion::FieldType::DRAG_MOLECULE
-        val = field['value']['el_label']
-      else
-        val = field['value']
-      end
-      "<td><b>#{field['label']}: </b><br />#{val}</td>"
-    rescue StandardError => e
-      Labimotion.log_exception(e)
-      byebug
-    end
-
-    def build_fields_html(layer)
-      fields = layer[Labimotion::Prop::FIELDS] || []
-      field_objs = []
-      cols = layer['cols']
-      field_objs.push('<table><tr>')
-      fields.each do |field|
-        field_objs.push('</tr><tr>') if (cols === 0)
-        field_obj = build_field_html(layer, field)
-        field_objs.push(field_obj)
-        cols -= 1
-      end
-      field_objs.push('</tr></table>')
-      field_objs.join("")
-    rescue StandardError => e
-      Labimotion.log_exception(e)
-      byebug
-    end
-
-    def build_layers_html
-      layer_html = []
-      first_line = true
-      @properties[Labimotion::Prop::LAYERS]&.keys&.each do |key|
-        layer_html.push('</tr></table>') if first_line == false
-        layer = @properties[Labimotion::Prop::LAYERS][key] || {}
-        fields = layer[Labimotion::Prop::FIELDS] || []
-        layer_html.push("<h2><b>Layer:#{layer['label']}</b></h2>")
-        layer_html.push('<table><tr>')
-        cols = layer['cols']
-        fields.each do |field|
-          if (cols === 0)
-            layer_html.push("</tr><tr>")
-          end
-
-          val = field['value'].is_a?(Hash) ? field['value']['el_label'] : field['value']
-          layer_html.push("<td>#{field['label']}: <br />#{val}</td>")
-          cols -= 1
-        end
-        first_line = false
-      end
-      layer_html.push('</tr></table>')
-      layer_html.join('')
-
-
-    rescue StandardError => e
-      Labimotion.log_exception(e)
-      byebug
-    end
-
-    def html_labimotion
-      layers_html = build_layers_html
-      html_body = <<-HTML.strip
-      #{layers_html}
-      HTML
-      html_body
-    rescue StandardError => e
-      Labimotion.log_exception(e)
-      byebug
-    end
-
-    def to_docx
-      location = Rails.root.join('lib', 'template', 'Labimotion.docx')
-      File.exist?(location)
-      template = Sablon.template(location)
-      layers = build_layers
-      context = {
-        name: @element.name,
-        short_label: @element.short_label,
-        layers: layers
-      }
-      output = "Labimotion1.docx"
-      template.render_to_file File.expand_path(output), context
-      File.read(output)
-    rescue StandardError => e
-      Labimotion.log_exception(e)
-      byebug
-    end
-  end
-end

data/lib/labimotion/libs/export_element_bak1.rb

@@ -1,118 +0,0 @@
-# frozen_string_literal: true
-require 'export_table'
-require 'labimotion/version'
-require 'sablon'
-
-module Labimotion
-  class ExportElementBak1
-    def initialize(current_user, element, export_format)
-      @current_user = current_user
-      @element = element
-      @properties = element.properties
-      @export_format = export_format
-    rescue StandardError => e
-      Labimotion.log_exception(e)
-      byebug
-    end
-
-    def build_field(layer, field)
-      field_obj = {}
-      field_obj[:label] = field['label']
-      field_obj[:field] = field['field']
-      field_obj[:type] = field['type']
-
-      case field['type']
-      when Labimotion::FieldType::DRAG_SAMPLE, Labimotion::FieldType::DRAG_ELEMENT, Labimotion::FieldType::DRAG_MOLECULE
-        field_obj[:value] = field['value']['el_label']
-      else
-        field_obj[:value] = field['value']
-      end
-      field_obj
-    rescue StandardError => e
-      Labimotion.log_exception(e)
-      byebug
-    end
-
-    def build_fields(layer, fields)
-      field_objs = []
-      fields.each do |field|
-        field_obj = build_field(layer, field)
-        field_objs.push(field_obj)
-      end
-      field_objs
-    rescue StandardError => e
-      Labimotion.log_exception(e)
-      byebug
-    end
-    def build_layers
-      objs = []
-      @properties[Labimotion::Prop::LAYERS]&.keys&.each do |key|
-        layer = @properties[Labimotion::Prop::LAYERS][key] || {}
-        fields = layer[Labimotion::Prop::FIELDS] || []
-        field_objs = build_fields(layer, fields)
-
-        layer_info = {
-          label: layer['label'],
-          layer: layer['layer'],
-          cols: layer['cols'],
-          fields: field_objs
-        }
-        objs.push(layer_info)
-      end
-      objs
-    rescue StandardError => e
-      Labimotion.log_exception(e)
-      byebug
-    end
-
-    def html_sample
-      html_body = <<-HTML.strip
-      <p style="text-align: right; background-color: #FFFF00">
-          Right aligned content with a yellow background color.
-      </p>
-      <div>
-          <span style="color: #123456">Inline styles</span> are possible as well
-      </div>
-      <table>
-        <tr>
-          <th>Company</th>
-          <th>Contact</th>
-          <th>Country</th>
-        </tr>
-        <tr>
-          <td>Alfreds Futterkiste</td>
-          <td>Maria Anders</td>
-          <td>Germany</td>
-        </tr>
-      </table>
-
-      HTML
-      html_body
-    rescue StandardError => e
-      Labimotion.log_exception(e)
-      byebug
-    end
-
-    def to_docx
-      location = Rails.root.join('lib', 'template', 'Labimotion.docx')
-      File.exist?(location)
-      template = Sablon.template(location)
-      layers = build_layers
-byebug
-      html_body  = html_sample
-      html_content = Sablon.content(:html, html_body)
-      context = {
-        name: @element.name,
-        short_label: @element.short_label,
-        layers: layers,
-        html_sample: html_content
-      }
-      output = "Labimotion1.docx"
-      template.render_to_file File.expand_path(output), context
-      File.read(output)
-    rescue StandardError => e
-      Labimotion.log_exception(e)
-      byebug
-    end
-  end
-end