labimotion 2.1.0.rc8 → 2.1.0.rc9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ded6e04ed88c0888ce184a58663ac2f91bbeb00f8e8e67f1feb70f6d53a3a39
-  data.tar.gz: e7cc351ed12b84cc6dad32705bdb0297addb5a9400445c72cbb4fdf7417c8bb6
+  metadata.gz: e6d531f720a6e62743918a54244a11e0487e36e832df383cc40606a4ede20241
+  data.tar.gz: 8eea6d130958617f8bf7cabe2c439c3053b768c93c292c41852f13d20116ca2b
 SHA512:
-  metadata.gz: 440d75c561f6ca9754f346bbdaf8da71efe2402a3ac569eb673ac24de94a654cbd45af1ef8d19edde2f9dfb488e9f1d692931eab9e8b3c77f1ba6a1858a93458
-  data.tar.gz: e86ff2f885489b280616f42d21806a33047cd2257296149ac56763efcb42e0d24b1ae303fce30d108b3431f0259b3204c2e223037321b0f2ee4908038f8ab73a
+  metadata.gz: ed51beb0f134c8e36e1b588f7263270448902d8bf1b17be03fc44b63f0129fcc1992606a2248c957cecd446cf7c6124babdabf515e0834f684dfc9d927254c5b
+  data.tar.gz: 1ec3c99f675ce7c32d3a497117504441da819e26073ac6aa50720e55c3ca255497b4d79919f65f8062f0eee2ee9b8f39ff723cacbe011a729434680e25a4931d

data/lib/labimotion/helpers/converter_helpers.rb

@@ -2,12 +2,25 @@
 require 'grape'
 
 module Labimotion
-  ## ElementHelpers
+  ## ConverterHelpers
   module ConverterHelpers
     extend Grape::API::Helpers
 
-    def demo(params)
-      ### TODO: implement demo
+    # Update the general_description field in the container's extended_metadata
+    def self.update_general_description(container, current_user, date: nil, time: nil)
+      return unless container.present?
+
+      desc = container.extended_metadata['general_description']
+
+      general_desc = desc if desc.present? && desc.is_a?(Hash)
+      general_desc = JSON.parse(container.extended_metadata['general_description']) if desc.present? && desc.is_a?(String)
+      general_desc = {} unless general_desc.is_a?(Hash)
+      general_desc['creator'] = current_user.name if current_user.present?
+      general_desc['date'] = date if date.present?
+      general_desc['time'] = time if time.present?
+
+      container.extended_metadata['general_description'] = general_desc.to_json
+      container.save!
     end
   end
 end

data/lib/labimotion/libs/converter.rb

@@ -6,6 +6,7 @@ require 'json'
 require 'date'
 require 'labimotion/version'
 require 'labimotion/utils/utils'
+require 'labimotion/helpers/converter_helpers'
 
 # rubocop: disable Metrics/AbcSize
 # rubocop: disable Metrics/MethodLength
@@ -228,6 +229,19 @@ module Labimotion
     def self.update_ds(dataset, dsr, current_user = nil) # rubocop: disable Metrics/PerceivedComplexity
       layers = dataset.properties[Labimotion::Prop::LAYERS] || {}
       new_prop = dataset.properties
+
+      container = dataset.element
+
+      # Extract and update general description fields
+      general_dsr = dsr.select { |ds| ds[:layer] == 'general' }
+      if general_dsr.present?
+        date = general_dsr.find { |ds| ds[:field] == 'date' }&.dig(:value)
+        time = general_dsr.find { |ds| ds[:field] == 'time' }&.dig(:value)
+        Labimotion::ConverterHelpers.update_general_description(container, current_user, date: date, time: time)
+      else
+        Labimotion::ConverterHelpers.update_general_description(container, current_user)
+      end
+
       dsr.each do |ds|
         layer = layers[ds[:layer]]
         next if layer.blank? || layer[Labimotion::Prop::FIELDS].blank?

data/lib/labimotion/libs/nmr_mapper.rb

@@ -4,6 +4,7 @@ require 'labimotion/libs/dataset_builder'
 require 'labimotion/version'
 require 'labimotion/utils/mapper_utils'
 require 'labimotion/utils/utils'
+require 'labimotion/helpers/converter_helpers'
 
 module Labimotion
   ## NmrMapper
@@ -61,6 +62,7 @@ module Labimotion
 
       def update_ds(_cid, obj, current_user, element)
         dataset = obj[:dataset]
+        process_general_description(obj, current_user, element)
         dataset.properties = process_prop(obj, current_user, element)
         dataset.save!
       end
@@ -106,6 +108,17 @@ module Labimotion
         new_prop
       end
 
+      def process_general_description(obj, current_user, element)
+        container = obj[:dataset]&.element
+        return unless container.present?
+
+        dt = obj[:metadata]&.dig('DATE')
+        date = Labimotion::MapperUtils.format_timestamp(dt, 'date') if dt.present?
+        time = Labimotion::MapperUtils.format_timestamp(dt, 'time') if dt.present?
+
+        Labimotion::ConverterHelpers.update_general_description(container, current_user, date: date, time: time)
+      end
+
       def process_prop(obj, current_user, element)
         new_prop = obj[:dataset].properties
         new_prop

data/lib/labimotion/version.rb

@@ -2,5 +2,5 @@
 
 ## Labimotion Version
 module Labimotion
-  VERSION = '2.1.0.rc8'
+  VERSION = '2.1.0.rc9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: labimotion
 version: !ruby/object:Gem::Version
-  version: 2.1.0.rc8
+  version: 2.1.0.rc9
 platform: ruby
 authors:
 - Chia-Lin Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-11-02 00:00:00.000000000 Z
+date: 2025-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx