labimotion 1.2.0.1 → 1.3.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85459b416735dd8702c2764bd1ff996855ddfaf37c8b037737c7cf5dbb9403a4
-  data.tar.gz: 8e659ab1b570a0d91dfd0e047720ddde4872eb8a3320c65500bd6b00e8be6e9f
+  metadata.gz: f43e928ba8d3a20237af9a587380be1a674074d8323f1b41ecedff3d3416c12b
+  data.tar.gz: 344ae75f2cee3560d9f18e2f167e2321310ae539735cfc74666182868db369fa
 SHA512:
-  metadata.gz: de6f3f92718a41d4d2a7bb4b7b3547c5a4996ea2e008beb3936e36d5606cabc5d1f6e73bf8525c9f0d306ff9af92d59eb08fce8d9e1fd6f0efcdd233f2bced33
-  data.tar.gz: bad917552004d85e0ad14091f32f599b7edda626561b099917a65c5bf2b2e6a7b2611e37782127a1b5a81bf1ed463435d3d4f1d4782d694dc4b19f2ee5e2ba0a
+  metadata.gz: 9cfe38fdd248d4fb4f32be1c607605a0a35c6f262dc0e0cb33bd7575895aea6cd177b752f9b888458af7d75dffe45acf05f08a44a352389b0bd9f93a0cc27fc9
+  data.tar.gz: b7cfc290285914a6b4afddbb604718d5aeace21b8cbda8fa08aa8557e7513c5efa24829a79d39d71e59a937b9ce104623b30afea85c7f70191304b33d68e4a42

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/libs/export_element1.rb

@@ -0,0 +1,200 @@
+# 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', {})
+        sample = Sample.find_by(id: val['el_id'])
+        field_obj[:value] = val['el_label']
+        field_obj[:has_structure] = true
+        obj_os = OpenStruct.new(sample)
+        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_element_bak1.rb

@@ -0,0 +1,118 @@
+# 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

data/lib/labimotion/utils/field_type.rb

@@ -7,6 +7,7 @@ module Labimotion
     DATETIME_RANGE = 'datetime-range'.freeze
     SELECT = 'select'.freeze
     INTEGER = 'integer'.freeze
+    INPUT_GROUP = 'input-group'.freeze
     SYSTEM_DEFINED = 'system-defined'.freeze
     DRAG = 'drag'.freeze
     DRAG_ELEMENT = 'drag_element'.freeze

data/lib/labimotion/utils/import_utils.rb

@@ -36,7 +36,7 @@ module Labimotion
         value
       end
 
-      def proc_assign_sample(value, sample, element)
+      def proc_assign_sample(value, sample)
         return {} if sample.nil?
 
         value = {} if value.nil? || value.is_a?(String)
@@ -45,16 +45,13 @@ module Labimotion
         value['el_tip'] = sample.short_label
         value['el_label'] = sample.short_label
         value['el_svg'] = sample.get_svg_path
-        if element&.class&.name == Labimotion::Prop::L_ELEMENT && sample&.class&.name == Labimotion::Prop::SAMPLE
-          Labimotion::ElementsSample.find_or_create_by(element_id: element.id, sample_id: sample.id)
-        end
         value
       rescue StandardError => e
         Labimotion.log_exception(e)
         value
       end
 
-      def proc_assign_element(value, element, _parent = nil)
+      def proc_assign_element(value, element)
         return {} if element.nil?
 
         value = {} if value.nil? || value.is_a?(String)
@@ -62,9 +59,6 @@ module Labimotion
         value['el_type'] = 'element' if value['el_type'].nil?
         value['el_tip'] = element.short_label
         value['el_label'] = element.short_label
-        if _parent&.class&.name == Labimotion::Prop::L_ELEMENT && element&.class&.name == Labimotion::Prop::L_ELEMENT
-          Labimotion::ElementsElement.find_or_create_by(parent_id: _parent.id, element_id: element.id)
-        end
         value
       rescue StandardError => e
         Labimotion.log_exception(e)
@@ -98,20 +92,20 @@ module Labimotion
         properties
       end
 
-      def proc_table_sample(properties, data, instances, svalue, key, tidx, vdx, col_id, element)
+      def proc_table_sample(properties, data, instances, svalue, key, tidx, vdx, col_id)
         return properties unless id = svalue.fetch('el_id', nil)
 
         # orig_s = data.fetch(Labimotion::Prop::SAMPLE, nil)&.fetch(svalue['el_id'], nil)
         sample = instances.fetch(Labimotion::Prop::SAMPLE, nil)&.fetch(id, nil)
         val = properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][tidx]['sub_values'][vdx][col_id]['value']
-        properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][tidx]['sub_values'][vdx][col_id]['value'] = proc_assign_sample(val, sample, element)
+        properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][tidx]['sub_values'][vdx][col_id]['value'] = proc_assign_sample(val, sample)
         properties
       rescue StandardError => e
         Labimotion.log_exception(e)
         properties
       end
 
