glib-web 3.16.2 → 3.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d5b87ed40b6899921ff69c27b36f7a7fdbd5bda372cc66e862fa118e5b3829e
-  data.tar.gz: d48ca7297c13cb43a969e274bf3090cd72bfed50dda1fa150de961db3cb53dfa
+  metadata.gz: f1d722ffb4523a19dec06cb824aabfd33ad049b49e307b5d1d2b56bc8c82ce49
+  data.tar.gz: 67a81620f13a428079cef376169c0268aa17adf4c72ebf0f5b3c5c3f58100eff
 SHA512:
-  metadata.gz: 93ec58c318c1568c69dcd7007b1cff9effd8a7048e885cf10df17c3065c7ad64d37220d8c30e9a44af01d592664f18d617832da3b88297e779893954f6aa95aa
-  data.tar.gz: 1aecb33728606c762df28283bfab3b21399748f27b9a709158a13859e8cd147031eee7cdfd71ada6d10f56fe13450f8f1615f175fb1648363fefbc03402dcec9
+  metadata.gz: 0a95ba9bd199538e98b0d49d3801057902d3631137475ef1198ded587234a5a5adee025c80c10ea0c5f7b680e3beaa9ebf8e99c932a7ab3bea6634dbd340013b
+  data.tar.gz: 76d489f4984445da7168d9a8b33b997f4c75cbf0b820958c9497e7535fa2e18c322730686ea94fa9617dccfbf0bd613fa1b43dcd2e8ab2169c174146fd0cd459

data/app/helpers/glib/json_ui/view_builder/charts.rb

@@ -34,48 +34,42 @@ class Glib::JsonUi::ViewBuilder
       end
     end
 
+    module Attributes
+      extend ActiveSupport::Concern
+
+      included do
+        array :colors
+        string :prefix
+        string :suffix
+        int :min
+        int :max
+        hash :legend
+        hash :plugins
+      end
+    end
+
     class Line < View
       include Series
-      array :colors
-      string :prefix
-      string :suffix
-      int :min
-      int :max
-      string :legend
-      # idea for the future
-      # hash :nextPage
+      include Attributes
     end
 
     class Column < View
       include Series
+      include Attributes
 
       bool :stacked
-      array :colors
-      string :prefix
-      string :suffix
-      int :min
-      int :max
-      string :legend
     end
 
     class Pie < View
       include Series
-      array :colors
-      string :prefix
-      string :suffix
-      int :min
-      int :max
-      string :legend
-
+      include Attributes
+      array :dataPoints
     end
 
     class Area < View
       include Series
-      array :colors
-      string :prefix
-      string :suffix
-      int :min
-      int :max
+      include Attributes
+      array :dataPoints
     end
 
   end

data/app/helpers/glib/json_ui/view_builder/fields.rb

@@ -48,9 +48,6 @@ class Glib::JsonUi::ViewBuilder
       # Override
       def created
         if @prop && (form = page.current_form)
-          association = form.nested_associations.last
-          context = association || form
-
           context.field_assert_respond_to(@prop)
 
           @name ||= context.field_name(@prop, @multiple || false)
@@ -61,7 +58,7 @@ class Glib::JsonUi::ViewBuilder
 
           if form.current_dynamic_group.nil?
             # This is not relevant inside a dynamic group
-            @value ||= context.field_value(@prop)
+            @value ||= determine_value(context, @prop)
           end
         end
         json.name @name
@@ -78,6 +75,16 @@ class Glib::JsonUi::ViewBuilder
         # json.validation @validation if @validation
       end
 
+      # To be overridden
+      def determine_value(context, prop)
+        context.field_value(prop)
+      end
+
+      def context
+        form = page.current_form
+        association = form.nested_associations.last
+        @context ||= association || form
+      end
     end
 
     class Text < AbstractField
@@ -168,6 +175,8 @@ class Glib::JsonUi::ViewBuilder
       bool :multiple, cache: true
       # bool :manualEntry
       hash :append
+
+      panels_builder :accessory, :header, :footer
     end
 
     class TimeZone < AbstractField
@@ -274,8 +283,17 @@ class Glib::JsonUi::ViewBuilder
 
         json.set! :buttonLabels, @buttonLabels
 
+        if @prop && context
+          json.fileTitle context.field_value(@prop).blob&.filename
+        end
+
         super
       end
+
+      @Override
+      def determine_value(context, prop)
+        context.field_value(prop)&.signed_id || ''
+      end
     end
 
     class MultiUpload < AbstractField
@@ -310,9 +328,9 @@ class Glib::JsonUi::ViewBuilder
         json.placeholder @placeholder if @placeholder
         json.hint @hint if @hint
 
-        if @prop && (form = page.current_form)
-          association = form.nested_associations.last
-          context = association || form
+        if @prop && context
+          # association = form.nested_associations.last
+          # context = association || form
 
           @files ||= context.field_value(@prop, collect_ids: false).to_a.map { |file| { name: file.blob&.filename, signed_id: file.signed_id } }
         end

