labimotion 1.3.0.rc3 → 1.3.0.rc5

data/lib/labimotion/libs/export_element.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 require 'export_table'
 require 'labimotion/version'
+require 'labimotion/utils/units'
 require 'sablon'
 
 module Labimotion
@@ -8,6 +9,25 @@ module Labimotion
     def initialize(current_user, element, export_format)
       @current_user = current_user
       @element = element
+      @parent =
+        case element.class.name
+        when 'Labimotion::Segment'
+          element&.element
+        when 'Labimotion::Dataset'
+          element&.element&.root_element
+        end
+      @element_klass =
+        case element.class.name
+        when 'Labimotion::Element'
+          element.element_klass
+        when 'Labimotion::Segment'
+          element.segment_klass
+        when 'Labimotion::Dataset'
+          element.dataset_klass
+        end
+      @name = @element.instance_of?(Labimotion::Element) ? element.name : @parent&.name
+      @short_label = @element.instance_of?(Labimotion::Element) ? element.short_label : @parent&.short_label
+      @element_name = "#{@element_klass.label}_#{@short_label}".gsub(/\s+/, '')
       @properties = element.properties
       @options = element.properties_release[Labimotion::Prop::SEL_OPTIONS]
       @export_format = export_format
@@ -17,7 +37,12 @@ module Labimotion
 
     def build_layers
       objs = []
-      @properties[Labimotion::Prop::LAYERS]&.keys&.sort_by { |key| @properties[Labimotion::Prop::LAYERS][key]['position'] }&.each do |key|
+      @properties[Labimotion::Prop::LAYERS]&.keys&.sort_by do |key|
+        [
+          @properties[Labimotion::Prop::LAYERS].fetch(key, nil)&.fetch('position', 0) || 0,
+          @properties[Labimotion::Prop::LAYERS].fetch(key, nil)&.fetch('wf_position', 0) || 0
+        ]
+      end&.each do |key|
         layer = @properties[Labimotion::Prop::LAYERS][key] || {}
 
         ## Build fields html
@@ -53,23 +78,25 @@ module Labimotion
         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
-        obj_final = OpenStruct.new(obj_os)
-        field_obj[:structure] = Reporter::Docx::DiagramSample.new(obj: obj_final, format: 'png').generate
+        val = field.fetch('value', nil)
+        if val.present?
+          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
+          obj_final = OpenStruct.new(obj_os)
+          field_obj[:structure] = Reporter::Docx::DiagramSample.new(obj: obj_final, format: 'png').generate
+        end
       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
+        val = field.fetch('value', nil)
+        if val.present?
+          obj = Molecule.find_by(id: val['el_id'])
+          field_obj[:value] = val['el_label']
+        end
       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
@@ -82,7 +109,6 @@ module Labimotion
         tbl = []
         ## tbl_idx = []
         header = {}
-
         sub_fields = field.fetch('sub_fields', [])
         sub_fields.each_with_index do |sub_field, idx|
           header["col#{idx}"] = sub_field['col_name']
@@ -107,6 +133,25 @@ module Labimotion
           end
         end
         field_obj[:value] = val.join(' ')
+      when Labimotion::FieldType::WF_NEXT
+        if field['value'].present? && field['wf_options'].present?
+          field_obj[:value] = field['wf_options'].find { |ss| ss['key'] == field['value'] }&.fetch('label', nil)&.split('(')&.first&.strip
+        end
+      when Labimotion::FieldType::SYSTEM_DEFINED
+        _field = field
+        unit = Labimotion::Units::FIELDS.find { |o| o[:field] == _field['option_layers'] }&.fetch(:units, []).find { |u| u[:key] == _field['value_system'] }&.fetch(:label, '')
+        val = _field['value'].to_s + ' ' + unit
+        val = Sablon.content(:html, "<div>" + val + "</div>") if val.include? '<'
+        field_obj[:value] = val
+      when Labimotion::FieldType::TEXT_FORMULA
+        field.fetch('text_sub_fields', []).each do |sub_field|
+          va = @properties['layers'][sub_field.fetch('layer','')]['fields'].find { |f| f['field'] == sub_field.fetch('field','') }&.fetch('value',nil)
+          field_obj[:value] = (field_obj[:value] || '') + va.to_s + sub_field.fetch('separator','') if va.present?
+        end
+        # field_obj[:value] = (field['value'] && field['value']['el_label']) || ''
+        # field_obj[:obj] = field['value']  ### change to object
+      else
+        field_obj[:value] = field['value']
       end
       field_obj
     rescue StandardError => e
@@ -117,10 +162,27 @@ module Labimotion
       return '' if sub_field.fetch('id', nil).nil? || sub_val[sub_field['id']].nil?
 
       case sub_field['type']