-      def proc_table_prop(layer, key, data, instance, properties, field, tidx, type, element)
+      def proc_table_prop(layer, key, data, instance, properties, field, tidx, type)
         fields = field[Labimotion::Prop::SUBFIELDS].select { |ss| ss['type'] == type }
         return properties if fields.nil?
 
@@ -131,7 +125,7 @@ module Labimotion
             when Labimotion::FieldType::DRAG_MOLECULE
               properties = proc_table_molecule(properties, data, svalue, key, tidx, vdx, col_id)
             when Labimotion::FieldType::DRAG_SAMPLE
-              properties = proc_table_sample(properties, data, instance, svalue, key, tidx, vdx, col_id, element)
+              properties = proc_table_sample(properties, data, instance, svalue, key, tidx, vdx, col_id)
             end
           end
         end
@@ -142,14 +136,14 @@ module Labimotion
       end
     end
 
-    def self.proc_sample(layer, key, data, instances, properties, element)
+    def self.proc_sample(layer, key, data, instances, properties)
       fields = layer[Labimotion::Prop::FIELDS].select { |ss| ss['type'] == Labimotion::FieldType::DRAG_SAMPLE }
       fields.each do |field|
         idx = properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS].index(field)
         id = field["value"] && field["value"]["el_id"] unless idx.nil?
         sample = instances.fetch(Labimotion::Prop::SAMPLE, nil)&.fetch(id, nil)
         val = properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][idx]['value']
-        val = proc_assign_sample(val, sample, element)
+        val = proc_assign_sample(val, sample)
         properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][idx]['value'] = val
       end
       properties
@@ -158,7 +152,7 @@ module Labimotion
       raise
     end
 
-    def self.proc_element(layer, key, data, instances, properties, elements, element)
+    def self.proc_element(layer, key, data, instances, properties, elements)
       fields = layer[Labimotion::Prop::FIELDS].select { |ss| ss['type'] == Labimotion::FieldType::DRAG_ELEMENT }
       fields.each do |field|
         idx = properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS].index(field)
@@ -168,7 +162,7 @@ module Labimotion
           properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][idx]['value'] = {}
         else
           val = properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][idx]['value']
-          val = proc_assign_element(val, att_el, element)
+          val = proc_assign_element(val, att_el)
           properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][idx]['value'] = val
         end
       end
@@ -231,14 +225,14 @@ module Labimotion
     end
 
 
-    def self.proc_table(layer, key, data, instance, properties, element)
+    def self.proc_table(layer, key, data, instance, properties)
       fields = layer[Labimotion::Prop::FIELDS].select { |ss| ss['type'] == Labimotion::FieldType::TABLE }
       fields&.each do |field|
         tidx = layer[Labimotion::Prop::FIELDS].index(field)
         next unless field['sub_values'].present? && field[Labimotion::Prop::SUBFIELDS].present?
 
-        proc_table_prop(layer, key, data, instance, properties, field, tidx, Labimotion::FieldType::DRAG_MOLECULE, element)
-        proc_table_prop(layer, key, data, instance, properties, field, tidx, Labimotion::FieldType::DRAG_SAMPLE, element)
+        proc_table_prop(layer, key, data, instance, properties, field, tidx, Labimotion::FieldType::DRAG_MOLECULE)
+        proc_table_prop(layer, key, data, instance, properties, field, tidx, Labimotion::FieldType::DRAG_SAMPLE)
       end
       properties
     rescue StandardError => e
@@ -252,9 +246,9 @@ module Labimotion
         layer = properties[Labimotion::Prop::LAYERS][key]
         properties = proc_molecule(layer, key, data, properties)
         properties = proc_upload(layer, key, data, instances, attachments, elmenet)
-        properties = proc_sample(layer, key, data, instances, properties, elmenet)
-        properties = proc_element(layer, key, data, instances, properties, elements, elmenet) # unless elements.nil?
-        properties = proc_table(layer, key, data, instances, properties, elmenet)
+        properties = proc_sample(layer, key, data, instances, properties)
+        properties = proc_element(layer, key, data, instances, properties, elements) # unless elements.nil?
+        properties = proc_table(layer, key, data, instances, properties)
       end
       properties
     rescue StandardError => e

data/lib/labimotion/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: labimotion
 version: !ruby/object:Gem::Version
-  version: 1.2.0.1
+  version: 1.3.0.rc1
 platform: ruby
 authors:
 - Chia-Lin Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-18 00:00:00.000000000 Z
+date: 2024-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,6 +66,8 @@ files:
 - lib/labimotion/helpers/segment_helpers.rb
 - lib/labimotion/libs/converter.rb
 - lib/labimotion/libs/export_dataset.rb
+- lib/labimotion/libs/export_element1.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
@@ -102,7 +104,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: {}
@@ -117,9 +119,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.6
 signing_key: