toji 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa71d753d4af9a4c3c73c00fe9a1c8d3e759ebceee63adc6ccdc2583c85153d1
-  data.tar.gz: 3a432ecd4fcb2d55aaaac3df83138bd41cf23c17c8e1481b7741d1ee13b09dcd
+  metadata.gz: ea7f317a8523e02571115e31cddcd0c5f02aed9a89d64cb8ff58955545817f5c
+  data.tar.gz: 0c431190ff6c2120477f50e778043f7b2163d1f18d25168c635187b37610c000
 SHA512:
-  metadata.gz: 65b271cc91a9628587e77c984db514cfb103560ff6121f1b57de6957abfa169e30e376c65241dcaeaa0cd3843bf743d80f319312d4de4ec19242038d14af13ac
-  data.tar.gz: 0654f03b646d83039c3fd0f2b95886bd3c33c26448833b89a517357932493a3b997481d58a811db3f19113e0f5696f993ec063006b11df7fb90d02d646ddf4e4
+  metadata.gz: 0e10824774f5b262428d06f60c5b8b57d5d7545f0a35dc15728423eba2fe9d8fdeddde865a007adc52448e6636f75a6c43a74a4c0dd4d8540a59f7747c7ef85b
+  data.tar.gz: eb02aca9c2f3754c2abd31bd07aaa9cd32482d5e0ed42e99345ff61ec02cd9ba644df235ad288eef7c730bf52344a17fa8a6a2388168869bad385db734f9498c

data/lib/toji/schedule/calendar.rb

@@ -63,14 +63,14 @@ module Toji
           date_row = _date_rows[date]
           if date_row
             koji_len.times {|i|
-              columns << (date_row.kojis[i]&.text || "")
+              columns << (date_row.kojis[i]&.to_h_a || [])
             }
             rice_len.times {|i|
-              columns << (date_row.rices[i]&.text || "")
+              columns << (date_row.rices[i]&.to_h_a || [])
             }
           else
             (koji_len + rice_len).times {
-              columns << ""
+              columns << []
             }
           end
 
@@ -82,8 +82,26 @@ module Toji
         {header: headers, rows: rows}
       end
 
-      def table
+      def table_text_data
         data = table_data
+        data[:rows] = data[:rows].map {|row|
+          row.map {|column|
+            if Array===column
+              column.map{|c|
+                name = c[:product_name]
+                weight = "%.17g" % c[:weight]
+                "#{name}: #{weight}"
+              }.join("<br>")
+            else
+              column
+            end
+          }
+        }
+        data
+      end
+
+      def table
+        data = table_text_data
 
         Plotly::Plot.new(
           data: [{

data/lib/toji/schedule/date_column.rb

@@ -29,7 +29,8 @@ module Toji
       def to_h_a
         event_groups.map {|es|
           {
-            product: es.first.product.to_h,
+            product_id: es.first.product.id,
+            product_name: es.first.product.name,
             weight: es.map(&:weight).sum,
           }
         }

data/lib/toji/schedule/product.rb

@@ -1,6 +1,7 @@
 module Toji
   module Schedule
     class Product
+      attr_reader :id
       attr_reader :name
       attr_reader :description
       attr_reader :recipe
@@ -10,7 +11,8 @@ module Toji
 
       attr_reader :color
 
-      def initialize(name, description, recipe, koji_dates, rice_dates, color=nil)
+      def initialize(id, name, description, recipe, koji_dates, rice_dates, color=nil)
+        @id = id
         @name = name
         @description = description
         @recipe = recipe
@@ -64,6 +66,7 @@ module Toji
           end
 
           new(
+            args[:id],
             args[:name],
             args[:description],
             recipe,

data/lib/toji/version.rb

@@ -1,3 +1,3 @@
 module Toji
-  VERSION = "1.6.3"
+  VERSION = "1.6.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toji
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Yoshida Tetsuya