data/app/views/json_ui/garage/forms/selects.json.jbuilder

@@ -60,8 +60,29 @@ page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', p
     options << { type: 'divider' }
   end
 
-  form.fields_select name: 'user[language]', width: 'matchParent', label: 'Primary Language', options: options, value: 'nl'
-  form.fields_select name: 'user[languages][]', width: 'matchParent', label: 'Primary Language', options: options, value: ['ja', 'de'], multiple: true
+  form.fields_select \
+    name: 'user[language]',
+    width: 'matchParent',
+    label: 'Primary Language',
+    options: options,
+    value: 'nl',
+    accessory: ->(accessory) do
+      accessory.header padding: { x: 16, y: 10 }, childViews: ->(header) do
+        header.label text: 'Header'
+      end
+      accessory.footer padding: { x: 16, y: 10 }, childViews: ->(header) do
+        header.label text: 'Footer'
+      end
+      # footer.label text: 'TEST123'
+    end
+
+  form.fields_select \
+    name: 'user[languages][]',
+    width: 'matchParent',
+    label: 'Primary Language',
+    options: options,
+    value: ['ja', 'de'],
+    multiple: true
 
   form.spacer height: 20
   form.h2 text: 'Select fields with empty values'

data/app/views/json_ui/garage/views/charts.json.jbuilder

@@ -1,3 +1,14 @@
+default_plugins = {
+  datalabels: {
+    backgroundColor: 'skyblue',
+    borderRadius: 4,
+    color: 'white',
+    font: {
+      weight: 'bold'
+    },
+    padding: 6
+  }
+}
 
 if params[:data_only].present?
   json_ui_page json do |page|
@@ -43,7 +54,8 @@ else
           json.points points.map { |k, v| { x: k, y: v } }
         end
       ],
-      colors: ['#79AC78', '#3085C3'], legend: 'bottom'
+      plugins: default_plugins,
+      colors: ['#79AC78', '#3085C3'], legend: { display: false }
 
       # scroll.spacer height: 20
       # scroll.h1 text: 'Line chart using remote data'
@@ -79,7 +91,8 @@ else
           json.points points
         end
       ],
-      colors: ['#b00', '#666', '#E55604'], legend: 'left'
+      plugins: default_plugins,
+      colors: ['lightgreen', 'whitesmoke', 'skyblue'], legend: { position: 'left' }
 
       scroll.h2 text: 'Column chart (Stacked)'
       scroll.charts_column stacked: true, dataGroups: [
@@ -110,54 +123,42 @@ else
           }
           json.points points
         end
-      ], legend: 'bottom'
+      ], plugins: default_plugins, legend: { position: 'bottom', align: 'start' }
 
+      plugins = default_plugins.deep_dup
+      plugins[:datalabels][:formatType] = 'label'
       scroll.h2 text: 'Pie chart'
-      scroll.charts_pie dataSeries: [
-        -> do
-          json.title 'Straberry'
-          json.value 25
-        end,
-        -> do
-          json.title 'Banana'
-          json.value 25
-        end
-      ], legend: 'bottom'
+      scroll.charts_pie \
+        colors: ['#fc5a8d', '#F5E216'],
+        plugins: plugins,
+        dataPoints: [{ title: 'Strawberry', value: 25 }, { title: 'Banana', value: 75 }], legend: { display: false }
 
       scroll.h2 text: 'Donut chart'
       scroll.charts_pie \
         styleClasses: ['donut'],
-        dataSeries: [
-          -> do
-            json.title 'Straberry'
-            json.value 25
-          end,
-          -> do
-            json.title 'Banana'
-            json.value 25
-          end
-        ], legend: 'bottom'
+        suffix: '%',
+        colors: ['#fc5a8d', '#F5E216'],
+        plugins: default_plugins.merge({
+          centerLabel: {
+            labels: [
+              {
+                text: 'Fruits',
+                font: {
+                  weigth: 'bold',
+                  size: 20
+                }
+              },
+              { text: 'You like' }
+            ]
+          }
+        }),
+        dataPoints: [{ title: 'Strawberry', value: 25 }, { title: 'Banana', value: 75 }],
+        legend: { position: 'right' }
 
       scroll.h2 text: 'Area chart'
-      scroll.charts_area dataSeries: [
-        -> do
-          json.title 'Jan'
-          json.value 25
-        end,
-        -> do
-          json.title 'Feb'
-          json.value 55
-        end,
-        -> do
-          json.title 'Mar'
-          json.value 60
-        end,
-        -> do
-          json.title 'June'
-          json.value 20
-        end
-      ],
-      colors: ['#5B0888']
+      scroll.charts_area \
+        dataPoints: [{ title: 'Jan', value: 25 }, { title: 'Feb', value: 55 }, { title: 'Mar', value: 60 }, { title: 'Apr', value: 45 }],
+        colors: ['#5B0888']
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 3.16.2
+  version: 3.17.0
 platform: ruby
 authors:
 - ''
@@ -327,8 +327,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.4.6
 signing_key: 
 specification_version: 4
 summary: ''