+      when Labimotion::FieldType::DRAG_SAMPLE
+        val = sub_val[sub_field['id']]['value'] || {}
+        label = val['el_label'].present? ? "Short Label: [#{val['el_label']}] \n" : ''
+        name = val['el_name'].present? ? "Name: [#{val['el_name']}] \n" : ''
+        ext = val['el_external_label'].present? ? "Ext. Label: [#{val['el_external_label']}] \n" : ''
+        mass = val['el_molecular_weight'].present? ? "Mass: [#{val['el_molecular_weight']}] \n" : ''
+        "#{label}#{name}#{ext}#{mass}"
+      when Labimotion::FieldType::DRAG_MOLECULE
+        val = sub_val[sub_field['id']]['value'] || {}
+        smile = val['el_smiles'].present? ? "SMILES: [#{val['el_smiles']}] \n" : ''
+        inchikey = val['el_inchikey'].present? ? "InChiKey:[#{val['el_inchikey']}] \n" : ''
+        iupac = val['el_iupac'].present? ? "IUPAC:[#{val['el_iupac']}] \n" : ''
+        mass = val['el_molecular_weight'].present? ? "MASS: [#{val['el_molecular_weight']}] \n" : ''
+        "#{smile}#{inchikey}#{iupac}#{mass}"
       when Labimotion::FieldType::SELECT
         sub_val[sub_field['id']]['value']
       when Labimotion::FieldType::SYSTEM_DEFINED
-        "#{sub_val[sub_field['id']]['value']} #{sub_val[sub_field['id']]['value_system']}"
+        unit = Labimotion::Units::FIELDS.find { |o| o[:field] == sub_field['option_layers'] }&.fetch(:units, [])&.find { |u| u[:key] == sub_field['value_system'] }&.fetch(:label, '')
+        val = sub_val[sub_field['id']]['value'].to_s + ' ' + unit
+        val = Sablon.content(:html, "<div>" + val + "</div>") if val.include? '<'
+        val
       else
         sub_val[sub_field['id']]
       end
@@ -148,8 +210,11 @@ module Labimotion
       template = Sablon.template(location)
       layers = build_layers
       context = {
-        name: @element.name,
-        short_label: @element.short_label,
+        label: @element_klass.label,
+        desc: @element_klass.desc,
+        name: @name,
+        parent_klass: @parent.present? ? "#{@parent&.class&.name&.split('::')&.last}: " : '',
+        short_label: @short_label,
         date: Time.now.strftime('%d/%m/%Y'),
         author: @current_user.name,
         layers: layers
@@ -162,14 +227,13 @@ module Labimotion
       Labimotion.log_exception(e)
     ensure
       # Close and delete the temporary file
-      tempfile.close
-      tempfile.unlink
+      tempfile&.close
+      tempfile&.unlink
     end
 
 
     def res_name
-      element_name = @element.short_label
-      "#{element_name}_#{Time.now.strftime('%Y%m%d%H%M')}.docx"
+      "#{@element_name}_#{Time.now.strftime('%Y%m%d%H%M')}.docx"
     rescue StandardError => e
       Labimotion.log_exception(e)
     end

data/lib/labimotion/libs/nmr_mapper.rb

@@ -28,8 +28,8 @@ module Labimotion
       att = Attachment.find_by(id: id, con_state: Labimotion::ConState::NMR)
       return if att.nil?
 
-      if Labimotion::IS_RAILS5 == true
-        Zip::File.open(att.store.path) do |zip_file|
+      if att&.attachment_attacher&.file&.url
+        Zip::File.open(att.attachment_attacher.file.url) do |zip_file|
           zip_file.each do |entry|
             if entry.name.include?('/pdata/') && entry.name.include?('parm.txt')
               metadata = entry.get_input_stream.read.force_encoding('UTF-8')
@@ -39,19 +39,6 @@ module Labimotion
             end
           end
         end
-      else
-        if att&.attachment_attacher&.file&.url
-          Zip::File.open(att.attachment_attacher.file.url) do |zip_file|
-            zip_file.each do |entry|
-              if entry.name.include?('/pdata/') && entry.name.include?('parm.txt')
-                metadata = entry.get_input_stream.read.force_encoding('UTF-8')
-                return { is_bagit: false, metadata: metadata }
-              elsif entry.name.include?('metadata/') && entry.name.include?('converter.json')
-                return { is_bagit: true, metadata: nil }
-              end
-            end
-          end
-        end
       end
       { is_bagit: false, metadata: nil }
     end

data/lib/labimotion/models/concerns/generic_klass_revisions.rb

@@ -6,6 +6,12 @@ module Labimotion
     extend ActiveSupport::Concern
     included do
       # has_many :element_klasses_revisions, dependent: :destroy
+      before_save :check_identifier
+    end
+
+      
+    def check_identifier
+      self.identifier = identifier || SecureRandom.uuid
     end
 
     def create_klasses_revision(current_user)

data/lib/labimotion/utils/field_type.rb

@@ -8,6 +8,8 @@ module Labimotion
     SELECT = 'select'.freeze
     INTEGER = 'integer'.freeze
     INPUT_GROUP = 'input-group'.freeze
+    WF_NEXT = 'wf-next'.freeze
+    TEXT_FORMULA = 'text-formula'.freeze
     SYSTEM_DEFINED = 'system-defined'.freeze
     DRAG = 'drag'.freeze
     DRAG_ELEMENT = 'drag_element'.freeze